testutils: update darknode + multichain

go.mod

@@ -24,10 +24,10 @@ require (
 	github.com/onsi/gomega v1.10.1
 	github.com/prometheus/tsdb v0.10.0 // indirect
 	github.com/renproject/aw v0.4.0-9
-	github.com/renproject/darknode v0.5.3-0.20200828055521-59848052844c
+	github.com/renproject/darknode v0.5.3-0.20200830191011-21d6e9e92f05
 	github.com/renproject/id v0.4.2
 	github.com/renproject/kv v1.1.2
-	github.com/renproject/multichain v0.2.2-0.20200825005104-6df8be827d53
+	github.com/renproject/multichain v0.2.2-0.20200830190810-5f55852d27e7
 	github.com/renproject/pack v0.2.3
 	github.com/renproject/phi v0.1.0
 	github.com/rjeczalik/notify v0.9.2 // indirect

go.sum

@@ -145,6 +145,7 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/centrifuge/go-substrate-rpc-client v1.1.0/go.mod h1:GBMLH8MQs5g4FcrytcMm9uRgBnTL1LIkNTue6lUPhZU=
 github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67 h1:8k9FLYBLKT+9v2HQJ/a95ZemmTx+/ltJcAiRhVushG8=
 github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
@@ -1176,6 +1177,7 @@ github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssy
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/xxHash v0.1.5/go.mod h1:w2waW5Zoa/Wc4Yqe0wgrIYAGKqRMf7czn2HNKXmuL+I=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -1251,6 +1253,8 @@ github.com/renproject/darknode v0.5.3-0.20200827060210-a730c04b0ad4 h1:4jwnvBtNA
 github.com/renproject/darknode v0.5.3-0.20200827060210-a730c04b0ad4/go.mod h1:6pgLsy/uNHEKbwkMNG/IZRWZwz6PsKT3dfSihBrDMAs=
 github.com/renproject/darknode v0.5.3-0.20200828055521-59848052844c h1:5CNZVhN43UTLGjw6paBxqOmxfyvGvHajSw6dpBwrJIo=
 github.com/renproject/darknode v0.5.3-0.20200828055521-59848052844c/go.mod h1:6pgLsy/uNHEKbwkMNG/IZRWZwz6PsKT3dfSihBrDMAs=
+github.com/renproject/darknode v0.5.3-0.20200830191011-21d6e9e92f05 h1:tkAeE7nIT/z6yemveUb04wBRSgYwI8f9h2Lpoft9kmM=
+github.com/renproject/darknode v0.5.3-0.20200830191011-21d6e9e92f05/go.mod h1:qfbzbHce2xJxncCQOgE1pouI3Q4YF5lPcOF37LXt9qE=
 github.com/renproject/id v0.4.2 h1:XseNDPPCJtsZjIWR7Qgf+zxy0Gt5xsLrfwpQxJt5wFQ=
 github.com/renproject/id v0.4.2/go.mod h1:bCzV4zZkyWetf0GvhJxMT9HQNnGUwzQpImtXOUXqq0k=
 github.com/renproject/kv v1.1.2 h1:P18yHdDVJTEZ9yeyx6o82ICY1m6f+VdtAt/ouZez+AU=
@@ -1259,6 +1263,8 @@ github.com/renproject/multichain v0.1.1-0.20200818002057-658ceb9178e6 h1:GH561/i
 github.com/renproject/multichain v0.1.1-0.20200818002057-658ceb9178e6/go.mod h1:hx36VausG91eGL0S8Yw9mX7hv0Jd/IgytuCQhmvwXOo=
 github.com/renproject/multichain v0.2.2-0.20200825005104-6df8be827d53 h1:UHXJpVld8pyR/3G7zFPoLm/1zzr5eRYPCliVnuLJwg8=
 github.com/renproject/multichain v0.2.2-0.20200825005104-6df8be827d53/go.mod h1:kTJZcO7wXSdF2m7zLTllN1Mo8PcOxddoM5gSiKKy/YQ=
+github.com/renproject/multichain v0.2.2-0.20200830190810-5f55852d27e7 h1:r/LqG37//myTKuAiL2Jq3BfMj2meHiqd52A2+mlN/tk=
+github.com/renproject/multichain v0.2.2-0.20200830190810-5f55852d27e7/go.mod h1:mjHtOQzcOy5eqZ3c2Hq89MPNJ41IAIyRVQmoe3R6uYg=
 github.com/renproject/pack v0.2.3 h1:6zHFyz45ow52iLNLG19eyA/UphJE8b2LsYEcLC3HqQQ=
 github.com/renproject/pack v0.2.3/go.mod h1:pzX3Hc04RoPft89LaZJVp0xgngVGi90V7GvyC3mOGg4=
 github.com/renproject/phi v0.1.0 h1:ZOn7QeDribk/uV46OhQWcTLxyuLg7P+xR1Hfl5cOQuI=

testutils/blockchain.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/renproject/multichain"
+	"github.com/renproject/multichain/api/gas"
 	"github.com/renproject/multichain/api/utxo"
 	"github.com/renproject/pack"
 	"github.com/sirupsen/logrus"
@@ -37,22 +38,6 @@ func (b mockBindings) DecodeAddress(chain multichain.Chain, addr multichain.Addr
 	panic("unimplemented")
 }
 
-func (b mockBindings) Phash(chain multichain.Chain, payload pack.Bytes) pack.Bytes32 {
-	panic("unimplemented")
-}
-
-func (b mockBindings) Nhash(chain multichain.Chain, nonce pack.Bytes32, outpoint multichain.UTXOutpoint) pack.Bytes32 {
-	panic("unimplemented")
-}
-
-func (b mockBindings) Ghash(chain multichain.Chain, pHash pack.Bytes32, token, to pack.Bytes, nonce pack.Bytes32) pack.Bytes32 {
-	panic("unimplemented")
-}
-
-func (b mockBindings) Sighash(chain multichain.Chain, phash pack.Bytes32, amount pack.U256, token, to pack.Bytes, nhash pack.Bytes32) (pack.Bytes32, error) {
-	panic("unimplemented")
-}
-
 func (b mockBindings) AccountBurnInfo(ctx context.Context, chain multichain.Chain, asset multichain.Asset, nonce pack.Bytes32) (amount pack.U256, recipient pack.String, payload pack.Bytes, err error) {
 	return pack.U256{}, "", nil, b.isConfirmed(nonce.String())
 }
@@ -61,7 +46,7 @@ func (b mockBindings) AccountLockInfo(ctx context.Context, chain multichain.Chai
 	panic("unimplemented")
 }
 
-func (b mockBindings) AccountBuildTx(chain multichain.Chain, asset multichain.Asset, from, to multichain.Address, value, nonce pack.U256, payload pack.Bytes) (multichain.AccountTx, error) {
+func (b mockBindings) AccountBuildTx(chain multichain.Chain, asset multichain.Asset, from, to multichain.Address, value, nonce, gasLimit, gasPrice pack.U256, payload pack.Bytes) (multichain.AccountTx, error) {
 	panic("unimplemented")
 }
 
@@ -81,15 +66,11 @@ func (b mockBindings) UTXOSubmitTx(ctx context.Context, chain multichain.Chain,
 	panic("unimplemented")
 }
 
-func (b mockBindings) UTXOGatewayPubKeyScript(chain multichain.Chain, asset multichain.Asset, gpubkey pack.Bytes, ghash pack.Bytes32) (pack.Bytes, error) {
-	panic("unimplemented")
-}
-
-func (b mockBindings) UTXOGatewayScript(chain multichain.Chain, asset multichain.Asset, gpubkey pack.Bytes, ghash pack.Bytes32) (pack.Bytes, error) {
+func (b mockBindings) GasFee(chain multichain.Chain, asset multichain.Asset, gasCost pack.U256) (gasFee pack.U256, err error) {
 	panic("unimplemented")
 }
 
-func (b mockBindings) GasFee(chain multichain.Chain, asset multichain.Asset, gasCost pack.U256) (gasFee pack.U256, err error) {
+func (b mockBindings) GasLimit(chain multichain.Chain, asset multichain.Asset, txType gas.TxType) (gasLimit pack.U256, err error) {
 	panic("unimplemented")
 }