pay contract: add pre and post calls. new dprelayer deployments

daimo-eth · Nov 4, 2024 · fe746d7 · fe746d7
1 parent db7213f
commit fe746d7
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 100 deletions.
diff --git a/packages/contract/broadcast/DeployDaimoPayRelayer.s.sol/10/run-latest.json b/packages/contract/broadcast/DeployDaimoPayRelayer.s.sol/10/run-latest.json
diff --git a/packages/contract/broadcast/DeployDaimoPayRelayer.s.sol/56/run-latest.json b/packages/contract/broadcast/DeployDaimoPayRelayer.s.sol/56/run-latest.json
diff --git a/packages/contract/broadcast/DeployDaimoPayRelayer.s.sol/8453/run-latest.json b/packages/contract/broadcast/DeployDaimoPayRelayer.s.sol/8453/run-latest.json
diff --git a/packages/contract/script/pay/DeployDaimoPayRelayer.s.sol b/packages/contract/script/pay/DeployDaimoPayRelayer.s.sol
@@ -14,7 +14,7 @@ contract DeployDaimoPayRelayer is Script {
         vm.startBroadcast();
 
         address daimoPayRelayer = CREATE3.deploy(
-            keccak256("DaimoPayRelayer-options1"),
+            keccak256("DaimoPayRelayer-options2"),
             abi.encodePacked(
                 type(DaimoPayRelayer).creationCode,
                 abi.encode(owner)

diff --git a/packages/contract/src/pay/DaimoPayRelayer.sol b/packages/contract/src/pay/DaimoPayRelayer.sol
@@ -121,15 +121,29 @@ contract DaimoPayRelayer is Ownable2Step {
         Call[] calldata preCalls,
         DaimoPay dp,
         PayIntent calldata intent,
-        Call[] calldata calls,
-        bytes calldata bridgeExtraData
+        Call[] calldata startCalls,
+        bytes calldata bridgeExtraData,
+        Call[] calldata postCalls
     ) public payable onlyOwner {
+        // Make pre-start calls
         for (uint256 i = 0; i < preCalls.length; ++i) {
             Call calldata call = preCalls[i];
             (bool success, ) = call.to.call{value: call.value}(call.data);
             require(success, "DPR: preCall failed");
         }
-        dp.startIntent(intent, calls, bridgeExtraData);
+
+        dp.startIntent({
+            intent: intent,
+            calls: startCalls,
+            bridgeExtraData: bridgeExtraData
+        });
+
+        // Make post-start calls
+        for (uint256 i = 0; i < postCalls.length; ++i) {
+            Call calldata call = postCalls[i];
+            (bool success, ) = call.to.call{value: call.value}(call.data);
+            require(success, "DPR: postCall failed");
+        }
     }
 
     function fastFinish(
@@ -148,18 +162,27 @@ contract DaimoPayRelayer is Ownable2Step {
     }
 
     function claimAndKeep(
-        Call calldata mintCall,
+        Call[] calldata preCalls,
         DaimoPay dp,
         PayIntent calldata intent,
-        Call[] calldata calls
+        Call[] calldata claimCalls,
+        Call[] calldata postCalls
     ) public onlyOwner {
-        if (mintCall.data.length > 0) {
-            (bool success, ) = mintCall.to.call{value: mintCall.value}(
-                mintCall.data
-            );
+        // Make pre-claim calls
+        for (uint256 i = 0; i < preCalls.length; ++i) {
+            Call calldata call = preCalls[i];
+            (bool success, ) = call.to.call{value: call.value}(call.data);
+            require(success, "DPR: preCall failed");
         }
 
-        dp.claimIntent({intent: intent, calls: calls});
+        dp.claimIntent({intent: intent, calls: claimCalls});
+
+        // Make post-claim calls
+        for (uint256 i = 0; i < postCalls.length; ++i) {
+            Call calldata call = postCalls[i];
+            (bool success, ) = call.to.call{value: call.value}(call.data);
+            require(success, "DPR: postCall failed");
+        }
 
         // Transfer any bridgeTokenOut balance back to the owner
         uint256 n = intent.bridgeTokenOutOptions.length;

diff --git a/packages/daimo-contract/src/codegen/contracts.ts b/packages/daimo-contract/src/codegen/contracts.ts
@@ -4604,9 +4604,9 @@ export const daimoPayRelayerAbi = [
     type: 'function',
     inputs: [
       {
-        name: 'mintCall',
-        internalType: 'struct Call',
-        type: 'tuple',
+        name: 'preCalls',
+        internalType: 'struct Call[]',
+        type: 'tuple[]',
         components: [
           { name: 'to', internalType: 'address', type: 'address' },
           { name: 'value', internalType: 'uint256', type: 'uint256' },
@@ -4662,7 +4662,17 @@ export const daimoPayRelayerAbi = [
         ],
       },
       {
-        name: 'calls',
+        name: 'claimCalls',
+        internalType: 'struct Call[]',
+        type: 'tuple[]',
+        components: [
+          { name: 'to', internalType: 'address', type: 'address' },
+          { name: 'value', internalType: 'uint256', type: 'uint256' },
+          { name: 'data', internalType: 'bytes', type: 'bytes' },
+        ],
+      },
+      {
+        name: 'postCalls',
         internalType: 'struct Call[]',
         type: 'tuple[]',
         components: [
@@ -4834,7 +4844,7 @@ export const daimoPayRelayerAbi = [
         ],
       },
       {
-        name: 'calls',
+        name: 'startCalls',
         internalType: 'struct Call[]',
         type: 'tuple[]',
         components: [
@@ -4844,6 +4854,16 @@ export const daimoPayRelayerAbi = [
         ],
       },
       { name: 'bridgeExtraData', internalType: 'bytes', type: 'bytes' },
+      {
+        name: 'postCalls',
+        internalType: 'struct Call[]',
+        type: 'tuple[]',
+        components: [
+          { name: 'to', internalType: 'address', type: 'address' },
+          { name: 'value', internalType: 'uint256', type: 'uint256' },
+          { name: 'data', internalType: 'bytes', type: 'bytes' },
+        ],
+      },
     ],
     name: 'startIntent',
     outputs: [],

diff --git a/packages/daimo-contract/src/index.ts b/packages/daimo-contract/src/index.ts
@@ -69,13 +69,13 @@ export const daimoPayBridgerAddress =
   "0x6b052F3A28eA1078c431FBface949559568ef960";
 /** Daimo Pay Axelar bridger address */
 export const daimoPayAxelarBridgerAddress =
-  "0xd0838A173e6a246928642Ed94b30Ae481Af545a3";
+  "0x32F372328ac108fDbf9009A9729f28699E1919f3";
 /** Daimo Pay intent factory address */
 export const payIntentFactoryAddress =
   "0xF46F51c7855bDa3bFB48161fcAf40484923BeCee";
 /** Daimo Pay relayer address */
 export const daimoPayRelayerAddress =
-  "0x5a648289c56DBF5b3A1F5af838261Bda6e9D0375";
+  "0x9f85421578bd7bd6eC5684cbABB4C77B90575F05";
 
 // DAv2
 export const entryPointV07Address =