etherfi-protocol · pankajjagtapp · May 26, 2026 · May 26, 2026 · May 26, 2026 · May 26, 2026
diff --git a/.github/workflows/run-forge-tests.yaml b/.github/workflows/run-forge-tests.yaml
@@ -30,6 +30,7 @@ jobs:
         run: forge test -vvv
         env:
           MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
+          OP_RPC_URL: ${{ secrets.OP_RPC_URL }}
           SCROLL_RPC_URL: ${{ secrets.SCROLL_RPC_URL }}
           HISTORICAL_PROOF_812_WITHDRAWAL_RPC_URL: ${{ secrets.HISTORICAL_PROOF_812_WITHDRAWAL_RPC_URL }}
           HISTORICAL_PROOF_RPC_URL: ${{ secrets.HISTORICAL_PROOF_RPC_URL }}

diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,9 @@ typechain-types
 .vscode/
 release/logs/txns/*
 
+# Lock files
+foundry.lock
+
 # Hardhat files
 cache
 artifacts

diff --git a/deployment/AuctionManager/2026-06-26-22-16-11.json b/deployment/AuctionManager/2026-06-26-22-16-11.json
@@ -0,0 +1,15 @@
+{
+  "contractName": "AuctionManager",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_blacklister": "0x5585996E7cFE95f2D99e61168B8b35C66Ff99B18",
+      "_nodeOperatorManagerContract": "0xd5edf7730ABAd812247F6F54D7bd31a52554e35E",
+      "_stakingManagerContractAddress": "0x25e821b7197B146F7713C3b89B6A4D83516B912d",
+      "_treasury": "0x0c83EAe1FE72c390A02E426572854931EefF93BA"
+    }
+  },
+  "deployedAddress": "0x3311c72A04D2779f4425c036dBC40d14fEc0162b"
+}
diff --git a/deployment/Blacklister/2026-06-26-22-16-11.json b/deployment/Blacklister/2026-06-26-22-16-11.json
@@ -0,0 +1,11 @@
+{
+  "contractName": "Blacklister",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9"
+    }
+  },
+  "deployedAddress": "0xBC870C47c6eB10009A0720e76F166f104C124ecF"
+}
diff --git a/deployment/CumulativeMerkleRewardsDistributor/2026-06-26-22-16-11.json b/deployment/CumulativeMerkleRewardsDistributor/2026-06-26-22-16-11.json
@@ -0,0 +1,11 @@
+{
+  "contractName": "CumulativeMerkleRewardsDistributor",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9"
+    }
+  },
+  "deployedAddress": "0x9eb91bD087Ff6381E2497e54Fd796c6a166e6a8a"
+}
diff --git a/deployment/EETH/2026-06-26-22-16-11.json b/deployment/EETH/2026-06-26-22-16-11.json
@@ -0,0 +1,14 @@
+{
+  "contractName": "EETH",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_blacklister": "0x5585996E7cFE95f2D99e61168B8b35C66Ff99B18",
+      "_rateLimiter": "0x6C7c54cfC2225fA985cD25F04d923B93c60a02F8"
+    }
+  },
+  "deployedAddress": "0xd1901dD36CBf4a81386d0162DF2707f7dDb60527"
+}
diff --git a/deployment/EtherFiNode/2026-06-26-22-16-11.json b/deployment/EtherFiNode/2026-06-26-22-16-11.json
@@ -0,0 +1,14 @@
+{
+  "contractName": "EtherFiNode",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_etherFiNodesManager": "0x8B71140AD2e5d1E7018d2a7f8a288BD3CD38916F",
+      "_eigenPodManager": "0x91E677b07F7AF907ec9a428aafA9fc14a0d3A338",
+      "_delegationManager": "0x39053D51B77DC0d36036Fc1fCc8Cb819df8Ef37A"
+    }
+  },
+  "deployedAddress": "0x556Db8c611FE63e694413F718d795f976dcF5881"
+}
diff --git a/deployment/EtherFiNodesManager/2026-06-26-22-16-11.json b/deployment/EtherFiNodesManager/2026-06-26-22-16-11.json
@@ -0,0 +1,13 @@
+{
+  "contractName": "EtherFiNodesManager",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_stakingManager": "0x25e821b7197B146F7713C3b89B6A4D83516B912d",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_rateLimiter": "0x6C7c54cfC2225fA985cD25F04d923B93c60a02F8"
+    }
+  },
+  "deployedAddress": "0xcF5928EA7d7F164ec868cEdA7a69E08a102B5e05"
+}
diff --git a/deployment/EtherFiOracle/2026-06-26-22-16-11.json b/deployment/EtherFiOracle/2026-06-26-22-16-11.json
@@ -0,0 +1,13 @@
+{
+  "contractName": "EtherFiOracle",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_minQuorumSize": "3",
+      "_etherFiAdmin": "0x0EF8fa4760Db8f5Cd4d993f3e3416f30f942D705",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9"
+    }
+  },
+  "deployedAddress": "0x0565c8Ea133fF27ba9D471330A52068a268A2b9e"
+}
diff --git a/deployment/EtherFiRateLimiter/2026-06-26-22-16-11.json b/deployment/EtherFiRateLimiter/2026-06-26-22-16-11.json
@@ -0,0 +1,13 @@
+{
+  "contractName": "EtherFiRateLimiter",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_eETH": "0x35fA164735182de50811E8e2E824cFb9B6118ac2",
+      "_weETH": "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee"
+    }
+  },
+  "deployedAddress": "0x9Ea4D0Fd09B628E23B1998F2153e27E5261B1B67"
+}
diff --git a/deployment/EtherFiRestaker/2026-06-26-22-16-11.json b/deployment/EtherFiRestaker/2026-06-26-22-16-11.json
@@ -0,0 +1,18 @@
+{
+  "contractName": "EtherFiRestaker",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_liquifier": "0x9FFDF407cDe9a93c47611799DA23924Af3EF764F",
+      "_rewardsCoordinator": "0x7750d328b314EfFa365A0402CcfD489B80B0adda",
+      "_etherFiRedemptionManager": "0xDadEf1fFBFeaAB4f68A9fD181395F68b4e4E7Ae0",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_rateLimiter": "0x6C7c54cfC2225fA985cD25F04d923B93c60a02F8",
+      "_eigenLayerStrategyManager": "0x858646372CC42E1A627fcE94aa7A7033e7CF075A",
+      "_eigenLayerDelegationManager": "0x39053D51B77DC0d36036Fc1fCc8Cb819df8Ef37A"
+    }
+  },
+  "deployedAddress": "0x51357a700B309637F109A897a6479A563D5AFb8E"
+}
diff --git a/deployment/EtherFiRewardsRouter/2026-06-26-22-16-11.json b/deployment/EtherFiRewardsRouter/2026-06-26-22-16-11.json
@@ -0,0 +1,13 @@
+{
+  "contractName": "EtherFiRewardsRouter",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_treasury": "0x0c83EAe1FE72c390A02E426572854931EefF93BA",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9"
+    }
+  },
+  "deployedAddress": "0xCB9614b005F11F7781e92fF2B4a9AEBfAEB33E76"
+}
diff --git a/deployment/MembershipManager/2026-06-26-22-16-11.json b/deployment/MembershipManager/2026-06-26-22-16-11.json
@@ -0,0 +1,15 @@
+{
+  "contractName": "MembershipManager",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_eETH": "0x35fA164735182de50811E8e2E824cFb9B6118ac2",
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_membershipNFT": "0xb49e4420eA6e35F98060Cd133842DbeA9c27e479",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_blacklister": "0x5585996E7cFE95f2D99e61168B8b35C66Ff99B18"
+    }
+  },
+  "deployedAddress": "0xa9DbE5C7C8172ef83a30c143892E0010420e6307"
+}
diff --git a/deployment/MembershipNFT/2026-06-26-22-16-11.json b/deployment/MembershipNFT/2026-06-26-22-16-11.json
@@ -0,0 +1,14 @@
+{
+  "contractName": "MembershipNFT",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_membershipManager": "0x3d320286E014C3e1ce99Af6d6B00f0C1D63E3000",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_blacklister": "0x5585996E7cFE95f2D99e61168B8b35C66Ff99B18"
+    }
+  },
+  "deployedAddress": "0xD43D99Df3D42675ce126a7CfF8F7DfF037620851"
+}
diff --git a/deployment/NodeOperatorManager/2026-06-26-22-16-11.json b/deployment/NodeOperatorManager/2026-06-26-22-16-11.json
@@ -0,0 +1,12 @@
+{
+  "contractName": "NodeOperatorManager",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_auctionManagerContractAddress": "0x00C452aFFee3a17d9Cecc1Bcd2B8d5C7635C4CB9"
+    }
+  },
+  "deployedAddress": "0x2474d68d6E9f7Be77C9A343ce21DBE16F0743BD3"
+}
diff --git a/deployment/PriorityWithdrawalQueue/2026-06-26-22-16-11.json b/deployment/PriorityWithdrawalQueue/2026-06-26-22-16-11.json
@@ -0,0 +1,16 @@
+{
+  "contractName": "PriorityWithdrawalQueue",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_eETH": "0x35fA164735182de50811E8e2E824cFb9B6118ac2",
+      "_weETH": "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee",
+      "_blacklister": "0x5585996E7cFE95f2D99e61168B8b35C66Ff99B18",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_minDelay": "3600"
+    }
+  },
+  "deployedAddress": "0x77b929bEFe793367712C0c28Ca8E857bf23A2296"
+}
diff --git a/deployment/RestakingRewardsRouter/2026-06-26-22-16-11.json b/deployment/RestakingRewardsRouter/2026-06-26-22-16-11.json
@@ -0,0 +1,13 @@
+{
+  "contractName": "RestakingRewardsRouter",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_rewardTokenAddress": "0xec53bF9167f50cDEB3Ae105f56099aaaB9061F83",
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216"
+    }
+  },
+  "deployedAddress": "0x6BF6AcD4b22795080c719D987BAa8F4FCb1Ab3F8"
+}
diff --git a/deployment/RevokeAdmin/2026-06-26-22-16-11.json b/deployment/RevokeAdmin/2026-06-26-22-16-11.json
@@ -0,0 +1,11 @@
+{
+  "contractName": "RevokeAdmin",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9"
+    }
+  },
+  "deployedAddress": "0x5a765826700CF3a918eB713b3a7978e9333085Df"
+}
diff --git a/deployment/RoleRegistry/2026-06-26-22-16-11.json b/deployment/RoleRegistry/2026-06-26-22-16-11.json
@@ -0,0 +1,11 @@
+{
+  "contractName": "RoleRegistry",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_revokeAdmin": "0x4A84BA0b5e716b37C78D0F5094757205626C7C1e"
+    }
+  },
+  "deployedAddress": "0x3B44A093b9736af765f98F3245998f63bc757970"
+}
diff --git a/deployment/StakingManager/2026-06-26-22-16-11.json b/deployment/StakingManager/2026-06-26-22-16-11.json
@@ -0,0 +1,16 @@
+{
+  "contractName": "StakingManager",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_etherFiNodesManager": "0x8B71140AD2e5d1E7018d2a7f8a288BD3CD38916F",
+      "_ethDepositContract": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
+      "_auctionManager": "0x00C452aFFee3a17d9Cecc1Bcd2B8d5C7635C4CB9",
+      "_etherFiNodeBeacon": "0x3c55986Cfee455E2533F4D29006634EcF9B7c03F",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9"
+    }
+  },
+  "deployedAddress": "0x66e1C53e846eF3E9f3722591868AfcFfB7f39800"
+}
diff --git a/deployment/UUPSProxy/2026-06-26-22-16-11.json b/deployment/UUPSProxy/2026-06-26-22-16-11.json
@@ -0,0 +1,12 @@
+{
+  "contractName": "UUPSProxy",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_implementation": "0x5a765826700CF3a918eB713b3a7978e9333085Df",
+      "_data": "0x8129fc1c"
+    }
+  },
+  "deployedAddress": "0x4A84BA0b5e716b37C78D0F5094757205626C7C1e"
+}
diff --git a/deployment/WeETH/2026-06-26-22-16-11.json b/deployment/WeETH/2026-06-26-22-16-11.json
@@ -0,0 +1,14 @@
+{
+  "contractName": "WeETH",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_eETH": "0x35fA164735182de50811E8e2E824cFb9B6118ac2",
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_blacklister": "0x5585996E7cFE95f2D99e61168B8b35C66Ff99B18"
+    }
+  },
+  "deployedAddress": "0xA6Ca0607190d03CF16fe6F2865Cf40c3D160ccf3"
+}
diff --git a/deployment/WeETHWithdrawAdapter/2026-06-26-22-16-11.json b/deployment/WeETHWithdrawAdapter/2026-06-26-22-16-11.json
@@ -0,0 +1,15 @@
+{
+  "contractName": "WeETHWithdrawAdapter",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_weETH": "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee",
+      "_eETH": "0x35fA164735182de50811E8e2E824cFb9B6118ac2",
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_blacklister": "0x5585996E7cFE95f2D99e61168B8b35C66Ff99B18"
+    }
+  },
+  "deployedAddress": "0xbe386B1Fb51ffAcAE0522a5dA099371cd4a2AAeA"
+}
diff --git a/deployment/WithdrawRequestNFT/2026-06-26-22-16-11.json b/deployment/WithdrawRequestNFT/2026-06-26-22-16-11.json
@@ -0,0 +1,14 @@
+{
+  "contractName": "WithdrawRequestNFT",
+  "deploymentParameters": {
+    "factory": "0x356d1B83970CeF2018F2c9337cDdb67dff5AEF99",
+    "salt": "0x0f1e8d966c85bcd3b352d94da15fe2eae61f897c000000000000000000000000",
+    "constructorArgs": {
+      "_liquidityPool": "0x308861A430be4cce5502d0A12724771Fc6DaF216",
+      "_roleRegistry": "0x62247D29B4B9BECf4BB73E0c722cf6445cfC7cE9",
+      "_blacklister": "0x5585996E7cFE95f2D99e61168B8b35C66Ff99B18",
+      "_etherFiAdmin": "0x0EF8fa4760Db8f5Cd4d993f3e3416f30f942D705"
+    }
+  },
+  "deployedAddress": "0x41617D01362770ebAAC10311aB899FBc8a4E4A7E"
+}
diff --git a/...igenlayer-libraries/BeaconChainProofs.sol → ...igenlayer-libraries/BeaconChainProofs.sol b/...igenlayer-libraries/BeaconChainProofs.sol → ...igenlayer-libraries/BeaconChainProofs.sol
@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.0;
 
-import "./EigenlayerMerkle.sol";
-import "./Endian.sol";
+import "@eigenlayer-libraries/EigenlayerMerkle.sol";
+import "@eigenlayer-libraries/Endian.sol";
 
 //Utility library for parsing and PHASE0 beacon chain block headers
 //SSZ Spec: https://github.com/ethereum/consensus-specs/blob/dev/ssz/simple-serialize.md#merkleization

diff --git a/src/eigenlayer-libraries/BytesLib.sol → lib/eigenlayer-libraries/BytesLib.sol b/src/eigenlayer-libraries/BytesLib.sol → lib/eigenlayer-libraries/BytesLib.sol
diff --git a/...layer-libraries/EIP1271SignatureUtils.sol → ...layer-libraries/EIP1271SignatureUtils.sol b/...layer-libraries/EIP1271SignatureUtils.sol → ...layer-libraries/EIP1271SignatureUtils.sol
diff --git a/...eigenlayer-libraries/EigenlayerMerkle.sol → ...eigenlayer-libraries/EigenlayerMerkle.sol b/...eigenlayer-libraries/EigenlayerMerkle.sol → ...eigenlayer-libraries/EigenlayerMerkle.sol
diff --git a/src/eigenlayer-libraries/Endian.sol → lib/eigenlayer-libraries/Endian.sol b/src/eigenlayer-libraries/Endian.sol → lib/eigenlayer-libraries/Endian.sol
diff --git a/...yer-libraries/LegacyBeaconChainProofs.sol → ...yer-libraries/LegacyBeaconChainProofs.sol b/...yer-libraries/LegacyBeaconChainProofs.sol → ...yer-libraries/LegacyBeaconChainProofs.sol
@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.0;
 
-import "./EigenlayerMerkle.sol";
-import "./Endian.sol";
+import "@eigenlayer-libraries/EigenlayerMerkle.sol";
+import "@eigenlayer-libraries/Endian.sol";
 
 //Utility library for parsing and PHASE0 beacon chain block headers
 //SSZ Spec: https://github.com/ethereum/consensus-specs/blob/dev/ssz/simple-serialize.md#merkleization

diff --git a/src/eigenlayer-libraries/Merkle.sol → lib/eigenlayer-libraries/Merkle.sol b/src/eigenlayer-libraries/Merkle.sol → lib/eigenlayer-libraries/Merkle.sol
diff --git a/src/eigenlayer-libraries/OperatorSetLib.sol → lib/eigenlayer-libraries/OperatorSetLib.sol b/src/eigenlayer-libraries/OperatorSetLib.sol → lib/eigenlayer-libraries/OperatorSetLib.sol
diff --git a/src/eigenlayer-libraries/SlashingLib.sol → lib/eigenlayer-libraries/SlashingLib.sol b/src/eigenlayer-libraries/SlashingLib.sol → lib/eigenlayer-libraries/SlashingLib.sol
diff --git a/...nlayer-libraries/StructuredLinkedList.sol → ...nlayer-libraries/StructuredLinkedList.sol b/...nlayer-libraries/StructuredLinkedList.sol → ...nlayer-libraries/StructuredLinkedList.sol
diff --git a/remappings.txt b/remappings.txt
@@ -2,7 +2,10 @@ forge-std/=lib/forge-std/src/
 @openzeppelin/=lib/openzeppelin-contracts/
 @openzeppelin-upgradeable/=lib/openzeppelin-contracts-upgradeable/
 @uniswap/=lib/
-@eigenlayer/=lib/eigenlayer-contracts/src/
+@eigenlayer-libraries/=lib/eigenlayer-libraries
+@etherfi/=src/
+@tests/=test/
+@scripts/=script/
 @layerzerolabs/lz-evm-oapp-v2/contracts/=lib/Etherfi-SyncPools/node_modules/@layerzerolabs/lz-evm-oapp-v2/contracts/
 @layerzerolabs/lz-evm-protocol-v2/contracts/=lib/Etherfi-SyncPools/node_modules/@layerzerolabs/lz-evm-protocol-v2/contracts/
 @layerzerolabs/lz-evm-messagelib-v2/contracts/=lib/Etherfi-SyncPools/node_modules/@layerzerolabs/lz-evm-messagelib-v2/contracts/