@piprail/sdk 1.25.0 → 2.0.0

package/dist/index.d.cts

@@ -4878,44 +4878,42 @@ type PipRailEvent = {
     reason: string;
 };
 /**
- * Wallet for the chosen chain family (the `chain` selector routes; each driver
- * validates its own key format):
- *   - EVM     → `{ privateKey }` (0x… hex) or a viem `{ walletClient }`
- *   - Tron    → `{ privateKey }` (32-byte hex — secp256k1, like EVM)
- *   - Sui     → `{ privateKey }` (suiprivkey1… bech32) or a ready `{ keypair }`
- *   - Solana  → `{ secretKey }` (Uint8Array | base58) or `{ signer }`
- *   - TON     → `{ mnemonic }` (24 words) or a ready `{ keyPair }`
- *   - Stellar → `{ secret }` (S… seed) or a ready `{ keypair }`
- *   - XRPL    → `{ seed }` (s… seed) or a ready `{ wallet }`
- *   - NEAR    → `{ accountId, privateKey }` (privateKey = ed25519:… secret)
- *   - Aptos   → `{ privateKey }` (AIP-80 `ed25519-priv-0x…` / raw `0x…` hex) or `{ account }`
- *   - Algorand→ `{ mnemonic }` (25 words) or a ready `{ account }`
+ * Wallet for the chosen chain family. **One field, every chain: `{ key }`** — the
+ * chain's secret as a string (the `chain` selector routes; each driver validates the
+ * format). NEAR also needs `{ accountId }`. What `key` is, per chain:
+ *   - EVM / Tron     → a 0x… hex private key (secp256k1)
+ *   - Sui            → a `suiprivkey1…` bech32 secret
+ *   - Aptos          → an AIP-80 `ed25519-priv-0x…` (or raw `0x…`) secret
+ *   - Solana         → a base58 secret key (or a `Uint8Array`)
+ *   - TON            → a 24-word mnemonic  (optional `version: 'v4' | 'v5r1'`, default v4)
+ *   - Algorand       → a 25-word mnemonic
+ *   - Stellar        → an `S…` secret seed
+ *   - XRPL           → an `s…` secret seed
+ *   - NEAR           → `{ accountId, key }`, where `key` is an `ed25519:…` secret
+ *
+ * Advanced (bring your own native signer object — type-specific): EVM `{ walletClient }`,
+ * Solana `{ signer }`, TON `{ keyPair }`, Stellar/Sui `{ keypair }`, XRPL `{ wallet }`,
+ * Aptos/Algorand `{ account }`.
  */
 type WalletInput = {
-    privateKey: string;
+    key: string;
+    version?: 'v4' | 'v5r1';
 } | {
-    walletClient: unknown;
+    accountId: string;
+    key: string;
 } | {
-    secretKey: Uint8Array | string;
+    walletClient: unknown;
 } | {
     signer: unknown;
-} | {
-    mnemonic: string | string[];
-    version?: 'v4' | 'v5r1';
 } | {
     keyPair: unknown;
     version?: 'v4' | 'v5r1';
-} | {
-    secret: string;
 } | {
     keypair: unknown;
-} | {
-    seed: string;
 } | {
     wallet: unknown;
 } | {
-    accountId: string;
-    privateKey: string;
+    account: unknown;
 };
 /**
  * A priced payment requirement — what `client.quote(url)` returns and what an
@@ -5540,8 +5538,8 @@ declare function fetchAcross(clients: PipRailClient[], url: string, init?: Reque
  * `'solana'|'ton'|'tron'|'near'|'sui'|'aptos'|'algorand'|'stellar'|'xrpl'`); the
  * VALUE is that family's {@link WalletInput}:
  *
- *   base/bnb/… → { privateKey }   solana → { secretKey }   ton/algorand → { mnemonic }
- *   stellar → { secret }   xrpl → { seed }   near → { accountId, privateKey }
+ *   every chain → { key }   ·   near → { accountId, key }
+ *   (`key` is that chain's secret string — see {@link WalletInput} for the per-chain format)
  *
  * One key per family — this map is how a single buyer carries the keys for every
  * chain it's willing to pay on. (For a CUSTOM EVM chain configured by a viem
@@ -5588,9 +5586,9 @@ declare class MultiChainPayer implements PayingClient {
      * ```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'] },
      * })
@@ -5952,7 +5950,8 @@ interface ManifestInput {
      * Optional ownership proofs — each a signature of the BARE ORIGIN STRING by a
      * `payTo` key (EVM: eip191 hex). A trust badge on indexes that verify it
      * (x402scan: `recoverMessageAddress(origin, sig) === payTo`); never required to
-     * be listed. Produce one with the driver's `signMessage(wallet, origin)`.
+     * be listed. Produce one via `client.discoverySigner()`, then `signer.signMessage(origin)`
+     * (single-arg — it signs the bare origin string).
      */
     ownershipProofs?: string[];
     /** OpenAPI `info.title`. Default 'PipRail x402 resources'. */
@@ -6171,8 +6170,8 @@ interface ExactRailOption {
          *  discovers it automatically (e.g. PayAI). Ignored on EVM. */
         feePayer?: string;
     };
-    /** Required for `settle: 'self'` — the gas-paying relayer wallet: EVM `{ privateKey }` /
-     *  `{ walletClient }`, or Solana `{ secretKey }` / `{ signer }`. (Distinct from `payTo`, the
+    /** Required for `settle: 'self'` — the gas-paying relayer wallet: a `{ key }` (or a
+     *  bring-your-own EVM `{ walletClient }` / Solana `{ signer }`). (Distinct from `payTo`, the
      *  receive address — on Solana they MUST be different keys, a scheme MUST-rule.) */
     relayer?: unknown;
     /** Which exact transfer method to advertise (EVM). `'auto'` (default) uses EIP-3009 when the

package/dist/index.d.ts

@@ -4878,44 +4878,42 @@ type PipRailEvent = {
     reason: string;
 };
 /**
- * Wallet for the chosen chain family (the `chain` selector routes; each driver
- * validates its own key format):
- *   - EVM     → `{ privateKey }` (0x… hex) or a viem `{ walletClient }`
- *   - Tron    → `{ privateKey }` (32-byte hex — secp256k1, like EVM)
- *   - Sui     → `{ privateKey }` (suiprivkey1… bech32) or a ready `{ keypair }`
- *   - Solana  → `{ secretKey }` (Uint8Array | base58) or `{ signer }`
- *   - TON     → `{ mnemonic }` (24 words) or a ready `{ keyPair }`
- *   - Stellar → `{ secret }` (S… seed) or a ready `{ keypair }`
- *   - XRPL    → `{ seed }` (s… seed) or a ready `{ wallet }`
- *   - NEAR    → `{ accountId, privateKey }` (privateKey = ed25519:… secret)
- *   - Aptos   → `{ privateKey }` (AIP-80 `ed25519-priv-0x…` / raw `0x…` hex) or `{ account }`
- *   - Algorand→ `{ mnemonic }` (25 words) or a ready `{ account }`
+ * Wallet for the chosen chain family. **One field, every chain: `{ key }`** — the
+ * chain's secret as a string (the `chain` selector routes; each driver validates the
+ * format). NEAR also needs `{ accountId }`. What `key` is, per chain:
+ *   - EVM / Tron     → a 0x… hex private key (secp256k1)
+ *   - Sui            → a `suiprivkey1…` bech32 secret
+ *   - Aptos          → an AIP-80 `ed25519-priv-0x…` (or raw `0x…`) secret
+ *   - Solana         → a base58 secret key (or a `Uint8Array`)
+ *   - TON            → a 24-word mnemonic  (optional `version: 'v4' | 'v5r1'`, default v4)
+ *   - Algorand       → a 25-word mnemonic
+ *   - Stellar        → an `S…` secret seed
+ *   - XRPL           → an `s…` secret seed
+ *   - NEAR           → `{ accountId, key }`, where `key` is an `ed25519:…` secret
+ *
+ * Advanced (bring your own native signer object — type-specific): EVM `{ walletClient }`,
+ * Solana `{ signer }`, TON `{ keyPair }`, Stellar/Sui `{ keypair }`, XRPL `{ wallet }`,
+ * Aptos/Algorand `{ account }`.
  */
 type WalletInput = {
-    privateKey: string;
+    key: string;
+    version?: 'v4' | 'v5r1';
 } | {
-    walletClient: unknown;
+    accountId: string;
+    key: string;
 } | {
-    secretKey: Uint8Array | string;
+    walletClient: unknown;
 } | {
     signer: unknown;
-} | {
-    mnemonic: string | string[];
-    version?: 'v4' | 'v5r1';
 } | {
     keyPair: unknown;
     version?: 'v4' | 'v5r1';
-} | {
-    secret: string;
 } | {
     keypair: unknown;
-} | {
-    seed: string;
 } | {
     wallet: unknown;
 } | {
-    accountId: string;
-    privateKey: string;
+    account: unknown;
 };
 /**
  * A priced payment requirement — what `client.quote(url)` returns and what an
@@ -5540,8 +5538,8 @@ declare function fetchAcross(clients: PipRailClient[], url: string, init?: Reque
  * `'solana'|'ton'|'tron'|'near'|'sui'|'aptos'|'algorand'|'stellar'|'xrpl'`); the
  * VALUE is that family's {@link WalletInput}:
  *
- *   base/bnb/… → { privateKey }   solana → { secretKey }   ton/algorand → { mnemonic }
- *   stellar → { secret }   xrpl → { seed }   near → { accountId, privateKey }
+ *   every chain → { key }   ·   near → { accountId, key }
+ *   (`key` is that chain's secret string — see {@link WalletInput} for the per-chain format)
  *
  * One key per family — this map is how a single buyer carries the keys for every
  * chain it's willing to pay on. (For a CUSTOM EVM chain configured by a viem
@@ -5588,9 +5586,9 @@ declare class MultiChainPayer implements PayingClient {
      * ```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'] },
      * })
@@ -5952,7 +5950,8 @@ interface ManifestInput {
      * Optional ownership proofs — each a signature of the BARE ORIGIN STRING by a
      * `payTo` key (EVM: eip191 hex). A trust badge on indexes that verify it
      * (x402scan: `recoverMessageAddress(origin, sig) === payTo`); never required to
-     * be listed. Produce one with the driver's `signMessage(wallet, origin)`.
+     * be listed. Produce one via `client.discoverySigner()`, then `signer.signMessage(origin)`
+     * (single-arg — it signs the bare origin string).
      */
     ownershipProofs?: string[];
     /** OpenAPI `info.title`. Default 'PipRail x402 resources'. */
@@ -6171,8 +6170,8 @@ interface ExactRailOption {
          *  discovers it automatically (e.g. PayAI). Ignored on EVM. */
         feePayer?: string;
     };
-    /** Required for `settle: 'self'` — the gas-paying relayer wallet: EVM `{ privateKey }` /
-     *  `{ walletClient }`, or Solana `{ secretKey }` / `{ signer }`. (Distinct from `payTo`, the
+    /** Required for `settle: 'self'` — the gas-paying relayer wallet: a `{ key }` (or a
+     *  bring-your-own EVM `{ walletClient }` / Solana `{ signer }`). (Distinct from `payTo`, the
      *  receive address — on Solana they MUST be different keys, a scheme MUST-rule.) */
     relayer?: unknown;
     /** Which exact transfer method to advertise (EVM). `'auto'` (default) uses EIP-3009 when the

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-47VEOHZN.js";
 
 // src/drivers/registry.ts
 var byFamily = /* @__PURE__ */ new Map();
@@ -319,8 +320,9 @@ 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 account = privateKeyToAccount(config.key);
     const transport = http(resolved.rpcUrl);
     const walletClient = createWalletClient({ account, chain: resolved.chain, transport });
     return { account, walletClient };
@@ -328,7 +330,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) {
@@ -1595,9 +1597,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 +1801,7 @@ var loaders = {
   solana: async () => {
     let mod;
     try {
-      mod = await import("./solana-KWNRY5NR.js");
+      mod = await import("./solana-DTO2R3AT.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 +1813,7 @@ var loaders = {
   ton: async () => {
     let mod;
     try {
-      mod = await import("./ton-QN5GTOCS.js");
+      mod = await import("./ton-CPK57L2O.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 +1825,7 @@ var loaders = {
   stellar: async () => {
     let mod;
     try {
-      mod = await import("./stellar-YB7JXKK4.js");
+      mod = await import("./stellar-T5VONOEO.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Stellar selected, but its package isn't installed. Run: npm install @stellar/stellar-sdk`,
@@ -1829,7 +1837,7 @@ var loaders = {
   xrpl: async () => {
     let mod;
     try {
-      mod = await import("./xrpl-ECHK3GIX.js");
+      mod = await import("./xrpl-AH4FFC2C.js");
     } catch (cause) {
       throw new MissingDriverError(
         `XRPL selected, but its package isn't installed. Run: npm install xrpl`,
@@ -1841,7 +1849,7 @@ var loaders = {
   tron: async () => {
     let mod;
     try {
-      mod = await import("./tron-QSNCDYRB.js");
+      mod = await import("./tron-LZRCDRZC.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Tron selected, but its package isn't installed. Run: npm install tronweb`,
@@ -1853,7 +1861,7 @@ var loaders = {
   sui: async () => {
     let mod;
     try {
-      mod = await import("./sui-IODKU2MA.js");
+      mod = await import("./sui-J53NYMVL.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Sui selected, but its package isn't installed. Run: npm install @mysten/sui`,
@@ -1865,7 +1873,7 @@ var loaders = {
   near: async () => {
     let mod;
     try {
-      mod = await import("./near-TWA4PYOD.js");
+      mod = await import("./near-CHE7B2CY.js");
     } catch (cause) {
       throw new MissingDriverError(
         `NEAR selected, but its package isn't installed. Run: npm install near-api-js`,
@@ -1877,7 +1885,7 @@ var loaders = {
   aptos: async () => {
     let mod;
     try {
-      mod = await import("./aptos-3TSKTI4D.js");
+      mod = await import("./aptos-SMEQXIYJ.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Aptos selected, but its package isn't installed. Run: npm install @aptos-labs/ts-sdk`,
@@ -1889,7 +1897,7 @@ var loaders = {
   algorand: async () => {
     let mod;
     try {
-      mod = await import("./algorand-677ILBQS.js");
+      mod = await import("./algorand-RJ4DRWHV.js");
     } catch (cause) {
       throw new MissingDriverError(
         `Algorand selected, but its package isn't installed. Run: npm install algosdk`,
@@ -3669,9 +3677,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'] },
    * })
@@ -4649,7 +4657,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-TWA4PYOD.js → near-CHE7B2CY.js}

@@ -4,10 +4,11 @@ import {
   RecipientNotReadyError,
   UnknownTokenError,
   WrongFamilyError,
+  assertNoLegacyWalletKey,
   nativeCost,
   rejectForeignToken,
   toInsufficientFundsError
-} from "./chunk-L6WQRHEZ.js";
+} from "./chunk-47VEOHZN.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
     });
   }

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

@@ -7,7 +7,8 @@
 
 
 
-var _chunkU35MG4TFcjs = require('./chunk-U35MG4TF.cjs');
+
+var _chunkDKQXW454cjs = require('./chunk-DKQXW454.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, _chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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(_chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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(_chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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).`
+  _chunkDKQXW454cjs.assertNoLegacyWalletKey.call(void 0, wallet, "NEAR");
+  if (!("accountId" in wallet) || !("key" in wallet)) {
+    throw new (0, _chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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);
+      _chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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, _chunkDKQXW454cjs.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, _chunkDKQXW454cjs.ConfirmationTimeoutError)(`NEAR tx ${hash} not confirmed in time.`);
     },
     async estimateCost() {
-      return _chunkU35MG4TFcjs.nativeCost.call(void 0, {
+      return _chunkDKQXW454cjs.nativeCost.call(void 0, {
         symbol: "NEAR",
         decimals: NEAR_DECIMALS,
         fee: 1500000000000000000000n,

package/dist/{solana-KWNRY5NR.js → solana-DTO2R3AT.js}

@@ -4,10 +4,11 @@ import {
   UnknownTokenError,
   UnsupportedSchemeError,
   WrongFamilyError,
+  assertNoLegacyWalletKey,
   nativeCost,
   rejectForeignToken,
   toInsufficientFundsError
-} from "./chunk-L6WQRHEZ.js";
+} from "./chunk-47VEOHZN.js";
 
 // src/drivers/solana/index.ts
 import { Connection, PublicKey as PublicKey3 } from "@solana/web3.js";
@@ -511,24 +512,20 @@ import bs582 from "bs58";
 function toKeypair(wallet, network) {
   if (typeof wallet !== "object" || wallet === null) {
     throw new WrongFamilyError(
-      `chain ${network} is Solana; wallet must be { secretKey } or { signer }.`
-    );
-  }
-  if ("privateKey" in wallet || "walletClient" in wallet) {
-    throw new WrongFamilyError(
-      `chain ${network} is Solana; an EVM wallet can't be used \u2014 pass { secretKey } or { signer }.`
+      `chain ${network} is Solana; wallet must be { key } (base58 secret) or { signer }.`
     );
   }
+  assertNoLegacyWalletKey(wallet, "Solana");
   if ("signer" in wallet) {
     return wallet.signer;
   }
-  if ("secretKey" in wallet) {
-    const sk = wallet.secretKey;
+  if ("key" in wallet) {
+    const sk = wallet.key;
     const bytes = typeof sk === "string" ? bs582.decode(sk) : sk;
     return Keypair3.fromSecretKey(bytes);
   }
   throw new WrongFamilyError(
-    `chain ${network} is Solana; wallet must be { secretKey } or { signer }.`
+    `chain ${network} is Solana; wallet must be { key } (base58 secret) or { signer }.`
   );
 }