diff --git a/solidity/deploy/37_deploy_light_relay_maintainer_proxy.ts b/solidity/deploy/34_deploy_light_relay_maintainer_proxy.ts similarity index 100% rename from solidity/deploy/37_deploy_light_relay_maintainer_proxy.ts rename to solidity/deploy/34_deploy_light_relay_maintainer_proxy.ts diff --git a/solidity/deploy/34_deploy_wallet_coordinator.ts b/solidity/deploy/34_deploy_wallet_coordinator.ts deleted file mode 100644 index dac4c41c2..000000000 --- a/solidity/deploy/34_deploy_wallet_coordinator.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { HardhatRuntimeEnvironment } from "hardhat/types" -import { DeployFunction } from "hardhat-deploy/types" - -const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { - const { deployments, ethers, getNamedAccounts, helpers } = hre - const { deployer } = await getNamedAccounts() - - const Bridge = await deployments.get("Bridge") - - const [walletCoordinator, proxyDeployment] = - await helpers.upgrades.deployProxy("WalletCoordinator", { - contractName: "WalletCoordinator", - initializerArgs: [Bridge.address], - factoryOpts: { - signer: await ethers.getSigner(deployer), - }, - proxyOpts: { - kind: "transparent", - }, - }) - - if (hre.network.tags.etherscan) { - // We use `verify` instead of `verify:verify` as the `verify` task is defined - // in "@openzeppelin/hardhat-upgrades" to perform Etherscan verification - // of Proxy and Implementation contracts. - await hre.run("verify", { - address: proxyDeployment.address, - constructorArgsParams: proxyDeployment.args, - }) - } - - if (hre.network.tags.tenderly) { - await hre.tenderly.verify({ - name: "WalletCoordinator", - address: walletCoordinator.address, - }) - } -} - -export default func - -func.tags = ["WalletCoordinator"] -func.dependencies = ["Bridge"] diff --git a/solidity/deploy/35_add_coordinator_address.ts b/solidity/deploy/35_add_coordinator_address.ts deleted file mode 100644 index 0f52b056e..000000000 --- a/solidity/deploy/35_add_coordinator_address.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { HardhatRuntimeEnvironment } from "hardhat/types" -import { DeployFunction } from "hardhat-deploy/types" - -const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { - const { getNamedAccounts, deployments } = hre - const { execute } = deployments - const { deployer, coordinator } = await getNamedAccounts() - - await execute( - "WalletCoordinator", - { from: deployer, log: true, waitConfirmations: 1 }, - "addCoordinator", - coordinator - ) -} - -export default func - -func.tags = ["AddCoordinatorAddress"] -func.dependencies = ["WalletCoordinator"] diff --git a/solidity/deploy/38_authorize_maintainer_in_light_relay_maintainer_proxy.ts b/solidity/deploy/35_authorize_maintainer_in_light_relay_maintainer_proxy.ts similarity index 100% rename from solidity/deploy/38_authorize_maintainer_in_light_relay_maintainer_proxy.ts rename to solidity/deploy/35_authorize_maintainer_in_light_relay_maintainer_proxy.ts diff --git a/solidity/deploy/39_transfer_light_relay_maintainer_proxy_ownership.ts b/solidity/deploy/36_transfer_light_relay_maintainer_proxy_ownership.ts similarity index 100% rename from solidity/deploy/39_transfer_light_relay_maintainer_proxy_ownership.ts rename to solidity/deploy/36_transfer_light_relay_maintainer_proxy_ownership.ts diff --git a/solidity/deploy/36_transfer_wallet_coordinator_ownership.ts b/solidity/deploy/36_transfer_wallet_coordinator_ownership.ts deleted file mode 100644 index 7c8673bfc..000000000 --- a/solidity/deploy/36_transfer_wallet_coordinator_ownership.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { HardhatRuntimeEnvironment } from "hardhat/types" -import { DeployFunction } from "hardhat-deploy/types" - -const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { - const { getNamedAccounts, helpers } = hre - const { deployer, governance } = await getNamedAccounts() - - await helpers.ownable.transferOwnership( - "WalletCoordinator", - governance, - deployer - ) -} - -export default func - -func.tags = ["TransferWalletCoordinatorOwnership"] -func.dependencies = ["AddCoordinatorAddress"] -func.runAtTheEnd = true diff --git a/solidity/deploy/40_authorize_light_relay_maintainer_proxy_in_reimbursement_pool.ts b/solidity/deploy/37_authorize_light_relay_maintainer_proxy_in_reimbursement_pool.ts similarity index 100% rename from solidity/deploy/40_authorize_light_relay_maintainer_proxy_in_reimbursement_pool.ts rename to solidity/deploy/37_authorize_light_relay_maintainer_proxy_in_reimbursement_pool.ts diff --git a/solidity/deploy/41_authorize_light_relay_maintainer_proxy_in_light_relay.ts b/solidity/deploy/38_authorize_light_relay_maintainer_proxy_in_light_relay.ts similarity index 100% rename from solidity/deploy/41_authorize_light_relay_maintainer_proxy_in_light_relay.ts rename to solidity/deploy/38_authorize_light_relay_maintainer_proxy_in_light_relay.ts diff --git a/solidity/deploy/81_upgrade_wallet_coordinator_v2.ts b/solidity/deploy/81_upgrade_wallet_coordinator_v2.ts deleted file mode 100644 index 09f34895a..000000000 --- a/solidity/deploy/81_upgrade_wallet_coordinator_v2.ts +++ /dev/null @@ -1,99 +0,0 @@ -import { Artifact, HardhatRuntimeEnvironment } from "hardhat/types" -import { DeployFunction, Deployment } from "hardhat-deploy/types" -import { ContractFactory } from "ethers" -import { ProxyAdmin, WalletCoordinator } from "../typechain" - -const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { - const { ethers, helpers, deployments } = hre - - const { deployer } = await helpers.signers.getNamedSigners() - - const proxyDeployment: Deployment = await deployments.get("WalletCoordinator") - const implementationContractFactory: ContractFactory = - await ethers.getContractFactory("WalletCoordinator", { - signer: deployer, - }) - - // Deploy new implementation contract - const newImplementationAddress: string = (await hre.upgrades.prepareUpgrade( - proxyDeployment, - implementationContractFactory, - { - kind: "transparent", - } - )) as string - - deployments.log( - `new implementation contract deployed at: ${newImplementationAddress}` - ) - - // Assemble proxy upgrade transaction. - const proxyAdmin: ProxyAdmin = - (await hre.upgrades.admin.getInstance()) as ProxyAdmin - const proxyAdminOwner = await proxyAdmin.owner() - - const upgradeTxData = await proxyAdmin.interface.encodeFunctionData( - "upgrade", - [proxyDeployment.address, newImplementationAddress] - ) - - deployments.log( - `proxy admin owner ${proxyAdminOwner} is required to upgrade proxy implementation with transaction:\n` + - `\t\tfrom: ${proxyAdminOwner}\n` + - `\t\tto: ${proxyAdmin.address}\n` + - `\t\tdata: ${upgradeTxData}` - ) - - // Update Deployment Artifact - const walletCoordinatorArtifact: Artifact = - hre.artifacts.readArtifactSync("WalletCoordinator") - - await deployments.save("WalletCoordinator", { - ...proxyDeployment, - abi: walletCoordinatorArtifact.abi, - implementation: newImplementationAddress, - }) - - // Assemble parameters upgrade transaction. - const walletCoordinator: WalletCoordinator = - await helpers.contracts.getContract("WalletCoordinator") - - const walletCoordinatorOwner = await walletCoordinator.owner() - - const updateRedemptionProposalParametersTxData = - walletCoordinator.interface.encodeFunctionData( - "updateRedemptionProposalParameters", - [7200, 600, 7200, 20, 20000] - ) - - deployments.log( - `WalletCoordinator owner ${walletCoordinatorOwner} is required to update redemption proposal parameters with transaction:\n` + - `\t\tfrom: ${walletCoordinatorOwner}\n` + - `\t\tto: ${walletCoordinator.address}\n` + - `\t\tdata: ${updateRedemptionProposalParametersTxData}` - ) - - if (hre.network.tags.etherscan) { - // We use `verify` instead of `verify:verify` as the `verify` task is defined - // in "@openzeppelin/hardhat-upgrades" to perform Etherscan verification - // of Proxy and Implementation contracts. - await hre.run("verify", { - address: newImplementationAddress, - constructorArgsParams: proxyDeployment.args, - }) - } - - if (hre.network.tags.tenderly) { - await hre.tenderly.verify({ - name: "WalletCoordinator", - address: newImplementationAddress, - }) - } -} - -export default func - -func.tags = ["UpgradeWalletCoordinator"] -// When running an upgrade uncomment the skip below and run the command: -// yarn deploy --tags UpgradeWalletCoordinator --network -func.skip = async () => true