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.

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

[0.6.2] deps: update dcrd/dcrwallet to 1.8 modules #2403

Merged
merged 2 commits into from
Jun 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/asset/btc/btc.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcwallet/wallet"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/decred/dcrd/rpcclient/v7"
"github.com/decred/dcrd/rpcclient/v8"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion client/asset/dcr/coin_selection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

walletjson "decred.org/dcrwallet/v2/rpc/jsonrpc/types"
walletjson "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
)

func Test_leastOverFund(t *testing.T) {
Expand Down
30 changes: 7 additions & 23 deletions client/asset/dcr/dcr.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ import (
"decred.org/dcrdex/dex/calc"
"decred.org/dcrdex/dex/config"
dexdcr "decred.org/dcrdex/dex/networks/dcr"
walletjson "decred.org/dcrwallet/v2/rpc/jsonrpc/types"
_ "decred.org/dcrwallet/v2/wallet/drivers/bdb"
"github.com/decred/dcrd/blockchain/stake/v4"
"github.com/decred/dcrd/blockchain/v4"
walletjson "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
_ "decred.org/dcrwallet/v3/wallet/drivers/bdb"
"github.com/decred/dcrd/blockchain/stake/v5"
"github.com/decred/dcrd/blockchain/standalone/v2"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrec"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
"github.com/decred/dcrd/dcrutil/v4"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v3"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/txscript/v4"
"github.com/decred/dcrd/txscript/v4/sign"
"github.com/decred/dcrd/txscript/v4/stdaddr"
Expand Down Expand Up @@ -2831,7 +2831,7 @@ func (dcr *ExchangeWallet) AuditContract(coinID, contract, txData dex.Bytes, reb
if err != nil {
return nil, fmt.Errorf("invalid contract tx data: %w", err)
}
if err = blockchain.CheckTransactionSanity(contractTx, dcr.chainParams); err != nil {
if err = standalone.CheckTransactionSanity(contractTx, uint64(dcr.chainParams.MaxTxSize)); err != nil {
return nil, fmt.Errorf("invalid contract tx data: %w", err)
}
if checkHash := contractTx.TxHash(); checkHash != *txHash {
Expand Down Expand Up @@ -2888,23 +2888,7 @@ func (dcr *ExchangeWallet) AuditContract(coinID, contract, txData dex.Bytes, reb
}

func determineTxTree(msgTx *wire.MsgTx) int8 {
// stake.DetermineTxType will produce correct results if we pass true for
// isTreasuryEnabled regardless of whether the treasury vote has activated
// or not.
// The only possibility for wrong results is passing isTreasuryEnabled=false
// _after_ the treasury vote activates - some stake tree votes may identify
// as regular tree transactions.
// Could try with isTreasuryEnabled false, then true and if neither comes up
// as a stake transaction, then we infer regular, but that isn't necessary
// as explained above.
isTreasuryEnabled := true
// Consider the automatic ticket revocations agenda NOT active. Specifying
// true just adds the constraints that revocations must have an empty
// signature script for its input and must have zero fee. Thus, false will
// correctly identify consensus-validated transactions before OR after
// activation of this agenda.
isAutoRevocationsEnabled := false
if stake.DetermineTxType(msgTx, isTreasuryEnabled, isAutoRevocationsEnabled) != stake.TxTypeRegular {
if stake.DetermineTxType(msgTx) != stake.TxTypeRegular {
return wire.TxTreeStake
}
return wire.TxTreeRegular
Expand Down
10 changes: 5 additions & 5 deletions client/asset/dcr/dcr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ import (
"decred.org/dcrdex/dex/calc"
"decred.org/dcrdex/dex/config"
dexdcr "decred.org/dcrdex/dex/networks/dcr"
"decred.org/dcrwallet/v2/rpc/client/dcrwallet"
walletjson "decred.org/dcrwallet/v2/rpc/jsonrpc/types"
"decred.org/dcrwallet/v3/rpc/client/dcrwallet"
walletjson "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrec"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
"github.com/decred/dcrd/dcrjson/v4"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/gcs/v3"
"github.com/decred/dcrd/gcs/v3/blockcf2"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v3"
"github.com/decred/dcrd/gcs/v4"
"github.com/decred/dcrd/gcs/v4/blockcf2"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/txscript/v4"
"github.com/decred/dcrd/txscript/v4/stdaddr"
"github.com/decred/dcrd/wire"
Expand Down
12 changes: 6 additions & 6 deletions client/asset/dcr/rpcwallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ import (

"decred.org/dcrdex/client/asset"
"decred.org/dcrdex/dex"
"decred.org/dcrwallet/v2/rpc/client/dcrwallet"
walletjson "decred.org/dcrwallet/v2/rpc/jsonrpc/types"
"decred.org/dcrwallet/v3/rpc/client/dcrwallet"
walletjson "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/decred/dcrd/dcrjson/v4"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/gcs/v3"
"github.com/decred/dcrd/gcs/v3/blockcf2"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v3"
"github.com/decred/dcrd/rpcclient/v7"
"github.com/decred/dcrd/gcs/v4"
"github.com/decred/dcrd/gcs/v4/blockcf2"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/rpcclient/v8"
"github.com/decred/dcrd/txscript/v4/stdaddr"
"github.com/decred/dcrd/wire"
)
Expand Down
20 changes: 10 additions & 10 deletions client/asset/dcr/spv.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ import (

"decred.org/dcrdex/client/asset"
"decred.org/dcrdex/dex"
"decred.org/dcrwallet/v2/chain"
walleterrors "decred.org/dcrwallet/v2/errors"
"decred.org/dcrwallet/v2/p2p"
walletjson "decred.org/dcrwallet/v2/rpc/jsonrpc/types"
"decred.org/dcrwallet/v2/spv"
"decred.org/dcrwallet/v2/wallet"
"decred.org/dcrwallet/v2/wallet/udb"
"decred.org/dcrwallet/v3/chain"
walleterrors "decred.org/dcrwallet/v3/errors"
"decred.org/dcrwallet/v3/p2p"
walletjson "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
"decred.org/dcrwallet/v3/spv"
"decred.org/dcrwallet/v3/wallet"
"decred.org/dcrwallet/v3/wallet/udb"
"github.com/decred/dcrd/addrmgr/v2"
"github.com/decred/dcrd/blockchain/stake/v4"
"github.com/decred/dcrd/blockchain/stake/v5"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/connmgr/v3"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/gcs/v3"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v3"
"github.com/decred/dcrd/gcs/v4"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/txscript/v4"
"github.com/decred/dcrd/txscript/v4/stdaddr"
"github.com/decred/dcrd/wire"
Expand Down
16 changes: 8 additions & 8 deletions client/asset/dcr/spv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import (
"decred.org/dcrdex/client/asset"
"decred.org/dcrdex/dex"
"decred.org/dcrdex/dex/encode"
walleterrors "decred.org/dcrwallet/v2/errors"
"decred.org/dcrwallet/v2/p2p"
walletjson "decred.org/dcrwallet/v2/rpc/jsonrpc/types"
"decred.org/dcrwallet/v2/wallet"
"decred.org/dcrwallet/v2/wallet/udb"
"github.com/decred/dcrd/blockchain/stake/v4"
walleterrors "decred.org/dcrwallet/v3/errors"
"decred.org/dcrwallet/v3/p2p"
walletjson "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
"decred.org/dcrwallet/v3/wallet"
"decred.org/dcrwallet/v3/wallet/udb"
"github.com/decred/dcrd/blockchain/stake/v5"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/gcs/v3"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v3"
"github.com/decred/dcrd/gcs/v4"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/txscript/v4"
"github.com/decred/dcrd/txscript/v4/stdaddr"
"github.com/decred/dcrd/wire"
Expand Down
4 changes: 2 additions & 2 deletions client/asset/dcr/wallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (

"decred.org/dcrdex/client/asset"
"decred.org/dcrdex/dex"
walletjson "decred.org/dcrwallet/v2/rpc/jsonrpc/types"
walletjson "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v3"
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/txscript/v4/stdaddr"
"github.com/decred/dcrd/wire"
)
Expand Down
2 changes: 1 addition & 1 deletion client/asset/zec/regnet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"decred.org/dcrdex/dex"
"decred.org/dcrdex/dex/config"
dexzec "decred.org/dcrdex/dex/networks/zec"
"github.com/decred/dcrd/rpcclient/v7"
"github.com/decred/dcrd/rpcclient/v8"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion client/webserver/site/dist/entry.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/webserver/site/dist/entry.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/webserver/site/dist/style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/webserver/site/dist/style.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dex/networks/dcr/script.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"decred.org/dcrdex/dex"
"decred.org/dcrdex/server/account"
"decred.org/dcrwallet/v2/wallet/txsizes"
"decred.org/dcrwallet/v3/wallet/txsizes"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrec"
"github.com/decred/dcrd/dcrutil/v4"
Expand Down
2 changes: 1 addition & 1 deletion dex/networks/ltc/block_online_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/btcsuite/btcd/btcjson"
"github.com/decred/dcrd/chaincfg/chainhash" // just for the array type, not its methods
"github.com/decred/dcrd/rpcclient/v7"
"github.com/decred/dcrd/rpcclient/v8"
)

// TestOnlineDeserializeBlock attempts to deserialize every testnet4 LTC block
Expand Down
1 change: 1 addition & 0 deletions dex/testing/dcr/create-wallet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ cat >> "${WALLET_DIR}/${NAME}.conf" <<EOF
enablevoting=1
enableticketbuyer=1
ticketbuyer.limit=6
; NOTE: when regenerating the chain from genesis, might need to comment out this line:
ticketbuyer.balancetomaintainabsolute=1000
EOF
fi
Expand Down
9 changes: 3 additions & 6 deletions dex/testing/dcr/harness.sh
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,6 @@ if [ "$MINE" = "1" ]; then
echo "Mining 600 blocks on alpha"
echo "Mining blocks 0 through 99"
tmux send-keys -t $SESSION:0 "./mine-alpha 100${WAIT}" C-m\; wait-for donedcr

# Send beta some dough while we're here.
tmux send-keys -t $SESSION:0 "./alpha sendtoaddress ${BETA_MINING_ADDR} 1000${WAIT}" C-m\; wait-for donedcr

echo "Mining blocks 100 through 199"
tmux send-keys -t $SESSION:0 "./mine-alpha 100${WAIT}" C-m\; wait-for donedcr
echo "Mining blocks 200 through 299"
Expand All @@ -351,11 +347,12 @@ if [ "$MINE" = "1" ]; then
tmux send-keys -t $SESSION:0 "./mine-alpha 100${WAIT}" C-m\; wait-for donedcr
echo "Mining blocks 400 through 499"
tmux send-keys -t $SESSION:0 "./mine-alpha 100${WAIT}" C-m\; wait-for donedcr
# Don't stop here. There's a period of high ticket price where the avaialable
# balance for alpha is really low. Go to 600 to get through it.
echo "Mining blocks 500 through 599"
tmux send-keys -t $SESSION:0 "./mine-alpha 100${WAIT}" C-m\; wait-for donedcr

# Send beta some dough while we're here.
tmux send-keys -t $SESSION:0 "./alpha sendtoaddress ${BETA_MINING_ADDR} 1000${WAIT}" C-m\; wait-for donedcr

# Have alpha send some credits to the other wallets
for i in 10 18 5 7 1 15 3 25
do
Expand Down
Binary file modified dex/testing/dcr/harnesschain.tar.gz
Binary file not shown.
57 changes: 28 additions & 29 deletions dex/testing/loadbot/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ require (
)

require (
decred.org/cspp/v2 v2.0.0 // indirect
decred.org/dcrwallet/v2 v2.0.11 // indirect
decred.org/cspp/v2 v2.1.0 // indirect
decred.org/dcrwallet/v3 v3.0.1 // indirect
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
Expand Down Expand Up @@ -40,38 +40,37 @@ require (
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
github.com/cockroachdb/redact v1.1.3 // indirect
github.com/companyzero/sntrup4591761 v0.0.0-20200131011700-2b0d299dbd22 // indirect
github.com/companyzero/sntrup4591761 v0.0.0-20220309191932-9e0f3af2f07a // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/blake2b v1.0.0 // indirect
github.com/dchest/siphash v1.2.3 // indirect
github.com/dcrlabs/neutrino-bch v0.0.0-20221031001408-f296bfa9bd1c // indirect
github.com/dcrlabs/neutrino-ltc v0.0.0-20221031001456-55ef06cefead // indirect
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
github.com/decred/base58 v1.0.4 // indirect
github.com/decred/dcrd/addrmgr/v2 v2.0.1 // indirect
github.com/decred/dcrd/blockchain/stake/v4 v4.0.0 // indirect
github.com/decred/dcrd/blockchain/standalone/v2 v2.1.0 // indirect
github.com/decred/dcrd/blockchain/v4 v4.0.2 // indirect
github.com/decred/dcrd/certgen v1.1.1 // indirect
github.com/decred/dcrd/chaincfg/chainhash v1.0.3 // indirect
github.com/decred/dcrd/chaincfg/v3 v3.1.1 // indirect
github.com/decred/dcrd/connmgr/v3 v3.1.0 // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
github.com/decred/dcrd/crypto/ripemd160 v1.0.1 // indirect
github.com/decred/dcrd/database/v3 v3.0.0 // indirect
github.com/decred/dcrd/dcrec v1.0.0 // indirect
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/decred/dcrd/dcrjson/v4 v4.0.0 // indirect
github.com/decred/dcrd/dcrutil/v4 v4.0.0 // indirect
github.com/decred/dcrd/gcs/v3 v3.0.0 // indirect
github.com/decred/dcrd/hdkeychain/v3 v3.1.0 // indirect
github.com/decred/base58 v1.0.5 // indirect
github.com/decred/dcrd/addrmgr/v2 v2.0.2 // indirect
github.com/decred/dcrd/blockchain/stake/v5 v5.0.0 // indirect
github.com/decred/dcrd/blockchain/standalone/v2 v2.2.0 // indirect
github.com/decred/dcrd/certgen v1.1.2 // indirect
github.com/decred/dcrd/chaincfg/chainhash v1.0.4 // indirect
github.com/decred/dcrd/chaincfg/v3 v3.2.0 // indirect
github.com/decred/dcrd/connmgr/v3 v3.1.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/dcrec v1.0.1 // indirect
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/decred/dcrd/dcrjson/v4 v4.0.1 // indirect
github.com/decred/dcrd/dcrutil/v4 v4.0.1 // indirect
github.com/decred/dcrd/gcs/v4 v4.0.0 // indirect
github.com/decred/dcrd/hdkeychain/v3 v3.1.1 // indirect
github.com/decred/dcrd/lru v1.1.1 // indirect
github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0 // indirect
github.com/decred/dcrd/rpcclient/v7 v7.0.0 // indirect
github.com/decred/dcrd/txscript/v4 v4.0.0 // indirect
github.com/decred/dcrd/wire v1.5.0 // indirect
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.0.0 // indirect
github.com/decred/dcrd/rpcclient/v8 v8.0.0 // indirect
github.com/decred/dcrd/txscript/v4 v4.1.0 // indirect
github.com/decred/dcrd/wire v1.6.0 // indirect
github.com/decred/go-socks v1.1.0 // indirect
github.com/decred/slog v1.2.0 // indirect
github.com/dgraph-io/badger v1.6.2 // indirect
Expand Down Expand Up @@ -106,7 +105,7 @@ require (
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jrick/bitset v1.0.0 // indirect
github.com/jrick/logrotate v1.0.0 // indirect
github.com/jrick/wsrpc/v2 v2.3.4 // indirect
github.com/jrick/wsrpc/v2 v2.3.5 // indirect
github.com/kkdai/bstream v1.0.0 // indirect
github.com/klauspost/compress v1.15.15 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
Expand Down Expand Up @@ -158,7 +157,7 @@ require (
github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/zquestz/grab v0.0.0-20190224022517-abcee96e61b1 // indirect
go.etcd.io/bbolt v1.3.7-0.20220130032806-d5db64bdbfde // indirect
go.etcd.io/bbolt v1.3.7 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/net v0.8.0 // indirect
Expand All @@ -170,5 +169,5 @@ require (
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
lukechampine.com/blake3 v1.1.7 // indirect
lukechampine.com/blake3 v1.2.1 // indirect
)