Merge branch 'main' into implement-glacis-LF-11761

lifinance · Feb 20, 2025 · b928756 · b928756
2 parents a3af8ce + 40e5cda
commit b928756
Show file tree

Hide file tree

Showing 13 changed files with 672 additions and 228 deletions.
diff --git a/.env.example b/.env.example
@@ -73,3 +73,6 @@ GOERLI_ETHERSCAN_API_KEY=
 LINEATEST_ETHERSCAN_API_KEY=
 MUMBAI_ETHERSCAN_API_KEY=
 SEPOLIA_ETHERSCAN_API_KEY=
+
+# Mongo DB for SAFE transactions
+MONGODB_URI=""
diff --git a/.github/workflows/olympixStaticAnalysis.yml b/.github/workflows/olympixStaticAnalysis.yml
@@ -37,7 +37,7 @@ jobs:
         env:
           ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
         run: |
-          args=$(echo $ALL_CHANGED_FILES | xargs -n 1 -I {} printf -- "-p %s " "{}")
+          args=$(echo "$ALL_CHANGED_FILES" | xargs -n 1 printf -- "-p %s ")
           echo "ARGS=$args" >> $GITHUB_ENV
 
       - name: Run Olympix Integrated Security

diff --git a/.github/workflows/securityAlertsReview.yml b/.github/workflows/securityAlertsReview.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Check if Olympix Static Analysis has run at least once and was successful
         id: check-analysis
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GIT_ACTIONS_BOT_PAT_CLASSIC }}
           BRANCH_NAME: ${{ github.head_ref }}
         run: |
           # Fallback in case BRANCH_NAME is empty.
@@ -58,7 +58,7 @@ jobs:
       - name: Validate and set PR Number
         id: fetch_pr
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GIT_ACTIONS_BOT_PAT_CLASSIC }}
         run: |
           if [ -z "${{ steps.findPr.outputs.number }}" ]; then
             echo "Error: No pull request found." >&2
@@ -71,7 +71,7 @@ jobs:
 
       - name: Fetch Security Alerts for PR
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GIT_ACTIONS_BOT_PAT_CLASSIC }}
         run: |
           echo "Fetching security alerts for PR #${PR_NUMBER}..."
           
@@ -118,7 +118,7 @@ jobs:
       - name: Find Existing PR Comment
         id: find_comment
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GIT_ACTIONS_BOT_PAT_CLASSIC }}
         run: |
           echo "Searching for existing PR comment..."
           
@@ -134,7 +134,7 @@ jobs:
 
       - name: Post or Update PR Comment
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GIT_ACTIONS_BOT_PAT_CLASSIC }}
         run: |
           COMMENT_BODY="### 🤖 GitHub Action: Security Alerts Review 🔍\n\n"
 
@@ -235,7 +235,7 @@ jobs:
 
       - name: Check if Action Should Fail And Revert To Draft
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GIT_ACTIONS_BOT_PAT_CLASSIC }}
           PR_NUMBER: ${{ env.PR_NUMBER }}
         run: |
           echo "🔍 Checking if the workflow should fail and revert PR to draft based on security alerts..."
@@ -269,4 +269,4 @@ jobs:
             exit 1
           fi
 
-          echo "✅ No blocking security issues found. The workflow will pass successfully."
+          echo "✅ No blocking security issues found. The workflow will pass successfully."
diff --git a/.github/workflows/versionControlAndAuditCheck.yml b/.github/workflows/versionControlAndAuditCheck.yml
@@ -393,8 +393,8 @@ jobs:
           echo "This step will make sure that an audit is logged for each contract modified/added by this PR."
           echo "It will also make sure that no information is missing in the audit log and that the information is meaningful."
 
-          # load list of protected contracts
-          PROTECTED_CONTRACTS=$(cat contracts_for_audit.txt)
+          # convert from comma-separated to newline-separated
+          PROTECTED_CONTRACTS=$(tr ',' '\n' < contracts_for_audit.txt)
           echo "PROTECTED_CONTRACTS: $PROTECTED_CONTRACTS"
 
           ##### make sure that there are any protected contracts

diff --git a/config/dexs.json b/config/dexs.json
@@ -453,7 +453,8 @@
     "0xBBDe1d67297329148Fe1ED5e6B00114842728e65",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
-    "0xc55332b1d758e798a8dB1f255B029f045C4958b7"
+    "0xc55332b1d758e798a8dB1f255B029f045C4958b7",
+    "0x6a000f20005980200259b80c5102003040001068"
   ],
   "gravity": [
     "0x79540403cdE176Ca5f1fb95bE84A7ec91fFDEF76",
@@ -604,7 +605,8 @@
     "0x6c5A9e667297b409B5dD9850b38889ab84110c2A",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
-    "0xc55332b1d758e798a8dB1f255B029f045C4958b7"
+    "0xc55332b1d758e798a8dB1f255B029f045C4958b7",
+    "0x85CD07Ea01423b1E937929B44E4Ad8c40BbB5E71"
   ],
   "moonriver": [
     "0x5215E9fd223BC909083fbdB2860213873046e45d",
@@ -630,7 +632,8 @@
     "0x9e4791ad13f14783C7B2A6A7bD8D6DDD1DC95847",
     "0x7af71799C40F952237eAA4D81A77C1af49125113",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
-    "0xc55332b1d758e798a8dB1f255B029f045C4958b7"
+    "0xc55332b1d758e798a8dB1f255B029f045C4958b7",
+    "0x85CD07Ea01423b1E937929B44E4Ad8c40BbB5E71"
   ],
   "nova": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",

diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json
@@ -19713,6 +19713,16 @@
             "SALT": "09072024",
             "VERIFIED": "true"
           }
+        ],
+        "1.2.1": [
+          {
+            "ADDRESS": "0x3c0727E3Ab7BAf3a4205f518f1b7570d68Da19ba",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2025-02-06 18:50:14",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000d37bbe5744d730a1d98d8dc97c42f0ca46ad7146",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
         ]
       }
     },

diff --git a/deployments/mainnet.diamond.json b/deployments/mainnet.diamond.json
@@ -121,13 +121,13 @@
         "Name": "CalldataVerificationFacet",
         "Version": "1.1.1"
       },
-      "0xF965f52046D7095d5080bD31459601F4Eb24f72D": {
-        "Name": "",
-        "Version": ""
+      "0x424BDbbaEda89732443fb1B737b6Dc194a6Ddbd5": {
+        "Name": "RelayFacet",
+        "Version": "1.0.0"
       },
-      "0x376f99f7EADE8A17f036fCff9eBA978E66e5fd28": {
+      "0x3c0727E3Ab7BAf3a4205f518f1b7570d68Da19ba": {
         "Name": "ThorSwapFacet",
-        "Version": "1.2.0"
+        "Version": "1.2.1"
       },
       "0x711e80A9c1eB906d9Ae9d37E5432E6E7aCeEdA0B": {
         "Name": "WithdrawFacet",
@@ -161,9 +161,9 @@
         "Name": "AcrossFacetPackedV3",
         "Version": "1.2.0"
       },
-      "0x00990C0FfBB7eAB014351652aFB65AaE00db43A4": {
-        "Name": "",
-        "Version": ""
+      "0x5052fc5c7486162deDf7458E1f7c6ABaFbcd6895": {
+        "Name": "AcrossFacetV3",
+        "Version": "1.1.0"
       },
       "0x6F2baA7cd5F156CA1B132F7FF11E0fa2aD775F61": {
         "Name": "EmergencyPauseFacet",
@@ -173,17 +173,9 @@
         "Name": "GasZipFacet",
         "Version": "2.0.0"
       },
-      "0x6e00e0a7685Ca22c288d56D9E7924746B5043Ee7": {
-        "Name": "AcrossFacetV3",
-        "Version": "1.0.0"
-      },
-      "0x424BDbbaEda89732443fb1B737b6Dc194a6Ddbd5": {
-        "Name": "RelayFacet",
+      "0x18C85B940c29ECC3c210Ea40a5B6d91F5aeE2803": {
+        "Name": "DeBridgeDlnFacet",
         "Version": "1.0.0"
-      },
-      "0x5052fc5c7486162deDf7458E1f7c6ABaFbcd6895": {
-        "Name": "AcrossFacetV3",
-        "Version": "1.1.0"
       }
     },
     "Periphery": {

diff --git a/deployments/mainnet.json b/deployments/mainnet.json
@@ -45,7 +45,7 @@
   "StandardizedCallFacet": "0x175E7799DA0CD40E641352EaB90D8e39e02a4Ca9",
   "CalldataVerificationFacet": "0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0",
   "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C",
-  "ThorSwapFacet": "0x376f99f7EADE8A17f036fCff9eBA978E66e5fd28",
+  "ThorSwapFacet": "0x3c0727E3Ab7BAf3a4205f518f1b7570d68Da19ba",
   "AcrossFacetPacked": "0xE397c4883ec89ed4Fc9D258F00C689708b2799c9",
   "AmarokFacetPacked": "0xF18A285f4e6f720Eb9b4e05df71f88b9552E6ADB",
   "SymbiosisFacet": "0xe12b2488c71432F9a116E9ac244D3Ef4c2386d3a",
@@ -65,4 +65,4 @@
   "Permit2Proxy": "0x6307119078556Fc8aD77781DFC67df20d75FB4f9",
   "RelayFacet": "0x424BDbbaEda89732443fb1B737b6Dc194a6Ddbd5",
   "DeBridgeDlnFacet": "0x18C85B940c29ECC3c210Ea40a5B6d91F5aeE2803"
-}
+}
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "@layerzerolabs/lz-v2-utilities": "^2.3.21",
     "@octokit/rest": "^21.0.1",
     "@safe-global/api-kit": "^2.3.1",
-    "@safe-global/protocol-kit": "^3.1.0",
+    "@safe-global/protocol-kit": "^5.2.1",
     "@safe-global/safe-apps-sdk": "^9.0.0",
     "@safe-global/safe-core-sdk-types": "^4.1.0",
     "@uma/sdk": "^0.22.1",
@@ -96,6 +96,7 @@
     "enquirer": "^2.4.1",
     "light-spinner": "^1.0.4",
     "merkletreejs": "^0.3.11",
+    "mongodb": "^6.13.0",
     "notify-send": "^0.1.2",
     "pino": "^7.9.2",
     "tsx": "^4.19.2",