Merge branch 'main' of github.com:lifinance/contracts into deploy-sym…

…biosis-to-sonic-and-abstract
lifinance · Feb 5, 2025 · 8bcd587 · 8bcd587
2 parents 482e5e5 + 303dd23
commit 8bcd587
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/protectSecurityRelevantCode.yml b/.github/workflows/protectSecurityRelevantCode.yml
@@ -136,6 +136,7 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: pullNumber,
+              per_page: 100, // makes sure that only the LATEST 100 items are fetched (without this flag it gets all, starting with the first items)
             });
 
             // make sure that reviews are available

diff --git a/deployments/abstract.diamond.json b/deployments/abstract.diamond.json
@@ -81,4 +81,4 @@
       "TokenWrapper": "0x527868EDbF533C3Ac540f4457405f701D9d4c7c1"
     }
   }
-}
+}
diff --git a/deployments/abstract.json b/deployments/abstract.json
@@ -24,4 +24,4 @@
   "GasZipPeriphery": "0x2A3e04627E554b57163C078fd1d6698A655aeA12",
   "EmergencyPauseFacet": "0xDD5ae29dfA6634b186C8f842064A12a09bE9d2F8",
   "SymbiosisFacet": "0xe4db6A19c9F53fB946D31772a48002e1f9cB8763"
-}
+}
diff --git a/script/deploy/zksync/DeployLiFiDEXAggregator.zksync.s.sol b/script/deploy/zksync/DeployLiFiDEXAggregator.zksync.s.sol
@@ -23,15 +23,14 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/global.json");
+        string memory json = vm.readFile(path);
 
         address[] memory priviledgedUsers = new address[](1);
         priviledgedUsers[0] = _getConfigContractAddress(path, ".pauserWallet");
 
         // the original RouteProcessor4.sol is also deployed with address(0) for _bentoBox
-        address withdrawWalletAddress = _getConfigContractAddress(
-            path,
-            ".withdrawWallet"
-        );
-        return abi.encode(address(0), priviledgedUsers, withdrawWalletAddress);
+        address refundWalletAddress = json.readAddress(".refundWallet");
+
+        return abi.encode(address(0), priviledgedUsers, refundWalletAddress);
     }
 }
diff --git a/script/helperFunctions.sh b/script/helperFunctions.sh
@@ -1426,15 +1426,18 @@ function verifyContract() {
     if [ "$ARGS" = "0x" ]; then
       # only show output if DEBUG flag is activated
       if [[ "$DEBUG" == *"true"* ]]; then
+        if [[ $NETWORK == "zksync" || $NETWORK == "abstract" ]]; then
         if [[ $NETWORK == "zksync" || $NETWORK == "abstract" ]]; then
           # Verify using foundry-zksync
           FOUNDRY_PROFILE=zksync ./foundry-zksync/forge verify-contract --zksync --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --skip-is-verified-check -e "${!API_KEY}"
+          FOUNDRY_PROFILE=zksync ./foundry-zksync/forge verify-contract --zksync --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --skip-is-verified-check -e "${!API_KEY}"
         else
           forge verify-contract --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --skip-is-verified-check -e "${!API_KEY}"
         fi
 
         # TODO: add code that automatically identifies blockscout verification
       else
+        if [[ $NETWORK == "zksync" || $NETWORK == "abstract" ]]; then
         if [[ $NETWORK == "zksync" || $NETWORK == "abstract" ]]; then
           # Verify using foundry-zksync
           FOUNDRY_PROFILE=zksync ./foundry-zksync/forge verify-contract --zksync --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --skip-is-verified-check -e "${!API_KEY}" >/dev/null 2>&1
@@ -1445,13 +1448,15 @@ function verifyContract() {
     else
       # only show output if DEBUG flag is activated
       if [[ "$DEBUG" == *"true"* ]]; then
+        if [[ $NETWORK == "zksync" || $NETWORK == "abstract" ]]; then
         if [[ $NETWORK == "zksync" || $NETWORK == "abstract" ]]; then
           # Verify using foundry-zksync
          FOUNDRY_PROFILE=zksync ./foundry-zksync/forge verify-contract --zksync --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --constructor-args $ARGS --skip-is-verified-check -e "${!API_KEY}"
         else
           forge verify-contract --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --constructor-args $ARGS --skip-is-verified-check -e "${!API_KEY}"
         fi
       else
+        if [[ $NETWORK == "zksync" || $NETWORK == "abstract" ]]; then
         if [[ $NETWORK == "zksync" || $NETWORK == "abstract" ]]; then
           # Verify using foundry-zksync
          FOUNDRY_PROFILE=zksync ./foundry-zksync/forge verify-contract --zksync --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --constructor-args $ARGS --skip-is-verified-check -e "${!API_KEY}" >/dev/null 2>&1
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,4 +81,4 @@ @@
           "TokenWrapper": "0x527868EDbF533C3Ac540f4457405f701D9d4c7c1"
         }
       }
-    }
+    }