From 06a02e689be6c7e5ecaf0bbcc94e12bc3dc26f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Mon, 30 Sep 2024 13:50:19 +0200 Subject: [PATCH] fix: use -unlocked keywork to broadcast & impersonate --- Makefile | 2 +- script/deploy/AbstractDeployScript.sol | 9 +++++---- script/deploy/mainnet/003_UpgradeLidoARMScript.sol | 6 +++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b8f7787..5f16997 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ deploy: @forge script script/deploy/DeployManager.sol --rpc-url $(PROVIDER_URL) --private-key ${DEPLOYER_PRIVATE_KEY} --broadcast --slow --verify -vvvv deploy-testnet: - @forge script script/deploy/DeployManager.sol --rpc-url $(TESTNET_URL) --private-key ${DEPLOYER_PRIVATE_KEY} --broadcast --slow -vvvv + @forge script script/deploy/DeployManager.sol --rpc-url $(TESTNET_URL) --broadcast --slow --unlocked -vvvv deploy-holesky: @forge script script/deploy/DeployManager.sol --rpc-url $(HOLESKY_URL) --private-key ${DEPLOYER_PRIVATE_KEY} --broadcast --slow --verify -vvvv diff --git a/script/deploy/AbstractDeployScript.sol b/script/deploy/AbstractDeployScript.sol index 7e8b9bd..293cafd 100644 --- a/script/deploy/AbstractDeployScript.sol +++ b/script/deploy/AbstractDeployScript.sol @@ -50,8 +50,8 @@ abstract contract AbstractDeployScript is Script { /// @notice Detect if the RPC URL is a tendrly testnet, by trying to call a specific tenderly method on rpc. /// @dev if the call success, it means we are on a tenderly testnet, otherwise we arn't. function isTenderlyRpc() public returns (bool) { - // Try to give ethers to "0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf" which is the address for pk = 0x0....01 - try vm.rpc("tenderly_setBalance", "[[\"0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf\"], \"0xDE0B6B3A7640000\"]") { + // Try to give ethers to "ARM_MULTISIG" + try vm.rpc("tenderly_setBalance", "[[\"0xC8F2cF4742C86295653f893214725813B16f7410\"], \"0xDE0B6B3A7640000\"]") { tenderlyTestnet = true; return true; } catch { @@ -71,12 +71,11 @@ abstract contract AbstractDeployScript is Script { } if (this.isForked()) { + deployer = Mainnet.INITIAL_DEPLOYER; if (tenderlyTestnet) { - deployer = vm.rememberKey(uint256(1)); console.log("Deploying on Tenderly testnet with deployer: %s", deployer); vm.startBroadcast(deployer); } else { - deployer = Mainnet.INITIAL_DEPLOYER; console.log("Running script on mainnet fork impersonating: %s", deployer); vm.startPrank(deployer); } @@ -91,7 +90,9 @@ abstract contract AbstractDeployScript is Script { if (this.isForked()) { if (tenderlyTestnet) { + _buildGovernanceProposal(); vm.stopBroadcast(); + _fork(); } else { vm.stopPrank(); _buildGovernanceProposal(); diff --git a/script/deploy/mainnet/003_UpgradeLidoARMScript.sol b/script/deploy/mainnet/003_UpgradeLidoARMScript.sol index 9f8ae83..46ce5dd 100644 --- a/script/deploy/mainnet/003_UpgradeLidoARMScript.sol +++ b/script/deploy/mainnet/003_UpgradeLidoARMScript.sol @@ -68,7 +68,11 @@ contract UpgradeLidoARMMainnetScript is AbstractDeployScript { function _buildGovernanceProposal() internal override {} function _fork() internal override { - vm.startPrank(Mainnet.ARM_MULTISIG); + if (tenderlyTestnet) { + vm.startBroadcast(Mainnet.ARM_MULTISIG); + } else { + vm.startPrank(Mainnet.ARM_MULTISIG); + } if (lidoARMProxy == Proxy(0x0000000000000000000000000000000000000000)) { revert("Lido ARM proxy not found");