Merge branch 'main' into acrossv3-hotfix

lifinance · Dec 17, 2024 · 6c5989a · 6c5989a
2 parents 3bdbf13 + 5dcc604
commit 6c5989a
Show file tree

Hide file tree

Showing 28 changed files with 1,741 additions and 23 deletions.
diff --git a/.github/workflows/forceMergePRBypassAudit.yml b/.github/workflows/forceMergePRBypassAudit.yml
@@ -80,7 +80,6 @@ jobs:
         with:
           script: |
             const pr = parseInt(core.getInput('pr_number'));
-            const { context } = github;
             console.log(`Merging PR ${pr} now`)
 
             // Fetch PR details

diff --git a/.github/workflows/types.yaml b/.github/workflows/types.yaml
@@ -123,6 +123,7 @@ jobs:
           echo "Current version: $CURRENT_VERSION"
 
           VERSION_FRAGMENT=""
+          BETA=""
 
           # Determine the type of version bump
           if [[ "$BRANCH_NAME" == "main" ]]; then
@@ -151,10 +152,9 @@ jobs:
             PATCH=$((PATCH + 1))
           elif [[ "$VERSION_FRAGMENT" == "beta" ]]; then
             PATCH=$((PATCH + 1))
-            NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}-beta"
-          else
-            NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}"
+            BETA="-beta"
           fi
+          NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}${BETA}"
 
           echo "New version: $NEW_VERSION"
           echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
@@ -169,7 +169,7 @@ jobs:
         run: |
           cd lifi-contract-types
           TMP=$(mktemp)
-          jq --arg new_ver "$NEW_VERSION" '.version=$new_ver' package.json > "$TMP" && mv "$TMP" package.json
+          jq --arg version "$NEW_VERSION" '.version=$version' package.json > "$TMP" && mv "$TMP" package.json
           git config user.name github-actions
           git config user.email [email protected]
           echo "Updating version from $LATEST_TAG to $NEW_VERSION"

diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,4 @@ test/logs
 script/config.sh
 script/playground.sh
 test/solidity/TestPlayground.t.sol
+.aider*
diff --git a/audit/auditLog.json b/audit/auditLog.json
@@ -49,6 +49,13 @@
       "auditReportPath": "./audit/reports/2024.11.22_Permit2Proxy.pdf",
       "auditCommitHash": "0e3debb78abcdf9a9f934115338b611e16b039a0"
     },
+    "audit20241202": {
+      "auditCompletedOn": "02.12.2024",
+      "auditedBy": "Sujith Somraaj (individual security researcher)",
+      "auditorGitHandle": "sujithsomraaj",
+      "auditReportPath": "./audit/reports/2024-12-02_RelayFacet(v1.0.0).pdf",
+      "auditCommitHash": "291d0a78bc4174b3ec29bb2ce0b27c6b5d3e8ec8"
+    },
     "audit20241203": {
       "auditCompletedOn": "03.12.2024",
       "auditedBy": "Sujith Somraaj (individual security researcher)",
@@ -65,6 +72,11 @@
     }
   },
   "auditedContracts": {
+    "AcrossFacetPackedV3": {
+      "1.0.0": [
+        "audit20241007"
+      ]
+    },
     "AcrossFacetV3": {
       "1.0.0": [
         "audit20241007"
@@ -76,6 +88,14 @@
       ],
       "1.2.0": [
         "audit20241206"
+      ],
+    },
+    "EmergencyPauseFacet": {
+      "1.0.0": [
+        "audit20240913"
+      ],
+      "1.0.1": [
+        "audit20241105"
       ]
     },
     "GasZipFacet": {
@@ -93,12 +113,9 @@
         "audit20241107"
       ]
     },
-    "EmergencyPauseFacet": {
-      "1.0.0": [
-        "audit20240913"
-      ],
+    "LibAsset": {
       "1.0.1": [
-        "audit20241105"
+        "audit20241202"
       ]
     },
     "LiFiDEXAggregator": {
@@ -119,6 +136,11 @@
         "audit20241206"
       ]
     },
+    "RelayFacet": {
+      "1.0.0": [
+        "audit20241202"
+      ]
+    },
     "StargateFacetV2": {
       "1.0.1": [
         "audit20240814"

diff --git a/audit/reports/2024-12-02_RelayFacet(v1.0.0).pdf b/audit/reports/2024-12-02_RelayFacet(v1.0.0).pdf
diff --git a/config/relay.json b/config/relay.json
@@ -0,0 +1,46 @@
+{
+  "mainnet": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "optimism": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "polygon": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "boba": {
+    "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "arbitrum": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "avalanche": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "blast": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "mode": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "linea": {
+    "relayReceiver": "0x00000000aa467eba42a3d604b3d74d63b2b6c6cb",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "taiko": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  },
+  "scroll": {
+    "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934",
+    "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF"
+  }
+}
diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json
@@ -26370,5 +26370,49 @@
         ]
       }
     }
+  },
+  "RelayFacet": {
+    "arbitrum": {
+      "staging": {
+        "1.0.0": [
+          {
+            "ADDRESS": "0x3cf7dE0e31e13C93c8Aada774ADF1C7eD58157f5",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-11-07 14:15:11",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000a5f565650890fba1824ee0f21ebbbf660a179934000000000000000000000000f70da97812cb96acdf810712aa562db8dfa3dbef",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
+        ]
+      }
+    },
+    "polygon": {
+      "staging": {
+        "1.0.0": [
+          {
+            "ADDRESS": "0x3cf7dE0e31e13C93c8Aada774ADF1C7eD58157f5",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-11-07 14:16:01",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000a5f565650890fba1824ee0f21ebbbf660a179934000000000000000000000000f70da97812cb96acdf810712aa562db8dfa3dbef",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
+        ]
+      }
+    },
+    "optimism": {
+      "staging": {
+        "1.0.0": [
+          {
+            "ADDRESS": "0x3cf7dE0e31e13C93c8Aada774ADF1C7eD58157f5",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-11-07 14:17:16",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000a5f565650890fba1824ee0f21ebbbf660a179934000000000000000000000000f70da97812cb96acdf810712aa562db8dfa3dbef",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
+        ]
+      }
+    }
   }
 }
diff --git a/deployments/arbitrum.diamond.staging.json b/deployments/arbitrum.diamond.staging.json
@@ -125,9 +125,9 @@
         "Name": "",
         "Version": ""
       },
-      "0x2b64B62cbCfB38560222eBcfbbc4e65eC34c8Ce8": {
-        "Name": "",
-        "Version": ""
+      "0x74763722d92832d247cFa92825b06098cf72BAA2": {
+        "Name": "RelayFacet",
+        "Version": "1.0.0"
       },
       "0x6124C65B6264bE13f059b7C3A891a5b77DA8Bd95": {
         "Name": "AcrossFacetV3",
@@ -160,8 +160,8 @@
       "FeeCollector": "0x7F8E9bEBd1Dea263A36a6916B99bd84405B9654a",
       "LiFiDEXAggregator": "",
       "LiFuelFeeCollector": "0x94EA56D8049e93E0308B9c7d1418Baf6A7C68280",
-      "Receiver": "0x36E9B2E8A627474683eF3b1E9Df26D2bF04396f3",
       "ReceiverAcrossV3": "0x3877f47B560819E96BBD7e7700a02dfACe36D696",
+      "Receiver": "0x36E9B2E8A627474683eF3b1E9Df26D2bF04396f3",
       "ReceiverStargateV2": "",
       "RelayerCelerIM": "0xa1Ed8783AC96385482092b82eb952153998e9b70",
       "TokenWrapper": "0xF63b27AE2Dc887b88f82E2Cc597d07fBB2E78E70"

diff --git a/deployments/arbitrum.staging.json b/deployments/arbitrum.staging.json
@@ -49,5 +49,6 @@
   "Permit2Proxy": "0x6FC01BC9Ff6Cdab694Ec8Ca41B21a2F04C8c37E5",
   "AcrossFacetV3": "0x6124C65B6264bE13f059b7C3A891a5b77DA8Bd95",
   "ReceiverAcrossV3": "0xe4F3DEF14D61e47c696374453CD64d438FD277F8",
-  "AcrossFacetPackedV3": "0x21767081Ff52CE5563A29f27149D01C7127775A2"
+  "AcrossFacetPackedV3": "0x21767081Ff52CE5563A29f27149D01C7127775A2",
+  "RelayFacet": "0x3cf7dE0e31e13C93c8Aada774ADF1C7eD58157f5"
 }
diff --git a/deployments/optimism.diamond.staging.json b/deployments/optimism.diamond.staging.json
@@ -124,6 +124,10 @@
       "0x4352459F6BE1C7D1278F8c34Bb598b0feeB50f8b": {
         "Name": "AcrossFacetPackedV3",
         "Version": "1.0.0"
+      },
+      "0x74763722d92832d247cFa92825b06098cf72BAA2": {
+        "Name": "RelayFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -132,8 +136,8 @@
       "FeeCollector": "0x7F8E9bEBd1Dea263A36a6916B99bd84405B9654a",
       "LiFiDEXAggregator": "",
       "LiFuelFeeCollector": "0x94EA56D8049e93E0308B9c7d1418Baf6A7C68280",
-      "Receiver": "0x36E9B2E8A627474683eF3b1E9Df26D2bF04396f3",
       "ReceiverAcrossV3": "0x3877f47B560819E96BBD7e7700a02dfACe36D696",
+      "Receiver": "0x36E9B2E8A627474683eF3b1E9Df26D2bF04396f3",
       "ReceiverStargateV2": "",
       "RelayerCelerIM": "0xa1Ed8783AC96385482092b82eb952153998e9b70",
       "TokenWrapper": "0xF63b27AE2Dc887b88f82E2Cc597d07fBB2E78E70"

diff --git a/deployments/optimism.staging.json b/deployments/optimism.staging.json
@@ -39,5 +39,6 @@
   "EmergencyPauseFacet": "0x17Bb203F42d8e404ac7E8dB6ff972B7E8473850b",
   "AcrossFacetV3": "0x6124C65B6264bE13f059b7C3A891a5b77DA8Bd95",
   "ReceiverAcrossV3": "0x3877f47B560819E96BBD7e7700a02dfACe36D696",
-  "AcrossFacetPackedV3": "0x4352459F6BE1C7D1278F8c34Bb598b0feeB50f8b"
-}
+  "AcrossFacetPackedV3": "0x4352459F6BE1C7D1278F8c34Bb598b0feeB50f8b",
+  "RelayFacet": "0x3cf7dE0e31e13C93c8Aada774ADF1C7eD58157f5"
+}
diff --git a/deployments/polygon.diamond.staging.json b/deployments/polygon.diamond.staging.json
@@ -120,6 +120,10 @@
       "0xE15C7585636e62b88bA47A40621287086E0c2E33": {
         "Name": "",
         "Version": ""
+      },
+      "0x74763722d92832d247cFa92825b06098cf72BAA2": {
+        "Name": "RelayFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -128,8 +132,8 @@
       "FeeCollector": "0x7F8E9bEBd1Dea263A36a6916B99bd84405B9654a",
       "LiFiDEXAggregator": "",
       "LiFuelFeeCollector": "0x94EA56D8049e93E0308B9c7d1418Baf6A7C68280",
-      "Receiver": "0x36E9B2E8A627474683eF3b1E9Df26D2bF04396f3",
       "ReceiverAcrossV3": "",
+      "Receiver": "0x36E9B2E8A627474683eF3b1E9Df26D2bF04396f3",
       "ReceiverStargateV2": "",
       "ReceiverAcrossV3": "",
       "RelayerCelerIM": "0xa1Ed8783AC96385482092b82eb952153998e9b70",

diff --git a/deployments/polygon.staging.json b/deployments/polygon.staging.json
@@ -50,4 +50,6 @@
   "Permit2Proxy": "0x6FC01BC9Ff6Cdab694Ec8Ca41B21a2F04C8c37E5",
   "AcrossFacetPackedV3": "0x21767081Ff52CE5563A29f27149D01C7127775A2",
   "ReceiverAcrossV3": "0xe4F3DEF14D61e47c696374453CD64d438FD277F8"
+  "RelayFacet": "0x3cf7dE0e31e13C93c8Aada774ADF1C7eD58157f5",
+  "Permit2Proxy": "0x6FC01BC9Ff6Cdab694Ec8Ca41B21a2F04C8c37E5"
 }
diff --git a/docs/README.md b/docs/README.md
@@ -28,6 +28,7 @@
 - [Optimism Bridge Facet](./OptimismBridgeFacet.md)
 - [Periphery Registry Facet](./PeripheryRegistryFacet.md)
 - [Polygon Bridge Facet](./PolygonBridgeFacet.md)
+- [Relay Facet](./RelayFacet.md)
 - [Ronin Bridge Facet](./RoninBridgeFacet.md)
 - [Squid Facet](./SquidFacet.md)
 - [Standardized Call Facet](./StandardizedCallFacet.md)