lifinance · mirooon · Jun 5, 2025 · Jun 6, 2025 · Jun 6, 2025 · Jun 10, 2025
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -28,7 +28,6 @@ module.exports = {
     'no-empty-function': 'off',
     eqeqeq: ['error', 'always'],
     'prefer-const': 'error',
-    curly: ['error', 'multi'], // Allow single-line statements without braces
     'no-template-curly-in-string': 'error', // Warns about `${var}` in regular strings
     'no-throw-literal': 'error', // Requires throwing Error objects instead of literals
     '@typescript-eslint/return-await': ['error', 'in-try-catch'], // More nuanced control over return await

diff --git a/src/Facets/DexManagerFacet.sol → archive/src/Facets/DexManagerFacet.sol b/src/Facets/DexManagerFacet.sol → archive/src/Facets/DexManagerFacet.sol
diff --git a/archive/test/Facets/CelerIMFacet.t.sol b/archive/test/Facets/CelerIMFacet.t.sol
@@ -2,14 +2,14 @@
 pragma solidity ^0.8.17;
 
 import { LibSwap, TestBaseFacet } from "../utils/TestBaseFacet.sol";
-import { LibAllowList } from "lifi/Libraries/LibAllowList.sol";
 import { CelerIMFacetMutable, IMessageBus, MsgDataTypes, IERC20, CelerIM } from "lifi/Facets/CelerIMFacetMutable.sol";
 import { RelayerCelerIM } from "lifi/Periphery/RelayerCelerIM.sol";
 import { ERC20Proxy } from "lifi/Periphery/ERC20Proxy.sol";
 import { Executor } from "lifi/Periphery/Executor.sol";
+import { TestWhitelistManagerBase } from "../utils/TestWhitelistManagerBase.sol";
 
 // Stub CelerIMFacet Contract
-contract TestCelerIMFacet is CelerIMFacetMutable {
+contract TestCelerIMFacet is CelerIMFacetMutable, TestWhitelistManagerBase {
     constructor(
         IMessageBus _messageBus,
         address _relayerOwner,
@@ -23,14 +23,6 @@ contract TestCelerIMFacet is CelerIMFacetMutable {
             _cfUSDC
         )
     {}
-
-    function addDex(address _dex) external {
-        LibAllowList.addAllowedContract(_dex);
-    }
-
-    function setFunctionApprovalBySignature(bytes4 _signature) external {
-        LibAllowList.addAllowedSelector(_signature);
-    }
 }
 
 interface Ownable {
@@ -119,22 +111,22 @@ contract CelerIMFacetTest is TestBaseFacet {
         functionSelectors[1] = celerIMFacet
             .swapAndStartBridgeTokensViaCelerIM
             .selector;
-        functionSelectors[2] = celerIMFacet.addDex.selector;
+        functionSelectors[2] = celerIMFacet.addToWhitelist.selector;
         functionSelectors[3] = celerIMFacet
-            .setFunctionApprovalBySignature
+            .setFunctionApprovalBySelector
             .selector;
 
         addFacet(diamond, address(celerIMFacet), functionSelectors);
 
         celerIMFacet = TestCelerIMFacet(address(diamond));
-        celerIMFacet.addDex(address(uniswap));
-        celerIMFacet.setFunctionApprovalBySignature(
+        celerIMFacet.addToWhitelist(address(uniswap));
+        celerIMFacet.setFunctionApprovalBySelector(
             uniswap.swapExactTokensForTokens.selector
         );
-        celerIMFacet.setFunctionApprovalBySignature(
+        celerIMFacet.setFunctionApprovalBySelector(
             uniswap.swapTokensForExactETH.selector
         );
-        celerIMFacet.setFunctionApprovalBySignature(
+        celerIMFacet.setFunctionApprovalBySelector(
             uniswap.swapETHForExactTokens.selector
         );
         setFacetAddressInTestBase(address(celerIMFacet), "cBridgeFacet");

diff --git a/audit/auditLog.json b/audit/auditLog.json
@@ -636,4 +636,4 @@
       "1.0.1": ["audit20250706"]
     }
   }
-}
+}
diff --git a/config/global.json b/config/global.json
@@ -5,28 +5,28 @@
   "pauserWallet": "0xd38743b48d26743C0Ec6898d699394FBc94657Ee",
   "lifuelRebalanceWallet": "0xC71284231A726A18ac85c94D75f9fe17A185BeAF",
   "deployerWallet": "0x11F1022cA6AdEF6400e5677528a80d49a069C00c",
-  "approvedSigsForRefundWallet": [
+  "approvedSelectorsForRefundWallet": [
     {
-      "sig": "0x0d19e519",
+      "selector": "0x0d19e519",
       "name": "CBridgeFacet.triggerRefund"
     },
     {
-      "sig": "0xd9caed12",
+      "selector": "0xd9caed12",
       "name": "WithdrawFacet.withdraw"
     }
   ],
-  "approvedSigsForDeployerWallet": [
+  "approvedSelectorsForDeployerWallet": [
     {
-      "sig": "0xfcd8e49e",
-      "name": "DexManagerFacet.batchAddDex"
+      "selector": "0x2db6fa36",
+      "name": "WhitelistManagerFacet.batchAddToWhitelist"
     },
     {
-      "sig": "0x9afc19c7",
-      "name": "DexManagerFacet.batchRemoveDex"
+      "selector": "0x045fb888",
+      "name": "WhitelistManagerFacet.batchRemoveFromWhitelist"
     },
     {
-      "sig": "0x44e2b18c",
-      "name": "DexManagerFacet.batchSetFunctionApprovalBySignature"
+      "selector": "0xecd18517",
+      "name": "WhitelistManagerFacet.batchSetFunctionWhitelistBySelector"
     }
   ],
   "safeOwners": [
@@ -46,7 +46,7 @@
   "coreFacets": [
     "AccessManagerFacet",
     "CalldataVerificationFacet",
-    "DexManagerFacet",
+    "WhitelistManagerFacet",
     "DiamondCutFacet",
     "DiamondLoupeFacet",
     "EmergencyPauseFacet",

diff --git a/config/networks.json b/config/networks.json
@@ -450,7 +450,7 @@
     "wrappedNativeAddress": "0x5555555555555555555555555555555555555555",
     "status": "active",
     "type": "mainnet",
-    "rpcUrl": "https://hyperliquid-json-rpc.stakely.io",
+    "rpcUrl": "https://rpc.hypurrscan.io",
     "verificationType": "blockscout",
     "explorerUrl": "https://hyperevmscan.io",
     "explorerApiUrl": "https://api.etherscan.io/v2/api?chainid=999",

diff --git a/config/whitelistManager.json b/config/whitelistManager.json
@@ -0,0 +1,188 @@
+{
+  "functionSelectorsToRemove": [
+    "0x01617fab",
+    "0x03b87e5f",
+    "0x04204ceb",
+    "0x04e45aaf",
+    "0x0502b1c5",
+    "0x07ed2379",
+    "0x08298b5a",
+    "0x083001ba",
+    "0x09b81346",
+    "0x0a512416",
+    "0x0b86a4c1",
+    "0x0d5f0e3b",
+    "0x117aa677",
+    "0x11bcc81e",
+    "0x12345678",
+    "0x12aa3caf",
+    "0x160e8be3",
+    "0x188ac35d",
+    "0x18cbafe5",
+    "0x19367472",
+    "0x1a01c532",
+    "0x1b113d4d",
+    "0x1c58db4f",
+    "0x1e6d24c2",
+    "0x1eacd35f",
+    "0x1f0464d1",
+    "0x21025a06",
+    "0x2213bc0b",
+    "0x22dca3d7",
+    "0x23856bc3",
+    "0x24856bc3",
+    "0x24dd6483",
+    "0x2646478b",
+    "0x2a197298",
+    "0x2bf6e9ec",
+    "0x2e95b6c8",
+    "0x2fa11647",
+    "0x301a3720",
+    "0x30eef8bd",
+    "0x32af3139",
+    "0x33320de3",
+    "0x3593564c",
+    "0x3598d8ab",
+    "0x3865bde6",
+    "0x38ed1739",
+    "0x3b635ce4",
+    "0x3ccfd60b",
+    "0x3cdf133f",
+    "0x3eca9c0a",
+    "0x414bf389",
+    "0x415565b0",
+    "0x42712a67",
+    "0x45977d03",
+    "0x4629fd85",
+    "0x46c67b6d",
+    "0x472b43f3",
+    "0x476357fe",
+    "0x47f8bd41",
+    "0x49228978",
+    "0x49404b7c",
+    "0x49616997",
+    "0x4a25d94a",
+    "0x4dcebcba",
+    "0x5023b4df",
+    "0x5028bb95",
+    "0x5161b966",
+    "0x54bacd13",
+    "0x54e3f31b",
+    "0x58f15100",
+    "0x59e50fed",
+    "0x5a099843",
+    "0x5ae401dc",
+    "0x5c11d795",
+    "0x5e94e28d",
+    "0x5f3bd1c8",
+    "0x62e238bb",
+    "0x6678ec1f",
+    "0x676528d1",
+    "0x6af479b2",
+    "0x6b58f2f0",
+    "0x6e5129d1",
+    "0x715018a6",
+    "0x72c8913d",
+    "0x74ef98d9",
+    "0x7515d97c",
+    "0x7617b389",
+    "0x762b1562",
+    "0x77725df6",
+    "0x78e3214f",
+    "0x791ac947",
+    "0x7a1eb1b9",
+    "0x7a42416a",
+    "0x7bf2d6d4",
+    "0x7c025200",
+    "0x7f457675",
+    "0x7ff36ab5",
+    "0x803ba26d",
+    "0x81791788",
+    "0x83800a8e",
+    "0x83bd37f9",
+    "0x84a7f3dd",
+    "0x84bd6d29",
+    "0x862738f9",
+    "0x87654321",
+    "0x876a02f6",
+    "0x8770ba91",
+    "0x8803dbee",
+    "0x8980041a",
+    "0x89af926a",
+    "0x8a657e67",
+    "0x8af033fb",
+    "0x8b71ae6c",
+    "0x8fd8d1bb",
+    "0x90411a32",
+    "0x91695586",
+    "0x94cfab17",
+    "0x9570eeee",
+    "0x987e7d8e",
+    "0x9a2967d2",
+    "0x9b2c0a37",
+    "0xa22c27fe",
+    "0xa2a1623d",
+    "0xa5669eae",
+    "0xa5be382e",
+    "0xa6886da9",
+    "0xa76dfc3b",
+    "0xa76f4eb6",
+    "0xa816ca92",
+    "0xa8676443",
+    "0xa94e78ef",
+    "0xac9650d8",
+    "0xb0431182",
+    "0xb22f4db8",
+    "0xb35d7e73",
+    "0xb56c9663",
+    "0xb6f9de95",
+    "0xb80c2f09",
+    "0xb858183f",
+    "0xb94c3609",
+    "0xbc80f1a8",
+    "0xc04b8d59",
+    "0xc43c9ef6",
+    "0xc4af5a74",
+    "0xc57559dd",
+    "0xc63113ad",
+    "0xc6aabf84",
+    "0xce8d3bde",
+    "0xcf81464b",
+    "0xd0a3b665",
+    "0xd0e30db0",
+    "0xd33721a5",
+    "0xd4ef38de",
+    "0xd57360fc",
+    "0xd6ed22e6",
+    "0xd85ca173",
+    "0xd9627aa4",
+    "0xda1a5f42",
+    "0xda35bb0d",
+    "0xdb3e2198",
+    "0xdd343700",
+    "0xdd9c5f96",
+    "0xdef65669",
+    "0xe0cbc5f2",
+    "0xe21fd0e9",
+    "0xe37ed256",
+    "0xe3ead59e",
+    "0xe449022e",
+    "0xe5d7bde6",
+    "0xe8bb3b6c",
+    "0xee623204",
+    "0xeedd56e1",
+    "0xf28c0498",
+    "0xf2fde38b",
+    "0xf35b4733",
+    "0xf35cae90",
+    "0xf52e33f5",
+    "0xf78dc253",
+    "0xf7fcd384",
+    "0xf87dc1b7",
+    "0xf8be52e1",
+    "0xfa461e33",
+    "0xfb3bdb41",
+    "0xfc374157",
+    "0xff84aafa"
+  ]
+}
diff --git a/config/dexs.json → config/whitelistedAddresses.json b/config/dexs.json → config/whitelistedAddresses.json
diff --git a/config/sigs.json → config/whitelistedSelectors.json b/config/sigs.json → config/whitelistedSelectors.json
@@ -1,5 +1,5 @@
 {
-  "sigs": [
+  "selectors": [
     "0x862738f9",
     "0x1b113d4d",
     "0x3593564c",
@@ -90,7 +90,6 @@
     "0x301a3720",
     "0x7a1eb1b9",
     "0xb22f4db8",
-    "0x3593564c",
     "0x24856bc3",
     "0x5161b966",
     "0xb858183f",

diff --git a/conventions.md b/conventions.md
@@ -379,6 +379,36 @@ We use Foundry as our primary development and testing framework. Foundry provide
 - Any contract inheriting from `TestBase.sol` must call `initTestBase()` in `setUp()`
 - Use `vm.startPrank(address)` and `vm.stopPrank()` for user simulation
 
+### Test Inheritance and Whitelist Management
+
+- For facets that require whitelist functionality:
+  - Test contracts should inherit from `TestWhitelistManagerBase`
+  - This provides standard whitelist management functions:
+    - `addToWhitelist(address)`
+    - `removeFromWhitelist(address)`
+    - `setFunctionWhitelistBySelector(bytes4)`
+    - `removeFunctionApprovalBySelector(bytes4)`
+  - Example pattern:
+    ```solidity
+    contract TestFacet is TestWhitelistManagerBase {
+        constructor() {}
+    }
+
+    contract FacetTest is TestBase {
+        TestFacet internal facet;
+
+        function setUp() public {
+            initTestBase();
+            facet = new TestFacet();
+            // Add required whitelist approvals
+            facet.addToWhitelist(ADDRESS_UNISWAP);
+            facet.setFunctionWhitelistBySelector(
+                uniswap.swapExactTokensForTokens.selector
+            );
+        }
+    }
+    ```
+
 ### Assertions and Event Testing
 
 - Use `assertEq()` for checking equality of values
-Original file line number
+Diff line change
@@ Expand Up / @@ -636,4 +636,4 @@ @@
           "1.0.1": ["audit20250706"]
         }
       }
-    }
+    }