👷🏻 🚀 ✅ Add sender to context and perpsMarketSNXV3 to paymaster

Kwenta · Jul 9, 2024 · 28014a6 · 28014a6
1 parent 7d5ac41
commit 28014a6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -14,11 +14,13 @@ import {MarginPaymaster} from "src/MarginPaymaster.sol";
 contract Setup is Script {
     function deploySystem(
         address entryPoint,
-        address smartMarginV3
+        address smartMarginV3,
+        address perpsMarketSNXV3
     ) public returns (address) {
         MarginPaymaster marginPaymaster = new MarginPaymaster(
             entryPoint,
-            smartMarginV3
+            smartMarginV3,
+            perpsMarketSNXV3
         );
         return address(marginPaymaster);
     }
@@ -32,7 +34,11 @@ contract DeployBase is Setup, BaseParameters {
         uint256 privateKey = vm.envUint("PRIVATE_KEY");
         vm.startBroadcast(privateKey);
 
-        Setup.deploySystem(CANONICAL_ENTRY_POINT, SMART_MARGIN_V3);
+        Setup.deploySystem(
+            CANONICAL_ENTRY_POINT,
+            SMART_MARGIN_V3,
+            PERPS_MARKET_PROXY_ANDROMEDA
+        );
 
         vm.stopBroadcast();
     }

diff --git a/src/MarginPaymaster.sol b/src/MarginPaymaster.sol
@@ -10,28 +10,35 @@ import {console} from "forge-std/console.sol";
 contract MarginPaymaster is IPaymaster {
     address public immutable entryPoint;
     address public immutable smartMarginV3;
+    address public immutable perpsMarketSNXV3;
 
     error InvalidEntryPoint();
 
-    constructor(address _entryPoint, address _smartMarginV3) {
+    constructor(
+        address _entryPoint,
+        address _smartMarginV3,
+        address _perpsMarketSNXV3
+    ) {
         entryPoint = _entryPoint;
         smartMarginV3 = _smartMarginV3;
+        perpsMarketSNXV3 = _perpsMarketSNXV3;
     }
 
     function validatePaymasterUserOp(
-        UserOperation calldata,
+        UserOperation calldata userOp,
         bytes32,
         uint256
     ) external returns (bytes memory context, uint256 validationData) {
         if (msg.sender != entryPoint) revert InvalidEntryPoint();
         console.log("validatePaymasterUserOp");
         // context = new bytes(0); // passed to the postOp method
-        context = "yo"; // passed to the postOp method
+        context = abi.encode(userOp.sender); // passed to the postOp method
         validationData = 0; // special value means no validation
     }
 
-    function postOp(PostOpMode, bytes calldata, uint256) external {
+    function postOp(PostOpMode, bytes calldata context, uint256) external {
         if (msg.sender != entryPoint) revert InvalidEntryPoint();
-        console.log("postOp");
+        address sender = abi.decode(context, (address));
+        console.log("postOp", sender);
     }
 }
diff --git a/test/utils/Bootstrap.sol b/test/utils/Bootstrap.sol
@@ -48,6 +48,7 @@ contract Bootstrap is Test {
         BootstrapLocal bootstrap = new BootstrapLocal();
         marginPaymasterAddress = bootstrap.init(
             address(entryPoint),
+            address(0),
             address(0)
         );
         marginPaymaster = MarginPaymaster(marginPaymasterAddress);
@@ -98,11 +99,13 @@ contract Bootstrap is Test {
 contract BootstrapLocal is Setup {
     function init(
         address entryPoint,
-        address smartMarginV3
+        address smartMarginV3,
+        address perpsMarketSNXV3
     ) public returns (address) {
         address marginPaymasterAddress = Setup.deploySystem(
             entryPoint,
-            smartMarginV3
+            smartMarginV3,
+            perpsMarketSNXV3
         );
 
         return marginPaymasterAddress;
@@ -126,7 +129,8 @@ contract BootstrapBase is Setup, BaseParameters {
     {
         address marginPaymasterAddress = Setup.deploySystem(
             CANONICAL_ENTRY_POINT,
-            SMART_MARGIN_V3
+            SMART_MARGIN_V3,
+            PERPS_MARKET_PROXY_ANDROMEDA
         );
 
         return (