From 5c1b9500df84dab60fc571854edb12721ffecc65 Mon Sep 17 00:00:00 2001 From: Kevin Halliday Date: Tue, 30 Jul 2024 19:45:47 -0400 Subject: [PATCH] chore(e2e): post omega deploy updates (#1619) Backport 1618. Update netconf static, disable redeploy issue: none --- e2e/app/run.go | 5 +-- lib/netconf/omega/consensus-genesis.json | 39 +++++++++++++----------- lib/netconf/omega/execution-genesis.json | 32 ++++++++++++++++++- lib/netconf/static.go | 8 ++++- 4 files changed, 60 insertions(+), 24 deletions(-) diff --git a/e2e/app/run.go b/e2e/app/run.go index 2784cab7b..5caa09b2c 100644 --- a/e2e/app/run.go +++ b/e2e/app/run.go @@ -11,7 +11,6 @@ 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" @@ -47,9 +46,7 @@ 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 == netconf.Omega { - log.Warn(ctx, "Temporarily allowing protected network deploy, remove this after success", nil) - } else if def.Testnet.Network.IsProtected() { + 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/netconf/omega/consensus-genesis.json b/lib/netconf/omega/consensus-genesis.json index fc440eb8e..affb30363 100644 --- a/lib/netconf/omega/consensus-genesis.json +++ b/lib/netconf/omega/consensus-genesis.json @@ -1,5 +1,5 @@ { - "genesis_time": "2024-07-19T10:23:06.336657033Z", + "genesis_time": "2024-07-30T21:08:41.889190944Z", "chain_id": "omni-1000164", "initial_height": "1", "consensus_params": { @@ -37,28 +37,28 @@ "accounts": [ { "@type": "/cosmos.auth.v1beta1.BaseAccount", - "address": "omni1nr43xdcup9vstxzumh5nwqvgs82d0u3fz8qsex", + "address": "omni1ee3yeew9w9ak8nkndtahdpt3s0s23fhta7q437", "pub_key": null, "account_number": "0", "sequence": "0" }, { "@type": "/cosmos.auth.v1beta1.BaseAccount", - "address": "omni1a9k0ntv3e4kujyvpwcpalv7xt404x2u4aca2s7", + "address": "omni1nr43xdcup9vstxzumh5nwqvgs82d0u3fz8qsex", "pub_key": null, "account_number": "1", "sequence": "0" }, { "@type": "/cosmos.auth.v1beta1.BaseAccount", - "address": "omni1m0fx56zak3r4kmzc4hkqmcrvdm3c064gfs7af7", + "address": "omni1a9k0ntv3e4kujyvpwcpalv7xt404x2u4aca2s7", "pub_key": null, "account_number": "2", "sequence": "0" }, { "@type": "/cosmos.auth.v1beta1.BaseAccount", - "address": "omni1ee3yeew9w9ak8nkndtahdpt3s0s23fhta7q437", + "address": "omni1m0fx56zak3r4kmzc4hkqmcrvdm3c064gfs7af7", "pub_key": null, "account_number": "3", "sequence": "0" @@ -136,8 +136,11 @@ "delegator_starting_infos": [], "validator_slash_events": [] }, + "evidence": { + "evidence": [] + }, "evmengine": { - "execution_block_hash": "przNQhqMFSlkzHopPBV/djpwtdfUR2z+n1TydqL0kz4=" + "execution_block_hash": "Pb5UTGGgwAc843qvzzuN4cYbZEB+5Z03UvhroeJ5PK8=" }, "genutil": { "gen_txs": [ @@ -147,7 +150,7 @@ { "@type": "/cosmos.staking.v1beta1.MsgCreateValidator", "description": { - "moniker": "0x98Eb13371c095905985cddE937018881d4D7f229", + "moniker": "0xCE624ce5C5717b63CED36AfB76857183E0a8a6eb", "identity": "", "website": "", "security_contact": "", @@ -160,10 +163,10 @@ }, "min_self_delegation": "1000000000000000000", "delegator_address": "", - "validator_address": "omnivaloper1nr43xdcup9vstxzumh5nwqvgs82d0u3fyythw5", + "validator_address": "omnivaloper1ee3yeew9w9ak8nkndtahdpt3s0s23fhtmatjxv", "pubkey": { "@type": "/cosmos.crypto.secp256k1.PubKey", - "key": "A/n6M8nhAsztDoEah6U3Rxu6ldIfx3UwQHBTKrB3VRRR" + "key": "AqeIcvxp8vvmr2iqe0ZI419i10vjL8MJWihf0ziv6/0W" }, "value": { "denom": "stake", @@ -194,7 +197,7 @@ { "@type": "/cosmos.staking.v1beta1.MsgCreateValidator", "description": { - "moniker": "0xe96cF9Ad91cD6dc911817603Dfb3c65d5f532B95", + "moniker": "0x98Eb13371c095905985cddE937018881d4D7f229", "identity": "", "website": "", "security_contact": "", @@ -207,10 +210,10 @@ }, "min_self_delegation": "1000000000000000000", "delegator_address": "", - "validator_address": "omnivaloper1a9k0ntv3e4kujyvpwcpalv7xt404x2u4mmkd8v", + "validator_address": "omnivaloper1nr43xdcup9vstxzumh5nwqvgs82d0u3fyythw5", "pubkey": { "@type": "/cosmos.crypto.secp256k1.PubKey", - "key": "A2XSABhzVvWkZ02FDFtE5Ntu1SKQBTbDaMrmoGFoOQCm" + "key": "A/n6M8nhAsztDoEah6U3Rxu6ldIfx3UwQHBTKrB3VRRR" }, "value": { "denom": "stake", @@ -241,7 +244,7 @@ { "@type": "/cosmos.staking.v1beta1.MsgCreateValidator", "description": { - "moniker": "0xdBd26a685DB4475b6c58ADEC0DE06c6eE387EAa8", + "moniker": "0xe96cF9Ad91cD6dc911817603Dfb3c65d5f532B95", "identity": "", "website": "", "security_contact": "", @@ -254,10 +257,10 @@ }, "min_self_delegation": "1000000000000000000", "delegator_address": "", - "validator_address": "omnivaloper1m0fx56zak3r4kmzc4hkqmcrvdm3c064g0n467v", + "validator_address": "omnivaloper1a9k0ntv3e4kujyvpwcpalv7xt404x2u4mmkd8v", "pubkey": { "@type": "/cosmos.crypto.secp256k1.PubKey", - "key": "A1/pZXRYCcNGiLYL2B6Qkg2gUplrR7dp4dkTq9P40DdN" + "key": "A2XSABhzVvWkZ02FDFtE5Ntu1SKQBTbDaMrmoGFoOQCm" }, "value": { "denom": "stake", @@ -288,7 +291,7 @@ { "@type": "/cosmos.staking.v1beta1.MsgCreateValidator", "description": { - "moniker": "0xCE624ce5C5717b63CED36AfB76857183E0a8a6eb", + "moniker": "0xdBd26a685DB4475b6c58ADEC0DE06c6eE387EAa8", "identity": "", "website": "", "security_contact": "", @@ -301,10 +304,10 @@ }, "min_self_delegation": "1000000000000000000", "delegator_address": "", - "validator_address": "omnivaloper1ee3yeew9w9ak8nkndtahdpt3s0s23fhtmatjxv", + "validator_address": "omnivaloper1m0fx56zak3r4kmzc4hkqmcrvdm3c064g0n467v", "pubkey": { "@type": "/cosmos.crypto.secp256k1.PubKey", - "key": "AqeIcvxp8vvmr2iqe0ZI419i10vjL8MJWihf0ziv6/0W" + "key": "A1/pZXRYCcNGiLYL2B6Qkg2gUplrR7dp4dkTq9P40DdN" }, "value": { "denom": "stake", diff --git a/lib/netconf/omega/execution-genesis.json b/lib/netconf/omega/execution-genesis.json index 3bc2d51fa..6bed20b1b 100644 --- a/lib/netconf/omega/execution-genesis.json +++ b/lib/netconf/omega/execution-genesis.json @@ -10729,6 +10729,9 @@ "balance": "0x0", "nonce": "0x1" }, + "24d2f0e25e1a321b1dfe2fab5936907047cefc97": { + "balance": "0xd3c21bcecceda1000000" + }, "24de2aedd6c9391ec5bdf0628b8b41c5024becf1": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -11911,6 +11914,9 @@ "balance": "0x0", "nonce": "0x1" }, + "371a5561c150c1ac051f3c190e4072f56b251ce6": { + "balance": "0xd3c21bcecceda1000000" + }, "373809f90a2390a2f02ea2926e38e75dbbf92ae9": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -13125,6 +13131,9 @@ "balance": "0x0", "nonce": "0x1" }, + "4a5eb30afed3ed1a5eab5bb95d5e6769ff1bc44e": { + "balance": "0xd3c21bcecceda1000000" + }, "4a962184aa34c9bf99c82854863231f601058b46": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -14946,6 +14955,9 @@ "balance": "0x0", "nonce": "0x1" }, + "64bc5a64713d4642c38a4e6521b0fa6f293ed85b": { + "balance": "0xd3c21bcecceda1000000" + }, "64f36e17a6f1e24394aceaec8e38e53499253289": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -16231,6 +16243,9 @@ "balance": "0x0", "nonce": "0x1" }, + "78b223a22000f65033e1422a623cc3d6b566c3e8": { + "balance": "0xd3c21bcecceda1000000" + }, "78dabdeca3215bf1f025cf6e1859d4da2dbbc74e": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -16346,6 +16361,9 @@ "7a6cf389082dc698285474976d7c75cade08ab7e": { "balance": "0xd3c21bcecceda1000000" }, + "7aaa75265052bfce2a4910a4f50b68939e157fbd": { + "balance": "0xd3c21bcecceda1000000" + }, "7ab040910dc9b23d3b04e1dbafa70c29b98b5f54": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -16863,6 +16881,9 @@ "balance": "0x0", "nonce": "0x1" }, + "815ba064f72667b11da226201991a2106c6f4ae0": { + "balance": "0xd3c21bcecceda1000000" + }, "81b62a1033ebeb8b071ad9f78cc42fcc31ba8542": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -19670,6 +19691,9 @@ "balance": "0x0", "nonce": "0x1" }, + "ad5c6124305ab7f0101ec2e3bc9c2a5ec06e3594": { + "balance": "0xd3c21bcecceda1000000" + }, "ad5f4fbba56de9de75cb8c4f349d8e84e6d94311": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -19702,6 +19726,9 @@ "balance": "0x0", "nonce": "0x1" }, + "ae2927bfebf272a74340fc99d23d002035e5a0ea": { + "balance": "0xd3c21bcecceda1000000" + }, "ae6673e2cbe1d87feae1a56ddecb59cc120179e8": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -21137,6 +21164,9 @@ "balance": "0x0", "nonce": "0x1" }, + "c4c6abedf3c585c5efd755cb6591c92aa6e66079": { + "balance": "0xd3c21bcecceda1000000" + }, "c4f5514a8f720c7ea19111806207a78b246ee169": { "code": "0x60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea26469706673582212204e6c3564458e40536cebf1d675d2ad7af11c5352eae442784c5e053dcf005af164736f6c63430008180033", "storage": { @@ -31656,7 +31686,7 @@ "nonce": "0x1" }, "ede1dbfffffffffffffffffffffffffffffffffd": { - "code": "0x6080604052600436106100f35760003560e01c80638fdcb4c91161008a578063c4d66de811610059578063c4d66de8146102c2578063d9caed12146102e2578063f2fde38b14610302578063f35ea5571461032257600080fd5b80638fdcb4c914610259578063969b53da146102705780639c5451b014610290578063c3de453d146102af57600080fd5b80633abfe55f116100c65780633abfe55f146101ba578063402914f5146101da578063715018a6146102075780638da5cb5b1461021c57600080fd5b806312622e5b146100f85780631e83409a1461013557806323b051d91461015757806339acf9f11461017b575b600080fd5b34801561010457600080fd5b50600054610118906001600160401b031681565b6040516001600160401b0390911681526020015b60405180910390f35b34801561014157600080fd5b50610155610150366004610ef5565b610342565b005b34801561016357600080fd5b5061016d60015481565b60405190815260200161012c565b34801561018757600080fd5b506000546101a290600160401b90046001600160a01b031681565b6040516001600160a01b03909116815260200161012c565b3480156101c657600080fd5b5061016d6101d5366004610f19565b61063b565b3480156101e657600080fd5b5061016d6101f5366004610ef5565b60036020526000908152604090205481565b34801561021357600080fd5b5061015561070b565b34801561022857600080fd5b507f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c199300546001600160a01b03166101a2565b34801561026557600080fd5b50610118620124f881565b34801561027c57600080fd5b506002546101a2906001600160a01b031681565b34801561029c57600080fd5b5061016d6a52b7d2dcc80cd2e400000081565b6101556102bd366004610f19565b61071f565b3480156102ce57600080fd5b506101556102dd366004610ef5565b61072d565b3480156102ee57600080fd5b506101556102fd366004610f45565b61083b565b34801561030e57600080fd5b5061015561031d366004610ef5565b610aa2565b34801561032e57600080fd5b5061015561033d366004610f9b565b610ae0565b60008060089054906101000a90046001600160a01b03166001600160a01b0316632f32700e6040518163ffffffff1660e01b81526004016040805180830381865afa158015610395573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b99190610fe6565b600054909150600160401b90046001600160a01b0316331461041a5760405162461bcd60e51b815260206004820152601560248201527413db5b9a509c9a5919d94e881b9bdd081e18d85b1b605a1b60448201526064015b60405180910390fd5b60005481516001600160401b0390811691161461046e5760405162461bcd60e51b81526020600482015260126024820152714f6d6e694272696467653a206e6f74204c3160701b6044820152606401610411565b6001600160a01b0382166104c45760405162461bcd60e51b815260206004820152601c60248201527f4f6d6e694272696467653a206e6f20636c61696d20746f207a65726f000000006044820152606401610411565b6020808201516001600160a01b038116600090815260039092526040909120546105305760405162461bcd60e51b815260206004820152601c60248201527f4f6d6e694272696467653a206e6f7468696e6720746f20636c61696d000000006044820152606401610411565b6001600160a01b038181166000908152600360205260408082208054908390559051909286169083908381818185875af1925050503d8060008114610591576040519150601f19603f3d011682016040523d82523d6000602084013e610596565b606091505b50509050806105e75760405162461bcd60e51b815260206004820152601b60248201527f4f6d6e694272696467653a207472616e73666572206661696c656400000000006044820152606401610411565b846001600160a01b0316836001600160a01b03167ff7a40077ff7a04c7e61f6f26fb13774259ddf1b6bce9ecf26a8276cdd39926838460405161062c91815260200190565b60405180910390a35050505050565b60008054604080516001600160a01b038681166024830152604480830187905283518084039091018152606490920183526020820180516001600160e01b031663f3fef3a360e01b1790529151632376548f60e21b8152600160401b840490921692638dd9523c926106c1926001600160401b039092169190620124f890600401611098565b602060405180830381865afa1580156106de573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070291906110ce565b90505b92915050565b610713610b37565b61071d6000610b92565b565b6107298282610c03565b5050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff1615906001600160401b03166000811580156107725750825b90506000826001600160401b0316600114801561078e5750303b155b90508115801561079c575080155b156107ba5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156107e457845460ff60401b1916600160401b1785555b6107ed86610e7e565b831561083357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b60008060089054906101000a90046001600160a01b03166001600160a01b0316632f32700e6040518163ffffffff1660e01b81526004016040805180830381865afa15801561088e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b29190610fe6565b600054909150600160401b90046001600160a01b0316331461090e5760405162461bcd60e51b815260206004820152601560248201527413db5b9a509c9a5919d94e881b9bdd081e18d85b1b605a1b6044820152606401610411565b60025460208201516001600160a01b039081169116146109695760405162461bcd60e51b81526020600482015260166024820152754f6d6e694272696467653a206e6f742062726964676560501b6044820152606401610411565b60005481516001600160401b039081169116146109bd5760405162461bcd60e51b81526020600482015260126024820152714f6d6e694272696467653a206e6f74204c3160701b6044820152606401610411565b81600160008282546109cf91906110fd565b90915550506040516000906001600160a01b0385169084908381818185875af1925050503d8060008114610a1f576040519150601f19603f3d011682016040523d82523d6000602084013e610a24565b606091505b5050905080610a5b576001600160a01b03851660009081526003602052604081208054859290610a559084906110fd565b90915550505b6040805184815282151560208201526001600160a01b0380871692908816917f2b664ab52fe561d3ace376046aea39744dd736ec1f67d89d504ffd2192825f61910161062c565b610aaa610b37565b6001600160a01b038116610ad457604051631e4fbdf760e01b815260006004820152602401610411565b610add81610b92565b50565b610ae8610b37565b600080546001600160401b03949094166001600160e01b031990941693909317600160401b6001600160a01b039384160217909255600280546001600160a01b03191692909116919091179055565b33610b697f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c199300546001600160a01b031690565b6001600160a01b03161461071d5760405163118cdaa760e01b8152336004820152602401610411565b7f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c19930080546001600160a01b031981166001600160a01b03848116918217845560405192169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3505050565b6001600160a01b038216610c595760405162461bcd60e51b815260206004820152601d60248201527f4f6d6e694272696467653a206e6f2062726964676520746f207a65726f0000006044820152606401610411565b60008111610ca95760405162461bcd60e51b815260206004820152601e60248201527f4f6d6e694272696467653a20616d6f756e74206d757374206265203e203000006044820152606401610411565b600154811115610cfb5760405162461bcd60e51b815260206004820152601860248201527f4f6d6e694272696467653a206e6f206c697175696469747900000000000000006044820152606401610411565b6000610d07838361063b565b9050610d1381836110fd565b3414610d615760405162461bcd60e51b815260206004820152601b60248201527f4f6d6e694272696467653a20696e636f72726563742066756e647300000000006044820152606401610411565b8160016000828254610d739190611110565b9091555050600054600254604080516001600160a01b038781166024830152604480830188905283518084039091018152606490920183526020820180516001600160e01b031663f3fef3a360e01b179052915163c21dda4f60e01b8152600160401b850483169463c21dda4f948794610e07946001600160401b03909316936004939190921691620124f8908401611123565b6000604051808303818588803b158015610e2057600080fd5b505af1158015610e34573d6000803e3d6000fd5b50506040518581526001600160a01b03871693503392507f59bc8a913d49a9626dd6ba5def7fcf12804061c1bb9b8b6db077e1a12cb4b422915060200160405180910390a3505050565b610e86610e8f565b610add81610ed8565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661071d57604051631afcd79f60e31b815260040160405180910390fd5b610aaa610e8f565b6001600160a01b0381168114610add57600080fd5b600060208284031215610f0757600080fd5b8135610f1281610ee0565b9392505050565b60008060408385031215610f2c57600080fd5b8235610f3781610ee0565b946020939093013593505050565b600080600060608486031215610f5a57600080fd5b8335610f6581610ee0565b92506020840135610f7581610ee0565b929592945050506040919091013590565b6001600160401b0381168114610add57600080fd5b600080600060608486031215610fb057600080fd5b8335610fbb81610f86565b92506020840135610fcb81610ee0565b91506040840135610fdb81610ee0565b809150509250925092565b600060408284031215610ff857600080fd5b604051604081018181106001600160401b038211171561102857634e487b7160e01b600052604160045260246000fd5b604052825161103681610f86565b8152602083015161104681610ee0565b60208201529392505050565b6000815180845260005b818110156110785760208185018101518683018201520161105c565b506000602082860101526020601f19601f83011685010191505092915050565b60006001600160401b038086168352606060208401526110bb6060840186611052565b9150808416604084015250949350505050565b6000602082840312156110e057600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820180821115610705576107056110e7565b81810381811115610705576107056110e7565b60006001600160401b03808816835260ff8716602084015260018060a01b038616604084015260a0606084015261115d60a0840186611052565b9150808416608084015250969550505050505056fea26469706673582212202127fbeb2bd2bec9c924d9c3b0ec2ae0e2b3bf00707a8315dc7c4014a5e34ba364736f6c63430008180033", + "code": "0x6080604052600436106100f35760003560e01c80638fdcb4c91161008a578063c4d66de811610059578063c4d66de8146102c2578063d9caed12146102e2578063f2fde38b14610302578063f35ea5571461032257600080fd5b80638fdcb4c914610259578063969b53da146102705780639c5451b014610290578063c3de453d146102af57600080fd5b80633abfe55f116100c65780633abfe55f146101ba578063402914f5146101da578063715018a6146102075780638da5cb5b1461021c57600080fd5b806312622e5b146100f85780631e83409a1461013557806323b051d91461015757806339acf9f11461017b575b600080fd5b34801561010457600080fd5b50600054610118906001600160401b031681565b6040516001600160401b0390911681526020015b60405180910390f35b34801561014157600080fd5b50610155610150366004610ef5565b610342565b005b34801561016357600080fd5b5061016d60015481565b60405190815260200161012c565b34801561018757600080fd5b506000546101a290600160401b90046001600160a01b031681565b6040516001600160a01b03909116815260200161012c565b3480156101c657600080fd5b5061016d6101d5366004610f19565b61063b565b3480156101e657600080fd5b5061016d6101f5366004610ef5565b60036020526000908152604090205481565b34801561021357600080fd5b5061015561070b565b34801561022857600080fd5b507f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c199300546001600160a01b03166101a2565b34801561026557600080fd5b50610118620124f881565b34801561027c57600080fd5b506002546101a2906001600160a01b031681565b34801561029c57600080fd5b5061016d6a52b7d2dcc80cd2e400000081565b6101556102bd366004610f19565b61071f565b3480156102ce57600080fd5b506101556102dd366004610ef5565b61072d565b3480156102ee57600080fd5b506101556102fd366004610f45565b61083b565b34801561030e57600080fd5b5061015561031d366004610ef5565b610aa2565b34801561032e57600080fd5b5061015561033d366004610f9b565b610ae0565b60008060089054906101000a90046001600160a01b03166001600160a01b0316632f32700e6040518163ffffffff1660e01b81526004016040805180830381865afa158015610395573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b99190610fe6565b600054909150600160401b90046001600160a01b0316331461041a5760405162461bcd60e51b815260206004820152601560248201527413db5b9a509c9a5919d94e881b9bdd081e18d85b1b605a1b60448201526064015b60405180910390fd5b60005481516001600160401b0390811691161461046e5760405162461bcd60e51b81526020600482015260126024820152714f6d6e694272696467653a206e6f74204c3160701b6044820152606401610411565b6001600160a01b0382166104c45760405162461bcd60e51b815260206004820152601c60248201527f4f6d6e694272696467653a206e6f20636c61696d20746f207a65726f000000006044820152606401610411565b6020808201516001600160a01b038116600090815260039092526040909120546105305760405162461bcd60e51b815260206004820152601c60248201527f4f6d6e694272696467653a206e6f7468696e6720746f20636c61696d000000006044820152606401610411565b6001600160a01b038181166000908152600360205260408082208054908390559051909286169083908381818185875af1925050503d8060008114610591576040519150601f19603f3d011682016040523d82523d6000602084013e610596565b606091505b50509050806105e75760405162461bcd60e51b815260206004820152601b60248201527f4f6d6e694272696467653a207472616e73666572206661696c656400000000006044820152606401610411565b846001600160a01b0316836001600160a01b03167ff7a40077ff7a04c7e61f6f26fb13774259ddf1b6bce9ecf26a8276cdd39926838460405161062c91815260200190565b60405180910390a35050505050565b60008054604080516001600160a01b038681166024830152604480830187905283518084039091018152606490920183526020820180516001600160e01b031663f3fef3a360e01b1790529151632376548f60e21b8152600160401b840490921692638dd9523c926106c1926001600160401b039092169190620124f890600401611098565b602060405180830381865afa1580156106de573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070291906110ce565b90505b92915050565b610713610b37565b61071d6000610b92565b565b6107298282610c03565b5050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff1615906001600160401b03166000811580156107725750825b90506000826001600160401b0316600114801561078e5750303b155b90508115801561079c575080155b156107ba5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156107e457845460ff60401b1916600160401b1785555b6107ed86610e7e565b831561083357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b60008060089054906101000a90046001600160a01b03166001600160a01b0316632f32700e6040518163ffffffff1660e01b81526004016040805180830381865afa15801561088e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b29190610fe6565b600054909150600160401b90046001600160a01b0316331461090e5760405162461bcd60e51b815260206004820152601560248201527413db5b9a509c9a5919d94e881b9bdd081e18d85b1b605a1b6044820152606401610411565b60025460208201516001600160a01b039081169116146109695760405162461bcd60e51b81526020600482015260166024820152754f6d6e694272696467653a206e6f742062726964676560501b6044820152606401610411565b60005481516001600160401b039081169116146109bd5760405162461bcd60e51b81526020600482015260126024820152714f6d6e694272696467653a206e6f74204c3160701b6044820152606401610411565b81600160008282546109cf91906110fd565b90915550506040516000906001600160a01b0385169084908381818185875af1925050503d8060008114610a1f576040519150601f19603f3d011682016040523d82523d6000602084013e610a24565b606091505b5050905080610a5b576001600160a01b03851660009081526003602052604081208054859290610a559084906110fd565b90915550505b6040805184815282151560208201526001600160a01b0380871692908816917f2b664ab52fe561d3ace376046aea39744dd736ec1f67d89d504ffd2192825f61910161062c565b610aaa610b37565b6001600160a01b038116610ad457604051631e4fbdf760e01b815260006004820152602401610411565b610add81610b92565b50565b610ae8610b37565b600080546001600160401b03949094166001600160e01b031990941693909317600160401b6001600160a01b039384160217909255600280546001600160a01b03191692909116919091179055565b33610b697f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c199300546001600160a01b031690565b6001600160a01b03161461071d5760405163118cdaa760e01b8152336004820152602401610411565b7f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c19930080546001600160a01b031981166001600160a01b03848116918217845560405192169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3505050565b6001600160a01b038216610c595760405162461bcd60e51b815260206004820152601d60248201527f4f6d6e694272696467653a206e6f2062726964676520746f207a65726f0000006044820152606401610411565b60008111610ca95760405162461bcd60e51b815260206004820152601e60248201527f4f6d6e694272696467653a20616d6f756e74206d757374206265203e203000006044820152606401610411565b600154811115610cfb5760405162461bcd60e51b815260206004820152601860248201527f4f6d6e694272696467653a206e6f206c697175696469747900000000000000006044820152606401610411565b6000610d07838361063b565b9050610d1381836110fd565b3414610d615760405162461bcd60e51b815260206004820152601b60248201527f4f6d6e694272696467653a20696e636f72726563742066756e647300000000006044820152606401610411565b8160016000828254610d739190611110565b9091555050600054600254604080516001600160a01b038781166024830152604480830188905283518084039091018152606490920183526020820180516001600160e01b031663f3fef3a360e01b179052915163c21dda4f60e01b8152600160401b850483169463c21dda4f948794610e07946001600160401b03909316936004939190921691620124f8908401611123565b6000604051808303818588803b158015610e2057600080fd5b505af1158015610e34573d6000803e3d6000fd5b50506040518581526001600160a01b03871693503392507f59bc8a913d49a9626dd6ba5def7fcf12804061c1bb9b8b6db077e1a12cb4b422915060200160405180910390a3505050565b610e86610e8f565b610add81610ed8565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661071d57604051631afcd79f60e31b815260040160405180910390fd5b610aaa610e8f565b6001600160a01b0381168114610add57600080fd5b600060208284031215610f0757600080fd5b8135610f1281610ee0565b9392505050565b60008060408385031215610f2c57600080fd5b8235610f3781610ee0565b946020939093013593505050565b600080600060608486031215610f5a57600080fd5b8335610f6581610ee0565b92506020840135610f7581610ee0565b929592945050506040919091013590565b6001600160401b0381168114610add57600080fd5b600080600060608486031215610fb057600080fd5b8335610fbb81610f86565b92506020840135610fcb81610ee0565b91506040840135610fdb81610ee0565b809150509250925092565b600060408284031215610ff857600080fd5b604051604081018181106001600160401b038211171561102857634e487b7160e01b600052604160045260246000fd5b604052825161103681610f86565b8152602083015161104681610ee0565b60208201529392505050565b6000815180845260005b818110156110785760208185018101518683018201520161105c565b506000602082860101526020601f19601f83011685010191505092915050565b60006001600160401b038086168352606060208401526110bb6060840186611052565b9150808416604084015250949350505050565b6000602082840312156110e057600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820180821115610705576107056110e7565b81810381811115610705576107056110e7565b60006001600160401b03808816835260ff8716602084015260018060a01b038616604084015260a0606084015261115d60a0840186611052565b9150808416608084015250969550505050505056fea26469706673582212203362228ea99516331d1cb16c18f08ecf347c30b7122cd62a73ea277e898c557664736f6c63430008180033", "storage": { "0xf0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00": "0x000000000000000000000000000000000000000000000000ffffffffffffffff" }, diff --git a/lib/netconf/static.go b/lib/netconf/static.go index fc1f5fe4c..606ab885a 100644 --- a/lib/netconf/static.go +++ b/lib/netconf/static.go @@ -131,6 +131,7 @@ var runid = uuid.New().String() //nolint:gochecknoglobals // Static addresses var ( omegaAVS = common.HexToAddress("0xa7b2e7830C51728832D33421670DbBE30299fD92") + omegaPortal = common.HexToAddress("0x1ce5094EE8b861674D3aD0da116D90592193c7d9") mainnetAVS = common.HexToAddress("0xed2f4d90b073128ae6769a9A8D51547B1Df766C8") mainnetToken = common.HexToAddress("0x36e66fbbce51e4cd5bd3c62b637eb411b18949d4") @@ -181,7 +182,12 @@ var statics = map[ID]Static{ AVSContractAddress: omegaAVS, OmniExecutionChainID: evmchain.IDOmniOmega, MaxValidators: maxValidators, - Portals: nil, + Portals: []Deployment{ + {ChainID: evmchain.IDArbSepolia, Address: omegaPortal, DeployHeight: 67804723}, + {ChainID: evmchain.IDBaseSepolia, Address: omegaPortal, DeployHeight: 13302705}, + {ChainID: evmchain.IDHolesky, Address: omegaPortal, DeployHeight: 2034739}, + {ChainID: evmchain.IDOpSepolia, Address: omegaPortal, DeployHeight: 15285567}, + }, ConsensusGenesisJSON: omegaConsensusGenesisJSON, ConsensusSeedTXT: omegaConsensusSeedsTXT, ExecutionGenesisJSON: omegaExecutionGenesisJSON,