@across-protocol/sdk 4.4.16 → 4.4.18

package/src/arch/tvm/TransactionUtils.ts

@@ -1,6 +1,6 @@
 import { TronWeb } from "tronweb";
 import { PopulatedTransaction } from "ethers";
-import { TvmAddress } from "../../utils";
+import { isDefined, TvmAddress } from "../../utils";
 
 export interface TronTransactionResult {
   txid: string;
@@ -25,8 +25,14 @@ export interface TronSimulationResult {
  * converts the target address to TRON Base58 format, and uses TronWeb's
  * `triggerSmartContract` → `sign` → `sendRawTransaction` pipeline.
  *
+ * TRON models a native TRX transfer as its own transaction type (`TransferContract`), distinct from
+ * the `TriggerSmartContract` used for calls. A populated transaction with no `data` field is
+ * therefore dispatched to TronWeb's `sendTransaction` instead; see {@link transferNative}. Note that
+ * this turns on `data` being absent, not empty: an explicit `"0x"` remains a contract call, since
+ * that is how TronWeb encodes a `receive`/`fallback` invocation.
+ *
  * @param tronWeb An authenticated TronWeb instance (with private key set).
- * @param populatedTx The populated transaction containing `to` and `data`.
+ * @param populatedTx The populated transaction containing `to`, and `data` for a contract call.
  * @param feeLimit The maximum TRX to burn for energy consumption, in SUN (1 TRX = 1,000,000 SUN).
  * @returns The transaction ID and result status.
  */
@@ -37,8 +43,8 @@ export async function submitTransaction(
   callValue: number = 0
 ): Promise<TronTransactionResult> {
   const { to, data } = populatedTx;
-  if (!to || !data) {
-    throw new Error("submitTransaction: populatedTx must have both 'to' and 'data' fields");
+  if (!to) {
+    throw new Error("submitTransaction: populatedTx must have a 'to' field");
   }
 
   const tronAddress = TvmAddress.from(to).toNative();
@@ -47,6 +53,16 @@ export async function submitTransaction(
     throw new Error("submitTransaction: TronWeb instance must have a default address configured");
   }
 
+  // No calldata at all means this is a value transfer, which triggerSmartContract cannot express: it
+  // requires a deployed contract at the target address, so it can never fund an EOA.
+  //
+  // Empty-but-present calldata ("0x") is deliberately *not* treated as a transfer. That is TronWeb's
+  // own encoding for a `receive`/`fallback` selector, which it submits as a TriggerSmartContract; a
+  // TransferContract would move the TRX without running the recipient's code.
+  if (!isDefined(data)) {
+    return transferNative(tronWeb, tronAddress, callValue);
+  }
+
   // Use triggerSmartContract with the `input` option to pass pre-encoded calldata.
   // The function selector is empty — the full calldata (selector + params) is in `input`.
   const input = data.startsWith("0x") ? data.slice(2) : data;
@@ -73,6 +89,30 @@ export async function submitTransaction(
   };
 }
 
+/**
+ * Transfer native TRX to an account via a `TransferContract` transaction.
+ *
+ * TronWeb's `sendTransaction` builds, signs and broadcasts in one call, using the instance's default
+ * private key. No fee limit applies, since transfers consume bandwidth rather than energy.
+ *
+ * @param tronWeb An authenticated TronWeb instance (with private key set).
+ * @param recipient Base58 recipient address.
+ * @param amount Transfer amount in SUN (1 TRX = 1,000,000 SUN).
+ * @returns The transaction ID and result status.
+ */
+async function transferNative(tronWeb: TronWeb, recipient: string, amount: number): Promise<TronTransactionResult> {
+  if (amount <= 0) {
+    throw new Error("submitTransaction: a transaction with no calldata must transfer a non-zero value");
+  }
+
+  const broadcast = await tronWeb.trx.sendTransaction(recipient, amount);
+
+  return {
+    txid: broadcast.txid ?? broadcast.transaction.txID,
+    result: broadcast.result ?? false,
+  };
+}
+
 /**
  * Simulate a populated EVM transaction against TRON via TronWeb (constant call / `eth_call`-style).
  *

package/src/utils/abi/contracts/Constants.json

@@ -278,6 +278,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "getMulticall3",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "pure"
+  },
   {
     "type": "function",
     "name": "getOftEid",

package/src/utils/abi/contracts/CounterfactualConfig.json

@@ -589,6 +589,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "getMulticall3",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "pure"
+  },
   {
     "type": "function",
     "name": "getOftEid",

package/src/utils/abi/contracts/DeploymentUtils.json

@@ -594,6 +594,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "getMulticall3",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "pure"
+  },
   {
     "type": "function",
     "name": "getOftEid",

package/src/utils/abi/contracts/ERC6492SignatureHandler.json

@@ -0,0 +1,15 @@
+[
+  {
+    "type": "function",
+    "name": "multicall3",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "contract IMulticall3"
+      }
+    ],
+    "stateMutability": "view"
+  }
+]

package/src/utils/abi/contracts/HubPoolTestBase.json

@@ -623,6 +623,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "getMulticall3",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "pure"
+  },
   {
     "type": "function",
     "name": "getOftEid",

package/src/utils/abi/contracts/IERC20AuthBytes.json

@@ -0,0 +1,45 @@
+[
+  {
+    "type": "function",
+    "name": "receiveWithAuthorization",
+    "inputs": [
+      {
+        "name": "from",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "to",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "value",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "validAfter",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "validBefore",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "nonce",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      },
+      {
+        "name": "signature",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  }
+]

package/src/utils/abi/contracts/IMulticall3.json

@@ -1,336 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "aggregate",
-    "inputs": [
-      {
-        "name": "calls",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Call[]",
-        "components": [
-          {
-            "name": "target",
-            "type": "address",
-            "internalType": "address"
-          },
-          {
-            "name": "callData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "outputs": [
-      {
-        "name": "blockNumber",
-        "type": "uint256",
-        "internalType": "uint256"
-      },
-      {
-        "name": "returnData",
-        "type": "bytes[]",
-        "internalType": "bytes[]"
-      }
-    ],
-    "stateMutability": "payable"
-  },
-  {
-    "type": "function",
-    "name": "aggregate3",
-    "inputs": [
-      {
-        "name": "calls",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Call3[]",
-        "components": [
-          {
-            "name": "target",
-            "type": "address",
-            "internalType": "address"
-          },
-          {
-            "name": "allowFailure",
-            "type": "bool",
-            "internalType": "bool"
-          },
-          {
-            "name": "callData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "outputs": [
-      {
-        "name": "returnData",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Result[]",
-        "components": [
-          {
-            "name": "success",
-            "type": "bool",
-            "internalType": "bool"
-          },
-          {
-            "name": "returnData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "stateMutability": "payable"
-  },
-  {
-    "type": "function",
-    "name": "aggregate3Value",
-    "inputs": [
-      {
-        "name": "calls",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Call3Value[]",
-        "components": [
-          {
-            "name": "target",
-            "type": "address",
-            "internalType": "address"
-          },
-          {
-            "name": "allowFailure",
-            "type": "bool",
-            "internalType": "bool"
-          },
-          {
-            "name": "value",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
-          {
-            "name": "callData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "outputs": [
-      {
-        "name": "returnData",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Result[]",
-        "components": [
-          {
-            "name": "success",
-            "type": "bool",
-            "internalType": "bool"
-          },
-          {
-            "name": "returnData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "stateMutability": "payable"
-  },
-  {
-    "type": "function",
-    "name": "blockAndAggregate",
-    "inputs": [
-      {
-        "name": "calls",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Call[]",
-        "components": [
-          {
-            "name": "target",
-            "type": "address",
-            "internalType": "address"
-          },
-          {
-            "name": "callData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "outputs": [
-      {
-        "name": "blockNumber",
-        "type": "uint256",
-        "internalType": "uint256"
-      },
-      {
-        "name": "blockHash",
-        "type": "bytes32",
-        "internalType": "bytes32"
-      },
-      {
-        "name": "returnData",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Result[]",
-        "components": [
-          {
-            "name": "success",
-            "type": "bool",
-            "internalType": "bool"
-          },
-          {
-            "name": "returnData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "stateMutability": "payable"
-  },
-  {
-    "type": "function",
-    "name": "getBasefee",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "basefee",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getBlockHash",
-    "inputs": [
-      {
-        "name": "blockNumber",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "blockHash",
-        "type": "bytes32",
-        "internalType": "bytes32"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getBlockNumber",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "blockNumber",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getChainId",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "chainid",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getCurrentBlockCoinbase",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "coinbase",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getCurrentBlockDifficulty",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "difficulty",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getCurrentBlockGasLimit",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "gaslimit",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getCurrentBlockTimestamp",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "timestamp",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getEthBalance",
-    "inputs": [
-      {
-        "name": "addr",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "balance",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getLastBlockHash",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "blockHash",
-        "type": "bytes32",
-        "internalType": "bytes32"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "tryAggregate",
@@ -360,65 +28,7 @@
     ],
     "outputs": [
       {
-        "name": "returnData",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Result[]",
-        "components": [
-          {
-            "name": "success",
-            "type": "bool",
-            "internalType": "bool"
-          },
-          {
-            "name": "returnData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "stateMutability": "payable"
-  },
-  {
-    "type": "function",
-    "name": "tryBlockAndAggregate",
-    "inputs": [
-      {
-        "name": "requireSuccess",
-        "type": "bool",
-        "internalType": "bool"
-      },
-      {
-        "name": "calls",
-        "type": "tuple[]",
-        "internalType": "struct IMulticall3.Call[]",
-        "components": [
-          {
-            "name": "target",
-            "type": "address",
-            "internalType": "address"
-          },
-          {
-            "name": "callData",
-            "type": "bytes",
-            "internalType": "bytes"
-          }
-        ]
-      }
-    ],
-    "outputs": [
-      {
-        "name": "blockNumber",
-        "type": "uint256",
-        "internalType": "uint256"
-      },
-      {
-        "name": "blockHash",
-        "type": "bytes32",
-        "internalType": "bytes32"
-      },
-      {
-        "name": "returnData",
+        "name": "",
         "type": "tuple[]",
         "internalType": "struct IMulticall3.Result[]",
         "components": [