mppx 0.4.11 → 0.4.12

package/src/tempo/session/Chain.ts

@@ -93,6 +93,11 @@ function assertUint128(amount: bigint): void {
   }
 }
 
+/** Options for {@link settleOnChain}. */
+export type SettleOptions =
+  | { feePayer: Account; account: Account }
+  | { feePayer?: undefined; account?: Account | undefined }
+
 /**
  * Submit a settle transaction on-chain.
  */
@@ -100,16 +105,21 @@ export async function settleOnChain(
   client: Client,
   escrowContract: Address,
   voucher: SignedVoucher,
-  feePayer?: Account | undefined,
+  options?: SettleOptions,
 ): Promise<Hex> {
   assertUint128(voucher.cumulativeAmount)
+  const resolved = options?.account ?? client.account
+  if (!resolved)
+    throw new Error(
+      'Cannot settle channel: no account available. Pass an `account` to tempo.settle(), or provide a `getClient` that returns an account-bearing client.',
+    )
   const args = [voucher.channelId, voucher.cumulativeAmount, voucher.signature] as const
-  if (feePayer) {
+  if (options?.feePayer) {
     const data = encodeFunctionData({ abi: escrowAbi, functionName: 'settle', args })
-    return sendFeePayerTx(client, feePayer, escrowContract, data, 'settle')
+    return sendFeePayerTx(client, resolved, options.feePayer, escrowContract, data, 'settle')
   }
   return writeContract(client, {
-    account: client.account!,
+    account: resolved,
     chain: client.chain,
     address: escrowContract,
     abi: escrowAbi,
@@ -118,6 +128,11 @@ export async function settleOnChain(
   })
 }
 
+/** Options for {@link closeOnChain}. */
+export type CloseOptions =
+  | { feePayer: Account; account: Account }
+  | { feePayer?: undefined; account?: Account | undefined }
+
 /**
  * Submit a close transaction on-chain.
  */
@@ -125,19 +140,18 @@ export async function closeOnChain(
   client: Client,
   escrowContract: Address,
   voucher: SignedVoucher,
-  account?: Account,
-  feePayer?: Account | undefined,
+  options?: CloseOptions,
 ): Promise<Hex> {
   assertUint128(voucher.cumulativeAmount)
-  const resolved = account ?? client.account
+  const resolved = options?.account ?? client.account
   if (!resolved)
     throw new Error(
       'Cannot close channel: no account available. Pass an `account` (viem Account, e.g. privateKeyToAccount("0x...")) to tempo.session(), or provide a `getClient` that returns an account-bearing client.',
     )
   const args = [voucher.channelId, voucher.cumulativeAmount, voucher.signature] as const
-  if (feePayer) {
+  if (options?.feePayer) {
     const data = encodeFunctionData({ abi: escrowAbi, functionName: 'close', args })
-    return sendFeePayerTx(client, feePayer, escrowContract, data, 'close')
+    return sendFeePayerTx(client, resolved, options.feePayer, escrowContract, data, 'close')
   }
   return writeContract(client, {
     account: resolved,
@@ -155,9 +169,13 @@ export async function closeOnChain(
  * Follows the same signTransaction + sendRawTransactionSync pattern used
  * by broadcastOpenTransaction / broadcastTopUpTransaction, but originates
  * the transaction server-side (estimating gas and fees first).
+ *
+ * @param account - The logical sender / msg.sender (e.g. the payee).
+ * @param feePayer - The gas sponsor — only co-signs to cover fees.
  */
 async function sendFeePayerTx(
   client: Client,
+  account: Account,
   feePayer: Account,
   to: Address,
   data: Hex,
@@ -167,12 +185,10 @@ async function sendFeePayerTx(
   // token.  `feePayer: true` tells the prepare hook to use expiring nonces but
   // does NOT set feeToken automatically, so we must provide it explicitly.
   const chainId = client.chain?.id
-  const feeToken = chainId
-    ? defaults.currency[chainId as keyof typeof defaults.currency]
-    : undefined
+  const feeToken = chainId ? defaults.resolveCurrency({ chainId }) : undefined
 
   const prepared = await prepareTransactionRequest(client, {
-    account: feePayer,
+    account,
     calls: [{ to, data }],
     feePayer: true,
     ...(feeToken ? { feeToken } : {}),
@@ -180,7 +196,7 @@ async function sendFeePayerTx(
 
   const serialized = (await signTransaction(client, {
     ...prepared,
-    account: feePayer,
+    account,
     feePayer,
   } as never)) as Hex