Skip to content

Commit

Permalink
Bump module to major version 5
Browse files Browse the repository at this point in the history
  • Loading branch information
jrick committed Sep 6, 2024
1 parent b9d5cc6 commit 5195fbb
Show file tree
Hide file tree
Showing 116 changed files with 332 additions and 327 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ https://decred.org/downloads/

### Build from source (all platforms)

- **Install Go 1.21 or 1.22**
- **Install Go 1.22 or 1.23**

Installation instructions can be found here: https://golang.org/doc/install.
Ensure Go was installed properly and is a supported version:
Expand All @@ -91,13 +91,13 @@ https://decred.org/downloads/
to download, build, and install without needing to clone the repo. Run:
```sh
$ go install decred.org/dcrwallet/v4@master
$ go install decred.org/dcrwallet/v5@master
```
to build the latest master branch, or:
```sh
$ go install decred.org/dcrwallet/v3@latest
$ go install decred.org/dcrwallet/v4@latest
```
for the latest released version.
Expand Down
8 changes: 4 additions & 4 deletions chain/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"sync/atomic"
"time"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/rpc/client/dcrd"
"decred.org/dcrwallet/v4/validate"
"decred.org/dcrwallet/v4/wallet"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/rpc/client/dcrd"
"decred.org/dcrwallet/v5/validate"
"decred.org/dcrwallet/v5/wallet"
"github.com/decred/dcrd/blockchain/stake/v5"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/crypto/blake256"
Expand Down
4 changes: 2 additions & 2 deletions cmd/movefunds/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"fmt"
"os"

"decred.org/dcrwallet/v4/rpc/jsonrpc/types"
"decred.org/dcrwallet/v4/wallet/txauthor"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/wallet/txauthor"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4"
Expand Down
6 changes: 3 additions & 3 deletions cmd/sweepaccount/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"os"
"path/filepath"

"decred.org/dcrwallet/v4/rpc/jsonrpc/types"
"decred.org/dcrwallet/v4/wallet/txauthor"
"decred.org/dcrwallet/v4/wallet/txrules"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/wallet/txauthor"
"decred.org/dcrwallet/v5/wallet/txrules"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4"
Expand Down
14 changes: 7 additions & 7 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"strings"

"decred.org/cspp/v2/solverrpc"
"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/internal/cfgutil"
"decred.org/dcrwallet/v4/internal/loggers"
"decred.org/dcrwallet/v4/internal/netparams"
"decred.org/dcrwallet/v4/version"
"decred.org/dcrwallet/v4/wallet"
"decred.org/dcrwallet/v4/wallet/txrules"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/internal/cfgutil"
"decred.org/dcrwallet/v5/internal/loggers"
"decred.org/dcrwallet/v5/internal/netparams"
"decred.org/dcrwallet/v5/version"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v5/wallet/txrules"
"github.com/decred/dcrd/connmgr/v3"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/txscript/v4/stdaddr"
Expand Down
24 changes: 12 additions & 12 deletions dcrwallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ import (
"runtime/pprof"
"time"

"decred.org/dcrwallet/v4/chain"
"decred.org/dcrwallet/v4/errors"
ldr "decred.org/dcrwallet/v4/internal/loader"
"decred.org/dcrwallet/v4/internal/loggers"
"decred.org/dcrwallet/v4/internal/prompt"
"decred.org/dcrwallet/v4/internal/rpc/rpcserver"
"decred.org/dcrwallet/v4/p2p"
"decred.org/dcrwallet/v4/spv"
"decred.org/dcrwallet/v4/ticketbuyer"
"decred.org/dcrwallet/v4/version"
"decred.org/dcrwallet/v4/vsp"
"decred.org/dcrwallet/v4/wallet"
"decred.org/dcrwallet/v5/chain"
"decred.org/dcrwallet/v5/errors"
ldr "decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/internal/loggers"
"decred.org/dcrwallet/v5/internal/prompt"
"decred.org/dcrwallet/v5/internal/rpc/rpcserver"
"decred.org/dcrwallet/v5/p2p"
"decred.org/dcrwallet/v5/spv"
"decred.org/dcrwallet/v5/ticketbuyer"
"decred.org/dcrwallet/v5/version"
"decred.org/dcrwallet/v5/vsp"
"decred.org/dcrwallet/v5/wallet"
"github.com/decred/dcrd/addrmgr/v2"
"github.com/decred/dcrd/wire"
)
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package deployments
import (
"context"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v5/errors"
"github.com/decred/dcrd/chaincfg/v3"
dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/wire"
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module decred.org/dcrwallet/v4
module decred.org/dcrwallet/v5

go 1.20
go 1.22

require (
decred.org/cspp/v2 v2.2.0
Expand Down
5 changes: 5 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ github.com/companyzero/sntrup4591761 v0.0.0-20220309191932-9e0f3af2f07a h1:clYxJ
github.com/companyzero/sntrup4591761 v0.0.0-20220309191932-9e0f3af2f07a/go.mod h1:z/9Ck1EDixEbBbZ2KH2qNHekEmDLTOZ+FyoIPWWSVOI=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dchest/siphash v1.2.3 h1:QXwFc8cFOR2dSa/gE6o/HokBMWtLUaNDVd+22aKHeEA=
github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIXMPAkHc=
github.com/decred/base58 v1.0.5 h1:hwcieUM3pfPnE/6p3J100zoRfGkQxBulZHo7GZfOqic=
Expand Down Expand Up @@ -105,6 +106,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
Expand Down Expand Up @@ -134,7 +136,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
Expand Down Expand Up @@ -218,6 +222,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
Expand Down
2 changes: 1 addition & 1 deletion internal/cfgutil/address.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package cfgutil

import (
"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v5/errors"
"github.com/decred/dcrd/txscript/v4/stdaddr"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cfgutil/curve.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"io"
"time"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v5/errors"
"github.com/decred/dcrd/certgen"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/loader/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"path/filepath"
"sync"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/wallet"
_ "decred.org/dcrwallet/v4/wallet/drivers/bdb" // driver loaded during init
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/wallet"
_ "decred.org/dcrwallet/v5/wallet/drivers/bdb" // driver loaded during init
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/txscript/v4/stdaddr"
Expand Down
6 changes: 3 additions & 3 deletions internal/loader/vsp.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package loader
import (
"sync"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/internal/loggers"
"decred.org/dcrwallet/v4/vsp"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/internal/loggers"
"decred.org/dcrwallet/v5/vsp"
)

var vspClients = struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/prompt/prompt.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"time"
"unicode"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/walletseed"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/walletseed"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/hdkeychain/v3"
"golang.org/x/term"
Expand Down
2 changes: 1 addition & 1 deletion internal/rpc/jsonrpc/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package jsonrpc
import (
"fmt"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v5/errors"
"github.com/decred/dcrd/dcrjson/v4"
"github.com/jrick/wsrpc/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/rpc/jsonrpc/marshaling.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"

"decred.org/dcrwallet/v4/wallet"
"decred.org/dcrwallet/v5/wallet"
)

type marshalJSONFunc func() ([]byte, error)
Expand Down
28 changes: 14 additions & 14 deletions internal/rpc/jsonrpc/methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ import (
"sync"
"time"

"decred.org/dcrwallet/v4/chain"
"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/internal/loader"
"decred.org/dcrwallet/v4/p2p"
"decred.org/dcrwallet/v4/rpc/client/dcrd"
"decred.org/dcrwallet/v4/rpc/jsonrpc/types"
"decred.org/dcrwallet/v4/spv"
"decred.org/dcrwallet/v4/version"
"decred.org/dcrwallet/v4/vsp"
"decred.org/dcrwallet/v4/wallet"
"decred.org/dcrwallet/v4/wallet/txauthor"
"decred.org/dcrwallet/v4/wallet/txrules"
"decred.org/dcrwallet/v4/wallet/txsizes"
"decred.org/dcrwallet/v4/wallet/udb"
"decred.org/dcrwallet/v5/chain"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/p2p"
"decred.org/dcrwallet/v5/rpc/client/dcrd"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/spv"
"decred.org/dcrwallet/v5/version"
"decred.org/dcrwallet/v5/vsp"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v5/wallet/txauthor"
"decred.org/dcrwallet/v5/wallet/txrules"
"decred.org/dcrwallet/v5/wallet/txsizes"
"decred.org/dcrwallet/v5/wallet/udb"
"github.com/decred/dcrd/blockchain/stake/v5"
blockchain "github.com/decred/dcrd/blockchain/standalone/v2"
"github.com/decred/dcrd/chaincfg/chainhash"
Expand Down
4 changes: 2 additions & 2 deletions internal/rpc/jsonrpc/rpchelp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"strings"
"testing"

"decred.org/dcrwallet/v4/internal/rpchelp"
"decred.org/dcrwallet/v4/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/internal/rpchelp"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"github.com/decred/dcrd/dcrjson/v4"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/rpc/jsonrpc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"sync/atomic"
"time"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/internal/loader"
"decred.org/dcrwallet/v4/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrjson/v4"
dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
Expand Down
30 changes: 15 additions & 15 deletions internal/rpc/rpcserver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"decred.org/dcrwallet/v4/chain"
"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/internal/cfgutil"
"decred.org/dcrwallet/v4/internal/loader"
"decred.org/dcrwallet/v4/internal/netparams"
"decred.org/dcrwallet/v4/p2p"
pb "decred.org/dcrwallet/v4/rpc/walletrpc"
"decred.org/dcrwallet/v4/spv"
"decred.org/dcrwallet/v4/ticketbuyer"
"decred.org/dcrwallet/v4/vsp"
"decred.org/dcrwallet/v4/wallet"
"decred.org/dcrwallet/v4/wallet/txauthor"
"decred.org/dcrwallet/v4/wallet/txrules"
"decred.org/dcrwallet/v4/wallet/udb"
"decred.org/dcrwallet/v4/walletseed"
"decred.org/dcrwallet/v5/chain"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/internal/cfgutil"
"decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/internal/netparams"
"decred.org/dcrwallet/v5/p2p"
pb "decred.org/dcrwallet/v5/rpc/walletrpc"
"decred.org/dcrwallet/v5/spv"
"decred.org/dcrwallet/v5/ticketbuyer"
"decred.org/dcrwallet/v5/vsp"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v5/wallet/txauthor"
"decred.org/dcrwallet/v5/wallet/txrules"
"decred.org/dcrwallet/v5/wallet/udb"
"decred.org/dcrwallet/v5/walletseed"
"github.com/decred/dcrd/addrmgr/v2"
"github.com/decred/dcrd/blockchain/stake/v5"
"github.com/decred/dcrd/chaincfg/chainhash"
Expand Down
4 changes: 2 additions & 2 deletions internal/rpchelp/genrpcserverhelp.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"os"
"strings"

"decred.org/dcrwallet/v4/internal/rpchelp"
"decred.org/dcrwallet/v4/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/internal/rpchelp"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"github.com/decred/dcrd/dcrjson/v4"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/rpchelp/methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package rpchelp

import (
"decred.org/dcrwallet/v4/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
)

Expand Down
2 changes: 1 addition & 1 deletion ipc.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"io"
"os"

"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v5/errors"
)

// Messages sent over a pipe are encoded using a simple binary message format:
Expand Down
20 changes: 10 additions & 10 deletions log.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ package main
import (
"os"

"decred.org/dcrwallet/v4/chain"
"decred.org/dcrwallet/v4/internal/loader"
"decred.org/dcrwallet/v4/internal/loggers"
"decred.org/dcrwallet/v4/internal/rpc/jsonrpc"
"decred.org/dcrwallet/v4/internal/rpc/rpcserver"
"decred.org/dcrwallet/v4/p2p"
"decred.org/dcrwallet/v4/spv"
"decred.org/dcrwallet/v4/ticketbuyer"
"decred.org/dcrwallet/v4/wallet"
"decred.org/dcrwallet/v4/wallet/udb"
"decred.org/dcrwallet/v5/chain"
"decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/internal/loggers"
"decred.org/dcrwallet/v5/internal/rpc/jsonrpc"
"decred.org/dcrwallet/v5/internal/rpc/rpcserver"
"decred.org/dcrwallet/v5/p2p"
"decred.org/dcrwallet/v5/spv"
"decred.org/dcrwallet/v5/ticketbuyer"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v5/wallet/udb"
"github.com/decred/dcrd/connmgr/v3"
"github.com/decred/dcrd/mixing/mixpool"
"github.com/decred/slog"
Expand Down
Loading

0 comments on commit 5195fbb

Please sign in to comment.