From ee1cec286defb93467ba635f47af953bb4111ff4 Mon Sep 17 00:00:00 2001 From: Fynn Date: Thu, 14 Mar 2024 12:39:25 -0300 Subject: [PATCH 1/3] Add script to deploy collector --- script/DeployCollector.s.sol | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 script/DeployCollector.s.sol diff --git a/script/DeployCollector.s.sol b/script/DeployCollector.s.sol new file mode 100644 index 0000000..4ea79a7 --- /dev/null +++ b/script/DeployCollector.s.sol @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: Apache License 2.0 +pragma solidity ^0.8.13; + +import "forge-std/Script.sol"; +import "../src/FeeRewardsManager.sol"; + +contract DeployCollector is Script { + function run() external { + vm.startBroadcast(); + FeeRewardsManager feeRewardsManager = FeeRewardsManager( + FeeRewardsManager( + payable(address(vm.envAddress("FEE_REWARDS_MANAGER"))) + ) + ); + feeRewardsManager.createFeeContract( + vm.envAddress("WITHDRAWAL_CREDENTIAL") + ); + vm.stopBroadcast(); + } +} From d577b98bd75d7a4a99c6efa2ba4a9d67ed523d22 Mon Sep 17 00:00:00 2001 From: Fynn Date: Wed, 14 Aug 2024 14:04:04 -0300 Subject: [PATCH 2/3] Add deploy files --- .env.dist | 1 + foundry.toml | 1 + script/ChangeFee.s.sol | 26 ++++++++++++++++++++++++++ script/DisplayCollectorContract.s.sol | 20 ++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 script/ChangeFee.s.sol create mode 100644 script/DisplayCollectorContract.s.sol diff --git a/.env.dist b/.env.dist index ffed0a5..1c6febe 100644 --- a/.env.dist +++ b/.env.dist @@ -3,3 +3,4 @@ ETHERSCAN_API_KEY= DEFAULT_FEE=2800 GOERLI_RPC_URL=https://ethereum-goerli.publicnode.com HOLESKY_RPC_URL=https://ethereum-holesky.publicnode.com +MAINNET_RPC_URL=https://eth.llamarpc.com diff --git a/foundry.toml b/foundry.toml index dce38e2..319617f 100644 --- a/foundry.toml +++ b/foundry.toml @@ -8,6 +8,7 @@ libs = ["lib"] [rpc_endpoints] goerli = "${GOERLI_RPC_URL}" holesky = "${HOLESKY_RPC_URL}" +mainnet = "${MAINNET_RPC_URL}" [etherscan] all_chains = { key = "${ETHERSCAN_API_KEY}" } diff --git a/script/ChangeFee.s.sol b/script/ChangeFee.s.sol new file mode 100644 index 0000000..a02e2fa --- /dev/null +++ b/script/ChangeFee.s.sol @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: Apache License 2.0 +pragma solidity ^0.8.13; + +import "forge-std/Script.sol"; +import "../src/FeeRewardsManager.sol"; + +contract ChangeFee is Script { + function run() external { + FeeRewardsManager feeRewardsManager = FeeRewardsManager( + FeeRewardsManager( + payable(address(vm.envAddress("FEE_REWARDS_MANAGER"))) + ) + ); + address payable addr = payable( + feeRewardsManager.predictFeeContractAddress( + vm.envAddress("WITHDRAWAL_CREDENTIAL") + ) + ); + vm.startBroadcast(); + feeRewardsManager.changeFeeNumerator( + addr, + uint32(vm.envUint("NEW_FEE")) + ); + vm.stopBroadcast(); + } +} diff --git a/script/DisplayCollectorContract.s.sol b/script/DisplayCollectorContract.s.sol new file mode 100644 index 0000000..a9dc53f --- /dev/null +++ b/script/DisplayCollectorContract.s.sol @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: Apache License 2.0 +pragma solidity ^0.8.13; + +import "forge-std/Script.sol"; +import "../src/FeeRewardsManager.sol"; +import "forge-std/console.sol"; + +contract DisplayCollector is Script { + function run() external { + FeeRewardsManager feeRewardsManager = FeeRewardsManager( + FeeRewardsManager( + payable(address(vm.envAddress("FEE_REWARDS_MANAGER"))) + ) + ); + address addr = feeRewardsManager.predictFeeContractAddress( + vm.envAddress("WITHDRAWAL_CREDENTIAL") + ); + console.log(addr); + } +} From b600529009fdd2917dad0d1850460931ac97ac08 Mon Sep 17 00:00:00 2001 From: Fynn Date: Wed, 14 Aug 2024 14:34:31 -0300 Subject: [PATCH 3/3] Rename and alter --- script/{ChangeFee.s.sol => ChangeDefaultFee.s.sol} | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) rename script/{ChangeFee.s.sol => ChangeDefaultFee.s.sol} (61%) diff --git a/script/ChangeFee.s.sol b/script/ChangeDefaultFee.s.sol similarity index 61% rename from script/ChangeFee.s.sol rename to script/ChangeDefaultFee.s.sol index a02e2fa..75006be 100644 --- a/script/ChangeFee.s.sol +++ b/script/ChangeDefaultFee.s.sol @@ -11,16 +11,8 @@ contract ChangeFee is Script { payable(address(vm.envAddress("FEE_REWARDS_MANAGER"))) ) ); - address payable addr = payable( - feeRewardsManager.predictFeeContractAddress( - vm.envAddress("WITHDRAWAL_CREDENTIAL") - ) - ); vm.startBroadcast(); - feeRewardsManager.changeFeeNumerator( - addr, - uint32(vm.envUint("NEW_FEE")) - ); + feeRewardsManager.changeDefaultFee(uint32(vm.envUint("NEW_FEE"))); vm.stopBroadcast(); } }