diff --git a/dcrutil/address.go b/dcrutil/address.go index 02cd14d2..f8882a7f 100644 --- a/dcrutil/address.go +++ b/dcrutil/address.go @@ -12,7 +12,7 @@ import ( "golang.org/x/crypto/ripemd160" "github.com/decred/base58" - "github.com/decred/dcrd/chaincfg/chainec" + "github.com/decred/dcrd/chaincfg/v2/chainec" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards" "github.com/decred/dcrd/dcrec/secp256k1" diff --git a/dcrutil/address_test.go b/dcrutil/address_test.go index fc8c6cce..2b5ace53 100644 --- a/dcrutil/address_test.go +++ b/dcrutil/address_test.go @@ -13,7 +13,7 @@ import ( "testing" "github.com/decred/base58" - "github.com/decred/dcrd/chaincfg/chainec" + "github.com/decred/dcrd/chaincfg/v2/chainec" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/secp256k1" "golang.org/x/crypto/ripemd160" diff --git a/dcrutil/example_test.go b/dcrutil/example_test.go index 7691ca5b..52ec732a 100644 --- a/dcrutil/example_test.go +++ b/dcrutil/example_test.go @@ -8,7 +8,7 @@ import ( "fmt" "math" - "github.com/decred/dcrd/chaincfg" + "github.com/decred/dcrd/chaincfg/v2" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrutil" ) @@ -88,12 +88,13 @@ func ExampleDecodeAddress() { // Ordinarily addresses would be read from the user or the result of a // derivation, but they are hard coded here for the purposes of this // example. + mainNetParmas := chaincfg.MainNetParams() addrsToDecode := []string{ "DsRUvfCwTMrKz29dDiQBJhZii9GDN3bVx6Q", // pay-to-pubkey-hash ecdsa "DSpf9Sru9MarMKQQnuzTiQ9tjWVJA3KSm2d", // pay-to-pubkey-hash schnorr } for idx, encodedAddr := range addrsToDecode { - addr, err := dcrutil.DecodeAddress(encodedAddr, &chaincfg.MainNetParams) + addr, err := dcrutil.DecodeAddress(encodedAddr, mainNetParmas) if err != nil { fmt.Println(err) return diff --git a/dcrutil/go.mod b/dcrutil/go.mod index bb206d20..fc3c19d4 100644 --- a/dcrutil/go.mod +++ b/dcrutil/go.mod @@ -5,11 +5,11 @@ go 1.11 require ( github.com/davecgh/go-spew v1.1.1 github.com/decred/base58 v1.0.0 - github.com/decred/dcrd/chaincfg v1.5.1 github.com/decred/dcrd/chaincfg/chainhash v1.0.1 + github.com/decred/dcrd/chaincfg/v2 v2.0.2 github.com/decred/dcrd/dcrec v1.0.0 github.com/decred/dcrd/dcrec/edwards v1.0.0 - github.com/decred/dcrd/dcrec/secp256k1 v1.0.1 + github.com/decred/dcrd/dcrec/secp256k1 v1.0.2 github.com/decred/dcrd/wire v1.2.0 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 ) diff --git a/dcrutil/go.sum b/dcrutil/go.sum index 2059d2e4..b224f53c 100644 --- a/dcrutil/go.sum +++ b/dcrutil/go.sum @@ -8,16 +8,18 @@ github.com/dchest/blake256 v1.0.0 h1:6gUgI5MHdz9g0TdrgKqXsoDX+Zjxmm1Sc6OsoGru50I github.com/dchest/blake256 v1.0.0/go.mod h1:xXNWCE1jsAP8DAjP+rKw2MbeqLczjI3TRx2VK+9OEYY= github.com/decred/base58 v1.0.0 h1:BVi1FQCThIjZ0ehG+I99NJ51o0xcc9A/fDKhmJxY6+w= github.com/decred/base58 v1.0.0/go.mod h1:LLY1p5e3g91byL/UO1eiZaYd+uRoVRarybgcoymu9Ks= -github.com/decred/dcrd/chaincfg v1.5.1 h1:u1Xbq0VTnAXIHW5ECqrWe0VYSgf5vWHqpSiwoLBzxAQ= -github.com/decred/dcrd/chaincfg v1.5.1/go.mod h1:FukMzTjkwzjPU+hK7CqDMQe3NMbSZAYU5PAcsx1wlv0= github.com/decred/dcrd/chaincfg/chainhash v1.0.1 h1:0vG7U9+dSjSCaHQKdoSKURK2pOb47+b+8FK5q4+Je7M= github.com/decred/dcrd/chaincfg/chainhash v1.0.1/go.mod h1:OVfvaOsNLS/A1y4Eod0Ip/Lf8qga7VXCQjUQLbkY0Go= +github.com/decred/dcrd/chaincfg/v2 v2.0.2 h1:VeGY52lHuYT01tIGbvYj+OO0GaGxGaJmnh+4vGca1+U= +github.com/decred/dcrd/chaincfg/v2 v2.0.2/go.mod h1:hpKvhLCDAD/xDZ3V1Pqpv9fIKVYYi11DyxETguazyvg= github.com/decred/dcrd/dcrec v1.0.0 h1:W+z6Es+Rai3MXYVoPAxYr5U1DGis0Co33scJ6uH2J6o= github.com/decred/dcrd/dcrec v1.0.0/go.mod h1:HIaqbEJQ+PDzQcORxnqen5/V1FR3B4VpIfmePklt8Q8= github.com/decred/dcrd/dcrec/edwards v1.0.0 h1:UDcPNzclKiJlWqV3x1Fl8xMCJrolo4PB4X9t8LwKDWU= github.com/decred/dcrd/dcrec/edwards v1.0.0/go.mod h1:HblVh1OfMt7xSxUL1ufjToaEvpbjpWvvTAUx4yem8BI= github.com/decred/dcrd/dcrec/secp256k1 v1.0.1 h1:EFWVd1p0t0Y5tnsm/dJujgV0ORogRJ6vo7CMAjLseAc= github.com/decred/dcrd/dcrec/secp256k1 v1.0.1/go.mod h1:lhu4eZFSfTJWUnR3CFRcpD+Vta0KUAqnhTsTksHXgy0= +github.com/decred/dcrd/dcrec/secp256k1 v1.0.2 h1:awk7sYJ4pGWmtkiGHFfctztJjHMKGLV8jctGQhAbKe0= +github.com/decred/dcrd/dcrec/secp256k1 v1.0.2/go.mod h1:CHTUIVfmDDd0KFVFpNX1pFVCBUegxW387nN0IGwNKR0= github.com/decred/dcrd/wire v1.2.0 h1:HqJVB7vcklIguzFWgRXw/WYCQ9cD3bUC5TKj53i1Hng= github.com/decred/dcrd/wire v1.2.0/go.mod h1:/JKOsLInOJu6InN+/zH5AyCq3YDIOW/EqcffvU8fJHM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/dcrutil/wif.go b/dcrutil/wif.go index 9e57e1b6..52a62a76 100644 --- a/dcrutil/wif.go +++ b/dcrutil/wif.go @@ -11,8 +11,8 @@ import ( "fmt" "github.com/decred/base58" - "github.com/decred/dcrd/chaincfg/chainec" "github.com/decred/dcrd/chaincfg/chainhash" + "github.com/decred/dcrd/chaincfg/v2/chainec" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards" "github.com/decred/dcrd/dcrec/secp256k1" diff --git a/dcrutil/wif_test.go b/dcrutil/wif_test.go index 656176dd..4a846702 100644 --- a/dcrutil/wif_test.go +++ b/dcrutil/wif_test.go @@ -8,7 +8,7 @@ package dcrutil import ( "testing" - "github.com/decred/dcrd/chaincfg/chainec" + "github.com/decred/dcrd/chaincfg/v2/chainec" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards" "github.com/decred/dcrd/dcrec/secp256k1"