From 6e647f731fe52362f5043fa52b1ed8588ed0a2d7 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Mon, 7 Oct 2019 23:23:59 -0500 Subject: [PATCH] multi: Use crypto/ripemd160 module. This updates the main, dcrutil, and blockchain modules to make use of the new crypto/ripemd160 module. --- dcrutil/address.go | 3 +-- dcrutil/address_test.go | 2 +- dcrutil/go.mod | 2 +- dcrutil/go.sum | 9 ++------- dcrutil/hash160.go | 3 +-- go.mod | 1 + go.sum | 2 ++ rpcwebsocket.go | 2 +- txscript/go.mod | 2 +- txscript/go.sum | 6 ++---- txscript/opcode.go | 3 +-- 11 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dcrutil/address.go b/dcrutil/address.go index 36653322..3b24bb09 100644 --- a/dcrutil/address.go +++ b/dcrutil/address.go @@ -9,10 +9,9 @@ import ( "errors" "fmt" - "golang.org/x/crypto/ripemd160" - "github.com/decred/base58" "github.com/decred/dcrd/chaincfg/v2/chainec" + "github.com/decred/dcrd/crypto/ripemd160" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards" "github.com/decred/dcrd/dcrec/secp256k1/v2" diff --git a/dcrutil/address_test.go b/dcrutil/address_test.go index 626c7ce0..5fb8d6c4 100644 --- a/dcrutil/address_test.go +++ b/dcrutil/address_test.go @@ -14,9 +14,9 @@ import ( "github.com/decred/base58" "github.com/decred/dcrd/chaincfg/v2/chainec" + "github.com/decred/dcrd/crypto/ripemd160" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/secp256k1/v2" - "golang.org/x/crypto/ripemd160" ) // mockAddrParams implements the AddressParams interface and is used throughout diff --git a/dcrutil/go.mod b/dcrutil/go.mod index 2501973f..20524c62 100644 --- a/dcrutil/go.mod +++ b/dcrutil/go.mod @@ -7,9 +7,9 @@ require ( github.com/decred/base58 v1.0.0 github.com/decred/dcrd/chaincfg/chainhash v1.0.2 github.com/decred/dcrd/chaincfg/v2 v2.0.2 + github.com/decred/dcrd/crypto/ripemd160 v1.0.0 github.com/decred/dcrd/dcrec v1.0.0 github.com/decred/dcrd/dcrec/edwards v1.0.0 github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 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 7875e178..007e0c08 100644 --- a/dcrutil/go.sum +++ b/dcrutil/go.sum @@ -16,6 +16,8 @@ github.com/decred/dcrd/chaincfg/v2 v2.0.2 h1:VeGY52lHuYT01tIGbvYj+OO0GaGxGaJmnh+ github.com/decred/dcrd/chaincfg/v2 v2.0.2/go.mod h1:hpKvhLCDAD/xDZ3V1Pqpv9fIKVYYi11DyxETguazyvg= github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/crypto/ripemd160 v1.0.0 h1:MciTnR4NfBqDFRFjFkrn8WPLP4Vo7t6ww6ghfn6wcXQ= +github.com/decred/dcrd/crypto/ripemd160 v1.0.0/go.mod h1:F0H8cjIuWTRoixr/LM3REB8obcWkmYx0gbxpQWR8RPg= 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= @@ -26,10 +28,3 @@ github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 h1:3GIJYXQDAKpLEFriGFN8SbSffak1 github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0/go.mod h1:3s92l0paYkZoIHuj4X93Teg/HB7eGM9x/zokGw+u4mY= 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= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/dcrutil/hash160.go b/dcrutil/hash160.go index ae119b6f..5b37af96 100644 --- a/dcrutil/hash160.go +++ b/dcrutil/hash160.go @@ -8,9 +8,8 @@ package dcrutil import ( "hash" - "golang.org/x/crypto/ripemd160" - "github.com/decred/dcrd/chaincfg/chainhash" + "github.com/decred/dcrd/crypto/ripemd160" ) // Calculate the hash of hasher over buf. diff --git a/go.mod b/go.mod index 6372e064..12f32e50 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/decred/dcrd/chaincfg/chainhash v1.0.2 github.com/decred/dcrd/chaincfg/v2 v2.2.0 github.com/decred/dcrd/connmgr/v2 v2.0.0 + github.com/decred/dcrd/crypto/ripemd160 v1.0.0 github.com/decred/dcrd/database/v2 v2.0.0 github.com/decred/dcrd/dcrec v1.0.0 github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 diff --git a/go.sum b/go.sum index 98f40424..9cc15b6a 100644 --- a/go.sum +++ b/go.sum @@ -19,6 +19,8 @@ github.com/decred/dcrd/blockchain/stake/v2 v2.0.0 h1:+FMrSt5tPicBKlev0k/r/2VsaVw github.com/decred/dcrd/blockchain/stake/v2 v2.0.0/go.mod h1:jv/rKMcZ87lhvVkHot/tElxeAYEUJ3mnKPHJ7WPq86U= github.com/decred/dcrd/blockchain/stake/v2 v2.0.1 h1:mAPZZA+Or8NPENheejmD6Fl90uykhurVuEdOBUMl35s= github.com/decred/dcrd/blockchain/stake/v2 v2.0.1/go.mod h1:jv/rKMcZ87lhvVkHot/tElxeAYEUJ3mnKPHJ7WPq86U= +github.com/decred/dcrd/crypto/ripemd160 v1.0.0 h1:MciTnR4NfBqDFRFjFkrn8WPLP4Vo7t6ww6ghfn6wcXQ= +github.com/decred/dcrd/crypto/ripemd160 v1.0.0/go.mod h1:F0H8cjIuWTRoixr/LM3REB8obcWkmYx0gbxpQWR8RPg= 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/go.mod h1:lhu4eZFSfTJWUnR3CFRcpD+Vta0KUAqnhTsTksHXgy0= diff --git a/rpcwebsocket.go b/rpcwebsocket.go index 004851f2..2b096b92 100644 --- a/rpcwebsocket.go +++ b/rpcwebsocket.go @@ -20,13 +20,13 @@ import ( "time" "github.com/gorilla/websocket" - "golang.org/x/crypto/ripemd160" "github.com/decred/dcrd/blockchain/stake/v2" "github.com/decred/dcrd/blockchain/standalone" "github.com/decred/dcrd/blockchain/v2" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v2" + "github.com/decred/dcrd/crypto/ripemd160" "github.com/decred/dcrd/dcrjson/v3" "github.com/decred/dcrd/dcrutil/v2" "github.com/decred/dcrd/rpc/jsonrpc/types/v2" diff --git a/txscript/go.mod b/txscript/go.mod index b802ec90..b634eaef 100644 --- a/txscript/go.mod +++ b/txscript/go.mod @@ -5,13 +5,13 @@ go 1.11 require ( github.com/decred/dcrd/chaincfg/chainhash v1.0.2 github.com/decred/dcrd/chaincfg/v2 v2.0.2 + github.com/decred/dcrd/crypto/ripemd160 v1.0.0 github.com/decred/dcrd/dcrec v1.0.0 github.com/decred/dcrd/dcrec/edwards v1.0.0 github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 github.com/decred/dcrd/dcrutil/v2 v2.0.0 github.com/decred/dcrd/wire v1.2.0 github.com/decred/slog v1.0.0 - golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 ) replace github.com/decred/dcrd/chaincfg/v2 => ../chaincfg diff --git a/txscript/go.sum b/txscript/go.sum index d470dd30..289fc132 100644 --- a/txscript/go.sum +++ b/txscript/go.sum @@ -12,16 +12,14 @@ github.com/decred/dcrd/chaincfg/chainhash v1.0.1 h1:0vG7U9+dSjSCaHQKdoSKURK2pOb4 github.com/decred/dcrd/chaincfg/chainhash v1.0.1/go.mod h1:OVfvaOsNLS/A1y4Eod0Ip/Lf8qga7VXCQjUQLbkY0Go= github.com/decred/dcrd/chaincfg/chainhash v1.0.2 h1:rt5Vlq/jM3ZawwiacWjPa+smINyLRN07EO0cNBV6DGU= github.com/decred/dcrd/chaincfg/chainhash v1.0.2/go.mod h1:BpbrGgrPTr3YJYRN3Bm+D9NuaFd+zGyNeIKgrhCXK60= -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/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/crypto/ripemd160 v1.0.0 h1:MciTnR4NfBqDFRFjFkrn8WPLP4Vo7t6ww6ghfn6wcXQ= +github.com/decred/dcrd/crypto/ripemd160 v1.0.0/go.mod h1:F0H8cjIuWTRoixr/LM3REB8obcWkmYx0gbxpQWR8RPg= 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/dcrec/secp256k1/v2 v2.0.0 h1:3GIJYXQDAKpLEFriGFN8SbSffak10UXHGdIcFaMPykY= diff --git a/txscript/opcode.go b/txscript/opcode.go index 4abf7934..40f90533 100644 --- a/txscript/opcode.go +++ b/txscript/opcode.go @@ -14,9 +14,8 @@ import ( "hash" "strings" - "golang.org/x/crypto/ripemd160" - "github.com/decred/dcrd/chaincfg/chainhash" + "github.com/decred/dcrd/crypto/ripemd160" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/edwards" "github.com/decred/dcrd/dcrec/secp256k1/v2"