From 1f651b7afce3d55e6af86b3f9a517ef16ccf65d7 Mon Sep 17 00:00:00 2001 From: Daniel Savu <23065004+daniel-savu@users.noreply.github.com> Date: Tue, 19 Dec 2023 10:55:15 +0000 Subject: [PATCH] chore: remove neutron-related deployments from testnet4 context (#3071) ### Description Removes most occurences of lines that contain the `neutron` string from the testnet4 context. Where validators are set (e.g. [here](https://github.com/hyperlane-xyz/hyperlane-monorepo/blob/3e685f9fb04fd1dd10b05250ade5b65150b75086/typescript/infra/config/environments/testnet4/validators.ts#L29)), the neutron context is required for type safety but can stay empty --- rust/config/testnet4_config.json | 26 ------------------- .../config/environments/testnet4/agent.ts | 21 --------------- .../config/environments/testnet4/chains.ts | 1 - .../environments/testnet4/gas-oracle.ts | 2 -- .../environments/testnet4/infrastructure.ts | 1 - typescript/sdk/src/consts/chains.ts | 1 - typescript/sdk/src/consts/multisigIsm.ts | 8 ------ 7 files changed, 60 deletions(-) diff --git a/rust/config/testnet4_config.json b/rust/config/testnet4_config.json index 12621e603..d0fbd1259 100644 --- a/rust/config/testnet4_config.json +++ b/rust/config/testnet4_config.json @@ -1007,32 +1007,6 @@ "index": { "from": 4558491 } - }, - "neutrontestnet": { - "name": "neutrontestnet", - "domainId": "33333", - "chainId": "duality-devnet", - "mailbox": "0xdb33c78ca39541dd740659fbfd86fdd601fe7225f10f26e87595c5b8df6bdcda", - "interchainGasPaymaster": "0xae38a168ced2b1cdafd7da5de2fbd22749b1ab52e88cd0b121f750a6c20a2814", - "validatorAnnounce": "0x29d5f702a35d4135d98abf52c62ddc0cfd74001663ec14d284edff7d0419fb58", - "merkleTreeHook": "0xb6aac0c4650129ded8e645e6ef8dcbba710623b826e5a1dae34158a27247c668", - "protocol": "cosmos", - "finalityBlocks": 1, - "rpcUrls": [ - { - "http": "http://54.149.31.83:26657" - } - ], - "grpcUrl": "http://52.43.22.152:9090", - "canonicalAsset": "token", - "prefix": "dual", - "index": { - "from": 1, - "chunk": 100000 - }, - "blocks": { - "reorgPeriod": 1 - } } }, "defaultRpcConsensusType": "fallback" diff --git a/typescript/infra/config/environments/testnet4/agent.ts b/typescript/infra/config/environments/testnet4/agent.ts index c2546e603..4621e0a1e 100644 --- a/typescript/infra/config/environments/testnet4/agent.ts +++ b/typescript/infra/config/environments/testnet4/agent.ts @@ -107,28 +107,7 @@ const releaseCandidate: RootAgentConfig = { }, }; -const neutron: RootAgentConfig = { - ...contextBase, - context: Contexts.Neutron, - rolesWithKeys: [Role.Relayer], - contextChainNames: { - relayer: [Chains.goerli], - validator: [], - scraper: [], - }, - relayer: { - rpcConsensusType: RpcConsensusType.Fallback, - docker: { - repo, - tag: '86b7f98-20231207-153805', - }, - gasPaymentEnforcement, - transactionGasLimit: 750000, - }, -}; - export const agents = { [Contexts.Hyperlane]: hyperlane, [Contexts.ReleaseCandidate]: releaseCandidate, - [Contexts.Neutron]: neutron, }; diff --git a/typescript/infra/config/environments/testnet4/chains.ts b/typescript/infra/config/environments/testnet4/chains.ts index a30cf70eb..3f87914ed 100644 --- a/typescript/infra/config/environments/testnet4/chains.ts +++ b/typescript/infra/config/environments/testnet4/chains.ts @@ -27,7 +27,6 @@ export const ethereumTestnetConfigs: ChainMap = { // Blessed non-Ethereum chains. export const nonEthereumTestnetConfigs: ChainMap = { // solanadevnet: chainMetadata.solanadevnet, - // neutrontestnet: chainMetadata.neutrontestnet, }; export const testnetConfigs: ChainMap = { diff --git a/typescript/infra/config/environments/testnet4/gas-oracle.ts b/typescript/infra/config/environments/testnet4/gas-oracle.ts index 7fda9ad6b..b173f4d3a 100644 --- a/typescript/infra/config/environments/testnet4/gas-oracle.ts +++ b/typescript/infra/config/environments/testnet4/gas-oracle.ts @@ -30,7 +30,6 @@ const gasPrices: ChainMap = { polygonzkevmtestnet: ethers.utils.parseUnits('1', 'gwei'), chiado: ethers.utils.parseUnits('2', 'gwei'), // solanadevnet: ethers.BigNumber.from('28'), - neutrontestnet: ethers.utils.parseUnits('0.1', 'gwei'), }; // Used to categorize rarity of testnet tokens & approximate exchange rates. @@ -65,7 +64,6 @@ const chainTokenRarity: ChainMap = { polygonzkevmtestnet: Rarity.Common, chiado: Rarity.Common, // solanadevnet: Rarity.Common, - neutrontestnet: Rarity.Common, }; // Gets the "value" of a testnet chain diff --git a/typescript/infra/config/environments/testnet4/infrastructure.ts b/typescript/infra/config/environments/testnet4/infrastructure.ts index c3367436c..9429f4782 100644 --- a/typescript/infra/config/environments/testnet4/infrastructure.ts +++ b/typescript/infra/config/environments/testnet4/infrastructure.ts @@ -40,7 +40,6 @@ export const infrastructure: InfrastructureConfig = { 'testnet3-', 'hyperlane-testnet4-', 'rc-testnet4-', - 'neutron-testnet4-', 'testnet4-', ], }, diff --git a/typescript/sdk/src/consts/chains.ts b/typescript/sdk/src/consts/chains.ts index 7139c057a..3907ee8c9 100644 --- a/typescript/sdk/src/consts/chains.ts +++ b/typescript/sdk/src/consts/chains.ts @@ -49,7 +49,6 @@ export enum DeprecatedChains { rinkeby = 'rinkeby', optimismkovan = 'optimismkovan', optimismrinkeby = 'optimismrinkeby', - neutrontestnet = 'neutrontestnet', } export const AllDeprecatedChains = Object.keys(DeprecatedChains) as string[]; diff --git a/typescript/sdk/src/consts/multisigIsm.ts b/typescript/sdk/src/consts/multisigIsm.ts index 6cdd5401f..d1c147575 100644 --- a/typescript/sdk/src/consts/multisigIsm.ts +++ b/typescript/sdk/src/consts/multisigIsm.ts @@ -191,14 +191,6 @@ export const defaultMultisigConfigs: ChainMap = { '0x7885fae56dbcf5176657f54adbbd881dc6714132', ], }, - neutrontestnet: { - threshold: 2, - validators: [ - '0x5d2a99d67cd294a821de4fb25da6901ea8f89814', - '0xb57486243ce3bb3c38c50a582b8bbd20cb393589', - '0x661faee997654d14ead4ae48035883f05c3150cf', - ], - }, optimism: { threshold: 2,