From 3dfcbdf19561aab2aae9c91fee3cc98a1783ec34 Mon Sep 17 00:00:00 2001 From: Harry Kalodner Date: Tue, 24 Nov 2020 15:43:50 -0500 Subject: [PATCH 1/4] Bump go-ethereum --- packages/arb-avm-cpp/go.mod | 2 +- packages/arb-avm-cpp/go.sum | 8 ++++---- packages/arb-evm/go.mod | 2 +- packages/arb-tx-aggregator/go.mod | 2 +- packages/arb-validator-core/go.mod | 2 +- packages/arb-validator/go.mod | 2 +- tests/fibgo/go.mod | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/arb-avm-cpp/go.mod b/packages/arb-avm-cpp/go.mod index 897a3592e6..5ca372cd5a 100644 --- a/packages/arb-avm-cpp/go.mod +++ b/packages/arb-avm-cpp/go.mod @@ -3,7 +3,7 @@ module github.com/offchainlabs/arbitrum/packages/arb-avm-cpp go 1.13 require ( - github.com/ethereum/go-ethereum v1.9.23 + github.com/ethereum/go-ethereum v1.9.24 github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 ) diff --git a/packages/arb-avm-cpp/go.sum b/packages/arb-avm-cpp/go.sum index 0d0c26e953..3f20716e6e 100644 --- a/packages/arb-avm-cpp/go.sum +++ b/packages/arb-avm-cpp/go.sum @@ -63,10 +63,8 @@ github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVV github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.9.14/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= -github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbcJl13ek= -github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= -github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= -github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= +github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= +github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= 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= @@ -94,6 +92,8 @@ github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= diff --git a/packages/arb-evm/go.mod b/packages/arb-evm/go.mod index e3c26db84b..0fc6cc1f88 100644 --- a/packages/arb-evm/go.mod +++ b/packages/arb-evm/go.mod @@ -3,7 +3,7 @@ module github.com/offchainlabs/arbitrum/packages/arb-evm go 1.13 require ( - github.com/ethereum/go-ethereum v1.9.23 + github.com/ethereum/go-ethereum v1.9.24 github.com/golang/protobuf v1.4.2 github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.2 diff --git a/packages/arb-tx-aggregator/go.mod b/packages/arb-tx-aggregator/go.mod index 2204b9ce86..1306985a3e 100644 --- a/packages/arb-tx-aggregator/go.mod +++ b/packages/arb-tx-aggregator/go.mod @@ -5,7 +5,7 @@ go 1.13 require ( github.com/c-bata/go-prompt v0.2.4-0.20200903090133-56c224c88aba github.com/emirpasic/gods v1.12.0 - github.com/ethereum/go-ethereum v1.9.23 + github.com/ethereum/go-ethereum v1.9.24 github.com/gorilla/handlers v1.4.2 github.com/gorilla/mux v1.7.4 github.com/kr/pretty v0.2.0 // indirect diff --git a/packages/arb-validator-core/go.mod b/packages/arb-validator-core/go.mod index 5d47d7c3db..ade998b349 100644 --- a/packages/arb-validator-core/go.mod +++ b/packages/arb-validator-core/go.mod @@ -3,7 +3,7 @@ module github.com/offchainlabs/arbitrum/packages/arb-validator-core go 1.13 require ( - github.com/ethereum/go-ethereum v1.9.23 + github.com/ethereum/go-ethereum v1.9.24 github.com/golang/protobuf v1.4.2 github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 github.com/pkg/errors v0.9.1 diff --git a/packages/arb-validator/go.mod b/packages/arb-validator/go.mod index dabf12d9cb..06b8dedbef 100644 --- a/packages/arb-validator/go.mod +++ b/packages/arb-validator/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/c-bata/go-prompt v0.2.3 // indirect - github.com/ethereum/go-ethereum v1.9.23 + github.com/ethereum/go-ethereum v1.9.24 github.com/golang/protobuf v1.4.2 github.com/kr/pretty v0.2.0 // indirect github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.7.2 diff --git a/tests/fibgo/go.mod b/tests/fibgo/go.mod index 84ed8722f3..70c98e3568 100644 --- a/tests/fibgo/go.mod +++ b/tests/fibgo/go.mod @@ -3,7 +3,7 @@ module github.com/offchainlabs/arbitrum/tests/fibgo go 1.13 require ( - github.com/ethereum/go-ethereum v1.9.23 + github.com/ethereum/go-ethereum v1.9.24 github.com/offchainlabs/arbitrum/packages/arb-tx-aggregator v0.7.2 github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 github.com/offchainlabs/arbitrum/packages/arb-validator v0.7.2 From fdb92f47caf90556bc94185d22865c01209b5bc0 Mon Sep 17 00:00:00 2001 From: Harry Kalodner Date: Tue, 24 Nov 2020 15:50:47 -0500 Subject: [PATCH 2/4] Update versions --- docs/Installation.md | 2 +- packages/arb-avm-cpp/CMakeLists.txt | 2 +- packages/arb-avm-cpp/go.mod | 2 +- packages/arb-checkpointer/go.mod | 8 ++++---- packages/arb-checkpointer/go.sum | 4 ++++ packages/arb-evm/go.mod | 6 +++--- packages/arb-evm/go.sum | 4 ++++ packages/arb-provider-ethers/package.json | 2 +- packages/arb-tx-aggregator/go.mod | 10 +++++----- packages/arb-tx-aggregator/go.sum | 4 ++++ packages/arb-tx-aggregator/web3/web3.go | 2 +- packages/arb-validator-core/go.mod | 4 ++-- packages/arb-validator-core/go.sum | 4 ++++ packages/arb-validator/go.mod | 11 +++++------ packages/arb-validator/go.sum | 4 ++++ packages/arbos-contracts/package.json | 2 +- packages/tools/package.json | 2 +- tests/fibgo/go.mod | 8 ++++---- 18 files changed, 50 insertions(+), 31 deletions(-) diff --git a/docs/Installation.md b/docs/Installation.md index 4d0ec09923..4c51bfeb0f 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -71,7 +71,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.7.2 https://github.com/offchainlabs/arbitrum.git +git clone -b v0.7.3 https://github.com/offchainlabs/arbitrum.git cd arbitrum yarn yarn build diff --git a/packages/arb-avm-cpp/CMakeLists.txt b/packages/arb-avm-cpp/CMakeLists.txt index 5f044d5128..d57058bc3a 100644 --- a/packages/arb-avm-cpp/CMakeLists.txt +++ b/packages/arb-avm-cpp/CMakeLists.txt @@ -50,7 +50,7 @@ include(CTest) set(AVM_VERSION_MAJOR 0) set(AVM_VERSION_MINOR 7) -set(AVM_VERSION_PATCH 2) +set(AVM_VERSION_PATCH 3) set(AVM_VERSION_STRING ${AVM_VERSION_MAJOR}.${AVM_VERSION_MINOR}.${AVM_VERSION_PATCH}) diff --git a/packages/arb-avm-cpp/go.mod b/packages/arb-avm-cpp/go.mod index 5ca372cd5a..8838ae5600 100644 --- a/packages/arb-avm-cpp/go.mod +++ b/packages/arb-avm-cpp/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/ethereum/go-ethereum v1.9.24 - github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 + github.com/offchainlabs/arbitrum/packages/arb-util v0.7.3 ) replace github.com/offchainlabs/arbitrum/packages/arb-util => ../arb-util diff --git a/packages/arb-checkpointer/go.mod b/packages/arb-checkpointer/go.mod index 57ca04c3d0..8e7d2dfbef 100644 --- a/packages/arb-checkpointer/go.mod +++ b/packages/arb-checkpointer/go.mod @@ -3,10 +3,10 @@ module github.com/offchainlabs/arbitrum/packages/arb-checkpointer go 1.13 require ( - github.com/golang/protobuf v1.4.2 - github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.2 + github.com/golang/protobuf v1.4.3 + github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-util v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.3 google.golang.org/protobuf v1.25.0 ) diff --git a/packages/arb-checkpointer/go.sum b/packages/arb-checkpointer/go.sum index e1983d5f8b..c40fad9a28 100644 --- a/packages/arb-checkpointer/go.sum +++ b/packages/arb-checkpointer/go.sum @@ -71,6 +71,8 @@ github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbc github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= +github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= +github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc h1:jtW8jbpkO4YirRSyepBOH8E+2HEw6/hKkBvFPwhUN8c= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -102,6 +104,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= diff --git a/packages/arb-evm/go.mod b/packages/arb-evm/go.mod index 0fc6cc1f88..fbaceb1480 100644 --- a/packages/arb-evm/go.mod +++ b/packages/arb-evm/go.mod @@ -4,9 +4,9 @@ go 1.13 require ( github.com/ethereum/go-ethereum v1.9.24 - github.com/golang/protobuf v1.4.2 - github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.2 + github.com/golang/protobuf v1.4.3 + github.com/offchainlabs/arbitrum/packages/arb-util v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.3 github.com/pkg/errors v0.9.1 google.golang.org/protobuf v1.25.0 ) diff --git a/packages/arb-evm/go.sum b/packages/arb-evm/go.sum index bdb988bac3..132bd1834b 100644 --- a/packages/arb-evm/go.sum +++ b/packages/arb-evm/go.sum @@ -71,6 +71,8 @@ github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbc github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= +github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= +github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc h1:jtW8jbpkO4YirRSyepBOH8E+2HEw6/hKkBvFPwhUN8c= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -103,6 +105,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= diff --git a/packages/arb-provider-ethers/package.json b/packages/arb-provider-ethers/package.json index 91c8c50339..0688544e0a 100644 --- a/packages/arb-provider-ethers/package.json +++ b/packages/arb-provider-ethers/package.json @@ -1,6 +1,6 @@ { "name": "arb-provider-ethers", - "version": "0.7.2", + "version": "0.7.3", "description": "Arbitrum provider for ethers", "author": "Offchain Labs, Inc.", "license": "Apache-2.0", diff --git a/packages/arb-tx-aggregator/go.mod b/packages/arb-tx-aggregator/go.mod index 1306985a3e..436a24dc80 100644 --- a/packages/arb-tx-aggregator/go.mod +++ b/packages/arb-tx-aggregator/go.mod @@ -10,11 +10,11 @@ require ( github.com/gorilla/mux v1.7.4 github.com/kr/pretty v0.2.0 // indirect github.com/mattn/go-tty v0.0.3 // indirect - github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-checkpointer v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-evm v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.2 + github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-checkpointer v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-evm v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-util v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.3 github.com/pkg/errors v0.9.1 github.com/pkg/term v0.0.0-20200520122047-c3ffed290a03 // indirect github.com/rs/zerolog v1.20.0 diff --git a/packages/arb-tx-aggregator/go.sum b/packages/arb-tx-aggregator/go.sum index 7c73e6e11f..5719314fa0 100644 --- a/packages/arb-tx-aggregator/go.sum +++ b/packages/arb-tx-aggregator/go.sum @@ -75,6 +75,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/ethereum/go-ethereum v1.9.14/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= +github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= +github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc h1:jtW8jbpkO4YirRSyepBOH8E+2HEw6/hKkBvFPwhUN8c= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -110,6 +112,8 @@ github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw= diff --git a/packages/arb-tx-aggregator/web3/web3.go b/packages/arb-tx-aggregator/web3/web3.go index 9109a5ef77..ae55da8eb1 100644 --- a/packages/arb-tx-aggregator/web3/web3.go +++ b/packages/arb-tx-aggregator/web3/web3.go @@ -25,7 +25,7 @@ type Web3 struct { } func (web3 *Web3) ClientVersion() string { - return "arb-tx-aggregator/v0.7.2" + return "arb-tx-aggregator/v0.7.3" } func (web3 *Web3) Sha3(data hexutil.Bytes) hexutil.Bytes { diff --git a/packages/arb-validator-core/go.mod b/packages/arb-validator-core/go.mod index ade998b349..8548e357dc 100644 --- a/packages/arb-validator-core/go.mod +++ b/packages/arb-validator-core/go.mod @@ -4,8 +4,8 @@ go 1.13 require ( github.com/ethereum/go-ethereum v1.9.24 - github.com/golang/protobuf v1.4.2 - github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 + github.com/golang/protobuf v1.4.3 + github.com/offchainlabs/arbitrum/packages/arb-util v0.7.3 github.com/pkg/errors v0.9.1 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 google.golang.org/protobuf v1.25.0 diff --git a/packages/arb-validator-core/go.sum b/packages/arb-validator-core/go.sum index 921534f505..dc0851957d 100644 --- a/packages/arb-validator-core/go.sum +++ b/packages/arb-validator-core/go.sum @@ -73,6 +73,8 @@ github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbc github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= +github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= +github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc h1:jtW8jbpkO4YirRSyepBOH8E+2HEw6/hKkBvFPwhUN8c= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -110,6 +112,8 @@ github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw= diff --git a/packages/arb-validator/go.mod b/packages/arb-validator/go.mod index 06b8dedbef..65d4b04864 100644 --- a/packages/arb-validator/go.mod +++ b/packages/arb-validator/go.mod @@ -5,13 +5,12 @@ go 1.13 require ( github.com/c-bata/go-prompt v0.2.3 // indirect github.com/ethereum/go-ethereum v1.9.24 - github.com/golang/protobuf v1.4.2 + github.com/golang/protobuf v1.4.3 github.com/kr/pretty v0.2.0 // indirect - github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-checkpointer v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-tx-aggregator v0.7.1 // indirect - github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.2 + github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-checkpointer v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-util v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.3 github.com/pkg/errors v0.9.1 github.com/pkg/term v0.0.0-20200520122047-c3ffed290a03 // indirect github.com/rs/zerolog v1.20.0 // indirect diff --git a/packages/arb-validator/go.sum b/packages/arb-validator/go.sum index d2ee1cd6a8..280e2daca7 100644 --- a/packages/arb-validator/go.sum +++ b/packages/arb-validator/go.sum @@ -80,6 +80,8 @@ github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbc github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= +github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= +github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc h1:jtW8jbpkO4YirRSyepBOH8E+2HEw6/hKkBvFPwhUN8c= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -116,6 +118,8 @@ github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw= diff --git a/packages/arbos-contracts/package.json b/packages/arbos-contracts/package.json index 1c26d4dfd9..a94e08ab4f 100644 --- a/packages/arbos-contracts/package.json +++ b/packages/arbos-contracts/package.json @@ -1,6 +1,6 @@ { "name": "arbos-contracts", - "version": "0.7.2", + "version": "0.7.3", "private": true, "author": "Offchain Labs, Inc.", "license": "Apache-2.0", diff --git a/packages/tools/package.json b/packages/tools/package.json index cef09889fc..3c710038c5 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "tools", - "version": "0.7.2", + "version": "0.7.3", "main": "index.js", "license": "Apache-2.0", "private": true, diff --git a/tests/fibgo/go.mod b/tests/fibgo/go.mod index 70c98e3568..aba0331d84 100644 --- a/tests/fibgo/go.mod +++ b/tests/fibgo/go.mod @@ -4,10 +4,10 @@ go 1.13 require ( github.com/ethereum/go-ethereum v1.9.24 - github.com/offchainlabs/arbitrum/packages/arb-tx-aggregator v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-util v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-validator v0.7.2 - github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.2 + github.com/offchainlabs/arbitrum/packages/arb-tx-aggregator v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-util v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-validator v0.7.3 + github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.3 ) replace github.com/offchainlabs/arbitrum/packages/arb-validator => ../../packages/arb-validator From 22ac80af787544b64c4b8fb8bbdb5159b7dab931 Mon Sep 17 00:00:00 2001 From: Harry Kalodner Date: Tue, 24 Nov 2020 16:05:48 -0500 Subject: [PATCH 3/4] Tidy --- packages/arb-checkpointer/go.sum | 4 --- packages/arb-evm/go.sum | 4 --- packages/arb-tx-aggregator/go.sum | 2 -- packages/arb-validator-core/go.sum | 5 +--- packages/arb-validator/go.mod | 3 --- packages/arb-validator/go.sum | 28 -------------------- scripts/go-vet | 42 +++++++++++------------------- 7 files changed, 16 insertions(+), 72 deletions(-) diff --git a/packages/arb-checkpointer/go.sum b/packages/arb-checkpointer/go.sum index c40fad9a28..d55f382c1b 100644 --- a/packages/arb-checkpointer/go.sum +++ b/packages/arb-checkpointer/go.sum @@ -67,10 +67,6 @@ github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVV github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.9.14/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= -github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbcJl13ek= -github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= -github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= -github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= diff --git a/packages/arb-evm/go.sum b/packages/arb-evm/go.sum index 132bd1834b..118250e677 100644 --- a/packages/arb-evm/go.sum +++ b/packages/arb-evm/go.sum @@ -67,10 +67,6 @@ github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVV github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.9.14/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= -github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbcJl13ek= -github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= -github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= -github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= diff --git a/packages/arb-tx-aggregator/go.sum b/packages/arb-tx-aggregator/go.sum index 5719314fa0..d06ec47666 100644 --- a/packages/arb-tx-aggregator/go.sum +++ b/packages/arb-tx-aggregator/go.sum @@ -73,8 +73,6 @@ github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.9.14/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= -github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= -github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= diff --git a/packages/arb-validator-core/go.sum b/packages/arb-validator-core/go.sum index dc0851957d..efae36e8c6 100644 --- a/packages/arb-validator-core/go.sum +++ b/packages/arb-validator-core/go.sum @@ -69,10 +69,6 @@ github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVV github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.9.14/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= -github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbcJl13ek= -github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= -github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= -github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -341,6 +337,7 @@ gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7 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-20200316214253-d7b0ff38cac9 h1:ITeyKbRetrVzqR3U1eY+ywgp7IBspGd1U/bkwd1gWu4= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200316214253-d7b0ff38cac9/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= +gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 h1:a6cXbcDDUkSBlpnkWV1bJ+vv3mOgQEltEJ2rPxroVu0= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= diff --git a/packages/arb-validator/go.mod b/packages/arb-validator/go.mod index 65d4b04864..2b2cf14eed 100644 --- a/packages/arb-validator/go.mod +++ b/packages/arb-validator/go.mod @@ -3,7 +3,6 @@ module github.com/offchainlabs/arbitrum/packages/arb-validator go 1.13 require ( - github.com/c-bata/go-prompt v0.2.3 // indirect github.com/ethereum/go-ethereum v1.9.24 github.com/golang/protobuf v1.4.3 github.com/kr/pretty v0.2.0 // indirect @@ -12,8 +11,6 @@ require ( github.com/offchainlabs/arbitrum/packages/arb-util v0.7.3 github.com/offchainlabs/arbitrum/packages/arb-validator-core v0.7.3 github.com/pkg/errors v0.9.1 - github.com/pkg/term v0.0.0-20200520122047-c3ffed290a03 // indirect - github.com/rs/zerolog v1.20.0 // indirect google.golang.org/protobuf v1.25.0 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ) diff --git a/packages/arb-validator/go.sum b/packages/arb-validator/go.sum index 280e2daca7..e61e702774 100644 --- a/packages/arb-validator/go.sum +++ b/packages/arb-validator/go.sum @@ -40,8 +40,6 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/c-bata/go-prompt v0.2.3 h1:jjCS+QhG/sULBhAaBdjb2PlMRVaKXQgn+4yzaauvs2s= -github.com/c-bata/go-prompt v0.2.3/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= @@ -51,7 +49,6 @@ github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+ 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/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= 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= @@ -70,16 +67,9 @@ 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/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/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= -github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.9.14/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= -github.com/ethereum/go-ethereum v1.9.20/go.mod h1:JSSTypSMTkGZtAdAChH2wP5dZEvPGh3nUTuDpH+hNrg= -github.com/ethereum/go-ethereum v1.9.22 h1:/Fea9n2EWJuNJ9oahMq9luqjRBcbW7QWdThbcJl13ek= -github.com/ethereum/go-ethereum v1.9.22/go.mod h1:FQjK3ZwD8C5DYn7ukTmFee36rq1dOMESiUfXr5RUc1w= -github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw= -github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/ethereum/go-ethereum v1.9.24 h1:6AK+ORt3EMDO+FTjzXy/AQwHMbu52J2nYHIjyQX9azQ= github.com/ethereum/go-ethereum v1.9.24/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -133,12 +123,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/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.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= -github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -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= @@ -187,11 +171,6 @@ github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/offchainlabs/arbitrum v0.7.1 h1:JBkSbMZFObg/2rqIiXiLrKLxN7WelEtBOGRY6jalmoc= -github.com/offchainlabs/arbitrum/packages/arb-evm v0.7.1 h1:Heo6Sq3JuZSsvPuQccjcqGK5dsdNcvUHWwaUa2j6nm8= -github.com/offchainlabs/arbitrum/packages/arb-evm v0.7.1/go.mod h1:4XbYeQDzNKgK4YA0b4wxF5XcaOIAo11RTClyfagDZRI= -github.com/offchainlabs/arbitrum/packages/arb-tx-aggregator v0.7.1 h1:tjNbbHa3mpmaGrwQN07ihWEDri3hwCk8Hezz/dyKsW0= -github.com/offchainlabs/arbitrum/packages/arb-tx-aggregator v0.7.1/go.mod h1:qJjvnJjDg33KWxiVj+6IU9kxmbSRzheyGt+fsJZHrfc= github.com/offchainlabs/go-solidity-sha3 v0.1.2 h1:IJ/KUv8zW5+Rtq/VvhNjq/Q7MDXjDx1ArAvkJhBRQAs= github.com/offchainlabs/go-solidity-sha3 v0.1.2/go.mod h1:WYAU7UTm1wXzEhnsTt843T77fKfR9x/rqqzjm8NJ3Mc= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -221,8 +200,6 @@ 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/term v0.0.0-20200520122047-c3ffed290a03 h1:pd4YKIqCB0U7O2I4gWHgEUA2mCEOENmco0l/bM957bU= -github.com/pkg/term v0.0.0-20200520122047-c3ffed290a03/go.mod h1:Z9+Ul5bCbBKnbCvdOWbLqTHhJiYV414CURZJba6L8qA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= 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= @@ -238,9 +215,6 @@ github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00 h1:8DPul/X0IT/1TNMIxoKLwde github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521 h1:3hxavr+IHMsQBrYUPQM5v0CgENFktkkbg1sfpgM3h20= github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= -github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil v2.20.5+incompatible h1:tYH07UPoQt0OCQdgWWMgYHy3/a9bcxNpBIysykNIP7I= github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= @@ -299,7 +273,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 h1:Jcxah/M+oLZ/R4/z5RzfPzGbPXnVDPkEDtf2JnuxN+U= golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -335,7 +308,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/scripts/go-vet b/scripts/go-vet index 9340f242c6..377a9ef6fd 100755 --- a/scripts/go-vet +++ b/scripts/go-vet @@ -3,32 +3,20 @@ # Exit on error set -e -cd packages - -cd arb-util -go vet ./... -cd .. - -cd arb-avm-cpp -go vet ./... -cd .. - -cd arb-validator-core -go vet ./... -cd .. +packages=( + arb-util + arb-avm-cpp + arb-validator-core + arb-validator + arb-evm + arb-checkpointer + arb-tx-aggregator +) -cd arb-validator -go vet ./... -cd .. - -cd arb-evm -go vet ./... -cd .. - -cd arb-checkpointer -go vet ./... -cd .. +cd packages -cd arb-tx-aggregator -go vet ./... -cd .. +for i in "${packages[@]}"; do + cd $i + go vet ./... + cd .. +done From 70b45bb7c6b9f1e6ee08414c1d4fa906cdd00a04 Mon Sep 17 00:00:00 2001 From: Harry Kalodner Date: Tue, 24 Nov 2020 16:12:00 -0500 Subject: [PATCH 4/4] Clean up go scripts --- .pre-commit-config.yaml | 2 +- package.json | 5 +-- .../checkpointing/checkpointing.pb.go | 4 +-- .../ckptcontext/ckptcontext.pb.go | 4 +-- packages/arb-evm/evm/evm.pb.go | 4 +-- scripts/go-generate | 34 ------------------- scripts/{go-vet => run-go-packages} | 3 +- 7 files changed, 11 insertions(+), 45 deletions(-) delete mode 100755 scripts/go-generate rename scripts/{go-vet => run-go-packages} (93%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2c011e6587..9752eb7ac1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -55,6 +55,6 @@ repos: - 'prettier-plugin-solidity@^1.0.0-alpha.54' - id: go-vet name: Go Vet - entry: ./scripts/go-vet + entry: ./scripts/run-go-packages 'go vet ./...' language: script files: \.go$ diff --git a/package.json b/package.json index 94fd6534a6..0208daebb7 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,9 @@ "docker:ganache": "yarn workspace arb-bridge-eth docker:ganache", "docker:geth": "yarn workspace arb-bridge-eth docker:geth", "prepare": "yarn workspace arb-provider-ethers prepare", - "go:vet": "./scripts/go-vet", - "go:generate": "./scripts/go-generate", + "go:vet": "./scripts/run-go-packages 'go vet ./...'", + "go:generate": "./scripts/run-go-packages 'go generate ./...'", + "go:tidy": "./scripts/run-go-packages 'go mod tidy'", "demo:initialize": "yarn workspace tools demo:initialize", "demo:deploy": "./scripts/arb_deploy.py local", "prod:initialize": "yarn workspace tools prod:initialize", diff --git a/packages/arb-checkpointer/checkpointing/checkpointing.pb.go b/packages/arb-checkpointer/checkpointing/checkpointing.pb.go index 8840b31844..7d9109d1c2 100644 --- a/packages/arb-checkpointer/checkpointing/checkpointing.pb.go +++ b/packages/arb-checkpointer/checkpointing/checkpointing.pb.go @@ -15,8 +15,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel -// protoc v3.11.2 +// protoc-gen-go v1.25.0 +// protoc v3.13.0 // source: checkpointing.proto package checkpointing diff --git a/packages/arb-checkpointer/ckptcontext/ckptcontext.pb.go b/packages/arb-checkpointer/ckptcontext/ckptcontext.pb.go index 5a818d3512..211f9dfd72 100644 --- a/packages/arb-checkpointer/ckptcontext/ckptcontext.pb.go +++ b/packages/arb-checkpointer/ckptcontext/ckptcontext.pb.go @@ -15,8 +15,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel -// protoc v3.11.2 +// protoc-gen-go v1.25.0 +// protoc v3.13.0 // source: ckptcontext.proto package ckptcontext diff --git a/packages/arb-evm/evm/evm.pb.go b/packages/arb-evm/evm/evm.pb.go index a0e9bdbc0c..e4978c3ec7 100644 --- a/packages/arb-evm/evm/evm.pb.go +++ b/packages/arb-evm/evm/evm.pb.go @@ -1496,7 +1496,7 @@ var file_evm_proto_depIdxs = []int32{ 4, // 1: evm.FindLogsArgs.topicGroups:type_name -> evm.TopicGroup 1, // 2: evm.FindLogsReply.logs:type_name -> evm.FullLogBuf 5, // 3: evm.RollupValidator.GetBlockCount:input_type -> evm.BlockCountArgs - 17, // 4: evm.RollupValidator.BlockInfoByNumber:input_type -> evm.BlockInfoArgs + 17, // 4: evm.RollupValidator.BlockInfo:input_type -> evm.BlockInfoArgs 19, // 5: evm.RollupValidator.BlockHash:input_type -> evm.BlockHashArgs 9, // 6: evm.RollupValidator.GetOutputMessage:input_type -> evm.GetOutputMessageArgs 11, // 7: evm.RollupValidator.GetRequestResult:input_type -> evm.GetRequestResultArgs @@ -1505,7 +1505,7 @@ var file_evm_proto_depIdxs = []int32{ 13, // 10: evm.RollupValidator.GetChainAddress:input_type -> evm.GetChainAddressArgs 21, // 11: evm.RollupValidator.SendTransaction:input_type -> evm.SendTransactionArgs 6, // 12: evm.RollupValidator.GetBlockCount:output_type -> evm.BlockCountReply - 18, // 13: evm.RollupValidator.BlockInfoByNumber:output_type -> evm.BlockInfoReply + 18, // 13: evm.RollupValidator.BlockInfo:output_type -> evm.BlockInfoReply 20, // 14: evm.RollupValidator.BlockHash:output_type -> evm.BlockHashReply 10, // 15: evm.RollupValidator.GetOutputMessage:output_type -> evm.GetOutputMessageReply 12, // 16: evm.RollupValidator.GetRequestResult:output_type -> evm.GetRequestResultReply diff --git a/scripts/go-generate b/scripts/go-generate deleted file mode 100755 index c59cbccc88..0000000000 --- a/scripts/go-generate +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Exit on error -set -e - -cd packages - -cd arb-util -go generate ./... -cd .. - -cd arb-avm-cpp -go generate ./... -cd .. - -cd arb-validator-core -go generate ./... -cd .. - -cd arb-validator -go generate ./... -cd .. - -cd arb-checkpointer -go generate ./... -cd .. - -cd arb-evm -go generate ./... -cd .. - -cd arb-tx-aggregator -go generate ./... -cd .. diff --git a/scripts/go-vet b/scripts/run-go-packages similarity index 93% rename from scripts/go-vet rename to scripts/run-go-packages index 377a9ef6fd..964f9fd7d1 100755 --- a/scripts/go-vet +++ b/scripts/run-go-packages @@ -14,9 +14,8 @@ packages=( ) cd packages - for i in "${packages[@]}"; do cd $i - go vet ./... + $1 cd .. done