Update legend script deploy script; deploy legend scripts

compound-finance · Mar 15, 2024 · 480e772 · 480e772
1 parent 9a47d51
commit 480e772
Show file tree

Hide file tree

Showing 11 changed files with 2,373 additions and 25 deletions.
diff --git a/broadcast/DeployLegendScripts.s.sol/11155111/run-1710538175.json b/broadcast/DeployLegendScripts.s.sol/11155111/run-1710538175.json
diff --git a/broadcast/DeployLegendScripts.s.sol/11155111/run-1710538194.json b/broadcast/DeployLegendScripts.s.sol/11155111/run-1710538194.json
diff --git a/broadcast/DeployLegendScripts.s.sol/11155111/run-1710538322.json b/broadcast/DeployLegendScripts.s.sol/11155111/run-1710538322.json
diff --git a/broadcast/DeployLegendScripts.s.sol/11155111/run-latest.json b/broadcast/DeployLegendScripts.s.sol/11155111/run-latest.json
diff --git a/broadcast/DeployLegendScripts.s.sol/84532/run-1710538342.json b/broadcast/DeployLegendScripts.s.sol/84532/run-1710538342.json
diff --git a/broadcast/DeployLegendScripts.s.sol/84532/run-1710538348.json b/broadcast/DeployLegendScripts.s.sol/84532/run-1710538348.json
diff --git a/broadcast/DeployLegendScripts.s.sol/84532/run-1710538465.json b/broadcast/DeployLegendScripts.s.sol/84532/run-1710538465.json
diff --git a/broadcast/DeployLegendScripts.s.sol/84532/run-latest.json b/broadcast/DeployLegendScripts.s.sol/84532/run-latest.json
diff --git a/quark-out.release-v2024-03-15+9a47d51.zip b/quark-out.release-v2024-03-15+9a47d51.zip
diff --git a/script/DeployTerminalScripts.s.sol → script/DeployLegendScripts.s.sol b/script/DeployTerminalScripts.s.sol → script/DeployLegendScripts.s.sol
@@ -32,7 +32,8 @@ import {
 // Optional ENV vars:
 // ETHERSCAN_KEY
 
-contract DeployTerminalScripts is Script {
+contract DeployLegendScripts is Script {
+    CodeJar codeJar;
     CometSupplyActions cometSupplyActions;
     CometWithdrawActions cometWithdrawActions;
     UniswapSwapActions uniswapSwapActions;
@@ -43,50 +44,39 @@ contract DeployTerminalScripts is Script {
 
     function run() public {
         address deployer = vm.addr(vm.envUint("DEPLOYER_PK"));
-        QuarkWalletProxyFactory factory = QuarkWalletProxyFactory(vm.envAddress("QUARK_WALLET_FACTORY_ADDRESS"));
-        CodeJar codeJar = QuarkWallet(payable(factory.walletImplementation())).codeJar();
+        codeJar = CodeJar(vm.envAddress("CODE_JAR"));
+        console.log("Code Jar Address: ", address(codeJar));
 
         vm.startBroadcast(deployer);
 
         console.log("=============================================================");
         console.log("Deploying Terminal Scripts");
 
-        cometSupplyActions = CometSupplyActions(
-            codeJar.saveCode(vm.getCode(string.concat("out/", "LegendScript.sol/CometSupplyActions.json")))
-        );
+        cometSupplyActions =
+            CometSupplyActions(codeJar.saveCode(abi.encodePacked(type(CometSupplyActions).creationCode)));
         console.log("CometSupplyActions Deployed:", address(cometSupplyActions));
 
-        cometWithdrawActions = CometWithdrawActions(
-            codeJar.saveCode(vm.getCode(string.concat("out/", "LegendScript.sol/CometWithdrawActions.json")))
-        );
+        cometWithdrawActions =
+            CometWithdrawActions(codeJar.saveCode(abi.encodePacked(type(CometWithdrawActions).creationCode)));
         console.log("CometWithdrawActions Deployed:", address(cometWithdrawActions));
 
-        uniswapSwapActions = UniswapSwapActions(
-            codeJar.saveCode(vm.getCode(string.concat("out/", "LegendScript.sol/UniswapSwapActions.json")))
-        );
+        uniswapSwapActions =
+            UniswapSwapActions(codeJar.saveCode(abi.encodePacked(type(UniswapSwapActions).creationCode)));
         console.log("UniswapSwapActions Deployed:", address(uniswapSwapActions));
 
-        transferActions = TransferActions(
-            codeJar.saveCode(vm.getCode(string.concat("out/", "LegendScript.sol/TransferActions.json")))
-        );
+        transferActions = TransferActions(codeJar.saveCode(abi.encodePacked(type(TransferActions).creationCode)));
         console.log("TransferActions Deployed:", address(transferActions));
 
-        cometClaimRewards = CometClaimRewards(
-            codeJar.saveCode(vm.getCode(string.concat("out/", "LegendScript.sol/CometClaimRewards.json")))
-        );
+        cometClaimRewards = CometClaimRewards(codeJar.saveCode(abi.encodePacked(type(CometClaimRewards).creationCode)));
         console.log("CometClaimRewards Deployed:", address(cometClaimRewards));
 
         cometSupplyMultipleAssetsAndBorrow = CometSupplyMultipleAssetsAndBorrow(
-            codeJar.saveCode(
-                vm.getCode(string.concat("out/", "LegendScript.sol/CometSupplyMultipleAssetsAndBorrow.json"))
-            )
+            codeJar.saveCode(abi.encodePacked(type(CometSupplyMultipleAssetsAndBorrow).creationCode))
         );
         console.log("CometSupplyMultipleAssetsAndBorrow Deployed:", address(cometSupplyMultipleAssetsAndBorrow));
 
         cometRepayAndWithdrawMultipleAssets = CometRepayAndWithdrawMultipleAssets(
-            codeJar.saveCode(
-                vm.getCode(string.concat("out/", "LegendScript.sol/CometRepayAndWithdrawMultipleAssets.json"))
-            )
+            codeJar.saveCode(abi.encodePacked(type(CometRepayAndWithdrawMultipleAssets).creationCode))
         );
         console.log("CometRepayAndWithdrawMultipleAssets Deployed:", address(cometRepayAndWithdrawMultipleAssets));
 

diff --git a/script/deploy-terminal-scripts.sh → script/deploy-legend-scripts.sh b/script/deploy-terminal-scripts.sh → script/deploy-legend-scripts.sh
@@ -25,7 +25,7 @@ forge script --via-ir \
     $wallet_args \
     $etherscan_args \
     $@ \
-    script/DeployTerminalScripts.s.sol:DeployTerminalScripts
+    script/DeployLegendScripts.s.sol:DeployLegendScripts
 
 repo_root=$(git rev-parse --show-toplevel)
 ${repo_root}/script/prepare-release.sh