@piprail/sdk 1.25.0 → 2.0.1

package/dist/index.js

@@ -17,13 +17,14 @@ import {
   WalletRequiredError,
   WrongChainError,
   WrongFamilyError,
+  assertNoLegacyWalletKey,
   floorUnits,
   formatUnits,
   nativeCost,
   parseUnits,
   rejectForeignToken,
   toInsufficientFundsError
-} from "./chunk-L6WQRHEZ.js";
+} from "./chunk-7XK22JSQ.js";
 
 // src/drivers/registry.ts
 var byFamily = /* @__PURE__ */ new Map();
@@ -319,8 +320,23 @@ import {
 } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 function createWalletAdapter(config, resolved) {
-  if ("privateKey" in config) {
-    const account = privateKeyToAccount(config.privateKey);
+  assertNoLegacyWalletKey(config, "EVM");
+  if ("key" in config) {
+    const key = config.key;
+    if (typeof key !== "string" || !/^0x[0-9a-fA-F]{64}$/.test(key)) {
+      const hint = typeof key === "string" && !key.startsWith("0x") ? " (got a non-0x string \u2014 a base58/seed key belongs to another family; pass { key } as the EVM chain's 0x\u2026 hex secret)." : " (expected 0x followed by 64 hex characters).";
+      throw new WrongFamilyError(
+        `chain is EVM; the wallet { key } is not a valid 0x\u2026 32-byte hex private key${hint}`
+      );
+    }
+    let account;
+    try {
+      account = privateKeyToAccount(key);
+    } catch (err) {
+      throw new WrongFamilyError(
+        `chain is EVM; the wallet { key } is not a valid 0x\u2026 32-byte hex private key: ${err instanceof Error ? err.message : String(err)}.`
+      );
+    }
     const transport = http(resolved.rpcUrl);
     const walletClient = createWalletClient({ account, chain: resolved.chain, transport });
     return { account, walletClient };
@@ -328,7 +344,7 @@ function createWalletAdapter(config, resolved) {
   const wc = config.walletClient;
   if (!wc.account) {
     throw new WrongFamilyError(
-      "chain is EVM; the provided walletClient has no attached account. Use `createWalletClient({ account, chain, transport })`, or pass { privateKey }."
+      "chain is EVM; the provided walletClient has no attached account. Use `createWalletClient({ account, chain, transport })`, or pass { key }."
     );
   }
   if (wc.chain && wc.chain.id !== resolved.chainId) {
@@ -1492,6 +1508,7 @@ function isValidChallenge(value) {
   const v = value;
   if (v.x402Version !== 2) return false;
   if (!Array.isArray(v.accepts) || v.accepts.length === 0) return false;
+  if (!v.accepts.every((a) => a !== null && typeof a === "object")) return false;
   if (!v.resource || typeof v.resource !== "object") return false;
   return true;
 }
@@ -1595,9 +1612,15 @@ function makeEvmNetwork(resolved) {
       }
     },
     bindWallet(wallet) {
-      if (typeof wallet !== "object" || wallet === null || !("privateKey" in wallet) && !("walletClient" in wallet)) {
+      if (typeof wallet !== "object" || wallet === null) {
         throw new WrongFamilyError(
-          `chain ${network} is EVM; wallet must be { privateKey } or { walletClient }.`
+          `chain ${network} is EVM; wallet must be { key } (0x\u2026 hex) or { walletClient }.`
+        );
+      }
+      assertNoLegacyWalletKey(wallet, "EVM");
+      if (!("key" in wallet) && !("walletClient" in wallet)) {
+        throw new WrongFamilyError(
+          `chain ${network} is EVM; wallet must be { key } (0x\u2026 hex) or { walletClient }.`
         );
       }
       return { _native: createWalletAdapter(wallet, resolved) };
@@ -1793,7 +1816,7 @@ var loaders = {
   solana: async () => {
     let mod;
     try {
-      mod = await import("./solana-KWNRY5NR.js");
+      mod = await import("./solana-E4MD6JJ6.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Solana selected, but its packages aren't installed. Run: npm install @solana/web3.js @solana/spl-token bs58`,
@@ -1805,7 +1828,7 @@ var loaders = {
   ton: async () => {
     let mod;
     try {
-      mod = await import("./ton-QN5GTOCS.js");
+      mod = await import("./ton-5ZPT5PSP.js");
     } catch (cause) {
       throw new MissingDriverError(
         `TON selected, but its packages aren't installed. Run: npm install @ton/ton @ton/core @ton/crypto`,
@@ -1817,7 +1840,7 @@ var loaders = {
   stellar: async () => {
     let mod;
     try {
-      mod = await import("./stellar-YB7JXKK4.js");
+      mod = await import("./stellar-U5NCRIOJ.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Stellar selected, but its package isn't installed. Run: npm install @stellar/stellar-sdk`,
@@ -1829,7 +1852,7 @@ var loaders = {
   xrpl: async () => {
     let mod;
     try {
-      mod = await import("./xrpl-ECHK3GIX.js");
+      mod = await import("./xrpl-2MZEOIFY.js");
     } catch (cause) {
       throw new MissingDriverError(
         `XRPL selected, but its package isn't installed. Run: npm install xrpl`,
@@ -1841,7 +1864,7 @@ var loaders = {
   tron: async () => {
     let mod;
     try {
-      mod = await import("./tron-QSNCDYRB.js");
+      mod = await import("./tron-WYS4X2I5.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Tron selected, but its package isn't installed. Run: npm install tronweb`,
@@ -1853,7 +1876,7 @@ var loaders = {
   sui: async () => {
     let mod;
     try {
-      mod = await import("./sui-IODKU2MA.js");
+      mod = await import("./sui-Y53M4GUM.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Sui selected, but its package isn't installed. Run: npm install @mysten/sui`,
@@ -1865,7 +1888,7 @@ var loaders = {
   near: async () => {
     let mod;
     try {
-      mod = await import("./near-TWA4PYOD.js");
+      mod = await import("./near-MTYBCUYM.js");
     } catch (cause) {
       throw new MissingDriverError(
         `NEAR selected, but its package isn't installed. Run: npm install near-api-js`,
@@ -1877,7 +1900,7 @@ var loaders = {
   aptos: async () => {
     let mod;
     try {
-      mod = await import("./aptos-3TSKTI4D.js");
+      mod = await import("./aptos-RIL56C7L.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Aptos selected, but its package isn't installed. Run: npm install @aptos-labs/ts-sdk`,
@@ -1889,7 +1912,7 @@ var loaders = {
   algorand: async () => {
     let mod;
     try {
-      mod = await import("./algorand-677ILBQS.js");
+      mod = await import("./algorand-GSFVZTBF.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Algorand selected, but its package isn't installed. Run: npm install algosdk`,
@@ -2577,8 +2600,29 @@ var PipRailClient = class {
     this.maxRetries = Math.max(1, opts.maxPaymentRetries ?? 3);
     this.retryTimeoutMs = opts.retryTimeoutMs ?? 3e4;
     this.onEvent = opts.onEvent ?? (() => void 0);
+    this.assertPolicyAmountCaps(opts.policy);
     this.assertPolicyTimeOptions(opts.policy);
   }
+  /**
+   * Fail LOUDLY at construction on a malformed amount cap — a security boundary
+   * must never silently half-arm, and a misconfigured cap is a programmer error
+   * (→ `TypeError`, no new SDK code). Each cap (`maxAmount` / `maxTotal` /
+   * `windowTotal`) must be a non-negative decimal STRING (the same grammar
+   * {@link floorUnits} accepts), so a typo like `'0.01abc'` fails fast here instead
+   * of lazily throwing a raw `floorUnits` error out of the never-throw read methods.
+   */
+  assertPolicyAmountCaps(policy) {
+    if (!policy) return;
+    for (const field of ["maxAmount", "maxTotal", "windowTotal"]) {
+      const v = policy[field];
+      if (v === void 0) continue;
+      if (typeof v !== "string" || !/^\d+(\.\d+)?$/.test(v)) {
+        throw new TypeError(
+          `policy.${field} must be a non-negative decimal string (e.g. '0.10'); got ${JSON.stringify(v)}.`
+        );
+      }
+    }
+  }
   /**
    * Fail LOUDLY at construction on a misconfigured time policy — a security
    * boundary must never silently half-arm. Two invariants (a misconfiguration is
@@ -3181,20 +3225,25 @@ var PipRailClient = class {
   /** Build the agent-facing quote for an accept: TRUE decimals/symbol (via the
    *  driver's describeAsset) + the policy verdict + a symbol-mismatch flag. */
   buildQuote(net, accept, url, description) {
-    if (!/^\d+$/.test(accept.amount)) {
+    if (typeof accept.amount !== "string" || !/^\d+$/.test(accept.amount)) {
+      throw new InvalidEnvelopeError(
+        `challenge amount "${String(accept.amount)}" is not a base-unit integer string.`
+      );
+    }
+    if (typeof accept.asset !== "string" || accept.asset.length === 0) {
       throw new InvalidEnvelopeError(
-        `challenge amount "${accept.amount}" is not a base-unit integer.`
+        `challenge on ${accept.network} states no (string) asset \u2014 refusing to price it.`
       );
     }
     const amountBase = BigInt(accept.amount);
     const described = net.describeAsset(accept.asset);
-    const decimals = described?.decimals ?? accept.extra.decimals;
-    if (decimals === void 0) {
+    const decimals = described?.decimals ?? accept.extra?.decimals;
+    if (typeof decimals !== "number" || !Number.isInteger(decimals) || decimals < 0) {
       throw new InvalidEnvelopeError(
-        `challenge for ${accept.asset} on ${accept.network} states no decimals and the SDK doesn't recognise the token \u2014 refusing to price it.`
+        `challenge for ${accept.asset} on ${accept.network} states no valid decimals and the SDK doesn't recognise the token \u2014 refusing to price it.`
       );
     }
-    const symbol = described?.symbol ?? accept.extra.symbol;
+    const symbol = described?.symbol ?? accept.extra?.symbol;
     const amountFormatted = formatUnits(amountBase, decimals);
     const intent = {
       host: hostOf2(url),
@@ -3226,7 +3275,7 @@ var PipRailClient = class {
       this.ledger.totalFor(accept.network, accept.asset),
       ctx
     );
-    const serverSymbol = accept.extra.symbol;
+    const serverSymbol = accept.extra?.symbol;
     const symbolMismatch = intent.recognized && !!serverSymbol && !!symbol && serverSymbol.toUpperCase() !== symbol.toUpperCase();
     return {
       url,
@@ -3302,7 +3351,7 @@ var PipRailClient = class {
     const ref = await net.send(wallet, accept);
     this.safeEmit({ kind: "payment-broadcast", ref });
     try {
-      const { height } = await net.confirm(ref, accept.extra.minConfirmations ?? 1);
+      const { height } = await net.confirm(ref, accept.extra?.minConfirmations ?? 1);
       this.safeEmit({
         kind: "payment-confirmed",
         ref,
@@ -3322,7 +3371,7 @@ var PipRailClient = class {
     const signature = {
       x402Version: 2,
       accepted: accept,
-      payload: { nonce: accept.extra.nonce, txHash: ref }
+      payload: { nonce: accept.extra?.nonce, txHash: ref }
     };
     const headers = new Headers(originalInit?.headers);
     headers.set(HEADER_SIGNATURE, buildSignatureHeader(signature));
@@ -3669,9 +3718,9 @@ var MultiChainPayer = class _MultiChainPayer {
    * ```ts
    * const payer = MultiChainPayer.fromWallets({
    *   wallets: {
-   *     base:    { privateKey: process.env.EVM_KEY! },
-   *     solana:  { secretKey:  process.env.SOLANA_SECRET! },
-   *     xrpl:    { seed:       process.env.XRPL_SEED! },
+   *     base:    { key: process.env.EVM_KEY! },
+   *     solana:  { key: process.env.SOLANA_SECRET! },
+   *     xrpl:    { key: process.env.XRPL_SEED! },
    *   },
    *   policy: { maxAmount: '1.00', maxTotal: '20.00', tokens: ['USDC', 'USDT'] },
    * })
@@ -4015,6 +4064,22 @@ async function readBody(res) {
     return text;
   }
 }
+function toToolError(err) {
+  if (!(err instanceof PipRailError)) throw err;
+  const out = {
+    ok: false,
+    code: err.code,
+    reason: err.message,
+    explain: explainDecline(err)
+  };
+  if (err instanceof PaymentDeclinedError) {
+    out.declined = true;
+    if (err.reasonCode) out.reasonCode = err.reasonCode;
+  }
+  const ref = err.ref;
+  if (typeof ref === "string") out.ref = ref;
+  return out;
+}
 function paymentTools(client) {
   return [
     {
@@ -4041,23 +4106,27 @@ function paymentTools(client) {
         additionalProperties: false
       },
       invoke: async (args) => {
-        const opts = {};
-        if (typeof args.query === "string") opts.query = args.query;
-        if (typeof args.network === "string") opts.network = args.network;
-        if (typeof args.maxPrice === "number") opts.maxPrice = args.maxPrice;
-        if (typeof args.limit === "number") opts.limit = args.limit;
-        const found = await client.discover(opts);
-        return {
-          count: found.length,
-          resources: found.map((r) => ({
-            resource: r.resource,
-            name: r.name,
-            description: r.description,
-            source: r.source,
-            priceUsd: r.priceUsd,
-            networks: [...new Set(r.rails.map((rail) => rail.network))]
-          }))
-        };
+        try {
+          const opts = {};
+          if (typeof args.query === "string") opts.query = args.query;
+          if (typeof args.network === "string") opts.network = args.network;
+          if (typeof args.maxPrice === "number") opts.maxPrice = args.maxPrice;
+          if (typeof args.limit === "number") opts.limit = args.limit;
+          const found = await client.discover(opts);
+          return {
+            count: found.length,
+            resources: found.map((r) => ({
+              resource: r.resource,
+              name: r.name,
+              description: r.description,
+              source: r.source,
+              priceUsd: r.priceUsd,
+              networks: [...new Set(r.rails.map((rail) => rail.network))]
+            }))
+          };
+        } catch (err) {
+          return toToolError(err);
+        }
       }
     },
     {
@@ -4080,8 +4149,12 @@ function paymentTools(client) {
       },
       outputSchema: OPEN_OBJECT,
       invoke: async (args) => {
-        const quote = await client.quote(String(args.url));
-        return quote ? { gated: true, ...quote } : { gated: false, url: String(args.url) };
+        try {
+          const quote = await client.quote(String(args.url));
+          return quote ? { gated: true, ...quote } : { gated: false, url: String(args.url) };
+        } catch (err) {
+          return toToolError(err);
+        }
       }
     },
     {
@@ -4104,34 +4177,38 @@ function paymentTools(client) {
       },
       outputSchema: OPEN_OBJECT,
       invoke: async (args) => {
-        const plan = await client.planPayment(String(args.url));
-        if (plan == null) return { gated: false, url: String(args.url) };
-        return {
-          gated: true,
-          payable: plan.payable,
-          status: plan.status,
-          fundingHint: plan.fundingHint,
-          // One model-readable line distilling the whole plan.
-          summary: summarizePlan(plan),
-          best: plan.best ? {
-            network: plan.best.accept.network,
-            symbol: plan.best.quote.symbol,
-            amount: plan.best.quote.amountFormatted,
-            gasCoin: plan.best.cost.feeSymbol,
-            gas: plan.best.cost.feeFormatted
-          } : null,
-          options: plan.options.map((o) => ({
-            network: o.accept.network,
-            symbol: o.quote.symbol,
-            amount: o.quote.amountFormatted,
-            state: o.state,
-            blockers: o.blockers,
-            warnings: o.warnings,
-            recipientReady: o.recipient.ready
-          })),
-          // The session's time leash, present only when a time policy is configured.
-          ...plan.session ? { session: plan.session } : {}
-        };
+        try {
+          const plan = await client.planPayment(String(args.url));
+          if (plan == null) return { gated: false, url: String(args.url) };
+          return {
+            gated: true,
+            payable: plan.payable,
+            status: plan.status,
+            fundingHint: plan.fundingHint,
+            // One model-readable line distilling the whole plan.
+            summary: summarizePlan(plan),
+            best: plan.best ? {
+              network: plan.best.accept.network,
+              symbol: plan.best.quote.symbol,
+              amount: plan.best.quote.amountFormatted,
+              gasCoin: plan.best.cost.feeSymbol,
+              gas: plan.best.cost.feeFormatted
+            } : null,
+            options: plan.options.map((o) => ({
+              network: o.accept.network,
+              symbol: o.quote.symbol,
+              amount: o.quote.amountFormatted,
+              state: o.state,
+              blockers: o.blockers,
+              warnings: o.warnings,
+              recipientReady: o.recipient.ready
+            })),
+            // The session's time leash, present only when a time policy is configured.
+            ...plan.session ? { session: plan.session } : {}
+          };
+        } catch (err) {
+          return toToolError(err);
+        }
       }
     },
     {
@@ -4237,14 +4314,18 @@ function paymentTools(client) {
         additionalProperties: false
       },
       invoke: async (args) => {
-        const opts = {};
-        if (typeof args.name === "string") opts.name = args.name;
-        if (typeof args.description === "string") opts.description = args.description;
-        if (typeof args.priceUsd === "number") opts.priceUsd = args.priceUsd;
-        if (typeof args.network === "string") opts.network = args.network;
-        if (typeof args.asset === "string") opts.asset = args.asset;
-        const outcomes = await client.register(String(args.url), opts);
-        return { outcomes };
+        try {
+          const opts = {};
+          if (typeof args.name === "string") opts.name = args.name;
+          if (typeof args.description === "string") opts.description = args.description;
+          if (typeof args.priceUsd === "number") opts.priceUsd = args.priceUsd;
+          if (typeof args.network === "string") opts.network = args.network;
+          if (typeof args.asset === "string") opts.asset = args.asset;
+          const outcomes = await client.register(String(args.url), opts);
+          return { outcomes };
+        } catch (err) {
+          return toToolError(err);
+        }
       }
     },
     {
@@ -4260,14 +4341,18 @@ function paymentTools(client) {
       parameters: { type: "object", properties: {}, additionalProperties: false },
       outputSchema: OPEN_OBJECT,
       invoke: async () => {
-        const spent = client.spent();
-        const budget = client.budget();
-        return {
-          spent,
-          remaining: budget.byAsset,
-          session: budget.session,
-          report: formatSpendReport(spent)
-        };
+        try {
+          const spent = client.spent();
+          const budget = client.budget();
+          return {
+            spent,
+            remaining: budget.byAsset,
+            session: budget.session,
+            report: formatSpendReport(spent)
+          };
+        } catch (err) {
+          return toToolError(err);
+        }
       }
     },
     {
@@ -4649,7 +4734,7 @@ function createPaymentGate(options) {
     if (settle === "self") {
       if (cfg.relayer === void 0) {
         throw new Error(
-          "requirePayment: exact `settle: 'self'` needs a `relayer` wallet (the gas-paying key that broadcasts the settle), e.g. exact: { settle: 'self', relayer: { privateKey } }."
+          "requirePayment: exact `settle: 'self'` needs a `relayer` wallet (the gas-paying key that broadcasts the settle), e.g. exact: { settle: 'self', relayer: { key } }."
         );
       }
       relayer = net.bindWallet(cfg.relayer);

package/dist/{near-MG256A3E.cjs → near-DI2I3MAV.cjs}

@@ -7,7 +7,8 @@
 
 
 
-var _chunkU35MG4TFcjs = require('./chunk-U35MG4TF.cjs');
+
+var _chunkJG6KRAW6cjs = require('./chunk-JG6KRAW6.cjs');
 
 // src/drivers/near/index.ts
 var _nearapijs = require('near-api-js');
@@ -53,18 +54,18 @@ async function payNear(params) {
     return res.hash;
   } catch (err) {
     if (isNearRegistrationError(err)) {
-      throw new (0, _chunkU35MG4TFcjs.RecipientNotReadyError)(
+      throw new (0, _chunkJG6KRAW6cjs.RecipientNotReadyError)(
         `NEAR recipient ${accept.payTo} isn't registered on token ${accept.asset} (NEP-145 storage_deposit) \u2014 register it once (\u22480.00125 NEAR) before it can receive. (NEAR: not registered)`,
         { cause: err }
       );
     }
     if (isNearAffordability(err)) {
-      throw new (0, _chunkU35MG4TFcjs.InsufficientFundsError)(
+      throw new (0, _chunkJG6KRAW6cjs.InsufficientFundsError)(
         err instanceof Error ? err.message : "Insufficient NEAR balance for the payment.",
         { cause: err }
       );
     }
-    throw _nullishCoalesce(_chunkU35MG4TFcjs.toInsufficientFundsError.call(void 0, err), () => ( err));
+    throw _nullishCoalesce(_chunkJG6KRAW6cjs.toInsufficientFundsError.call(void 0, err), () => ( err));
   }
 }
 async function payNearNative(params) {
@@ -74,12 +75,12 @@ async function payNearNative(params) {
     return res.hash;
   } catch (err) {
     if (isNearAffordability(err)) {
-      throw new (0, _chunkU35MG4TFcjs.InsufficientFundsError)(
+      throw new (0, _chunkJG6KRAW6cjs.InsufficientFundsError)(
         err instanceof Error ? err.message : "Insufficient NEAR balance for the payment.",
         { cause: err }
       );
     }
-    throw _nullishCoalesce(_chunkU35MG4TFcjs.toInsufficientFundsError.call(void 0, err), () => ( err));
+    throw _nullishCoalesce(_chunkJG6KRAW6cjs.toInsufficientFundsError.call(void 0, err), () => ( err));
   }
 }
 function isNearRegistrationError(err) {
@@ -216,36 +217,27 @@ function txNotFound(hash) {
 
 function assertNearWallet(wallet, network) {
   if (typeof wallet !== "object" || wallet === null) {
-    throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)(
-      `chain ${network} is NEAR; wallet must be { accountId, privateKey } (privateKey = ed25519:\u2026).`
-    );
-  }
-  if ("walletClient" in wallet) {
-    throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)(
-      `chain ${network} is NEAR; a viem { walletClient } can't be used \u2014 pass { accountId, privateKey }.`
-    );
-  }
-  if ("secretKey" in wallet || "signer" in wallet || "mnemonic" in wallet || "keyPair" in wallet || "secret" in wallet || "seed" in wallet || "keypair" in wallet) {
-    throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)(
-      `chain ${network} is NEAR; that looks like another family's wallet \u2014 pass { accountId, privateKey }.`
+    throw new (0, _chunkJG6KRAW6cjs.WrongFamilyError)(
+      `chain ${network} is NEAR; wallet must be { accountId, key } (key = ed25519:\u2026).`
     );
   }
-  if (!("accountId" in wallet) || !("privateKey" in wallet)) {
-    throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)(
-      `chain ${network} is NEAR; wallet must be { accountId, privateKey } (privateKey = ed25519:\u2026).`
+  _chunkJG6KRAW6cjs.assertNoLegacyWalletKey.call(void 0, wallet, "NEAR");
+  if (!("accountId" in wallet) || !("key" in wallet)) {
+    throw new (0, _chunkJG6KRAW6cjs.WrongFamilyError)(
+      `chain ${network} is NEAR; wallet must be { accountId, key } (key = ed25519:\u2026).`
     );
   }
   return wallet;
 }
 function resolveNearWallet(config) {
-  if (!config.accountId || !config.privateKey) {
-    throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)("NEAR wallet needs { accountId, privateKey } (privateKey = ed25519:\u2026).");
+  if (!config.accountId || !config.key) {
+    throw new (0, _chunkJG6KRAW6cjs.WrongFamilyError)("NEAR wallet needs { accountId, key } (key = ed25519:\u2026).");
   }
   let signer;
   try {
-    signer = _nearapijs.KeyPairSigner.fromSecretKey(config.privateKey);
+    signer = _nearapijs.KeyPairSigner.fromSecretKey(config.key);
   } catch (cause) {
-    throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)("NEAR wallet { privateKey } is not a valid ed25519:\u2026 secret key.", {
+    throw new (0, _chunkJG6KRAW6cjs.WrongFamilyError)("NEAR wallet { key } is not a valid ed25519:\u2026 secret key.", {
       cause
     });
   }
@@ -312,16 +304,16 @@ function makeNearNetwork(preset, rpcUrl) {
         const info = preset.tokens[token.toUpperCase()];
         if (!info) {
           const known = Object.keys(preset.tokens).join(", ") || "(none built in)";
-          throw new (0, _chunkU35MG4TFcjs.UnknownTokenError)(
+          throw new (0, _chunkJG6KRAW6cjs.UnknownTokenError)(
             `token "${token}" isn't built in for NEAR (known: ${known}). Pass { contractId, decimals } for a custom NEP-141.`
           );
         }
         return { asset: info.contractId, decimals: info.decimals, symbol: info.symbol };
       }
-      _chunkU35MG4TFcjs.rejectForeignToken.call(void 0, token, "near", network);
+      _chunkJG6KRAW6cjs.rejectForeignToken.call(void 0, token, "near", network);
       const t = token;
       if (!t.contractId || typeof t.decimals !== "number") {
-        throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)(
+        throw new (0, _chunkJG6KRAW6cjs.WrongFamilyError)(
           `chain ${network} is NEAR; a custom token must be { contractId, decimals }.`
         );
       }
@@ -340,12 +332,12 @@ function makeNearNetwork(preset, rpcUrl) {
     },
     assertValidPayTo(payTo) {
       if (payTo.startsWith("0x")) {
-        throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)(
+        throw new (0, _chunkJG6KRAW6cjs.WrongFamilyError)(
           `chain ${network} is NEAR, but payTo "${payTo}" looks like an EVM/Sui 0x address.`
         );
       }
       if (!isValidNearAccountId(payTo)) {
-        throw new (0, _chunkU35MG4TFcjs.WrongFamilyError)(
+        throw new (0, _chunkJG6KRAW6cjs.WrongFamilyError)(
           `chain ${network} is NEAR, but payTo "${payTo}" is not a valid NEAR account id.`
         );
       }
@@ -389,10 +381,10 @@ function makeNearNetwork(preset, rpcUrl) {
         if (tx && tx.success) return { height: "0" };
       } catch (e7) {
       }
-      throw new (0, _chunkU35MG4TFcjs.ConfirmationTimeoutError)(`NEAR tx ${hash} not confirmed in time.`);
+      throw new (0, _chunkJG6KRAW6cjs.ConfirmationTimeoutError)(`NEAR tx ${hash} not confirmed in time.`);
     },
     async estimateCost() {
-      return _chunkU35MG4TFcjs.nativeCost.call(void 0, {
+      return _chunkJG6KRAW6cjs.nativeCost.call(void 0, {
         symbol: "NEAR",
         decimals: NEAR_DECIMALS,
         fee: 1500000000000000000000n,

package/dist/{near-TWA4PYOD.js → near-MTYBCUYM.js}

@@ -4,10 +4,11 @@ import {
   RecipientNotReadyError,
   UnknownTokenError,
   WrongFamilyError,
+  assertNoLegacyWalletKey,
   nativeCost,
   rejectForeignToken,
   toInsufficientFundsError
-} from "./chunk-L6WQRHEZ.js";
+} from "./chunk-7XK22JSQ.js";
 
 // src/drivers/near/index.ts
 import { JsonRpcProvider, Account, actions } from "near-api-js";
@@ -217,35 +218,26 @@ import { KeyPairSigner } from "near-api-js";
 function assertNearWallet(wallet, network) {
   if (typeof wallet !== "object" || wallet === null) {
     throw new WrongFamilyError(
-      `chain ${network} is NEAR; wallet must be { accountId, privateKey } (privateKey = ed25519:\u2026).`
+      `chain ${network} is NEAR; wallet must be { accountId, key } (key = ed25519:\u2026).`
     );
   }
-  if ("walletClient" in wallet) {
+  assertNoLegacyWalletKey(wallet, "NEAR");
+  if (!("accountId" in wallet) || !("key" in wallet)) {
     throw new WrongFamilyError(
-      `chain ${network} is NEAR; a viem { walletClient } can't be used \u2014 pass { accountId, privateKey }.`
-    );
-  }
-  if ("secretKey" in wallet || "signer" in wallet || "mnemonic" in wallet || "keyPair" in wallet || "secret" in wallet || "seed" in wallet || "keypair" in wallet) {
-    throw new WrongFamilyError(
-      `chain ${network} is NEAR; that looks like another family's wallet \u2014 pass { accountId, privateKey }.`
-    );
-  }
-  if (!("accountId" in wallet) || !("privateKey" in wallet)) {
-    throw new WrongFamilyError(
-      `chain ${network} is NEAR; wallet must be { accountId, privateKey } (privateKey = ed25519:\u2026).`
+      `chain ${network} is NEAR; wallet must be { accountId, key } (key = ed25519:\u2026).`
     );
   }
   return wallet;
 }
 function resolveNearWallet(config) {
-  if (!config.accountId || !config.privateKey) {
-    throw new WrongFamilyError("NEAR wallet needs { accountId, privateKey } (privateKey = ed25519:\u2026).");
+  if (!config.accountId || !config.key) {
+    throw new WrongFamilyError("NEAR wallet needs { accountId, key } (key = ed25519:\u2026).");
   }
   let signer;
   try {
-    signer = KeyPairSigner.fromSecretKey(config.privateKey);
+    signer = KeyPairSigner.fromSecretKey(config.key);
   } catch (cause) {
-    throw new WrongFamilyError("NEAR wallet { privateKey } is not a valid ed25519:\u2026 secret key.", {
+    throw new WrongFamilyError("NEAR wallet { key } is not a valid ed25519:\u2026 secret key.", {
       cause
     });
   }