@across-protocol/contracts 5.0.10-alpha.3 → 5.0.10

package/contracts/chain-adapters/ZkStack_Adapter.sol

@@ -182,7 +182,7 @@ contract ZkStack_Adapter is AdapterInterface, CircleCCTPAdapter {
                 _transferUsdc(to, amount);
             } else {
                 IERC20(l1Token).forceApprove(USDC_SHARED_BRIDGE, amount);
-                txHash = BRIDGE_HUB.requestL2TransactionTwoBridges(
+                txHash = BRIDGE_HUB.requestL2TransactionTwoBridges{ value: txBaseCost }(
                     BridgeHubInterface.L2TransactionRequestTwoBridgesOuter({
                         chainId: CHAIN_ID,
                         mintValue: txBaseCost,

package/contracts/handlers/MulticallHandler.sol

@@ -10,7 +10,13 @@ import "@openzeppelin/contracts-v4/security/ReentrancyGuard.sol";
 /**
  * @title Across Multicall contract that allows a user to specify a series of calls that should be made by the handler
  * via the message field in the deposit.
- * @dev This contract makes the calls blindly. The contract will send any remaining tokens The caller should ensure that the tokens received by the handler are completely consumed.
+ * @dev This contract makes the calls blindly. The caller should ensure that the tokens received by the handler are
+ * completely consumed; otherwise leftover balances will be sent to the fallbackRecipient (when one is provided)
+ * or remain on this contract.
+ *
+ * @dev This contract is a stateless utility with no per-user accounting or admin rescue. Tokens delivered to it
+ * are expected to be consumed in the same transaction; any balances left on the contract can be claimed by any
+ * caller.
  */
 contract MulticallHandler is AcrossMessageHandler, ReentrancyGuard {
     using SafeERC20 for IERC20;

package/contracts/libraries/SafeTransferERC20.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
+/**
+ * @notice Mixin exposing a virtual `_safeTransfer` hook. Default implementation uses
+ *         OZ `SafeERC20.safeTransfer`. Inheritors may override to swap in alternative
+ *         ERC20 transfer semantics.
+ */
+abstract contract SafeTransferERC20 {
+    // This mixin is the only place in the codebase permitted to call `IERC20.safeTransfer`
+    // directly. Inheriting contracts restrict their own `using` directives to exclude
+    // `safeTransfer` so all transfer call sites are forced through this overridable hook.
+    using { SafeERC20.safeTransfer } for IERC20;
+
+    function _safeTransfer(address token, address to, uint256 amount) internal virtual {
+        IERC20(token).safeTransfer(to, amount);
+    }
+}

package/contracts/libraries/TronTransferLib.sol

@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
+/**
+ * @notice Balance-delta ERC20 transfer for tokens whose `transfer` returns non-standard
+ *         values. Specifically targets Tron USDT, which returns false even on success.
+ * @dev Two-error model: `_safeTransferBalanceCheck` reverts with `TronTransferCallReverted`
+ *      if the underlying call reverts, or `TronTransferBalanceMismatch` if the call returns
+ *      but the recipient's balance does not increase by exactly `amount`. `_balanceDeltaTransfer`
+ *      is the bool-pair primitive both wrappers (revert / no-revert) share — callers needing a
+ *      collapsed bool can AND the two flags. Assumes no fee-on-transfer.
+ *
+ *      IERC20 and IERC20Upgradeable produce bytewise-identical calldata for
+ *      `transfer(address,uint256)` and `balanceOf(address)`, so this library is safe to call
+ *      from contracts using either OZ variant.
+ */
+library TronTransferLib {
+    error TronTransferCallReverted();
+    error TronTransferBalanceMismatch();
+
+    /// @dev Returns (callOk, balanceOk). callOk=false means the low-level call reverted;
+    ///      balanceOk=false means the call returned but balance did not change by exactly `amount`.
+    ///      When callOk=false, balanceOk is also false (no balance check performed).
+    function _balanceDeltaTransfer(
+        address token,
+        address to,
+        uint256 amount
+    ) internal returns (bool callOk, bool balanceOk) {
+        uint256 pre = IERC20(token).balanceOf(to);
+        (callOk, ) = token.call(abi.encodeCall(IERC20.transfer, (to, amount)));
+        if (!callOk) return (false, false);
+        balanceOk = IERC20(token).balanceOf(to) == pre + amount;
+    }
+
+    function _safeTransferBalanceCheck(address token, address to, uint256 amount) internal {
+        (bool callOk, bool balanceOk) = _balanceDeltaTransfer(token, to, amount);
+        if (!callOk) revert TronTransferCallReverted();
+        if (!balanceOk) revert TronTransferBalanceMismatch();
+    }
+}

package/contracts/periphery/SpokePoolPeriphery.sol

@@ -21,6 +21,10 @@ import { AddressToBytes32 } from "../libraries/AddressConverters.sol";
  * @title SwapProxy
  * @notice A dedicated proxy contract that isolates swap execution to mitigate frontrunning vulnerabilities.
  * The SpokePoolPeriphery transfers tokens to this contract, which performs the swap and returns tokens back to the periphery.
+ *
+ * @dev This contract is a stateless utility with no per-user accounting or admin rescue. Tokens delivered to it
+ * are expected to be consumed in the same transaction; any balances left on the contract can be claimed by any
+ * caller.
  * @custom:security-contact bugs@across.to
  */
 contract SwapProxy is ReentrancyGuard {

package/contracts/periphery/counterfactual/CounterfactualDepositSpokePool.sol

@@ -8,6 +8,7 @@ import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import { V3SpokePoolInterface } from "../../interfaces/V3SpokePoolInterface.sol";
 import { ICounterfactualImplementation } from "../../interfaces/ICounterfactualImplementation.sol";
 import { NATIVE_ASSET, BPS_SCALAR } from "./CounterfactualConstants.sol";
+import { SafeTransferERC20 } from "../../libraries/SafeTransferERC20.sol";
 
 /**
  * @notice Route parameters committed to in the merkle leaf.
@@ -51,8 +52,11 @@ struct SpokePoolSubmitterData {
  *      cannot sign `speedUpV3Deposit` messages.
  * @custom:security-contact bugs@across.to
  */
-contract CounterfactualDepositSpokePool is ICounterfactualImplementation, EIP712 {
-    using SafeERC20 for IERC20;
+contract CounterfactualDepositSpokePool is ICounterfactualImplementation, EIP712, SafeTransferERC20 {
+    // Restrict the `using` attachment to `forceApprove` only. All `safeTransfer` calls must go
+    // through the `_safeTransfer` hook (inherited from `SafeTransferERC20`) so chain-specific
+    // variants can override transfer semantics in one place.
+    using { SafeERC20.forceApprove } for IERC20;
 
     uint256 internal constant EXCHANGE_RATE_SCALAR = 1e18;
 
@@ -152,7 +156,7 @@ contract CounterfactualDepositSpokePool is ICounterfactualImplementation, EIP712
                 (bool success, ) = sd.executionFeeRecipient.call{ value: dp.executionFee }("");
                 if (!success) revert NativeTransferFailed();
             } else {
-                IERC20(inputToken).safeTransfer(sd.executionFeeRecipient, dp.executionFee);
+                _safeTransfer(inputToken, sd.executionFeeRecipient, dp.executionFee);
             }
         }
 

package/contracts/periphery/counterfactual/CounterfactualDepositSpokePoolTr.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { CounterfactualDepositSpokePool } from "./CounterfactualDepositSpokePool.sol";
+import { TronTransferLib } from "../../libraries/TronTransferLib.sol";
+
+/**
+ * @title CounterfactualDepositSpokePoolTr
+ * @notice Tron-specific variant of `CounterfactualDepositSpokePool` for chains where the
+ *         input token may be Tron USDT (whose `transfer` returns false on success).
+ * @dev Inherits everything from the mainline implementation and overrides the
+ *      `_safeTransfer` hook to use a balance-delta success check that tolerates
+ *      Tron USDT's non-standard return value. `forceApprove` is unaffected — `approve`
+ *      returns true correctly on Tron USDT.
+ *
+ *      The EIP-712 domain name is inherited from the parent (`CounterfactualDepositSpokePool`).
+ *      Cross-implementation signature replay is already prevented by the `verifyingContract`
+ *      field of the EIP-712 domain: each clone's address is derived via CREATE2 from its
+ *      implementation address, so a signature for a mainline clone does not verify against
+ *      a Tron-variant clone.
+ * @custom:security-contact bugs@across.to
+ */
+contract CounterfactualDepositSpokePoolTr is CounterfactualDepositSpokePool {
+    constructor(
+        address _spokePool,
+        address _signer,
+        address _wrappedNativeToken
+    ) CounterfactualDepositSpokePool(_spokePool, _signer, _wrappedNativeToken) {} // solhint-disable-line no-empty-blocks
+
+    /// @dev TRON OVERRIDE: was `IERC20(token).safeTransfer(to, amount)` in the parent.
+    ///      `TronTransferLib._safeTransferBalanceCheck` uses a balance-delta success check so it
+    ///      tolerates Tron USDT's non-standard `transfer` return value.
+    function _safeTransfer(address token, address to, uint256 amount) internal override {
+        TronTransferLib._safeTransferBalanceCheck(token, to, amount);
+    }
+}

package/contracts/periphery/counterfactual/WithdrawImplementation.sol

@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { ICounterfactualImplementation } from "../../interfaces/ICounterfactualImplementation.sol";
 import { NATIVE_ASSET } from "./CounterfactualConstants.sol";
+import { SafeTransferERC20 } from "../../libraries/SafeTransferERC20.sol";
 
 /**
  * @notice Withdrawal parameters committed to in the merkle leaf.
@@ -22,9 +21,7 @@ struct WithdrawParams {
  * @dev Called via delegatecall from the CounterfactualDeposit dispatcher. `address(this)` is the clone
  *      and `msg.sender` is the original caller.
  */
-contract WithdrawImplementation is ICounterfactualImplementation {
-    using SafeERC20 for IERC20;
-
+contract WithdrawImplementation is ICounterfactualImplementation, SafeTransferERC20 {
     event Withdraw(address indexed token, address indexed to, uint256 amount);
 
     error Unauthorized();
@@ -46,7 +43,7 @@ contract WithdrawImplementation is ICounterfactualImplementation {
             (bool success, ) = to.call{ value: amount }("");
             if (!success) revert NativeTransferFailed();
         } else {
-            IERC20(token).safeTransfer(to, amount);
+            _safeTransfer(token, to, amount);
         }
 
         emit Withdraw(token, to, amount);

package/contracts/periphery/counterfactual/WithdrawImplementationTron.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { WithdrawImplementation } from "./WithdrawImplementation.sol";
+import { TronTransferLib } from "../../libraries/TronTransferLib.sol";
+
+/**
+ * @title WithdrawImplementationTron
+ * @notice Tron-specific variant of `WithdrawImplementation`. Inherits from the mainline
+ *         contract and overrides the `_safeTransfer` hook to use a balance-delta
+ *         success check that tolerates Tron USDT's non-standard `transfer` return value.
+ *         Native-asset withdrawals are unchanged.
+ * @custom:security-contact bugs@across.to
+ */
+contract WithdrawImplementationTron is WithdrawImplementation {
+    /// @dev TRON OVERRIDE: was `IERC20(token).safeTransfer(to, amount)` in the parent.
+    ///      `TronTransferLib._safeTransferBalanceCheck` uses a balance-delta success check so it
+    ///      tolerates Tron USDT's non-standard `transfer` return value.
+    function _safeTransfer(address token, address to, uint256 amount) internal override {
+        TronTransferLib._safeTransferBalanceCheck(token, to, amount);
+    }
+}

package/contracts/sp1-helios/SP1AutoVerifier.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.25;
 import { ISP1Verifier } from "@sp1-contracts/src/ISP1Verifier.sol";
 
 /// @title SP1 Auto Verifier
-/// @notice A no-op verifier that accepts any proof. Useful for testing SP1Helios without real proofs.
+/// @notice A no-op verifier that accepts any proof.
 contract SP1AutoVerifier is ISP1Verifier {
     // pure is intentionally stricter than the interface's view; Solidity allows this and it's correct for a no-op.
     function verifyProof(bytes32, bytes calldata, bytes calldata) external pure {}

package/contracts/spoke-pools/SpokePool.sol

@@ -11,6 +11,7 @@ import "../upgradeable/MultiCallerUpgradeable.sol";
 import "../upgradeable/EIP712CrossChainUpgradeable.sol";
 import "../upgradeable/AddressLibUpgradeable.sol";
 import "../libraries/AddressConverters.sol";
+import { SafeTransferERC20 } from "../libraries/SafeTransferERC20.sol";
 import { IOFT, SendParam, MessagingFee } from "../interfaces/IOFT.sol";
 import { OFTTransportAdapter } from "../libraries/OFTTransportAdapter.sol";
 
@@ -39,9 +40,13 @@ abstract contract SpokePool is
     MultiCallerUpgradeable,
     EIP712CrossChainUpgradeable,
     IDestinationSettler,
-    OFTTransportAdapter
+    OFTTransportAdapter,
+    SafeTransferERC20
 {
-    using SafeERC20Upgradeable for IERC20Upgradeable;
+    // Restrict the `using` attachment to `safeTransferFrom` only. All `safeTransfer` calls must go
+    // through the `_safeTransfer` hook (inherited from `SafeTransferERC20`) so chain-specific
+    // variants can override transfer semantics in one place.
+    using { SafeERC20Upgradeable.safeTransferFrom } for IERC20Upgradeable;
     using AddressLibUpgradeable for address;
     using Bytes32ToAddress for bytes32;
     using AddressToBytes32 for address;
@@ -1241,7 +1246,7 @@ abstract contract SpokePool is
         uint256 refund = relayerRefund[l2TokenAddress.toAddress()][msg.sender];
         if (refund == 0) revert NoRelayerRefundToClaim();
         relayerRefund[l2TokenAddress.toAddress()][msg.sender] = 0;
-        IERC20Upgradeable(l2TokenAddress.toAddress()).safeTransfer(refundAddress.toAddress(), refund);
+        _safeTransfer(l2TokenAddress.toAddress(), refundAddress.toAddress(), refund);
 
         emit ClaimedRelayerRefund(l2TokenAddress, refundAddress, refund, msg.sender);
     }
@@ -1429,7 +1434,7 @@ abstract contract SpokePool is
     // Re-implementation of OZ _callOptionalReturnBool to use private logic. Function executes a transfer and returns a
     // bool indicating if the external call was successful, rather than reverting. Original method:
     // https://github.com/OpenZeppelin/openzeppelin-contracts/blob/28aed34dc5e025e61ea0390c18cac875bfde1a78/contracts/token/ERC20/utils/SafeERC20.sol#L188
-    function _noRevertTransfer(address token, address to, uint256 amount) internal returns (bool) {
+    function _noRevertTransfer(address token, address to, uint256 amount) internal virtual returns (bool) {
         bool success;
         uint256 returnSize;
         uint256 returnValue;
@@ -1548,7 +1553,7 @@ abstract contract SpokePool is
             wrappedNativeToken.withdraw(amount);
             AddressLibUpgradeable.sendValue(to, amount);
         } else {
-            IERC20Upgradeable(address(wrappedNativeToken)).safeTransfer(to, amount);
+            _safeTransfer(address(wrappedNativeToken), to, amount);
         }
     }
 
@@ -1662,7 +1667,7 @@ abstract contract SpokePool is
         } else {
             // Note: Similar to note above, send token directly from the contract to the user in the slow relay case.
             if (!isSlowFill) IERC20Upgradeable(outputToken).safeTransferFrom(msg.sender, recipientToSend, amountToSend);
-            else IERC20Upgradeable(outputToken).safeTransfer(recipientToSend, amountToSend);
+            else _safeTransfer(outputToken, recipientToSend, amountToSend);
         }
 
         bytes memory updatedMessage = relayExecution.updatedMessage;

package/contracts/spoke-pools/Tron_SpokePool.sol

@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { IERC20 } from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol";
+
+import { Universal_SpokePool } from "./Universal_SpokePool.sol";
+import { ITokenMessenger } from "../external/interfaces/CCTPInterfaces.sol";
+import { TronTransferLib } from "../libraries/TronTransferLib.sol";
+
+/**
+ * @notice Tron-specific SpokePool variant that handles non-standard ERC20 implementations.
+ * @dev Tron USDT's `transfer` always returns false on success, which breaks the return-value
+ *      checks in `SafeERC20.safeTransfer` and `SpokePool._noRevertTransfer`. This variant
+ *      overrides both base hooks (`_noRevertTransfer` and `_safeTransfer`) to delegate to
+ *      `TronTransferLib`, which performs a balance-delta success check. `transferFrom` is
+ *      correct on Tron USDT, so paths using `safeTransferFrom` are unchanged.
+ *
+ *      Assumes Tether's `basisPointsRate` fee-on-transfer mechanism stays at zero. If it
+ *      is ever activated, balance-delta will report failure on successful transfers and
+ *      USDT routes on this contract will wedge until disabled operationally.
+ * @custom:security-contact bugs@across.to
+ */
+contract Tron_SpokePool is Universal_SpokePool {
+    /// @custom:oz-upgrades-unsafe-allow constructor
+    constructor(
+        uint256 _adminUpdateBufferSeconds,
+        address _helios,
+        address _hubPoolStore,
+        address _wrappedNativeTokenAddress,
+        uint32 _depositQuoteTimeBuffer,
+        uint32 _fillDeadlineBuffer,
+        IERC20 _l2Usdc,
+        ITokenMessenger _cctpTokenMessenger,
+        uint32 _oftDstEid,
+        uint256 _oftFeeCap
+    )
+        Universal_SpokePool(
+            _adminUpdateBufferSeconds,
+            _helios,
+            _hubPoolStore,
+            _wrappedNativeTokenAddress,
+            _depositQuoteTimeBuffer,
+            _fillDeadlineBuffer,
+            _l2Usdc,
+            _cctpTokenMessenger,
+            _oftDstEid,
+            _oftFeeCap
+        )
+    {} // solhint-disable-line no-empty-blocks
+
+    /// @dev Replaces base implementation's return-value-based success detection with a
+    ///      balance-delta check. Required because Tron USDT's `transfer` returns false
+    ///      even on successful transfers.
+    function _noRevertTransfer(address token, address to, uint256 amount) internal override returns (bool) {
+        (bool callOk, bool balanceOk) = TronTransferLib._balanceDeltaTransfer(token, to, amount);
+        return callOk && balanceOk;
+    }
+
+    /// @dev Revert-on-failure variant; reverts with `TronTransferCallReverted` or
+    ///      `TronTransferBalanceMismatch` so callers can distinguish failure modes.
+    ///      Replaces the base `safeTransfer` call sites (claimRelayerRefund, slow-fill ERC20 path).
+    function _safeTransfer(address token, address to, uint256 amount) internal override {
+        TronTransferLib._safeTransferBalanceCheck(token, to, amount);
+    }
+}

package/contracts/test/MockTronUSDT.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+import { ERC20 } from "@openzeppelin/contracts-v4/token/ERC20/ERC20.sol";
+
+/**
+ * @title MockTronUSDT
+ * @notice Test mock that mirrors the Tron USDT bug: `transfer` moves balances correctly
+ *         but always returns `false` on success. `transferFrom` and `approve` return
+ *         `true` correctly per the standard.
+ * @dev Set `blacklisted[addr]` to make transfers involving that address revert, simulating
+ *      Tether's `notBlacklisted` modifier and the "actual failure" scenario.
+ */
+contract MockTronUSDT is ERC20 {
+    mapping(address => bool) public blacklisted;
+
+    constructor() ERC20("Tron USDT", "USDT") {}
+
+    function mint(address to, uint256 amount) external {
+        _mint(to, amount);
+    }
+
+    function setBlacklisted(address account, bool isBlacklisted) external {
+        blacklisted[account] = isBlacklisted;
+    }
+
+    function decimals() public pure override returns (uint8) {
+        return 6;
+    }
+
+    function transfer(address to, uint256 amount) public override returns (bool) {
+        require(!blacklisted[msg.sender] && !blacklisted[to], "blacklisted");
+        _transfer(msg.sender, to, amount);
+        return false;
+    }
+}

package/contracts/tron/TronCounterfactualImports.sol

@@ -2,12 +2,13 @@
 pragma solidity ^0.8.0;
 
 // Entry point for counterfactual contracts in the tron Foundry profile. These use OZ v4 and must
-// be in a separate file from SP1Helios/UniversalSpokePool (OZ v5) to avoid name collisions.
+// be in a separate file from SP1Helios/Tron_SpokePool (OZ v5) to avoid name collisions.
 import "../periphery/counterfactual/AdminWithdrawManager.sol";
 import "../periphery/counterfactual/CounterfactualConstants.sol";
 import "../periphery/counterfactual/CounterfactualDeposit.sol";
 import "../periphery/counterfactual/CounterfactualDepositCCTP.sol";
 import "../periphery/counterfactual/CounterfactualDepositFactoryTron.sol";
 import "../periphery/counterfactual/CounterfactualDepositOFT.sol";
-import "../periphery/counterfactual/CounterfactualDepositSpokePool.sol";
-import "../periphery/counterfactual/WithdrawImplementation.sol";
+import "../periphery/counterfactual/CounterfactualDepositSpokePoolTr.sol";
+import "../libraries/TronTransferLib.sol";
+import "../periphery/counterfactual/WithdrawImplementationTron.sol";

package/contracts/tron/TronImports.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-// Entry point for SP1Helios and UniversalSpokePool in the tron Foundry profile. These use OZ v5
+// Entry point for SP1Helios and Tron_SpokePool in the tron Foundry profile. These use OZ v5
 // and must be in a separate file from counterfactual contracts (OZ v4) to avoid name collisions.
 import "../sp1-helios/SP1Helios.sol";
 import "../sp1-helios/SP1AutoVerifier.sol";
 import "@openzeppelin/contracts-v4/proxy/ERC1967/ERC1967Proxy.sol";
-import "../spoke-pools/Universal_SpokePool.sol";
+import "../spoke-pools/Tron_SpokePool.sol";

package/contracts/tron/TronPeripheryImports.sol

@@ -2,5 +2,5 @@
 pragma solidity ^0.8.0;
 
 // Entry point for SpokePoolPeriphery and SwapProxy in the tron Foundry profile. These use OZ v4
-// and are kept in a separate file from SP1Helios/UniversalSpokePool (OZ v5) to avoid name collisions.
+// and are kept in a separate file from SP1Helios/Tron_SpokePool (OZ v5) to avoid name collisions.
 import "../periphery/SpokePoolPeriphery.sol";

package/dist/broadcast/deployed-addresses.json

@@ -215,20 +215,15 @@
                     "block_number": 24021499,
                     "transaction_hash": "0x70b3edf99db66aac34338c3686cd708ddfc2b503c2f707f51ced67dc50e5022f"
                 },
-                "PermissionedMulticallHandler_CCTP_USDC": {
-                    "address": "0xD9D9Fd5A693dCD8FEf97A1d58d1d38aeeE771dF4",
-                    "block_number": 24923036,
-                    "transaction_hash": "0xdf6e007fee3ff93b47e6b135cb0ba9457fafea8f38350025e7c8c84d46ef0905"
+                "DonationBox_CCTP": {
+                    "address": "0xc1A2465c0913438A51d0b6339169f8b944f00cD1",
+                    "block_number": 24451558,
+                    "transaction_hash": "0x2571a14def62200935cd4c90356b1f1415e6977e60380c7dbdd4b0f4915d12fa"
                 },
-                "DonationBox_CCTP_USDC": {
-                    "address": "0xE694EbDFfCAD44ffb2025E2341027743fFDEAe3f",
-                    "block_number": 24923037,
-                    "transaction_hash": "0xa718319386ecd03007db65595e2905385658c329a7beb626e3403eb0bd594ea4"
-                },
-                "SponsoredCCTPDstPeriphery_CCTP_USDC": {
-                    "address": "0x545cd9145A7B783328e9f0B9f489c962464F82e0",
-                    "block_number": 24923038,
-                    "transaction_hash": "0xd96182e721a33c860d4296d20d86e439bf423026841c8433e3d1ce5fe0321f82"
+                "SponsoredCCTPDstPeriphery": {
+                    "address": "0xDe589398a3FE1DCca80C12053A14811f3E4033f4",
+                    "block_number": 24451558,
+                    "transaction_hash": "0x60497293901970b1fc224cc51f134a171e5430ef6f30ff9a9084b7a0c852718a"
                 },
                 "SponsoredCCTPSrcPeriphery": {
                     "address": "0x6769155b16F25D317819eFef011E0A50A48e83c5",
@@ -854,12 +849,12 @@
                     "block_number": 31071129,
                     "transaction_hash": "0xd78f71ca11de6d28fe02006adf91b55f05efe0ffb1e0b2f51cb450cdf5ade5c0"
                 },
-                "DonationBox_OFT_USDT": {
+                "DonationBox_OFT": {
                     "address": "0xf9a0c1C775f1B6e156ad3f1DB784520461DDb19e",
                     "block_number": 27226495,
                     "transaction_hash": "0x79d57ee428509b8a739a619580ef0154d3618f782d5cab1bfad01c0d542d2e3e"
                 },
-                "DstOFTHandler_OFT_USDT": {
+                "DstOFTHandler": {
                     "address": "0x0Ca8316a6fcc15C833A220c40D84550B08339438",
                     "block_number": 27226495,
                     "transaction_hash": "0x11abc3566704b51ee63255b70eddb4e3f127c7e6c9dad6bdfbf547b684bcaf2c"
@@ -874,40 +869,20 @@
                     "block_number": 32382094,
                     "transaction_hash": "0x188d49f786ebe99a6dbeb7c845d525064431a1eb615d0bea275d8da8a32953b1"
                 },
-                "PermissionedMulticallHandler_CCTP_USDC": {
-                    "address": "0xD7B719ed2b02Bfa0247600EDd6bd8Fb3957e95c8",
-                    "block_number": 33686717,
-                    "transaction_hash": "0x51bc99dd5ba78198246e16eee7b2f94dbe123720f05bffd1dd0862d5da8e2fb5"
-                },
-                "DonationBox_CCTP_USDC": {
-                    "address": "0xe3D0D1B6d3571EDC9657dB5076AC1Be5f0bBfE60",
-                    "block_number": 33686717,
-                    "transaction_hash": "0x38305e431db9c74a6f9fa2f6209c2086cc4b79f10ca3bfae773e4313914eaf28"
-                },
-                "SponsoredCCTPDstPeriphery_CCTP_USDC": {
-                    "address": "0x1CFE31eD57c2d2b4CB69c0298A1b586965b882d5",
-                    "block_number": 33686717,
-                    "transaction_hash": "0x5730f65ea3507b2daea9a0a143b3da717d7f2194e428993fb04fddfb714eb66e"
-                },
-                "PermissionedMulticallHandler_CCTP_USDH": {
-                    "address": "0x9EE4300b6af03392bE493fa769DE33bb07242bfb",
-                    "block_number": 33792552,
-                    "transaction_hash": "0x2608d5b2b75ef17422b375b1a2d0e80e7f338b92b55f8fdbccf8ae71ef7710ef"
+                "DonationBox_CCTP": {
+                    "address": "0xEd7422d44045781f4492Fa4b569063e5a1EB185b",
+                    "block_number": 27222774,
+                    "transaction_hash": "0x4eab452b9de97795c5d6644791e824359af36006ec521a7d1fb4c4283d247ff3"
                 },
-                "DonationBox_CCTP_USDH": {
-                    "address": "0x35B7D6e007f499c806F6d6742d7285D285e17F29",
-                    "block_number": 33792552,
-                    "transaction_hash": "0xe9958c68d14ed788f240cf981ed6bd1d1410b844b522c0fab5d0ed4acb2b1128"
-                },
-                "SponsoredCCTPDstPeriphery_CCTP_USDH": {
-                    "address": "0x74dfB6Ab65419Fd2022614Fa8BA45e9f50a3aE59",
-                    "block_number": 33792552,
-                    "transaction_hash": "0xb6d72530b3ca9ed94868b38c5477c83d69d575a7fe175e4c6cb649aeb9724acd"
+                "SponsoredCCTPDstPeriphery": {
+                    "address": "0x478D451e101bE484880a14cf3cCC293CD48E6140",
+                    "block_number": 27222774,
+                    "transaction_hash": "0x2b293a55b216b63afc96c148a0043b7522c4f6a847b9bc73112d03da3f1d2c6e"
                 },
                 "SponsoredCCTPSrcPeriphery": {
-                    "address": "0xF4E32c4aC479f0B007BC005Ec0F481A2C78Ba1B4",
-                    "block_number": 33685558,
-                    "transaction_hash": "0xef3bcc6d1bb0adc5a2b88c6dbe64a2492f72ac7d27a4aa6e42e5ace34df1f531"
+                    "address": "0xc611D7c33d1C7915F13ef35f488EAee9D9DC3555",
+                    "block_number": 27219602,
+                    "transaction_hash": "0x13b2a5eee6960ab615fe83eaac7203a16878d039fa4a91cb9e1dfafc1bc56298"
                 },
                 "TransferProxy": {
                     "address": "0x8b2C0BFaBD6DaD8cc700dde3F168D3c81CF0eEfF",
@@ -1217,20 +1192,15 @@
                     "block_number": 43894633,
                     "transaction_hash": "0x28b429aae286cfb5f09ce924514384b64203a62def3fbb61296a93e1bb3636eb"
                 },
-                "PermissionedMulticallHandler_CCTP_USDC": {
-                    "address": "0xB6CAAfD8Ecf18385fFc7c020327E111a1D40A2D4",
-                    "block_number": 44959757,
-                    "transaction_hash": "0x0e3e581e4970cb3b9a193f8fddf7a63cbcc4c4f7b980139a6f685fbbfec1d459"
-                },
-                "DonationBox_CCTP_USDC": {
-                    "address": "0x3ff139d8d5519555aA13b0eBd357B0Ba810f06Df",
-                    "block_number": 44959758,
-                    "transaction_hash": "0x019b8a736e60768ec4410e4e38c8ae4385e23e72c0cdcc9f305269d1208948c5"
+                "DonationBox_CCTP": {
+                    "address": "0xC1d6B848553602BED3524B05B7EB68c20899d861",
+                    "block_number": 42941026,
+                    "transaction_hash": "0xe8250326847544f47a63a3b799e07e127d21dc62a1901722293ef1335bee17e4"
                 },
-                "SponsoredCCTPDstPeriphery_CCTP_USDC": {
-                    "address": "0x8dEDA155E446F5d90579C3DCe560e5b00e93F773",
-                    "block_number": 44959760,
-                    "transaction_hash": "0x052db9819150099889e890e641781eedcb3f7e016f87d72bea2984ce6554d350"
+                "SponsoredCCTPDstPeriphery": {
+                    "address": "0xd9DC78B969E9Efb1e54B625c33A21Aaf2509e6a1",
+                    "block_number": 42941286,
+                    "transaction_hash": "0x75e0619a67afe82f14b279e9b1896882a0b64513161f4d49cc80fd771e019df6"
                 },
                 "SponsoredCCTPSrcPeriphery": {
                     "address": "0xa30968D3468316D957B9115EAad3C1c8E450116d",
@@ -1890,10 +1860,10 @@
                     "block_number": 81269910,
                     "transaction_hash": "ac7736e4912d3bd8e02b9dc26bd0ba6c0486b488b091141a8dde7f0c96be13f5"
                 },
-                "CounterfactualDepositSpokePool": {
-                    "address": "TN3K7Tk2jZMjdafcUQrkg8yw6BneQtXZ75",
-                    "block_number": 81271437,
-                    "transaction_hash": "d3a41d6aaf79a3a482c3824050ecd44457957b920893d92da222a2335eefdd09"
+                "CounterfactualDepositSpokePoolTr": {
+                    "address": "TF3BzhGswEw4kEWnR5dzjCsZEj4cVzVtsG",
+                    "block_number": 82681402,
+                    "transaction_hash": "7c4a10b23d583e9290d43a3b2b8dca02cccf47b53b2f5932e6fa92ab72b6ba47"
                 },
                 "SP1AutoVerifier": {
                     "address": "TUsGvWXwp8fhFfJD2Qj3qGUWUFqH4sjm84",
@@ -1901,24 +1871,24 @@
                     "transaction_hash": "6bb786350fb65c85df414085b65caa22e5de47d59a241ec4b213aae2b41a9738"
                 },
                 "SP1Helios": {
-                    "address": "TM7RW746BsRpoarBGZfwWVnVvhLNK6tBQx",
-                    "block_number": 81266543,
-                    "transaction_hash": "2a282124875b409051659cb86e82d2e6ae7eaa16df3d1a801b0936a2ffae81e9"
+                    "address": "TBQff32XdcRpknUY6iJVz2GkQe4aeB9eSm",
+                    "block_number": 82679886,
+                    "transaction_hash": "78ee3e484f44da394b990adcd3b43d422a343246ab7c7141b3385ee3aeac2f71"
                 },
                 "SpokePool": {
-                    "address": "TDe6gRnHcqZnhn1H5UZQcJ29kmvadFKjb8",
-                    "block_number": 81267900,
-                    "transaction_hash": "916d12109b908916a5180dbaf032c577b758615e975ce909cdee696f066f5ac9"
+                    "address": "TTbCVPfUZmPhrB9sYC8GKgGBQQEdZovkmS",
+                    "block_number": 82680434,
+                    "transaction_hash": "74051a48b3f5f7b3bae081adab862e63689b93ee4e221473221f2a4206f5216c"
                 },
                 "SpokePoolPeriphery": {
                     "address": "TN88jHbhTpRcKwS6f7fNmXFbGbeqJR1trZ",
                     "block_number": 81812685,
                     "transaction_hash": "9a708fb56c6b0bba4e87599f8b1309b479f144badc7a2130d4cd3554836e4481"
                 },
-                "WithdrawImplementation": {
-                    "address": "TJkwUDFPKXABkeu38v42sdwQS2VxgRweow",
-                    "block_number": 81269861,
-                    "transaction_hash": "226499b9a0e735991922ca744364017aa882df1b33ea23e44c80695181ed12d4"
+                "WithdrawImplementationTron": {
+                    "address": "THPA5L2jxGE84FHMieds212WH3sRX5Hi9t",
+                    "block_number": 82681537,
+                    "transaction_hash": "5afe38b1baa3538f6692da873b1480b99dc30af81400948daf38fce8ac336d1d"
                 }
             }
         },

package/dist/evm/artifacts/AcrossMessageHandlerMock.sol/AcrossMessageHandlerMock.json

@@ -1 +1 @@
-{"abi":[{"type":"function","name":"handleV3AcrossMessage","inputs":[{"name":"tokenSent","type":"address","internalType":"address"},{"name":"amount","type":"uint256","internalType":"uint256"},{"name":"relayer","type":"address","internalType":"address"},{"name":"message","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":"0x60808060405234601557610154908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c633a5be8cb14610025575f80fd5b346100c05760803660031901126100c05761003e6100d8565b506100476100fb565b5060643567ffffffffffffffff81116100c057366023820112156100c057806004013567ffffffffffffffff81116100c457601f8101601f19908116603f0116830167ffffffffffffffff8111848210176100c45760405280835236602482840101116100c0575f928160246020940184830137010152005b5f80fd5b634e487b7160e01b5f52604160045260245ffd5b6004359073ffffffffffffffffffffffffffffffffffffffff821682036100c057565b6044359073ffffffffffffffffffffffffffffffffffffffff821682036100c05756fea264697066735822122032b5cad3b224b740b9bbc0a4125dce4280d93cccf959dd369258d68703564b2164736f6c634300081e0033"}
+{"abi":[{"type":"function","name":"handleV3AcrossMessage","inputs":[{"name":"tokenSent","type":"address","internalType":"address"},{"name":"amount","type":"uint256","internalType":"uint256"},{"name":"relayer","type":"address","internalType":"address"},{"name":"message","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":"0x60808060405234601557610154908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c633a5be8cb14610025575f80fd5b346100c05760803660031901126100c05761003e6100d8565b506100476100fb565b5060643567ffffffffffffffff81116100c057366023820112156100c057806004013567ffffffffffffffff81116100c457601f8101601f19908116603f0116830167ffffffffffffffff8111848210176100c45760405280835236602482840101116100c0575f928160246020940184830137010152005b5f80fd5b634e487b7160e01b5f52604160045260245ffd5b6004359073ffffffffffffffffffffffffffffffffffffffff821682036100c057565b6044359073ffffffffffffffffffffffffffffffffffffffff821682036100c05756fea2646970667358221220ef8049b741ca8fdac486ace45efd7ddfebc0ae9d8ebd87ed9ddd5035543ecd1464736f6c634300081e0033"}