diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index dc519446e..a412ec43e 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -34,14 +34,14 @@ import ( ) var ( - addr1, err1 = common.HexToAddress("cb94b11771b0a90d32421b0bca90701f16923c32993c") - addr2, err2 = common.HexToAddress("cb30f22ac2235ef6020516a503ba3c6222a068e65da6") - addr3, err3 = common.HexToAddress("cb22ac06311d367113a9ec35e2f44260b8a55a3753bd") + addr1, err1 = common.HexToAddress("cb27de521e43741cf785cbad450d5649187b9612018f") + addr2, err2 = common.HexToAddress("cb74db416ff2f9c53dabaf34f81142db30350ea7b144") + addr3, err3 = common.HexToAddress("cb65e49851f010cd7d81b5b4969f3b0e8325c415359d") cachetestDir, _ = filepath.Abs(filepath.Join("testdata", "keystore")) cachetestAccounts = []accounts.Account{ { Address: addr1, - URL: accounts.URL{Scheme: KeyStoreScheme, Path: filepath.Join(cachetestDir, "UTC--2020-07-20T17-37-08.515483762Z--cb94b11771b0a90d32421b0bca90701f16923c32993c")}, + URL: accounts.URL{Scheme: KeyStoreScheme, Path: filepath.Join(cachetestDir, "UTC--2020-07-20T17-37-08.515483762Z--cb27de521e43741cf785cbad450d5649187b9612018f")}, }, { Address: addr2, diff --git a/accounts/keystore/testdata/dupes/1 b/accounts/keystore/testdata/dupes/1 index f52254c70..02b823d1d 100644 --- a/accounts/keystore/testdata/dupes/1 +++ b/accounts/keystore/testdata/dupes/1 @@ -1 +1 @@ -{"address":"cb30f22ac2235ef6020516a503ba3c6222a068e65da6","crypto":{"cipher":"aes-128-ctr","ciphertext":"503096539824a2f433950a3e74884c6541fc0e5fed39c6900288646051b26b1549944a09a0fcb59c99c2f7649a587af1a179d8605a0a669953","cipherparams":{"iv":"2e4921d45922d3d09372442be46a88bd"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":6,"r":8,"salt":"7304a0e6dba9a7d6b209eb9d87b7bb747eb983854b09c5e39309934ac6d92c7b"},"mac":"c5cfaf38664d9034c28f6ee79045ae04320a1e0f3892b90f5ae9a4d6475b2b3d"},"id":"2355858f-b495-3d1d-846c-b65ecf3265db","version":3} \ No newline at end of file +{"address":"cb74db416ff2f9c53dabaf34f81142db30350ea7b144","crypto":{"cipher":"aes-128-ctr","ciphertext":"6aa169663d4ab11611d0e6d79988140fe8682fe4a3a201e7ce51678f60c448a2496d45adc1a5c1bd833e4e53daca5b75f3cf71a2e8255b5edd","cipherparams":{"iv":"da8c73f7f222997af20c3e378d8a3e83"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2,"p":1,"r":8,"salt":"b721d800bd2c0beec1f4d7d44315aa9d6f3c27360d0c965a9e52bd8b27914f96"},"mac":"9dd9f2a178bed1515bb5b64febe194b01d2b6bf48b12ad0485e4538bc1ca1638"},"id":"661fc28b-e59d-4aae-ab34-fb24eb8c51b7","version":3} \ No newline at end of file diff --git a/accounts/keystore/testdata/dupes/2 b/accounts/keystore/testdata/dupes/2 index f52254c70..02b823d1d 100644 --- a/accounts/keystore/testdata/dupes/2 +++ b/accounts/keystore/testdata/dupes/2 @@ -1 +1 @@ -{"address":"cb30f22ac2235ef6020516a503ba3c6222a068e65da6","crypto":{"cipher":"aes-128-ctr","ciphertext":"503096539824a2f433950a3e74884c6541fc0e5fed39c6900288646051b26b1549944a09a0fcb59c99c2f7649a587af1a179d8605a0a669953","cipherparams":{"iv":"2e4921d45922d3d09372442be46a88bd"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":6,"r":8,"salt":"7304a0e6dba9a7d6b209eb9d87b7bb747eb983854b09c5e39309934ac6d92c7b"},"mac":"c5cfaf38664d9034c28f6ee79045ae04320a1e0f3892b90f5ae9a4d6475b2b3d"},"id":"2355858f-b495-3d1d-846c-b65ecf3265db","version":3} \ No newline at end of file +{"address":"cb74db416ff2f9c53dabaf34f81142db30350ea7b144","crypto":{"cipher":"aes-128-ctr","ciphertext":"6aa169663d4ab11611d0e6d79988140fe8682fe4a3a201e7ce51678f60c448a2496d45adc1a5c1bd833e4e53daca5b75f3cf71a2e8255b5edd","cipherparams":{"iv":"da8c73f7f222997af20c3e378d8a3e83"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2,"p":1,"r":8,"salt":"b721d800bd2c0beec1f4d7d44315aa9d6f3c27360d0c965a9e52bd8b27914f96"},"mac":"9dd9f2a178bed1515bb5b64febe194b01d2b6bf48b12ad0485e4538bc1ca1638"},"id":"661fc28b-e59d-4aae-ab34-fb24eb8c51b7","version":3} \ No newline at end of file diff --git a/accounts/keystore/testdata/dupes/foo b/accounts/keystore/testdata/dupes/foo index 5032bc37a..a1f980e12 100644 --- a/accounts/keystore/testdata/dupes/foo +++ b/accounts/keystore/testdata/dupes/foo @@ -1 +1 @@ -{"address":"cb94b11771b0a90d32421b0bca90701f16923c32993c","crypto":{"cipher":"aes-128-ctr","ciphertext":"a957bbbe79d4257a363eaf905cdd73e6d5289704b8044abf9af2b26fd0137320b6fb54fd1052126da2b5b08d6899e352d3ffc8284875f0dd27","cipherparams":{"iv":"a7415a7526fbf1938f5ed7c33c0881b6"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":6,"r":8,"salt":"f7bd40793e404cb4b0d47c63c64b4cae2558c5729206d4bd949de870924d9d9c"},"mac":"16dbfa4706278ad026316205cffaad9a1cc3573a86ba2ec233079c8cd8a85e8c"},"id":"2355858f-b495-3d1d-846c-b65ecf3265db","version":3} \ No newline at end of file +{"address":"cb27de521e43741cf785cbad450d5649187b9612018f","crypto":{"cipher":"aes-128-ctr","ciphertext":"13b3adc4203f236343e7c6a59c04ac56e6dee12258eba391697d2b5f1e9b87698f53ae12b5837bc906c42bce38f9b575ea82dfaef84b1d6795","cipherparams":{"iv":"ce4b6edebbcb44c76ba42cb2c7a59dd3"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2,"p":1,"r":8,"salt":"54eeca614269586df5dfbde87b39e4077b0353d23fe3fb0e72312973b8d4d3df"},"mac":"d7450eab867cc3b4f7619a586878428cf2a73056fcae32cc605df8ce07e799f6"},"id":"84c5fc55-b541-42ed-aaa7-28f508cd85c0","version":3} \ No newline at end of file diff --git a/accounts/keystore/testdata/keystore/UTC--2020-07-20T17-37-08.515483762Z--cb27de521e43741cf785cbad450d5649187b9612018f b/accounts/keystore/testdata/keystore/UTC--2020-07-20T17-37-08.515483762Z--cb27de521e43741cf785cbad450d5649187b9612018f new file mode 100644 index 000000000..a1f980e12 --- /dev/null +++ b/accounts/keystore/testdata/keystore/UTC--2020-07-20T17-37-08.515483762Z--cb27de521e43741cf785cbad450d5649187b9612018f @@ -0,0 +1 @@ +{"address":"cb27de521e43741cf785cbad450d5649187b9612018f","crypto":{"cipher":"aes-128-ctr","ciphertext":"13b3adc4203f236343e7c6a59c04ac56e6dee12258eba391697d2b5f1e9b87698f53ae12b5837bc906c42bce38f9b575ea82dfaef84b1d6795","cipherparams":{"iv":"ce4b6edebbcb44c76ba42cb2c7a59dd3"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2,"p":1,"r":8,"salt":"54eeca614269586df5dfbde87b39e4077b0353d23fe3fb0e72312973b8d4d3df"},"mac":"d7450eab867cc3b4f7619a586878428cf2a73056fcae32cc605df8ce07e799f6"},"id":"84c5fc55-b541-42ed-aaa7-28f508cd85c0","version":3} \ No newline at end of file diff --git a/accounts/keystore/testdata/keystore/UTC--2020-07-20T17-37-08.515483762Z--cb94b11771b0a90d32421b0bca90701f16923c32993c b/accounts/keystore/testdata/keystore/UTC--2020-07-20T17-37-08.515483762Z--cb94b11771b0a90d32421b0bca90701f16923c32993c deleted file mode 100644 index 5032bc37a..000000000 --- a/accounts/keystore/testdata/keystore/UTC--2020-07-20T17-37-08.515483762Z--cb94b11771b0a90d32421b0bca90701f16923c32993c +++ /dev/null @@ -1 +0,0 @@ -{"address":"cb94b11771b0a90d32421b0bca90701f16923c32993c","crypto":{"cipher":"aes-128-ctr","ciphertext":"a957bbbe79d4257a363eaf905cdd73e6d5289704b8044abf9af2b26fd0137320b6fb54fd1052126da2b5b08d6899e352d3ffc8284875f0dd27","cipherparams":{"iv":"a7415a7526fbf1938f5ed7c33c0881b6"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":6,"r":8,"salt":"f7bd40793e404cb4b0d47c63c64b4cae2558c5729206d4bd949de870924d9d9c"},"mac":"16dbfa4706278ad026316205cffaad9a1cc3573a86ba2ec233079c8cd8a85e8c"},"id":"2355858f-b495-3d1d-846c-b65ecf3265db","version":3} \ No newline at end of file diff --git a/accounts/keystore/testdata/keystore/aaa b/accounts/keystore/testdata/keystore/aaa index f52254c70..02b823d1d 100644 --- a/accounts/keystore/testdata/keystore/aaa +++ b/accounts/keystore/testdata/keystore/aaa @@ -1 +1 @@ -{"address":"cb30f22ac2235ef6020516a503ba3c6222a068e65da6","crypto":{"cipher":"aes-128-ctr","ciphertext":"503096539824a2f433950a3e74884c6541fc0e5fed39c6900288646051b26b1549944a09a0fcb59c99c2f7649a587af1a179d8605a0a669953","cipherparams":{"iv":"2e4921d45922d3d09372442be46a88bd"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":6,"r":8,"salt":"7304a0e6dba9a7d6b209eb9d87b7bb747eb983854b09c5e39309934ac6d92c7b"},"mac":"c5cfaf38664d9034c28f6ee79045ae04320a1e0f3892b90f5ae9a4d6475b2b3d"},"id":"2355858f-b495-3d1d-846c-b65ecf3265db","version":3} \ No newline at end of file +{"address":"cb74db416ff2f9c53dabaf34f81142db30350ea7b144","crypto":{"cipher":"aes-128-ctr","ciphertext":"6aa169663d4ab11611d0e6d79988140fe8682fe4a3a201e7ce51678f60c448a2496d45adc1a5c1bd833e4e53daca5b75f3cf71a2e8255b5edd","cipherparams":{"iv":"da8c73f7f222997af20c3e378d8a3e83"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2,"p":1,"r":8,"salt":"b721d800bd2c0beec1f4d7d44315aa9d6f3c27360d0c965a9e52bd8b27914f96"},"mac":"9dd9f2a178bed1515bb5b64febe194b01d2b6bf48b12ad0485e4538bc1ca1638"},"id":"661fc28b-e59d-4aae-ab34-fb24eb8c51b7","version":3} \ No newline at end of file diff --git a/accounts/keystore/testdata/keystore/foo/fd9bd350f08ee3c0c19b85a8e16114a11a60aa4e b/accounts/keystore/testdata/keystore/foo/fd9bd350f08ee3c0c19b85a8e16114a11a60aa4e index 676c9866d..df127e420 100644 --- a/accounts/keystore/testdata/keystore/foo/fd9bd350f08ee3c0c19b85a8e16114a11a60aa4e +++ b/accounts/keystore/testdata/keystore/foo/fd9bd350f08ee3c0c19b85a8e16114a11a60aa4e @@ -1 +1 @@ -{"address":"cb22ac06311d367113a9ec35e2f44260b8a55a3753bd","crypto":{"cipher":"aes-128-ctr","ciphertext":"8e9e0fcc11168c54a489d541e046ba138d15f862754de5df80c2289dc7b8fcb3c9d0fd47935dd3b7b33fe401cbf1aa763016dbdef62b5bfc81","cipherparams":{"iv":"0faaa611faa95ddda4305271549b752f"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":6,"r":8,"salt":"ca2dc8495121a90d09e4dc193b39a83b0d98307d7e64a684bed845eff1e5f35c"},"mac":"73d82db94ad659a7ef8398a98ebc2cca856df01c0d8c1cdad4b67bad9c85ace7"},"id":"2355858f-b495-3d1d-846c-b65ecf3265db","version":3} \ No newline at end of file +{"address":"cb65e49851f010cd7d81b5b4969f3b0e8325c415359d","crypto":{"cipher":"aes-128-ctr","ciphertext":"e3baf22fc47c32bfb60c366f7420e6ec3c4e67304cffbe2eefda0b534cca7234a4e259c78c5d6af12793b131fa5c5e5edfd5654e9176a984d3","cipherparams":{"iv":"2c50c7de1792298229e7857c24f8b88e"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2,"p":1,"r":8,"salt":"1d960f43650c0633c42e111a84a44dfcb765a6ceb6c852592919a9c594e65387"},"mac":"80a0d1857a0baed49df9df93bcd7369d45ca9aeba54a6075800c59e49a7dfe70"},"id":"7220fd89-0227-4014-b55e-92abdfecf500","version":3} \ No newline at end of file diff --git a/accounts/keystore/testdata/keystore/zzz b/accounts/keystore/testdata/keystore/zzz index 676c9866d..df127e420 100644 --- a/accounts/keystore/testdata/keystore/zzz +++ b/accounts/keystore/testdata/keystore/zzz @@ -1 +1 @@ -{"address":"cb22ac06311d367113a9ec35e2f44260b8a55a3753bd","crypto":{"cipher":"aes-128-ctr","ciphertext":"8e9e0fcc11168c54a489d541e046ba138d15f862754de5df80c2289dc7b8fcb3c9d0fd47935dd3b7b33fe401cbf1aa763016dbdef62b5bfc81","cipherparams":{"iv":"0faaa611faa95ddda4305271549b752f"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":6,"r":8,"salt":"ca2dc8495121a90d09e4dc193b39a83b0d98307d7e64a684bed845eff1e5f35c"},"mac":"73d82db94ad659a7ef8398a98ebc2cca856df01c0d8c1cdad4b67bad9c85ace7"},"id":"2355858f-b495-3d1d-846c-b65ecf3265db","version":3} \ No newline at end of file +{"address":"cb65e49851f010cd7d81b5b4969f3b0e8325c415359d","crypto":{"cipher":"aes-128-ctr","ciphertext":"e3baf22fc47c32bfb60c366f7420e6ec3c4e67304cffbe2eefda0b534cca7234a4e259c78c5d6af12793b131fa5c5e5edfd5654e9176a984d3","cipherparams":{"iv":"2c50c7de1792298229e7857c24f8b88e"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2,"p":1,"r":8,"salt":"1d960f43650c0633c42e111a84a44dfcb765a6ceb6c852592919a9c594e65387"},"mac":"80a0d1857a0baed49df9df93bcd7369d45ca9aeba54a6075800c59e49a7dfe70"},"id":"7220fd89-0227-4014-b55e-92abdfecf500","version":3} \ No newline at end of file diff --git a/cmd/gocore/accountcmd_test.go b/cmd/gocore/accountcmd_test.go index db507e3f8..10dd34817 100644 --- a/cmd/gocore/accountcmd_test.go +++ b/cmd/gocore/accountcmd_test.go @@ -53,15 +53,15 @@ func TestAccountList(t *testing.T) { defer gocore.ExpectExit() if runtime.GOOS == "windows" { gocore.Expect(` -Account #0: {cb94b11771b0a90d32421b0bca90701f16923c32993c} keystore://{{.Datadir}}\keystore\UTC--2020-07-20T17-37-08.515483762Z--cb94b11771b0a90d32421b0bca90701f16923c32993c -Account #1: {cb30f22ac2235ef6020516a503ba3c6222a068e65da6} keystore://{{.Datadir}}\keystore\aaa -Account #2: {cb22ac06311d367113a9ec35e2f44260b8a55a3753bd} keystore://{{.Datadir}}\keystore\zzz +Account #0: {cb27de521e43741cf785cbad450d5649187b9612018f} keystore://{{.Datadir}}\keystore\UTC--2020-07-20T17-37-08.515483762Z--cb27de521e43741cf785cbad450d5649187b9612018f +Account #1: {cb74db416ff2f9c53dabaf34f81142db30350ea7b144} keystore://{{.Datadir}}\keystore\aaa +Account #2: {cb65e49851f010cd7d81b5b4969f3b0e8325c415359d} keystore://{{.Datadir}}\keystore\zzz `) } else { gocore.Expect(` -Account #0: {cb94b11771b0a90d32421b0bca90701f16923c32993c} keystore://{{.Datadir}}/keystore/UTC--2020-07-20T17-37-08.515483762Z--cb94b11771b0a90d32421b0bca90701f16923c32993c -Account #1: {cb30f22ac2235ef6020516a503ba3c6222a068e65da6} keystore://{{.Datadir}}/keystore/aaa -Account #2: {cb22ac06311d367113a9ec35e2f44260b8a55a3753bd} keystore://{{.Datadir}}/keystore/zzz +Account #0: {cb27de521e43741cf785cbad450d5649187b9612018f} keystore://{{.Datadir}}/keystore/UTC--2020-07-20T17-37-08.515483762Z--cb27de521e43741cf785cbad450d5649187b9612018f +Account #1: {cb74db416ff2f9c53dabaf34f81142db30350ea7b144} keystore://{{.Datadir}}/keystore/aaa +Account #2: {cb65e49851f010cd7d81b5b4969f3b0e8325c415359d} keystore://{{.Datadir}}/keystore/zzz `) } } @@ -104,10 +104,10 @@ func TestAccountUpdate(t *testing.T) { datadir := tmpDatadirWithKeystore(t) gocore := runGocore(t, "account", "update", "--datadir", datadir, "--lightkdf", - "cb22ac06311d367113a9ec35e2f44260b8a55a3753bd") + "cb65e49851f010cd7d81b5b4969f3b0e8325c415359d") defer gocore.ExpectExit() gocore.Expect(` -Unlocking account cb22ac06311d367113a9ec35e2f44260b8a55a3753bd | Attempt 1/3 +Unlocking account cb65e49851f010cd7d81b5b4969f3b0e8325c415359d | Attempt 1/3 !! Unsupported terminal, password will be echoed. Password: {{.InputLine "foobar"}} Please give a new password. Do not forget this password. @@ -146,10 +146,10 @@ func TestUnlockFlag(t *testing.T) { datadir := tmpDatadirWithKeystore(t) gocore := runGocore(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", - "--unlock", "cb22ac06311d367113a9ec35e2f44260b8a55a3753bd", + "--unlock", "cb65e49851f010cd7d81b5b4969f3b0e8325c415359d", "js", "testdata/empty.js") gocore.Expect(` -Unlocking account cb22ac06311d367113a9ec35e2f44260b8a55a3753bd | Attempt 1/3 +Unlocking account cb65e49851f010cd7d81b5b4969f3b0e8325c415359d | Attempt 1/3 !! Unsupported terminal, password will be echoed. Password: {{.InputLine "foobar"}} `) @@ -157,7 +157,7 @@ Password: {{.InputLine "foobar"}} wantMessages := []string{ "Unlocked account", - "=cb22ac06311d367113a9ec35e2f44260b8a55a3753bd", + "=cb65e49851f010cd7d81b5b4969f3b0e8325c415359d", } for _, m := range wantMessages { if !strings.Contains(gocore.StderrText(), m) { @@ -170,17 +170,17 @@ func TestUnlockFlagWrongPassword(t *testing.T) { datadir := tmpDatadirWithKeystore(t) gocore := runGocore(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", - "--unlock", "cb22ac06311d367113a9ec35e2f44260b8a55a3753bd") + "--unlock", "cb65e49851f010cd7d81b5b4969f3b0e8325c415359d") defer gocore.ExpectExit() gocore.Expect(` -Unlocking account cb22ac06311d367113a9ec35e2f44260b8a55a3753bd | Attempt 1/3 +Unlocking account cb65e49851f010cd7d81b5b4969f3b0e8325c415359d | Attempt 1/3 !! Unsupported terminal, password will be echoed. Password: {{.InputLine "foobar1"}} -Unlocking account cb22ac06311d367113a9ec35e2f44260b8a55a3753bd | Attempt 2/3 +Unlocking account cb65e49851f010cd7d81b5b4969f3b0e8325c415359d | Attempt 2/3 Password: {{.InputLine "foobar1"}} -Unlocking account cb22ac06311d367113a9ec35e2f44260b8a55a3753bd | Attempt 3/3 +Unlocking account cb65e49851f010cd7d81b5b4969f3b0e8325c415359d | Attempt 3/3 Password: {{.InputLine "foobar1"}} -Fatal: Failed to unlock account cb22ac06311d367113a9ec35e2f44260b8a55a3753bd (could not decrypt key with given password) +Fatal: Failed to unlock account cb65e49851f010cd7d81b5b4969f3b0e8325c415359d (could not decrypt key with given password) `) } @@ -202,8 +202,8 @@ Password: {{.InputLine "foobar"}} wantMessages := []string{ "Unlocked account", - "=cb94b11771b0a90d32421b0bca90701f16923c32993c", - "=cb22ac06311d367113a9ec35e2f44260b8a55a3753bd", + "=cb27de521e43741cf785cbad450d5649187b9612018f", + "=cb65e49851f010cd7d81b5b4969f3b0e8325c415359d", } for _, m := range wantMessages { if !strings.Contains(gocore.StderrText(), m) { @@ -222,8 +222,8 @@ func TestUnlockFlagPasswordFile(t *testing.T) { wantMessages := []string{ "Unlocked account", - "=cb94b11771b0a90d32421b0bca90701f16923c32993c", - "=cb22ac06311d367113a9ec35e2f44260b8a55a3753bd", + "=cb27de521e43741cf785cbad450d5649187b9612018f", + "=cb65e49851f010cd7d81b5b4969f3b0e8325c415359d", } for _, m := range wantMessages { if !strings.Contains(gocore.StderrText(), m) { @@ -247,7 +247,7 @@ func TestUnlockFlagAmbiguous(t *testing.T) { store := filepath.Join("..", "..", "accounts", "keystore", "testdata", "dupes") gocore := runGocore(t, "--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", - "--unlock", "cb30f22ac2235ef6020516a503ba3c6222a068e65da6", + "--unlock", "cb74db416ff2f9c53dabaf34f81142db30350ea7b144", "js", "testdata/empty.js") defer gocore.ExpectExit() @@ -257,10 +257,10 @@ func TestUnlockFlagAmbiguous(t *testing.T) { return abs }) gocore.Expect(` -Unlocking account cb30f22ac2235ef6020516a503ba3c6222a068e65da6 | Attempt 1/3 +Unlocking account cb74db416ff2f9c53dabaf34f81142db30350ea7b144 | Attempt 1/3 !! Unsupported terminal, password will be echoed. Password: {{.InputLine "foobar"}} -Multiple key files exist for address cb30f22ac2235ef6020516a503ba3c6222a068e65da6: +Multiple key files exist for address cb74db416ff2f9c53dabaf34f81142db30350ea7b144: keystore://{{keypath "1"}} keystore://{{keypath "2"}} Testing your password against all of them... @@ -272,7 +272,7 @@ In order to avoid this warning, you need to remove the following duplicate key f wantMessages := []string{ "Unlocked account", - "=cb30f22ac2235ef6020516a503ba3c6222a068e65da6", + "=cb74db416ff2f9c53dabaf34f81142db30350ea7b144", } for _, m := range wantMessages { if !strings.Contains(gocore.StderrText(), m) { @@ -285,7 +285,7 @@ func TestUnlockFlagAmbiguousWrongPassword(t *testing.T) { store := filepath.Join("..", "..", "accounts", "keystore", "testdata", "dupes") gocore := runGocore(t, "--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", - "--unlock", "cb30f22ac2235ef6020516a503ba3c6222a068e65da6") + "--unlock", "cb74db416ff2f9c53dabaf34f81142db30350ea7b144") defer gocore.ExpectExit() // Helper for the expect template, returns absolute keystore path. @@ -294,10 +294,10 @@ func TestUnlockFlagAmbiguousWrongPassword(t *testing.T) { return abs }) gocore.Expect(` -Unlocking account cb30f22ac2235ef6020516a503ba3c6222a068e65da6 | Attempt 1/3 +Unlocking account cb74db416ff2f9c53dabaf34f81142db30350ea7b144 | Attempt 1/3 !! Unsupported terminal, password will be echoed. Password: {{.InputLine "wrong"}} -Multiple key files exist for address cb30f22ac2235ef6020516a503ba3c6222a068e65da6: +Multiple key files exist for address cb74db416ff2f9c53dabaf34f81142db30350ea7b144: keystore://{{keypath "1"}} keystore://{{keypath "2"}} Testing your password against all of them... diff --git a/core/types/block_test.go b/core/types/block_test.go index 421f8404f..60f85bfca 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -18,14 +18,13 @@ package types import ( "bytes" + "github.com/core-coin/go-core/params" eddsa "github.com/core-coin/go-goldilocks" "hash" "math/big" "reflect" "testing" - "github.com/core-coin/go-core/params" - "github.com/core-coin/go-core/common" "github.com/core-coin/go-core/crypto" "github.com/core-coin/go-core/rlp" @@ -36,7 +35,7 @@ import ( func TestBlockEncoding(t *testing.T) { key, _ := crypto.HexToEDDSA("2da94fd47e8369ffe88850654de266727ff284c3f78d61b04153cb9a908ed3b61248ac5172d3caabbc3493807c0297645ae328e10eb9543bdb") - blockEnc := common.FromHex("f904b4f901daa00000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000096cb848888f1f195afa192cfee860698584c030f4c9db1a0ef1552a40b7165c3cd773806b9e0c165b75356e0314bf0706f279c729f51e017a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8825208845506eb078088a13a5a8c8f2bb1c4f902d3f902d0800a82c3500196cb4896f17ca7f974ce8b1d596292c83ba7f38257101b0a80b902aef902abf901daa00000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000096cb848888f1f195afa192cfee860698584c030f4c9db1a0ef1552a40b7165c3cd773806b9e0c165b75356e0314bf0706f279c729f51e017a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8825208845506eb078088a13a5a8c8f2bb1c4f8cbf8c9800a82c3500196cb723ce833507cdfb66b76332523f034b38d8b077f560a80b8a8ac4f81b3c3fc94b5deccc435a1dda8408dc2d4f36cb8cb5d88d80ab0d93a9129cd5ffc28d591c101ed4725809f3635f5cf554599ea8f751af59b43497b6f956eb346946ae69648f3f9f6a1df3e5828486219a3c64fce0fd4b1de04696d7abfb8fabf0a5e3c655c02d839eb4f09308722dbcc413b5871d83426cd5b3a0083e6f589f60c1177b287b8f4f764acfcba7dfceadc51ef37b40d6182e3fe6bce148c8a48e07379754ebbf8c0c0") + blockEnc := common.FromHex("f904b4f901daa00000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000096cb848888f1f195afa192cfee860698584c030f4c9db1a0ef1552a40b7165c3cd773806b9e0c165b75356e0314bf0706f279c729f51e017a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8825208845506eb078088a13a5a8c8f2bb1c4f902d3f902d0800a82c3500196cb8238748ee459bc0c1d86eab1d3f6d83bb433cdad9c0a80b902aef902abf901daa00000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000096cb848888f1f195afa192cfee860698584c030f4c9db1a0ef1552a40b7165c3cd773806b9e0c165b75356e0314bf0706f279c729f51e017a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8825208845506eb078088a13a5a8c8f2bb1c4f8cbf8c9800a82c3500196cb723ce833507cdfb66b76332523f034b38d8b077f560a80b8a8ac4f81b3c3fc94b5deccc435a1dda8408dc2d4f36cb8cb5d88d80ab0d93a9129cd5ffc28d591c101ed4725809f3635f5cf554599ea8f751af59b43497b6f956eb346946ae69648f3f9f6a1df3e5828486219a3c64fce0fd4b1de04696d7abfb8fabf0a5e3c655c02d839eb4f09308722dbcc413b5871d83426cd5b3a0083e6f589f60c1177b287b8f4f764acfcba7dfceadc51ef37b40d6182e3fe6bce148c8a48e07379754ebbf8c0c0") var block Block if err := rlp.DecodeBytes(blockEnc, &block); err != nil { t.Fatal("decode error: ", err) diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index a374e6ab9..dd61b47b9 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -66,7 +66,7 @@ func TestTransactionSigHash(t *testing.T) { if nucleus.Hash(emptyTx) != common.HexToHash("0x0064d7a2aa08686b4f36a2188352ba162ff2b5bdce72335f4a0e25a6c5f47af7") { t.Errorf("empty transaction hash mismatch, got %x", emptyTx.Hash()) } - if nucleus.Hash(rightvrsTx) != common.HexToHash("0xc5606a8629133547d2fe010fd1f2d2a144704e207e9eb35add40e49dac635300") { + if nucleus.Hash(rightvrsTx) != common.HexToHash("0x4da44e1f55eb0aa1958ce6a47fdf503b9cc9421fb1c4312b9eba1a3c5587e647") { t.Errorf("RightVRS transaction hash mismatch, got %x", rightvrsTx.Hash()) } } @@ -76,7 +76,7 @@ func TestTransactionEncode(t *testing.T) { if err != nil { t.Fatalf("encode error: %v", err) } - should := common.FromHex("f8cb800a82c3500196cb4896f17ca7f974ce8b1d596292c83ba7f38257101b0a821123b8a8b7ea2c0222ad2cf32dc5671dcff5b6d3190d328b2696cca92b5b17d56b76fb26b6e3e303f3d1c428828b0e86616f783b4fc0dcc9d60157f820d2ce5b6b2709734fcf4188bc1020db6e8b972c63531832d0ee4fd66a1c2cee858540e237ff4351d8b2ed0c08edf15a9851cfd532191c39825e4ad8d405878998a67c949b3f94e3445f1d6e61f69d091be53f4326eb9d9d05627375ef943ae9f1763689984aa377ed84cd8923973ab0") + should := common.FromHex("f8cb800a82c3500196cb8238748ee459bc0c1d86eab1d3f6d83bb433cdad9c0a821123b8a8b7ea2c0222ad2cf32dc5671dcff5b6d3190d328b2696cca92b5b17d56b76fb26b6e3e303f3d1c428828b0e86616f783b4fc0dcc9d60157f820d2ce5b6b2709734fcf4188bc1020db6e8b972c63531832d0ee4fd66a1c2cee858540e237ff4351d8b2ed0c08edf15a9851cfd532191c39825e4ad8d405878998a67c949b3f94e3445f1d6e61f69d091be53f4326eb9d9d05627375ef943ae9f1763689984aa377ed84cd8923973ab0") if !bytes.Equal(txb, should) { t.Errorf("encoded RLP mismatch, got %x", txb) } diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 41580aad3..b94bf29f2 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -91,7 +91,7 @@ func TestSharedKeyPadding(t *testing.T) { // sanity checks prv0 := hexKey("1033b1bac4c731e800b6399a357e51cf1b20eec942aac608c90b89553003e2ed3f94bd80613ee9006b1e62b6bb45109d0db9a4833e78363991") prv1 := hexKey("fdf02153a9d5e3e0f3a958bbe9ee7e79eaf77a22703aee462354998ab0178f06566707c297df3510a3b071ccedac6b3154531aa51d10401868") - pub0 := decode("d0ac61cb8a3712468f5264def724a8e569d0973a88da1a14c3c3fd6db8cb79c947f36ac1b5a975790ffe46a019ed7c28500aa2f5a8b9562200") + pub0 := decode("2f65ab658f3b0bc9fbdea48703b9c5c0dc2151c5ae8c4b77b1e5cdaee9fa20748e01960ab51ddb118d1209f73d186f0444921ad72c7c757480") pub1 := decode("77b1d24670fee6dd811f4f06573ce5f19844eb50cb6ce960d12bdbc8bf77be2221111cf755371d9e896e544ea2a4ebf206b775df55f5e74580") prv0Pub := eddsa.Ed448DerivePublicKey(*prv0) @@ -237,7 +237,7 @@ func TestSharedKeyStatic(t *testing.T) { t.Fatal(ErrBadSharedKeys) } - sk := decode("3db819aa0ebae1996860cf44941e57b4df43b50908e46717e3a23b1eee114ce0a4535683eb44b9e533075d0a4e3333d8c6752736a6faa327") + sk := decode("55a3895b1c32b1d9b2160d81da1f56d2f60641fc6b997adffc53b5f473e2b62a0dc65fb4aed8fddbae912864b683a29885df4bd86c1d4760") if !bytes.Equal(sk1, sk) { t.Fatalf("shared secret mismatch: want: %x have: %x", sk, sk1) } diff --git a/crypto/signature_test.go b/crypto/signature_test.go index df3f066df..a65dc080b 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -29,8 +29,8 @@ import ( var ( testmsg = common.Hex2Bytes("ce0677bb30baa8cf067c88db9811f4333d131bf8bcf12fe7065d211dce971008") - testsig = common.Hex2Bytes("59bcf2f083adb0df2d45adf500effdec7bf50396c41ad6bef98bbe9f05b127d4ee0557197cc489cb2446d0824bbcdedadf7e649f4d04e3c18012d49157fe68aea683779db4e579bc4b17d815a924f8f9cfe0c1e301bbee423aaba58952cebb60d43135d0a70237d691c178f36136140926009c9023964b1c45772f748867b8f3dbf02732537c21bceb3b7b0cc69d1b5c275fb3a76bfc482dfff2336d3e18da9fdb3139459b02b51a8d8f00") - testpubkey = common.Hex2Bytes("9c9023964b1c45772f748867b8f3dbf02732537c21bceb3b7b0cc69d1b5c275fb3a76bfc482dfff2336d3e18da9fdb3139459b02b51a8d8f00") + testsig = common.Hex2Bytes("ea535a535ff0dbfda0b2c1394bad87311789c1c6eafe6eef48fd509c2e7ba0e67c4774fab8c45abf1c7e22532bb816115bf1da8438fdb81e00e13ca01494adc201c9c35bc32cdd7c1922a0b1121f1d8ed72b37786dfd6e5583b06ad172bdb4f1d2afd41b4444abd2b5901c851fcb3d641200fadc64a37e95ad1bcbaf19625bf95826e6a8cbab42b57fc91b72da98d26bae8bda2d1fc52c508a03724aded17b8cef8253f2116307bbbf7580") + testpubkey = common.Hex2Bytes("fadc64a37e95ad1bcbaf19625bf95826e6a8cbab42b57fc91b72da98d26bae8bda2d1fc52c508a03724aded17b8cef8253f2116307bbbf7580") ) func TestEcrecover(t *testing.T) { diff --git a/go.mod b/go.mod index c07fdd456..531643836 100644 --- a/go.mod +++ b/go.mod @@ -3,68 +3,55 @@ module github.com/core-coin/go-core go 1.13 require ( - github.com/Azure/azure-pipeline-go v0.2.2 // indirect github.com/Azure/azure-storage-blob-go v0.7.0 - github.com/Azure/go-autorest/autorest/adal v0.8.0 // indirect - github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect github.com/VictoriaMetrics/fastcache v1.6.0 github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 github.com/aws/aws-sdk-go v1.25.48 github.com/cespare/cp v0.1.0 github.com/cloudflare/cloudflare-go v0.14.0 - github.com/core-coin/go-goldilocks v1.0.6 + github.com/core-coin/go-goldilocks v1.0.7 github.com/core-coin/go-randomy v0.0.12 github.com/davecgh/go-spew v1.1.1 github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea - github.com/dlclark/regexp2 v1.2.0 // indirect github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498 github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa github.com/fatih/color v1.7.0 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff - github.com/go-ole/go-ole v1.2.1 // indirect - github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect github.com/go-stack/stack v1.8.0 github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.3 - github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989 - github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277 - github.com/hashicorp/golang-lru v0.5.4 + github.com/gorilla/websocket v1.4.2 + github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29 + github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d github.com/hpcloud/tail v1.0.0 - github.com/huin/goupnp v1.0.1-0.20210626160114-33cdcbb30dda + github.com/huin/goupnp v1.0.2 github.com/influxdata/influxdb v1.8.3 github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 - github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/julienschmidt/httprouter v1.2.0 github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 - github.com/kylelemons/godebug v1.1.0 // indirect - github.com/mattn/go-colorable v0.1.0 - github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035 - github.com/naoina/go-stringutil v0.1.0 // indirect + github.com/mattn/go-colorable v0.1.8 + github.com/mattn/go-isatty v0.0.12 github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 github.com/olekukonko/tablewriter v0.0.5 github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 github.com/prometheus/tsdb v0.7.1 github.com/rjeczalik/notify v0.9.1 - github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00 - github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521 // indirect + github.com/rs/cors v1.7.0 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 // indirect github.com/stretchr/testify v1.7.0 github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef - golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 - golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20210510120138-977fb7262007 - golang.org/x/text v0.3.4 - golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 + golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 + golang.org/x/text v0.3.6 + golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 gopkg.in/urfave/cli.v1 v1.20.0 - gotest.tools v2.2.0+incompatible // indirect ) diff --git a/go.sum b/go.sum index c87c1db0c..1135c2dfe 100644 --- a/go.sum +++ b/go.sum @@ -47,6 +47,7 @@ github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIO github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= +github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -58,10 +59,27 @@ github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4 github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/aws/aws-sdk-go v1.25.48 h1:J82DYDGZHOKHdhx6hD24Tm30c2C3GchYGfN0mf9iKUk= github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= +github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= +github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8= +github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4= +github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= +github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= +github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= +github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= +github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= +github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= +github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= +github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= +github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= +github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= @@ -76,21 +94,23 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.14.0 h1:gFqGlGl/5f9UGXAaKapCGUfaTCgRKKnzu2VvzMZlOFA= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= -github.com/core-coin/go-goldilocks v1.0.4 h1:LrHUzGGao7BA5InwRe0q+7cxXo9TJD5VEjQjhfEbKQo= -github.com/core-coin/go-goldilocks v1.0.4/go.mod h1:uXjPZTv3XMF/wmyidKozOb8yQwWmg2ZbO0Amcuiw9mg= -github.com/core-coin/go-goldilocks v1.0.6 h1:ETizs4nr+9KgsY9QIZAp4uIk7gyiWzRQ5CBn1oqO37U= -github.com/core-coin/go-goldilocks v1.0.6/go.mod h1:uXjPZTv3XMF/wmyidKozOb8yQwWmg2ZbO0Amcuiw9mg= -github.com/core-coin/go-randomy v0.0.11 h1:ny6CiSDpb5AdK/g3cZ65oEuZn0zby+NJcmOAFq4Ma7Q= -github.com/core-coin/go-randomy v0.0.11/go.mod h1:EygyK38LKN0+kYYXe5fDDFd+xLlNqKm93JmJz3hT7Jc= +github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= +github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= +github.com/core-coin/go-goldilocks v1.0.7 h1:7VVgRbxvcbq9y6QHGykifv9JZKYkfBc10Yg4x5u1RDY= +github.com/core-coin/go-goldilocks v1.0.7/go.mod h1:JTm1uvJTW3v825Qg1s8Xb/MzmQUxCIPH1iTiL0aq710= github.com/core-coin/go-randomy v0.0.12 h1:IZQXFzquwvqVxzDScck18NDxBSxMxyGs8fW/0Gfy9Kw= github.com/core-coin/go-randomy v0.0.12/go.mod h1:EygyK38LKN0+kYYXe5fDDFd+xLlNqKm93JmJz3hT7Jc= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= +github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X6GqbFowYdYdI0L9bwxL07jyPZIdepyZ0= github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= +github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= +github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= @@ -102,10 +122,12 @@ github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498 h1:Y9vTBSsV4hSwPSj4bacAU/eSnV3dAxVpepaghAdhGoQ= github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa h1:XKAhUk/dtp+CV0VO6mhG2V7jA9vbcGcnYF/Ay9NjZrY= github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/go-ethereum v1.10.8/go.mod h1:pJNuIUYfX5+JKzSD/BTdNsvJSZ1TJqmz0dVyXMAbf6M= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= @@ -116,8 +138,12 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= +github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= +github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0= @@ -127,6 +153,8 @@ github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80n github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-sourcemap/sourcemap v2.1.2+incompatible h1:0b/xya7BKGhXuqFESKM4oIiRo9WOt2ebz7KxfreD6ug= github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -152,6 +180,7 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -159,6 +188,7 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -166,47 +196,60 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989 h1:giknQ4mEuDFmmHSrGcbargOuLHQGtywqo4mheITex54= -github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277 h1:E0whKxgp2ojts0FDgUA8dl62bmH0LxKanMoBr6MDTDM= -github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29 h1:sezaKhEfPFg8W0Enm61B9Gs911H8iesGY5R8NDPtd1M= +github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= +github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= +github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huin/goupnp v1.0.1-0.20210626160114-33cdcbb30dda h1:Vofqyy/Ysqit++X33unU0Gr08b6P35hKm3juytDrBVI= -github.com/huin/goupnp v1.0.1-0.20210626160114-33cdcbb30dda/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM= +github.com/huin/goupnp v1.0.2 h1:RfGLP+h3mvisuWEyybxNq5Eft3NWhHLPeUN72kpKZoI= +github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.8.3 h1:WEypI1BQFTT4teLM+1qkEcvUi0dAvopAI/ir0vAiBg8= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= +github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE= +github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= +github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19ybifQhZoQNF5D8= github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJyexcZ3pYbTI9jWx5tHo1Dee/tWbLMfPe2TA= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= +github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= @@ -220,6 +263,7 @@ github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 h1:I/yrLt2WilKxlQKCM5 github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= @@ -234,16 +278,26 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.0 h1:v2XXALHHh6zHfYTJ+cSkwtyffnaOyR1MXaA91mTrb8o= -github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d h1:oNAwILwmgWKFpuU+dXvI6dl9jG2mAWAZLX3r9s0PPiw= github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035 h1:USWjF42jDCSEeikX/G1g40ZWnsPXN5WkZ4jMHZWyBK4= -github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= @@ -264,9 +318,11 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= @@ -305,14 +361,13 @@ github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1 github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00 h1:8DPul/X0IT/1TNMIxoKLwdemEOBBHDC/K4EB16Cw5WE= -github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521 h1:3hxavr+IHMsQBrYUPQM5v0CgENFktkkbg1sfpgM3h20= -github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= +github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -333,31 +388,43 @@ github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 h1:xQdMZ1WLrgkkvOZ/LDQxjVxMLdby7osSh4ZEVa5sIjs= github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= +github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= +github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -384,6 +451,8 @@ golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCc golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -401,10 +470,13 @@ golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -417,6 +489,7 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -425,6 +498,7 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -432,32 +506,47 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 h1:uCLL3g5wH2xjxVREVuAbP9JM5PPKjRbXKRa6IBjkzmU= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE= +golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -479,10 +568,12 @@ golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -554,8 +645,9 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= @@ -565,5 +657,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/internal/jsre/deps/bindata.go b/internal/jsre/deps/bindata.go index a6ecc57af..dc161cb5e 100644 --- a/internal/jsre/deps/bindata.go +++ b/internal/jsre/deps/bindata.go @@ -1,14 +1,14 @@ -// Code generated by go-bindata. +// Code generated by go-bindata. DO NOT EDIT. // sources: -// bignumber.js -// web3.js -// DO NOT EDIT! +// bignumber.js (17.314kB) +// web3.js (551.362kB) package deps import ( "bytes" "compress/gzip" + "crypto/sha256" "fmt" "io" "io/ioutil" @@ -21,7 +21,7 @@ import ( func bindataRead(data []byte, name string) ([]byte, error) { gz, err := gzip.NewReader(bytes.NewBuffer(data)) if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %w", name, err) } var buf bytes.Buffer @@ -29,7 +29,7 @@ func bindataRead(data []byte, name string) ([]byte, error) { clErr := gz.Close() if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %w", name, err) } if clErr != nil { return nil, err @@ -39,8 +39,9 @@ func bindataRead(data []byte, name string) ([]byte, error) { } type asset struct { - bytes []byte - info os.FileInfo + bytes []byte + info os.FileInfo + digest [sha256.Size]byte } type bindataFileInfo struct { @@ -84,8 +85,8 @@ func bignumberJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "bignumber.js", size: 17314, mode: os.FileMode(436), modTime: time.Unix(1632380968, 0)} - a := &asset{bytes: bytes, info: info} + info := bindataFileInfo{name: "bignumber.js", size: 17314, mode: os.FileMode(0664), modTime: time.Unix(1603198464, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x5b, 0x75, 0xfc, 0x15, 0x5e, 0x7d, 0x27, 0x1a, 0x9a, 0xb5, 0xfb, 0x16, 0x90, 0xf4, 0x93, 0xac, 0xcb, 0x6c, 0x9c, 0xcd, 0x68, 0xe6, 0xd0, 0x3a, 0xcf, 0xa3, 0x83, 0x5c, 0x20, 0x34, 0x66, 0x45}} return a, nil } @@ -104,8 +105,8 @@ func web3Js() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "web3.js", size: 551362, mode: os.FileMode(436), modTime: time.Unix(1632383656, 0)} - a := &asset{bytes: bytes, info: info} + info := bindataFileInfo{name: "web3.js", size: 551362, mode: os.FileMode(0664), modTime: time.Unix(1633091877, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xe5, 0x40, 0x45, 0x91, 0x90, 0xaf, 0x9d, 0xce, 0xcc, 0x67, 0x77, 0x6d, 0x4a, 0xd, 0x1f, 0x6, 0x41, 0x9f, 0x0, 0xf2, 0x94, 0xa0, 0x93, 0xf0, 0xe2, 0xd7, 0xcd, 0x2, 0x6e, 0x8d, 0x56, 0xa}} return a, nil } @@ -113,8 +114,8 @@ func web3Js() (*asset, error) { // It returns an error if the asset could not be found or // could not be loaded. func Asset(name string) ([]byte, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) @@ -124,6 +125,12 @@ func Asset(name string) ([]byte, error) { return nil, fmt.Errorf("Asset %s not found", name) } +// AssetString returns the asset contents as a string (instead of a []byte). +func AssetString(name string) (string, error) { + data, err := Asset(name) + return string(data), err +} + // MustAsset is like Asset but panics when Asset would return an error. // It simplifies safe initialization of global variables. func MustAsset(name string) []byte { @@ -135,12 +142,18 @@ func MustAsset(name string) []byte { return a } +// MustAssetString is like AssetString but panics when Asset would return an +// error. It simplifies safe initialization of global variables. +func MustAssetString(name string) string { + return string(MustAsset(name)) +} + // AssetInfo loads and returns the asset info for the given name. // It returns an error if the asset could not be found or // could not be loaded. func AssetInfo(name string) (os.FileInfo, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) @@ -150,6 +163,33 @@ func AssetInfo(name string) (os.FileInfo, error) { return nil, fmt.Errorf("AssetInfo %s not found", name) } +// AssetDigest returns the digest of the file with the given name. It returns an +// error if the asset could not be found or the digest could not be loaded. +func AssetDigest(name string) ([sha256.Size]byte, error) { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { + a, err := f() + if err != nil { + return [sha256.Size]byte{}, fmt.Errorf("AssetDigest %s can't read by error: %v", name, err) + } + return a.digest, nil + } + return [sha256.Size]byte{}, fmt.Errorf("AssetDigest %s not found", name) +} + +// Digests returns a map of all known files and their checksums. +func Digests() (map[string][sha256.Size]byte, error) { + mp := make(map[string][sha256.Size]byte, len(_bindata)) + for name := range _bindata { + a, err := _bindata[name]() + if err != nil { + return nil, err + } + mp[name] = a.digest + } + return mp, nil +} + // AssetNames returns the names of the assets. func AssetNames() []string { names := make([]string, 0, len(_bindata)) @@ -165,6 +205,9 @@ var _bindata = map[string]func() (*asset, error){ "web3.js": web3Js, } +// AssetDebug is true if the assets were built with the debug flag enabled. +const AssetDebug = false + // AssetDir returns the file names below a certain // directory embedded in the file by go-bindata. // For example if you run go-bindata on data/... and data contains the @@ -174,15 +217,15 @@ var _bindata = map[string]func() (*asset, error){ // img/ // a.png // b.png -// then AssetDir("data") would return []string{"foo.txt", "img"} -// AssetDir("data/img") would return []string{"a.png", "b.png"} -// AssetDir("foo.txt") and AssetDir("notexist") would return an error +// then AssetDir("data") would return []string{"foo.txt", "img"}, +// AssetDir("data/img") would return []string{"a.png", "b.png"}, +// AssetDir("foo.txt") and AssetDir("notexist") would return an error, and // AssetDir("") will return []string{"data"}. func AssetDir(name string) ([]string, error) { node := _bintree if len(name) != 0 { - cannonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(cannonicalName, "/") + canonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(canonicalName, "/") for _, p := range pathList { node = node.Children[p] if node == nil { @@ -210,7 +253,7 @@ var _bintree = &bintree{nil, map[string]*bintree{ "web3.js": {web3Js, map[string]*bintree{}}, }} -// RestoreAsset restores an asset under the given directory +// RestoreAsset restores an asset under the given directory. func RestoreAsset(dir, name string) error { data, err := Asset(name) if err != nil { @@ -228,14 +271,10 @@ func RestoreAsset(dir, name string) error { if err != nil { return err } - err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) - if err != nil { - return err - } - return nil + return os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) } -// RestoreAssets restores an asset under the given directory recursively +// RestoreAssets restores an asset under the given directory recursively. func RestoreAssets(dir, name string) error { children, err := AssetDir(name) // File @@ -253,6 +292,6 @@ func RestoreAssets(dir, name string) error { } func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) + canonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(canonicalName, "/")...)...) } diff --git a/p2p/discover/v4_lookup_test.go b/p2p/discover/v4_lookup_test.go index 3a0b7749d..a94337e1a 100644 --- a/p2p/discover/v4_lookup_test.go +++ b/p2p/discover/v4_lookup_test.go @@ -175,45 +175,37 @@ func checkLookupResults(t *testing.T, tn *preminedDevin, results []*enode.Node) var lookupDevin = &preminedDevin{ target: hexEncPubkey("8e3646849ec3232a7a73aef657f05ae9437c0b7960919e9d2c41760ba1fb8fa81970339ef20ffded54da1c7c1a48698d56ea6cda5fa4535f60"), dists: [257][]*eddsa.PrivateKey{ - 250: { - hexEncPrivkey("4e0fa28ffcc38dde53d62cae67296a409dbac36abc5b77242a1e36f9569cf5073fc4dbb8cbf656b2219e173071bc46eb52c3788b92635430ab"), - hexEncPrivkey("e8ddff19e703d8fc127f84804368f3206d07cbeb9b52329e12facafc57b33c45806513d1200976749955d460d4ffcaf1e89932f54fd08929a9"), - hexEncPrivkey("c9ac39684fa2a736a3a2d3dcecf381e49d051fe1af2491324790474d0968d7e8d17d85cc7ddb99443e67b8bca53447851c047340407d2705c6"), - hexEncPrivkey("b3e39098d5b41d7d9d306068213e7312540335ef1cfd3bbaab5457790c093739aa488185129892f315a5b998700f5c87b3b43fcee00c111881"), - hexEncPrivkey("01f201e25338f6527680b108383719167522e2f47c327e024fd4fc07d297160540ab6f390729dc344ddb439fb089d4a144a9abc2c047fb128a"), - }, 251: { hexEncPrivkey("4ec11de85d5eae2185956f08e214dad13b77643cc68fdc78cd91d6f7a641ab8f4e3ec37d0a58aaafb77fd37723e021b2303b45f42f848b17e8"), hexEncPrivkey("8572729f472bd32f4e4cfdca7d8d9c1d1869cd24c4bfee25f3d80033aba409bfddc37a2a7d41b5df7af7acbf8efe64bbbbd320f268faf929f6"), hexEncPrivkey("02476279c874e251a436da90658741aab2abc70c13dce1fb1f760fc15a33134c6632dec8b3efaf7d104fbed699cd0a6c0b4c18a6cbb509148a"), - hexEncPrivkey("2e0b546595b30da4686cb0de2a297f784790cf9e464e5148ef5fb17073daab62fc49a0db9fb85ceaa5b57694e7595fd4b1e871c49f21f53fb2"), - hexEncPrivkey("3182b70f6a9005a84d20ea90b3c4c4e349dd1af41cbdd616e8c6d5bf19bf5b913d4882ca1afac2a1ff5e3bf243d95603f26a8322f5930e35a6"), + hexEncPrivkey("7be4205cc11c06f7cd5229b97c5cfd1520857b5324ea94d081af3d0f5d45cb2a9b18af6c0347f4b93df8d0f3fa2abc100bd324dd3649fb305f"), hexEncPrivkey("29018630edb797f47a0bd266e2b7d20acb87563ee299e0a9fc93ef9d74823655c2bb06495901e584cb97e6b5c0c5640f1525ff063e2f6422e6"), hexEncPrivkey("c58a2e28d4f6b636073ba2f7743e6b339580d673a3bd7912e2d3fbcbef916bc87f8a7135f9385035c169b1b5254d6f46f9fec5a578e0be0616"), + hexEncPrivkey("4e0fa28ffcc38dde53d62cae67296a409dbac36abc5b77242a1e36f9569cf5073fc4dbb8cbf656b2219e173071bc46eb52c3788b92635430ab"), }, - 253: { + 252: { hexEncPrivkey("de76ffa137c42a6907d7ec018c7c396edbbc7e7381d0694bc0735ecb4c2a678d9ba1557d7b7cd55fb5e15caa36effba76cbb092e78bfae2aac"), hexEncPrivkey("a5c81bd0cb63b0e7c8115661736fda9bfd00a1dbedbc992d7e29672420410f3a68f6bfd9e3198411d1646984a2c71a2664010bf98d486f0429"), hexEncPrivkey("8f262dcbadd8e8473874491ebf27603f76e899a58934701f656ab98de1e704a84e31dbf72168026456d85a58aec626e593946d23b750723c5f"), - hexEncPrivkey("6a8bd432989c7b9da111ba0ee260884b196b802a3afccccf7faaeb76974d830e9095f3b8f9f30ed961b23be06cd5013ce7a60ecc1831c9105a"), - hexEncPrivkey("8dcde5e7e89f70a14e512f0f8044689739d983de63b26b887a454c227db43202a17afb37cb4d0176470e319ab0ad0d74e38ba10335e8c0184a"), - hexEncPrivkey("5355491fedbb2faee68a855a4b562ad19e187e84df8ec52a827c71c7f8cf30aee16a9511c339d1f330c397caa184db5d7d80ab7b29e0313cbc"), - hexEncPrivkey("e7ccb1c830a74568e02512f9e2fdc8c09bb93ab4302781c040f1b4b0ac3b4bb0ab73c898a6ba30bec3d936f48493fc6a4fc2c6a6b7c04734ab"), hexEncPrivkey("6d2fbdfaf77ce9faf47349e8c67f786036a9cb30ca44853567c474d35d6a12a28fdcb909e2f08793e40060ce84524496913b43c7bfcb0502bf"), hexEncPrivkey("823a8b9e05d8ae96d270e1a45d9f65ec5e339ae34bb4d6d4a72fd65878a79a71575b443288a967e4c05edde1d12bd68794961f74129b1b359e"), }, - 254: { + 253: { + hexEncPrivkey("e8ddff19e703d8fc127f84804368f3206d07cbeb9b52329e12facafc57b33c45806513d1200976749955d460d4ffcaf1e89932f54fd08929a9"), hexEncPrivkey("dc7f83393ee14d76fc172916a97b2fae99c1e519254e22e5496b3fc1e141d294655f659af388aa39185bfc5edbbe477d2fca276b742d400ac6"), hexEncPrivkey("86554af46fb8bef12c7c2b692de76d40faf3763c777d73c2a9e8d75fc45762e4486df4367223d5b21dd8a16f6e82eb93dc2cba22ab984c3163"), hexEncPrivkey("3d3c1ecc8d3d24dfe57e87667752304a98e54aa9ae930bb8fcc54a72db74779633233fca7cbf3accf660ee9797252de3744ea10e713d8216e9"), hexEncPrivkey("838a6a651b88046811642af151a11c92bf7bcea94f3501b2dc640464a0826594e00cb263d048d336f486b7377ac6a1cc316596412a35922d4b"), hexEncPrivkey("db25870ff65a850f906b651ef5269134173a83780c6208efd32da1163545472fba7b1ca36941d14a7bf35ad513d54483ef1cd90eda70c631f3"), hexEncPrivkey("efb928b925f75f788d8a7608673cff2491a545a229f8dd3317cef12dd1e01a1513b4f32548ef2857709a0dfaf1e7608e5d2405bd459b4d2c3f"), - hexEncPrivkey("f01db2e896243ebeae26224f1e7cf431f9b7ed42cef4891786a56bce00913058402a957a55170677d6bacdfd3ed9d477b7a475d1f01ae70a36"), hexEncPrivkey("cd68374c9e3563e783a64d1c4e8e10374ee683d02db3b8abda8d95344e2309defb2b6b8d6beea7534c662a5b015f62ef52b84f2a79024a3cc4"), hexEncPrivkey("62b9528842ef9c6718174d08fe2885c5986be762df7f9b9b79a6197541af9d254bff702993f0d8838fb73fef9f65d8d4973696eccb25d21020"), }, - 255: { + 254: { + hexEncPrivkey("b3e39098d5b41d7d9d306068213e7312540335ef1cfd3bbaab5457790c093739aa488185129892f315a5b998700f5c87b3b43fcee00c111881"), + hexEncPrivkey("01f201e25338f6527680b108383719167522e2f47c327e024fd4fc07d297160540ab6f390729dc344ddb439fb089d4a144a9abc2c047fb128a"), + hexEncPrivkey("c9ac39684fa2a736a3a2d3dcecf381e49d051fe1af2491324790474d0968d7e8d17d85cc7ddb99443e67b8bca53447851c047340407d2705c6"), hexEncPrivkey("703d57c414280bd8a37c9b1006bbc9688029d381d2f7923670af9b6b5b75d5cffbb41fc48e9d4dc1b2dacfa236d90de006e1cb23cbbd710d7c"), hexEncPrivkey("d57bc206235847a6054e7094a6bdce137fdd8c8d991a312ddec7ebbb10ca9378dfaca0f2cb44e05143d868829add5c44c09d4ab6d224563e9e"), hexEncPrivkey("c89f9b6bbd5243ca9d42619b72fc0b65b3f1f913af1f23d71f3efab4e56ec69019a3a71bd8ebf0f68316c2e88fb826208bd432186967ba3dd3"), @@ -222,8 +214,16 @@ var lookupDevin = &preminedDevin{ hexEncPrivkey("4c58b93a9273b11b0ea9d2918c0d5c43b34ea26e35492816d13b981a4a6e6e57588b5449dc00487b34eb2687cf6715933ad6704b3821093886"), hexEncPrivkey("d1f02c0d56ce58bb7b086a1da55cabb14ca29368d46c84d91a047dd8e16b97ea37ee8937e139d2fcfbfb6fef08f2a2f824e3aa700e820b214b"), }, + 255: { + hexEncPrivkey("6a8bd432989c7b9da111ba0ee260884b196b802a3afccccf7faaeb76974d830e9095f3b8f9f30ed961b23be06cd5013ce7a60ecc1831c9105a"), + hexEncPrivkey("8dcde5e7e89f70a14e512f0f8044689739d983de63b26b887a454c227db43202a17afb37cb4d0176470e319ab0ad0d74e38ba10335e8c0184a"), + hexEncPrivkey("5355491fedbb2faee68a855a4b562ad19e187e84df8ec52a827c71c7f8cf30aee16a9511c339d1f330c397caa184db5d7d80ab7b29e0313cbc"), + hexEncPrivkey("e7ccb1c830a74568e02512f9e2fdc8c09bb93ab4302781c040f1b4b0ac3b4bb0ab73c898a6ba30bec3d936f48493fc6a4fc2c6a6b7c04734ab"), + }, 256: { - hexEncPrivkey("7be4205cc11c06f7cd5229b97c5cfd1520857b5324ea94d081af3d0f5d45cb2a9b18af6c0347f4b93df8d0f3fa2abc100bd324dd3649fb305f"), + hexEncPrivkey("f01db2e896243ebeae26224f1e7cf431f9b7ed42cef4891786a56bce00913058402a957a55170677d6bacdfd3ed9d477b7a475d1f01ae70a36"), + hexEncPrivkey("2e0b546595b30da4686cb0de2a297f784790cf9e464e5148ef5fb17073daab62fc49a0db9fb85ceaa5b57694e7595fd4b1e871c49f21f53fb2"), + hexEncPrivkey("3182b70f6a9005a84d20ea90b3c4c4e349dd1af41cbdd616e8c6d5bf19bf5b913d4882ca1afac2a1ff5e3bf243d95603f26a8322f5930e35a6"), hexEncPrivkey("f77933ae3d48cb6dff8d102db4b96258cba5d2695f9f9f23384fa08f666a50558ed58ec402742d39da5507b9700a0a12758bda6530290a2e1d"), hexEncPrivkey("5a60fa5213ae61a87286d64483fffc850691437014e478841f17538d8cc612a4d1664e3d1e8ef3bde5e75b7edb1fc137370f2630f7211734cb"), }, diff --git a/p2p/dnsdisc/client_test.go b/p2p/dnsdisc/client_test.go index 2236cfbfb..da8b578e0 100644 --- a/p2p/dnsdisc/client_test.go +++ b/p2p/dnsdisc/client_test.go @@ -42,21 +42,21 @@ const ( func TestClientSyncTree(t *testing.T) { r := mapResolver{ - "EKGDFXDJFOGNNKIH66UR4TKZMU.n": "enr:-Pm4qyUfi0JirUuXJJFfYF2uxs_Z_bwtNk7QCZiqVBJaMTqalJlyxhmwkhtubqiuk4GUigbtPrkgeWmHgCnmlcfeH_xaoRXvLwRdi3Y3F7Ll2FK1Cp0FicKZExheLWGnldu4G7AHhH9CjewMXslyfoPZp_cQADQGL9Zm-16uVazy2WTjIqqv7MEVYdFsz15hOFN8zUbmJadJUk_h6cXgi5zI2bQDNMpOQ4gEwncoAICCaWSCdjSJc2VjcDI1NmsxuDk0Bi_WZvterlWs8tlk4yKqr-zBFWHRbM9eYThTfM1G5iWnSVJP4enF4IucyNm0AzTKTkOIBMJ3KAA", + "AZ2AA7473KDOKV7PC3GMHBXZSE.n": "enr:-Pm4q1Jkab2APz8czlz1s8NxAZYGjIutJ0Or9tucWsbQnzA5uGrgqeOt2jmV3zC423-V6pGEto25A6fwgH-BxlojPGJwKfBv-kAt3p2WpWCuXsrv58mGFDV18Si0RPzVk04Jact6D2STKiyQDhasrWw94dUcAHxVxTpa-ZmsVbDRxaijR6cRzDr6EuJ_zNZ5PIJtnip-37g-dI_K44yrJZK97PnOaqlrtHrjykxVAICCaWSCdjSJc2VjcDI1NmsxuDl8VcU6WvmZrFWw0cWoo0enEcw6-hLif8zWeTyCbZ4qft-4PnSPyuOMqyWSvez5zmqpa7R648pMVQA", "FFWEK2OQ5VIQR6UVZCTXPYTWI4.n": "enr:-Pm4q-56O3Ed1neHk_0leSRDqNm-uCqxBbekTF7vZJoVC3UAKbs_ozkQaDMBa7yIQdrhGfbHlah7wAOPAIjBJ6JHRJNQBevMWIbLCY3XoGROUrmVhoyUdB3LL8STkVSurs5VLJbWuQF2IUac7UOILSsD3Xg2AKMHAoZkYa-RtQVo4_9_l47u_sO-Ggberg4RJkamAZS-cMx5boa9vO7_8Cxk6YZLRzXEXGqhJa0tgAKCaWSCdjSJc2VjcDI1NmsxuDmjBwKGZGGvkbUFaOP_f5eO7v7DvhoG3q4OESZGpgGUvnDMeW6Gvbzu__AsZOmGS0c1xFxqoSWtLYA", - "QAO2PMLNIZU6HVN4OGDWWQ4UCQ.n": "enrtree-branch:RESRN326FX43MSLLCGJTO64QNE,EKGDFXDJFOGNNKIH66UR4TKZMU,FFWEK2OQ5VIQR6UVZCTXPYTWI4", "RESRN326FX43MSLLCGJTO64QNE.n": "enr:-Pm4q4K4eHfS_nw1XZzCEzcx2wE3xwgOcEcrbD8xduY9lahR9Y99FKuo38r73EcyFashWcCvw6KFOd_ggPKhgG0g9D-iBt5oH27IRFWhfes-mhh41SGAxn2hOolcRH6N-QZma9orGk9b6wFnyikIEtf3DsMsANbRV07JV2YasbfV8oJTJyN3DSaRp3Mocpg1LJl6aV9sapqrZR46_JRrNZPfG8oWrU8YJAbfcxHBAAGCaWSCdjSJc2VjcDI1NmsxuDnW0VdOyVdmGrG31fKCUycjdw0mkadzKHKYNSyZemlfbGqaq2UeOvyUazWT3xvKFq1PGCQG33MRwQA", - "UXCFO6UUOO6E4BTJNZPMHAH2HY.n": "enrtree://WJQDGHW5NWGEXKGW4EWJY3ZERP4MAK4HSI4EFM5I7JST7VCU7SW4H65MFVZ4YJNCDHCLKAXLAK3GHIV7EBAVOTUDCKAA@morenodes.example.org", - "n": "enrtree-root:v1 e=QAO2PMLNIZU6HVN4OGDWWQ4UCQ l=UXCFO6UUOO6E4BTJNZPMHAH2HY seq=1 sig=dKx74xYd64nBzlEXzYdK2UiCiKT05oqi3rL3C75nQ4dWxPh2RyY6R7hcXbDPomvdd7LuAbzTPhYAQWgNfReglAJL6gm6baXw46oA-5KpvZIt6qmUwFE8W2BUQWl34Xr4m3hKmUlU4AJO9OR8rNci5h8ASnsKymLWBgRmVCKoPAQ5OAZITJYZuTbCaLUSZjp91KylRphiCcVVLJpwqIOG5K34ZndqiPAvZ0QA", + "NBR5UGUKPKHBEV6MNKYLWA76UA.n": "enrtree-branch:AZ2AA7473KDOKV7PC3GMHBXZSE,RESRN326FX43MSLLCGJTO64QNE,FFWEK2OQ5VIQR6UVZCTXPYTWI4", + "HBRIBBF355HFMMLJX4ATX3PRRY.n": "enrtree://JJ5QVSTC2YDAIZSUEKUDYBBZHADEQTEWDG4TNQTIWUJGMOT52SWKKRUYMIE4KVJMTJYKRA4G4SW7QZTXNKEPAL3HIQAA@morenodes.example.org", + "n": "enrtree-root:v1 e=NBR5UGUKPKHBEV6MNKYLWA76UA l=HBRIBBF355HFMMLJX4ATX3PRRY seq=1 sig=0-nBiy1P3GB-CsXUL4vR_WKoY7UK0bYIjFCvhrxTd64A_Cg1Y3UOPQpWo-FLdLdEHWbri-xL_ocAS7yG_Mn8-QCmQZAG_7apeT9NYp4dAbscIdX0J1YJdjxeWSVN1t4UU5a5ixdkNHfOthEtGN8TjSIAhR3c_l0JEw3XUFpFrCjAQu-MCmR7bhcFQ_-KFwrG6r_1oQ2Q_-glxs9NYZz2ueAgQ8Lm0te4tZsA", } var ( wantNodes = testNodes(0x29452, 3) - wantLinks = []string{"enrtree://WJQDGHW5NWGEXKGW4EWJY3ZERP4MAK4HSI4EFM5I7JST7VCU7SW4H65MFVZ4YJNCDHCLKAXLAK3GHIV7EBAVOTUDCKAA@morenodes.example.org"} + wantLinks = []string{"enrtree://JJ5QVSTC2YDAIZSUEKUDYBBZHADEQTEWDG4TNQTIWUJGMOT52SWKKRUYMIE4KVJMTJYKRA4G4SW7QZTXNKEPAL3HIQAA@morenodes.example.org"} wantSeq = uint(1) ) c := NewClient(Config{Resolver: r, Logger: testlog.Logger(t, log.LvlTrace)}) - stree, err := c.SyncTree("enrtree://JJ5QVSTC2YDAIZSUEKUDYBBZHADEQTEWDG4TNQTIWUJGMOT52SWKKRUYMIE4KVJMTJYKRA4G4SW7QZTXNKEPAL3HIQAA@n") + stree, err := c.SyncTree("enrtree://QUO5Z7S5BEJQ3V2QLJC2YKGAILXYYCTEPNXBOBKD76FBOCWG5K77LIINSD76QJOGZ5GWDHHWXHQCAQ6C43JNPOFVTMAA@n") if err != nil { t.Fatal("sync error:", err) } diff --git a/p2p/dnsdisc/tree_test.go b/p2p/dnsdisc/tree_test.go index 322e0336f..fa240693e 100644 --- a/p2p/dnsdisc/tree_test.go +++ b/p2p/dnsdisc/tree_test.go @@ -62,7 +62,7 @@ func TestParseRoot(t *testing.T) { } func TestParseEntry(t *testing.T) { - testkey := testKey(signingKeySeed) + testkey := testKey(nodesSeed1) pub := eddsa.Ed448DerivePublicKey(*testkey) tests := []struct { input string @@ -92,8 +92,8 @@ func TestParseEntry(t *testing.T) { }, // Links { - input: "enrtree://JJ5QVSTC2YDAIZSUEKUDYBBZHADEQTEWDG4TNQTIWUJGMOT52SWKKRUYMIE4KVJMTJYKRA4G4SW7QZTXNKEPAL3HIQAA@nodes.example.org", - e: &linkEntry{"JJ5QVSTC2YDAIZSUEKUDYBBZHADEQTEWDG4TNQTIWUJGMOT52SWKKRUYMIE4KVJMTJYKRA4G4SW7QZTXNKEPAL3HIQAA@nodes.example.org", "nodes.example.org", &pub}, + input: "enrtree://SALGRL5CVC6ZXZSAJ5HJWZ5X5I2MURYEE7MRPZFFS3FRN4OJJDC2ISGFNZOKZPAUC3B2SOWTTAX4F3GD6VOR777KM2AA@nodes.example.org", + e: &linkEntry{"SALGRL5CVC6ZXZSAJ5HJWZ5X5I2MURYEE7MRPZFFS3FRN4OJJDC2ISGFNZOKZPAUC3B2SOWTTAX4F3GD6VOR777KM2AA@nodes.example.org", "nodes.example.org", &pub}, }, { input: "enrtree://nodes.example.org", diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go index fd1674069..68c972523 100644 --- a/p2p/enode/urlv4_test.go +++ b/p2p/enode/urlv4_test.go @@ -44,7 +44,7 @@ var parseNodeTests = []struct { }{ // Records { - input: "enr:-QEIuKt6aR02JVEasAcN6aHg5djoI9oFRkCd2aPONGpfY8suq9fCqrNSKfea1-8ZequFoRebWIuTHUUKBADSCdZYQmgwJHUDUKfrJ-oNLokbrJfPwUmIPZcGDLuh2GhgpBYuxZa1E1ANjVnri__1UcAFxvuXOwBKxeNrt2K0-fU-Gj7OlAcN8THGp_AGZCTvynw2lCt5fBwAXZNM8RBn0a8A_vqhA7TV3M0AeOkGCoBjgmlkgnY0gmlwhH8AAAGJc2VjcDI1NmsxuDlKxeNrt2K0-fU-Gj7OlAcN8THGp_AGZCTvynw2lCt5fBwAXZNM8RBn0a8A_vqhA7TV3M0AeOkGCoCDdWRwgnZc", + input: "enr:-QEIuKuk5dq-y6V-njXo1mgo6ETegrTMMdpiN7snT31ebR2RbMp68L5qzSi3AOFPaE70U5gXyaqnxSXEuwCrW-9ElZ4GjrTXOK_-ovGusc5_npVF4ITl6Z6hbOqIG4yV0_VdT9Gmwf1BUh4Ylggtf0Z6jjJ9GAAC_L2OxBWwhT3M3rdzJE9s8bVcyfOEk3tXJwwQQLlCFQGnGRF3DIr82yGNZQcHrBESaKfilTyQJ4BjgmlkgnY0gmlwhH8AAAGJc2VjcDI1NmsxuDkC_L2OxBWwhT3M3rdzJE9s8bVcyfOEk3tXJwwQQLlCFQGnGRF3DIr82yGNZQcHrBESaKfilTyQJ4CDdWRwgnZc", wantResult: func() *Node { testKey, _ := crypto.HexToEDDSA("07e988804055546babfb00e34d015314a21a76a1cb049cad4adeb3d931af355f2393ba45bfda9aeb7ca40c1e0a4e63ba4639e43957a54109f2") var r enr.Record diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index edf7433be..d029aca48 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -382,7 +382,7 @@ type handshakeAuthTest struct { var cip8HandshakeAuthTests = []handshakeAuthTest{ // (Auth₁) RLPx v4 plain encoding { - input: `024cea4fe3ca154bf3dabef6c312e1d3ed34a01a45847d4a013108b396f373382c8486320a32f7d96a7f8ac7d354a32c1bb9e6d4fb0ac7272ce9806df1c08cffce1e329e7d9206fb4ce1f27d9943ff4d2ed7a3bde5847b10167e3b0027c2c48a1bc33db256ee572f05ea140c5c085e206b1362051e129a8a550b6878b28c1d8d981aaa37d07d5b8ac17eb887775fb2169889f9105ac6cc39860632af2fc9a27fde3201168855527ab189df8f0fbcc4c07354e3fd4dbfa6b776bdcebbd02ed2bb454fe6fa156e98a1440f0dc6c00c33683cde84ddf64c8c6a241f100d4813537c28227d42a315a3a4739910e3f9304190a591e6f826588b6f4cb496bc7625c2116555a8eb636c28397b29752e36d7e5d1240c167cd91e6066731cfe562325ad27760fa764340a0fcc18af361ce63251a890c20b7cc06730c4db82275712b4352c49842f772c35d8088efeae51e6f9a3baaaa225349286211b3fd2125068d483073519b91233dc1612cc58c9ed59f95166fddde5a05d4e5a2a119c40391ee1e8d2afcfd18158f4a47af90fa9e8c2db0b138022f3c621804bdd36b429f720df93ed16fd9c9932bd5d2548b4a48d6bf29ca0f641c6eb0b0044600aa75a4b0ad501a59d952b1a904f0c0d0468fdf58e5e9e56b91e56793d58e5150e035d311dd6c5fee6ea6a1d01660adb72e97a10d14a9a463bf583a39d19c0a40ad3b57f7e777391b7714488687b1c10a11958300e64afae8a9762f8c6f85c536156ad642dcfe78b61bc17eaca64d40890e679a172b14a7a7d8e11d55da029c8a8da33abbd11c307d05deb2486d36d08d08348b8bd83`, + input: `024c996a6dc06dc9b270be2a756422a9c8b0cd5c8d1fff40f6c5c7fbddb1ad399c8809137f6083a77143bde0d555d28a9deb062343d3a84242a500d6d6cc8db82eef9fb170cd450944c5ea5568b820c890429401cad1772d982d92c55182550c2341eaf4e960aae5a87127efb7545b65450164001ee32a2cbb01404512d174cafc6cf808eab83e875cc6ef668163dd48a3865e1c240db7a11d90a9e8d8b9533a3169946f14d19bf15d714b29b020eafca689add206bf94afa27231bfa1945c6a70357a4dd31af09adab31ffd6c18bdcd16b45e92d24a0d6501b569c4ae0e86a3bebd015c4c22373ce86dfc9da9907b35d8f978e8d47fb005b20b13531edbcb0ff1c776aee6042f55e6a42f12089e6a41f82f1ad18bbd6c1c7d601ef81dc8363d5da7689c11f6e6e19da9b759b72215cb7387cedacb9380c148e06f873746b96fc6048c09ebbb736e53bb0ece94444bc9f2fc44ddbd520a1f665804a26c9f03d1e365e7fc1e235854e4dd83d9c439a81411cec80b1c98f5850cc92a8aa40bce3f6e71836358d9dbfdb9300b411086efcacff2f8bbb5548bfe5042411b278f5c42d8ceae3821ec93d92a7e76508e638eacbca223728b9569d8ddd4e167edba287665cdc21cfbbb2e8e77730a4d577ec14a4274d1b627b832595c9b6f2f4993dbd6f2b11b1e4cc3b3a1d93a8a6bf8580e85c4e570cb32a8c512e20abb00a73cbaf0143b561fff11f2d8c557badb391b2031f7d29d2c75fa9670fc890a8d9f6a4cc095c97e82823eb3efd707b94b3207d2149bdb2dd5e5d84754548194923ec13839d43cafc28bb111734ba4854bb0a2`, isPlain: false, wantRest: []rlp.RawValue{}, wantVersion: 4, @@ -410,18 +410,18 @@ type handshakeAckTest struct { var cip8HandshakeRespTests = []handshakeAckTest{ // (Ack₁) RLPx v4 plain encoding { - input: `1f25a25b85bf5bbaf2e18663e3776f41a72ca14b6f9ef65658f9da30cf0078b403269c740b918fb0a307dbbba6aedf1f80e612ac132661d200bc07a2a2e11197a2b6cac13ffeb12cf932372d9d98f4e22a5a940b00d09d726b04701e9b301789a1a7a431267cb388a0c8b7a034001c2da59df6b8061800772ecdb5c892d30f91d6095acfe772d0437507724b01fd869bcbc30fa8f7a9016522eb525b629df2aae7d1e3da2f3271d572db57240d76b383cc9886de28914757912b12799e3d42c608a7fb3106e83bbbdcbe66811aeb8d3eebd19fa685612f4c4f918aedcbf374f55312f2`, + input: `eca7a771a547ddbc4075532b85d9f83a6ec927b0572a3c222a39fba8184d8729a6b14b14c26f23b4c509d174b5477a73a8cb8bf95a814da780987def344a0dee794c78073873228500d123f8472ea008fd89bf184d6375cbc08116b0cf5d46b1c1c125edf00ef1ce2a3f5535667a0813cac568e32e5ae7f1c68df69dba2a1a24a77f6c6b148e3fd04f7753cb9343d5abfe9a7be00b4fdc92bd8ec999b82b6da33ccebc3f8fbb3960d4272b7c9f1ef6bf93906b04306e05a6e28b6dc9c19f7c8d26ca4f1de3b7edd524fc8dcb9fafe4d4da34fcb6dad601af263af7d6b0132387f35f11`, wantVersion: 4, }, // (Ack₂) CIP-8 encoding { - input: `019efa17c5f8155a29be83d87450b2270125a8cd82afd2ba73439ff66886074053d79fea273534d1ddd327d8117bcb28f7c0e79cbebbfdbcc443002a7bd79ad4308b809797987c4775859819ffa2991a2301eedf87fb5e3bcdcefed9617a27f3bfa7de21bb41a21556dbea9b37e5b6619ca4bc2088125cbadf6543ab0daa82d42c38325de1f11be9515c809608274cc2a605687677aaa52654a37acd62e958862a90080ead6b483cde8ffa6cc25f6332b2e8ef8b2e4b79c2f83ca58e95f91cf184ff737af9a70ea17fe1b838ca3ef7d0f0e9d9a8c2f1952fc3a92177cbda75bcf5e5fd79d17645a03ab57420497bc574e64e7b1119b5ab624ebd8977140235b6f57596347612e3f2d22d0490a1b10fb8b064fcb55b6642aad0c5c850b50b410f2549ea0b0b8927506de68bcab802af69aeaf495fdce8c4ac39bae87ad00550f76606a1e6c21885a58a8dc23b206366be4188ca3292c804fd457123157b794ddd9decaa6fb4bf98e58176d2a8436f363b9fc9ff1fd16c057e764e5f89d177b14d3267523911b88f14c749698c691d67fd2508c45057bad86e644ade07c31321b6`, + input: `01a4dc5bb0d46b3ef7e35124fe30913961ff4b962ac49328a1f17c734ba40a8c0d2b4007a81ab3257da60bb7c5ef1c2b883dd58ea1b51f6e6a318037dac7d00c6b57a658e804a033e3a61921160c00ec11fb2719fd11b2ea8882eb4d1fe15b6ef5c4747e9af92c27d18f99bddc824d576d8650257a421b5ec059aeb7feec0174209c8f057d95a6991ae36ca72547de2e089eee5319b342cc4f8b12cb7628806236af54295d7d21c9e00aa81f063f5dc852b7721f942bf3b12313716297824cb1e635f9934793d92520970fc2071349e3163b2364ff7fd9d2079c2a5bb39d5b312546c2de60815e1152760122e2ae43cff2b0774a9879471e83872f1d86fa5fbab0d27e59722717ddee8881834671d1ae6a5eb09019df64bb5297bb4dc476d860a9f4ce813382c47d434380616de332e25d03a7f993d0576c76b63b95f0157fb2e915c7c0ce189ab854b026afbcd80699acf862dd589c628705c7c310fd1c551d22aac8ffbe3c332c3c46f6df4f887f552c10116dabeb83cca00ced3bb517cf9c5c425e5c9aa77b6f29876632398dff93123485fe3778ee63a85bc41e72eab9e4980ee25b6a69`, wantVersion: 4, wantRest: []rlp.RawValue{}, }, // (Ack₃) CIP-8 encoding with version 57, additional list elements { - input: `01a4b7be1a43972fa4c7fe12585551f38a50d382e12b8d9184582847adf6e3ebfc424c21021a591aa9c591dc78c5b51ecac3916d68e386eda370803abef5c9372d7bb6212df673a74b22b312d699e62686efb2a4ad8d4bb0c11464edaac29c2e3543f1becbaa90a1f20ec863bce245e463e3977a2a08cfadaf40bc6e9220f0bfbf89ec7a2b135dd03dfb456a864bee985b5321b1aa18f50d9b5f2c5b0c473ffb071ddeb92682bfa9716912a7627e2cc216d9ff0d51132c28126a57c20dbf67d215368489f3f6a65545cecd814f0fbead04b3ca6119b3ebc6e1f4b4d8c5f6b12f9905165c85373c676d11bb353c946daa31070fa5acab924966511d45e3286d53cec90d34818ea12ab9a561283375b1f65ae6b70f3d1eed78070cbac05468cd1ad9209733fff27b32269907dd8dd950539f85b76e0ea3506afa5fbc3a2b3f0eb3cce2babb47911664a78d14b230e40b92a0367d98f62b7a19d61330836d69a628fb66eec9c132693b1ff3aad4547ab021895410048dd701253f3da5cfa3b1f8af0825a2fc10dd6addfce3872abb2b88d0a5d8f135968364fffb52fd1e384af997a11fd550f242`, + input: `018298af236a6774f8f6497412c6529aa4d867612c22bd96942bc502319a74d0ea6d07a5802b5997a5abd917153c0e860ceb703a869c9716f85100db6100d8ae296f52abb054e8f9caa5c060f656576e5d9effe4ab40fb49e156c4765ace4d047cfc8b4432fe281d5508f536943fb769b6fa060b6faaba7ac13d8b84317b8dabd4d53883393a539314df3671ae076cd5da05728313cfbd8956c6c973a46fed1b2fd0520b3658b06637d061d84377ff2cebd387e5ef965c76c4810283e496a53c954d2af9b955a73f31fd4bc63ab373d22bf5f0b14955312d7ffb7ad335c90bd8ac563e8d7576ee5ceefbff16f2e4a9c5d4de3a2192985b7aa2522a5bc92b221cb2f036ba427039e83cbba7acfcc60596bd06afc875cf355fe2f8a2d8a35539684341635a348bec7a4445a38adc9999ebaf195fb325dc131665f77fe1b7d9e1f037e3e82cebf90aaf92f7042c6802dded28657a4e5281adedf98d62a14de5b88c518d5337bd1d483d459e8d49c1ff3ec211cd2f09717b0acbadebe7a0266e3c466c356ee0`, wantVersion: 57, wantRest: []rlp.RawValue{{0x06}, {0xC2, 0x07, 0x08}, {0x81, 0xFA}}, }, @@ -509,9 +509,9 @@ func TestHandshakeForwardCompatibility(t *testing.T) { authCiphertext = unhex(cip8HandshakeAuthTests[1].input) authRespCiphertext = unhex(cip8HandshakeRespTests[1].input) authMsg = makeAuth(cip8HandshakeAuthTests[1]) - wantAES = unhex("f66f0ebac0eb93bb131bbc91e8cfc996c4e923617b5d9a2aac25e610d7408279") - wantMAC = unhex("7e6e60c3bb303290a274b07f82269c8af55a5ae89891900ac42ad42064083866") - wantFooIngressHash = unhex("38ae8889d5072cbaf71481c19f6ef5a3cafe4b48998c72d5ab8f24c8a754c87f") + wantAES = unhex("02a8f660fd5c452851980694e076d64b2168605201638e95c47d3c696000b1d7") + wantMAC = unhex("96a446be84d374707892788f7de25dcf9b175f4bc9dd7a6c119af31cc2b30f72") + wantFooIngressHash = unhex("82dffd828360fc5c2c049f28d1860bab35d64b590d225f27e2a9af5d76da7451") ) if err := hs.handleAuthMsg(authMsg, keyB); err != nil { t.Fatalf("handleAuthMsg: %v", err) diff --git a/xcb/tracers/internal/tracers/assets.go b/xcb/tracers/internal/tracers/assets.go index 7bf250cdd..e10ab4e39 100644 --- a/xcb/tracers/internal/tracers/assets.go +++ b/xcb/tracers/internal/tracers/assets.go @@ -132,7 +132,7 @@ func call_tracerJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "call_tracer.js", size: 9072, mode: os.FileMode(0664), modTime: time.Unix(1632082031, 0)} + info := bindataFileInfo{name: "call_tracer.js", size: 9072, mode: os.FileMode(0664), modTime: time.Unix(1632676072, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xda, 0xf3, 0xf2, 0x30, 0x63, 0x10, 0x9d, 0x6c, 0xa7, 0xa4, 0xe7, 0xe2, 0x88, 0xb3, 0xe0, 0xca, 0x23, 0x13, 0x5c, 0x3b, 0xcc, 0x76, 0x9e, 0x9f, 0xa0, 0x5f, 0x89, 0xba, 0x7f, 0xf6, 0xdf, 0x7c}} return a, nil }