Skip to content

Commit

Permalink
op deps update (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
@protolambda
protolambda authored Sep 10, 2022
1 parent 0633b1a commit 64e4fc9
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 32 deletions.
2 changes: 1 addition & 1 deletion clients/op-geth/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG branch=develop
ARG branch=optimism-history
FROM ethereumoptimism/op-geth:$branch

RUN apk add curl jq bash
Expand Down
5 changes: 5 additions & 0 deletions optimism/devnet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,11 @@ func (d *Devnet) InitChain(maxSeqDrift uint64, seqWindowSize uint64, chanTimeout
GasPriceOracleScalar: 1000_000,
GasPriceOracleDecimals: 6,
DeploymentWaitConfirmations: 1,

EIP1559Elasticity: 10,
EIP1559Denominator: 50,

FundDevAccounts: false,
}

l1Genesis, err := genesis.BuildL1DeveloperGenesis(config)
Expand Down
14 changes: 7 additions & 7 deletions optimism/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/ethereum/hive/optimism
go 1.18

require (
github.com/ethereum-optimism/optimism/op-batcher v0.7.0
github.com/ethereum-optimism/optimism/op-bindings v0.8.3
github.com/ethereum-optimism/optimism/op-chain-ops v0.8.3
github.com/ethereum-optimism/optimism/op-node v0.8.3
github.com/ethereum-optimism/optimism/op-proposer v0.7.0
github.com/ethereum-optimism/optimism/op-batcher v0.8.6
github.com/ethereum-optimism/optimism/op-bindings v0.8.6
github.com/ethereum-optimism/optimism/op-chain-ops v0.8.6
github.com/ethereum-optimism/optimism/op-node v0.8.6
github.com/ethereum-optimism/optimism/op-proposer v0.8.6
github.com/ethereum/go-ethereum v1.10.23
github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1
github.com/miguelmota/go-ethereum-hdwallet v0.1.1
Expand All @@ -34,7 +34,7 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/ethereum-optimism/optimism/op-service v0.5.0 // indirect
github.com/ethereum-optimism/optimism/op-service v0.8.6 // indirect
github.com/fjl/memsize v0.0.1 // indirect
github.com/flynn/noise v1.0.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
Expand Down Expand Up @@ -145,4 +145,4 @@ require (
lukechampine.com/blake3 v1.1.7 // indirect
)

replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220907143004-2aacc679d638
replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
28 changes: 14 additions & 14 deletions optimism/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,20 +173,20 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ethereum-optimism/op-geth v0.0.0-20220907143004-2aacc679d638 h1:LcvgHjeooGBobfEIEYikMzx1MoIAjRqa/ZDdkrhV3Hw=
github.com/ethereum-optimism/op-geth v0.0.0-20220907143004-2aacc679d638/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
github.com/ethereum-optimism/optimism/op-batcher v0.7.0 h1:gE3v1NQA+x/02CUHkelNJO8iXKWTDFgPTYdgY4oKtsk=
github.com/ethereum-optimism/optimism/op-batcher v0.7.0/go.mod h1:ir6uju6GWVojOdQx2xh92nEGtrjFuTnqMM5VbtvrO5M=
github.com/ethereum-optimism/optimism/op-bindings v0.8.3 h1:6v3n0fZhxcqVF9mu8l2Axqi4/XcMqpthtl3mEkqhi04=
github.com/ethereum-optimism/optimism/op-bindings v0.8.3/go.mod h1:XZRKu/LTd03m50duwMFEqCWe6qkjgLBZUoZG3CR2Kg0=
github.com/ethereum-optimism/optimism/op-chain-ops v0.8.3 h1:X36b6y9fPGiJx2ugs+1RR8OKA9mYljsNTReTLNPa+Tg=
github.com/ethereum-optimism/optimism/op-chain-ops v0.8.3/go.mod h1:ik59PuWUSXYfrb/cLJ3pRxZijVoy/QabRN5TgGIMEkQ=
github.com/ethereum-optimism/optimism/op-node v0.8.3 h1:Snuick9EtalM6Cbs8rVUcoCDPFpu6Xxr7kre+RbLbY0=
github.com/ethereum-optimism/optimism/op-node v0.8.3/go.mod h1:CPa18cq3E41eqwpsohX/QkupY11D3CYsNqbKZD6H860=
github.com/ethereum-optimism/optimism/op-proposer v0.7.0 h1:B5XkZQ02xxNhFcAZRW9jt+h/RREAgFRG+KfCdyhTZU8=
github.com/ethereum-optimism/optimism/op-proposer v0.7.0/go.mod h1:7xxzcDk1bWAo3NpnLEzMsKnub0PnbAzyYmciavwc7J8=
github.com/ethereum-optimism/optimism/op-service v0.5.0 h1:D0OyBbRGttT3geECT935W4DPhbVAibPWZAayWpEd+e4=
github.com/ethereum-optimism/optimism/op-service v0.5.0/go.mod h1:otr/BXzgcZmJKUl18v+WLJjtWoIwqoJ/L0/cNvIIkUs=
github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 h1:W/ZU6BZH7ilTrpdoJOF9N4OReqXbpeRtUB6klIpEdMA=
github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
github.com/ethereum-optimism/optimism/op-batcher v0.8.6 h1:phRqDO8qUIzJzRYt4+ZivSQx4gENeVcTiHY7wj4TnN4=
github.com/ethereum-optimism/optimism/op-batcher v0.8.6/go.mod h1:Ghz9Ilox6Ca5TjJAroZVheCleE5a/Ek4qjlW1yULb+A=
github.com/ethereum-optimism/optimism/op-bindings v0.8.6 h1:jJYhmygt7hqGzYa+8sme9SdnKt1c3Y6EbWgIrRONoxw=
github.com/ethereum-optimism/optimism/op-bindings v0.8.6/go.mod h1:gUX5317IAvRMjB4GftayM87JVln3DTqukfirwJpEWnE=
github.com/ethereum-optimism/optimism/op-chain-ops v0.8.6 h1:tNGW3gztoIx2t+z64wAkDIvsUpvc468Y8IG9K4/hAKk=
github.com/ethereum-optimism/optimism/op-chain-ops v0.8.6/go.mod h1:RZ0R4dy/F/bMbKlDef7k1oSiD4BEx9GmwXYtnmx7mEk=
github.com/ethereum-optimism/optimism/op-node v0.8.6 h1:xNwN+Q/Rt17vSKawhBeG9qTcqcyh8JU8PGjK1iuGkF4=
github.com/ethereum-optimism/optimism/op-node v0.8.6/go.mod h1:gkyzgVHV3+tIhLZ8GhT+bL9GrrmouQCW4mKYukS0SHg=
github.com/ethereum-optimism/optimism/op-proposer v0.8.6 h1:iy8XAtkvrURBy3TT2Lf540cbWztxit7K4+BghZ4IsMI=
github.com/ethereum-optimism/optimism/op-proposer v0.8.6/go.mod h1:tuCLnXcO4MrtVyis1Yfo7wtL8EQta1u6zFdzHHj+RAc=
github.com/ethereum-optimism/optimism/op-service v0.8.6 h1:ruZp/BxL8TGn1y9EJmygypPTeVAFlAA0A/h8LsCoV+M=
github.com/ethereum-optimism/optimism/op-service v0.8.6/go.mod h1:gm8YNzERrL/CHBPWx3+01mR/NOVpLLw4GEUSnnTdyFU=
github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg=
github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1 h1:/9pjERGkOhfngQJ8wAxx+pjrM5lnml+dUxD3HVDaE8g=
github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1/go.mod h1:G8XiiUErpj6++yb93r6y6T1nWBh4Bgoi3QFwUSbzt/U=
Expand Down
6 changes: 3 additions & 3 deletions simulators/optimism/l1ops/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ module github.com/ethereum/hive/simulators/optimism/l1ops

go 1.18

replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220907143004-2aacc679d638
replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1

replace github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1 => github.com/ethereum-optimism/hive v0.0.0-20220811164854-8d8a3893710c

replace github.com/ethereum/hive/optimism v0.0.0 => github.com/ethereum-optimism/hive/optimism v0.0.0-20220811164854-8d8a3893710c

require (
github.com/ethereum-optimism/optimism/op-bindings v0.8.3
github.com/ethereum-optimism/optimism/op-node v0.8.3
github.com/ethereum-optimism/optimism/op-bindings v0.8.6
github.com/ethereum-optimism/optimism/op-node v0.8.6
github.com/ethereum/go-ethereum v1.10.23
github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1
github.com/ethereum/hive/optimism v0.0.0
Expand Down
6 changes: 3 additions & 3 deletions simulators/optimism/p2p/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ module github.com/ethereum/hive/simulators/optimism/p2p

go 1.18

replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220907143004-2aacc679d638
replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1

replace github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1 => github.com/ethereum-optimism/hive v0.0.0-20220811164854-8d8a3893710c

replace github.com/ethereum/hive/optimism v0.0.0 => github.com/ethereum-optimism/hive/optimism v0.0.0-20220811164854-8d8a3893710c

require (
github.com/ethereum-optimism/optimism/op-node v0.8.3
github.com/ethereum-optimism/optimism/op-proposer v0.8.3
github.com/ethereum-optimism/optimism/op-node v0.8.6
github.com/ethereum-optimism/optimism/op-proposer v0.8.6
github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1
github.com/ethereum/hive/optimism v0.0.0
github.com/stretchr/testify v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion simulators/optimism/rpc/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/ethereum/hive/simulators/optimism/rpc

go 1.18

replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220907143004-2aacc679d638
replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1

replace github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1 => github.com/ethereum-optimism/hive v0.0.0-20220811164854-8d8a3893710c

Expand Down
6 changes: 3 additions & 3 deletions simulators/optimism/testnet/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ module github.com/ethereum/hive/simulators/optimism/testnet

go 1.18

replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220907143004-2aacc679d638
replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1

replace github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1 => github.com/ethereum-optimism/hive v0.0.0-20220811164854-8d8a3893710c

replace github.com/ethereum/hive/optimism v0.0.0 => github.com/ethereum-optimism/hive/optimism v0.0.0-20220811164854-8d8a3893710c

require (
github.com/ethereum-optimism/optimism/op-node v0.8.3
github.com/ethereum-optimism/optimism/op-proposer v0.8.3
github.com/ethereum-optimism/optimism/op-node v0.8.6
github.com/ethereum-optimism/optimism/op-proposer v0.8.6
github.com/ethereum/hive v0.0.0-20220727121216-02ad57aaf9c1
github.com/ethereum/hive/optimism v0.0.0
github.com/stretchr/testify v1.8.0
Expand Down

0 comments on commit 64e4fc9

Please sign in to comment.