diff --git a/glide.lock b/glide.lock index 6a1f63eaa..c36803cdb 100644 --- a/glide.lock +++ b/glide.lock @@ -1,12 +1,12 @@ -hash: ea6e6ffa31517aacb35de06b097975229096253bf658d302f2d6652fde91b3f1 -updated: 2017-01-27T20:06:58.5779336-06:00 +hash: 4a7317ba20a3d8dd1ea253b86d86231d97cf85c16ca368471a50e8c42771daf0 +updated: 2017-05-08T23:05:30.5569509-05:00 imports: - name: github.com/btcsuite/btclog version: 73889fb79bd687870312b6e40effcecffbd57d30 - name: github.com/btcsuite/btcrpcclient version: abcdfb702a7ca67e4a32c10be380c63216bd69fe - name: github.com/btcsuite/btcutil - version: 86346b5a958c0cf94186b87855469ae991be501c + version: dcd4997b0664bcfd6ef48e4ae9da8396e08b1cd9 subpackages: - base58 - bloom @@ -15,10 +15,6 @@ imports: version: 4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f subpackages: - socks -- name: github.com/btcsuite/golangcrypto - version: 53f62d9b43e87a6c56975cf862af7edf33a8d0df - subpackages: - - ripemd160 - name: github.com/btcsuite/goleveldb version: 7834afc9e8cd15233b6c3d97e12674a31ca24602 subpackages: @@ -54,4 +50,8 @@ imports: - spew - name: github.com/jessevdk/go-flags version: 1679536dcc895411a9f5848d9a0250be7856448c +- name: golang.org/x/crypto + version: 122d919ec1efcfb58483215da23f815853e24b81 + subpackages: + - ripemd160 testImports: [] diff --git a/glide.yaml b/glide.yaml index 802a283c0..2de57b2c8 100644 --- a/glide.yaml +++ b/glide.yaml @@ -9,7 +9,7 @@ import: - package: github.com/btcsuite/go-socks subpackages: - socks -- package: github.com/btcsuite/golangcrypto +- package: golang.org/x/crypto subpackages: - ripemd160 - package: github.com/btcsuite/goleveldb diff --git a/rpcwebsocket.go b/rpcwebsocket.go index a25109252..ecfcc38bb 100644 --- a/rpcwebsocket.go +++ b/rpcwebsocket.go @@ -20,6 +20,8 @@ import ( "sync" "time" + "golang.org/x/crypto/ripemd160" + "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcjson" "github.com/btcsuite/btcd/chaincfg/chainhash" @@ -27,7 +29,6 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/btcsuite/golangcrypto/ripemd160" "github.com/btcsuite/websocket" ) diff --git a/txscript/opcode.go b/txscript/opcode.go index ccbc7d95c..5d8f503b9 100644 --- a/txscript/opcode.go +++ b/txscript/opcode.go @@ -12,10 +12,11 @@ import ( "fmt" "hash" + "golang.org/x/crypto/ripemd160" + "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/golangcrypto/ripemd160" ) // An opcode defines the information related to a txscript opcode. opfunc, if