@t2000/cli 4.2.1 → 4.3.0

package/dist/index.js

@@ -1,5 +1,10 @@
 #!/usr/bin/env node
 import { createRequire as __createRequire } from 'module'; import { fileURLToPath as __fileURLToPath } from 'url'; import { dirname as __pathDirname } from 'path'; const require = __createRequire(import.meta.url); const __filename = __fileURLToPath(import.meta.url); const __dirname = __pathDirname(__filename);
+import {
+  SIGNATURE_FLAG_TO_SCHEME,
+  SIGNATURE_SCHEME_TO_FLAG,
+  SIGNATURE_SCHEME_TO_SIZE
+} from "./chunk-634W6JCI.js";
 import {
   AggregatorClient,
   Env,
@@ -27,11 +32,6 @@ import {
   init_bcs,
   suiBcs
 } from "./chunk-24QPX3VK.js";
-import {
-  SIGNATURE_FLAG_TO_SCHEME,
-  SIGNATURE_SCHEME_TO_FLAG,
-  SIGNATURE_SCHEME_TO_SIZE
-} from "./chunk-634W6JCI.js";
 import {
   HashMD,
   SHA512_IV,
@@ -34992,7 +34992,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);
@@ -35298,14 +35306,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;
@@ -35677,11 +35686,88 @@ var KeypairSigner = class {
     return this.keypair;
   }
 };
+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 };
+}
 function parseChallengeAmount(challenge) {
   const raw = challenge?.request?.amount;
   const n = typeof raw === "string" ? Number(raw) : typeof raw === "number" ? raw : Number.NaN;
   return Number.isFinite(n) ? n : void 0;
 }
+async function payWithMpp(args) {
+  const { signer, client, options } = args;
+  const { Mppx } = await import("./client-BG6M6WUI.js");
+  const { sui, USDC } = await import("./client-UCPLLOGQ.js");
+  const { SuiGrpcClient: SuiGrpcClient2 } = await import("./grpc-RHG6ARHV.js");
+  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
+  };
+}
 var ZkLoginSigner = class {
   constructor(ephemeralKeypair, zkProof, userAddress, maxEpoch) {
     this.ephemeralKeypair = ephemeralKeypair;
@@ -35703,8 +35789,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("./esm-SWUQQCXL.js");
+    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;
@@ -40579,25 +40674,6 @@ var ContactManager = class {
   }
 };
 var DEFAULT_CONFIG_DIR = join$1(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 import_index2.default {
   _signer;
   _keypair;
@@ -40677,66 +40753,11 @@ var T2000 = class _T2000 extends import_index2.default {
   async pay(options) {
     this.enforcer.assertNotLocked();
     this.enforcer.check({ operation: "pay", amount: options.maxPrice ?? 1 });
-    const { Mppx } = await import("./client-BG6M6WUI.js");
-    const { sui, USDC } = await import("./client-3JAUHH6P.js");
-    const { SuiGrpcClient: SuiGrpcClient2 } = await import("./grpc-RHG6ARHV.js");
-    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 paid = !!paymentDigest;
-    if (paid) {
-      this.enforcer.recordUsage(chargedAmount ?? options.maxPrice ?? 1);
+    const result = await payWithMpp({ signer: this._signer, client: this.client, options });
+    if (result.paid) {
+      this.enforcer.recordUsage(result.cost ?? 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
@@ -45326,7 +45347,7 @@ function registerMcpStart(parent) {
   parent.command("start", { isDefault: true }).description("Start MCP server (stdio transport \u2014 for AI client integration)").option("--key <path>", "Custom wallet path (default ~/.t2000/wallet.key)").action(async (opts) => {
     let mod2;
     try {
-      mod2 = await import("./dist-EQH4IESE.js");
+      mod2 = await import("./dist-ELFUROC5.js");
     } catch {
       console.error("MCP server not installed. Run:\n  npm install -g @t2000/mcp");
       process.exit(1);