Merge pull request #72 from base-org/jack/paymaster

Add Paymaster implementation for destination chain ERC-4337 UserOp support

Author: jackchuma

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "contracts/lib/optimism"]
 	path = contracts/lib/optimism
 	url = https://github.com/ethereum-optimism/optimism
+[submodule "contracts/lib/account-abstraction"]
+	path = contracts/lib/account-abstraction
+	url = https://github.com/eth-infinitism/account-abstraction
+[submodule "contracts/lib/solady"]
+	path = contracts/lib/solady
+	url = https://github.com/Vectorized/solady

contracts/lib/account-abstraction

@@ -3,6 +3,8 @@ pragma solidity 0.8.24;
 
 import {Script} from "forge-std/Script.sol";
 
+import {EntryPoint} from "account-abstraction/core/EntryPoint.sol";
+
 contract HelperConfig is Script {
     struct NetworkConfig {
         uint256 chainId;
@@ -13,21 +15,25 @@ contract HelperConfig is Script {
         address l2Oracle;
         address shoyuBashi;
         uint256 deployerKey;
+        address entryPoint;
     }
 
     uint256 public DEFAULT_ANVIL_PRIVATE_KEY = 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80;
 
     uint256 public constant ARBITRUM_SEPOLIA_CHAIN_ID = 421614;
     uint256 public constant BASE_SEPOLIA_CHAIN_ID = 84532;
     uint256 public constant OPTIMISM_SEPOLIA_CHAIN_ID = 11155420;
+    uint256 public constant LOCAL_CHAIN_ID = 31337;
 
-    function getConfig(uint256 chainId) public view returns (NetworkConfig memory config) {
+    function getConfig(uint256 chainId) public returns (NetworkConfig memory config) {
         if (chainId == ARBITRUM_SEPOLIA_CHAIN_ID) {
             return getArbitrumSepoliaConfig();
         } else if (chainId == BASE_SEPOLIA_CHAIN_ID) {
             return getBaseSepoliaConfig();
         } else if (chainId == OPTIMISM_SEPOLIA_CHAIN_ID) {
             return getOptimismSepoliaConfig();
+        } else if (chainId == LOCAL_CHAIN_ID) {
+            return getLocalConfig();
         }
 
         require(false, "Unsupported chain");
@@ -42,7 +48,8 @@ contract HelperConfig is Script {
             inbox: 0x3925cA932720B63ccD2C359DF27fD4146b123628,
             l2Oracle: 0x042B2E6C5E99d4c521bd49beeD5E99651D9B0Cf4,
             shoyuBashi: 0xce8b068D4F7F2eb3bDAFa72eC3C4feE78CF9Ccf7,
-            deployerKey: vm.envUint("PRIVATE_KEY")
+            deployerKey: vm.envUint("PRIVATE_KEY"),
+            entryPoint: address(0)
         });
     }
 
@@ -55,7 +62,8 @@ contract HelperConfig is Script {
             inbox: 0x0D595D4d3dC06548D536e74528C5B8ecc2171B31,
             l2Oracle: 0x4C8BA32A5DAC2A720bb35CeDB51D6B067D104205,
             shoyuBashi: 0x6602dc9b6bd964C2a11BBdA9B2275308D1Bbc14f,
-            deployerKey: vm.envUint("PRIVATE_KEY")
+            deployerKey: vm.envUint("PRIVATE_KEY"),
+            entryPoint: address(0)
         });
     }
 
@@ -68,7 +76,27 @@ contract HelperConfig is Script {
             inbox: 0x27B9e81C31eab9fdB8Ed1280680b23299FBa4cd8,
             l2Oracle: 0x218CD9489199F321E1177b56385d333c5B598629,
             shoyuBashi: 0x7237bb8d1d38DF8b473b5A38eD90088AF162ad8e,
-            deployerKey: vm.envUint("PRIVATE_KEY")
+            deployerKey: vm.envUint("PRIVATE_KEY"),
+            entryPoint: address(0)
+        });
+    }
+
+    function getLocalConfig() public returns (NetworkConfig memory) {
+        EntryPoint entryPoint = new EntryPoint();
+
+        return NetworkConfig({
+            chainId: LOCAL_CHAIN_ID,
+            opStackOutbox: address(0),
+            arbitrumOutbox: address(0),
+            hashiOutbox: address(0),
+            inbox: address(0),
+            l2Oracle: address(0),
+            shoyuBashi: address(0),
+            deployerKey: 0,
+            entryPoint: address(entryPoint)
         });
     }
+
+    // Including to block from coverage report
+    function test() external {}
 }

contracts/lib/solady

@@ -39,7 +39,6 @@ contract SubmitRequest is Script, ERC7786Base {
 
     function _initMessage(uint256 destinationChainId, uint256 duration)
         private
-        view
         returns (string memory, Message[] memory, bytes[] memory)
     {
         HelperConfig.NetworkConfig memory dstConfig = helperConfig.getConfig(destinationChainId);
@@ -64,4 +63,7 @@ contract SubmitRequest is Script, ERC7786Base {
 
         return (destinationChain, calls, attributes);
     }
+
+    // Including to block from coverage report
+    function test() external {}
 }

contracts/script/DeployRIP7755Inbox.s.sol

@@ -10,7 +10,7 @@ import {RIP7755Inbox} from "../../src/RIP7755Inbox.sol";
 contract SubmitToInbox is Script, ERC7786Base {
     function run() external {
         uint256 pk = vm.envUint("PRIVATE_KEY");
-        RIP7755Inbox inbox = RIP7755Inbox(0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512);
+        RIP7755Inbox inbox = RIP7755Inbox(payable(0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512));
 
         (string memory sourceChain, string memory sender, Message[] memory messages, bytes[] memory attributes) =
             _initMessage();
@@ -44,4 +44,7 @@ contract SubmitToInbox is Script, ERC7786Base {
 
         return (sourceChain, sender, calls, attributes);
     }
+
+    // Including to block from coverage report
+    function test() external {}
 }