From e610602a88d360056e4462384549564e0762ec4e Mon Sep 17 00:00:00 2001 From: 0xTimepunk Date: Mon, 6 Jan 2025 15:41:42 +0000 Subject: [PATCH 1/2] feat: readying superVault on base --- script/forge-scripts/Deploy.SuperVault.s.sol | 17 ++++++++++++----- script/utils/deploy_supervault.sh | 4 ++-- script/utils/verify_contracts.sh | 3 +-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/script/forge-scripts/Deploy.SuperVault.s.sol b/script/forge-scripts/Deploy.SuperVault.s.sol index e3fc2c5..39e2fc2 100644 --- a/script/forge-scripts/Deploy.SuperVault.s.sol +++ b/script/forge-scripts/Deploy.SuperVault.s.sol @@ -32,9 +32,12 @@ contract MainnetDeploySuperVault is Script { /// @notice Deploy SuperVault uint256[] memory superformIds = new uint256[](1); - superformIds[0] = chainId == 1 - ? 6_277_101_737_254_839_006_396_113_557_627_089_406_881_862_780_813_070_776_090 // Gauntlet's USDC Core, - : 53_060_340_969_225_424_123_272_122_895_191_053_251_498_236_784_870_936_252_229_868; + + if (chainId == 1) { + superformIds[0] = 6_277_101_737_254_839_006_396_113_557_627_089_406_881_862_780_813_070_776_090; + } else if (chainId == 8453) { + superformIds[0] = 53_060_340_969_225_715_878_205_116_584_081_115_198_352_809_299_304_516_324_185_578; + } uint256[] memory startingWeights = new uint256[](1); startingWeights[0] = 10_000; @@ -59,8 +62,12 @@ contract MainnetDeploySuperVault is Script { MANAGEMENT = 0xde587D0C7773BD239fF1bE87d32C876dEd4f7879; } // USDC on mainnet - address ASSET = - chainId == 1 ? 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48 : 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913; + address ASSET; + if (chainId == 1) { + ASSET = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48; + } else if (chainId == 8453) { + ASSET = 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913; + } assert(STRATEGIST != address(0)); assert(VAULT_MANAGER != address(0)); diff --git a/script/utils/deploy_supervault.sh b/script/utils/deploy_supervault.sh index 61de8e7..3a03462 100644 --- a/script/utils/deploy_supervault.sh +++ b/script/utils/deploy_supervault.sh @@ -17,8 +17,8 @@ export TENDERLY_ACCESS_TOKEN=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/TENDERLY_ # Run the script echo Deploying SV To Production: ... -forge script script/forge-scripts/Deploy.SuperVault.s.sol:MainnetDeploySuperVault --sig "deploySuperVault(uint256,uint256)" 0 1 \ - --rpc-url $ETHEREUM_RPC_URL \ +forge script script/forge-scripts/Deploy.SuperVault.s.sol:MainnetDeploySuperVault --sig "deploySuperVault(uint256,uint256)" 0 8453 \ + --rpc-url $BSC_RPC_URL \ --account default \ --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 \ --legacy \ diff --git a/script/utils/verify_contracts.sh b/script/utils/verify_contracts.sh index 083fe0f..4a3378a 100644 --- a/script/utils/verify_contracts.sh +++ b/script/utils/verify_contracts.sh @@ -22,10 +22,9 @@ export BASESCAN_API_KEY=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/BASESCAN_API_K # --etherscan-api-key $TENDERLY_ACCESS_TOKEN -constructor_arg_staging="$(cast abi-encode 'constructor((address,address,address,address,string,uint256,uint256[],uint256[]))' '(0xB2C097ac459aFAc892ae5b35f6bd6a9Dd3071F47,0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913,0x1F05a8Ff6d895Ba04C84c5031c5d63FA1afCDA6F,0x6A5DD913fE3CB5193E09D1810a3b9ff1C0f9c0D6,SuperUSDC,1000000000000,[53060340969225424123272122895191053251498236784870936252229868],[10000])')" +#constructor_arg="$(cast abi-encode 'constructor((address,address,address,address,string,uint256,uint256[],uint256[]))' '(0xB2C097ac459aFAc892ae5b35f6bd6a9Dd3071F47,0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913,0x1F05a8Ff6d895Ba04C84c5031c5d63FA1afCDA6F,0x6A5DD913fE3CB5193E09D1810a3b9ff1C0f9c0D6,SuperUSDC,1000000000000,[53060340969225424123272122895191053251498236784870936252229868],[10000])')" export NETWORK_ID=8453 -export TENDERLY_VERIFIER_URL_STAGING=https://api.tenderly.co/api/v1/account/superform/project/v1/etherscan/verify/network/8453 forge verify-contract 0xBD34DB7ef42533A51eb0F53eD9D91D06880bcdf1 "src/SuperVault.sol:SuperVault" --chain-id $NETWORK_ID \ --num-of-optimizations 200 \ From c34ddf086db7287cc5665fda05ac13819b8d0a17 Mon Sep 17 00:00:00 2001 From: 0xTimepunk Date: Tue, 7 Jan 2025 10:59:31 +0000 Subject: [PATCH 2/2] feat: super usdc deployed to base --- script/deployments/prod/1/8453.json | 3 +++ script/utils/deploy_supervault.sh | 2 +- script/utils/verify_contracts.sh | 2 +- snapshots/Deposit.json | 9 --------- snapshots/Rebalance.json | 6 ------ 5 files changed, 5 insertions(+), 17 deletions(-) create mode 100644 script/deployments/prod/1/8453.json delete mode 100644 snapshots/Deposit.json delete mode 100644 snapshots/Rebalance.json diff --git a/script/deployments/prod/1/8453.json b/script/deployments/prod/1/8453.json new file mode 100644 index 0000000..c2454bb --- /dev/null +++ b/script/deployments/prod/1/8453.json @@ -0,0 +1,3 @@ +{ + "SuperVault": "0xe9F2a5F9f3c846f29066d7fB3564F8E6B6b2D65b" +} \ No newline at end of file diff --git a/script/utils/deploy_supervault.sh b/script/utils/deploy_supervault.sh index 3a03462..b59bfc0 100644 --- a/script/utils/deploy_supervault.sh +++ b/script/utils/deploy_supervault.sh @@ -18,7 +18,7 @@ export TENDERLY_ACCESS_TOKEN=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/TENDERLY_ echo Deploying SV To Production: ... forge script script/forge-scripts/Deploy.SuperVault.s.sol:MainnetDeploySuperVault --sig "deploySuperVault(uint256,uint256)" 0 8453 \ - --rpc-url $BSC_RPC_URL \ + --rpc-url $BASE_RPC_URL \ --account default \ --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 \ --legacy \ diff --git a/script/utils/verify_contracts.sh b/script/utils/verify_contracts.sh index 4a3378a..b2d3944 100644 --- a/script/utils/verify_contracts.sh +++ b/script/utils/verify_contracts.sh @@ -26,7 +26,7 @@ export BASESCAN_API_KEY=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/BASESCAN_API_K export NETWORK_ID=8453 -forge verify-contract 0xBD34DB7ef42533A51eb0F53eD9D91D06880bcdf1 "src/SuperVault.sol:SuperVault" --chain-id $NETWORK_ID \ +forge verify-contract 0xe9F2a5F9f3c846f29066d7fB3564F8E6B6b2D65b "src/SuperVault.sol:SuperVault" --chain-id $NETWORK_ID \ --num-of-optimizations 200 \ --watch \ --compiler-version v0.8.23 \ diff --git a/snapshots/Deposit.json b/snapshots/Deposit.json deleted file mode 100644 index aa216f5..0000000 --- a/snapshots/Deposit.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Deposit with one underlying superform: Aave": "765658", - "Deposit with one underlying superform: Fluid": "649484", - "Deposit with one underlying superform: Morpho": "1748696", - "Deposit with three underlying superforms: Aave + Fluid + Morpho": "2186758", - "Deposit with two underlying superforms: Aave + Fluid": "946357", - "Deposit with two underlying superforms: Aave + Morpho": "1986806", - "Deposit with two underlying superforms: Fluid + Morpho": "1884426" -} \ No newline at end of file diff --git a/snapshots/Rebalance.json b/snapshots/Rebalance.json deleted file mode 100644 index b2bbc1e..0000000 --- a/snapshots/Rebalance.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Rebalance with three underlying superforms: Aave + Fluid + Morpho": "2288318", - "Rebalance with two underlying superforms: Aave + Fluid": "743725", - "Rebalance with two underlying superforms: Aave + Morpho": "2168509", - "Rebalance with two underlying superforms: Fluid + Morpho": "2004865" -} \ No newline at end of file