diff --git a/blockchain/compress.go b/blockchain/compress.go index 56f84b14..3f5450ee 100644 --- a/blockchain/compress.go +++ b/blockchain/compress.go @@ -1,5 +1,5 @@ // Copyright (c) 2015-2016 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -9,7 +9,7 @@ import ( "fmt" "github.com/decred/dcrd/blockchain/stake/v3" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/txscript/v3" ) diff --git a/blockchain/fullblocktests/generate.go b/blockchain/fullblocktests/generate.go index a47a04a8..3ed7c7fb 100644 --- a/blockchain/fullblocktests/generate.go +++ b/blockchain/fullblocktests/generate.go @@ -1,5 +1,5 @@ // Copyright (c) 2016 The btcsuite developers -// Copyright (c) 2016-2019 The Decred developers +// Copyright (c) 2016-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -18,7 +18,7 @@ import ( "github.com/decred/dcrd/blockchain/v3/chaingen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/txscript/v3" "github.com/decred/dcrd/wire" diff --git a/blockchain/go.mod b/blockchain/go.mod index 49aaf307..9c161a66 100644 --- a/blockchain/go.mod +++ b/blockchain/go.mod @@ -9,7 +9,7 @@ require ( github.com/decred/dcrd/chaincfg/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/database/v2 v2.0.1 github.com/decred/dcrd/dcrec v1.0.0 - github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 + github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/dcrutil/v3 v3.0.0-20200104000002-54b67d3474fb github.com/decred/dcrd/gcs/v2 v2.0.0 github.com/decred/dcrd/txscript/v3 v3.0.0-20200104000002-54b67d3474fb @@ -20,6 +20,7 @@ require ( replace ( github.com/decred/dcrd/blockchain/stake/v3 => ./stake github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil github.com/decred/dcrd/txscript/v3 => ../txscript ) diff --git a/blockchain/stake/go.mod b/blockchain/stake/go.mod index 4d13aabc..d7af444c 100644 --- a/blockchain/stake/go.mod +++ b/blockchain/stake/go.mod @@ -15,6 +15,7 @@ require ( replace ( github.com/decred/dcrd/chaincfg/v3 => ../../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../../dcrutil github.com/decred/dcrd/txscript/v3 => ../../txscript ) diff --git a/database/go.mod b/database/go.mod index 46848d55..82a1e64a 100644 --- a/database/go.mod +++ b/database/go.mod @@ -19,5 +19,6 @@ require ( replace ( github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil ) diff --git a/dcrec/secp256k1/example_test.go b/dcrec/secp256k1/example_test.go index 713a4a47..43676fbf 100644 --- a/dcrec/secp256k1/example_test.go +++ b/dcrec/secp256k1/example_test.go @@ -1,5 +1,5 @@ // Copyright (c) 2014 The btcsuite developers -// Copyright (c) 2015-2016 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -10,7 +10,7 @@ import ( "fmt" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // This example demonstrates signing a message with a secp256k1 private key that diff --git a/dcrec/secp256k1/genprecomps.go b/dcrec/secp256k1/genprecomps.go index 9dd48349..f57a17e8 100644 --- a/dcrec/secp256k1/genprecomps.go +++ b/dcrec/secp256k1/genprecomps.go @@ -1,5 +1,5 @@ // Copyright 2015 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -18,7 +18,7 @@ import ( "log" "os" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) func main() { @@ -43,6 +43,7 @@ func main() { base64.StdEncoding.Encode(encoded, compressed.Bytes()) fmt.Fprintln(fi, "// Copyright (c) 2015 The btcsuite developers") + fmt.Fprintln(fi, "// Copyright (c) 2015-2020 The Decred developers") fmt.Fprintln(fi, "// Use of this source code is governed by an ISC") fmt.Fprintln(fi, "// license that can be found in the LICENSE file.") fmt.Fprintln(fi) diff --git a/dcrec/secp256k1/go.mod b/dcrec/secp256k1/go.mod index 916d8e98..3b26f3b2 100644 --- a/dcrec/secp256k1/go.mod +++ b/dcrec/secp256k1/go.mod @@ -1,4 +1,4 @@ -module github.com/decred/dcrd/dcrec/secp256k1/v2 +module github.com/decred/dcrd/dcrec/secp256k1/v3 go 1.11 diff --git a/dcrec/secp256k1/schnorr/ecdsa.go b/dcrec/secp256k1/schnorr/ecdsa.go index 2fe9d9ea..a5c9dff6 100644 --- a/dcrec/secp256k1/schnorr/ecdsa.go +++ b/dcrec/secp256k1/schnorr/ecdsa.go @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -12,7 +12,7 @@ import ( "math/big" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // scalarSize is the size of an encoded big endian scalar. diff --git a/dcrec/secp256k1/schnorr/ecdsa_test.go b/dcrec/secp256k1/schnorr/ecdsa_test.go index 8e48ec18..bb031246 100644 --- a/dcrec/secp256k1/schnorr/ecdsa_test.go +++ b/dcrec/secp256k1/schnorr/ecdsa_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -11,7 +11,7 @@ import ( "testing" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) type SchnorrSigningTestVectorHex struct { diff --git a/dcrec/secp256k1/schnorr/pubkey.go b/dcrec/secp256k1/schnorr/pubkey.go index 70bfba0a..2a46ee80 100644 --- a/dcrec/secp256k1/schnorr/pubkey.go +++ b/dcrec/secp256k1/schnorr/pubkey.go @@ -1,5 +1,5 @@ // Copyright (c) 2013-2014 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -8,7 +8,7 @@ package schnorr import ( "fmt" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // These constants define the lengths of serialized public keys. diff --git a/dcrec/secp256k1/schnorr/signature.go b/dcrec/secp256k1/schnorr/signature.go index d1ef4698..74074f80 100644 --- a/dcrec/secp256k1/schnorr/signature.go +++ b/dcrec/secp256k1/schnorr/signature.go @@ -1,5 +1,5 @@ // Copyright (c) 2013-2014 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -10,7 +10,7 @@ import ( "math/big" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // Signature is a type representing a Schnorr signature. diff --git a/dcrec/secp256k1/schnorr/threshold.go b/dcrec/secp256k1/schnorr/threshold.go index 9d8dca94..e010d242 100644 --- a/dcrec/secp256k1/schnorr/threshold.go +++ b/dcrec/secp256k1/schnorr/threshold.go @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -8,7 +8,7 @@ import ( "fmt" "math/big" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // Sha256VersionStringRFC6979 is the RFC6979 nonce version for a Schnorr signature diff --git a/dcrec/secp256k1/schnorr/threshold_test.go b/dcrec/secp256k1/schnorr/threshold_test.go index a21c0e7e..e963b8fa 100644 --- a/dcrec/secp256k1/schnorr/threshold_test.go +++ b/dcrec/secp256k1/schnorr/threshold_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -12,7 +12,7 @@ import ( "testing" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) type signerHex struct { diff --git a/dcrutil/address.go b/dcrutil/address.go index 09a55f67..dab563d4 100644 --- a/dcrutil/address.go +++ b/dcrutil/address.go @@ -1,5 +1,5 @@ // Copyright (c) 2013, 2014 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -13,8 +13,8 @@ import ( "github.com/decred/dcrd/crypto/ripemd160" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2/schnorr" + "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v3/schnorr" ) var ( diff --git a/dcrutil/address_test.go b/dcrutil/address_test.go index 3a97e274..e506e9be 100644 --- a/dcrutil/address_test.go +++ b/dcrutil/address_test.go @@ -1,5 +1,5 @@ // Copyright (c) 2013, 2014 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -15,7 +15,7 @@ import ( "github.com/decred/base58" "github.com/decred/dcrd/crypto/ripemd160" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // mockAddrParams implements the AddressParams interface and is used throughout diff --git a/dcrutil/go.mod b/dcrutil/go.mod index 172e6d16..cd7c7817 100644 --- a/dcrutil/go.mod +++ b/dcrutil/go.mod @@ -10,8 +10,11 @@ require ( github.com/decred/dcrd/crypto/ripemd160 v1.0.0 github.com/decred/dcrd/dcrec v1.0.0 github.com/decred/dcrd/dcrec/edwards/v2 v2.0.0 - github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 + github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/wire v1.3.0 ) -replace github.com/decred/dcrd/chaincfg/v3 => ../chaincfg +replace ( + github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 +) diff --git a/dcrutil/wif.go b/dcrutil/wif.go index 64ff5674..1b969904 100644 --- a/dcrutil/wif.go +++ b/dcrutil/wif.go @@ -1,5 +1,5 @@ // Copyright (c) 2013-2016 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -14,7 +14,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // ErrMalformedPrivateKey describes an error where a WIF-encoded private key diff --git a/fees/go.mod b/fees/go.mod index 3ffd209c..478d44c0 100644 --- a/fees/go.mod +++ b/fees/go.mod @@ -15,6 +15,7 @@ require ( replace ( github.com/decred/dcrd/blockchain/stake/v3 => ../blockchain/stake github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil github.com/decred/dcrd/txscript/v3 => ../txscript ) diff --git a/gcs/go.mod b/gcs/go.mod index ad4c168f..50080d78 100644 --- a/gcs/go.mod +++ b/gcs/go.mod @@ -14,6 +14,7 @@ require ( replace ( github.com/decred/dcrd/blockchain/stake/v3 => ../blockchain/stake github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil github.com/decred/dcrd/txscript/v3 => ../txscript ) diff --git a/go.mod b/go.mod index cfd9182f..e5c5a2eb 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/decred/dcrd/crypto/ripemd160 v1.0.0 github.com/decred/dcrd/database/v2 v2.0.1 github.com/decred/dcrd/dcrec v1.0.0 - github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 + github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/dcrjson/v3 v3.0.1 github.com/decred/dcrd/dcrutil/v3 v3.0.0-20200104000002-54b67d3474fb github.com/decred/dcrd/fees/v2 v2.0.0 @@ -57,7 +57,7 @@ replace ( github.com/decred/dcrd/crypto/ripemd160 => ./crypto/ripemd160 github.com/decred/dcrd/database/v2 => ./database github.com/decred/dcrd/dcrec => ./dcrec - github.com/decred/dcrd/dcrec/secp256k1/v2 => ./dcrec/secp256k1 + github.com/decred/dcrd/dcrec/secp256k1/v3 => ./dcrec/secp256k1 github.com/decred/dcrd/dcrjson/v3 => ./dcrjson github.com/decred/dcrd/dcrutil/v3 => ./dcrutil github.com/decred/dcrd/fees/v2 => ./fees diff --git a/go.sum b/go.sum index 1b4a9ec2..9bb24a42 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,7 @@ github.com/decred/base58 v1.0.2 h1:yupIH6bg+q7KYfBk7oUv3xFjKGb5Ypm4+v/61X4keGY= github.com/decred/base58 v1.0.2/go.mod h1:pXP9cXCfM2sFLb2viz2FNIdeMWmZDBKG3ZBYbiSM78E= github.com/decred/dcrd/dcrec/edwards/v2 v2.0.0 h1:E5KszxGgpjpmW8vN811G6rBAZg0/S/DftdGqN4FW5x4= github.com/decred/dcrd/dcrec/edwards/v2 v2.0.0/go.mod h1:d0H8xGMWbiIQP7gN3v2rByWUcuZPm9YsgmnfoxgbINc= +github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0/go.mod h1:3s92l0paYkZoIHuj4X93Teg/HB7eGM9x/zokGw+u4mY= github.com/decred/dcrd/rpc/jsonrpc/types v1.0.1 h1:sWsGtWzdmrna6aysDCHwjANTJh+Lxt2xp6S10ahP79Y= github.com/decred/dcrd/rpc/jsonrpc/types v1.0.1/go.mod h1:dJUp9PoyFYklzmlImpVkVLOr6j4zKuUv66YgemP2sd8= github.com/decred/dcrwallet/rpc/jsonrpc/types v1.3.0 h1:yCxtFqK7X6GvZWQzHXjCwoGCy9YVe3tGEwxCjW5rYQk= diff --git a/hdkeychain/extendedkey.go b/hdkeychain/extendedkey.go index f0cad805..30ba3558 100644 --- a/hdkeychain/extendedkey.go +++ b/hdkeychain/extendedkey.go @@ -1,5 +1,5 @@ // Copyright (c) 2014-2016 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -21,7 +21,7 @@ import ( "github.com/decred/base58" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" ) diff --git a/hdkeychain/go.mod b/hdkeychain/go.mod index 96d8f5fc..f1d7348c 100644 --- a/hdkeychain/go.mod +++ b/hdkeychain/go.mod @@ -7,11 +7,12 @@ require ( github.com/decred/dcrd/chaincfg/chainhash v1.0.2 github.com/decred/dcrd/chaincfg/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/dcrec v1.0.0 - github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 + github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/dcrutil/v3 v3.0.0-20200104000002-54b67d3474fb ) replace ( github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil ) diff --git a/mempool/go.mod b/mempool/go.mod index 424fbb94..dc504686 100644 --- a/mempool/go.mod +++ b/mempool/go.mod @@ -9,7 +9,7 @@ require ( github.com/decred/dcrd/chaincfg/chainhash v1.0.2 github.com/decred/dcrd/chaincfg/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/dcrec v1.0.0 - github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 + github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/dcrutil/v3 v3.0.0-20200104000002-54b67d3474fb github.com/decred/dcrd/mining/v3 v3.0.0-20200104000002-54b67d3474fb github.com/decred/dcrd/txscript/v3 v3.0.0-20200104000002-54b67d3474fb @@ -21,6 +21,7 @@ replace ( github.com/decred/dcrd/blockchain/stake/v3 => ../blockchain/stake github.com/decred/dcrd/blockchain/v3 => ../blockchain github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil github.com/decred/dcrd/mining/v3 => ../mining github.com/decred/dcrd/txscript/v3 => ../txscript diff --git a/mempool/go.sum b/mempool/go.sum index 3af41bbc..3caa0a63 100644 --- a/mempool/go.sum +++ b/mempool/go.sum @@ -36,7 +36,6 @@ github.com/decred/dcrd/dcrutil/v2 v2.0.1 h1:aL+c7o7Q66HV1gIif+XkNYo9DeorN3l01Vns github.com/decred/dcrd/dcrutil/v2 v2.0.1/go.mod h1:JdEgF6eh0TTohPeiqDxqDSikTSvAczq0J7tFMyyeD+k= github.com/decred/dcrd/gcs/v2 v2.0.0 h1:nCc3q9iIwIpF0khTSiC7xYgojKoKnPrqrgVjboOBXDE= github.com/decred/dcrd/gcs/v2 v2.0.0/go.mod h1:3XjKcrtvB+r2ezhIsyNCLk6dRnXRJVyYmsd1P3SkU3o= -github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/decred/dcrd/txscript/v2 v2.1.0 h1:IKIpNm0lPmNQoaZ2zxZm1qMwfmLb/XXeahxXlfc+MrA= github.com/decred/dcrd/txscript/v2 v2.1.0/go.mod h1:XaJAVrZU4NWRx4UEzTiDAs86op1m8GRJLz24SDBKOi0= github.com/decred/dcrd/wire v1.3.0 h1:X76I2/a8esUmxXmFpJpAvXEi014IA4twgwcOBeIS8lE= diff --git a/mempool/mempool_test.go b/mempool/mempool_test.go index 69dd032d..a1cc4cb1 100644 --- a/mempool/mempool_test.go +++ b/mempool/mempool_test.go @@ -22,7 +22,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/mining/v3" "github.com/decred/dcrd/txscript/v3" diff --git a/mempool/policy_test.go b/mempool/policy_test.go index f85c4b95..3f5535a9 100644 --- a/mempool/policy_test.go +++ b/mempool/policy_test.go @@ -15,7 +15,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/txscript/v3" "github.com/decred/dcrd/wire" diff --git a/mining/go.mod b/mining/go.mod index a3f25d5f..4badd428 100644 --- a/mining/go.mod +++ b/mining/go.mod @@ -13,6 +13,7 @@ replace ( github.com/decred/dcrd/blockchain/stake/v3 => ../blockchain/stake github.com/decred/dcrd/blockchain/v3 => ../blockchain github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil github.com/decred/dcrd/txscript/v3 => ../txscript ) diff --git a/peer/go.mod b/peer/go.mod index 7add1e4d..49f8285f 100644 --- a/peer/go.mod +++ b/peer/go.mod @@ -14,6 +14,7 @@ require ( replace ( github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil github.com/decred/dcrd/txscript/v3 => ../txscript ) diff --git a/require.go b/require.go index 543d32cd..8b2ddd45 100644 --- a/require.go +++ b/require.go @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Decred developers +// Copyright (c) 2019-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -13,6 +13,6 @@ package main import ( _ "github.com/decred/dcrd/bech32" - _ "github.com/decred/dcrd/dcrec/secp256k1/v2" + _ "github.com/decred/dcrd/dcrec/secp256k1/v3" _ "github.com/decred/dcrd/fees/v2" ) diff --git a/rpcclient/go.mod b/rpcclient/go.mod index 3baf6e73..8715a65e 100644 --- a/rpcclient/go.mod +++ b/rpcclient/go.mod @@ -20,6 +20,7 @@ require ( replace ( github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil github.com/decred/dcrd/rpc/jsonrpc/types/v2 => ../rpc/jsonrpc/types ) diff --git a/rpcserver.go b/rpcserver.go index a8f83e73..73ab17ce 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -44,7 +44,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrjson/v3" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/fees/v2" diff --git a/rpctest/memwallet.go b/rpctest/memwallet.go index a66d3593..3da8a551 100644 --- a/rpctest/memwallet.go +++ b/rpctest/memwallet.go @@ -15,7 +15,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/hdkeychain/v2" "github.com/decred/dcrd/rpcclient/v5" diff --git a/rpctest/votingwallet.go b/rpctest/votingwallet.go index e79e96ec..48b593a9 100644 --- a/rpctest/votingwallet.go +++ b/rpctest/votingwallet.go @@ -15,7 +15,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v2" "github.com/decred/dcrd/rpcclient/v5" diff --git a/txscript/engine.go b/txscript/engine.go index 68fa7d49..8b344e7b 100644 --- a/txscript/engine.go +++ b/txscript/engine.go @@ -1,5 +1,5 @@ // Copyright (c) 2013-2017 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -10,7 +10,7 @@ import ( "math/big" "strings" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/wire" ) diff --git a/txscript/example_test.go b/txscript/example_test.go index 982567c1..0a54c76c 100644 --- a/txscript/example_test.go +++ b/txscript/example_test.go @@ -12,7 +12,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/txscript/v3" "github.com/decred/dcrd/wire" diff --git a/txscript/go.mod b/txscript/go.mod index 2e5651a4..307e96d5 100644 --- a/txscript/go.mod +++ b/txscript/go.mod @@ -8,7 +8,7 @@ require ( github.com/decred/dcrd/crypto/ripemd160 v1.0.0 github.com/decred/dcrd/dcrec v1.0.0 github.com/decred/dcrd/dcrec/edwards/v2 v2.0.0 - github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 + github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0-00010101000000-000000000000 github.com/decred/dcrd/dcrutil/v3 v3.0.0-20200104000002-54b67d3474fb github.com/decred/dcrd/wire v1.3.0 github.com/decred/slog v1.0.0 @@ -16,5 +16,6 @@ require ( replace ( github.com/decred/dcrd/chaincfg/v3 => ../chaincfg + github.com/decred/dcrd/dcrec/secp256k1/v3 => ../dcrec/secp256k1 github.com/decred/dcrd/dcrutil/v3 => ../dcrutil ) diff --git a/txscript/opcode.go b/txscript/opcode.go index 8cc1d4de..7b9765cf 100644 --- a/txscript/opcode.go +++ b/txscript/opcode.go @@ -1,5 +1,5 @@ // Copyright (c) 2013-2016 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -18,8 +18,8 @@ import ( "github.com/decred/dcrd/crypto/ripemd160" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2/schnorr" + "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v3/schnorr" "github.com/decred/dcrd/wire" ) diff --git a/txscript/sigcache.go b/txscript/sigcache.go index 88a7754e..d9f016b3 100644 --- a/txscript/sigcache.go +++ b/txscript/sigcache.go @@ -1,5 +1,5 @@ // Copyright (c) 2015-2016 The btcsuite developers -// Copyright (c) 2016-2019 The Decred developers +// Copyright (c) 2016-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -10,7 +10,7 @@ import ( "sync" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // sigCacheEntry represents an entry in the SigCache. Entries within the diff --git a/txscript/sigcache_test.go b/txscript/sigcache_test.go index c2db6147..6fbd169c 100644 --- a/txscript/sigcache_test.go +++ b/txscript/sigcache_test.go @@ -1,5 +1,5 @@ // Copyright (c) 2015-2016 The btcsuite developers -// Copyright (c) 2016 The Decred developers +// Copyright (c) 2016-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -11,7 +11,7 @@ import ( "testing" "github.com/decred/dcrd/chaincfg/chainhash" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" ) // genRandomSig returns a random message, a signature of the message under the diff --git a/txscript/sign.go b/txscript/sign.go index 5f85092b..0a46e9d9 100644 --- a/txscript/sign.go +++ b/txscript/sign.go @@ -1,5 +1,5 @@ // Copyright (c) 2013-2015 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -11,8 +11,8 @@ import ( "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2/schnorr" + "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v3/schnorr" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/wire" ) diff --git a/txscript/sign_test.go b/txscript/sign_test.go index 7ac25cda..87ffc05c 100644 --- a/txscript/sign_test.go +++ b/txscript/sign_test.go @@ -16,8 +16,8 @@ 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/v2" - "github.com/decred/dcrd/dcrec/secp256k1/v2/schnorr" + "github.com/decred/dcrd/dcrec/secp256k1/v3" + "github.com/decred/dcrd/dcrec/secp256k1/v3/schnorr" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/wire" ) diff --git a/txscript/standard.go b/txscript/standard.go index fb7497e8..92761d84 100644 --- a/txscript/standard.go +++ b/txscript/standard.go @@ -1,5 +1,5 @@ // Copyright (c) 2013-2017 The btcsuite developers -// Copyright (c) 2015-2019 The Decred developers +// Copyright (c) 2015-2020 The Decred developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. @@ -11,7 +11,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" ) diff --git a/txscript/standard_test.go b/txscript/standard_test.go index 4ecbf3ce..cb70a0bc 100644 --- a/txscript/standard_test.go +++ b/txscript/standard_test.go @@ -14,7 +14,7 @@ import ( "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrec/secp256k1/v2" + "github.com/decred/dcrd/dcrec/secp256k1/v3" "github.com/decred/dcrd/dcrutil/v3" )