@t2000/sdk 4.2.1 → 4.3.0

package/dist/index.cjs

@@ -678,7 +678,15 @@ async function fetchAllCoins(client, owner, coinType) {
 }
 async function selectAndSplitCoin(tx, client, owner, coinType, amount, options = {}) {
   if (options.sponsoredContext) {
-    return selectCoinObjectsOnly(tx, client, owner, coinType, amount, options.allowSwapAll ?? true);
+    return selectCoinObjectsOnly(
+      tx,
+      client,
+      owner,
+      coinType,
+      amount,
+      options.allowSwapAll ?? true,
+      options.mergeCache
+    );
   }
   const balanceResp = await client.getBalance({ owner, coinType });
   const totalBalance = BigInt(balanceResp.totalBalance);
@@ -985,14 +993,15 @@ async function addSwapToTx(tx, client, address, input) {
       address,
       requestedRaw,
       input.sponsoredContext ?? false,
-      input.suiMergeCache
+      input.coinMergeCache
     );
     inputCoin = result.coin;
     effectiveRaw = result.effectiveAmount;
   } else {
     const { selectAndSplitCoin: selectAndSplitCoin2 } = await Promise.resolve().then(() => (init_coinSelection(), coinSelection_exports));
     const result = await selectAndSplitCoin2(tx, client, address, fromType, requestedRaw, {
-      sponsoredContext: input.sponsoredContext ?? false
+      sponsoredContext: input.sponsoredContext ?? false,
+      mergeCache: input.coinMergeCache
     });
     inputCoin = result.coin;
     effectiveRaw = result.effectiveAmount;
@@ -1393,6 +1402,27 @@ var KeypairSigner = class {
   }
 };
 
+// src/wallet/executeTx.ts
+async function executeTx(client, signer, buildTx, options = {}) {
+  const tx = await buildTx();
+  tx.setSender(signer.getAddress());
+  const txBytes = await tx.build({ client: options.buildClient ?? client });
+  const { signature } = await signer.signTransaction(txBytes);
+  const result = await client.executeTransactionBlock({
+    transactionBlock: txBytes,
+    signature,
+    options: { showEffects: true }
+  });
+  await client.waitForTransaction({ digest: result.digest });
+  const gasUsed = result.effects?.gasUsed;
+  let gasCostSui = 0;
+  if (gasUsed) {
+    const total = BigInt(gasUsed.computationCost) + BigInt(gasUsed.storageCost) - BigInt(gasUsed.storageRebate);
+    gasCostSui = Number(total) / 1e9;
+  }
+  return { digest: result.digest, gasCostSui, effects: result.effects ?? void 0 };
+}
+
 // src/mpp-cost.ts
 function parseChallengeAmount(challenge) {
   const raw = challenge?.request?.amount;
@@ -1400,6 +1430,66 @@ function parseChallengeAmount(challenge) {
   return Number.isFinite(n) ? n : void 0;
 }
 
+// src/wallet/pay.ts
+async function payWithMpp(args) {
+  const { signer, client, options } = args;
+  const { Mppx } = await import('mppx/client');
+  const { sui, USDC } = await import('@suimpp/mpp/client');
+  const { SuiGrpcClient: SuiGrpcClient2 } = await import('@mysten/sui/grpc');
+  const signerAddress = signer.getAddress();
+  let paymentDigest;
+  let gasCostSui = 0;
+  let chargedAmount;
+  const network = client.network === "testnet" ? "testnet" : "mainnet";
+  const grpcBaseUrl = network === "testnet" ? "https://fullnode.testnet.sui.io" : "https://fullnode.mainnet.sui.io";
+  const grpcClient = new SuiGrpcClient2({ baseUrl: grpcBaseUrl, network });
+  const mppx = Mppx.create({
+    polyfill: false,
+    onChallenge: async (challenge) => {
+      const parsed = parseChallengeAmount(challenge);
+      if (parsed !== void 0) chargedAmount = parsed;
+      return void 0;
+    },
+    methods: [sui({
+      client,
+      currency: USDC,
+      signer: {
+        toSuiAddress: () => signerAddress,
+        signPersonalMessage: (bytes) => signer.signPersonalMessage(bytes)
+      },
+      execute: async (tx) => {
+        const result = await executeTx(client, signer, () => tx, { buildClient: grpcClient });
+        paymentDigest = result.digest;
+        gasCostSui = result.gasCostSui;
+        return { digest: result.digest };
+      }
+    })]
+  });
+  const method = (options.method ?? "GET").toUpperCase();
+  const canHaveBody = method !== "GET" && method !== "HEAD";
+  const response = await mppx.fetch(options.url, {
+    method,
+    headers: options.headers,
+    body: canHaveBody ? options.body : void 0
+  });
+  const contentType = response.headers.get("content-type") ?? "";
+  let body;
+  try {
+    body = contentType.includes("application/json") ? await response.json() : await response.text();
+  } catch {
+    body = null;
+  }
+  const paid = !!paymentDigest;
+  return {
+    status: response.status,
+    body,
+    paid,
+    cost: paid ? chargedAmount ?? options.maxPrice ?? void 0 : void 0,
+    gasCostSui: paid ? gasCostSui : void 0,
+    receipt: paymentDigest ? { reference: paymentDigest, timestamp: (/* @__PURE__ */ new Date()).toISOString() } : void 0
+  };
+}
+
 // src/wallet/zkLoginSigner.ts
 var ZkLoginSigner = class {
   constructor(ephemeralKeypair, zkProof, userAddress, maxEpoch) {
@@ -1422,8 +1512,17 @@ var ZkLoginSigner = class {
       })
     };
   }
-  async signPersonalMessage(_messageBytes) {
-    throw new Error("ZkLoginSigner.signPersonalMessage is not yet implemented. Use KeypairSigner for sdk.pay() until grief-protection signing is wired for zkLogin.");
+  async signPersonalMessage(messageBytes) {
+    const { getZkLoginSignature } = await import('@mysten/zklogin');
+    const { signature: ephSig, bytes } = await this.ephemeralKeypair.signPersonalMessage(messageBytes);
+    return {
+      signature: getZkLoginSignature({
+        inputs: this.zkProof,
+        maxEpoch: this.maxEpoch,
+        userSignature: ephSig
+      }),
+      bytes
+    };
   }
   isExpired(currentEpoch) {
     return currentEpoch >= this.maxEpoch;
@@ -6512,25 +6611,6 @@ var ContactManager = class {
   }
 };
 var DEFAULT_CONFIG_DIR = path.join(os.homedir(), ".t2000");
-async function executeTx(client, signer, buildTx, options = {}) {
-  const tx = await buildTx();
-  tx.setSender(signer.getAddress());
-  const txBytes = await tx.build({ client: options.buildClient ?? client });
-  const { signature } = await signer.signTransaction(txBytes);
-  const result = await client.executeTransactionBlock({
-    transactionBlock: txBytes,
-    signature,
-    options: { showEffects: true }
-  });
-  await client.waitForTransaction({ digest: result.digest });
-  const gasUsed = result.effects?.gasUsed;
-  let gasCostSui = 0;
-  if (gasUsed) {
-    const total = BigInt(gasUsed.computationCost) + BigInt(gasUsed.storageCost) - BigInt(gasUsed.storageRebate);
-    gasCostSui = Number(total) / 1e9;
-  }
-  return { digest: result.digest, gasCostSui, effects: result.effects ?? void 0 };
-}
 var T2000 = class _T2000 extends eventemitter3.EventEmitter {
   _signer;
   _keypair;
@@ -6610,66 +6690,11 @@ var T2000 = class _T2000 extends eventemitter3.EventEmitter {
   async pay(options) {
     this.enforcer.assertNotLocked();
     this.enforcer.check({ operation: "pay", amount: options.maxPrice ?? 1 });
-    const { Mppx } = await import('mppx/client');
-    const { sui, USDC } = await import('@suimpp/mpp/client');
-    const { SuiGrpcClient: SuiGrpcClient2 } = await import('@mysten/sui/grpc');
-    const client = this.client;
-    const signer = this._signer;
-    const signerAddress = signer.getAddress();
-    let paymentDigest;
-    let gasCostSui = 0;
-    let chargedAmount;
-    const network = client.network === "testnet" ? "testnet" : "mainnet";
-    const grpcBaseUrl = network === "testnet" ? "https://fullnode.testnet.sui.io" : "https://fullnode.mainnet.sui.io";
-    const grpcClient = new SuiGrpcClient2({ baseUrl: grpcBaseUrl, network });
-    const mppx = Mppx.create({
-      polyfill: false,
-      onChallenge: async (challenge) => {
-        const parsed = parseChallengeAmount(challenge);
-        if (parsed !== void 0) chargedAmount = parsed;
-        return void 0;
-      },
-      methods: [sui({
-        client,
-        currency: USDC,
-        signer: {
-          toSuiAddress: () => signerAddress,
-          signPersonalMessage: (bytes) => signer.signPersonalMessage(bytes)
-        },
-        execute: async (tx) => {
-          const result = await executeTx(client, signer, () => tx, { buildClient: grpcClient });
-          paymentDigest = result.digest;
-          gasCostSui = result.gasCostSui;
-          return { digest: result.digest };
-        }
-      })]
-    });
-    const method = (options.method ?? "GET").toUpperCase();
-    const canHaveBody = method !== "GET" && method !== "HEAD";
-    const response = await mppx.fetch(options.url, {
-      method,
-      headers: options.headers,
-      body: canHaveBody ? options.body : void 0
-    });
-    const contentType = response.headers.get("content-type") ?? "";
-    let body;
-    try {
-      body = contentType.includes("application/json") ? await response.json() : await response.text();
-    } catch {
-      body = null;
+    const result = await payWithMpp({ signer: this._signer, client: this.client, options });
+    if (result.paid) {
+      this.enforcer.recordUsage(result.cost ?? options.maxPrice ?? 1);
     }
-    const paid = !!paymentDigest;
-    if (paid) {
-      this.enforcer.recordUsage(chargedAmount ?? options.maxPrice ?? 1);
-    }
-    return {
-      status: response.status,
-      body,
-      paid,
-      cost: paid ? chargedAmount ?? options.maxPrice ?? void 0 : void 0,
-      gasCostSui: paid ? gasCostSui : void 0,
-      receipt: paymentDigest ? { reference: paymentDigest, timestamp: (/* @__PURE__ */ new Date()).toISOString() } : void 0
-    };
+    return result;
   }
   // [S.323 / 2026-05-25] VOLO vSUI staking surfaces removed (full cut).
   // Engine cut Volo in S.277; SDK + CLI + MCP followed in S.323 because the
@@ -7973,7 +7998,8 @@ var WRITE_APPENDER_REGISTRY = {
       effectiveAmount = rawAmount;
     } else {
       const r = await selectAndSplitCoin(tx, ctx.client, ctx.sender, assetInfo.type, rawAmount, {
-        sponsoredContext: ctx.sponsoredContext
+        sponsoredContext: ctx.sponsoredContext,
+        mergeCache: ctx.coinMergeCache
       });
       coin = r.coin;
       effectiveAmount = r.effectiveAmount;
@@ -8047,7 +8073,8 @@ var WRITE_APPENDER_REGISTRY = {
       effectiveAmount = rawAmount;
     } else {
       const r = await selectAndSplitCoin(tx, ctx.client, ctx.sender, assetInfo.type, rawAmount, {
-        sponsoredContext: ctx.sponsoredContext
+        sponsoredContext: ctx.sponsoredContext,
+        mergeCache: ctx.coinMergeCache
       });
       coin = r.coin;
       effectiveAmount = r.effectiveAmount;
@@ -8091,7 +8118,14 @@ var WRITE_APPENDER_REGISTRY = {
       };
     }
     if (asset === "SUI") {
-      const result = await selectSuiCoin(tx, ctx.client, ctx.sender, rawAmount, ctx.sponsoredContext);
+      const result = await selectSuiCoin(
+        tx,
+        ctx.client,
+        ctx.sender,
+        rawAmount,
+        ctx.sponsoredContext,
+        ctx.coinMergeCache
+      );
       addSendToTx(tx, result.coin, recipient);
       return {
         preview: {
@@ -8154,7 +8188,7 @@ var WRITE_APPENDER_REGISTRY = {
       inputCoin: ctx.chainedCoin,
       precomputedRoute: input.precomputedRoute,
       sponsoredContext: ctx.sponsoredContext,
-      suiMergeCache: ctx.suiMergeCache
+      coinMergeCache: ctx.coinMergeCache
     });
     if (!ctx.isOutputConsumed) {
       tx.transferObjects([result.coin], ctx.sender);
@@ -8258,10 +8292,10 @@ async function composeTx(opts) {
     sponsoredContext: opts.sponsoredContext ?? false,
     overlayFee: opts.overlayFee,
     feeHooks: opts.feeHooks,
-    // One cache per compose run — shared across all legs so multi-leg
-    // sponsored bundles that source the same coin (e.g. two SUI swaps)
-    // merge that coin's objects exactly once.
-    suiMergeCache: /* @__PURE__ */ new Map()
+    // One cache per compose run — shared across all legs (any coin type)
+    // so multi-leg sponsored bundles that source the same coin (two SUI
+    // swaps, swap USDC + save USDC, ...) merge that coin's objects once.
+    coinMergeCache: /* @__PURE__ */ new Map()
   };
   const consumedSteps = /* @__PURE__ */ new Set();
   for (let i = 0; i < opts.steps.length; i++) {
@@ -8632,6 +8666,7 @@ exports.createSuiClient = createSuiClient;
 exports.deriveAllowedAddressesFromPtb = deriveAllowedAddressesFromPtb;
 exports.deserializeCetusRoute = deserializeCetusRoute;
 exports.displayHandle = displayHandle;
+exports.executeTx = executeTx;
 exports.exportPrivateKey = exportPrivateKey;
 exports.extractAllUserLegs = extractAllUserLegs;
 exports.extractTransferDetails = extractTransferDetails;
@@ -8675,6 +8710,7 @@ exports.normalizeAddressInput = normalizeAddressInput;
 exports.normalizeAsset = normalizeAsset;
 exports.normalizeCoinType = normalizeCoinType;
 exports.parseSuiRpcTx = parseSuiRpcTx;
+exports.payWithMpp = payWithMpp;
 exports.queryHistory = queryHistory;
 exports.queryTransaction = queryTransaction;
 exports.rawToStable = rawToStable;