diff --git a/.circleci/config.yml b/.circleci/config.yml index a864054176..d346a41420 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -258,6 +258,14 @@ jobs: cd arb-provider-go gotestsum --format short-verbose --junitfile ${TEST_RESULTS}/arb-provider-go.xml -- -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=$ARB_PACKAGES ./... working_directory: /home/user/project/packages/arb-provider-go + - run: + name: test fibgo + command: | + export CGO_LDFLAGS="-lgcov --coverage" + export ARB_PACKAGES=$(go list ./... | grep -v 'evilRollupServer' | awk -vORS=, '{ print "github.com/offchainlabs/arbitrum/"substr($1,21) }' | sed 's/,$/\n/') + cd ../tests/fibgo + gotestsum --format short-verbose --junitfile ${TEST_RESULTS}/fibgo.xml -- -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=$ARB_PACKAGES ./... + working_directory: /home/user/project/packages - run: codecovbash -R /home/user/project - store_test_results: path: *test-path diff --git a/docs/Installation.md b/docs/Installation.md index 8d6ec83071..e5d39a3444 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -68,7 +68,7 @@ Here are the important dependencies in case you are not running on a supported O Download the Arbitrum Monorepo from source: ```bash -git clone -b v0.4.1 --depth=1 -c advice.detachedHead=false https://github.com/offchainlabs/arbitrum.git +git clone -b v0.4.2 --depth=1 -c advice.detachedHead=false https://github.com/offchainlabs/arbitrum.git cd arbitrum yarn yarn build diff --git a/packages/arb-avm-cpp/go.mod b/packages/arb-avm-cpp/go.mod index 1b36a93d57..e0199df8f9 100644 --- a/packages/arb-avm-cpp/go.mod +++ b/packages/arb-avm-cpp/go.mod @@ -2,6 +2,6 @@ module github.com/offchainlabs/arbitrum/packages/arb-avm-cpp go 1.12 -require github.com/offchainlabs/arbitrum/packages/arb-util v0.4.1 +require github.com/offchainlabs/arbitrum/packages/arb-util v0.4.2 replace github.com/offchainlabs/arbitrum/packages/arb-util => ../arb-util diff --git a/packages/arb-avm-go/go.mod b/packages/arb-avm-go/go.mod index 863e33ad80..2f85e4e720 100644 --- a/packages/arb-avm-go/go.mod +++ b/packages/arb-avm-go/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/dgraph-io/badger v1.6.0 github.com/ethereum/go-ethereum v1.9.8 - github.com/offchainlabs/arbitrum/packages/arb-util v0.4.1 + github.com/offchainlabs/arbitrum/packages/arb-util v0.4.2 ) replace github.com/offchainlabs/arbitrum/packages/arb-util => ../arb-util diff --git a/packages/arb-provider-go/connection.go b/packages/arb-provider-go/connection.go index e5bfeb0ede..a648518e3a 100644 --- a/packages/arb-provider-go/connection.go +++ b/packages/arb-provider-go/connection.go @@ -10,24 +10,19 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/ethclient" - - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" - - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - + ethereum "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi/bind" ethcommon "github.com/ethereum/go-ethereum/common" - - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" - - "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/evm" - "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupvalidator" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/evm" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/validatorserver" ) var ARB_SYS_ADDRESS = ethcommon.HexToAddress("0x0000000000000000000000000000000000000064") @@ -289,7 +284,7 @@ func _extractAddrTopics(query ethereum.FilterQuery) (addr common.Address, topics return } -func _decodeLogInfo(ins *rollupvalidator.LogInfo) (*types.Log, error) { +func _decodeLogInfo(ins *validatorserver.LogInfo) (*types.Log, error) { outs := &types.Log{} addr, err := hexutil.Decode(ins.Address) if err != nil { diff --git a/packages/arb-provider-go/go.mod b/packages/arb-provider-go/go.mod index 5d15bea9cb..956acfbf7f 100644 --- a/packages/arb-provider-go/go.mod +++ b/packages/arb-provider-go/go.mod @@ -3,16 +3,12 @@ module github.com/offchainlabs/arbitrum/packages/arb-provider-go go 1.12 require ( - github.com/ethereum/go-ethereum v1.9.8 + github.com/ethereum/go-ethereum v1.9.10 github.com/gorilla/rpc v1.2.0 - github.com/offchainlabs/arbitrum/packages/arb-util v0.4.1 - github.com/offchainlabs/arbitrum/packages/arb-validator v0.4.1 + github.com/offchainlabs/arbitrum/packages/arb-util v0.4.2 + github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.4.2 ) -replace github.com/offchainlabs/arbitrum/packages/arb-validator => ../arb-validator - -replace github.com/offchainlabs/arbitrum/packages/arb-avm-go => ../arb-avm-go - -replace github.com/offchainlabs/arbitrum/packages/arb-avm-cpp => ../arb-avm-cpp +replace github.com/offchainlabs/arbitrum/packages/arb-validator-core => ../arb-validator-core replace github.com/offchainlabs/arbitrum/packages/arb-util => ../arb-util diff --git a/packages/arb-provider-go/go.sum b/packages/arb-provider-go/go.sum index 08e6f3f165..500511f0dc 100644 --- a/packages/arb-provider-go/go.sum +++ b/packages/arb-provider-go/go.sum @@ -23,6 +23,8 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictoriaMetrics/fastcache v1.5.2 h1:Erd8iIuBAL9kke8JzM4+WxkKuFkHh3ktwLanJvDgR44= github.com/VictoriaMetrics/fastcache v1.5.2/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= +github.com/VictoriaMetrics/fastcache v1.5.3 h1:2odJnXLbFZcoV9KYtQ+7TH1UOq3dn3AssMgieaezkR4= +github.com/VictoriaMetrics/fastcache v1.5.3/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= 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= @@ -30,11 +32,13 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/aristanetworks/fsnotify v1.4.2/go.mod h1:D/rtu7LpjYM8tRJphJ0hUBYpjai8SfX+aSNsWDTq/Ks= github.com/aristanetworks/glog v0.0.0-20180419172825-c15b03b3054f/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= +github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A= github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6 h1:6bZNnQcA2fkzH9AhZXbp2nDqbWa4bBqFeUb70Zq1HBM= github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6/go.mod h1:Z4RTxGAuYhPzcq8+EdRM+R8M48Ssle2TsWtwRKa+vns= github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= 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/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -57,6 +61,8 @@ github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18 h1:pl4eWIqvFe/Kg3zkn7NxevNzILnZYWDCG7qbA1CJik0= github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -85,12 +91,15 @@ github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c h1:JHHhtb9XWJrGNMcr github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= 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/elastic/gosigar v0.10.5 h1:GzPQ+78RaAb4J63unidA/JavQRKrB6s8IOzN6Ib59jo= github.com/elastic/gosigar v0.10.5/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= github.com/ethereum/go-ethereum v1.8.20/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= github.com/ethereum/go-ethereum v1.9.8 h1:4KUtrZOt45Ob1yXh0Mv/pPWRib/6B4p2l41nzEsEgVw= github.com/ethereum/go-ethereum v1.9.8/go.mod h1:N68Ktr8bkyajaEy6D8CSANxkhUxcnVjTmp9sKdKd8OI= +github.com/ethereum/go-ethereum v1.9.10 h1:jooX7tWcscpC7ytufk73t9JMCeJQ7aJF2YmZJQEuvFo= +github.com/ethereum/go-ethereum v1.9.10/go.mod h1:lXHkVo/MTvsEXfYsmNzelZ8R1e0DTvdk/wMZJIRpaRw= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= @@ -132,11 +141,13 @@ github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk= github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= +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/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad h1:eMxs9EL0PvIGS9TTtxg4R+JxuPGav82J8rA+GFnY7po= github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk= github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -155,6 +166,7 @@ github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJye github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= 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/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/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -200,6 +212,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= +github.com/offchainlabs/arbitrum v0.4.1 h1:zcIPxwsbxp6LggBQc1f6YOc8ee3tEHpiPcAn2UsfumA= +github.com/offchainlabs/arbitrum/packages/arb-validator v0.4.1/go.mod h1:RkUD5VdhtjR5rMG1w6EX/0yBgixJlaBMJmnhkUJPLAE= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= @@ -226,6 +240,8 @@ github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0je github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -250,9 +266,11 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8= github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM= github.com/robertkrimen/otto v0.0.0-20170205013659-6a77b7cbc37d/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= +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/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/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/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -288,6 +306,7 @@ github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod h1:9OrXJ github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= github.com/tjfoc/gmsm v1.0.1/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc= +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/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= @@ -317,6 +336,7 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2 h1:4dVFTC832rPn4pomLSz1vA+are2+dU19w1H8OngV7nc= golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -337,6 +357,7 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -353,7 +374,9 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190912185636-87d9f09c5d89/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610= diff --git a/packages/arb-provider-go/validatorProxy.go b/packages/arb-provider-go/validatorProxy.go index f69b9db296..6c45776f1f 100644 --- a/packages/arb-provider-go/validatorProxy.go +++ b/packages/arb-provider-go/validatorProxy.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupvalidator" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/validatorserver" ) type ValidatorProxy interface { @@ -20,7 +20,7 @@ type ValidatorProxy interface { GetMessageResult(txHash []byte) (value.Value, bool, error) GetAssertionCount() (int, error) GetVMInfo() (string, error) - FindLogs(fromHeight, toHeight int64, address []byte, topics [][32]byte) ([]*rollupvalidator.LogInfo, error) + FindLogs(fromHeight, toHeight int64, address []byte, topics [][32]byte) ([]*validatorserver.LogInfo, error) CallMessage(contract common.Address, sender common.Address, data []byte) (value.Value, error) } @@ -97,10 +97,10 @@ func (vp *ValidatorProxyImpl) doCall(methodName string, request interface{}, res //} func (vp *ValidatorProxyImpl) GetMessageResult(txHash []byte) (value.Value, bool, error) { - request := &rollupvalidator.GetMessageResultArgs{ + request := &validatorserver.GetMessageResultArgs{ TxHash: hexutil.Encode(txHash), } - var response rollupvalidator.GetMessageResultReply + var response validatorserver.GetMessageResultReply if err := vp.doCall("GetMessageResult", request, &response); err != nil { log.Println("ValProxy.GetMessageResult: doCall returned error:", err) return nil, false, err @@ -123,7 +123,7 @@ func (vp *ValidatorProxyImpl) GetMessageResult(txHash []byte) (value.Value, bool func (vp *ValidatorProxyImpl) GetAssertionCount() (int, error) { request := &struct{}{} - var response rollupvalidator.GetAssertionCountReply + var response validatorserver.GetAssertionCountReply if err := vp.doCall("GetAssertionCount", request, &response); err != nil { return 0, err } @@ -132,21 +132,21 @@ func (vp *ValidatorProxyImpl) GetAssertionCount() (int, error) { func (vp *ValidatorProxyImpl) GetVMInfo() (string, error) { request := &struct{}{} - var response rollupvalidator.GetVMInfoReply + var response validatorserver.GetVMInfoReply if err := vp.doCall("GetVMInfo", request, &response); err != nil { return "", err } return response.VmID, nil } -func (vp *ValidatorProxyImpl) FindLogs(fromHeight, toHeight int64, address []byte, topics [][32]byte) ([]*rollupvalidator.LogInfo, error) { - request := &rollupvalidator.FindLogsArgs{ +func (vp *ValidatorProxyImpl) FindLogs(fromHeight, toHeight int64, address []byte, topics [][32]byte) ([]*validatorserver.LogInfo, error) { + request := &validatorserver.FindLogsArgs{ FromHeight: _encodeInt(fromHeight), ToHeight: _encodeInt(toHeight), Address: hexutil.Encode(address), Topics: _encodeByteArraySlice(topics), } - var response rollupvalidator.FindLogsReply + var response validatorserver.FindLogsReply if err := vp.doCall("FindLogs", request, &response); err != nil { return nil, err } @@ -154,12 +154,12 @@ func (vp *ValidatorProxyImpl) FindLogs(fromHeight, toHeight int64, address []byt } func (vp *ValidatorProxyImpl) CallMessage(contract common.Address, sender common.Address, data []byte) (value.Value, error) { - request := &rollupvalidator.CallMessageArgs{ + request := &validatorserver.CallMessageArgs{ ContractAddress: hexutil.Encode(contract[:]), Sender: hexutil.Encode(sender[:]), Data: hexutil.Encode(data), } - var response rollupvalidator.CallMessageReply + var response validatorserver.CallMessageReply if err := vp.doCall("CallMessage", request, &response); err != nil { return nil, err } diff --git a/packages/arb-validator/arbbridge/arbClient.go b/packages/arb-validator-core/arbbridge/arbClient.go similarity index 100% rename from packages/arb-validator/arbbridge/arbClient.go rename to packages/arb-validator-core/arbbridge/arbClient.go diff --git a/packages/arb-validator/arbbridge/arbFactory.go b/packages/arb-validator-core/arbbridge/arbFactory.go similarity index 93% rename from packages/arb-validator/arbbridge/arbFactory.go rename to packages/arb-validator-core/arbbridge/arbFactory.go index 85b2921b55..3a75d63a83 100644 --- a/packages/arb-validator/arbbridge/arbFactory.go +++ b/packages/arb-validator-core/arbbridge/arbFactory.go @@ -20,7 +20,7 @@ import ( "context" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type ArbFactory interface { diff --git a/packages/arb-validator/arbbridge/arbRollup.go b/packages/arb-validator-core/arbbridge/arbRollup.go similarity index 97% rename from packages/arb-validator/arbbridge/arbRollup.go rename to packages/arb-validator-core/arbbridge/arbRollup.go index 4867dbda96..c7966061ee 100644 --- a/packages/arb-validator/arbbridge/arbRollup.go +++ b/packages/arb-validator-core/arbbridge/arbRollup.go @@ -21,7 +21,7 @@ import ( "math/big" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type ArbRollup interface { diff --git a/packages/arb-validator/arbbridge/arbRollupWatcher.go b/packages/arb-validator-core/arbbridge/arbRollupWatcher.go similarity index 93% rename from packages/arb-validator/arbbridge/arbRollupWatcher.go rename to packages/arb-validator-core/arbbridge/arbRollupWatcher.go index 8008ef72dd..5f4ad80927 100644 --- a/packages/arb-validator/arbbridge/arbRollupWatcher.go +++ b/packages/arb-validator-core/arbbridge/arbRollupWatcher.go @@ -20,7 +20,7 @@ import ( "context" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type ArbRollupWatcher interface { diff --git a/packages/arb-validator/arbbridge/challenge.go b/packages/arb-validator-core/arbbridge/challenge.go similarity index 100% rename from packages/arb-validator/arbbridge/challenge.go rename to packages/arb-validator-core/arbbridge/challenge.go diff --git a/packages/arb-validator/arbbridge/challengeFactory.go b/packages/arb-validator-core/arbbridge/challengeFactory.go similarity index 100% rename from packages/arb-validator/arbbridge/challengeFactory.go rename to packages/arb-validator-core/arbbridge/challengeFactory.go diff --git a/packages/arb-validator/arbbridge/events.go b/packages/arb-validator-core/arbbridge/events.go similarity index 94% rename from packages/arb-validator/arbbridge/events.go rename to packages/arb-validator-core/arbbridge/events.go index 2ad27f4da3..decbea0f46 100644 --- a/packages/arb-validator/arbbridge/events.go +++ b/packages/arb-validator-core/arbbridge/events.go @@ -20,8 +20,8 @@ import ( "math/big" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type Event interface { diff --git a/packages/arb-validator/arbbridge/executionChallenge.go b/packages/arb-validator-core/arbbridge/executionChallenge.go similarity index 94% rename from packages/arb-validator/arbbridge/executionChallenge.go rename to packages/arb-validator-core/arbbridge/executionChallenge.go index 0f0703a88e..8ce1d504f3 100644 --- a/packages/arb-validator/arbbridge/executionChallenge.go +++ b/packages/arb-validator-core/arbbridge/executionChallenge.go @@ -19,7 +19,7 @@ package arbbridge import ( "context" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type ExecutionChallenge interface { diff --git a/packages/arb-validator/arbbridge/globalInbox.go b/packages/arb-validator-core/arbbridge/globalInbox.go similarity index 95% rename from packages/arb-validator/arbbridge/globalInbox.go rename to packages/arb-validator-core/arbbridge/globalInbox.go index 4b246a1275..09ad0b5494 100644 --- a/packages/arb-validator/arbbridge/globalInbox.go +++ b/packages/arb-validator-core/arbbridge/globalInbox.go @@ -20,7 +20,7 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" "github.com/offchainlabs/arbitrum/packages/arb-util/common" ) diff --git a/packages/arb-validator/arbbridge/inboxTopChallenge.go b/packages/arb-validator-core/arbbridge/inboxTopChallenge.go similarity index 100% rename from packages/arb-validator/arbbridge/inboxTopChallenge.go rename to packages/arb-validator-core/arbbridge/inboxTopChallenge.go diff --git a/packages/arb-validator/arbbridge/messagesChallenge.go b/packages/arb-validator-core/arbbridge/messagesChallenge.go similarity index 96% rename from packages/arb-validator/arbbridge/messagesChallenge.go rename to packages/arb-validator-core/arbbridge/messagesChallenge.go index 5fbf8ed26e..15bb324ec2 100644 --- a/packages/arb-validator/arbbridge/messagesChallenge.go +++ b/packages/arb-validator-core/arbbridge/messagesChallenge.go @@ -21,7 +21,7 @@ import ( "math/big" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" ) type MessagesChallenge interface { diff --git a/packages/arb-validator/arbbridge/oneStepProof.go b/packages/arb-validator-core/arbbridge/oneStepProof.go similarity index 91% rename from packages/arb-validator/arbbridge/oneStepProof.go rename to packages/arb-validator-core/arbbridge/oneStepProof.go index e1cec8fddf..6ca4228f32 100644 --- a/packages/arb-validator/arbbridge/oneStepProof.go +++ b/packages/arb-validator-core/arbbridge/oneStepProof.go @@ -20,7 +20,7 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type OneStepProof interface { diff --git a/packages/arb-validator/arbbridge/vmConnection.go b/packages/arb-validator-core/arbbridge/vmConnection.go similarity index 100% rename from packages/arb-validator/arbbridge/vmConnection.go rename to packages/arb-validator-core/arbbridge/vmConnection.go diff --git a/packages/arb-validator/arbbridge/watcher.go b/packages/arb-validator-core/arbbridge/watcher.go similarity index 100% rename from packages/arb-validator/arbbridge/watcher.go rename to packages/arb-validator-core/arbbridge/watcher.go diff --git a/packages/arb-validator/ethbridge/arbClient.go b/packages/arb-validator-core/ethbridge/arbClient.go similarity index 96% rename from packages/arb-validator/ethbridge/arbClient.go rename to packages/arb-validator-core/ethbridge/arbClient.go index b02d9fddb3..40c7938e29 100644 --- a/packages/arb-validator/ethbridge/arbClient.go +++ b/packages/arb-validator-core/ethbridge/arbClient.go @@ -24,18 +24,15 @@ import ( "sync" "time" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/executionchallenge" - "github.com/ethereum/go-ethereum" - - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/challengetester" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/challengetester" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/executionchallenge" ) type EthArbClient struct { diff --git a/packages/arb-validator/ethbridge/arbFactory.go b/packages/arb-validator-core/ethbridge/arbFactory.go similarity index 95% rename from packages/arb-validator/ethbridge/arbFactory.go rename to packages/arb-validator-core/ethbridge/arbFactory.go index 521939e603..1893df24c8 100644 --- a/packages/arb-validator/ethbridge/arbFactory.go +++ b/packages/arb-validator-core/ethbridge/arbFactory.go @@ -20,15 +20,14 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" - errors2 "github.com/pkg/errors" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/arbfactory" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/arbfactory" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type arbFactory struct { diff --git a/packages/arb-validator/ethbridge/arbRollup.go b/packages/arb-validator-core/ethbridge/arbRollup.go similarity index 98% rename from packages/arb-validator/ethbridge/arbRollup.go rename to packages/arb-validator-core/ethbridge/arbRollup.go index df322e9547..339bc2afcf 100644 --- a/packages/arb-validator/ethbridge/arbRollup.go +++ b/packages/arb-validator-core/ethbridge/arbRollup.go @@ -21,10 +21,6 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" - - "github.com/offchainlabs/arbitrum/packages/arb-util/value" - errors2 "github.com/pkg/errors" "github.com/ethereum/go-ethereum/accounts/abi/bind" @@ -33,7 +29,9 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/rollup" + "github.com/offchainlabs/arbitrum/packages/arb-util/value" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/rollup" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type arbRollup struct { diff --git a/packages/arb-validator/ethbridge/arbRollupWatcher.go b/packages/arb-validator-core/ethbridge/arbRollupWatcher.go similarity index 97% rename from packages/arb-validator/ethbridge/arbRollupWatcher.go rename to packages/arb-validator-core/ethbridge/arbRollupWatcher.go index dad920e47b..9ad3a4fa34 100644 --- a/packages/arb-validator/ethbridge/arbRollupWatcher.go +++ b/packages/arb-validator-core/ethbridge/arbRollupWatcher.go @@ -22,11 +22,9 @@ import ( "math/big" "strings" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" - errors2 "github.com/pkg/errors" - "github.com/ethereum/go-ethereum" + ethereum "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" ethcommon "github.com/ethereum/go-ethereum/common" @@ -35,9 +33,10 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/rollup" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/rollup" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) var rollupCreatedID ethcommon.Hash diff --git a/packages/arb-validator/ethbridge/arbfactory/arbfactory.go b/packages/arb-validator-core/ethbridge/arbfactory/arbfactory.go similarity index 100% rename from packages/arb-validator/ethbridge/arbfactory/arbfactory.go rename to packages/arb-validator-core/ethbridge/arbfactory/arbfactory.go diff --git a/packages/arb-validator/ethbridge/bisectionChallenge.go b/packages/arb-validator-core/ethbridge/bisectionChallenge.go similarity index 95% rename from packages/arb-validator/ethbridge/bisectionChallenge.go rename to packages/arb-validator-core/ethbridge/bisectionChallenge.go index f479bfd650..f7e46df214 100644 --- a/packages/arb-validator/ethbridge/bisectionChallenge.go +++ b/packages/arb-validator-core/ethbridge/bisectionChallenge.go @@ -29,8 +29,8 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/executionchallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/executionchallenge" ) var continuedChallengeID ethcommon.Hash diff --git a/packages/arb-validator/ethbridge/chain.go b/packages/arb-validator-core/ethbridge/chain.go similarity index 96% rename from packages/arb-validator/ethbridge/chain.go rename to packages/arb-validator-core/ethbridge/chain.go index de414f8f3e..62cba4ad7a 100644 --- a/packages/arb-validator/ethbridge/chain.go +++ b/packages/arb-validator-core/ethbridge/chain.go @@ -22,11 +22,11 @@ import ( "math/big" "time" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" "github.com/pkg/errors" - "github.com/ethereum/go-ethereum" + ethereum "github.com/ethereum/go-ethereum" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" diff --git a/packages/arb-validator/ethbridge/challenge.go b/packages/arb-validator-core/ethbridge/challenge.go similarity index 95% rename from packages/arb-validator/ethbridge/challenge.go rename to packages/arb-validator-core/ethbridge/challenge.go index 3e6fc66e7d..b7e88f882c 100644 --- a/packages/arb-validator/ethbridge/challenge.go +++ b/packages/arb-validator-core/ethbridge/challenge.go @@ -29,8 +29,8 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/executionchallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/executionchallenge" ) var initiatedChallengeID ethcommon.Hash diff --git a/packages/arb-validator/ethbridge/challengeFactory.go b/packages/arb-validator-core/ethbridge/challengeFactory.go similarity index 96% rename from packages/arb-validator/ethbridge/challengeFactory.go rename to packages/arb-validator-core/ethbridge/challengeFactory.go index 8c163b4af5..5572740c98 100644 --- a/packages/arb-validator/ethbridge/challengeFactory.go +++ b/packages/arb-validator-core/ethbridge/challengeFactory.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/challengefactory" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/challengefactory" ) type challengeFactory struct { diff --git a/packages/arb-validator/ethbridge/challengeTester.go b/packages/arb-validator-core/ethbridge/challengeTester.go similarity index 96% rename from packages/arb-validator/ethbridge/challengeTester.go rename to packages/arb-validator-core/ethbridge/challengeTester.go index 8e6347d477..7834db896d 100644 --- a/packages/arb-validator/ethbridge/challengeTester.go +++ b/packages/arb-validator-core/ethbridge/challengeTester.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/challengetester" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/challengetester" ) type ChallengeTester struct { diff --git a/packages/arb-validator/ethbridge/challengefactory/challengefactory.go b/packages/arb-validator-core/ethbridge/challengefactory/challengefactory.go similarity index 100% rename from packages/arb-validator/ethbridge/challengefactory/challengefactory.go rename to packages/arb-validator-core/ethbridge/challengefactory/challengefactory.go diff --git a/packages/arb-validator/ethbridge/challengetester/challengetester.go b/packages/arb-validator-core/ethbridge/challengetester/challengetester.go similarity index 100% rename from packages/arb-validator/ethbridge/challengetester/challengetester.go rename to packages/arb-validator-core/ethbridge/challengetester/challengetester.go diff --git a/packages/arb-validator/ethbridge/conversion.go b/packages/arb-validator-core/ethbridge/conversion.go similarity index 100% rename from packages/arb-validator/ethbridge/conversion.go rename to packages/arb-validator-core/ethbridge/conversion.go diff --git a/packages/arb-validator/ethbridge/executionChallenge.go b/packages/arb-validator-core/ethbridge/executionChallenge.go similarity index 91% rename from packages/arb-validator/ethbridge/executionChallenge.go rename to packages/arb-validator-core/ethbridge/executionChallenge.go index 2ad7928e82..825b224a32 100644 --- a/packages/arb-validator/ethbridge/executionChallenge.go +++ b/packages/arb-validator-core/ethbridge/executionChallenge.go @@ -25,9 +25,8 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/executionchallenge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/executionchallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type executionChallenge struct { @@ -153,10 +152,10 @@ func (c *executionChallenge) ChooseSegment( ) error { bisectionHashes := make([]common.Hash, 0, len(assertions)) for i := range assertions { - stepCount := structures.CalculateBisectionStepCount(uint64(i), uint64(len(assertions)), totalSteps) + stepCount := valprotocol.CalculateBisectionStepCount(uint64(i), uint64(len(assertions)), totalSteps) bisectionHashes = append( bisectionHashes, - structures.ExecutionDataHash(stepCount, preconditions[i].Hash(), assertions[i].Hash()), + valprotocol.ExecutionDataHash(stepCount, preconditions[i].Hash(), assertions[i].Hash()), ) } return c.bisectionChallenge.chooseSegment( diff --git a/packages/arb-validator/ethbridge/executionChallengeWatcher.go b/packages/arb-validator-core/ethbridge/executionChallengeWatcher.go similarity index 93% rename from packages/arb-validator/ethbridge/executionChallengeWatcher.go rename to packages/arb-validator-core/ethbridge/executionChallengeWatcher.go index c830451ba8..cce5a70bb6 100644 --- a/packages/arb-validator/ethbridge/executionChallengeWatcher.go +++ b/packages/arb-validator-core/ethbridge/executionChallengeWatcher.go @@ -20,18 +20,18 @@ import ( "context" "strings" + ethereum "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/core/types" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" errors2 "github.com/pkg/errors" "github.com/ethereum/go-ethereum/accounts/abi" ethcommon "github.com/ethereum/go-ethereum/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/executionchallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/executionchallenge" ) var bisectedAssertionID ethcommon.Hash diff --git a/packages/arb-validator/ethbridge/executionchallenge/calls.go b/packages/arb-validator-core/ethbridge/executionchallenge/calls.go similarity index 97% rename from packages/arb-validator/ethbridge/executionchallenge/calls.go rename to packages/arb-validator-core/ethbridge/executionchallenge/calls.go index e74352879f..a3f344d33c 100644 --- a/packages/arb-validator/ethbridge/executionchallenge/calls.go +++ b/packages/arb-validator-core/ethbridge/executionchallenge/calls.go @@ -21,7 +21,7 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethutils" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethutils" "github.com/ethereum/go-ethereum/ethclient" diff --git a/packages/arb-validator/ethbridge/executionchallenge/executionchallenge.go b/packages/arb-validator-core/ethbridge/executionchallenge/executionchallenge.go similarity index 100% rename from packages/arb-validator/ethbridge/executionchallenge/executionchallenge.go rename to packages/arb-validator-core/ethbridge/executionchallenge/executionchallenge.go diff --git a/packages/arb-validator/ethbridge/globalInbox.go b/packages/arb-validator-core/ethbridge/globalInbox.go similarity index 96% rename from packages/arb-validator/ethbridge/globalInbox.go rename to packages/arb-validator-core/ethbridge/globalInbox.go index 1ac31df7f7..bd6fbe08e7 100644 --- a/packages/arb-validator/ethbridge/globalInbox.go +++ b/packages/arb-validator-core/ethbridge/globalInbox.go @@ -20,9 +20,9 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/globalinbox" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/globalinbox" errors2 "github.com/pkg/errors" diff --git a/packages/arb-validator/ethbridge/globalinbox/globalinbox.go b/packages/arb-validator-core/ethbridge/globalinbox/globalinbox.go similarity index 100% rename from packages/arb-validator/ethbridge/globalinbox/globalinbox.go rename to packages/arb-validator-core/ethbridge/globalinbox/globalinbox.go diff --git a/packages/arb-validator/ethbridge/inboxTopChallenge.go b/packages/arb-validator-core/ethbridge/inboxTopChallenge.go similarity index 90% rename from packages/arb-validator/ethbridge/inboxTopChallenge.go rename to packages/arb-validator-core/ethbridge/inboxTopChallenge.go index 20808bbc27..def64556d3 100644 --- a/packages/arb-validator/ethbridge/inboxTopChallenge.go +++ b/packages/arb-validator-core/ethbridge/inboxTopChallenge.go @@ -20,7 +20,9 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/inboxtopchallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" + + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/inboxtopchallenge" errors2 "github.com/pkg/errors" @@ -28,7 +30,6 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" ) type inboxTopChallenge struct { @@ -100,10 +101,10 @@ func (c *inboxTopChallenge) ChooseSegment( bisectionCount := uint64(len(chainHashes) - 1) bisectionHashes := make([]common.Hash, 0, bisectionCount) for i := uint64(0); i < bisectionCount; i++ { - stepCount := structures.CalculateBisectionStepCount(i, bisectionCount, chainLength) + stepCount := valprotocol.CalculateBisectionStepCount(i, bisectionCount, chainLength) bisectionHashes = append( bisectionHashes, - structures.InboxTopChallengeDataHash( + valprotocol.InboxTopChallengeDataHash( chainHashes[i], chainHashes[i+1], new(big.Int).SetUint64(uint64(stepCount)), diff --git a/packages/arb-validator/ethbridge/inboxTopChallengeWatcher.go b/packages/arb-validator-core/ethbridge/inboxTopChallengeWatcher.go similarity index 94% rename from packages/arb-validator/ethbridge/inboxTopChallengeWatcher.go rename to packages/arb-validator-core/ethbridge/inboxTopChallengeWatcher.go index e64e4eb238..a50f8f7450 100644 --- a/packages/arb-validator/ethbridge/inboxTopChallengeWatcher.go +++ b/packages/arb-validator-core/ethbridge/inboxTopChallengeWatcher.go @@ -22,15 +22,15 @@ import ( errors2 "github.com/pkg/errors" - "github.com/ethereum/go-ethereum" + ethereum "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/inboxtopchallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/inboxtopchallenge" ) var inboxTopBisectedID ethcommon.Hash diff --git a/packages/arb-validator/ethbridge/inboxtopchallenge/calls.go b/packages/arb-validator-core/ethbridge/inboxtopchallenge/calls.go similarity index 95% rename from packages/arb-validator/ethbridge/inboxtopchallenge/calls.go rename to packages/arb-validator-core/ethbridge/inboxtopchallenge/calls.go index 9cd39bf43d..4811b85155 100644 --- a/packages/arb-validator/ethbridge/inboxtopchallenge/calls.go +++ b/packages/arb-validator-core/ethbridge/inboxtopchallenge/calls.go @@ -21,7 +21,7 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethutils" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethutils" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" diff --git a/packages/arb-validator/ethbridge/inboxtopchallenge/inboxtopchallenge.go b/packages/arb-validator-core/ethbridge/inboxtopchallenge/inboxtopchallenge.go similarity index 100% rename from packages/arb-validator/ethbridge/inboxtopchallenge/inboxtopchallenge.go rename to packages/arb-validator-core/ethbridge/inboxtopchallenge/inboxtopchallenge.go diff --git a/packages/arb-validator/ethbridge/logFetcher.go b/packages/arb-validator-core/ethbridge/logFetcher.go similarity index 98% rename from packages/arb-validator/ethbridge/logFetcher.go rename to packages/arb-validator-core/ethbridge/logFetcher.go index ef4cf80ea5..47263018b2 100644 --- a/packages/arb-validator/ethbridge/logFetcher.go +++ b/packages/arb-validator-core/ethbridge/logFetcher.go @@ -22,11 +22,11 @@ import ( "log" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/ethereum/go-ethereum" + ethereum "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" ) diff --git a/packages/arb-validator/ethbridge/merkleTree.go b/packages/arb-validator-core/ethbridge/merkleTree.go similarity index 100% rename from packages/arb-validator/ethbridge/merkleTree.go rename to packages/arb-validator-core/ethbridge/merkleTree.go diff --git a/packages/arb-validator/ethbridge/messagesChallenge.go b/packages/arb-validator-core/ethbridge/messagesChallenge.go similarity index 93% rename from packages/arb-validator/ethbridge/messagesChallenge.go rename to packages/arb-validator-core/ethbridge/messagesChallenge.go index 54ab3cab54..7ad102410e 100644 --- a/packages/arb-validator/ethbridge/messagesChallenge.go +++ b/packages/arb-validator-core/ethbridge/messagesChallenge.go @@ -20,16 +20,15 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" - errors2 "github.com/pkg/errors" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/messageschallenge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/messageschallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type messagesChallenge struct { @@ -216,10 +215,10 @@ func (c *messagesChallenge) ChooseSegment( bisectionCount := uint64(len(chainHashes) - 1) bisectionHashes := make([]common.Hash, 0, bisectionCount) for i := uint64(0); i < bisectionCount; i++ { - stepCount := structures.CalculateBisectionStepCount(i, bisectionCount, chainLength.Uint64()) + stepCount := valprotocol.CalculateBisectionStepCount(i, bisectionCount, chainLength.Uint64()) bisectionHashes = append( bisectionHashes, - structures.MessageChallengeDataHash( + valprotocol.MessageChallengeDataHash( chainHashes[i], chainHashes[i+1], segmentHashes[i], diff --git a/packages/arb-validator/ethbridge/messagesChallengeWatcher.go b/packages/arb-validator-core/ethbridge/messagesChallengeWatcher.go similarity index 94% rename from packages/arb-validator/ethbridge/messagesChallengeWatcher.go rename to packages/arb-validator-core/ethbridge/messagesChallengeWatcher.go index ea29dade21..5ffae495fe 100644 --- a/packages/arb-validator/ethbridge/messagesChallengeWatcher.go +++ b/packages/arb-validator-core/ethbridge/messagesChallengeWatcher.go @@ -22,15 +22,15 @@ import ( errors2 "github.com/pkg/errors" - "github.com/ethereum/go-ethereum" + ethereum "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/messageschallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/messageschallenge" ) var messagesBisectedID ethcommon.Hash diff --git a/packages/arb-validator/ethbridge/messageschallenge/calls.go b/packages/arb-validator-core/ethbridge/messageschallenge/calls.go similarity index 97% rename from packages/arb-validator/ethbridge/messageschallenge/calls.go rename to packages/arb-validator-core/ethbridge/messageschallenge/calls.go index 344a021178..c484a4957b 100644 --- a/packages/arb-validator/ethbridge/messageschallenge/calls.go +++ b/packages/arb-validator-core/ethbridge/messageschallenge/calls.go @@ -6,12 +6,11 @@ import ( "fmt" "math/big" + ethereum "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" ) diff --git a/packages/arb-validator/ethbridge/messageschallenge/messageschallenge.go b/packages/arb-validator-core/ethbridge/messageschallenge/messageschallenge.go similarity index 100% rename from packages/arb-validator/ethbridge/messageschallenge/messageschallenge.go rename to packages/arb-validator-core/ethbridge/messageschallenge/messageschallenge.go diff --git a/packages/arb-validator/ethbridge/messagetester/messagetester.go b/packages/arb-validator-core/ethbridge/messagetester/messagetester.go similarity index 100% rename from packages/arb-validator/ethbridge/messagetester/messagetester.go rename to packages/arb-validator-core/ethbridge/messagetester/messagetester.go diff --git a/packages/arb-validator/ethbridge/oneStepProof.go b/packages/arb-validator-core/ethbridge/oneStepProof.go similarity index 91% rename from packages/arb-validator/ethbridge/oneStepProof.go rename to packages/arb-validator-core/ethbridge/oneStepProof.go index 2956b7480d..e094c225cc 100644 --- a/packages/arb-validator/ethbridge/oneStepProof.go +++ b/packages/arb-validator-core/ethbridge/oneStepProof.go @@ -26,8 +26,8 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/executionchallenge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/executionchallenge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type oneStepProof struct { diff --git a/packages/arb-validator/ethbridge/rollup/arbrollup.go b/packages/arb-validator-core/ethbridge/rollup/arbrollup.go similarity index 100% rename from packages/arb-validator/ethbridge/rollup/arbrollup.go rename to packages/arb-validator-core/ethbridge/rollup/arbrollup.go diff --git a/packages/arb-validator/ethbridge/rollup/calls.go b/packages/arb-validator-core/ethbridge/rollup/calls.go similarity index 97% rename from packages/arb-validator/ethbridge/rollup/calls.go rename to packages/arb-validator-core/ethbridge/rollup/calls.go index bb42f8e156..bc2aa828c7 100644 --- a/packages/arb-validator/ethbridge/rollup/calls.go +++ b/packages/arb-validator-core/ethbridge/rollup/calls.go @@ -21,7 +21,7 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethutils" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethutils" "github.com/ethereum/go-ethereum/ethclient" @@ -38,7 +38,6 @@ func (_ArbRollup *ArbRollupTransactor) MakeAssertionCall(ctx context.Context, cl return callCheck(ctx, client, from, contractAddress, "makeAssertion", _fields, _beforePendingCount, _prevDeadlineTicks, _prevChildType, _numSteps, _timeBoundsBlocks, _importedMessageCount, _didInboxInsn, _numArbGas, _stakerProof) } - func callCheck(ctx context.Context, client *ethclient.Client, from common.Address, contractAddress common.Address, method string, params ...interface{}) error { contractABI, err := abi.JSON(bytes.NewReader([]byte(ArbRollupABI))) if err != nil { diff --git a/packages/arb-validator/ethbridgetest/ethbridgetest.go b/packages/arb-validator-core/ethbridgetest/ethbridgetest.go similarity index 100% rename from packages/arb-validator/ethbridgetest/ethbridgetest.go rename to packages/arb-validator-core/ethbridgetest/ethbridgetest.go diff --git a/packages/arb-validator/ethbridgetest/message_test.go b/packages/arb-validator-core/ethbridgetest/message_test.go similarity index 94% rename from packages/arb-validator/ethbridgetest/message_test.go rename to packages/arb-validator-core/ethbridgetest/message_test.go index a94b02f1ff..db7146a23f 100644 --- a/packages/arb-validator/ethbridgetest/message_test.go +++ b/packages/arb-validator-core/ethbridgetest/message_test.go @@ -24,10 +24,10 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge/messagetester" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" - "github.com/offchainlabs/arbitrum/packages/arb-validator/test" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge/messagetester" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/test" ) func init() { diff --git a/packages/arb-validator/ethutils/calls.go b/packages/arb-validator-core/ethutils/calls.go similarity index 100% rename from packages/arb-validator/ethutils/calls.go rename to packages/arb-validator-core/ethutils/calls.go diff --git a/packages/arb-validator/evm/evm_advise.go b/packages/arb-validator-core/evm/evm_advise.go similarity index 98% rename from packages/arb-validator/evm/evm_advise.go rename to packages/arb-validator-core/evm/evm_advise.go index e8eeb611fb..6711695a88 100644 --- a/packages/arb-validator/evm/evm_advise.go +++ b/packages/arb-validator-core/evm/evm_advise.go @@ -22,12 +22,11 @@ import ( "math/big" "strings" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" - "github.com/ethereum/go-ethereum/common/hexutil" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/value" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" ) type Result interface { diff --git a/packages/arb-validator/evm/log.go b/packages/arb-validator-core/evm/log.go similarity index 97% rename from packages/arb-validator/evm/log.go rename to packages/arb-validator-core/evm/log.go index f9dfbeed43..3a55b49633 100644 --- a/packages/arb-validator/evm/log.go +++ b/packages/arb-validator-core/evm/log.go @@ -21,11 +21,11 @@ import ( "fmt" "strings" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/value" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" ) type Log struct { diff --git a/packages/arb-validator-core/go.mod b/packages/arb-validator-core/go.mod new file mode 100644 index 0000000000..1e78fc7132 --- /dev/null +++ b/packages/arb-validator-core/go.mod @@ -0,0 +1,13 @@ +module github.com/offchainlabs/arbitrum/packages/arb-validator-core + +go 1.12 + +require ( + github.com/ethereum/go-ethereum v1.9.10 + github.com/golang/protobuf v1.3.2 + github.com/offchainlabs/arbitrum/packages/arb-util v0.4.2 + github.com/pkg/errors v0.9.1 + google.golang.org/grpc v1.23.1 +) + +replace github.com/offchainlabs/arbitrum/packages/arb-util => ../arb-util diff --git a/packages/arb-validator-core/go.sum b/packages/arb-validator-core/go.sum new file mode 100644 index 0000000000..eda688cdc6 --- /dev/null +++ b/packages/arb-validator-core/go.sum @@ -0,0 +1,375 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= +github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= +github.com/Shopify/sarama v1.23.1/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/VictoriaMetrics/fastcache v1.5.2/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= +github.com/VictoriaMetrics/fastcache v1.5.3 h1:2odJnXLbFZcoV9KYtQ+7TH1UOq3dn3AssMgieaezkR4= +github.com/VictoriaMetrics/fastcache v1.5.3/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= +github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +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= +github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= +github.com/aristanetworks/fsnotify v1.4.2/go.mod h1:D/rtu7LpjYM8tRJphJ0hUBYpjai8SfX+aSNsWDTq/Ks= +github.com/aristanetworks/glog v0.0.0-20180419172825-c15b03b3054f/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= +github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A= +github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= +github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6 h1:6bZNnQcA2fkzH9AhZXbp2nDqbWa4bBqFeUb70Zq1HBM= +github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6/go.mod h1:Z4RTxGAuYhPzcq8+EdRM+R8M48Ssle2TsWtwRKa+vns= +github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +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/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= +github.com/btcsuite/btcd v0.0.0-20190109040709-5bda5314ca95/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= +github.com/btcsuite/btcd v0.0.0-20190629003639-c26ffa870fd8/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= +github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= +github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= +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/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= +github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +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/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9rTHJQ= +github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= +github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c h1:JHHhtb9XWJrGNMcrVP6vyzO4dusgi/HnceHTgxSejUM= +github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= +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/elastic/gosigar v0.10.5 h1:GzPQ+78RaAb4J63unidA/JavQRKrB6s8IOzN6Ib59jo= +github.com/elastic/gosigar v0.10.5/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= +github.com/ethereum/go-ethereum v1.8.20/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= +github.com/ethereum/go-ethereum v1.9.8/go.mod h1:N68Ktr8bkyajaEy6D8CSANxkhUxcnVjTmp9sKdKd8OI= +github.com/ethereum/go-ethereum v1.9.10 h1:jooX7tWcscpC7ytufk73t9JMCeJQ7aJF2YmZJQEuvFo= +github.com/ethereum/go-ethereum v1.9.10/go.mod h1:lXHkVo/MTvsEXfYsmNzelZ8R1e0DTvdk/wMZJIRpaRw= +github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= +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/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= +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/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad h1:eMxs9EL0PvIGS9TTtxg4R+JxuPGav82J8rA+GFnY7po= +github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk= +github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huin/goupnp v0.0.0-20161224104101-679507af18f3 h1:DqD8eigqlUm0+znmx7zhL0xvTW3+e1jCekJMfBUADWI= +github.com/huin/goupnp v0.0.0-20161224104101-679507af18f3/go.mod h1:MZ2ZmwcBpvOoJ22IJsc7va19ZwoheaBk43rKg12SKag= +github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo= +github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= +github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= +github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +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/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +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/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/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 h1:I/yrLt2WilKxlQKCM52clh5rGzTKpVctGT1lH4Dc8Jw= +github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/reedsolomon v1.9.2/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +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-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +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-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miguelmota/go-solidity-sha3 v0.1.0 h1:RoRqUD/qKqZCZIoAGVJhX6gEHeD6333uQv+jhBGpRDk= +github.com/miguelmota/go-solidity-sha3 v0.1.0/go.mod h1:FuaBKCJUkJcmPqCuKvPFYfzK1auYGr5+8i2evSBIm/Q= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= +github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= +github.com/offchainlabs/arbitrum v0.4.1 h1:zcIPxwsbxp6LggBQc1f6YOc8ee3tEHpiPcAn2UsfumA= +github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.4.1 h1:55jrxB7vH0rnkeUzSwqm/Qj2ssLhSfJWoWI5svu7yus= +github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.4.1/go.mod h1:ned/tmRpfuqf0A+1strUGB6xE8dKDDuzGZLNO7vKFnw= +github.com/offchainlabs/arbitrum/packages/arb-avm-go v0.4.1 h1:JYlALMHmF1pP/Mo476Hp8ciLCttRtluO/g4CVL5BibU= +github.com/offchainlabs/arbitrum/packages/arb-avm-go v0.4.1/go.mod h1:h3/cTf4o60g/VLs5EIkotsx3oP5xzNQfCXqzUkDsiMQ= +github.com/offchainlabs/arbitrum/packages/arb-util v0.4.1 h1:zTe8Rzc7EjfpzGDi3wCbq1tkQGibp0tsh96GF56x5Yk= +github.com/offchainlabs/arbitrum/packages/arb-util v0.4.1/go.mod h1:ujBu28/CoqkpVpnPmQfZ9pQgpcK+fPd4lVwzyuJymBA= +github.com/offchainlabs/arbitrum/packages/arb-validator v0.4.1 h1:Gy7ufhMFeviUrOJ50yvRTPV75I/Qy3eLAvzdp33qEGo= +github.com/offchainlabs/arbitrum/packages/arb-validator v0.4.1/go.mod h1:RkUD5VdhtjR5rMG1w6EX/0yBgixJlaBMJmnhkUJPLAE= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c h1:1RHs3tNxjXGHeul8z2t6H2N2TlAqpKe5yryJztRx4Jk= +github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +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.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= +github.com/openconfig/reference v0.0.0-20190727015836-8dfd928c9696/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222 h1:goeTyGkArOZIVOMA0dQbyuPWGNQJZGPwPu/QS9GlpnA= +github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= +github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= +github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150 h1:ZeU+auZj1iNzN8iVhff6M38Mfu73FQiJve/GEXYJBjE= +github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/prometheus/tsdb v0.10.0 h1:If5rVCMTp6W2SiRAQFlbpJNgVlgMEd+U2GZckwK38ic= +github.com/prometheus/tsdb v0.10.0/go.mod h1:oi49uRhEe9dPUTlS3JRZOwJuVi6tmh10QSgwXEyGCt4= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE= +github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= +github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8= +github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM= +github.com/robertkrimen/otto v0.0.0-20170205013659-6a77b7cbc37d/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= +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/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= +github.com/rs/cors v1.7.0/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/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +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/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= +github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= +github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48 h1:ju5UTwk5Odtm4trrY+4Ca4RMj5OyXbmVeDAVad2T0Jw= +github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= +github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE= +github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= +github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 h1:njlZPzLwU639dk2kqnCPPv+wNjq7Xb6EfUxe/oX0/NM= +github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +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/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d h1:gZZadD8H+fF+n9CmNhYL1Y0dJB+kLOmKd7FbPJLeGHs= +github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA= +github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= +github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= +github.com/tjfoc/gmsm v1.0.1/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc= +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/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8= +github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8cVcUy5CeIBYhEESkOB7m6Gmkrk= +github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= +github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= +github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/xtaci/kcp-go v5.4.5+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= +github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= +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-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2 h1:4dVFTC832rPn4pomLSz1vA+are2+dU19w1H8OngV7nc= +golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +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-20181205085412-a5c9d58dba9a/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-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI= +golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8 h1:41hwlulw1prEMBxLQSlMSux1zxJf07B3WPsdjJlKZxE= +golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190912185636-87d9f09c5d89/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= +gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= +gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= +gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= +gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= +gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= +gopkg.in/olebedev/go-duktape.v3 v3.0.0-20190213234257-ec84240a7772/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= +gopkg.in/olebedev/go-duktape.v3 v3.0.0-20190709231704-1e4459ed25ff/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= +gopkg.in/redis.v4 v4.2.4/go.mod h1:8KREHdypkCEojGKQcjMqAODMICIVwZAONWq8RowTITA= +gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/packages/arb-validator/message/call.go b/packages/arb-validator-core/message/call.go similarity index 100% rename from packages/arb-validator/message/call.go rename to packages/arb-validator-core/message/call.go diff --git a/packages/arb-validator/message/contractTransaction.go b/packages/arb-validator-core/message/contractTransaction.go similarity index 100% rename from packages/arb-validator/message/contractTransaction.go rename to packages/arb-validator-core/message/contractTransaction.go diff --git a/packages/arb-validator/message/data.go b/packages/arb-validator-core/message/data.go similarity index 100% rename from packages/arb-validator/message/data.go rename to packages/arb-validator-core/message/data.go diff --git a/packages/arb-validator/message/data_test.go b/packages/arb-validator-core/message/data_test.go similarity index 100% rename from packages/arb-validator/message/data_test.go rename to packages/arb-validator-core/message/data_test.go diff --git a/packages/arb-validator/message/erc20.go b/packages/arb-validator-core/message/erc20.go similarity index 100% rename from packages/arb-validator/message/erc20.go rename to packages/arb-validator-core/message/erc20.go diff --git a/packages/arb-validator/message/erc20_test.go b/packages/arb-validator-core/message/erc20_test.go similarity index 100% rename from packages/arb-validator/message/erc20_test.go rename to packages/arb-validator-core/message/erc20_test.go diff --git a/packages/arb-validator/message/erc721.go b/packages/arb-validator-core/message/erc721.go similarity index 100% rename from packages/arb-validator/message/erc721.go rename to packages/arb-validator-core/message/erc721.go diff --git a/packages/arb-validator/message/erc721_test.go b/packages/arb-validator-core/message/erc721_test.go similarity index 100% rename from packages/arb-validator/message/erc721_test.go rename to packages/arb-validator-core/message/erc721_test.go diff --git a/packages/arb-validator/message/eth.go b/packages/arb-validator-core/message/eth.go similarity index 100% rename from packages/arb-validator/message/eth.go rename to packages/arb-validator-core/message/eth.go diff --git a/packages/arb-validator/message/eth_test.go b/packages/arb-validator-core/message/eth_test.go similarity index 100% rename from packages/arb-validator/message/eth_test.go rename to packages/arb-validator-core/message/eth_test.go diff --git a/packages/arb-validator/message/message.go b/packages/arb-validator-core/message/message.go similarity index 100% rename from packages/arb-validator/message/message.go rename to packages/arb-validator-core/message/message.go diff --git a/packages/arb-validator/message/transaction.go b/packages/arb-validator-core/message/transaction.go similarity index 100% rename from packages/arb-validator/message/transaction.go rename to packages/arb-validator-core/message/transaction.go diff --git a/packages/arb-validator/message/transaction_test.go b/packages/arb-validator-core/message/transaction_test.go similarity index 100% rename from packages/arb-validator/message/transaction_test.go rename to packages/arb-validator-core/message/transaction_test.go diff --git a/packages/arb-validator/mockbridge/arbClient.go b/packages/arb-validator-core/mockbridge/arbClient.go similarity index 97% rename from packages/arb-validator/mockbridge/arbClient.go rename to packages/arb-validator-core/mockbridge/arbClient.go index 072b803131..a2057d35c3 100644 --- a/packages/arb-validator/mockbridge/arbClient.go +++ b/packages/arb-validator-core/mockbridge/arbClient.go @@ -22,7 +22,7 @@ import ( "math/big" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type ArbClient struct { diff --git a/packages/arb-validator/mockbridge/arbFactory.go b/packages/arb-validator-core/mockbridge/arbFactory.go similarity index 89% rename from packages/arb-validator/mockbridge/arbFactory.go rename to packages/arb-validator-core/mockbridge/arbFactory.go index 70779c6638..ca49a8436e 100644 --- a/packages/arb-validator/mockbridge/arbFactory.go +++ b/packages/arb-validator-core/mockbridge/arbFactory.go @@ -3,10 +3,10 @@ package mockbridge import ( "context" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type ArbFactory struct { diff --git a/packages/arb-validator/mockbridge/arbRollup.go b/packages/arb-validator-core/mockbridge/arbRollup.go similarity index 98% rename from packages/arb-validator/mockbridge/arbRollup.go rename to packages/arb-validator-core/mockbridge/arbRollup.go index eb5ff3980f..41751dfedc 100644 --- a/packages/arb-validator/mockbridge/arbRollup.go +++ b/packages/arb-validator-core/mockbridge/arbRollup.go @@ -20,12 +20,12 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type ArbRollup struct { diff --git a/packages/arb-validator/mockbridge/arbRollupWatcher.go b/packages/arb-validator-core/mockbridge/arbRollupWatcher.go similarity index 98% rename from packages/arb-validator/mockbridge/arbRollupWatcher.go rename to packages/arb-validator-core/mockbridge/arbRollupWatcher.go index 719fc6cd77..b9434c40be 100644 --- a/packages/arb-validator/mockbridge/arbRollupWatcher.go +++ b/packages/arb-validator-core/mockbridge/arbRollupWatcher.go @@ -19,10 +19,10 @@ package mockbridge import ( "context" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type EthRollupWatcher struct { diff --git a/packages/arb-validator/mockbridge/bisectionChallenge.go b/packages/arb-validator-core/mockbridge/bisectionChallenge.go similarity index 98% rename from packages/arb-validator/mockbridge/bisectionChallenge.go rename to packages/arb-validator-core/mockbridge/bisectionChallenge.go index 16ed4a0e72..f9eec58a05 100644 --- a/packages/arb-validator/mockbridge/bisectionChallenge.go +++ b/packages/arb-validator-core/mockbridge/bisectionChallenge.go @@ -20,7 +20,7 @@ import ( "context" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type BisectionChallenge struct { diff --git a/packages/arb-validator/mockbridge/challenge.go b/packages/arb-validator-core/mockbridge/challenge.go similarity index 98% rename from packages/arb-validator/mockbridge/challenge.go rename to packages/arb-validator-core/mockbridge/challenge.go index bc072fff22..0111102b37 100644 --- a/packages/arb-validator/mockbridge/challenge.go +++ b/packages/arb-validator-core/mockbridge/challenge.go @@ -20,7 +20,7 @@ import ( "context" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type Challenge struct { diff --git a/packages/arb-validator/mockbridge/clientConnection.go b/packages/arb-validator-core/mockbridge/clientConnection.go similarity index 92% rename from packages/arb-validator/mockbridge/clientConnection.go rename to packages/arb-validator-core/mockbridge/clientConnection.go index 8fdad6823a..ced1a65850 100644 --- a/packages/arb-validator/mockbridge/clientConnection.go +++ b/packages/arb-validator-core/mockbridge/clientConnection.go @@ -21,7 +21,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type ClientConnection struct { diff --git a/packages/arb-validator/mockbridge/executionChallenge.go b/packages/arb-validator-core/mockbridge/executionChallenge.go similarity index 97% rename from packages/arb-validator/mockbridge/executionChallenge.go rename to packages/arb-validator-core/mockbridge/executionChallenge.go index 95123504ec..d5f9bc0c89 100644 --- a/packages/arb-validator/mockbridge/executionChallenge.go +++ b/packages/arb-validator-core/mockbridge/executionChallenge.go @@ -20,8 +20,8 @@ import ( "context" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type ExecutionChallenge struct { diff --git a/packages/arb-validator/mockbridge/globalInbox.go b/packages/arb-validator-core/mockbridge/globalInbox.go similarity index 94% rename from packages/arb-validator/mockbridge/globalInbox.go rename to packages/arb-validator-core/mockbridge/globalInbox.go index f4b4894445..b00a84b137 100644 --- a/packages/arb-validator/mockbridge/globalInbox.go +++ b/packages/arb-validator-core/mockbridge/globalInbox.go @@ -20,10 +20,10 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type GlobalInbox struct { diff --git a/packages/arb-validator/mockbridge/inboxTopChallenge.go b/packages/arb-validator-core/mockbridge/inboxTopChallenge.go similarity index 97% rename from packages/arb-validator/mockbridge/inboxTopChallenge.go rename to packages/arb-validator-core/mockbridge/inboxTopChallenge.go index 8cf70cc811..619f737ba5 100644 --- a/packages/arb-validator/mockbridge/inboxTopChallenge.go +++ b/packages/arb-validator-core/mockbridge/inboxTopChallenge.go @@ -21,7 +21,7 @@ import ( "math/big" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type InboxTopChallenge struct { diff --git a/packages/arb-validator/mockbridge/messagesChallenge.go b/packages/arb-validator-core/mockbridge/messagesChallenge.go similarity index 96% rename from packages/arb-validator/mockbridge/messagesChallenge.go rename to packages/arb-validator-core/mockbridge/messagesChallenge.go index 37dc133c94..2270457a81 100644 --- a/packages/arb-validator/mockbridge/messagesChallenge.go +++ b/packages/arb-validator-core/mockbridge/messagesChallenge.go @@ -20,10 +20,10 @@ import ( "context" "math/big" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type MessagesChallenge struct { diff --git a/packages/arb-validator/mockbridge/oneStepProof.go b/packages/arb-validator-core/mockbridge/oneStepProof.go similarity index 92% rename from packages/arb-validator/mockbridge/oneStepProof.go rename to packages/arb-validator-core/mockbridge/oneStepProof.go index 499a4cdc90..6f38a954e0 100644 --- a/packages/arb-validator/mockbridge/oneStepProof.go +++ b/packages/arb-validator-core/mockbridge/oneStepProof.go @@ -21,8 +21,8 @@ import ( "math/big" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type OneStepProof struct { diff --git a/packages/arb-validator/test/helper.go b/packages/arb-validator-core/test/helper.go similarity index 100% rename from packages/arb-validator/test/helper.go rename to packages/arb-validator-core/test/helper.go diff --git a/packages/arb-validator/unanimous/unanimous.go b/packages/arb-validator-core/unanimous/unanimous.go similarity index 96% rename from packages/arb-validator/unanimous/unanimous.go rename to packages/arb-validator-core/unanimous/unanimous.go index 640aca45e6..4540008f54 100644 --- a/packages/arb-validator/unanimous/unanimous.go +++ b/packages/arb-validator-core/unanimous/unanimous.go @@ -20,7 +20,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/hashing" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) func UnanimousAssertPartialPartialHash( diff --git a/packages/arb-validator-core/validatorserver/serialization.go b/packages/arb-validator-core/validatorserver/serialization.go new file mode 100644 index 0000000000..7d957657ca --- /dev/null +++ b/packages/arb-validator-core/validatorserver/serialization.go @@ -0,0 +1,19 @@ +/* + * Copyright 2020, Offchain Labs, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package validatorserver + +//go:generate bash -c "protoc -I$(go list -f '{{ .Dir }}' -m github.com/offchainlabs/arbitrum/packages/arb-validator) -I. --tstypes_out=../../arb-provider-ethers/src/lib --go_out=paths=source_relative,plugins=grpc:. *.proto" diff --git a/packages/arb-validator/rollupvalidator/server.pb.go b/packages/arb-validator-core/validatorserver/server.pb.go similarity index 57% rename from packages/arb-validator/rollupvalidator/server.pb.go rename to packages/arb-validator-core/validatorserver/server.pb.go index 0db766476a..116a6a55f8 100644 --- a/packages/arb-validator/rollupvalidator/server.pb.go +++ b/packages/arb-validator-core/validatorserver/server.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: server.proto -package rollupvalidator +package validatorserver import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -570,62 +574,286 @@ func (m *CallMessageReply) GetRawVal() string { } func init() { - proto.RegisterType((*LogInfo)(nil), "rollupvalidator.LogInfo") - proto.RegisterType((*FindLogsArgs)(nil), "rollupvalidator.FindLogsArgs") - proto.RegisterType((*FindLogsReply)(nil), "rollupvalidator.FindLogsReply") - proto.RegisterType((*GetMessageResultArgs)(nil), "rollupvalidator.GetMessageResultArgs") - proto.RegisterType((*GetMessageResultReply)(nil), "rollupvalidator.GetMessageResultReply") - proto.RegisterType((*GetAssertionCountArgs)(nil), "rollupvalidator.GetAssertionCountArgs") - proto.RegisterType((*GetAssertionCountReply)(nil), "rollupvalidator.GetAssertionCountReply") - proto.RegisterType((*GetVMInfoArgs)(nil), "rollupvalidator.GetVMInfoArgs") - proto.RegisterType((*GetVMInfoReply)(nil), "rollupvalidator.GetVMInfoReply") - proto.RegisterType((*CallMessageArgs)(nil), "rollupvalidator.CallMessageArgs") - proto.RegisterType((*CallMessageReply)(nil), "rollupvalidator.CallMessageReply") + proto.RegisterType((*LogInfo)(nil), "validatorserver.LogInfo") + proto.RegisterType((*FindLogsArgs)(nil), "validatorserver.FindLogsArgs") + proto.RegisterType((*FindLogsReply)(nil), "validatorserver.FindLogsReply") + proto.RegisterType((*GetMessageResultArgs)(nil), "validatorserver.GetMessageResultArgs") + proto.RegisterType((*GetMessageResultReply)(nil), "validatorserver.GetMessageResultReply") + proto.RegisterType((*GetAssertionCountArgs)(nil), "validatorserver.GetAssertionCountArgs") + proto.RegisterType((*GetAssertionCountReply)(nil), "validatorserver.GetAssertionCountReply") + proto.RegisterType((*GetVMInfoArgs)(nil), "validatorserver.GetVMInfoArgs") + proto.RegisterType((*GetVMInfoReply)(nil), "validatorserver.GetVMInfoReply") + proto.RegisterType((*CallMessageArgs)(nil), "validatorserver.CallMessageArgs") + proto.RegisterType((*CallMessageReply)(nil), "validatorserver.CallMessageReply") } func init() { proto.RegisterFile("server.proto", fileDescriptor_ad098daeda4239f7) } var fileDescriptor_ad098daeda4239f7 = []byte{ - // 653 bytes of a gzipped FileDescriptorProto + // 656 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x4d, 0x6f, 0xd3, 0x4c, 0x10, 0x56, 0x9a, 0x8f, 0x26, 0xd3, 0x8f, 0xf4, 0x5d, 0xf5, 0x2d, 0x56, 0x04, 0x25, 0x58, 0xa5, - 0x44, 0x15, 0x24, 0x52, 0x39, 0x23, 0x51, 0x8a, 0x68, 0x23, 0xb5, 0x08, 0x59, 0x28, 0x07, 0x6e, - 0x6b, 0x7b, 0xe3, 0x58, 0xdd, 0x78, 0xa3, 0xdd, 0x75, 0x29, 0x12, 0x17, 0x7e, 0x1d, 0x67, 0xfe, - 0x11, 0xda, 0x59, 0xc7, 0x71, 0xec, 0x96, 0xde, 0x3c, 0xcf, 0x7c, 0xed, 0xf3, 0xcc, 0x8c, 0x0c, - 0xdb, 0x8a, 0xc9, 0x5b, 0x26, 0x87, 0x0b, 0x29, 0xb4, 0x20, 0x5d, 0x29, 0x38, 0x4f, 0x17, 0xb7, - 0x94, 0xc7, 0x21, 0xd5, 0x42, 0xba, 0xbf, 0x36, 0x60, 0xf3, 0x4a, 0x44, 0xe3, 0x64, 0x2a, 0x88, - 0x03, 0x9b, 0x34, 0x0c, 0x25, 0x53, 0xca, 0xa9, 0xf5, 0x6b, 0x83, 0x8e, 0xb7, 0x34, 0xc9, 0x53, - 0xe8, 0xf8, 0x5c, 0x04, 0x37, 0x97, 0x54, 0xcd, 0x9c, 0x0d, 0xf4, 0xad, 0x00, 0xd2, 0x87, 0x2d, - 0x34, 0x3e, 0xa7, 0x73, 0x9f, 0x49, 0xa7, 0x8e, 0xfe, 0x22, 0x44, 0x08, 0x34, 0x42, 0xaa, 0xa9, - 0xd3, 0x40, 0x17, 0x7e, 0x93, 0x1e, 0xb4, 0xb9, 0x69, 0x1c, 0xb2, 0x3b, 0xa7, 0x89, 0x78, 0x6e, - 0x93, 0x03, 0x68, 0x69, 0xb1, 0x88, 0x03, 0xe5, 0xb4, 0xfa, 0xf5, 0x41, 0xc7, 0xcb, 0x2c, 0x72, - 0x02, 0x7b, 0x5a, 0xd2, 0x44, 0xd1, 0x40, 0xc7, 0x22, 0xb1, 0xb9, 0x9b, 0x98, 0x5b, 0xc1, 0xc9, - 0x00, 0xba, 0x05, 0x0c, 0x5f, 0xde, 0xc6, 0xd0, 0x32, 0xec, 0xfe, 0x84, 0xed, 0x4f, 0x71, 0x12, - 0x5e, 0x89, 0x48, 0x9d, 0xc9, 0x48, 0x91, 0x43, 0x80, 0xa9, 0x14, 0xf3, 0x4b, 0x16, 0x47, 0x33, - 0x9d, 0x49, 0x51, 0x40, 0xcc, 0xcb, 0xb5, 0xc8, 0xbc, 0x56, 0x8c, 0xdc, 0x2e, 0x6a, 0x58, 0x5f, - 0xd7, 0x70, 0xc5, 0xa9, 0x51, 0xe4, 0xe4, 0xbe, 0x83, 0x9d, 0x65, 0x77, 0x8f, 0x2d, 0xf8, 0x0f, - 0xf2, 0x1a, 0x1a, 0x5c, 0x44, 0x36, 0x6c, 0xeb, 0xd4, 0x19, 0x96, 0x46, 0x36, 0xcc, 0xc6, 0xe5, - 0x61, 0x94, 0x3b, 0x84, 0xfd, 0x0b, 0xa6, 0xaf, 0x99, 0x52, 0x34, 0x62, 0x1e, 0x53, 0x29, 0xd7, - 0x48, 0xc2, 0xb4, 0xbb, 0x43, 0xd6, 0x96, 0x40, 0x66, 0xb9, 0x7f, 0x6a, 0xf0, 0x7f, 0x39, 0xc1, - 0xf6, 0xdd, 0x87, 0xe6, 0x54, 0xa4, 0x49, 0x88, 0x09, 0x6d, 0xcf, 0x1a, 0xa6, 0x8e, 0xa4, 0xdf, - 0x27, 0x94, 0x67, 0x54, 0x33, 0xcb, 0x88, 0xc4, 0x45, 0xf4, 0x45, 0x32, 0xec, 0x61, 0xb9, 0x16, - 0x10, 0xb3, 0x14, 0xc6, 0x12, 0x4a, 0x63, 0x80, 0x9d, 0x7c, 0x11, 0x22, 0x2e, 0x6c, 0x73, 0x11, - 0x4d, 0x28, 0x37, 0x16, 0x53, 0x4e, 0x13, 0x65, 0x59, 0xc3, 0xc8, 0x11, 0xec, 0x88, 0xe4, 0x7c, - 0x46, 0xe3, 0xe4, 0xab, 0x25, 0xd3, 0xc2, 0x3a, 0xeb, 0xa0, 0xfb, 0x04, 0x29, 0x9d, 0x29, 0xc5, - 0xa4, 0x19, 0xea, 0xb9, 0x48, 0x13, 0x14, 0xc1, 0x7d, 0x0f, 0x07, 0x15, 0x87, 0x25, 0x7b, 0x0c, - 0xbb, 0x74, 0x0d, 0x46, 0xd6, 0x4d, 0xaf, 0x84, 0xba, 0x5d, 0xd8, 0xb9, 0x60, 0x7a, 0x72, 0x6d, - 0x14, 0xc7, 0x92, 0x47, 0xb0, 0x9b, 0x03, 0xb6, 0x14, 0x81, 0xc6, 0xed, 0x7c, 0xfc, 0x31, 0xd3, - 0x19, 0xbf, 0xdd, 0x08, 0xba, 0xe7, 0x94, 0xf3, 0x4c, 0x65, 0x1c, 0xc8, 0x00, 0xba, 0x81, 0x48, - 0xb4, 0xa4, 0x81, 0x3e, 0x5b, 0xbb, 0xb2, 0x32, 0x6c, 0x24, 0x57, 0x2c, 0x09, 0x99, 0x5c, 0x4a, - 0x6e, 0xad, 0xfc, 0x8a, 0xea, 0xab, 0x2b, 0x72, 0x4f, 0x60, 0xaf, 0xd0, 0xc8, 0x3e, 0x68, 0x35, - 0xb2, 0x5a, 0x71, 0x64, 0xa7, 0xbf, 0xeb, 0xd0, 0xf5, 0x70, 0x99, 0x26, 0xcb, 0x65, 0x22, 0x14, - 0xf6, 0xca, 0xdb, 0x40, 0x5e, 0x56, 0x56, 0xee, 0xbe, 0x0d, 0xeb, 0x1d, 0x3f, 0x1a, 0x66, 0x9f, - 0xe3, 0xc1, 0x56, 0xe1, 0x89, 0xa4, 0x5f, 0x49, 0x2b, 0x29, 0xd5, 0x7b, 0xf1, 0xaf, 0x08, 0x5b, - 0x73, 0x0c, 0xed, 0xe5, 0xd1, 0x90, 0x67, 0x95, 0xf0, 0xe2, 0x35, 0xf7, 0x0e, 0x1f, 0x74, 0xdb, - 0x52, 0x21, 0xfc, 0x57, 0xd9, 0x11, 0x72, 0x2f, 0xb7, 0xea, 0x82, 0xf5, 0x5e, 0x3d, 0x1e, 0x67, - 0xbb, 0x5c, 0x41, 0x27, 0x5f, 0x1b, 0x72, 0x78, 0x5f, 0xd6, 0x6a, 0xc7, 0x7a, 0xcf, 0x1f, 0xf6, - 0x63, 0xb5, 0x0f, 0xe3, 0x6f, 0x17, 0x51, 0xac, 0x67, 0xa9, 0x3f, 0x0c, 0xc4, 0x7c, 0x24, 0xa6, - 0xd3, 0xc0, 0x5c, 0x03, 0xa7, 0xbe, 0x1a, 0x51, 0xe9, 0xc7, 0x5a, 0xa6, 0xf3, 0xd1, 0x82, 0x06, - 0x37, 0x34, 0x62, 0x88, 0xbc, 0xc9, 0x2b, 0x8d, 0x4a, 0x95, 0xfd, 0x16, 0xfe, 0x18, 0xde, 0xfe, - 0x0d, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x7d, 0xc8, 0xf9, 0x28, 0x06, 0x00, 0x00, + 0x44, 0x15, 0x4d, 0xa4, 0x72, 0x46, 0xa2, 0x14, 0xd1, 0x56, 0x4a, 0x2b, 0x64, 0xa1, 0x1c, 0xb8, + 0x6d, 0xec, 0x8d, 0x63, 0x75, 0xe3, 0x8d, 0x76, 0xd7, 0xa5, 0x48, 0x5c, 0xf8, 0x75, 0x9c, 0xf9, + 0x47, 0x68, 0x67, 0x1d, 0xc7, 0xb1, 0x53, 0x7a, 0xf3, 0x3c, 0xf3, 0xb5, 0xcf, 0x33, 0x33, 0x32, + 0x6c, 0x2b, 0x26, 0xef, 0x99, 0xec, 0xcf, 0xa5, 0xd0, 0x82, 0xb4, 0xef, 0x29, 0x8f, 0x02, 0xaa, + 0x85, 0xb4, 0xb0, 0xfb, 0x6b, 0x03, 0x36, 0x87, 0x22, 0xbc, 0x8e, 0x27, 0x82, 0x38, 0xb0, 0x49, + 0x83, 0x40, 0x32, 0xa5, 0x9c, 0x4a, 0xb7, 0xd2, 0x6b, 0x79, 0x0b, 0x93, 0x3c, 0x87, 0xd6, 0x98, + 0x0b, 0xff, 0xee, 0x8a, 0xaa, 0xa9, 0xb3, 0x81, 0xbe, 0x25, 0x40, 0xba, 0xb0, 0x85, 0xc6, 0x6d, + 0x32, 0x1b, 0x33, 0xe9, 0x54, 0xd1, 0x9f, 0x87, 0x08, 0x81, 0x5a, 0x40, 0x35, 0x75, 0x6a, 0xe8, + 0xc2, 0x6f, 0xd2, 0x81, 0x26, 0x37, 0x8d, 0x03, 0xf6, 0xe0, 0xd4, 0x11, 0xcf, 0x6c, 0x72, 0x00, + 0x0d, 0x2d, 0xe6, 0x91, 0xaf, 0x9c, 0x46, 0xb7, 0xda, 0x6b, 0x79, 0xa9, 0x45, 0x4e, 0x60, 0x4f, + 0x4b, 0x1a, 0x2b, 0xea, 0xeb, 0x48, 0xc4, 0x36, 0x77, 0x13, 0x73, 0x4b, 0x38, 0xe9, 0x41, 0x3b, + 0x87, 0xe1, 0xcb, 0x9b, 0x18, 0x5a, 0x84, 0xdd, 0x9f, 0xb0, 0xfd, 0x39, 0x8a, 0x83, 0xa1, 0x08, + 0xd5, 0xb9, 0x0c, 0x15, 0x39, 0x04, 0x98, 0x48, 0x31, 0xbb, 0x62, 0x51, 0x38, 0xd5, 0xa9, 0x14, + 0x39, 0xc4, 0xbc, 0x5c, 0x8b, 0xd4, 0x6b, 0xc5, 0xc8, 0xec, 0xbc, 0x86, 0xd5, 0x55, 0x0d, 0x97, + 0x9c, 0x6a, 0x79, 0x4e, 0xee, 0x7b, 0xd8, 0x59, 0x74, 0xf7, 0xd8, 0x9c, 0xff, 0x20, 0x6f, 0xa1, + 0xc6, 0x45, 0x68, 0xc3, 0xb6, 0xce, 0x9c, 0x7e, 0x61, 0x64, 0xfd, 0x74, 0x5c, 0x1e, 0x46, 0xb9, + 0x7d, 0xd8, 0xbf, 0x64, 0xfa, 0x86, 0x29, 0x45, 0x43, 0xe6, 0x31, 0x95, 0x70, 0x8d, 0x24, 0x4c, + 0xbb, 0x07, 0x64, 0x6d, 0x09, 0xa4, 0x96, 0xfb, 0xa7, 0x02, 0xff, 0x17, 0x13, 0x6c, 0xdf, 0x7d, + 0xa8, 0x4f, 0x44, 0x12, 0x07, 0x98, 0xd0, 0xf4, 0xac, 0x61, 0xea, 0x48, 0xfa, 0x7d, 0x44, 0x79, + 0x4a, 0x35, 0xb5, 0x8c, 0x48, 0x5c, 0x84, 0x5f, 0x24, 0xc3, 0x1e, 0x96, 0x6b, 0x0e, 0x31, 0x4b, + 0x61, 0x2c, 0xa1, 0x34, 0x06, 0xd8, 0xc9, 0xe7, 0x21, 0xe2, 0xc2, 0x36, 0x17, 0xe1, 0x88, 0x72, + 0x63, 0x31, 0xe5, 0xd4, 0x51, 0x96, 0x15, 0x8c, 0x1c, 0xc1, 0x8e, 0x88, 0x2f, 0xa6, 0x34, 0x8a, + 0xbf, 0x5a, 0x32, 0x0d, 0xac, 0xb3, 0x0a, 0xba, 0xcf, 0x90, 0xd2, 0xb9, 0x52, 0x4c, 0x9a, 0xa1, + 0x5e, 0x88, 0x24, 0x46, 0x11, 0xdc, 0x0f, 0x70, 0x50, 0x72, 0x58, 0xb2, 0xc7, 0xb0, 0x4b, 0x57, + 0x60, 0x64, 0x5d, 0xf7, 0x0a, 0xa8, 0xdb, 0x86, 0x9d, 0x4b, 0xa6, 0x47, 0x37, 0x46, 0x71, 0x2c, + 0x79, 0x04, 0xbb, 0x19, 0x60, 0x4b, 0x11, 0xa8, 0xdd, 0xcf, 0xae, 0x3f, 0xa5, 0x3a, 0xe3, 0xb7, + 0x1b, 0x42, 0xfb, 0x82, 0x72, 0x9e, 0xaa, 0x8c, 0x03, 0xe9, 0x41, 0xdb, 0x17, 0xb1, 0x96, 0xd4, + 0xd7, 0xe7, 0x2b, 0x57, 0x56, 0x84, 0x8d, 0xe4, 0x8a, 0xc5, 0x01, 0x93, 0x0b, 0xc9, 0xad, 0x95, + 0x5d, 0x51, 0x75, 0x79, 0x45, 0xee, 0x09, 0xec, 0xe5, 0x1a, 0xd9, 0x07, 0x2d, 0x47, 0x56, 0xc9, + 0x8f, 0xec, 0xec, 0x77, 0x15, 0xda, 0x9e, 0xe0, 0x3c, 0x99, 0x8f, 0x16, 0x2b, 0x45, 0x28, 0xec, + 0x15, 0xb7, 0x81, 0xbc, 0x2e, 0xad, 0xdc, 0xba, 0x0d, 0xeb, 0x1c, 0x3f, 0x19, 0x66, 0x9f, 0xe3, + 0xc1, 0x56, 0xee, 0x89, 0xa4, 0x5b, 0x4a, 0x2b, 0x28, 0xd5, 0x79, 0xf5, 0xaf, 0x08, 0x5b, 0xf3, + 0x1a, 0x9a, 0x8b, 0xa3, 0x21, 0x2f, 0x4a, 0xe1, 0xf9, 0x6b, 0xee, 0x1c, 0x3e, 0xea, 0xb6, 0xa5, + 0x02, 0xf8, 0xaf, 0xb4, 0x23, 0x64, 0x2d, 0xb7, 0xf2, 0x82, 0x75, 0xde, 0x3c, 0x1d, 0x67, 0xbb, + 0x0c, 0xa1, 0x95, 0xad, 0x0d, 0x39, 0x5c, 0x97, 0xb5, 0xdc, 0xb1, 0xce, 0xcb, 0xc7, 0xfd, 0x58, + 0xed, 0xe3, 0xed, 0xb7, 0x61, 0x18, 0xe9, 0x69, 0x32, 0xee, 0xfb, 0x62, 0x36, 0x10, 0x93, 0x89, + 0x6f, 0xae, 0x81, 0xd3, 0xb1, 0x1a, 0x50, 0x39, 0x8e, 0xb4, 0x4c, 0x66, 0x83, 0x39, 0xf5, 0xef, + 0x68, 0xc8, 0x10, 0x39, 0xcd, 0xea, 0x9d, 0xfa, 0x42, 0xb2, 0x41, 0xa1, 0xfc, 0xb8, 0x81, 0x7f, + 0x87, 0x77, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x2c, 0xe5, 0xf9, 0x2d, 0x06, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// RollupValidatorClient is the client API for RollupValidator service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type RollupValidatorClient interface { + GetMessageResult(ctx context.Context, in *GetMessageResultArgs, opts ...grpc.CallOption) (*GetMessageResultReply, error) + CallMessage(ctx context.Context, in *CallMessageArgs, opts ...grpc.CallOption) (*CallMessageReply, error) + FindLogs(ctx context.Context, in *FindLogsArgs, opts ...grpc.CallOption) (*FindLogsReply, error) + GetAssertionCount(ctx context.Context, in *GetAssertionCountArgs, opts ...grpc.CallOption) (*GetAssertionCountReply, error) + GetVMInfo(ctx context.Context, in *GetVMInfoArgs, opts ...grpc.CallOption) (*GetVMInfoReply, error) +} + +type rollupValidatorClient struct { + cc *grpc.ClientConn +} + +func NewRollupValidatorClient(cc *grpc.ClientConn) RollupValidatorClient { + return &rollupValidatorClient{cc} +} + +func (c *rollupValidatorClient) GetMessageResult(ctx context.Context, in *GetMessageResultArgs, opts ...grpc.CallOption) (*GetMessageResultReply, error) { + out := new(GetMessageResultReply) + err := c.cc.Invoke(ctx, "/validatorserver.RollupValidator/GetMessageResult", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *rollupValidatorClient) CallMessage(ctx context.Context, in *CallMessageArgs, opts ...grpc.CallOption) (*CallMessageReply, error) { + out := new(CallMessageReply) + err := c.cc.Invoke(ctx, "/validatorserver.RollupValidator/CallMessage", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *rollupValidatorClient) FindLogs(ctx context.Context, in *FindLogsArgs, opts ...grpc.CallOption) (*FindLogsReply, error) { + out := new(FindLogsReply) + err := c.cc.Invoke(ctx, "/validatorserver.RollupValidator/FindLogs", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *rollupValidatorClient) GetAssertionCount(ctx context.Context, in *GetAssertionCountArgs, opts ...grpc.CallOption) (*GetAssertionCountReply, error) { + out := new(GetAssertionCountReply) + err := c.cc.Invoke(ctx, "/validatorserver.RollupValidator/GetAssertionCount", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *rollupValidatorClient) GetVMInfo(ctx context.Context, in *GetVMInfoArgs, opts ...grpc.CallOption) (*GetVMInfoReply, error) { + out := new(GetVMInfoReply) + err := c.cc.Invoke(ctx, "/validatorserver.RollupValidator/GetVMInfo", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// RollupValidatorServer is the server API for RollupValidator service. +type RollupValidatorServer interface { + GetMessageResult(context.Context, *GetMessageResultArgs) (*GetMessageResultReply, error) + CallMessage(context.Context, *CallMessageArgs) (*CallMessageReply, error) + FindLogs(context.Context, *FindLogsArgs) (*FindLogsReply, error) + GetAssertionCount(context.Context, *GetAssertionCountArgs) (*GetAssertionCountReply, error) + GetVMInfo(context.Context, *GetVMInfoArgs) (*GetVMInfoReply, error) +} + +// UnimplementedRollupValidatorServer can be embedded to have forward compatible implementations. +type UnimplementedRollupValidatorServer struct { +} + +func (*UnimplementedRollupValidatorServer) GetMessageResult(ctx context.Context, req *GetMessageResultArgs) (*GetMessageResultReply, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetMessageResult not implemented") +} +func (*UnimplementedRollupValidatorServer) CallMessage(ctx context.Context, req *CallMessageArgs) (*CallMessageReply, error) { + return nil, status.Errorf(codes.Unimplemented, "method CallMessage not implemented") +} +func (*UnimplementedRollupValidatorServer) FindLogs(ctx context.Context, req *FindLogsArgs) (*FindLogsReply, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindLogs not implemented") +} +func (*UnimplementedRollupValidatorServer) GetAssertionCount(ctx context.Context, req *GetAssertionCountArgs) (*GetAssertionCountReply, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetAssertionCount not implemented") +} +func (*UnimplementedRollupValidatorServer) GetVMInfo(ctx context.Context, req *GetVMInfoArgs) (*GetVMInfoReply, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetVMInfo not implemented") +} + +func RegisterRollupValidatorServer(s *grpc.Server, srv RollupValidatorServer) { + s.RegisterService(&_RollupValidator_serviceDesc, srv) +} + +func _RollupValidator_GetMessageResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetMessageResultArgs) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RollupValidatorServer).GetMessageResult(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/validatorserver.RollupValidator/GetMessageResult", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RollupValidatorServer).GetMessageResult(ctx, req.(*GetMessageResultArgs)) + } + return interceptor(ctx, in, info, handler) +} + +func _RollupValidator_CallMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CallMessageArgs) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RollupValidatorServer).CallMessage(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/validatorserver.RollupValidator/CallMessage", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RollupValidatorServer).CallMessage(ctx, req.(*CallMessageArgs)) + } + return interceptor(ctx, in, info, handler) +} + +func _RollupValidator_FindLogs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindLogsArgs) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RollupValidatorServer).FindLogs(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/validatorserver.RollupValidator/FindLogs", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RollupValidatorServer).FindLogs(ctx, req.(*FindLogsArgs)) + } + return interceptor(ctx, in, info, handler) +} + +func _RollupValidator_GetAssertionCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetAssertionCountArgs) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RollupValidatorServer).GetAssertionCount(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/validatorserver.RollupValidator/GetAssertionCount", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RollupValidatorServer).GetAssertionCount(ctx, req.(*GetAssertionCountArgs)) + } + return interceptor(ctx, in, info, handler) +} + +func _RollupValidator_GetVMInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetVMInfoArgs) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RollupValidatorServer).GetVMInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/validatorserver.RollupValidator/GetVMInfo", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RollupValidatorServer).GetVMInfo(ctx, req.(*GetVMInfoArgs)) + } + return interceptor(ctx, in, info, handler) +} + +var _RollupValidator_serviceDesc = grpc.ServiceDesc{ + ServiceName: "validatorserver.RollupValidator", + HandlerType: (*RollupValidatorServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "GetMessageResult", + Handler: _RollupValidator_GetMessageResult_Handler, + }, + { + MethodName: "CallMessage", + Handler: _RollupValidator_CallMessage_Handler, + }, + { + MethodName: "FindLogs", + Handler: _RollupValidator_FindLogs_Handler, + }, + { + MethodName: "GetAssertionCount", + Handler: _RollupValidator_GetAssertionCount_Handler, + }, + { + MethodName: "GetVMInfo", + Handler: _RollupValidator_GetVMInfo_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "server.proto", } diff --git a/packages/arb-validator/rollupvalidator/server.proto b/packages/arb-validator-core/validatorserver/server.proto similarity index 97% rename from packages/arb-validator/rollupvalidator/server.proto rename to packages/arb-validator-core/validatorserver/server.proto index b20e6b206e..c938948038 100644 --- a/packages/arb-validator/rollupvalidator/server.proto +++ b/packages/arb-validator-core/validatorserver/server.proto @@ -15,8 +15,8 @@ */ syntax = "proto3"; -package rollupvalidator; -option go_package = "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupvalidator"; +package validatorserver; +option go_package = "github.com/offchainlabs/arbitrum/packages/arb-validator-core/validatorserver"; message LogInfo { string address = 1; diff --git a/packages/arb-validator/valmessage/message.go b/packages/arb-validator-core/valmessage/message.go similarity index 100% rename from packages/arb-validator/valmessage/message.go rename to packages/arb-validator-core/valmessage/message.go diff --git a/packages/arb-validator/valmessage/outgoing.go b/packages/arb-validator-core/valmessage/outgoing.go similarity index 100% rename from packages/arb-validator/valmessage/outgoing.go rename to packages/arb-validator-core/valmessage/outgoing.go diff --git a/packages/arb-validator/valmessage/requests.go b/packages/arb-validator-core/valmessage/requests.go similarity index 95% rename from packages/arb-validator/valmessage/requests.go rename to packages/arb-validator-core/valmessage/requests.go index 61d95c70db..9934a8166a 100644 --- a/packages/arb-validator/valmessage/requests.go +++ b/packages/arb-validator-core/valmessage/requests.go @@ -20,7 +20,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/hashing" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type UnanimousRequestData struct { diff --git a/packages/arb-validator/valmessage/serialization.go b/packages/arb-validator-core/valmessage/serialization.go similarity index 100% rename from packages/arb-validator/valmessage/serialization.go rename to packages/arb-validator-core/valmessage/serialization.go diff --git a/packages/arb-validator/valmessage/valmessage.pb.go b/packages/arb-validator-core/valmessage/valmessage.pb.go similarity index 99% rename from packages/arb-validator/valmessage/valmessage.pb.go rename to packages/arb-validator-core/valmessage/valmessage.pb.go index 6c89946802..ab1ea21c6c 100644 --- a/packages/arb-validator/valmessage/valmessage.pb.go +++ b/packages/arb-validator-core/valmessage/valmessage.pb.go @@ -5,11 +5,12 @@ package valmessage import ( fmt "fmt" + math "math" + proto "github.com/golang/protobuf/proto" common "github.com/offchainlabs/arbitrum/packages/arb-util/common" protocol "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" - valprotocol "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" - math "math" + valprotocol "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/packages/arb-validator/valmessage/valmessage.proto b/packages/arb-validator-core/valmessage/valmessage.proto similarity index 100% rename from packages/arb-validator/valmessage/valmessage.proto rename to packages/arb-validator-core/valmessage/valmessage.proto diff --git a/packages/arb-validator/structures/challenge.go b/packages/arb-validator-core/valprotocol/challenge.go similarity index 98% rename from packages/arb-validator/structures/challenge.go rename to packages/arb-validator-core/valprotocol/challenge.go index 1b59c634f0..18278cbbe6 100644 --- a/packages/arb-validator/structures/challenge.go +++ b/packages/arb-validator-core/valprotocol/challenge.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package structures +package valprotocol import ( "math/big" diff --git a/packages/arb-validator/valprotocol/confirmation.go b/packages/arb-validator-core/valprotocol/confirmation.go similarity index 100% rename from packages/arb-validator/valprotocol/confirmation.go rename to packages/arb-validator-core/valprotocol/confirmation.go diff --git a/packages/arb-validator/valprotocol/executionAssertionStub.go b/packages/arb-validator-core/valprotocol/executionAssertionStub.go similarity index 100% rename from packages/arb-validator/valprotocol/executionAssertionStub.go rename to packages/arb-validator-core/valprotocol/executionAssertionStub.go diff --git a/packages/arb-validator/valprotocol/message.go b/packages/arb-validator-core/valprotocol/message.go similarity index 100% rename from packages/arb-validator/valprotocol/message.go rename to packages/arb-validator-core/valprotocol/message.go diff --git a/packages/arb-validator/valprotocol/nodeData.go b/packages/arb-validator-core/valprotocol/nodeData.go similarity index 100% rename from packages/arb-validator/valprotocol/nodeData.go rename to packages/arb-validator-core/valprotocol/nodeData.go diff --git a/packages/arb-validator/valprotocol/params.go b/packages/arb-validator-core/valprotocol/params.go similarity index 100% rename from packages/arb-validator/valprotocol/params.go rename to packages/arb-validator-core/valprotocol/params.go diff --git a/packages/arb-validator/valprotocol/precondition.go b/packages/arb-validator-core/valprotocol/precondition.go similarity index 100% rename from packages/arb-validator/valprotocol/precondition.go rename to packages/arb-validator-core/valprotocol/precondition.go diff --git a/packages/arb-validator/valprotocol/pruning.go b/packages/arb-validator-core/valprotocol/pruning.go similarity index 100% rename from packages/arb-validator/valprotocol/pruning.go rename to packages/arb-validator-core/valprotocol/pruning.go diff --git a/packages/arb-validator/valprotocol/serialization.go b/packages/arb-validator-core/valprotocol/serialization.go similarity index 100% rename from packages/arb-validator/valprotocol/serialization.go rename to packages/arb-validator-core/valprotocol/serialization.go diff --git a/packages/arb-validator/valprotocol/tokenType.go b/packages/arb-validator-core/valprotocol/tokenType.go similarity index 100% rename from packages/arb-validator/valprotocol/tokenType.go rename to packages/arb-validator-core/valprotocol/tokenType.go diff --git a/packages/arb-validator/valprotocol/valprotocol.pb.go b/packages/arb-validator-core/valprotocol/valprotocol.pb.go similarity index 100% rename from packages/arb-validator/valprotocol/valprotocol.pb.go rename to packages/arb-validator-core/valprotocol/valprotocol.pb.go diff --git a/packages/arb-validator/valprotocol/valprotocol.proto b/packages/arb-validator-core/valprotocol/valprotocol.proto similarity index 98% rename from packages/arb-validator/valprotocol/valprotocol.proto rename to packages/arb-validator-core/valprotocol/valprotocol.proto index 0caf05d772..1133ee2d6c 100644 --- a/packages/arb-validator/valprotocol/valprotocol.proto +++ b/packages/arb-validator-core/valprotocol/valprotocol.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package valprotocol; import "common/common.proto"; import "protocol/protocol.proto"; -option go_package = "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol"; +option go_package = "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol"; message PreconditionBuf { common.HashBuf beforeHash = 1; diff --git a/packages/arb-validator/challenges/challenge.go b/packages/arb-validator/challenges/challenge.go index f7c6bf8175..7f70b6e64b 100644 --- a/packages/arb-validator/challenges/challenge.go +++ b/packages/arb-validator/challenges/challenge.go @@ -22,7 +22,7 @@ import ( "time" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type ChallengeState uint8 diff --git a/packages/arb-validator/challenges/defender.go b/packages/arb-validator/challenges/defender.go index 8b007d804c..9dee85bbb8 100644 --- a/packages/arb-validator/challenges/defender.go +++ b/packages/arb-validator/challenges/defender.go @@ -21,8 +21,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type AssertionDefender struct { @@ -58,7 +57,7 @@ func (ad AssertionDefender) NBisect(slices uint64) ([]AssertionDefender, []*valp pre := ad.precondition for i := uint64(0); i < slices; i++ { - steps := structures.CalculateBisectionStepCount(i, slices, nsteps) + steps := valprotocol.CalculateBisectionStepCount(i, slices, nsteps) initState := m.Clone() assertion, numSteps := m.ExecuteAssertion( @@ -91,7 +90,7 @@ func ChooseAssertionToChallenge( ) (uint16, machine.Machine, error) { assertionCount := uint64(len(assertions)) for i := range assertions { - steps := structures.CalculateBisectionStepCount(uint64(i), assertionCount, totalSteps) + steps := valprotocol.CalculateBisectionStepCount(uint64(i), assertionCount, totalSteps) initState := m.Clone() generatedAssertion, numSteps := m.ExecuteAssertion( steps, diff --git a/packages/arb-validator/challenges/executionChallenge.go b/packages/arb-validator/challenges/executionChallenge.go index d0c13e31da..230e145ee3 100644 --- a/packages/arb-validator/challenges/executionChallenge.go +++ b/packages/arb-validator/challenges/executionChallenge.go @@ -25,9 +25,8 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) func DefendExecutionClaim( @@ -200,7 +199,7 @@ func defendExecution( // Replayed from existing event totalSteps := uint64(0) for i := uint64(0); i < contEv.SegmentIndex.Uint64(); i++ { - totalSteps += structures.CalculateBisectionStepCount(i, uint64(len(ev.Assertions)), ev.TotalSteps) + totalSteps += valprotocol.CalculateBisectionStepCount(i, uint64(len(ev.Assertions)), ev.TotalSteps) } mach := defender.initState @@ -214,7 +213,7 @@ func defendExecution( ) pre = pre.GeneratePostcondition(valprotocol.NewExecutionAssertionStubFromAssertion(assertion)) - steps := structures.CalculateBisectionStepCount(contEv.SegmentIndex.Uint64(), uint64(len(ev.Assertions)), ev.TotalSteps) + steps := valprotocol.CalculateBisectionStepCount(contEv.SegmentIndex.Uint64(), uint64(len(ev.Assertions)), ev.TotalSteps) defender = NewAssertionDefender(pre, steps, mach) } } @@ -272,7 +271,7 @@ func challengeExecution( cMach := mach.Clone() challengedAssertionNum = uint16(rand.Int31n(int32(len(ev.Assertions)))) for i := 0; i < len(ev.Assertions); i++ { - stepCount := structures.CalculateBisectionStepCount(uint64(i), uint64(len(ev.Assertions)), ev.TotalSteps) + stepCount := valprotocol.CalculateBisectionStepCount(uint64(i), uint64(len(ev.Assertions)), ev.TotalSteps) m = cMach.Clone() assertion, _ := cMach.ExecuteAssertion( stepCount, @@ -315,7 +314,7 @@ func challengeExecution( // Replayed from existing event totalSteps := uint64(0) for i := uint64(0); i < contEv.SegmentIndex.Uint64(); i++ { - totalSteps += structures.CalculateBisectionStepCount(i, uint64(len(ev.Assertions)), ev.TotalSteps) + totalSteps += valprotocol.CalculateBisectionStepCount(i, uint64(len(ev.Assertions)), ev.TotalSteps) } assertion, _ := mach.ExecuteAssertion( totalSteps, diff --git a/packages/arb-validator/challenges/executionChallenge_test.go b/packages/arb-validator/challenges/executionChallenge_test.go index f872ff80f1..5c223358b6 100644 --- a/packages/arb-validator/challenges/executionChallenge_test.go +++ b/packages/arb-validator/challenges/executionChallenge_test.go @@ -24,10 +24,9 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-validator/loader" - "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" ) func testExecutionChallenge(t *testing.T) { @@ -47,7 +46,7 @@ func testExecutionChallenge(t *testing.T) { precondition := valprotocol.NewPrecondition(mach.Hash(), timeBounds, value.NewEmptyTuple()) assertion, numSteps := afterMachine.ExecuteAssertion(1000, timeBounds, value.NewEmptyTuple(), 0) - challengeHash := structures.ExecutionDataHash( + challengeHash := valprotocol.ExecutionDataHash( numSteps, precondition.Hash(), valprotocol.NewExecutionAssertionStubFromAssertion(assertion).Hash(), diff --git a/packages/arb-validator/challenges/inboxTopChallenge.go b/packages/arb-validator/challenges/inboxTopChallenge.go index 7e3c1550f7..f67b3c7779 100644 --- a/packages/arb-validator/challenges/inboxTopChallenge.go +++ b/packages/arb-validator/challenges/inboxTopChallenge.go @@ -25,7 +25,7 @@ import ( "math/rand" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" errors2 "github.com/pkg/errors" ) diff --git a/packages/arb-validator/challenges/inboxTopChallenge_test.go b/packages/arb-validator/challenges/inboxTopChallenge_test.go index 0b56666fd1..602501b778 100644 --- a/packages/arb-validator/challenges/inboxTopChallenge_test.go +++ b/packages/arb-validator/challenges/inboxTopChallenge_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" ) @@ -83,7 +83,7 @@ func testInboxTopChallenge(t *testing.T) { if err != nil { t.Fatal(err) } - challengeHash := structures.InboxTopChallengeDataHash(bottomHash, topHash, big.NewInt(3)) + challengeHash := valprotocol.InboxTopChallengeDataHash(bottomHash, topHash, big.NewInt(3)) if err := testChallenge( valprotocol.InvalidInboxTopChildType, diff --git a/packages/arb-validator/challenges/messagesChallenge.go b/packages/arb-validator/challenges/messagesChallenge.go index dbe8eb852e..3e04a060b7 100644 --- a/packages/arb-validator/challenges/messagesChallenge.go +++ b/packages/arb-validator/challenges/messagesChallenge.go @@ -26,12 +26,12 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/hashing" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" errors2 "github.com/pkg/errors" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" ) diff --git a/packages/arb-validator/challenges/messagesChallenge_test.go b/packages/arb-validator/challenges/messagesChallenge_test.go index 4eac16b5cb..3069de29a1 100644 --- a/packages/arb-validator/challenges/messagesChallenge_test.go +++ b/packages/arb-validator/challenges/messagesChallenge_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" ) @@ -63,7 +63,7 @@ func testMessagesChallenge(t *testing.T) { } importedMessages := inbox.Hash() - challengeHash := structures.MessageChallengeDataHash( + challengeHash := valprotocol.MessageChallengeDataHash( beforeInbox, afterInbox, value.NewEmptyTuple().Hash(), diff --git a/packages/arb-validator/challenges/testHelper.go b/packages/arb-validator/challenges/testHelper.go index 55a55ee5f5..b4fb986c2f 100644 --- a/packages/arb-validator/challenges/testHelper.go +++ b/packages/arb-validator/challenges/testHelper.go @@ -30,13 +30,13 @@ import ( "github.com/ethereum/go-ethereum/ethclient" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" errors2 "github.com/pkg/errors" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/test" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/test" ) type ChallengeFunc func(common.Address, *ethbridge.EthArbAuthClient, *common.BlockId) (ChallengeState, error) diff --git a/packages/arb-validator/checkpointing/checkpointing.go b/packages/arb-validator/checkpointing/checkpointing.go index 9ae4f53471..f36f453b7a 100644 --- a/packages/arb-validator/checkpointing/checkpointing.go +++ b/packages/arb-validator/checkpointing/checkpointing.go @@ -29,7 +29,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type RollupCheckpointerFactory interface { diff --git a/packages/arb-validator/checkpointing/dummyCheckpointing.go b/packages/arb-validator/checkpointing/dummyCheckpointing.go index e4fac5e2b7..2e1a24c53e 100644 --- a/packages/arb-validator/checkpointing/dummyCheckpointing.go +++ b/packages/arb-validator/checkpointing/dummyCheckpointing.go @@ -25,7 +25,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/loader" ) diff --git a/packages/arb-validator/checkpointing/indexedCheckpointer.go b/packages/arb-validator/checkpointing/indexedCheckpointer.go index 7c2b8cdbf1..73bacc98e6 100644 --- a/packages/arb-validator/checkpointing/indexedCheckpointer.go +++ b/packages/arb-validator/checkpointing/indexedCheckpointer.go @@ -19,17 +19,18 @@ package checkpointing import ( "context" "errors" - "github.com/golang/protobuf/proto" - "github.com/offchainlabs/arbitrum/packages/arb-avm-cpp/cmachine" - "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-util/machine" - "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" "log" "math/big" "os" "sync" "time" + + "github.com/golang/protobuf/proto" + "github.com/offchainlabs/arbitrum/packages/arb-avm-cpp/cmachine" + "github.com/offchainlabs/arbitrum/packages/arb-util/common" + "github.com/offchainlabs/arbitrum/packages/arb-util/machine" + "github.com/offchainlabs/arbitrum/packages/arb-util/value" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type IndexedCheckpointer struct { diff --git a/packages/arb-validator/cmd/arb-validator/arb-validator.go b/packages/arb-validator/cmd/arb-validator/arb-validator.go index 286bf5ba28..517c91e9d0 100644 --- a/packages/arb-validator/cmd/arb-validator/arb-validator.go +++ b/packages/arb-validator/cmd/arb-validator/arb-validator.go @@ -33,12 +33,12 @@ import ( errors2 "github.com/pkg/errors" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupmanager" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/loader" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollup" ) diff --git a/packages/arb-validator/cmd/evil-arb-validator/evil-arb-validator.go b/packages/arb-validator/cmd/evil-arb-validator/evil-arb-validator.go index 053ddc137a..e05a15dddd 100644 --- a/packages/arb-validator/cmd/evil-arb-validator/evil-arb-validator.go +++ b/packages/arb-validator/cmd/evil-arb-validator/evil-arb-validator.go @@ -25,7 +25,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-validator/cmdhelper" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/rolluptest" diff --git a/packages/arb-validator/cmdhelper/cmdhelper.go b/packages/arb-validator/cmdhelper/cmdhelper.go index 338142382d..c996baa543 100644 --- a/packages/arb-validator/cmdhelper/cmdhelper.go +++ b/packages/arb-validator/cmdhelper/cmdhelper.go @@ -32,8 +32,8 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollup" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupmanager" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupvalidator" diff --git a/packages/arb-validator/go.mod b/packages/arb-validator/go.mod index b07efd582d..e6f718c8e3 100644 --- a/packages/arb-validator/go.mod +++ b/packages/arb-validator/go.mod @@ -3,36 +3,18 @@ module github.com/offchainlabs/arbitrum/packages/arb-validator go 1.12 require ( - github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6 // indirect - github.com/btcsuite/btcd v0.0.0-20190629003639-c26ffa870fd8 // indirect - github.com/cespare/cp v1.1.1 // indirect - github.com/deckarep/golang-set v1.7.1 // indirect - github.com/edsrzf/mmap-go v1.0.0 // indirect - github.com/elastic/gosigar v0.10.5 // indirect - github.com/ethereum/go-ethereum v1.9.8 - github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect + github.com/ethereum/go-ethereum v1.9.10 github.com/gogo/protobuf v1.1.1 github.com/golang/protobuf v1.3.2 github.com/gorilla/handlers v1.4.2 github.com/gorilla/mux v1.7.3 github.com/gorilla/rpc v1.2.0 - github.com/gorilla/websocket v1.4.1 // indirect - github.com/hashicorp/golang-lru v0.5.3 // indirect - github.com/huin/goupnp v1.0.0 // indirect - github.com/mattn/go-colorable v0.1.2 // indirect - github.com/mattn/go-isatty v0.0.9 // indirect - github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.4.1 - github.com/offchainlabs/arbitrum/packages/arb-avm-go v0.4.1 - github.com/offchainlabs/arbitrum/packages/arb-util v0.4.1 - github.com/pborman/uuid v1.2.0 // indirect - github.com/pkg/errors v0.8.1 - github.com/prometheus/tsdb v0.10.0 // indirect - github.com/rjeczalik/notify v0.9.2 // indirect - github.com/rs/cors v1.7.0 // indirect - github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48 // indirect - github.com/tyler-smith/go-bip39 v1.0.2 // indirect + github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.4.2 + github.com/offchainlabs/arbitrum/packages/arb-avm-go v0.4.2 + github.com/offchainlabs/arbitrum/packages/arb-util v0.4.2 + github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.4.2 + github.com/pkg/errors v0.9.1 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 - gopkg.in/olebedev/go-duktape.v3 v3.0.0-20190709231704-1e4459ed25ff // indirect ) replace github.com/offchainlabs/arbitrum/packages/arb-avm-go => ../arb-avm-go @@ -40,3 +22,5 @@ replace github.com/offchainlabs/arbitrum/packages/arb-avm-go => ../arb-avm-go replace github.com/offchainlabs/arbitrum/packages/arb-avm-cpp => ../arb-avm-cpp replace github.com/offchainlabs/arbitrum/packages/arb-util => ../arb-util + +replace github.com/offchainlabs/arbitrum/packages/arb-validator-core => ../arb-validator-core diff --git a/packages/arb-validator/go.sum b/packages/arb-validator/go.sum index b46294d5a7..38c0ac1a8e 100644 --- a/packages/arb-validator/go.sum +++ b/packages/arb-validator/go.sum @@ -24,6 +24,8 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictoriaMetrics/fastcache v1.5.2 h1:Erd8iIuBAL9kke8JzM4+WxkKuFkHh3ktwLanJvDgR44= github.com/VictoriaMetrics/fastcache v1.5.2/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= +github.com/VictoriaMetrics/fastcache v1.5.3 h1:2odJnXLbFZcoV9KYtQ+7TH1UOq3dn3AssMgieaezkR4= +github.com/VictoriaMetrics/fastcache v1.5.3/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= 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= @@ -36,6 +38,7 @@ github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6 h1:6bZNnQc github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6/go.mod h1:Z4RTxGAuYhPzcq8+EdRM+R8M48Ssle2TsWtwRKa+vns= github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= 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/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -58,6 +61,8 @@ github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18 h1:pl4eWIqvFe/Kg3zkn7NxevNzILnZYWDCG7qbA1CJik0= github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -93,6 +98,8 @@ github.com/elastic/gosigar v0.10.5/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTy github.com/ethereum/go-ethereum v1.8.20/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= github.com/ethereum/go-ethereum v1.9.8 h1:4KUtrZOt45Ob1yXh0Mv/pPWRib/6B4p2l41nzEsEgVw= github.com/ethereum/go-ethereum v1.9.8/go.mod h1:N68Ktr8bkyajaEy6D8CSANxkhUxcnVjTmp9sKdKd8OI= +github.com/ethereum/go-ethereum v1.9.10 h1:jooX7tWcscpC7ytufk73t9JMCeJQ7aJF2YmZJQEuvFo= +github.com/ethereum/go-ethereum v1.9.10/go.mod h1:lXHkVo/MTvsEXfYsmNzelZ8R1e0DTvdk/wMZJIRpaRw= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= @@ -158,6 +165,7 @@ github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJye github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= 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/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/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -203,6 +211,7 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= +github.com/offchainlabs/arbitrum/packages/arb-validator v0.4.1/go.mod h1:RkUD5VdhtjR5rMG1w6EX/0yBgixJlaBMJmnhkUJPLAE= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= @@ -228,6 +237,8 @@ github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0je github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -350,7 +361,9 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190912185636-87d9f09c5d89/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610= diff --git a/packages/arb-validator/proofmachine/proofmachine.go b/packages/arb-validator/proofmachine/proofmachine.go index 6926390742..7aab0f8421 100644 --- a/packages/arb-validator/proofmachine/proofmachine.go +++ b/packages/arb-validator/proofmachine/proofmachine.go @@ -27,8 +27,8 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type Machine struct { diff --git a/packages/arb-validator/proofmachine/proofmachine_test.go b/packages/arb-validator/proofmachine/proofmachine_test.go index c8b4f29335..7950384535 100644 --- a/packages/arb-validator/proofmachine/proofmachine_test.go +++ b/packages/arb-validator/proofmachine/proofmachine_test.go @@ -30,9 +30,9 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/test" "github.com/offchainlabs/arbitrum/packages/arb-validator/loader" - "github.com/offchainlabs/arbitrum/packages/arb-validator/test" ) func setupTestValidateProof(t *testing.T) (*Connection, error) { diff --git a/packages/arb-validator/rollup/announcerListener.go b/packages/arb-validator/rollup/announcerListener.go index 8e50cc78aa..5bd36eda01 100644 --- a/packages/arb-validator/rollup/announcerListener.go +++ b/packages/arb-validator/rollup/announcerListener.go @@ -20,11 +20,11 @@ import ( "context" "log" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type AnnouncerListener struct { diff --git a/packages/arb-validator/rollup/assertionListener.go b/packages/arb-validator/rollup/assertionListener.go index 81229d19dc..128c4f4cff 100644 --- a/packages/arb-validator/rollup/assertionListener.go +++ b/packages/arb-validator/rollup/assertionListener.go @@ -19,11 +19,11 @@ package rollup import ( "context" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type FinalizedAssertion struct { diff --git a/packages/arb-validator/rollup/chainParamsSetting.go b/packages/arb-validator/rollup/chainParamsSetting.go index cb101667ee..782abcd840 100644 --- a/packages/arb-validator/rollup/chainParamsSetting.go +++ b/packages/arb-validator/rollup/chainParamsSetting.go @@ -20,7 +20,7 @@ import ( "math/big" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) func DefaultChainParams() valprotocol.ChainParams { diff --git a/packages/arb-validator/rollup/listener.go b/packages/arb-validator/rollup/listener.go index bea733f081..9ec3e50fff 100644 --- a/packages/arb-validator/rollup/listener.go +++ b/packages/arb-validator/rollup/listener.go @@ -23,13 +23,13 @@ import ( "sync" "time" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-validator/challenges" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) const ( diff --git a/packages/arb-validator/rollup/node.go b/packages/arb-validator/rollup/node.go index ada8b11ef8..935400f255 100644 --- a/packages/arb-validator/rollup/node.go +++ b/packages/arb-validator/rollup/node.go @@ -29,8 +29,8 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" "github.com/offchainlabs/arbitrum/packages/arb-util/value" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" ) type Node struct { @@ -192,7 +192,7 @@ func (node *Node) ChallengeNodeData(params valprotocol.ChainParams) (common.Hash case valprotocol.InvalidInboxTopChildType: inboxLeft := new(big.Int).Add(vmProtoData.InboxCount, node.disputable.AssertionParams.ImportedMessageCount) inboxLeft = inboxLeft.Sub(node.disputable.MaxInboxCount, inboxLeft) - ret := structures.InboxTopChallengeDataHash( + ret := valprotocol.InboxTopChallengeDataHash( node.disputable.AssertionClaim.AfterInboxTop, node.disputable.MaxInboxTop, inboxLeft, @@ -200,7 +200,7 @@ func (node *Node) ChallengeNodeData(params valprotocol.ChainParams) (common.Hash challengePeriod := params.GracePeriod.Add(common.TicksFromBlockNum(common.NewTimeBlocks(big.NewInt(1)))) return ret, challengePeriod case valprotocol.InvalidMessagesChildType: - ret := structures.MessageChallengeDataHash( + ret := valprotocol.MessageChallengeDataHash( vmProtoData.InboxTop, node.disputable.AssertionClaim.AfterInboxTop, value.NewEmptyTuple().Hash(), @@ -210,7 +210,7 @@ func (node *Node) ChallengeNodeData(params valprotocol.ChainParams) (common.Hash challengePeriod := params.GracePeriod.Add(common.TicksFromBlockNum(common.NewTimeBlocks(big.NewInt(1)))) return ret, challengePeriod case valprotocol.InvalidExecutionChildType: - ret := structures.ExecutionDataHash( + ret := valprotocol.ExecutionDataHash( node.disputable.AssertionParams.NumSteps, node.ExecutionPreconditionHash(), node.disputable.AssertionClaim.AssertionStub.Hash(), diff --git a/packages/arb-validator/rollup/nodeGraph.go b/packages/arb-validator/rollup/nodeGraph.go index f681f75c99..280f636265 100644 --- a/packages/arb-validator/rollup/nodeGraph.go +++ b/packages/arb-validator/rollup/nodeGraph.go @@ -21,7 +21,7 @@ import ( "log" "strconv" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" diff --git a/packages/arb-validator/rollup/opinionThread.go b/packages/arb-validator/rollup/opinionThread.go index 2031170ef2..2991ef9873 100644 --- a/packages/arb-validator/rollup/opinionThread.go +++ b/packages/arb-validator/rollup/opinionThread.go @@ -26,7 +26,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) type preparedAssertion struct { diff --git a/packages/arb-validator/rollup/rollup.go b/packages/arb-validator/rollup/rollup.go index 2837c9f1dc..bd1ebf52b6 100644 --- a/packages/arb-validator/rollup/rollup.go +++ b/packages/arb-validator/rollup/rollup.go @@ -32,9 +32,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" ) //go:generate bash -c "protoc -I$(go list -f '{{ .Dir }}' -m github.com/offchainlabs/arbitrum/packages/arb-util) -I. -I .. --go_out=paths=source_relative:. *.proto" diff --git a/packages/arb-validator/rollup/rollup.pb.go b/packages/arb-validator/rollup/rollup.pb.go index 8d293c409c..ac993e3ba5 100644 --- a/packages/arb-validator/rollup/rollup.pb.go +++ b/packages/arb-validator/rollup/rollup.pb.go @@ -5,11 +5,12 @@ package rollup import ( fmt "fmt" + math "math" + proto "github.com/golang/protobuf/proto" common "github.com/offchainlabs/arbitrum/packages/arb-util/common" + valprotocol "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" structures "github.com/offchainlabs/arbitrum/packages/arb-validator/structures" - valprotocol "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/packages/arb-validator/rollup/rollup_test.go b/packages/arb-validator/rollup/rollup_test.go index 89ff04694d..56adc4f942 100644 --- a/packages/arb-validator/rollup/rollup_test.go +++ b/packages/arb-validator/rollup/rollup_test.go @@ -28,8 +28,8 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" ) var dummyAddress common.Address diff --git a/packages/arb-validator/rollup/stakedNodeGraph.go b/packages/arb-validator/rollup/stakedNodeGraph.go index fe8d9cefb1..5ad2690496 100644 --- a/packages/arb-validator/rollup/stakedNodeGraph.go +++ b/packages/arb-validator/rollup/stakedNodeGraph.go @@ -21,13 +21,13 @@ import ( "log" "sort" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/machine" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) //go:generate bash -c "protoc -I$(go list -f '{{ .Dir }}' -m github.com/offchainlabs/arbitrum/packages/arb-util) -I. --go_out=paths=source_relative:. *.proto" diff --git a/packages/arb-validator/rollup/testListeners.go b/packages/arb-validator/rollup/testListeners.go index a3a04c8597..adf55f0d44 100644 --- a/packages/arb-validator/rollup/testListeners.go +++ b/packages/arb-validator/rollup/testListeners.go @@ -21,7 +21,7 @@ import ( "log" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) // WARNING: The code in this file is badly behaved, on purpose. It is for testing only. diff --git a/packages/arb-validator/rollupmanager/manager.go b/packages/arb-validator/rollupmanager/manager.go index 37310c5e86..01c131fc88 100644 --- a/packages/arb-validator/rollupmanager/manager.go +++ b/packages/arb-validator/rollupmanager/manager.go @@ -24,16 +24,13 @@ import ( "time" "github.com/gogo/protobuf/proto" - "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" + "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollup" - - "github.com/offchainlabs/arbitrum/packages/arb-util/common" - - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" ) const ( diff --git a/packages/arb-validator/rollupmanager/stressTest.go b/packages/arb-validator/rollupmanager/stressTest.go index a2e32670ab..ee59205686 100644 --- a/packages/arb-validator/rollupmanager/stressTest.go +++ b/packages/arb-validator/rollupmanager/stressTest.go @@ -23,7 +23,7 @@ import ( "time" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" ) type ArbClientStressTest struct { diff --git a/packages/arb-validator/rolluptest/evilRollupCheckpointer.go b/packages/arb-validator/rolluptest/evilRollupCheckpointer.go index 110008e9f9..7a9588ad30 100644 --- a/packages/arb-validator/rolluptest/evilRollupCheckpointer.go +++ b/packages/arb-validator/rolluptest/evilRollupCheckpointer.go @@ -24,7 +24,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/machine" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/arbbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/arbbridge" "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" ) diff --git a/packages/arb-validator/rollupvalidator/rpcserver.go b/packages/arb-validator/rollupvalidator/rpcserver.go index 7214f096fd..ed7025aaa1 100644 --- a/packages/arb-validator/rollupvalidator/rpcserver.go +++ b/packages/arb-validator/rollupvalidator/rpcserver.go @@ -22,6 +22,7 @@ import ( "net/http" "time" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/validatorserver" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupmanager" "github.com/gorilla/handlers" @@ -30,7 +31,6 @@ import ( "github.com/gorilla/rpc/json" ) -//go:generate bash -c "protoc -I$(go list -f '{{ .Dir }}' -m github.com/offchainlabs/arbitrum/packages/arb-validator) -I. --tstypes_out=../../arb-provider-ethers/src/lib --go_out=paths=source_relative,plugins=grpc:. *.proto" // Server provides an interface for interacting with a a running coordinator type RPCServer struct { *Server @@ -67,7 +67,7 @@ func NewRPCServer(man *rollupmanager.Manager, maxCallTime time.Duration) (*RPCSe } // FindLogs takes a set of parameters and return the list of all logs that match the query -func (m *RPCServer) FindLogs(r *http.Request, args *FindLogsArgs, reply *FindLogsReply) error { +func (m *RPCServer) FindLogs(r *http.Request, args *validatorserver.FindLogsArgs, reply *validatorserver.FindLogsReply) error { ret, err := m.Server.FindLogs(context.Background(), args) if ret != nil { *reply = *ret @@ -76,7 +76,7 @@ func (m *RPCServer) FindLogs(r *http.Request, args *FindLogsArgs, reply *FindLog } // GetMessageResult returns the value output by the VM in response to the message with the given hash -func (m *RPCServer) GetMessageResult(r *http.Request, args *GetMessageResultArgs, reply *GetMessageResultReply) error { +func (m *RPCServer) GetMessageResult(r *http.Request, args *validatorserver.GetMessageResultArgs, reply *validatorserver.GetMessageResultReply) error { ret, err := m.Server.GetMessageResult(context.Background(), args) if ret != nil { *reply = *ret @@ -85,7 +85,7 @@ func (m *RPCServer) GetMessageResult(r *http.Request, args *GetMessageResultArgs } // GetAssertionCount returns the total number of finalized assertions -func (m *RPCServer) GetAssertionCount(r *http.Request, args *GetAssertionCountArgs, reply *GetAssertionCountReply) error { +func (m *RPCServer) GetAssertionCount(r *http.Request, args *validatorserver.GetAssertionCountArgs, reply *validatorserver.GetAssertionCountReply) error { ret, err := m.Server.GetAssertionCount(context.Background(), args) if ret != nil { *reply = *ret @@ -94,7 +94,7 @@ func (m *RPCServer) GetAssertionCount(r *http.Request, args *GetAssertionCountAr } // GetVMInfo returns current metadata about this VM -func (m *RPCServer) GetVMInfo(r *http.Request, args *GetVMInfoArgs, reply *GetVMInfoReply) error { +func (m *RPCServer) GetVMInfo(r *http.Request, args *validatorserver.GetVMInfoArgs, reply *validatorserver.GetVMInfoReply) error { ret, err := m.Server.GetVMInfo(context.Background(), args) if ret != nil { *reply = *ret @@ -103,7 +103,7 @@ func (m *RPCServer) GetVMInfo(r *http.Request, args *GetVMInfoArgs, reply *GetVM } // CallMessage takes a request from a client to process in a temporary context and return the result -func (m *RPCServer) CallMessage(r *http.Request, args *CallMessageArgs, reply *CallMessageReply) error { +func (m *RPCServer) CallMessage(r *http.Request, args *validatorserver.CallMessageArgs, reply *validatorserver.CallMessageReply) error { ret, err := m.Server.CallMessage(context.Background(), args) if ret != nil { *reply = *ret diff --git a/packages/arb-validator/rollupvalidator/server.go b/packages/arb-validator/rollupvalidator/server.go index 2e16b60e33..465bb305ee 100644 --- a/packages/arb-validator/rollupvalidator/server.go +++ b/packages/arb-validator/rollupvalidator/server.go @@ -26,7 +26,9 @@ import ( "strconv" "time" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/validatorserver" + + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupmanager" @@ -35,7 +37,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/protocol" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/evm" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/evm" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollup" ) @@ -64,7 +66,7 @@ func NewServer(man *rollupmanager.Manager, maxCallTime time.Duration) (*Server, } // FindLogs takes a set of parameters and return the list of all logs that match the query -func (m *Server) FindLogs(ctx context.Context, args *FindLogsArgs) (*FindLogsReply, error) { +func (m *Server) FindLogs(ctx context.Context, args *validatorserver.FindLogsArgs) (*validatorserver.FindLogsReply, error) { addressBytes, err := hexutil.Decode(args.Address) if err != nil { fmt.Println("FindLogs error1", err) @@ -88,7 +90,7 @@ func (m *Server) FindLogs(ctx context.Context, args *FindLogsArgs) (*FindLogsRep return nil, err } - var logsChan <-chan []*LogInfo + var logsChan <-chan []*validatorserver.LogInfo if args.ToHeight == "latest" { logsChan = m.tracker.FindLogs(&fromHeight, nil, addressInt, topics) } else { @@ -101,13 +103,13 @@ func (m *Server) FindLogs(ctx context.Context, args *FindLogsArgs) (*FindLogsRep } ret := <-logsChan - return &FindLogsReply{ + return &validatorserver.FindLogsReply{ Logs: ret, }, nil } // GetMessageResult returns the value output by the VM in response to the message with the given hash -func (m *Server) GetMessageResult(ctx context.Context, args *GetMessageResultArgs) (*GetMessageResultReply, error) { +func (m *Server) GetMessageResult(ctx context.Context, args *validatorserver.GetMessageResultArgs) (*validatorserver.GetMessageResultReply, error) { txHashBytes, err := hexutil.Decode(args.TxHash) if err != nil { return nil, err @@ -118,14 +120,14 @@ func (m *Server) GetMessageResult(ctx context.Context, args *GetMessageResultArg txInfo := <-resultChan if !txInfo.Found { - return &GetMessageResultReply{ + return &validatorserver.GetMessageResultReply{ Found: false, }, nil } var buf bytes.Buffer _ = value.MarshalValue(txInfo.RawVal, &buf) // error can only occur from writes and bytes.Buffer is safe - return &GetMessageResultReply{ + return &validatorserver.GetMessageResultReply{ Found: true, RawVal: hexutil.Encode(buf.Bytes()), LogPreHash: txInfo.LogsPreHash, @@ -136,22 +138,22 @@ func (m *Server) GetMessageResult(ctx context.Context, args *GetMessageResultArg } // GetAssertionCount returns the total number of finalized assertions -func (m *Server) GetAssertionCount(ctx context.Context, args *GetAssertionCountArgs) (*GetAssertionCountReply, error) { +func (m *Server) GetAssertionCount(ctx context.Context, args *validatorserver.GetAssertionCountArgs) (*validatorserver.GetAssertionCountReply, error) { req := m.tracker.AssertionCount() - return &GetAssertionCountReply{ + return &validatorserver.GetAssertionCountReply{ AssertionCount: int32(<-req), }, nil } // GetVMInfo returns current metadata about this VM -func (m *Server) GetVMInfo(ctx context.Context, args *GetVMInfoArgs) (*GetVMInfoReply, error) { - return &GetVMInfoReply{ +func (m *Server) GetVMInfo(ctx context.Context, args *validatorserver.GetVMInfoArgs) (*validatorserver.GetVMInfoReply, error) { + return &validatorserver.GetVMInfoReply{ VmID: hexutil.Encode(m.rollupAddress[:]), }, nil } // CallMessage takes a request from a client to process in a temporary context and return the result -func (m *Server) CallMessage(ctx context.Context, args *CallMessageArgs) (*CallMessageReply, error) { +func (m *Server) CallMessage(ctx context.Context, args *validatorserver.CallMessageArgs) (*validatorserver.CallMessageReply, error) { log.Println("CallMessage", args.Data) dataBytes, err := hexutil.Decode(args.Data) if err != nil { @@ -206,7 +208,7 @@ func (m *Server) CallMessage(ctx context.Context, args *CallMessageArgs) (*CallM result := results[len(results)-1] var buf bytes.Buffer _ = value.MarshalValue(result, &buf) // error can only occur from writes and bytes.Buffer is safe - return &CallMessageReply{ + return &validatorserver.CallMessageReply{ RawVal: hexutil.Encode(buf.Bytes()), }, nil } diff --git a/packages/arb-validator/rollupvalidator/txtracker.go b/packages/arb-validator/rollupvalidator/txtracker.go index 79106df90a..861a9004dc 100644 --- a/packages/arb-validator/rollupvalidator/txtracker.go +++ b/packages/arb-validator/rollupvalidator/txtracker.go @@ -21,12 +21,14 @@ import ( "math/big" "strconv" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/validatorserver" + "github.com/ethereum/go-ethereum/common/hexutil" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/hashing" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/evm" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/evm" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollup" ) @@ -48,7 +50,7 @@ type findLogsRequest struct { address *big.Int topics []common.Hash - resultChan chan<- []*LogInfo + resultChan chan<- []*validatorserver.LogInfo } type logsInfo struct { @@ -151,8 +153,8 @@ func (tr *txTracker) FindLogs( toHeight *int64, address *big.Int, topics []common.Hash, -) <-chan []*LogInfo { - req := make(chan []*LogInfo, 1) +) <-chan []*validatorserver.LogInfo { + req := make(chan []*validatorserver.LogInfo, 1) tr.requests <- findLogsRequest{fromHeight, toHeight, address, topics, req} return req } @@ -248,7 +250,7 @@ func (tr *txTracker) processRequest(request validatorRequest) { endHeight = altEndHeight } } - logs := make([]*LogInfo, 0) + logs := make([]*validatorserver.LogInfo, 0) if startHeight >= int64(len(tr.assertionInfo)) { request.resultChan <- logs break @@ -264,7 +266,7 @@ func (tr *txTracker) processRequest(request validatorRequest) { topicStrings = append(topicStrings, hexutil.Encode(topic[:])) } - logs = append(logs, &LogInfo{ + logs = append(logs, &validatorserver.LogInfo{ Address: hexutil.Encode(addressBytes[12:]), BlockHash: hexutil.Encode(evmLog.Msg.TxHash[:]), BlockNumber: "0x" + strconv.FormatInt(startHeight+int64(i), 16), diff --git a/packages/arb-validator/structures/inbox.go b/packages/arb-validator/structures/inbox.go index 599e322fb6..341347deb7 100644 --- a/packages/arb-validator/structures/inbox.go +++ b/packages/arb-validator/structures/inbox.go @@ -24,7 +24,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" "github.com/offchainlabs/arbitrum/packages/arb-util/hashing" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/value" diff --git a/packages/arb-validator/structures/inbox_test.go b/packages/arb-validator/structures/inbox_test.go index c4aaaff249..e7d742ffa1 100644 --- a/packages/arb-validator/structures/inbox_test.go +++ b/packages/arb-validator/structures/inbox_test.go @@ -23,7 +23,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" ) func getStack() *MessageStack { diff --git a/packages/arb-validator/structures/vmInbox.go b/packages/arb-validator/structures/vmInbox.go index bf37da3d2e..654a140026 100644 --- a/packages/arb-validator/structures/vmInbox.go +++ b/packages/arb-validator/structures/vmInbox.go @@ -21,7 +21,7 @@ import ( "github.com/offchainlabs/arbitrum/packages/arb-util/common" "github.com/offchainlabs/arbitrum/packages/arb-util/value" - "github.com/offchainlabs/arbitrum/packages/arb-validator/message" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/message" ) type VMInbox struct { diff --git a/packages/arb-provider-go/test/bridge_eth_addresses.json b/tests/fibgo/bridge_eth_addresses.json similarity index 100% rename from packages/arb-provider-go/test/bridge_eth_addresses.json rename to tests/fibgo/bridge_eth_addresses.json diff --git a/packages/arb-provider-go/test/connection_test.go b/tests/fibgo/connection_test.go similarity index 97% rename from packages/arb-provider-go/test/connection_test.go rename to tests/fibgo/connection_test.go index e8b4c0a15a..79737cf01a 100644 --- a/packages/arb-provider-go/test/connection_test.go +++ b/tests/fibgo/connection_test.go @@ -15,22 +15,18 @@ import ( "github.com/ethereum/go-ethereum/ethclient" - "github.com/offchainlabs/arbitrum/packages/arb-validator/valprotocol" - - "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" - - "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupmanager" - "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" goarbitrum "github.com/offchainlabs/arbitrum/packages/arb-provider-go" "github.com/offchainlabs/arbitrum/packages/arb-util/common" - "github.com/offchainlabs/arbitrum/packages/arb-validator/ethbridge" - "github.com/offchainlabs/arbitrum/packages/arb-validator/test" - + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/ethbridge" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/test" + "github.com/offchainlabs/arbitrum/packages/arb-validator-core/valprotocol" + "github.com/offchainlabs/arbitrum/packages/arb-validator/checkpointing" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollup" + "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupmanager" "github.com/offchainlabs/arbitrum/packages/arb-validator/rollupvalidator" ) diff --git a/packages/arb-provider-go/test/contract.ao b/tests/fibgo/contract.ao similarity index 100% rename from packages/arb-provider-go/test/contract.ao rename to tests/fibgo/contract.ao diff --git a/packages/arb-provider-go/test/fibabi.go b/tests/fibgo/fibabi.go similarity index 100% rename from packages/arb-provider-go/test/fibabi.go rename to tests/fibgo/fibabi.go diff --git a/tests/fibgo/go.mod b/tests/fibgo/go.mod new file mode 100644 index 0000000000..55c1a6098f --- /dev/null +++ b/tests/fibgo/go.mod @@ -0,0 +1,23 @@ +module github.com/offchainlabs/arbitrum/tests/fibgo + +go 1.13 + +require ( + github.com/ethereum/go-ethereum v1.9.10 + github.com/offchainlabs/arbitrum/packages/arb-provider-go v0.4.2 + github.com/offchainlabs/arbitrum/packages/arb-util v0.4.2 + github.com/offchainlabs/arbitrum/packages/arb-validator v0.4.2 + github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.4.2 +) + +replace github.com/offchainlabs/arbitrum/packages/arb-provider-go => ../../packages/arb-provider-go + +replace github.com/offchainlabs/arbitrum/packages/arb-validator => ../../packages/arb-validator + +replace github.com/offchainlabs/arbitrum/packages/arb-validator-core => ../../packages/arb-validator-core + +replace github.com/offchainlabs/arbitrum/packages/arb-avm-go => ../../packages/arb-avm-go + +replace github.com/offchainlabs/arbitrum/packages/arb-avm-cpp => ../../packages/arb-avm-cpp + +replace github.com/offchainlabs/arbitrum/packages/arb-util => ../../packages/arb-util diff --git a/tests/fibgo/go.sum b/tests/fibgo/go.sum new file mode 100644 index 0000000000..b52cfb8537 --- /dev/null +++ b/tests/fibgo/go.sum @@ -0,0 +1,255 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= +github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/VictoriaMetrics/fastcache v1.5.2/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= +github.com/VictoriaMetrics/fastcache v1.5.3 h1:2odJnXLbFZcoV9KYtQ+7TH1UOq3dn3AssMgieaezkR4= +github.com/VictoriaMetrics/fastcache v1.5.3/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= +github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +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= +github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= +github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A= +github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= +github.com/btcsuite/btcd v0.0.0-20190109040709-5bda5314ca95/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= +github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= +github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/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/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +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/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c h1:JHHhtb9XWJrGNMcrVP6vyzO4dusgi/HnceHTgxSejUM= +github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/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/ethereum/go-ethereum v1.8.20/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= +github.com/ethereum/go-ethereum v1.9.8/go.mod h1:N68Ktr8bkyajaEy6D8CSANxkhUxcnVjTmp9sKdKd8OI= +github.com/ethereum/go-ethereum v1.9.10 h1:jooX7tWcscpC7ytufk73t9JMCeJQ7aJF2YmZJQEuvFo= +github.com/ethereum/go-ethereum v1.9.10/go.mod h1:lXHkVo/MTvsEXfYsmNzelZ8R1e0DTvdk/wMZJIRpaRw= +github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +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/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c h1:zqAKixg3cTcIasAMJV+EcfVbWwLpOZ7LeoWJvcuD/5Q= +github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= +github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk= +github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= +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/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad h1:eMxs9EL0PvIGS9TTtxg4R+JxuPGav82J8rA+GFnY7po= +github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huin/goupnp v0.0.0-20161224104101-679507af18f3 h1:DqD8eigqlUm0+znmx7zhL0xvTW3+e1jCekJMfBUADWI= +github.com/huin/goupnp v0.0.0-20161224104101-679507af18f3/go.mod h1:MZ2ZmwcBpvOoJ22IJsc7va19ZwoheaBk43rKg12SKag= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= +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/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/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= +github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 h1:I/yrLt2WilKxlQKCM52clh5rGzTKpVctGT1lH4Dc8Jw= +github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +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/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miguelmota/go-solidity-sha3 v0.1.0 h1:RoRqUD/qKqZCZIoAGVJhX6gEHeD6333uQv+jhBGpRDk= +github.com/miguelmota/go-solidity-sha3 v0.1.0/go.mod h1:FuaBKCJUkJcmPqCuKvPFYfzK1auYGr5+8i2evSBIm/Q= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= +github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c h1:1RHs3tNxjXGHeul8z2t6H2N2TlAqpKe5yryJztRx4Jk= +github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +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/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222 h1:goeTyGkArOZIVOMA0dQbyuPWGNQJZGPwPu/QS9GlpnA= +github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150 h1:ZeU+auZj1iNzN8iVhff6M38Mfu73FQiJve/GEXYJBjE= +github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE= +github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= +github.com/robertkrimen/otto v0.0.0-20170205013659-6a77b7cbc37d/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= +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/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= +github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= +github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE= +github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= +github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 h1:njlZPzLwU639dk2kqnCPPv+wNjq7Xb6EfUxe/oX0/NM= +github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +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/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d h1:gZZadD8H+fF+n9CmNhYL1Y0dJB+kLOmKd7FbPJLeGHs= +github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA= +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/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8cVcUy5CeIBYhEESkOB7m6Gmkrk= +github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI= +golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= +gopkg.in/olebedev/go-duktape.v3 v3.0.0-20190213234257-ec84240a7772/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= +gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/packages/arb-provider-go/test/server.crt b/tests/fibgo/server.crt similarity index 100% rename from packages/arb-provider-go/test/server.crt rename to tests/fibgo/server.crt diff --git a/packages/arb-provider-go/test/server.key b/tests/fibgo/server.key similarity index 100% rename from packages/arb-provider-go/test/server.key rename to tests/fibgo/server.key