pay contract: fix leftover recipient, redeploy

packages/contract/script/deployV2.sh

@@ -22,7 +22,7 @@ SCRIPTS=(
     # "script/pay/DeployDaimoPayBridger.s.sol"
     # "script/pay/DeployPayIntentFactory.s.sol"
     # "script/pay/DeployDaimoPay.s.sol"
-    # "script/pay/DeployDaimoPayRelayer.s.sol" # The deployer must be the LP that calls this contract.
+    "script/pay/DeployDaimoPayRelayer.s.sol" # The deployer must be the LP that calls this contract.
 
     # DAv2
     # "script/DeployFlexSwapperUniOnly.s.sol"
@@ -50,7 +50,7 @@ CHAINS=(
 
     # TESTNETS
     # "$ETHERSCAN_API_KEY_L1,https://eth-sepolia.g.alchemy.com/v2/$ALCHEMY_API_KEY"
-    # "$ETHERSCAN_API_KEY_BASE,https://sepolia.base.org"
+    "$ETHERSCAN_API_KEY_BASE,https://sepolia.base.org"
 
 )
 

packages/contract/script/pay/DeployDaimoPay.s.sol

@@ -12,7 +12,7 @@ contract DeployDaimoPay is Script {
 
         address intentFactory = CREATE3.getDeployed(
             msg.sender,
-            keccak256("PayIntentFactory-options4")
+            keccak256("PayIntentFactory-5")
         );
         address bridger = CREATE3.getDeployed(
             msg.sender,
@@ -22,7 +22,7 @@ contract DeployDaimoPay is Script {
         console.log("using bridger at", bridger);
 
         address daimoPay = CREATE3.deploy(
-            keccak256("DaimoPay-options4"),
+            keccak256("DaimoPay-5"),
             abi.encodePacked(
                 type(DaimoPay).creationCode,
                 abi.encode(intentFactory, bridger)

packages/contract/script/pay/DeployDaimoPayRelayer.s.sol

@@ -14,7 +14,7 @@ contract DeployDaimoPayRelayer is Script {
         vm.startBroadcast();
 
         address daimoPayRelayer = CREATE3.deploy(
-            keccak256("DaimoPayRelayer-options5"),
+            keccak256("DaimoPayRelayer-5"),
             abi.encodePacked(
                 type(DaimoPayRelayer).creationCode,
                 abi.encode(owner)

packages/contract/script/pay/DeployPayIntentFactory.s.sol

@@ -11,7 +11,7 @@ contract DeployPayIntentFactory is Script {
         vm.startBroadcast();
 
         address intentFactory = CREATE3.deploy(
-            keccak256("PayIntentFactory-options4"),
+            keccak256("PayIntentFactory-5"),
             abi.encodePacked(type(PayIntentFactory).creationCode, abi.encode())
         );
 

packages/contract/src/pay/DaimoPay.sol

@@ -138,10 +138,6 @@ contract DaimoPay {
 
         // Finish the intent and return any leftover tokens to the caller
         _finishIntent({intentAddr: intentAddr, intent: intent, calls: calls});
-        TransferTokenBalance.refundLeftoverTokens({
-            token: intent.finalCallToken.token,
-            recipient: payable(msg.sender)
-        });
 
         emit FastFinish({intentAddr: intentAddr, newRecipient: msg.sender});
     }
@@ -175,10 +171,6 @@ contract DaimoPay {
                 intent: intent,
                 calls: calls
             });
-            TransferTokenBalance.refundLeftoverTokens({
-                token: intent.finalCallToken.token,
-                recipient: payable(recipient)
-            });
         } else {
             // Otherwise, the relayer fastFinished the intent, give them the recieved
             // amount.
@@ -187,7 +179,7 @@ contract DaimoPay {
             uint256 n = intent.bridgeTokenOutOptions.length;
             for (uint256 i = 0; i < n; ++i) {
                 TokenAmount calldata tokenOut = intent.bridgeTokenOutOptions[i];
-                TransferTokenBalance.transferBalance({
+                TokenUtils.transferBalance({
                     token: tokenOut.token,
                     recipient: payable(recipient)
                 });
@@ -203,6 +195,7 @@ contract DaimoPay {
     // Swap the token the relayer transferred to finalCallToken
     // Then, if the intent has a finalCall, make the intent call.
     // Otherwise, transfer the token to the final address.
+    // Finally, send any leftover final token to the caller.
     function _finishIntent(
         address intentAddr,
         PayIntent calldata intent,
@@ -268,6 +261,11 @@ contract DaimoPay {
                 intent: intent
             });
         }
+
+        TokenUtils.transferBalance({
+            token: intent.finalCallToken.token,
+            recipient: payable(msg.sender)
+        });
     }
 
     receive() external payable {}

packages/contract/src/pay/DaimoPayRelayer.sol

@@ -187,7 +187,7 @@ contract DaimoPayRelayer is Ownable2Step {
         // Transfer any bridgeTokenOut balance back to the owner
         uint256 n = intent.bridgeTokenOutOptions.length;
         for (uint256 i = 0; i < n; i++) {
-            TransferTokenBalance.transferBalance(
+            TokenUtils.transferBalance(
                 intent.bridgeTokenOutOptions[i].token,
                 payable(msg.sender)
             );

packages/contract/src/pay/PayIntent.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.12;
 import "openzeppelin-contracts/contracts/proxy/utils/Initializable.sol";
 import "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import "./TransferTokenBalance.sol";
+import "./TokenUtils.sol";
 import "../interfaces/IDaimoPayBridger.sol";
 
 /// @dev Represents an intended call: "make X of token Y show up on chain Z, then
@@ -123,7 +123,7 @@ contract PayIntentContract is Initializable {
             });
 
             // Refund any leftover tokens in the contract to caller
-            TransferTokenBalance.refundLeftoverTokens({
+            TokenUtils.transferBalance({
                 token: IERC20(bridgeTokenIn),
                 recipient: caller
             });
@@ -150,7 +150,7 @@ contract PayIntentContract is Initializable {
         // Send to escrow contract, which will forward to current recipient
         uint256 n = intent.bridgeTokenOutOptions.length;
         for (uint256 i = 0; i < n; ++i) {
-            TransferTokenBalance.transferBalance({
+            TokenUtils.transferBalance({
                 token: intent.bridgeTokenOutOptions[i].token,
                 recipient: intent.escrow
             });

packages/contract/src/pay/TokenUtils.sol

@@ -71,4 +71,13 @@ library TokenUtils {
         );
         token.safeTransferFrom({from: from, to: to, value: amount});
     }
+
+    /// Sends any token balance in the contract to the recipient.
+    function transferBalance(IERC20 token, address payable recipient) internal {
+        uint256 balance = getBalanceOf({token: token, addr: address(this)});
+
+        if (balance > 0) {
+            transfer({token: token, recipient: recipient, amount: balance});
+        }
+    }
 }

packages/contract/test/pay/DaimoPay.t.sol

@@ -5,6 +5,7 @@ import "forge-std/Test.sol";
 import {GasInfo} from "@axelar-network/contracts/interfaces/IAxelarGasService.sol";
 import "account-abstraction/interfaces/IEntryPoint.sol";
 import "account-abstraction/core/EntryPoint.sol";
+import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 
 import "../../src/pay/DaimoPay.sol";
 import "../../src/pay/DaimoPayBridger.sol";
@@ -181,7 +182,10 @@ contract DaimoPayTest is Test {
         console.log("DaimoPay address:", address(dp));
         console.log("TestUSDC (fromToken) address:", address(_fromToken));
         console.log("TestUSDC (toToken) address:", address(_toToken));
-        console.log("TestUSDC (bridgeTokenOption) address:", address(_bridgeTokenOption));
+        console.log(
+            "TestUSDC (bridgeTokenOption) address:",
+            address(_bridgeTokenOption)
+        );
     }
 
     function getBridgeTokenOutOptions()
@@ -420,12 +424,8 @@ contract DaimoPayTest is Test {
         });
 
         // Extra tokens should be refunded to the caller
-        vm.expectEmit(LINEA_INTENT_ADDR);
-        emit TransferTokenBalance.RefundedTokens({
-            recipient: _alice,
-            token: address(_fromToken),
-            amount: 10
-        });
+        vm.expectEmit(address(_fromToken));
+        emit IERC20.Transfer(LINEA_INTENT_ADDR, _alice, 10);
 
         vm.expectEmit(address(dp));
         emit DaimoPay.Start(LINEA_INTENT_ADDR, intent);
@@ -619,12 +619,8 @@ contract DaimoPayTest is Test {
         _toToken.transfer({to: address(dp), value: 10});
 
         // An extra 9 of finalCallToken should be sent back to the LP
-        vm.expectEmit(address(dp));
-        emit TransferTokenBalance.RefundedTokens({
-            recipient: _lp,
-            token: address(_toToken),
-            amount: 9
-        });
+        vm.expectEmit(address(_toToken));
+        emit IERC20.Transfer(address(dp), _lp, 9);
 
         dp.fastFinishIntent({intent: intent, calls: new Call[](0)});
 

packages/daimo-contract/src/codegen/contracts.ts

@@ -2887,31 +2887,6 @@ export const daimoPayAbi = [
     ],
     name: 'IntentFinished',
   },
-  {
-    type: 'event',
-    anonymous: false,
-    inputs: [
-      {
-        name: 'recipient',
-        internalType: 'address',
-        type: 'address',
-        indexed: true,
-      },
-      {
-        name: 'token',
-        internalType: 'address',
-        type: 'address',
-        indexed: true,
-      },
-      {
-        name: 'amount',
-        internalType: 'uint256',
-        type: 'uint256',
-        indexed: true,
-      },
-    ],
-    name: 'RefundedTokens',
-  },
   {
     type: 'event',
     anonymous: false,
@@ -6840,31 +6815,6 @@ export const payIntentContractAbi = [
     ],
     name: 'Initialized',
   },
-  {
-    type: 'event',
-    anonymous: false,
-    inputs: [
-      {
-        name: 'recipient',
-        internalType: 'address',
-        type: 'address',
-        indexed: true,
-      },
-      {
-        name: 'token',
-        internalType: 'address',
-        type: 'address',
-        indexed: true,
-      },
-      {
-        name: 'amount',
-        internalType: 'uint256',
-        type: 'uint256',
-        indexed: true,
-      },
-    ],
-    name: 'RefundedTokens',
-  },
   {
     type: 'error',
     inputs: [{ name: 'target', internalType: 'address', type: 'address' }],

packages/daimo-contract/src/index.ts

@@ -64,15 +64,15 @@ export const daimoFastCctpAddrs: Address[] = [
 ];
 
 // Daimo Pay
-export const daimoPayAddress = "0xf603cE83e28c9E9E699c4df2B11E31B63b1890C0";
+export const daimoPayAddress = "0x9BD9caF29B76E98d57Fc3a228A39C7efe8ca0eAf";
 export const daimoPayBridgerAddress =
   "0xB4418A1EcE96CF1F797fef3Ab2c0Afdf59701C38";
 export const daimoPayAxelarBridgerAddress =
   "0x91052AEc686070bc8787fde3d530f21976302867";
 export const payIntentFactoryAddress =
-  "0x78dC70cC8C3b3a79BF161941934ed4829C9E7DDf";
+  "0x90498530e2FddcD937faB0Ab56cF6a7c1FB08b62";
 export const daimoPayRelayerAddress =
-  "0xD9c53251d364F4E467412EDbD0ecCe6aAEB97cAA";
+  "0xc46614d2E324Bfe5c0707D0b61d61d280FDcf65B";
 
 // Utils
 export const daimoPayBatchReadUtilsAddress =

packages/daimo-contract/wagmi.config.ts

@@ -50,6 +50,7 @@ export default defineConfig({
       forge: { build: false },
       include: [
         "Daimo*.sol/*",
+        "Dummy*.sol/*",
         "Pay*.sol/*",
         "ERC*.sol/*",
         "EntryPoint.sol/*",