Skip to content

Commit

Permalink
chore(e2e): post omega deploy updates (#1619)
Browse files Browse the repository at this point in the history 
Backport 1618.

Update netconf static, disable redeploy

issue: none
  • Loading branch information
@kevinhalliday
kevinhalliday authored Jul 30, 2024
1 parent fac8982 commit 5c1b950
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 24 deletions.
5 changes: 1 addition & 4 deletions e2e/app/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)
}
Expand Down
39 changes: 21 additions & 18 deletions lib/netconf/omega/consensus-genesis.json
View file
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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": [
Expand All @@ -147,7 +150,7 @@
{
"@type": "/cosmos.staking.v1beta1.MsgCreateValidator",
"description": {
"moniker": "0x98Eb13371c095905985cddE937018881d4D7f229",
"moniker": "0xCE624ce5C5717b63CED36AfB76857183E0a8a6eb",
"identity": "",
"website": "",
"security_contact": "",
Expand All @@ -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",
Expand Down Expand Up @@ -194,7 +197,7 @@
{
"@type": "/cosmos.staking.v1beta1.MsgCreateValidator",
"description": {
"moniker": "0xe96cF9Ad91cD6dc911817603Dfb3c65d5f532B95",
"moniker": "0x98Eb13371c095905985cddE937018881d4D7f229",
"identity": "",
"website": "",
"security_contact": "",
Expand All @@ -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",
Expand Down Expand Up @@ -241,7 +244,7 @@
{
"@type": "/cosmos.staking.v1beta1.MsgCreateValidator",
"description": {
"moniker": "0xdBd26a685DB4475b6c58ADEC0DE06c6eE387EAa8",
"moniker": "0xe96cF9Ad91cD6dc911817603Dfb3c65d5f532B95",
"identity": "",
"website": "",
"security_contact": "",
Expand All @@ -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",
Expand Down Expand Up @@ -288,7 +291,7 @@
{
"@type": "/cosmos.staking.v1beta1.MsgCreateValidator",
"description": {
"moniker": "0xCE624ce5C5717b63CED36AfB76857183E0a8a6eb",
"moniker": "0xdBd26a685DB4475b6c58ADEC0DE06c6eE387EAa8",
"identity": "",
"website": "",
"security_contact": "",
Expand All @@ -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",
Expand Down
Loading

0 comments on commit 5c1b950

Please sign in to comment.