Merge branch 'main' of github.com:lifinance/contracts into fixTypesAc…

…tion_6

.github/workflows/protectSecurityRelevantCode.yml

@@ -6,8 +6,8 @@ name: Protect security-critical code/system
 # - protects the pre-commit checker script stored in .husky/pre-commit
 
 on:
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+  pull_request_review:
+    types: [submitted]
 
 jobs:
   protect-critical-code:

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "lib/solady"]
 	path = lib/solady
 	url = https://github.com/Vectorized/solady
+[submodule "lib/Permit2"]
+	path = lib/Permit2
+	url = https://github.com/Uniswap/Permit2

audit/auditLog.json

@@ -34,19 +34,29 @@
       "auditorGitHandle": "sujithsomraaj",
       "auditReportPath": "./audit/reports/2024.11.05_EmergencyPauseFacet_ReAudit.pdf",
       "auditCommitHash": "da61880ba3847c07c35b64a78b957ff845ec18ac"
+    },
+    "audit20241122": {
+      "auditCompletedOn": "22.11.2024",
+      "auditedBy": "Sujith Somraaj (individual security researcher)",
+      "auditorGitHandle": "sujithsomraaj",
+      "auditReportPath": "./audit/reports/2024.11.22_Permit2Proxy.pdf",
+      "auditCommitHash": "0e3debb78abcdf9a9f934115338b611e16b039a0"
     }
   },
   "auditedContracts": {
-    "EmergencyPauseFacet": {
-      "1.0.0": ["audit20240913"],
-      "1.0.1": ["audit20241105"]
-    },
     "AcrossFacetV3": {
       "1.0.0": ["audit20241007"]
     },
     "AcrossFacetPackedV3": {
       "1.0.0": ["audit20241007"]
     },
+    "EmergencyPauseFacet": {
+      "1.0.0": ["audit20240913"],
+      "1.0.1": ["audit20241105"]
+    },
+    "Permit2Proxy": {
+      "1.0.0": ["audit20241122"]
+    },
     "ReceiverAcrossV3": {
       "1.0.0": ["audit20241007"]
     },

config/dexs.json

@@ -43,7 +43,8 @@
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0x7d0ccaa3fac1e5a943c5168b6ced828691b46b36",
-    "0x40aA958dd87FC8305b97f2BA922CDdCa374bcD7f"
+    "0x40aA958dd87FC8305b97f2BA922CDdCa374bcD7f",
+    "0xFe837A3530dD566401d35beFCd55582AF7c4dfFC"
   ],
   "arbitrum": [
     "0x5215E9fd223BC909083fbdB2860213873046e45d",
@@ -153,7 +154,8 @@
     "0x717b7948AA264DeCf4D780aa6914482e5F46Da3e",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0x1dac23e41fc8ce857e86fd8c1ae5b6121c67d96d",
-    "0x40aA958dd87FC8305b97f2BA922CDdCa374bcD7f"
+    "0x40aA958dd87FC8305b97f2BA922CDdCa374bcD7f",
+    "0x3a64Ec3606FF7310E8fAd6FcC008e39705fB496d"
   ],
   "base": [
     "0x5215E9fd223BC909083fbdB2860213873046e45d",
@@ -267,7 +269,8 @@
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0x9333c74bdd1e118634fe5664aca7a9710b108bab",
-    "0x2c34A2Fb1d0b4f55de51E1d0bDEfaDDce6b7cDD6"
+    "0x2c34A2Fb1d0b4f55de51E1d0bDEfaDDce6b7cDD6",
+    "0x0343C5757Fb98aD9eF39824e08B852aF61C71c64"
   ],
   "celo": [
     "0xC85c2B19958D116d79C654ecE73b359c08802A76",
@@ -313,7 +316,7 @@
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0x3a629404258dF01bef29Dd5d428508D92e207bD0",
     "0xf332761c673b59b21ff6dfa8ada44d78c12def09",
-    "0x70cbb871e8f30fc8ce23609e9e0ea87b6b222f58",
+    "0x70cbb871e8f30fc8ce23609e9e0ea87b6b222f58"
   ],
   "evmos": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -524,8 +527,7 @@
     "0xc02FFcdD914DbA646704439c6090BAbaD521d04C",
     "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
-    "0xd0f95fafa06de1b21e79db03c649919501e99ea9", 
+    "0xd0f95fafa06de1b21e79db03c649919501e99ea9",
     "0xbd0ebe49779e154e5042b34d5bcfbc498e4b3249"
   ],
   "moonbeam": [
@@ -700,7 +702,8 @@
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0xa748d6573aca135af68f2635be60cb80278bd855",
-    "0x3B86917369B83a6892f553609F3c2F439C184e31"
+    "0x3B86917369B83a6892f553609F3c2F439C184e31",
+    "0x46AFE01D758a46d64c7d8E0791314D5db3E2e683"
   ],
   "polygonzkevm": [
     "0x5215E9fd223BC909083fbdB2860213873046e45d",
@@ -742,7 +745,7 @@
     "0x9870F0C91D722B3393383722968269496d919bD8",
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
     "0xC82fd49be3F3D851b9E10589C50784cEAC7114a5",
-    "0xdb3af8df1cab8ae4159ed6a9b33df5f8c3ad1485", 
+    "0xdb3af8df1cab8ae4159ed6a9b33df5f8c3ad1485",
     "0x801d8ed849039007a7170830623180396492c7ed"
   ],
   "scroll": [
@@ -755,7 +758,6 @@
     "0xbfe03c9e20a9fc0b37de01a172f207004935e0b1",
     "0x0000000000005e88410ccdfade4a5efae4b49562",
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0x6b2c0c7be2048daa9b5527982c29f48062b34d58",
     "0x57df6092665eb6058DE53939612413ff4B09114E"
   ],
@@ -806,7 +808,6 @@
     "0xe832e655E4C3c36b2be5256915ECF8536a642f59",
     "0x6fd4383cb451173d5f9304f041c7bcbf27d561ff",
     "0x1F683faf1E2a770aa75f7B2e92117A5c11183E9C",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0xb9061e38fee7d30134f56aef7117e2f6d1580666",
     "0xc67879F4065d3B9fe1C09EE990B891Aa8E3a4c2f"
   ],
@@ -823,9 +824,7 @@
     "0xf91bb752490473b8342a3e964e855b9f9a2a668e"
   ],
   "avalancheFujiTestnet": [],
-  "bscTestnet": [
-    "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506"
-  ],
+  "bscTestnet": ["0x1b02da8cb0d097eb8d57a175b88c7d8b47997506"],
   "localanvil": [],
   "mumbai": [
     "0x5215E9fd223BC909083fbdB2860213873046e45d",
@@ -834,4 +833,4 @@
     "0xf471d32cb40837bf24529fcf17418fc1a4807626",
     "0x427bFc2E0aa683ec43fbF7861d5F4A74147938d8"
   ]
-}
+}

config/networks.json

@@ -102,9 +102,9 @@
     "explorerUrl": "https://blastscan.io",
     "explorerApiUrl": "https://api.blastscan.io/api",
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
-    "safeApiUrl": "https://transaction.blast-safe.io/api",
+    "safeApiUrl": "https://safe-transaction-blast.safe.global/api",
     "safeAddress": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
-    "safeWebUrl": "https://blast-safe.io/transactions/queue?safe=blastmainnet:0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=blast:0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "gasZipChainId": 96
   },
   "boba": {

config/permit2Proxy.json

@@ -0,0 +1,31 @@
+{
+  "mainnet": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "arbitrum": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "aurora": "",
+  "avalanche": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "base": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "blast": "0x000000000022d473030f116ddee9f6b43ac78ba3",
+  "boba": "",
+  "bsc": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "celo": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "fantom": "",
+  "fraxtal": "",
+  "fuse": "",
+  "gnosis": "",
+  "gravity": "",
+  "immutablezkevm": "",
+  "linea": "",
+  "mantle": "",
+  "metis": "",
+  "mode": "",
+  "moonbeam": "",
+  "moonriver": "",
+  "optimism": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "polygon": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "polygonzkevm": "",
+  "rootstock": "",
+  "scroll": "",
+  "sei": "",
+  "taiko": "",
+  "zksync": "0x0000000000225e31d15943971f47ad3022f714fa"
+}

config/sigs.json

@@ -8,7 +8,6 @@
     "0xc6aabf84",
     "0xf8be52e1",
     "0x1eacd35f",
-    "0x91695586",
     "0xa5be382e",
     "0xfc374157",
     "0x18cbafe5",
@@ -57,15 +56,13 @@
     "0x414bf389",
     "0xf28c0498",
     "0xdb3e2198",
-    "0xbc80f1a8",
     "0x84bd6d29",
     "0x62e238bb",
     "0x3eca9c0a",
     "0x9570eeee",
     "0x5a099843",
     "0xe5d7bde6",
     "0x12aa3caf",
-    "0xe449022e",
     "0xbc80f1a8",
     "0x0502b1c5",
     "0xf78dc253",
@@ -150,6 +147,8 @@
     "0x6678ec1f",
     "0x30eef8bd",
     "0x4dcebcba",
-    "0x03b87e5f"
+    "0x03b87e5f",
+    "0x0d5f0e3b",
+    "0x08298b5a"
   ]
 }