From d87fefa0c4d683fe34506cda98bf6ae60f17f854 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Thu, 22 Aug 2024 17:16:49 -0700 Subject: [PATCH 1/4] Update op-erigon to 7c7d111 --- op-erigon/go.mod | 17 +++++++++-------- op-erigon/go.sum | 31 ++++++++++++++++++------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/op-erigon/go.mod b/op-erigon/go.mod index 9667d2a12a04..e5f4aeb942c0 100644 --- a/op-erigon/go.mod +++ b/op-erigon/go.mod @@ -13,6 +13,7 @@ require github.com/ledgerwatch/erigon v0.0.0-00010101000000-000000000000 require ( github.com/99designs/gqlgen v0.17.40 // indirect + github.com/BurntSushi/toml v1.4.0 // indirect github.com/Giulio2002/bls v0.0.0-20240315151443-652e18a3d188 // indirect github.com/RoaringBitmap/roaring v1.2.3 // indirect github.com/VictoriaMetrics/fastcache v1.12.2 // indirect @@ -56,7 +57,7 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/crate-crypto/go-ipa v0.0.0-20221111143132-9aa5d42120bc // indirect github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/deckarep/golang-set v1.8.0 // indirect github.com/deckarep/golang-set/v2 v2.3.1 // indirect @@ -68,7 +69,7 @@ require ( github.com/edsrzf/mmap-go v1.1.0 // indirect github.com/elastic/gosigar v0.14.2 // indirect github.com/emicklei/dot v1.6.1 // indirect - github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240315155522-09647974da0d // indirect + github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240726164940-d2a098074a5d // indirect github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c // indirect github.com/flynn/noise v1.0.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect @@ -176,7 +177,7 @@ require ( github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/webrtc/v3 v3.1.42 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect @@ -226,13 +227,13 @@ require ( go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.22.0 // indirect + golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.24.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.20.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect @@ -255,8 +256,8 @@ require ( zombiezen.com/go/sqlite v0.13.1 // indirect ) -replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20240815235925-b6707fc1b13d +replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20240822225929-7c7d111bcc39 replace github.com/tendermint/tendermint => github.com/bnb-chain/tendermint v0.31.12 -replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20240815235925-b6707fc1b13d +replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20240822225929-7c7d111bcc39 diff --git a/op-erigon/go.sum b/op-erigon/go.sum index 325ce3fa88a7..6c5f9a1c8713 100644 --- a/op-erigon/go.sum +++ b/op-erigon/go.sum @@ -50,6 +50,8 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy github.com/99designs/gqlgen v0.17.40 h1:/l8JcEVQ93wqIfmH9VS1jsAkwm6eAF1NwQn3N+SDqBY= github.com/99designs/gqlgen v0.17.40/go.mod h1:b62q1USk82GYIVjC60h02YguAZLqYZtvWml8KkhJps4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= +github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Giulio2002/bls v0.0.0-20240315151443-652e18a3d188 h1:X+7WswmEBD7DVOlAIXQiU4hok5pPcXFM7JgULHHdD/4= github.com/Giulio2002/bls v0.0.0-20240315151443-652e18a3d188/go.mod h1:nCQrFU6/QsJtLS+SBLWRn9UG2nds1f3hQKfWHCrtUqw= @@ -165,10 +167,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA= github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bobanetwork/op-erigon v1.9.7-0.20240815235925-b6707fc1b13d h1:B1lmAJBwWcCedN7cOUTBB15uFLLIzS6n4lz6YG1lG5s= -github.com/bobanetwork/op-erigon v1.9.7-0.20240815235925-b6707fc1b13d/go.mod h1:h05lMHT+MInwlt4irW+mqGlVcOXsZylDumgeiFvPPLw= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20240815235925-b6707fc1b13d h1:beQ6y47pwRM4jBBN22vBmT+IFoA6sJZzNuvgYdY6DSQ= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20240815235925-b6707fc1b13d/go.mod h1:2+pncCYFYSff2CSa6WAO3BtVh8OSVDoj8MgOU54DYyI= +github.com/bobanetwork/op-erigon v1.9.7-0.20240822225929-7c7d111bcc39 h1:YOu4fq4Sk9ybLy7cAQSArHisK5eE8TJlDK4+FlgYgcU= +github.com/bobanetwork/op-erigon v1.9.7-0.20240822225929-7c7d111bcc39/go.mod h1:x2EtETV3LVCQYaONP227/dC1KoFB2l028pP4c30TUb0= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20240822225929-7c7d111bcc39 h1:EEZ8fIeIZphA/6vQBKOJcFylje0dkNrGPntDeaiD+vQ= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20240822225929-7c7d111bcc39/go.mod h1:2+pncCYFYSff2CSa6WAO3BtVh8OSVDoj8MgOU54DYyI= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= @@ -221,8 +223,9 @@ github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBS github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= @@ -268,8 +271,8 @@ github.com/erigontech/mdbx-go v0.27.24 h1:jNsRE/4jC1F3S5SpAbmgT5jrEkfrdFk2MKEL9t github.com/erigontech/mdbx-go v0.27.24/go.mod h1:FAMxbOgqOnRDx51j8HjuJZIgznbDwjX7LItd+/UWyA4= github.com/erigontech/silkworm-go v0.18.0 h1:j56p61xZHBFhZGH1OixlGU8KcfjHzcw9pjAfjmVsOZA= github.com/erigontech/silkworm-go v0.18.0/go.mod h1:O50ux0apICEVEGyRWiE488K8qz8lc3PA/SXbQQAc8SU= -github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240315155522-09647974da0d h1:bFfj5iiIUazl+kZOucgf/oWAetPuD2B47O5qD7UCWkY= -github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240315155522-09647974da0d/go.mod h1:7xh2awFQqsiZxFrHKTgEd+InVfDRrkKVUIuK8SAFHp0= +github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240726164940-d2a098074a5d h1:oG3kUnMBGtUqPk9lrvsd1bDCdjRTyXhjpAbS7tr20hs= +github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240726164940-d2a098074a5d/go.mod h1:zy9f3TNPS7pwW4msMitF83fp0Wf452tZ6+Fg6d4JyXM= github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c h1:CndMRAH4JIwxbW8KYq6Q+cGWcGHz0FjGR3QqcInWcW0= github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -720,8 +723,9 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -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/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -969,8 +973,8 @@ golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1172,8 +1176,8 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -1190,8 +1194,9 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 43f863dbeeeaee274992572ebc66be032feaeae5 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Tue, 27 Aug 2024 10:16:26 -0700 Subject: [PATCH 2/4] Add boba devnet DFG --- .../deploy-config/boba-devnet.json | 81 +++++++++++++++++++ .../deployments/boba-devnet/11155111.json | 26 ++++++ .../scripts/deploy/FPUpgrade.s.sol | 8 +- 3 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 packages/contracts-bedrock/deploy-config/boba-devnet.json create mode 100644 packages/contracts-bedrock/deployments/boba-devnet/11155111.json diff --git a/packages/contracts-bedrock/deploy-config/boba-devnet.json b/packages/contracts-bedrock/deploy-config/boba-devnet.json new file mode 100644 index 000000000000..90c8125f0f76 --- /dev/null +++ b/packages/contracts-bedrock/deploy-config/boba-devnet.json @@ -0,0 +1,81 @@ +{ + "finalSystemOwner": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", + "portalGuardian": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", + "superchainConfigGuardian": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", + "controller": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", + + "l1StartingBlockTag": "0xb6404ecff691edd6895c474f4dfca5b3e27b92a19deabd80cbe05c75c1b4c924", + + "l1ChainID": 11155111, + "l1BlockTime": 12, + "l2ChainID": 288882, + "l2BlockTime": 2, + + "maxSequencerDrift": 600, + "sequencerWindowSize": 3600, + "channelTimeout": 300, + + "p2pSequencerAddress": "0x9e43BFCbcb21fCcc1Dfb41a3DaB1ACfaE3C03834", + "batchInboxAddress": "0xfFF0000000000000000000000000000000288882", + "batchSenderAddress": "0xe40d3fb61a6a9e16ffd17ae4ed225de00a4b16fd", + + "l2OutputOracleSubmissionInterval": 900, + "l2OutputOracleStartingBlockNumber": 0, + "l2OutputOracleStartingTimestamp": 1724692140, + + "l2OutputOracleProposer": "0x10aaf74a0735332b0ffb11935aba51f2a4170f91", + "l2OutputOracleChallenger": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", + + "finalizationPeriodSeconds": 12, + + "proxyAdminOwner": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", + "baseFeeVaultRecipient": "0x7Aa0289De18100Ca74E00F545480776E820aC8a6", + "l1FeeVaultRecipient": "0x7Aa0289De18100Ca74E00F545480776E820aC8a6", + "sequencerFeeVaultRecipient": "0x7Aa0289De18100Ca74E00F545480776E820aC8a6", + + "baseFeeVaultMinimumWithdrawalAmount": "0x0", + "l1FeeVaultMinimumWithdrawalAmount": "0x0", + "sequencerFeeVaultMinimumWithdrawalAmount": "0x0", + "baseFeeVaultWithdrawalNetwork": 0, + "l1FeeVaultWithdrawalNetwork": 0, + "sequencerFeeVaultWithdrawalNetwork": 0, + + "gasPriceOracleOverhead": 2100, + "gasPriceOracleScalar": 1000000, + + "enableGovernance": false, + "governanceTokenSymbol": "OP", + "governanceTokenName": "Optimism", + "governanceTokenOwner": "0x0000000000000000000000000000000000000000", + + "l2GenesisBlockGasLimit": "0x1C9C380", + "l2GenesisBlockBaseFeePerGas": "0xF4240", + + "eip1559Denominator": 50, + "eip1559Elasticity": 6, + "eip1559DenominatorCanyon": 250, + + "l1BobaTokenAddress": "0x33faF65b3DfcC6A1FccaD4531D9ce518F0FDc896", + + "requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000", + "recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000", + + "l2GenesisRegolithTimeOffset": "0x0", + "l2GenesisCanyonTimeOffset": "0x0", + + "systemConfigStartBlock": 5669592, + + "faultGameAbsolutePrestate": "0x038a20e1601a01b45f2f8084ad98b253c097fe6f2309356cad59930212874b30", + "faultGameMaxDepth": 73, + "faultGameClockExtension": 10800, + "faultGameMaxClockDuration": 302400, + "faultGameGenesisBlock": 42300, + "faultGameGenesisOutputRoot": "0x4bce13a3165c71d70aeaf3f4b52a873dde4ac32760ebdaa72f393001f1631d70", + "faultGameSplitDepth": 30, + "faultGameWithdrawalDelay": 604800, + "preimageOracleMinProposalSize": 126000, + "preimageOracleChallengePeriod": 86400, + "proofMaturityDelaySeconds": 604800, + "disputeGameFinalityDelaySeconds": 302400, + "respectedGameType": 0 +} diff --git a/packages/contracts-bedrock/deployments/boba-devnet/11155111.json b/packages/contracts-bedrock/deployments/boba-devnet/11155111.json new file mode 100644 index 000000000000..cb180547460d --- /dev/null +++ b/packages/contracts-bedrock/deployments/boba-devnet/11155111.json @@ -0,0 +1,26 @@ +{ + "AddressDeprecator": "0x889889C8b4Bd70436Fc1d8BF9e8b5C979B8C1aAf", + "L1CrossDomainMessenger": "0xDd38e7D39fe7c7bca0046AF82CE6a3116382A1FB", + "L1ERC721Bridge": "0xcD76a09fF8d39047247801b62C43Fc24Af8b6B4D", + "L1ERC721BridgeProxy": "0x57B679c04EAe2A9cee67414511E4A9f5a9F674E3", + "L1StandardBridge": "0xB10d743E3D9d7d429D8218dAc201AC13c520162b", + "L2OutputOracle": "0x658a608D677E0bAb677bA058d32DDC305371cc2E", + "L2OutputOracleProxy": "0xcFf51852d3E96912ea1cC8C6F12D6c86b0B37B4F", + "Lib_AddressManager": "0x69fF4875F7F4d1018f33b2a133F001e334359b02", + "OptimismMintableERC20Factory": "0x8C6D1ea504BdB7fd5BD5d90012C8d79D66C7d814", + "OptimismMintableERC20FactoryProxy": "0xd5C40568cB199cCc3bC6d4931742074225781686", + "OptimismPortal": "0xF47DcBb735337E9bc327e7d821485733FBc27204", + "OptimismPortalProxy": "0xD00d5Cc5620697a31014E5594AABba590793836D", + "PortalSender": "0x851F65a06DA4B86342D5F3b4C1524e0F3960A794", + "ProtocolVersions": "0x7FaB20bf6B47BC16a937329d0CE86A976B87Af7F", + "ProtocolVersionsProxy": "0x517E6adebE69eaD436E40b751A8743c748F1B54f", + "ProxyAdmin": "0xd7D6C90d94156dBd1251a57c28c7336F8B464C66", + "Proxy__OVM_L1CrossDomainMessenger": "0xA599581c9bfeE362B3CebA58F7888e7748B54Bc7", + "Proxy__OVM_L1StandardBridge": "0x9F10198e4c1e267757ca55ed29F028b8cD7Ee76D", + "SuperchainConfig": "0x655601F3229DC6a607b3aD81F42ebB449ee2B40C", + "SuperchainConfigProxy": "0x59230BEeaF4225B1E2C4ED391592c8962bb97ba4", + "SystemConfig": "0x4920a614aF36F3362D02220075624AD9ac2F87CB", + "SystemConfigProxy": "0xcc3c025036612B849340D6866eC0bd4d2d794a36", + "SystemDictator": "0xf1e2dc27E6D23Dd177CACE8922D735718051aAD0", + "SystemDictatorProxy": "0x4F1B03A4D1d4c5122b8eA8D79384cba26aA16BF1" +} diff --git a/packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol b/packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol index 6a188effb097..3312f74b9576 100644 --- a/packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol +++ b/packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol @@ -53,12 +53,12 @@ contract Deploy is Deployer { /// @notice read proxyd address from the hardhat deployment files function readProxyAddress(string memory _contractName) internal view returns (address _proxyAddress) { - string memory _hardhatDeploymentPath = vm.envOr("HARDHAT_DEPLOYMENT_PATH", string("")); + string memory _deploymentPath = vm.envOr("DEPLOYMENT_PATH", string("")); require( - bytes(_hardhatDeploymentPath).length > 0, - "Deploy: must set HARDHAT_DEPLOYMENT_PATH to filesystem path of hardhat deployment files" + bytes(_deploymentPath).length > 0, + "Deploy: must set DEPLOYMENT_PATH to deployment files" ); - string memory _contractJson = vm.readFile(_hardhatDeploymentPath); + string memory _contractJson = vm.readFile(_deploymentPath); bytes memory _contractAddress = stdJson.parseRaw(_contractJson, string(abi.encodePacked(".", _contractName))); _proxyAddress = bytesToAddress(_contractAddress); } From 7a2715d13ee60db18453fc1df10c9b1c98f444be Mon Sep 17 00:00:00 2001 From: cby3149 Date: Tue, 27 Aug 2024 11:15:48 -0700 Subject: [PATCH 3/4] Add DFG deployment --- .../contracts-bedrock/deploy-config/boba-devnet.json | 4 ++-- .../deployments/boba-devnet/11155111.json | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/contracts-bedrock/deploy-config/boba-devnet.json b/packages/contracts-bedrock/deploy-config/boba-devnet.json index 90c8125f0f76..67508601ce72 100644 --- a/packages/contracts-bedrock/deploy-config/boba-devnet.json +++ b/packages/contracts-bedrock/deploy-config/boba-devnet.json @@ -69,8 +69,8 @@ "faultGameMaxDepth": 73, "faultGameClockExtension": 10800, "faultGameMaxClockDuration": 302400, - "faultGameGenesisBlock": 42300, - "faultGameGenesisOutputRoot": "0x4bce13a3165c71d70aeaf3f4b52a873dde4ac32760ebdaa72f393001f1631d70", + "faultGameGenesisBlock": 44100, + "faultGameGenesisOutputRoot": "0xace7216028e6d6265ee6bed298efd7e85b069c6d39cab89cdfb14540b2398d37", "faultGameSplitDepth": 30, "faultGameWithdrawalDelay": 604800, "preimageOracleMinProposalSize": 126000, diff --git a/packages/contracts-bedrock/deployments/boba-devnet/11155111.json b/packages/contracts-bedrock/deployments/boba-devnet/11155111.json index cb180547460d..87859862eb72 100644 --- a/packages/contracts-bedrock/deployments/boba-devnet/11155111.json +++ b/packages/contracts-bedrock/deployments/boba-devnet/11155111.json @@ -22,5 +22,14 @@ "SystemConfig": "0x4920a614aF36F3362D02220075624AD9ac2F87CB", "SystemConfigProxy": "0xcc3c025036612B849340D6866eC0bd4d2d794a36", "SystemDictator": "0xf1e2dc27E6D23Dd177CACE8922D735718051aAD0", - "SystemDictatorProxy": "0x4F1B03A4D1d4c5122b8eA8D79384cba26aA16BF1" + "SystemDictatorProxy": "0x4F1B03A4D1d4c5122b8eA8D79384cba26aA16BF1", + "AnchorStateRegistry": "0x19B78bCf6A00073aCe3dD9242b027B38584BcB96", + "AnchorStateRegistryProxy": "0x4e47a89E4e6767602631E4d0aC9322A732ca44a1", + "DelayedWETH": "0x6E96d22af5eb35176C85E118331423C087a97Fad", + "DelayedWETHProxy": "0xFb121744B10EBBD8902dcb533D0dEaF6b7E7124a", + "DisputeGameFactory": "0xF4b393a18aAdb5716713285ACa1485aAc0fD2Ad6", + "DisputeGameFactoryProxy": "0x87716cf707a9E965a25B0C16079E4f1Bd43C3F21", + "Mips": "0x1c6716fcd8a07d336D64F6a0ebc67c05aa80b00F", + "OptimismPortal2": "0x7E32C38176e60Fc5EB3B7927d81c965308317970", + "PreimageOracle": "0xB247651eAF116dbbf30669f30Fae0BdB3F51Ef51" } From 080fed0edda1c5c3b58cb6faa0a7a7b04102acb1 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Tue, 27 Aug 2024 13:55:54 -0700 Subject: [PATCH 4/4] Fix unit tests --- packages/contracts-bedrock/deploy-config/boba-devnet.json | 2 -- packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/contracts-bedrock/deploy-config/boba-devnet.json b/packages/contracts-bedrock/deploy-config/boba-devnet.json index 67508601ce72..8571216a040a 100644 --- a/packages/contracts-bedrock/deploy-config/boba-devnet.json +++ b/packages/contracts-bedrock/deploy-config/boba-devnet.json @@ -1,8 +1,6 @@ { "finalSystemOwner": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", - "portalGuardian": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", "superchainConfigGuardian": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", - "controller": "0xe62B0E3a9F715493301eBdEC8310C899eae5b30c", "l1StartingBlockTag": "0xb6404ecff691edd6895c474f4dfca5b3e27b92a19deabd80cbe05c75c1b4c924", diff --git a/packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol b/packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol index 3312f74b9576..2456978b208c 100644 --- a/packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol +++ b/packages/contracts-bedrock/scripts/deploy/FPUpgrade.s.sol @@ -54,10 +54,7 @@ contract Deploy is Deployer { /// @notice read proxyd address from the hardhat deployment files function readProxyAddress(string memory _contractName) internal view returns (address _proxyAddress) { string memory _deploymentPath = vm.envOr("DEPLOYMENT_PATH", string("")); - require( - bytes(_deploymentPath).length > 0, - "Deploy: must set DEPLOYMENT_PATH to deployment files" - ); + require(bytes(_deploymentPath).length > 0, "Deploy: must set DEPLOYMENT_PATH to deployment files"); string memory _contractJson = vm.readFile(_deploymentPath); bytes memory _contractAddress = stdJson.parseRaw(_contractJson, string(abi.encodePacked(".", _contractName))); _proxyAddress = bytesToAddress(_contractAddress);