Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update decred dependencies to latest master #213

Merged
merged 7 commits into from
May 16, 2024
Merged

Update decred dependencies to latest master #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71337ff
go.mod: Bump go directive to go1.20
matheusd May 13, 2024
261584b
testutils: Prevent double close of synced channel
matheusd May 13, 2024
06d7dec
chainview: Simplify reorg interface test
matheusd May 14, 2024
f86fa79
multi: Update dcrwallet dep to latest dev version
matheusd Dec 12, 2023
36a7120
dcrwallet: Expose disablerelaytx
matheusd May 13, 2024
53c9182
multi: Pass along birthday from aezeed to wallet init
matheusd May 14, 2024
7477c62
version: Bump to v0.7.0
matheusd May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ ITEST_LDFLAGS := -ldflags "-X $(PKG)/build.Commit=$(COMMIT)"
RELEASE_LDFLAGS := $(call make_ldflags, $(RELEASE_TAGS), -s -w -buildid=)

DCRD_REPO := github.com/decred/dcrd
DCRD_COMMIT := v1.8.0
DCRD_COMMIT := 3d4d27280b43207c2891b733a3d33fdfb411b555
DCRD_META := "$(DCRD_COMMIT).from-dcrlnd"
DCRD_LDFLAGS := "-X github.com/decred/dcrd/internal/version.BuildMetadata=$(DCRD_META)"
DCRD_TMPDIR := $(shell mktemp -d)

DCRWALLET_REPO := github.com/decred/dcrwallet
DCRWALLET_COMMIT := v3.0.0
DCRWALLET_COMMIT := 1920377bb49f66318ed4630de9a32b245f90d2a2
DCRWALLET_META := $(DCRWALLET_COMMIT).from-dcrlnd
DCRWALLET_LDFLAGS := "-X decred.org/dcrwallet/version.BuildMetadata=$(DCRWALLET_META)"
DCRWALLET_TMPDIR := $(shell mktemp -d)
Expand Down
2 changes: 1 addition & 1 deletion build/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const (
// versioning 2.0.0 spec (https://semver.org/).
const (
appMajor uint = 0
appMinor uint = 6
appMinor uint = 7
appPatch uint = 0
)

Expand Down
2 changes: 1 addition & 1 deletion chainntnfs/dcrwnotify/dcrw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package dcrwnotify
import (
"context"

"decred.org/dcrwallet/v3/wallet"
"decred.org/dcrwallet/v4/wallet"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/wire"
Expand Down
2 changes: 1 addition & 1 deletion chainntnfs/dcrwnotify/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"

"decred.org/dcrwallet/v3/wallet"
"decred.org/dcrwallet/v4/wallet"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrlnd/blockcache"
"github.com/decred/dcrlnd/chainntnfs"
Expand Down
2 changes: 1 addition & 1 deletion chainntnfs/remotedcrwnotify/remotedcrw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package remotedcrwnotify
import (
"context"

"decred.org/dcrwallet/v3/rpc/walletrpc"
"decred.org/dcrwallet/v4/rpc/walletrpc"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/wire"
Expand Down
2 changes: 1 addition & 1 deletion chainntnfs/test/test_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"testing"
"time"

"decred.org/dcrwallet/v3/wallet"
"decred.org/dcrwallet/v4/wallet"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4"
Expand Down
4 changes: 2 additions & 2 deletions chainscan/csdrivers/dcrwdriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"sync"
"time"

"decred.org/dcrwallet/v3/errors"
"decred.org/dcrwallet/v3/wallet"
"decred.org/dcrwallet/v4/errors"
"decred.org/dcrwallet/v4/wallet"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/gcs/v4"
"github.com/decred/dcrd/wire"
Expand Down
2 changes: 1 addition & 1 deletion chainscan/csdrivers/dcrwdriver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"decred.org/dcrwallet/v3/rpc/walletrpc"
"decred.org/dcrwallet/v4/rpc/walletrpc"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/gcs/v4"
Expand Down
2 changes: 1 addition & 1 deletion chainscan/csdrivers/remotedcrwdriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sync"
"time"

"decred.org/dcrwallet/v3/rpc/walletrpc"
"decred.org/dcrwallet/v4/rpc/walletrpc"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/gcs/v4"
"github.com/decred/dcrd/gcs/v4/blockcf2"
Expand Down
2 changes: 1 addition & 1 deletion chainscan/examples/dcrwallethistorical/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"path/filepath"
"time"

"decred.org/dcrwallet/v3/rpc/walletrpc"
"decred.org/dcrwallet/v4/rpc/walletrpc"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/txscript/v4/stdaddr"
Expand Down
12 changes: 7 additions & 5 deletions config_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"time"

"decred.org/dcrwallet/v3/wallet"
"decred.org/dcrwallet/v4/wallet"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrlnd/blockcache"
"github.com/decred/dcrlnd/btcwalletcompat"
Expand Down Expand Up @@ -568,10 +568,11 @@ func (d *DefaultWalletImpl) BuildWalletConfig(ctx context.Context,
d.cfg.ActiveNetParams.Params)
case !isRemoteWallet && d.cfg.Dcrwallet.SPV:
spvCfg := &dcrwallet.SPVSyncerConfig{
Peers: d.cfg.Dcrwallet.SPVConnect,
Net: d.cfg.ActiveNetParams.Params,
AppDataDir: filepath.Join(d.cfg.Decred.ChainDir),
DialFunc: d.cfg.Dcrwallet.DialFunc,
Peers: d.cfg.Dcrwallet.SPVConnect,
Net: d.cfg.ActiveNetParams.Params,
AppDataDir: filepath.Join(d.cfg.Decred.ChainDir),
DialFunc: d.cfg.Dcrwallet.DialFunc,
DisableRelayTx: d.cfg.Dcrwallet.DisableRelayTx,
}
walletConfig.Syncer, err = dcrwallet.NewSPVSyncer(spvCfg)
}
Expand Down Expand Up @@ -932,6 +933,7 @@ func waitForWalletPassword(cfg *Config,
birthday = cipherSeed.BirthdayTime()
newWallet, err = loader.CreateNewWallet(
ctx, password, password, cipherSeed.Entropy[:],
birthday,
)

// No seed was given, we're importing a wallet from its extended
Expand Down
6 changes: 4 additions & 2 deletions dcrlnd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"errors"
"fmt"
"io"
"time"

"decred.org/dcrwallet/v3/wallet"
"decred.org/dcrwallet/v4/wallet"
"github.com/decred/dcrlnd/chainreg"
"github.com/decred/dcrlnd/lnrpc/initchainsyncrpc"
"github.com/decred/dcrlnd/lnwallet"
Expand Down Expand Up @@ -81,7 +82,8 @@ func noSeedBackupWalletInit(ctx context.Context, cfg *Config, privPass, pubPass
if _, err := io.ReadFull(rand.Reader, seed[:]); err != nil {
return nil, err
}
return loader.CreateNewWallet(ctx, pubPass, privPass, seed[:])
return loader.CreateNewWallet(ctx, pubPass, privPass, seed[:],
time.Now().Add(-time.Hour*24))
}

type RemoteWalletBuilder struct {
Expand Down
2 changes: 1 addition & 1 deletion docker/dcrwallet/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"os"

pb "decred.org/dcrwallet/v3/rpc/walletrpc"
pb "decred.org/dcrwallet/v4/rpc/walletrpc"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)
Expand Down
53 changes: 27 additions & 26 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
module github.com/decred/dcrlnd

go 1.18
go 1.20

require (
decred.org/dcrwallet/v3 v3.1.1-0.20240303162647-7352f6fb06da
decred.org/dcrwallet/v4 v4.0.0-20240516171148-1920377bb49f
github.com/NebulousLabs/go-upnp v0.0.0-20181203152547-b32978b8ccbf
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344
github.com/bahlo/generic-list-go v0.2.0
github.com/btcsuite/btcwallet/walletdb v1.4.0
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
github.com/davecgh/go-spew v1.1.1
github.com/decred/dcrd/addrmgr/v2 v2.0.2
github.com/decred/dcrd/addrmgr/v2 v2.0.3
github.com/decred/dcrd/bech32 v1.1.3
github.com/decred/dcrd/blockchain/stake/v5 v5.0.0
github.com/decred/dcrd/blockchain/standalone/v2 v2.2.0
github.com/decred/dcrd/blockchain/stake/v5 v5.0.1
github.com/decred/dcrd/blockchain/standalone/v2 v2.2.1
github.com/decred/dcrd/chaincfg/chainhash v1.0.4
github.com/decred/dcrd/chaincfg/v3 v3.2.0
github.com/decred/dcrd/chaincfg/v3 v3.2.1
github.com/decred/dcrd/connmgr v1.1.1
github.com/decred/dcrd/dcrec v1.0.1
github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.1
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
github.com/decred/dcrd/dcrjson/v4 v4.0.1
github.com/decred/dcrd/dcrutil/v4 v4.0.1
github.com/decred/dcrd/gcs/v4 v4.0.0
github.com/decred/dcrd/hdkeychain/v3 v3.1.1
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.1.0
github.com/decred/dcrd/rpcclient/v8 v8.0.0
github.com/decred/dcrd/txscript/v4 v4.1.0
github.com/decred/dcrd/wire v1.6.0
github.com/decred/dcrd/dcrutil/v4 v4.0.2
github.com/decred/dcrd/gcs/v4 v4.1.0
github.com/decred/dcrd/hdkeychain/v3 v3.1.2
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.2.0
github.com/decred/dcrd/rpcclient/v8 v8.0.1
github.com/decred/dcrd/txscript/v4 v4.1.1
github.com/decred/dcrd/wire v1.7.0
github.com/decred/dcrtest/dcrdtest v1.0.1-0.20231217203517-3d06801da382
github.com/decred/lightning-onion/v4 v4.0.0
github.com/decred/slog v1.2.0
Expand All @@ -37,7 +37,7 @@ require (
github.com/golang/glog v1.1.2
github.com/golang/protobuf v1.5.3
github.com/google/btree v1.1.2
github.com/gorilla/websocket v1.5.0
github.com/gorilla/websocket v1.5.1
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
Expand All @@ -60,12 +60,12 @@ require (
go.etcd.io/etcd/client/pkg/v3 v3.5.7
go.etcd.io/etcd/client/v3 v3.5.7
go.etcd.io/etcd/server/v3 v3.5.7
golang.org/x/crypto v0.15.0
golang.org/x/crypto v0.23.0
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
golang.org/x/net v0.18.0
golang.org/x/sync v0.5.0
golang.org/x/sys v0.14.0
golang.org/x/term v0.14.0
golang.org/x/net v0.25.0
golang.org/x/sync v0.7.0
golang.org/x/sys v0.20.0
golang.org/x/term v0.20.0
golang.org/x/time v0.1.0
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
google.golang.org/grpc v1.59.0
Expand All @@ -76,7 +76,7 @@ require (
)

require (
decred.org/cspp/v2 v2.1.0 // indirect
decred.org/cspp/v2 v2.2.0 // indirect
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -88,16 +88,17 @@ require (
github.com/dchest/siphash v1.2.3 // indirect
github.com/decred/base58 v1.0.5 // indirect
github.com/decred/dcrd v1.8.0 // indirect
github.com/decred/dcrd/certgen v1.1.2 // indirect
github.com/decred/dcrd/certgen v1.1.3 // indirect
github.com/decred/dcrd/chaincfg v1.5.2 // indirect
github.com/decred/dcrd/connmgr/v3 v3.1.1 // indirect
github.com/decred/dcrd/connmgr/v3 v3.1.2 // indirect
github.com/decred/dcrd/container/apbf v1.0.1 // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
github.com/decred/dcrd/crypto/ripemd160 v1.0.2 // indirect
github.com/decred/dcrd/database/v3 v3.0.1 // indirect
github.com/decred/dcrd/database/v3 v3.0.2 // indirect
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 // indirect
github.com/decred/dcrd/lru v1.1.2 // indirect
github.com/decred/dcrd/math/uint256 v1.0.1 // indirect
github.com/decred/dcrd/mixing v0.1.0 // indirect
github.com/decred/dcrd/peer/v3 v3.0.2 // indirect
github.com/decred/go-socks v1.1.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand Down Expand Up @@ -160,7 +161,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.15.0 // indirect
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
Expand All @@ -169,6 +170,6 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.2.1 // indirect
lukechampine.com/blake3 v1.3.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading
Loading