From c0aed4dab2ea37511197227f39b0171c599242ab Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 7 Aug 2023 20:47:51 +0200 Subject: [PATCH 1/2] Updating existing supported chains after Base deployment - Updated external addresses for Mainnet and Testnet - Updated mappings for existing supported chains --- .../00_resolve_base_wormhole_gateway.ts | 28 +++++++++++++ ...e_with_base_in_wormhole_gateway_mapping.ts | 39 ++++++++++++++++++ .../arbitrumGoerli/BaseWormholeGateway.json | 3 ++ .../arbitrumOne/BaseWormholeGateway.json | 3 ++ .../00_resolve_base_wormhole_gateway.ts | 28 +++++++++++++ ...e_with_base_in_wormhole_gateway_mapping.ts | 39 ++++++++++++++++++ .../optimism/BaseWormholeGateway.json | 3 ++ .../optimismGoerli/BaseWormholeGateway.json | 3 ++ .../00_resolve_base_wormhole_gateway.ts | 28 +++++++++++++ ...e_with_base_in_wormhole_gateway_mapping.ts | 41 +++++++++++++++++++ .../external/mumbai/BaseWormholeGateway.json | 3 ++ .../external/polygon/BaseWormholeGateway.json | 3 ++ 12 files changed, 221 insertions(+) create mode 100644 cross-chain/arbitrum/deploy_l2/00_resolve_base_wormhole_gateway.ts create mode 100644 cross-chain/arbitrum/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts create mode 100644 cross-chain/arbitrum/external/arbitrumGoerli/BaseWormholeGateway.json create mode 100644 cross-chain/arbitrum/external/arbitrumOne/BaseWormholeGateway.json create mode 100644 cross-chain/optimism/deploy_l2/00_resolve_base_wormhole_gateway.ts create mode 100644 cross-chain/optimism/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts create mode 100644 cross-chain/optimism/external/optimism/BaseWormholeGateway.json create mode 100644 cross-chain/optimism/external/optimismGoerli/BaseWormholeGateway.json create mode 100644 cross-chain/polygon/deploy_sidechain/00_resolve_base_wormhole_gateway.ts create mode 100644 cross-chain/polygon/deploy_sidechain/15_update_with_base_in_wormhole_gateway_mapping.ts create mode 100644 cross-chain/polygon/external/mumbai/BaseWormholeGateway.json create mode 100644 cross-chain/polygon/external/polygon/BaseWormholeGateway.json diff --git a/cross-chain/arbitrum/deploy_l2/00_resolve_base_wormhole_gateway.ts b/cross-chain/arbitrum/deploy_l2/00_resolve_base_wormhole_gateway.ts new file mode 100644 index 000000000..598d1c494 --- /dev/null +++ b/cross-chain/arbitrum/deploy_l2/00_resolve_base_wormhole_gateway.ts @@ -0,0 +1,28 @@ +import type { HardhatRuntimeEnvironment } from "hardhat/types" +import type { DeployFunction } from "hardhat-deploy/types" + +const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { + const { helpers, deployments } = hre + const { log } = deployments + + const BaseWormholeGateway = await deployments.getOrNull( + "BaseWormholeGateway" + ) + + if ( + BaseWormholeGateway && + helpers.address.isValid(BaseWormholeGateway.address) + ) { + log( + `using existing BaseWormholeGateway at ${BaseWormholeGateway.address}` + ) + } else if (hre.network.name === "hardhat") { + log("using fake BaseWormholeGateway for hardhat network") + } else { + throw new Error("deployed BaseWormholeGateway contract not found") + } +} + +export default func + +func.tags = ["BaseWormholeGateway"] diff --git a/cross-chain/arbitrum/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts b/cross-chain/arbitrum/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts new file mode 100644 index 000000000..fbdfa25d2 --- /dev/null +++ b/cross-chain/arbitrum/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts @@ -0,0 +1,39 @@ +import type { HardhatRuntimeEnvironment } from "hardhat/types" +import type { DeployFunction } from "hardhat-deploy/types" + +const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { + const { deployments, getNamedAccounts, ethers } = hre + const { execute, log } = deployments + const { deployer } = await getNamedAccounts() + + // Fake BaseWormholeGateway for local development purposes only. + const fakeBaseWormholeGateway = + "0x1af5DC16568EFF2d480a43A77E6C409e497FcFb9" + + // See https://docs.wormhole.com/wormhole/blockchain-environments/evm#base + // This ID is valid for both Base Testnet and Mainnet + const baseWormholeChainID = 30 + + const baseWormholeGateway = await deployments.getOrNull( + "BaseWormholeGateway" + ) + + let baseWormholeGatewayAddress = baseWormholeGateway?.address + if (!baseWormholeGatewayAddress && hre.network.name === "hardhat") { + baseWormholeGatewayAddress = fakeBaseWormholeGateway + log(`fake BaseWormholeGateway address ${baseWormholeGatewayAddress}`) + } + + await execute( + "ArbitrumWormholeGateway", + { from: deployer, log: true, waitConfirmations: 1 }, + "updateGatewayAddress", + baseWormholeChainID, + ethers.utils.hexZeroPad(baseWormholeGatewayAddress, 32) + ) +} + +export default func + +func.tags = ["SetBaseGatewayAddress"] +func.dependencies = ["BaseWormholeGateway"] diff --git a/cross-chain/arbitrum/external/arbitrumGoerli/BaseWormholeGateway.json b/cross-chain/arbitrum/external/arbitrumGoerli/BaseWormholeGateway.json new file mode 100644 index 000000000..74c39592d --- /dev/null +++ b/cross-chain/arbitrum/external/arbitrumGoerli/BaseWormholeGateway.json @@ -0,0 +1,3 @@ +{ + "address": "0xe3e0511EEbD87F08FbaE4486419cb5dFB06e1343" +} diff --git a/cross-chain/arbitrum/external/arbitrumOne/BaseWormholeGateway.json b/cross-chain/arbitrum/external/arbitrumOne/BaseWormholeGateway.json new file mode 100644 index 000000000..6571efe8d --- /dev/null +++ b/cross-chain/arbitrum/external/arbitrumOne/BaseWormholeGateway.json @@ -0,0 +1,3 @@ +{ + "address": "0x09959798B95d00a3183d20FaC298E4594E599eab" +} diff --git a/cross-chain/optimism/deploy_l2/00_resolve_base_wormhole_gateway.ts b/cross-chain/optimism/deploy_l2/00_resolve_base_wormhole_gateway.ts new file mode 100644 index 000000000..598d1c494 --- /dev/null +++ b/cross-chain/optimism/deploy_l2/00_resolve_base_wormhole_gateway.ts @@ -0,0 +1,28 @@ +import type { HardhatRuntimeEnvironment } from "hardhat/types" +import type { DeployFunction } from "hardhat-deploy/types" + +const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { + const { helpers, deployments } = hre + const { log } = deployments + + const BaseWormholeGateway = await deployments.getOrNull( + "BaseWormholeGateway" + ) + + if ( + BaseWormholeGateway && + helpers.address.isValid(BaseWormholeGateway.address) + ) { + log( + `using existing BaseWormholeGateway at ${BaseWormholeGateway.address}` + ) + } else if (hre.network.name === "hardhat") { + log("using fake BaseWormholeGateway for hardhat network") + } else { + throw new Error("deployed BaseWormholeGateway contract not found") + } +} + +export default func + +func.tags = ["BaseWormholeGateway"] diff --git a/cross-chain/optimism/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts b/cross-chain/optimism/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts new file mode 100644 index 000000000..854060ea4 --- /dev/null +++ b/cross-chain/optimism/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts @@ -0,0 +1,39 @@ +import type { HardhatRuntimeEnvironment } from "hardhat/types" +import type { DeployFunction } from "hardhat-deploy/types" + +const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { + const { deployments, getNamedAccounts, ethers } = hre + const { execute, log } = deployments + const { deployer } = await getNamedAccounts() + + // Fake BaseWormholeGateway for local development purposes only. + const fakeBaseWormholeGateway = + "0x1af5DC16568EFF2d480a43A77E6C409e497FcFb9" + + // See https://docs.wormhole.com/wormhole/blockchain-environments/evm#base + // This ID is valid for both Base Testnet and Mainnet + const baseWormholeChainID = 30 + + const baseWormholeGateway = await deployments.getOrNull( + "BaseWormholeGateway" + ) + + let baseWormholeGatewayAddress = baseWormholeGateway?.address + if (!baseWormholeGatewayAddress && hre.network.name === "hardhat") { + baseWormholeGatewayAddress = fakeBaseWormholeGateway + log(`fake BaseWormholeGateway address ${baseWormholeGatewayAddress}`) + } + + await execute( + "OptimismWormholeGateway", + { from: deployer, log: true, waitConfirmations: 1 }, + "updateGatewayAddress", + baseWormholeChainID, + ethers.utils.hexZeroPad(baseWormholeGatewayAddress, 32) + ) +} + +export default func + +func.tags = ["SetBaseGatewayAddress"] +func.dependencies = ["BaseWormholeGateway"] diff --git a/cross-chain/optimism/external/optimism/BaseWormholeGateway.json b/cross-chain/optimism/external/optimism/BaseWormholeGateway.json new file mode 100644 index 000000000..6571efe8d --- /dev/null +++ b/cross-chain/optimism/external/optimism/BaseWormholeGateway.json @@ -0,0 +1,3 @@ +{ + "address": "0x09959798B95d00a3183d20FaC298E4594E599eab" +} diff --git a/cross-chain/optimism/external/optimismGoerli/BaseWormholeGateway.json b/cross-chain/optimism/external/optimismGoerli/BaseWormholeGateway.json new file mode 100644 index 000000000..74c39592d --- /dev/null +++ b/cross-chain/optimism/external/optimismGoerli/BaseWormholeGateway.json @@ -0,0 +1,3 @@ +{ + "address": "0xe3e0511EEbD87F08FbaE4486419cb5dFB06e1343" +} diff --git a/cross-chain/polygon/deploy_sidechain/00_resolve_base_wormhole_gateway.ts b/cross-chain/polygon/deploy_sidechain/00_resolve_base_wormhole_gateway.ts new file mode 100644 index 000000000..598d1c494 --- /dev/null +++ b/cross-chain/polygon/deploy_sidechain/00_resolve_base_wormhole_gateway.ts @@ -0,0 +1,28 @@ +import type { HardhatRuntimeEnvironment } from "hardhat/types" +import type { DeployFunction } from "hardhat-deploy/types" + +const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { + const { helpers, deployments } = hre + const { log } = deployments + + const BaseWormholeGateway = await deployments.getOrNull( + "BaseWormholeGateway" + ) + + if ( + BaseWormholeGateway && + helpers.address.isValid(BaseWormholeGateway.address) + ) { + log( + `using existing BaseWormholeGateway at ${BaseWormholeGateway.address}` + ) + } else if (hre.network.name === "hardhat") { + log("using fake BaseWormholeGateway for hardhat network") + } else { + throw new Error("deployed BaseWormholeGateway contract not found") + } +} + +export default func + +func.tags = ["BaseWormholeGateway"] diff --git a/cross-chain/polygon/deploy_sidechain/15_update_with_base_in_wormhole_gateway_mapping.ts b/cross-chain/polygon/deploy_sidechain/15_update_with_base_in_wormhole_gateway_mapping.ts new file mode 100644 index 000000000..d5f4d771d --- /dev/null +++ b/cross-chain/polygon/deploy_sidechain/15_update_with_base_in_wormhole_gateway_mapping.ts @@ -0,0 +1,41 @@ +import type { HardhatRuntimeEnvironment } from "hardhat/types" +import type { DeployFunction } from "hardhat-deploy/types" + +const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { + const { deployments, getNamedAccounts, ethers } = hre + const { execute, log } = deployments + const { deployer } = await getNamedAccounts() + + // Fake BaseWormholeGateway for local development purposes only. + const fakeBaseWormholeGateway = + "0x2af5DC16568EFF2d480a43A77E6C409e497FcFb9" + + // See https://docs.wormhole.com/wormhole/blockchain-environments/evm#base + // This ID is valid for both Base Goerli and Mainnet + const baseWormholeChainID = 30 + + const baseWormholeGateway = await deployments.getOrNull( + "BaseWormholeGateway" + ) + + let baseWormholeGatewayAddress = baseWormholeGateway?.address + if (!baseWormholeGatewayAddress && hre.network.name === "hardhat") { + baseWormholeGatewayAddress = fakeBaseWormholeGateway + log( + `fake BaseWormholeGateway address ${baseWormholeGatewayAddress}` + ) + } + + await execute( + "PolygonWormholeGateway", + { from: deployer, log: true, waitConfirmations: 1 }, + "updateGatewayAddress", + baseWormholeChainID, + ethers.utils.hexZeroPad(baseWormholeGatewayAddress, 32) + ) +} + +export default func + +func.tags = ["SetBaseGatewayAddress"] +func.dependencies = ["BaseWormholeGateway"] diff --git a/cross-chain/polygon/external/mumbai/BaseWormholeGateway.json b/cross-chain/polygon/external/mumbai/BaseWormholeGateway.json new file mode 100644 index 000000000..74c39592d --- /dev/null +++ b/cross-chain/polygon/external/mumbai/BaseWormholeGateway.json @@ -0,0 +1,3 @@ +{ + "address": "0xe3e0511EEbD87F08FbaE4486419cb5dFB06e1343" +} diff --git a/cross-chain/polygon/external/polygon/BaseWormholeGateway.json b/cross-chain/polygon/external/polygon/BaseWormholeGateway.json new file mode 100644 index 000000000..6571efe8d --- /dev/null +++ b/cross-chain/polygon/external/polygon/BaseWormholeGateway.json @@ -0,0 +1,3 @@ +{ + "address": "0x09959798B95d00a3183d20FaC298E4594E599eab" +} From 0822d07e5245340f34f959ddd0561c41c4b2d0e1 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 7 Aug 2023 20:54:57 +0200 Subject: [PATCH 2/2] Linting only --- .../deploy_l2/00_resolve_base_wormhole_gateway.ts | 8 ++------ ...15_update_with_base_in_wormhole_gateway_mapping.ts | 7 ++----- .../deploy_l2/00_resolve_base_wormhole_gateway.ts | 8 ++------ ...15_update_with_base_in_wormhole_gateway_mapping.ts | 7 ++----- .../00_resolve_base_wormhole_gateway.ts | 8 ++------ ...15_update_with_base_in_wormhole_gateway_mapping.ts | 11 +++-------- 6 files changed, 13 insertions(+), 36 deletions(-) diff --git a/cross-chain/arbitrum/deploy_l2/00_resolve_base_wormhole_gateway.ts b/cross-chain/arbitrum/deploy_l2/00_resolve_base_wormhole_gateway.ts index 598d1c494..b615c4850 100644 --- a/cross-chain/arbitrum/deploy_l2/00_resolve_base_wormhole_gateway.ts +++ b/cross-chain/arbitrum/deploy_l2/00_resolve_base_wormhole_gateway.ts @@ -5,17 +5,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const { helpers, deployments } = hre const { log } = deployments - const BaseWormholeGateway = await deployments.getOrNull( - "BaseWormholeGateway" - ) + const BaseWormholeGateway = await deployments.getOrNull("BaseWormholeGateway") if ( BaseWormholeGateway && helpers.address.isValid(BaseWormholeGateway.address) ) { - log( - `using existing BaseWormholeGateway at ${BaseWormholeGateway.address}` - ) + log(`using existing BaseWormholeGateway at ${BaseWormholeGateway.address}`) } else if (hre.network.name === "hardhat") { log("using fake BaseWormholeGateway for hardhat network") } else { diff --git a/cross-chain/arbitrum/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts b/cross-chain/arbitrum/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts index fbdfa25d2..bed5ff5ad 100644 --- a/cross-chain/arbitrum/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts +++ b/cross-chain/arbitrum/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts @@ -7,16 +7,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const { deployer } = await getNamedAccounts() // Fake BaseWormholeGateway for local development purposes only. - const fakeBaseWormholeGateway = - "0x1af5DC16568EFF2d480a43A77E6C409e497FcFb9" + const fakeBaseWormholeGateway = "0x1af5DC16568EFF2d480a43A77E6C409e497FcFb9" // See https://docs.wormhole.com/wormhole/blockchain-environments/evm#base // This ID is valid for both Base Testnet and Mainnet const baseWormholeChainID = 30 - const baseWormholeGateway = await deployments.getOrNull( - "BaseWormholeGateway" - ) + const baseWormholeGateway = await deployments.getOrNull("BaseWormholeGateway") let baseWormholeGatewayAddress = baseWormholeGateway?.address if (!baseWormholeGatewayAddress && hre.network.name === "hardhat") { diff --git a/cross-chain/optimism/deploy_l2/00_resolve_base_wormhole_gateway.ts b/cross-chain/optimism/deploy_l2/00_resolve_base_wormhole_gateway.ts index 598d1c494..b615c4850 100644 --- a/cross-chain/optimism/deploy_l2/00_resolve_base_wormhole_gateway.ts +++ b/cross-chain/optimism/deploy_l2/00_resolve_base_wormhole_gateway.ts @@ -5,17 +5,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const { helpers, deployments } = hre const { log } = deployments - const BaseWormholeGateway = await deployments.getOrNull( - "BaseWormholeGateway" - ) + const BaseWormholeGateway = await deployments.getOrNull("BaseWormholeGateway") if ( BaseWormholeGateway && helpers.address.isValid(BaseWormholeGateway.address) ) { - log( - `using existing BaseWormholeGateway at ${BaseWormholeGateway.address}` - ) + log(`using existing BaseWormholeGateway at ${BaseWormholeGateway.address}`) } else if (hre.network.name === "hardhat") { log("using fake BaseWormholeGateway for hardhat network") } else { diff --git a/cross-chain/optimism/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts b/cross-chain/optimism/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts index 854060ea4..8c69bec2a 100644 --- a/cross-chain/optimism/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts +++ b/cross-chain/optimism/deploy_l2/15_update_with_base_in_wormhole_gateway_mapping.ts @@ -7,16 +7,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const { deployer } = await getNamedAccounts() // Fake BaseWormholeGateway for local development purposes only. - const fakeBaseWormholeGateway = - "0x1af5DC16568EFF2d480a43A77E6C409e497FcFb9" + const fakeBaseWormholeGateway = "0x1af5DC16568EFF2d480a43A77E6C409e497FcFb9" // See https://docs.wormhole.com/wormhole/blockchain-environments/evm#base // This ID is valid for both Base Testnet and Mainnet const baseWormholeChainID = 30 - const baseWormholeGateway = await deployments.getOrNull( - "BaseWormholeGateway" - ) + const baseWormholeGateway = await deployments.getOrNull("BaseWormholeGateway") let baseWormholeGatewayAddress = baseWormholeGateway?.address if (!baseWormholeGatewayAddress && hre.network.name === "hardhat") { diff --git a/cross-chain/polygon/deploy_sidechain/00_resolve_base_wormhole_gateway.ts b/cross-chain/polygon/deploy_sidechain/00_resolve_base_wormhole_gateway.ts index 598d1c494..b615c4850 100644 --- a/cross-chain/polygon/deploy_sidechain/00_resolve_base_wormhole_gateway.ts +++ b/cross-chain/polygon/deploy_sidechain/00_resolve_base_wormhole_gateway.ts @@ -5,17 +5,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const { helpers, deployments } = hre const { log } = deployments - const BaseWormholeGateway = await deployments.getOrNull( - "BaseWormholeGateway" - ) + const BaseWormholeGateway = await deployments.getOrNull("BaseWormholeGateway") if ( BaseWormholeGateway && helpers.address.isValid(BaseWormholeGateway.address) ) { - log( - `using existing BaseWormholeGateway at ${BaseWormholeGateway.address}` - ) + log(`using existing BaseWormholeGateway at ${BaseWormholeGateway.address}`) } else if (hre.network.name === "hardhat") { log("using fake BaseWormholeGateway for hardhat network") } else { diff --git a/cross-chain/polygon/deploy_sidechain/15_update_with_base_in_wormhole_gateway_mapping.ts b/cross-chain/polygon/deploy_sidechain/15_update_with_base_in_wormhole_gateway_mapping.ts index d5f4d771d..c0db4cbff 100644 --- a/cross-chain/polygon/deploy_sidechain/15_update_with_base_in_wormhole_gateway_mapping.ts +++ b/cross-chain/polygon/deploy_sidechain/15_update_with_base_in_wormhole_gateway_mapping.ts @@ -7,23 +7,18 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const { deployer } = await getNamedAccounts() // Fake BaseWormholeGateway for local development purposes only. - const fakeBaseWormholeGateway = - "0x2af5DC16568EFF2d480a43A77E6C409e497FcFb9" + const fakeBaseWormholeGateway = "0x2af5DC16568EFF2d480a43A77E6C409e497FcFb9" // See https://docs.wormhole.com/wormhole/blockchain-environments/evm#base // This ID is valid for both Base Goerli and Mainnet const baseWormholeChainID = 30 - const baseWormholeGateway = await deployments.getOrNull( - "BaseWormholeGateway" - ) + const baseWormholeGateway = await deployments.getOrNull("BaseWormholeGateway") let baseWormholeGatewayAddress = baseWormholeGateway?.address if (!baseWormholeGatewayAddress && hre.network.name === "hardhat") { baseWormholeGatewayAddress = fakeBaseWormholeGateway - log( - `fake BaseWormholeGateway address ${baseWormholeGatewayAddress}` - ) + log(`fake BaseWormholeGateway address ${baseWormholeGatewayAddress}`) } await execute(