From c2bdeb5ab7201460f155cad67f84d9ac99b7c9e5 Mon Sep 17 00:00:00 2001 From: Jonathan Chappelow Date: Thu, 16 Sep 2021 16:12:32 -0500 Subject: [PATCH] modules: handle auto-revocation agenda changes and update requires Use the new major versions: dcrjson/v4 and dcrec/secp256k1/v4. Update all other decred requires. This introduces a breaking change to stake.DetermineTxType, which now requires a third argument, a bool indicating if the auto-revocation agenda is active. We are able to say "false" always for this because post-activation revocations ADDS constraints, letting both types of revocations be detected. --- client/asset/btc/btc.go | 2 +- client/asset/dcr/dcr.go | 6 +- client/asset/dcr/dcr_test.go | 4 +- client/core/account.go | 2 +- client/core/bookie.go | 2 +- client/core/core.go | 4 +- client/core/core_test.go | 4 +- client/core/types.go | 4 +- client/db/test/dbtest.go | 2 +- client/db/types.go | 2 +- dex/networks/dcr/script_test.go | 2 +- go.mod | 35 +++++----- go.sum | 110 +++++++++++++++----------------- server/account/account.go | 2 +- server/account/pki/pki.go | 2 +- server/asset/btc/btc.go | 2 +- server/asset/dcr/dcr.go | 12 +++- server/asset/dcr/dcr_test.go | 6 +- server/asset/dcr/script.go | 6 +- server/auth/auth.go | 4 +- server/auth/auth_test.go | 4 +- server/cmd/dcrdex/key.go | 2 +- server/cmd/dcrdex/key_test.go | 2 +- server/cmd/dcrdex/main.go | 2 +- server/dex/dex.go | 4 +- server/market/routers_test.go | 4 +- server/swap/swap_test.go | 4 +- 27 files changed, 119 insertions(+), 116 deletions(-) diff --git a/client/asset/btc/btc.go b/client/asset/btc/btc.go index 19ec568880..ec17213ad9 100644 --- a/client/asset/btc/btc.go +++ b/client/asset/btc/btc.go @@ -30,7 +30,7 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/decred/dcrd/dcrjson/v3" // for dcrjson.RPCError returns from rpcclient + "github.com/decred/dcrd/dcrjson/v4" // for dcrjson.RPCError returns from rpcclient "github.com/decred/dcrd/rpcclient/v7" ) diff --git a/client/asset/dcr/dcr.go b/client/asset/dcr/dcr.go index 5ec10aeb4e..c0f2b3790e 100644 --- a/client/asset/dcr/dcr.go +++ b/client/asset/dcr/dcr.go @@ -30,9 +30,9 @@ import ( walletjson "decred.org/dcrwallet/v2/rpc/jsonrpc/types" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" - "github.com/decred/dcrd/dcrjson/v3" + "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" diff --git a/client/asset/dcr/dcr_test.go b/client/asset/dcr/dcr_test.go index eca90c4081..354d14c0db 100644 --- a/client/asset/dcr/dcr_test.go +++ b/client/asset/dcr/dcr_test.go @@ -25,8 +25,8 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" "github.com/decred/dcrd/dcrutil/v4" "github.com/decred/dcrd/gcs/v3" "github.com/decred/dcrd/gcs/v3/blockcf2" diff --git a/client/core/account.go b/client/core/account.go index 5467b0a5fe..7377f3b365 100644 --- a/client/core/account.go +++ b/client/core/account.go @@ -5,7 +5,7 @@ import ( "fmt" "decred.org/dcrdex/client/db" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" ) // AccountDisable is used to disable an account by given host and application diff --git a/client/core/bookie.go b/client/core/bookie.go index 43fc3b3da8..e5ab296ede 100644 --- a/client/core/bookie.go +++ b/client/core/bookie.go @@ -16,7 +16,7 @@ import ( "decred.org/dcrdex/dex/encode" "decred.org/dcrdex/dex/msgjson" "decred.org/dcrdex/dex/order" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" ) var ( diff --git a/client/core/core.go b/client/core/core.go index 646a39cb24..c407e6a165 100644 --- a/client/core/core.go +++ b/client/core/core.go @@ -35,8 +35,8 @@ import ( "decred.org/dcrdex/dex/wait" "decred.org/dcrdex/server/account" serverdex "decred.org/dcrdex/server/dex" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" "github.com/decred/go-socks/socks" "golang.org/x/text/language" "golang.org/x/text/message" diff --git a/client/core/core_test.go b/client/core/core_test.go index b9726f9569..341c669452 100644 --- a/client/core/core_test.go +++ b/client/core/core_test.go @@ -41,8 +41,8 @@ import ( "decred.org/dcrdex/server/account" serverdex "decred.org/dcrdex/server/dex" "github.com/decred/dcrd/crypto/blake256" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" "golang.org/x/text/language" "golang.org/x/text/message" ) diff --git a/client/core/types.go b/client/core/types.go index 2fdfe56da2..16e1f650c4 100644 --- a/client/core/types.go +++ b/client/core/types.go @@ -18,8 +18,8 @@ import ( "decred.org/dcrdex/dex/encrypt" "decred.org/dcrdex/dex/order" "decred.org/dcrdex/server/account" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" "github.com/decred/dcrd/hdkeychain/v3" ) diff --git a/client/db/test/dbtest.go b/client/db/test/dbtest.go index c85cd2c3f9..d79447a36c 100644 --- a/client/db/test/dbtest.go +++ b/client/db/test/dbtest.go @@ -12,7 +12,7 @@ import ( "decred.org/dcrdex/client/asset" "decred.org/dcrdex/client/db" ordertest "decred.org/dcrdex/dex/order/test" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" ) // Generate a public key on the secp256k1 curve. diff --git a/client/db/types.go b/client/db/types.go index 3103c533f6..85c93bece1 100644 --- a/client/db/types.go +++ b/client/db/types.go @@ -16,7 +16,7 @@ import ( "decred.org/dcrdex/dex/config" "decred.org/dcrdex/dex/encode" "decred.org/dcrdex/dex/order" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" "golang.org/x/crypto/blake2s" ) diff --git a/dex/networks/dcr/script_test.go b/dex/networks/dcr/script_test.go index 9aea0d6ffc..67979e25b4 100644 --- a/dex/networks/dcr/script_test.go +++ b/dex/networks/dcr/script_test.go @@ -12,7 +12,7 @@ import ( "decred.org/dcrdex/dex" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" "github.com/decred/dcrd/dcrutil/v4" "github.com/decred/dcrd/txscript/v4" "github.com/decred/dcrd/txscript/v4/stdaddr" diff --git a/go.mod b/go.mod index 9b32d8dae1..414d667df6 100644 --- a/go.mod +++ b/go.mod @@ -3,28 +3,29 @@ module decred.org/dcrdex go 1.16 require ( - decred.org/dcrwallet/v2 v2.0.0-20210714172147-8815838443cd + decred.org/dcrwallet/v2 v2.0.0-20210913145543-714c2f555f04 github.com/btcsuite/btcd v0.20.1-beta.0.20200615134404-e4f59022a387 github.com/btcsuite/btcutil v1.0.2 github.com/davecgh/go-spew v1.1.1 - github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210715032435-c9521b468f95 - github.com/decred/dcrd/certgen v1.1.2-0.20210715032435-c9521b468f95 - github.com/decred/dcrd/chaincfg/chainhash v1.0.3-0.20210715032435-c9521b468f95 - github.com/decred/dcrd/chaincfg/v3 v3.0.1-0.20210715032435-c9521b468f95 - github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20210715032435-c9521b468f95 - github.com/decred/dcrd/dcrec v1.0.1-0.20210715032435-c9521b468f95 + github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210914193033-2efb9bda71fe + github.com/decred/dcrd/certgen v1.1.2-0.20210901152745-8830d9c9cdba + github.com/decred/dcrd/chaincfg/chainhash v1.0.3 + github.com/decred/dcrd/chaincfg/v3 v3.0.1-0.20210901152745-8830d9c9cdba + github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20210901152745-8830d9c9cdba + github.com/decred/dcrd/database/v3 v3.0.0-20210914193033-2efb9bda71fe // indirect + github.com/decred/dcrd/dcrec v1.0.1-0.20210901152745-8830d9c9cdba github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2-0.20210715032435-c9521b468f95 - github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0 - github.com/decred/dcrd/dcrjson/v3 v3.1.1-0.20210715032435-c9521b468f95 - github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210715032435-c9521b468f95 - github.com/decred/dcrd/gcs/v3 v3.0.0-20210715032435-c9521b468f95 - github.com/decred/dcrd/hdkeychain/v3 v3.0.1-0.20210715032435-c9521b468f95 - github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210715032435-c9521b468f95 - github.com/decred/dcrd/rpcclient/v7 v7.0.0-20210819154602-48627ee18c3d - github.com/decred/dcrd/txscript/v4 v4.0.0-20210715032435-c9521b468f95 - github.com/decred/dcrd/wire v1.4.1-0.20210715032435-c9521b468f95 + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0 + github.com/decred/dcrd/dcrjson/v4 v4.0.0 + github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210914193033-2efb9bda71fe + github.com/decred/dcrd/gcs/v3 v3.0.0-20210914193033-2efb9bda71fe + github.com/decred/dcrd/hdkeychain/v3 v3.0.1-0.20210901152745-8830d9c9cdba + github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210914193033-2efb9bda71fe + github.com/decred/dcrd/rpcclient/v7 v7.0.0-20210914193033-2efb9bda71fe + github.com/decred/dcrd/txscript/v4 v4.0.0-20210914193033-2efb9bda71fe + github.com/decred/dcrd/wire v1.4.1-0.20210901152745-8830d9c9cdba github.com/decred/go-socks v1.1.0 - github.com/decred/slog v1.1.0 + github.com/decred/slog v1.2.0 github.com/ethereum/go-ethereum v1.10.6 github.com/gcash/bchd v0.17.2-0.20201218180520-5708823e0e99 github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000 diff --git a/go.sum b/go.sum index 5d70ac7e4e..8aa00196d7 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,8 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= decred.org/cspp v0.3.0/go.mod h1:UygjYilC94dER3BEU65Zzyoqy9ngJfWCD2rdJqvUs2A= -decred.org/dcrwallet/v2 v2.0.0-20210714172147-8815838443cd h1:OH3040mHSNXg6QaJHaSZMCVDMhGbPsj8eQA4238y+VY= -decred.org/dcrwallet/v2 v2.0.0-20210714172147-8815838443cd/go.mod h1:LAgwapWfB+2PYS7NksrJXUyj/qvQdSUM4ZXmcpnov9o= +decred.org/dcrwallet/v2 v2.0.0-20210913145543-714c2f555f04 h1:1mt0CfpyS8z0AVyRCN4CXVFTgBRthH5jWtcB6q6OXoE= +decred.org/dcrwallet/v2 v2.0.0-20210913145543-714c2f555f04/go.mod h1:v7R6jLH7uF5Z3CoE0lnAYSb0Ph6iS367YSR5BcclVbo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= @@ -112,88 +112,82 @@ github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/decred/base58 v1.0.3 h1:KGZuh8d1WEMIrK0leQRM47W85KqCAdl2N+uagbctdDI= github.com/decred/base58 v1.0.3/go.mod h1:pXP9cXCfM2sFLb2viz2FNIdeMWmZDBKG3ZBYbiSM78E= -github.com/decred/dcrd/addrmgr/v2 v2.0.0-20210525214639-70483c835b7f/go.mod h1:VKxDZPQTcFkUhJjEsr+dcnExKlp8qdS4sUR5XUsonwg= +github.com/decred/dcrd/addrmgr/v2 v2.0.0-20210901152745-8830d9c9cdba/go.mod h1:pFpkgqaKOORZmZ+GwO719PaXqBvBqt5ATUbMQ3QgYl8= github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210129192908-660d0518b4cf/go.mod h1:zALtZt59lCrhoj6dVMptHHAMw1hq0Zz9s2ZULWjhtZs= github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210409183916-7f402345f0a6/go.mod h1:YtLRoqodBkyTSLNhr4bvLlkn/C24gIzwTG16gtvxVQo= -github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210525214639-70483c835b7f/go.mod h1:l0WWtO2D4lhDJDWjFPFClNDBJ5gp6CI5dfk9QsWS59Q= -github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210715032435-c9521b468f95 h1:y1XUDb5vPBcZB6A0AuGkaCk0my4FJOpYYKZtYKsq1mU= -github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210715032435-c9521b468f95/go.mod h1:l0WWtO2D4lhDJDWjFPFClNDBJ5gp6CI5dfk9QsWS59Q= +github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210901152745-8830d9c9cdba/go.mod h1:CStg0VQxxpVWphul8V3BtBOlhkkHfGE3CgwZK00xYwE= +github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210914193033-2efb9bda71fe h1:KUoG7npDcaZTcp6SSq85Os15FkIH9a0Sk11kTFWP1Gk= +github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210914193033-2efb9bda71fe/go.mod h1:CStg0VQxxpVWphul8V3BtBOlhkkHfGE3CgwZK00xYwE= github.com/decred/dcrd/blockchain/standalone/v2 v2.0.0/go.mod h1:t2qaZ3hNnxHZ5kzVJDgW5sp47/8T5hYJt7SR+/JtRhI= -github.com/decred/dcrd/blockchain/standalone/v2 v2.0.1-0.20210525214639-70483c835b7f/go.mod h1:t2qaZ3hNnxHZ5kzVJDgW5sp47/8T5hYJt7SR+/JtRhI= -github.com/decred/dcrd/blockchain/v4 v4.0.0-20210525214639-70483c835b7f/go.mod h1:9IU+i0k9FY68p7P21aFeOYSGTT4q87UxSLWb47NEegU= -github.com/decred/dcrd/certgen v1.1.2-0.20210525214639-70483c835b7f/go.mod h1:ivkPLChfjdAgFh7ZQOtl6kJRqVkfrCq67dlq3AbZBQE= -github.com/decred/dcrd/certgen v1.1.2-0.20210715032435-c9521b468f95 h1:ZGdWjeRWFdzKuckO0ONnyL5+oL+3+LGQyiU5+MZn8bA= -github.com/decred/dcrd/certgen v1.1.2-0.20210715032435-c9521b468f95/go.mod h1:ivkPLChfjdAgFh7ZQOtl6kJRqVkfrCq67dlq3AbZBQE= +github.com/decred/dcrd/blockchain/standalone/v2 v2.0.1-0.20210901152745-8830d9c9cdba/go.mod h1:t2qaZ3hNnxHZ5kzVJDgW5sp47/8T5hYJt7SR+/JtRhI= +github.com/decred/dcrd/blockchain/v4 v4.0.0-20210901152745-8830d9c9cdba/go.mod h1:DrP4/0VuweZtbGjT4+HVxsX+ETs8TTx3JIc5wfHykLE= +github.com/decred/dcrd/certgen v1.1.2-0.20210901152745-8830d9c9cdba h1:oI24XC4N6KKbiAkqGkKPlT5EwgFwZHjk613LpQayBPI= +github.com/decred/dcrd/certgen v1.1.2-0.20210901152745-8830d9c9cdba/go.mod h1:ivkPLChfjdAgFh7ZQOtl6kJRqVkfrCq67dlq3AbZBQE= github.com/decred/dcrd/chaincfg/chainhash v1.0.2/go.mod h1:BpbrGgrPTr3YJYRN3Bm+D9NuaFd+zGyNeIKgrhCXK60= -github.com/decred/dcrd/chaincfg/chainhash v1.0.3-0.20210525214639-70483c835b7f/go.mod h1:BpbrGgrPTr3YJYRN3Bm+D9NuaFd+zGyNeIKgrhCXK60= -github.com/decred/dcrd/chaincfg/chainhash v1.0.3-0.20210715032435-c9521b468f95 h1:801W72/mS4NEZMX6Aip/ZUdlOmwQ5I5H49yEQhicf8g= -github.com/decred/dcrd/chaincfg/chainhash v1.0.3-0.20210715032435-c9521b468f95/go.mod h1:BpbrGgrPTr3YJYRN3Bm+D9NuaFd+zGyNeIKgrhCXK60= +github.com/decred/dcrd/chaincfg/chainhash v1.0.3-0.20210901152745-8830d9c9cdba/go.mod h1:BpbrGgrPTr3YJYRN3Bm+D9NuaFd+zGyNeIKgrhCXK60= +github.com/decred/dcrd/chaincfg/chainhash v1.0.3 h1:PF2czcYZGW3dz4i/35AUfVAgnqHl9TMNQt1ADTYGOoE= +github.com/decred/dcrd/chaincfg/chainhash v1.0.3/go.mod h1:BpbrGgrPTr3YJYRN3Bm+D9NuaFd+zGyNeIKgrhCXK60= github.com/decred/dcrd/chaincfg/v3 v3.0.0/go.mod h1:EspyubQ7D2w6tjP7rBGDIE7OTbuMgBjR2F2kZFnh31A= -github.com/decred/dcrd/chaincfg/v3 v3.0.1-0.20210525214639-70483c835b7f/go.mod h1:EspyubQ7D2w6tjP7rBGDIE7OTbuMgBjR2F2kZFnh31A= -github.com/decred/dcrd/chaincfg/v3 v3.0.1-0.20210715032435-c9521b468f95 h1:oatUiI2bPxSvxXWYNFzjNmjvrVbOsi5PpA+x/+gWOKo= -github.com/decred/dcrd/chaincfg/v3 v3.0.1-0.20210715032435-c9521b468f95/go.mod h1:EspyubQ7D2w6tjP7rBGDIE7OTbuMgBjR2F2kZFnh31A= -github.com/decred/dcrd/connmgr/v3 v3.0.1-0.20210525214639-70483c835b7f/go.mod h1:cPI43Aggp1lOhrVG75eJ3c3BwuFx0NhT77FK34ky+ak= +github.com/decred/dcrd/chaincfg/v3 v3.0.1-0.20210901152745-8830d9c9cdba h1:l3RuL7ihGlM+9U9ZbhgQFbl5MSOYkRHmaBdTWfOhDXk= +github.com/decred/dcrd/chaincfg/v3 v3.0.1-0.20210901152745-8830d9c9cdba/go.mod h1:EspyubQ7D2w6tjP7rBGDIE7OTbuMgBjR2F2kZFnh31A= +github.com/decred/dcrd/connmgr/v3 v3.0.1-0.20210901152745-8830d9c9cdba/go.mod h1:cPI43Aggp1lOhrVG75eJ3c3BwuFx0NhT77FK34ky+ak= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= -github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20210525214639-70483c835b7f/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= -github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20210715032435-c9521b468f95 h1:c+f88eXG8bj65q+gvE5bHRo9hT6hVpWYJP3i+CVARb0= -github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20210715032435-c9521b468f95/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20210901152745-8830d9c9cdba h1:xeu3k+84zLOaK/jdM6StVS28M+iLIxgfi6a+Y/Jihsk= +github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20210901152745-8830d9c9cdba/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/crypto/ripemd160 v1.0.1/go.mod h1:F0H8cjIuWTRoixr/LM3REB8obcWkmYx0gbxpQWR8RPg= -github.com/decred/dcrd/crypto/ripemd160 v1.0.2-0.20210525214639-70483c835b7f h1:qwAogjvG779bHCWtKGLKphLUoJexLFsKMvTZaZBFUOo= -github.com/decred/dcrd/crypto/ripemd160 v1.0.2-0.20210525214639-70483c835b7f/go.mod h1:F0H8cjIuWTRoixr/LM3REB8obcWkmYx0gbxpQWR8RPg= +github.com/decred/dcrd/crypto/ripemd160 v1.0.2-0.20210901152745-8830d9c9cdba h1:Jv2ENh9AxouG058q/VHHjdrVd9ULnAsv4kURTNssTSY= +github.com/decred/dcrd/crypto/ripemd160 v1.0.2-0.20210901152745-8830d9c9cdba/go.mod h1:F0H8cjIuWTRoixr/LM3REB8obcWkmYx0gbxpQWR8RPg= github.com/decred/dcrd/database/v2 v2.0.3-0.20210129190127-4ebd135a82f1/go.mod h1:C5nb1qImTy2sxAfV1KJFW6KHae+NbD6lSMJl58KY7XM= -github.com/decred/dcrd/database/v2 v2.0.3-0.20210514034330-bdccd3e3f7b0/go.mod h1:s9pAcB39CeM0vWQU1qor3AO6d9JdC3H2Ve9W+BP5i4g= -github.com/decred/dcrd/database/v2 v2.0.3-0.20210525214639-70483c835b7f h1:NoM9oJmPRbG+5ASB3r8AoO0Apx8HShOHnSVo8CDiSLQ= -github.com/decred/dcrd/database/v2 v2.0.3-0.20210525214639-70483c835b7f/go.mod h1:s9pAcB39CeM0vWQU1qor3AO6d9JdC3H2Ve9W+BP5i4g= +github.com/decred/dcrd/database/v3 v3.0.0-20210802132946-9ede6ae83e0f/go.mod h1:3WUAfz3R0FOz6wJcqTZ0CcUDfyIMrlO10f3aqa2/7vk= +github.com/decred/dcrd/database/v3 v3.0.0-20210914193033-2efb9bda71fe h1:8jMoLB3AL8OYSIAek4SHo/OAHZMz3QH9EmbqIYXfr0U= +github.com/decred/dcrd/database/v3 v3.0.0-20210914193033-2efb9bda71fe/go.mod h1:3WUAfz3R0FOz6wJcqTZ0CcUDfyIMrlO10f3aqa2/7vk= github.com/decred/dcrd/dcrec v1.0.0/go.mod h1:HIaqbEJQ+PDzQcORxnqen5/V1FR3B4VpIfmePklt8Q8= -github.com/decred/dcrd/dcrec v1.0.1-0.20210525214639-70483c835b7f/go.mod h1:HIaqbEJQ+PDzQcORxnqen5/V1FR3B4VpIfmePklt8Q8= -github.com/decred/dcrd/dcrec v1.0.1-0.20210715032435-c9521b468f95 h1:oUdiAFEgHYK4mGN/5WQEz1C5ZBcctfpFVGUa3YedwoA= -github.com/decred/dcrd/dcrec v1.0.1-0.20210715032435-c9521b468f95/go.mod h1:HIaqbEJQ+PDzQcORxnqen5/V1FR3B4VpIfmePklt8Q8= +github.com/decred/dcrd/dcrec v1.0.1-0.20210901152745-8830d9c9cdba h1:x1ti3P9WMqjxyh7K36OxUNhlhmWFZq6bOICeSB4OslA= +github.com/decred/dcrd/dcrec v1.0.1-0.20210901152745-8830d9c9cdba/go.mod h1:mIVCrTyD2BEUoie2drr/KAGNvjJCHwf01I0ZCkVQu6c= github.com/decred/dcrd/dcrec/edwards/v2 v2.0.1/go.mod h1:d0H8xGMWbiIQP7gN3v2rByWUcuZPm9YsgmnfoxgbINc= -github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2-0.20210525214639-70483c835b7f/go.mod h1:d0H8xGMWbiIQP7gN3v2rByWUcuZPm9YsgmnfoxgbINc= github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2-0.20210715032435-c9521b468f95 h1:QiK8Emx0TKDC7Dc8p+Pibvy+Ifq1FSXXKH3AelYq7sA= github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2-0.20210715032435-c9521b468f95/go.mod h1:d0H8xGMWbiIQP7gN3v2rByWUcuZPm9YsgmnfoxgbINc= -github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0 h1:sgNeV1VRMDzs6rzyPpxyM0jp317hnwiq58Filgag2xw= -github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0/go.mod h1:J70FGZSbzsjecRTiTzER+3f1KZLNaXkuv+yeFTKoxM8= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210127014238-b33b46cf1a24/go.mod h1:UkVqoxmJlLgUvBjJD+GdJz6mgdSdf3UjX83xfwUAYDk= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210525214639-70483c835b7f h1:oeFo4bqTaJhyqsPeqkzS+iRCosTntQWac9PzATpUF04= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210525214639-70483c835b7f/go.mod h1:UkVqoxmJlLgUvBjJD+GdJz6mgdSdf3UjX83xfwUAYDk= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210901152745-8830d9c9cdba/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0 h1:Fe5DW39aaoS/fqZiYlylEqQWIKznnbatWSHpWdFA3oQ= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/decred/dcrd/dcrjson/v3 v3.1.0/go.mod h1:fnTHev/ABGp8IxFudDhjGi9ghLiXRff1qZz/wvq12Mg= -github.com/decred/dcrd/dcrjson/v3 v3.1.1-0.20210525214639-70483c835b7f/go.mod h1:fnTHev/ABGp8IxFudDhjGi9ghLiXRff1qZz/wvq12Mg= -github.com/decred/dcrd/dcrjson/v3 v3.1.1-0.20210715032435-c9521b468f95 h1:QjXca7CAuf0yNRtyPHdLdZ8FJG5gXlwEYx5ET0zT0sQ= -github.com/decred/dcrd/dcrjson/v3 v3.1.1-0.20210715032435-c9521b468f95/go.mod h1:fnTHev/ABGp8IxFudDhjGi9ghLiXRff1qZz/wvq12Mg= +github.com/decred/dcrd/dcrjson/v3 v3.1.1-0.20210901152745-8830d9c9cdba h1:bs4KIALqsVsWyoJ3DgQkmp8kheESSuKJHMprmkBrorI= +github.com/decred/dcrd/dcrjson/v3 v3.1.1-0.20210901152745-8830d9c9cdba/go.mod h1:fnTHev/ABGp8IxFudDhjGi9ghLiXRff1qZz/wvq12Mg= +github.com/decred/dcrd/dcrjson/v4 v4.0.0 h1:KsaFhHAYO+vLYz7Qmx/fs1gOY5ouTEz8hRuDm8jmJtU= +github.com/decred/dcrd/dcrjson/v4 v4.0.0/go.mod h1:DMnSpU8lsVh+Nt5kHl63tkrjBDA7UIs4+ov8Kwwgvjs= github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210129181600-6ae0142d3b28/go.mod h1:xe59jKcMx5G/dbRmsZ8+FzY+WQDE/7YBP3k3uzJTtmI= -github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210525214639-70483c835b7f/go.mod h1:16XDlrGxq3sQd9YwzydmZUA/ojnP0MTJiYRt/7cpjrE= -github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210715032435-c9521b468f95 h1:x4DUbIq6wDfmX2M0EamuoOOpjGBEoUNWXEb/v8l5Es0= -github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210715032435-c9521b468f95/go.mod h1:16XDlrGxq3sQd9YwzydmZUA/ojnP0MTJiYRt/7cpjrE= +github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210901152745-8830d9c9cdba/go.mod h1:9SBpuzWthriVnxKeHm2Dh5jSPKq51q1rvgqac/+kgMI= +github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210914193033-2efb9bda71fe h1:iN8TZ+Mv0hLbBDHU4UggCg+f0adNlRtuik+kel8are4= +github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210914193033-2efb9bda71fe/go.mod h1:9SBpuzWthriVnxKeHm2Dh5jSPKq51q1rvgqac/+kgMI= github.com/decred/dcrd/gcs/v3 v3.0.0-20210129195202-a4265d63b619/go.mod h1:aGuAajYbDJB2oal17G371wiosGgVCc5d5FlT2EwZtoE= -github.com/decred/dcrd/gcs/v3 v3.0.0-20210525214639-70483c835b7f/go.mod h1:LFTyj3BaDsYioc/4QVUY5Wfkk+JjTu9MQB8Q6U9sC4I= -github.com/decred/dcrd/gcs/v3 v3.0.0-20210715032435-c9521b468f95 h1:9Aa61bmQ62hovsBsA/gJvnZEfeygxf6rYXYFMDCLYr0= -github.com/decred/dcrd/gcs/v3 v3.0.0-20210715032435-c9521b468f95/go.mod h1:LFTyj3BaDsYioc/4QVUY5Wfkk+JjTu9MQB8Q6U9sC4I= -github.com/decred/dcrd/hdkeychain/v3 v3.0.1-0.20210525214639-70483c835b7f/go.mod h1:A9Aqp4kStmkAwbZeuIlS1hZjTeDkxgVXSg+nSo4FJCs= -github.com/decred/dcrd/hdkeychain/v3 v3.0.1-0.20210715032435-c9521b468f95 h1:1RQbVRX/Si9OB2zb8VkB9bL40BVow+hQAjgsu8LNPRY= -github.com/decred/dcrd/hdkeychain/v3 v3.0.1-0.20210715032435-c9521b468f95/go.mod h1:A9Aqp4kStmkAwbZeuIlS1hZjTeDkxgVXSg+nSo4FJCs= +github.com/decred/dcrd/gcs/v3 v3.0.0-20210901152745-8830d9c9cdba/go.mod h1:SLlU9PRSMFL4jdAMGZ3m7smAZEbeboDwNOr3BOj4BjY= +github.com/decred/dcrd/gcs/v3 v3.0.0-20210914193033-2efb9bda71fe h1:o04eymmi2LReTF4H1q/fhuc5SpiBI3OLzKZGo3kVJ0I= +github.com/decred/dcrd/gcs/v3 v3.0.0-20210914193033-2efb9bda71fe/go.mod h1:SLlU9PRSMFL4jdAMGZ3m7smAZEbeboDwNOr3BOj4BjY= +github.com/decred/dcrd/hdkeychain/v3 v3.0.1-0.20210901152745-8830d9c9cdba h1:Coro49F65Ym8mUEpRzDKzLWixNnrR4+MHzKfUi50tYc= +github.com/decred/dcrd/hdkeychain/v3 v3.0.1-0.20210901152745-8830d9c9cdba/go.mod h1:A9Aqp4kStmkAwbZeuIlS1hZjTeDkxgVXSg+nSo4FJCs= github.com/decred/dcrd/lru v1.1.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210129200153-14fd1a785bf2/go.mod h1:9izQEJ5wU0ZwYHESMaaOIvE6H6y3IvDsQL3ByYGn9oc= -github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210525214639-70483c835b7f/go.mod h1:9izQEJ5wU0ZwYHESMaaOIvE6H6y3IvDsQL3ByYGn9oc= -github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210715032435-c9521b468f95 h1:+sKcEQYVoc0xZ4eaD1NT+u5KUvkUlrJ5THydWNmi1OQ= -github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210715032435-c9521b468f95/go.mod h1:9izQEJ5wU0ZwYHESMaaOIvE6H6y3IvDsQL3ByYGn9oc= -github.com/decred/dcrd/rpcclient/v7 v7.0.0-20210819154602-48627ee18c3d h1:GTxOteWdXV/aFXJFWhnB+lWbjoipG8PhcEsyF2Xdo3Q= -github.com/decred/dcrd/rpcclient/v7 v7.0.0-20210819154602-48627ee18c3d/go.mod h1:McAn73oY1SeAVUBQAlkjFivR67oTcoJqWsjWalRFxmo= +github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210901152745-8830d9c9cdba/go.mod h1:9izQEJ5wU0ZwYHESMaaOIvE6H6y3IvDsQL3ByYGn9oc= +github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210914193033-2efb9bda71fe h1:eXFrAJ3A1AKciOicqz6YsXHBGZTBQtHe7h1HqVNAwq0= +github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210914193033-2efb9bda71fe/go.mod h1:PIaKghQZNa5mbwCN+app8xPjK/5BHf6qpj3Svth5qLI= +github.com/decred/dcrd/rpcclient/v7 v7.0.0-20210914193033-2efb9bda71fe h1:BLM6aLwwdZf6Wfa5xT3f5RWlD61x2MZH8BWD0rwF0FQ= +github.com/decred/dcrd/rpcclient/v7 v7.0.0-20210914193033-2efb9bda71fe/go.mod h1:rA8pGrf5+9Ag+oJeAQolhkTtMwxudbhkYqe7j6aGTDE= github.com/decred/dcrd/txscript/v4 v4.0.0-20210129190127-4ebd135a82f1/go.mod h1:EnS4vtxTESoI59geLo9M8AUOvIprJy+O4gSVsQp6/h4= github.com/decred/dcrd/txscript/v4 v4.0.0-20210330065944-a2366e6e0b3b/go.mod h1:G6b6ERb4KkSqMOCcfSS6m5QV2dgXKVohRpK0HEECw5Q= github.com/decred/dcrd/txscript/v4 v4.0.0-20210415215133-96b98390a9a9/go.mod h1:LBGwMZRfpS50huRsc0Bihy7w2Sl9vK3TNqv8nhCRj0U= -github.com/decred/dcrd/txscript/v4 v4.0.0-20210525214639-70483c835b7f/go.mod h1:LBGwMZRfpS50huRsc0Bihy7w2Sl9vK3TNqv8nhCRj0U= -github.com/decred/dcrd/txscript/v4 v4.0.0-20210715032435-c9521b468f95 h1:jrX+he7ZZPZGVY0arVnKYIMcLEItjclrPNLwClAcoZQ= -github.com/decred/dcrd/txscript/v4 v4.0.0-20210715032435-c9521b468f95/go.mod h1:LBGwMZRfpS50huRsc0Bihy7w2Sl9vK3TNqv8nhCRj0U= +github.com/decred/dcrd/txscript/v4 v4.0.0-20210901152745-8830d9c9cdba/go.mod h1:2SlEW/rXtGK1mImNUwONANCRuKuYY+J/qHzwp2wzyRc= +github.com/decred/dcrd/txscript/v4 v4.0.0-20210914193033-2efb9bda71fe h1:4rHewRU0nyOmHuYLpyL+jzdCTFOBhBRNg8qhKInQuJM= +github.com/decred/dcrd/txscript/v4 v4.0.0-20210914193033-2efb9bda71fe/go.mod h1:2SlEW/rXtGK1mImNUwONANCRuKuYY+J/qHzwp2wzyRc= github.com/decred/dcrd/wire v1.3.0/go.mod h1:fnKGlUY2IBuqnpxx5dYRU5Oiq392OBqAuVjRVSkIoXM= github.com/decred/dcrd/wire v1.4.0/go.mod h1:WxC/0K+cCAnBh+SKsRjIX9YPgvrjhmE+6pZlel1G7Ro= -github.com/decred/dcrd/wire v1.4.1-0.20210525214639-70483c835b7f/go.mod h1:WxC/0K+cCAnBh+SKsRjIX9YPgvrjhmE+6pZlel1G7Ro= -github.com/decred/dcrd/wire v1.4.1-0.20210715032435-c9521b468f95 h1:r2dpreG9/E1/XkrRuk8sYSeVRTVSOcP0/MFbQsvB1ss= -github.com/decred/dcrd/wire v1.4.1-0.20210715032435-c9521b468f95/go.mod h1:WxC/0K+cCAnBh+SKsRjIX9YPgvrjhmE+6pZlel1G7Ro= +github.com/decred/dcrd/wire v1.4.1-0.20210901152745-8830d9c9cdba h1:hamC+kbHSDxywT7TU77nzZpRGG5SmnNAhcdVc2nKScQ= +github.com/decred/dcrd/wire v1.4.1-0.20210901152745-8830d9c9cdba/go.mod h1:fzAjVqw32LkbAZIt5mnrvBR751GTa3e0rRQdOIhPY3w= github.com/decred/go-socks v1.1.0 h1:dnENcc0KIqQo3HSXdgboXAHgqsCIutkqq6ntQjYtm2U= github.com/decred/go-socks v1.1.0/go.mod h1:sDhHqkZH0X4JjSa02oYOGhcGHYp12FsY1jQ/meV8md0= -github.com/decred/slog v1.1.0 h1:uz5ZFfmaexj1rEDgZvzQ7wjGkoSPjw2LCh8K+K1VrW4= github.com/decred/slog v1.1.0/go.mod h1:kVXlGnt6DHy2fV5OjSeuvCJ0OmlmTF6LFpEPMu/fOY0= +github.com/decred/slog v1.2.0 h1:soHAxV52B54Di3WtKLfPum9OFfWqwtf/ygf9njdfnPM= +github.com/decred/slog v1.2.0/go.mod h1:kVXlGnt6DHy2fV5OjSeuvCJ0OmlmTF6LFpEPMu/fOY0= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= diff --git a/server/account/account.go b/server/account/account.go index a6dbe2159a..97e7e19479 100644 --- a/server/account/account.go +++ b/server/account/account.go @@ -12,7 +12,7 @@ import ( "decred.org/dcrdex/server/account/pki" "github.com/decred/dcrd/crypto/blake256" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" ) var ( diff --git a/server/account/pki/pki.go b/server/account/pki/pki.go index d4261f434a..30f19b6918 100644 --- a/server/account/pki/pki.go +++ b/server/account/pki/pki.go @@ -3,7 +3,7 @@ package pki -import "github.com/decred/dcrd/dcrec/secp256k1/v3" +import "github.com/decred/dcrd/dcrec/secp256k1/v4" type PrivateKey = secp256k1.PrivateKey diff --git a/server/asset/btc/btc.go b/server/asset/btc/btc.go index 123e87a787..bf7053b010 100644 --- a/server/asset/btc/btc.go +++ b/server/asset/btc/btc.go @@ -24,7 +24,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/decred/dcrd/dcrjson/v3" // for dcrjson.RPCError returns from rpcclient + "github.com/decred/dcrd/dcrjson/v4" // for dcrjson.RPCError returns from rpcclient "github.com/decred/dcrd/rpcclient/v7" ) diff --git a/server/asset/dcr/dcr.go b/server/asset/dcr/dcr.go index aad8aee914..9852a049a9 100644 --- a/server/asset/dcr/dcr.go +++ b/server/asset/dcr/dcr.go @@ -22,7 +22,7 @@ import ( "decred.org/dcrdex/server/asset" "github.com/decred/dcrd/blockchain/stake/v4" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrjson/v3" + "github.com/decred/dcrd/dcrjson/v4" "github.com/decred/dcrd/dcrutil/v4" "github.com/decred/dcrd/hdkeychain/v3" chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v3" @@ -994,6 +994,8 @@ func (dcr *Backend) getTxOutInfo(ctx context.Context, txHash *chainhash.Hash, vo return txOut, verboseTx, pkScript, nil } +// determineTxTree determines if the transaction is in the regular transaction +// tree (wire.TxTreeRegular) or the stake tree (wire.TxTreeStake). 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 @@ -1005,7 +1007,13 @@ func determineTxTree(msgTx *wire.MsgTx) int8 { // as a stake transaction, then we infer regular, but that isn't necessary // as explained above. isTreasuryEnabled := true - if stake.DetermineTxType(msgTx, isTreasuryEnabled) != stake.TxTypeRegular { + // 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 { return wire.TxTreeStake } return wire.TxTreeRegular diff --git a/server/asset/dcr/dcr_test.go b/server/asset/dcr/dcr_test.go index b4aaa66184..bc1c597f2b 100644 --- a/server/asset/dcr/dcr_test.go +++ b/server/asset/dcr/dcr_test.go @@ -24,9 +24,9 @@ import ( "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" - "github.com/decred/dcrd/dcrec/secp256k1/v3/schnorr" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4/schnorr" "github.com/decred/dcrd/dcrutil/v4" "github.com/decred/dcrd/hdkeychain/v3" chainjson "github.com/decred/dcrd/rpc/jsonrpc/types/v3" diff --git a/server/asset/dcr/script.go b/server/asset/dcr/script.go index fc0e9cc784..ad14069b2a 100644 --- a/server/asset/dcr/script.go +++ b/server/asset/dcr/script.go @@ -8,9 +8,9 @@ import ( "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" - "github.com/decred/dcrd/dcrec/secp256k1/v3/schnorr" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4/schnorr" ) // checkSig checks the signature against the pubkey and message. diff --git a/server/auth/auth.go b/server/auth/auth.go index 342fe9d67e..53b7e32d17 100644 --- a/server/auth/auth.go +++ b/server/auth/auth.go @@ -20,8 +20,8 @@ import ( "decred.org/dcrdex/server/asset" "decred.org/dcrdex/server/comms" "decred.org/dcrdex/server/db" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" ) const ( diff --git a/server/auth/auth_test.go b/server/auth/auth_test.go index 9ea861cfc9..9751d9f1ad 100644 --- a/server/auth/auth_test.go +++ b/server/auth/auth_test.go @@ -23,8 +23,8 @@ import ( "decred.org/dcrdex/server/account" "decred.org/dcrdex/server/comms" "decred.org/dcrdex/server/db" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" ) func noop() {} diff --git a/server/cmd/dcrdex/key.go b/server/cmd/dcrdex/key.go index eaae9f4d2b..1e1231ae6c 100644 --- a/server/cmd/dcrdex/key.go +++ b/server/cmd/dcrdex/key.go @@ -9,7 +9,7 @@ import ( "decred.org/dcrdex/dex/encode" "decred.org/dcrdex/dex/encrypt" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" ) func dexKey(path string, pass []byte) (*secp256k1.PrivateKey, error) { diff --git a/server/cmd/dcrdex/key_test.go b/server/cmd/dcrdex/key_test.go index dc10bdb695..08ebf89577 100644 --- a/server/cmd/dcrdex/key_test.go +++ b/server/cmd/dcrdex/key_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" ) func Test_createAndStoreKey(t *testing.T) { diff --git a/server/cmd/dcrdex/main.go b/server/cmd/dcrdex/main.go index c11a1baf85..10576a98a5 100644 --- a/server/cmd/dcrdex/main.go +++ b/server/cmd/dcrdex/main.go @@ -24,7 +24,7 @@ import ( _ "decred.org/dcrdex/server/asset/eth" // register eth asset _ "decred.org/dcrdex/server/asset/ltc" // register ltc asset dexsrv "decred.org/dcrdex/server/dex" - "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v4" ) func mainCore(ctx context.Context) error { diff --git a/server/dex/dex.go b/server/dex/dex.go index f31c433c75..1e76591774 100644 --- a/server/dex/dex.go +++ b/server/dex/dex.go @@ -27,8 +27,8 @@ import ( "decred.org/dcrdex/server/db/driver/pg" "decred.org/dcrdex/server/market" "decred.org/dcrdex/server/swap" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" ) const ( diff --git a/server/market/routers_test.go b/server/market/routers_test.go index 496e22dede..b1da7016da 100644 --- a/server/market/routers_test.go +++ b/server/market/routers_test.go @@ -26,8 +26,8 @@ import ( "decred.org/dcrdex/server/db" "decred.org/dcrdex/server/matcher" "decred.org/dcrdex/server/swap" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" "github.com/decred/slog" ) diff --git a/server/swap/swap_test.go b/server/swap/swap_test.go index 6afcef499f..3289f44ac8 100644 --- a/server/swap/swap_test.go +++ b/server/swap/swap_test.go @@ -30,8 +30,8 @@ import ( "decred.org/dcrdex/server/comms" "decred.org/dcrdex/server/db" "decred.org/dcrdex/server/matcher" - "github.com/decred/dcrd/dcrec/secp256k1/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v3/ecdsa" + "github.com/decred/dcrd/dcrec/secp256k1/v4" + "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" ) const (