Skip to content

Commit

Permalink
Merge pull request #220 from OffchainLabs/deploy-fixes
Browse files Browse the repository at this point in the history 
Deploy fixes
  • Loading branch information
@edfelten
edfelten committed Feb 12, 2020
2 parents 075bf4c + b322e9d commit 9edd393
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 65 deletions.
5 changes: 1 addition & 4 deletions packages/arb-avm-cpp/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module github.com/offchainlabs/arbitrum/packages/arb-avm-cpp

go 1.12

require (
github.com/ethereum/go-ethereum v1.9.8
github.com/offchainlabs/arbitrum/packages/arb-util v0.2.0
)
require github.com/offchainlabs/arbitrum/packages/arb-util v0.4.0

replace github.com/offchainlabs/arbitrum/packages/arb-util => ../arb-util
3 changes: 1 addition & 2 deletions packages/arb-avm-go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ go 1.12
require (
github.com/dgraph-io/badger v1.6.0
github.com/ethereum/go-ethereum v1.9.8
github.com/miguelmota/go-solidity-sha3 v0.1.0
github.com/offchainlabs/arbitrum/packages/arb-util v0.2.0
github.com/offchainlabs/arbitrum/packages/arb-util v0.4.0
)

replace github.com/offchainlabs/arbitrum/packages/arb-util => ../arb-util
2 changes: 0 additions & 2 deletions packages/arb-avm-go/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
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/offchainlabs/arbitrum v0.2.1 h1:dhX6H79iRRmPl9cltK2wes6RhTGKz1mpO6oLhGQWzgU=
github.com/offchainlabs/arbitrum/packages/arb-validator v0.2.0 h1:/eHUDkTj9tpbFd5fOYC3fobBoonXtjUiukHvaXpYkvA=
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/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
Expand Down
7 changes: 2 additions & 5 deletions packages/arb-provider-go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ go 1.12

require (
github.com/ethereum/go-ethereum v1.9.8
github.com/gorilla/handlers v1.4.2
github.com/gorilla/mux v1.7.3
github.com/gorilla/rpc v1.2.0
github.com/miguelmota/go-solidity-sha3 v0.1.0
github.com/offchainlabs/arbitrum/packages/arb-util v0.2.0
github.com/offchainlabs/arbitrum/packages/arb-validator v0.2.0
github.com/offchainlabs/arbitrum/packages/arb-util v0.4.0
github.com/offchainlabs/arbitrum/packages/arb-validator v0.4.0
)

replace github.com/offchainlabs/arbitrum/packages/arb-validator => ../arb-validator
Expand Down
6 changes: 1 addition & 5 deletions packages/arb-provider-go/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ github.com/VictoriaMetrics/fastcache v1.5.2/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v
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 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc=
github.com/allegro/bigcache v1.2.1/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/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ=
Expand Down Expand Up @@ -90,7 +89,6 @@ github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVV
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.2/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/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
Expand Down Expand Up @@ -202,8 +200,6 @@ 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.3.0 h1:10AUa+oocXAh0GNlJ0llpCImg46UawxfEprZAjjuLu0=
github.com/offchainlabs/arbitrum/packages/arb-provider-go v0.2.0/go.mod h1:dTXPL3XpOaZdUO+zNalo5WHG8t8+Ynt4DTzxsBO+h2o=
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=
Expand Down
1 change: 0 additions & 1 deletion packages/arb-util/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ github.com/miguelmota/go-solidity-sha3 v0.1.0 h1:RoRqUD/qKqZCZIoAGVJhX6gEHeD6333
github.com/miguelmota/go-solidity-sha3 v0.1.0/go.mod h1:FuaBKCJUkJcmPqCuKvPFYfzK1auYGr5+8i2evSBIm/Q=
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.2.1 h1:dhX6H79iRRmPl9cltK2wes6RhTGKz1mpO6oLhGQWzgU=
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/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
Expand Down
20 changes: 14 additions & 6 deletions packages/arb-validator/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ 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
Expand All @@ -12,19 +16,23 @@ require (
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
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/miguelmota/go-solidity-sha3 v0.1.0
github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.2.0
github.com/offchainlabs/arbitrum/packages/arb-avm-go v0.2.0
github.com/offchainlabs/arbitrum/packages/arb-provider-go v0.2.0 // indirect
github.com/offchainlabs/arbitrum/packages/arb-util v0.2.0
github.com/offchainlabs/arbitrum/packages/arb-avm-cpp v0.4.0
github.com/offchainlabs/arbitrum/packages/arb-avm-go v0.4.0
github.com/offchainlabs/arbitrum/packages/arb-util v0.4.0
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
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
Expand Down
Loading

0 comments on commit 9edd393

Please sign in to comment.