From fac8982e57b6476a7b5f523060bbd2f6aad96189 Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Tue, 30 Jul 2024 16:50:41 -0400 Subject: [PATCH] feat(lib/netconf): update omega version (#1617) Backports 1616 in preparation for omega deployment issue: none --- e2e/app/run.go | 5 ++++- .../testdata/TestContractAddressReference.golden | 6 +++--- lib/netconf/static.go | 10 ++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/e2e/app/run.go b/e2e/app/run.go index 5caa09b2c..2784cab7b 100644 --- a/e2e/app/run.go +++ b/e2e/app/run.go @@ -11,6 +11,7 @@ import ( "github.com/omni-network/omni/lib/errors" "github.com/omni-network/omni/lib/k1util" "github.com/omni-network/omni/lib/log" + "github.com/omni-network/omni/lib/netconf" e2e "github.com/cometbft/cometbft/test/e2e/pkg" @@ -46,7 +47,9 @@ type DeployConfig struct { // Deploy a new e2e network. It also starts all services in order to deploy private portals. // It also returns an optional deployed ping pong contract is enabled. func Deploy(ctx context.Context, def Definition, cfg DeployConfig) (*pingpong.XDapp, error) { - if def.Testnet.Network.IsProtected() { + if def.Testnet.Network == netconf.Omega { + log.Warn(ctx, "Temporarily allowing protected network deploy, remove this after success", nil) + } else if def.Testnet.Network.IsProtected() { // If a protected network needs to be deployed temporarily comment out this check. return nil, errors.New("cannot deploy protected network", "network", def.Testnet.Network) } diff --git a/lib/contracts/testdata/TestContractAddressReference.golden b/lib/contracts/testdata/TestContractAddressReference.golden index 44dff3053..172497319 100644 --- a/lib/contracts/testdata/TestContractAddressReference.golden +++ b/lib/contracts/testdata/TestContractAddressReference.golden @@ -9,8 +9,8 @@ "omega": { "avs": "0xa7b2e7830c51728832d33421670dbbe30299fd92", "create3": "0x4bf2e538446b3faa2c439a4f8867a9052db8f1d0", - "l1bridge": "0x31a41add05110e92f4f323b8fadafe5eeba3965b", - "portal": "0x0eeaa62754a0628c062f45bd7605e57a9d3e3813", - "token": "0x764260d0a103692008e48ed60c3b3a017fd8fbae" + "l1bridge": "0x21abb45dcdceed997e2a6f7af80ea1c5cafafff6", + "portal": "0x1ce5094ee8b861674d3ad0da116d90592193c7d9", + "token": "0x21d1b3793bc3eebe2ce6aae2535315bdbd1e54c9" } } \ No newline at end of file diff --git a/lib/netconf/static.go b/lib/netconf/static.go index 8a486e8bf..fc1f5fe4c 100644 --- a/lib/netconf/static.go +++ b/lib/netconf/static.go @@ -132,7 +132,6 @@ var runid = uuid.New().String() var ( omegaAVS = common.HexToAddress("0xa7b2e7830C51728832D33421670DbBE30299fD92") mainnetAVS = common.HexToAddress("0xed2f4d90b073128ae6769a9A8D51547B1Df766C8") - omegaPortal = common.HexToAddress("0x0eEaA62754A0628C062F45bd7605E57a9d3e3813") mainnetToken = common.HexToAddress("0x36e66fbbce51e4cd5bd3c62b637eb411b18949d4") //go:embed omega/consensus-genesis.json @@ -178,16 +177,11 @@ var statics = map[ID]Static{ }, Omega: { Network: Omega, - Version: "v0.0.8", + Version: "v0.0.9", AVSContractAddress: omegaAVS, OmniExecutionChainID: evmchain.IDOmniOmega, MaxValidators: maxValidators, - Portals: []Deployment{ - {ChainID: evmchain.IDArbSepolia, Address: omegaPortal, DeployHeight: 64990937}, - {ChainID: evmchain.IDBaseSepolia, Address: omegaPortal, DeployHeight: 12808134}, - {ChainID: evmchain.IDHolesky, Address: omegaPortal, DeployHeight: 1958423}, - {ChainID: evmchain.IDOpSepolia, Address: omegaPortal, DeployHeight: 14791006}, - }, + Portals: nil, ConsensusGenesisJSON: omegaConsensusGenesisJSON, ConsensusSeedTXT: omegaConsensusSeedsTXT, ExecutionGenesisJSON: omegaExecutionGenesisJSON,