@anywalletkit/wallet-near 0.1.6 → 0.1.8

package/dist/index.cjs

@@ -30,6 +30,7 @@ __export(src_exports, {
   HistoryUnavailableError: () => HistoryUnavailableError,
   IMPLICIT_ACCOUNT_MIN_DEPOSIT: () => IMPLICIT_ACCOUNT_MIN_DEPOSIT,
   MAX_GAS: () => MAX_GAS,
+  MessageIsTransactionError: () => MessageIsTransactionError,
   NEAR_BASE_PATH: () => NEAR_BASE_PATH,
   NEP413_PREFIX: () => NEP413_PREFIX,
   NearRpc: () => NearRpc,
@@ -102,6 +103,7 @@ var STORAGE_DEPOSIT_GAS = 10n * TGAS;
 var IMPLICIT_ACCOUNT_MIN_DEPOSIT = 2n * 10n ** 21n;
 
 // src/errors.ts
+var import_core = require("@anywalletkit/core");
 var UnsafeTransactionError = class extends Error {
   code;
   constructor(code, message) {
@@ -110,6 +112,13 @@ var UnsafeTransactionError = class extends Error {
     this.code = code;
   }
 };
+var MessageIsTransactionError = class extends import_core.SignerError {
+  code = "message-is-transaction";
+  constructor() {
+    super("This message has the shape of a transaction (a 32-byte NEAR hash, or bytes naming this key as a Solana signer) and is not signed; use signNep413 for off-chain messages, or signTransaction so it can be reviewed.");
+    this.name = "MessageIsTransactionError";
+  }
+};
 var SimulationError = class extends Error {
   reason;
   constructor(reason) {
@@ -535,7 +544,7 @@ function decodeAnyTransaction(bytes) {
 }
 
 // src/rpc.ts
-var import_core = require("@anywalletkit/core");
+var import_core2 = require("@anywalletkit/core");
 function toBase64(bytes) {
   if (typeof btoa === "function") {
     let s = "";
@@ -575,9 +584,9 @@ function httpTransport(url, headers, timeoutMs) {
         ...signal ? { signal } : {}
       });
     } catch (e) {
-      throw new import_core.NetworkError(`${method}: ${signal?.aborted ? `no answer within ${timeoutMs} ms` : "request failed"}`, { provider: url, cause: e });
+      throw new import_core2.NetworkError(`${method}: ${signal?.aborted ? `no answer within ${timeoutMs} ms` : "request failed"}`, { provider: url, cause: e });
     }
-    if (!res.ok) throw new import_core.NetworkError(`${method}: HTTP ${res.status}`, { provider: url });
+    if (!res.ok) throw new import_core2.NetworkError(`${method}: HTTP ${res.status}`, { provider: url });
     const json = await res.json();
     if (json.error) throw new NearRpcError(method, json.error);
     return json.result;
@@ -605,7 +614,7 @@ function createClient(config) {
         lastError = e;
       }
     }
-    throw new import_core.NetworkError(`All NEAR providers failed for ${method}`, { cause: lastError });
+    throw new import_core2.NetworkError(`All NEAR providers failed for ${method}`, { cause: lastError });
   };
 }
 var UNKNOWN = /UNKNOWN_ACCOUNT|UNKNOWN_ACCESS_KEY|UNKNOWN_TRANSACTION|does not exist/i;
@@ -648,12 +657,12 @@ var NearRpc = class {
   }
   async latestBlockHash() {
     const b = await this.fetch("block", { finality: "final" });
-    if (!b.header?.hash) throw new import_core.NetworkError("block: no header hash in the response");
+    if (!b.header?.hash) throw new import_core2.NetworkError("block: no header hash in the response");
     return b.header.hash;
   }
   async gasPrice() {
     const r = await this.fetch("gas_price", [null]);
-    if (!r.gas_price) throw new import_core.NetworkError("gas_price: no price in the response");
+    if (!r.gas_price) throw new import_core2.NetworkError("gas_price: no price in the response");
     return BigInt(r.gas_price);
   }
   async sendTx(signedTxBase64, waitUntil = "EXECUTED_OPTIMISTIC") {
@@ -823,7 +832,7 @@ function nep413Hash(p) {
 }
 
 // src/read-only-account.ts
-var import_core2 = require("@anywalletkit/core");
+var import_core3 = require("@anywalletkit/core");
 var import_ed25519 = require("@noble/curves/ed25519.js");
 var import_sha22 = require("@noble/hashes/sha2.js");
 var ACTION_RECEIPT_GAS = 2n * 108059500000n;
@@ -865,7 +874,7 @@ var WalletAccountReadOnlyNear = class _WalletAccountReadOnlyNear {
     return publicKeyToString(this.publicKey);
   }
   requireRpc(what) {
-    if (!this._rpc) throw new import_core2.NetworkError(`The wallet must be connected to a provider to ${what}.`);
+    if (!this._rpc) throw new import_core3.NetworkError(`The wallet must be connected to a provider to ${what}.`);
     return this._rpc;
   }
   /** The account id. */
@@ -1126,7 +1135,14 @@ function equalBytes(a, b) {
 }
 
 // src/account.ts
-var import_core3 = require("@anywalletkit/core");
+var import_core4 = require("@anywalletkit/core");
+var carriesKey = (bytes, key) => {
+  outer: for (let i = 0; i + key.length <= bytes.length; i++) {
+    for (let j = 0; j < key.length; j++) if (bytes[i + j] !== key[j]) continue outer;
+    return true;
+  }
+  return false;
+};
 var WalletAccountNear = class _WalletAccountNear extends WalletAccountReadOnlyNear {
   /** nonce / block hash come from the node, so building needs the network. */
   needsNetwork = true;
@@ -1138,12 +1154,12 @@ var WalletAccountNear = class _WalletAccountNear extends WalletAccountReadOnlyNe
   _readOnly;
   constructor(signer, publicKey, path, config = {}, accountId) {
     super(accountId ?? implicitAccountId(publicKey), config, ed25519Key(publicKey));
-    this.signer = (0, import_core3.requireCurve)(signer, "ed25519");
+    this.signer = (0, import_core4.requireCurve)(signer, "ed25519");
     this.path = path;
   }
   /** Wrap a raw derived key (takes ownership; zeroized on dispose). */
   static fromPrivateKey(privateKey, publicKey, path, config = {}, accountId) {
-    return new _WalletAccountNear(import_core3.LocalSigner.fromPrivateKey("ed25519", privateKey, publicKey, path), publicKey, path, config, accountId);
+    return new _WalletAccountNear(import_core4.LocalSigner.fromPrivateKey("ed25519", privateKey, publicKey, path), publicKey, path, config, accountId);
   }
   /** Account index for the standard m/44'/397'/i' path. */
   get index() {
@@ -1155,15 +1171,23 @@ var WalletAccountNear = class _WalletAccountNear extends WalletAccountReadOnlyNe
     return new _WalletAccountNear(this.signer, this.publicKey.data, this.path, this._config, accountId);
   }
   key() {
-    if (this._disposed) throw new import_core3.SignerError("This account has been disposed.");
+    if (this._disposed) throw new import_core4.SignerError("This account has been disposed.");
   }
   async signBytes(bytes, context) {
     this.key();
     return this.signer.sign(bytes, { scheme: "ed25519", context });
   }
-  /** Raw ed25519 signature over the message bytes, as NEAR tooling prints it: "ed25519:<base58>". */
+  /**
+   * Raw ed25519 signature over the message bytes, as NEAR tooling prints it: "ed25519:<base58>".
+   * A 32-byte message — string or bytes — is refused with {@link MessageIsTransactionError}: a NEAR
+   * transaction is signed over its 32-byte sha256, so those bytes could be one. Bytes that carry
+   * this account's public key are refused as well: one ed25519 key (an external signer) may also be
+   * a Solana wallet, and a Solana transaction names its signer's key. Sites asking a wallet to sign
+   * a message use {@link signNep413}.
+   */
   async sign(message) {
     const bytes = typeof message === "string" ? new TextEncoder().encode(message) : message;
+    if (bytes.length === 32 || carriesKey(bytes, this.publicKey.data)) throw new MessageIsTransactionError();
     return `ed25519:${bytesToBase58(await this.signBytes(bytes, "near-message"))}`;
   }
   /** NEP-413 off-chain message (what NEAR Intents and dApps ask wallets to sign). */
@@ -1193,7 +1217,7 @@ var WalletAccountNear = class _WalletAccountNear extends WalletAccountReadOnlyNe
   async signTransaction(tx, options = {}) {
     this.key();
     this.requireRpc("sign transactions");
-    const { built } = await this.prepare(tx, (0, import_core3.feeLimit)(this._config.transactionMaxFee, options), "transaction");
+    const { built } = await this.prepare(tx, (0, import_core4.feeLimit)(this._config.transactionMaxFee, options), "transaction");
     return toBase64(encodeSignedTransaction(await this.signBuilt(built)));
   }
   async broadcast(signed) {
@@ -1218,7 +1242,7 @@ var WalletAccountNear = class _WalletAccountNear extends WalletAccountReadOnlyNe
     this.key();
     this.requireRpc("send transactions");
     const presigned = typeof tx === "string" ? decodeSigned(tx) : void 0;
-    const { built, estimate } = await this.prepare(tx, (0, import_core3.feeLimit)(this._config.transactionMaxFee, options), "transaction");
+    const { built, estimate } = await this.prepare(tx, (0, import_core4.feeLimit)(this._config.transactionMaxFee, options), "transaction");
     const signed = presigned ?? await this.signBuilt(built);
     return { hash: await this.broadcast(signed), fee: estimate.fee, estimate };
   }
@@ -1226,7 +1250,7 @@ var WalletAccountNear = class _WalletAccountNear extends WalletAccountReadOnlyNe
   async transfer(o, writeOptions = {}) {
     this.key();
     this.requireRpc("transfer tokens");
-    const { built, estimate } = await this.prepare(await this.transferActions(o), (0, import_core3.feeLimit)(this._config.transferMaxFee, writeOptions), "transfer");
+    const { built, estimate } = await this.prepare(await this.transferActions(o), (0, import_core4.feeLimit)(this._config.transferMaxFee, writeOptions), "transfer");
     return { hash: await this.broadcast(await this.signBuilt(built)), fee: estimate.fee, estimate };
   }
   /** The same account as a {@link WalletAccountReadOnlyNear}. */
@@ -1246,9 +1270,9 @@ function decodeSigned(b64) {
 }
 
 // src/manager.ts
-var import_core4 = require("@anywalletkit/core");
+var import_core5 = require("@anywalletkit/core");
 var NEAR_BASE_PATH = "m/44'/397'";
-var WalletManagerNear = class extends import_core4.WalletManager {
+var WalletManagerNear = class extends import_core5.WalletManager {
   constructor(seedOrSigner, config = {}) {
     super(seedOrSigner, config);
   }
@@ -1263,7 +1287,7 @@ var WalletManagerNear = class extends import_core4.WalletManager {
     const external = this.externalSigner();
     if (external) return this.fromSigner(external, full);
     return this.cachedAccount(full, () => {
-      const signer = import_core4.LocalSigner.leafFromSeed(this.seedBytes(), "ed25519", full);
+      const signer = import_core5.LocalSigner.leafFromSeed(this.seedBytes(), "ed25519", full);
       return new WalletAccountNear(signer, signer.publicKey, full, this._config);
     });
   }
@@ -1276,14 +1300,14 @@ var WalletManagerNear = class extends import_core4.WalletManager {
     this.requireSigner("ed25519");
     let rel;
     let key = "external";
-    if ((0, import_core4.isSeedSigner)(signer)) {
+    if ((0, import_core5.isSeedSigner)(signer)) {
       if (path === signer.path) key = path;
       else if (path.startsWith(`${signer.path}/`)) {
         rel = path.slice(signer.path.length + 1);
         key = path;
-      } else throw new import_core4.SignerError(`The injected signer sits at ${signer.path}; it cannot provide ${path}.`);
+      } else throw new import_core5.SignerError(`The injected signer sits at ${signer.path}; it cannot provide ${path}.`);
     } else if (path !== `${NEAR_BASE_PATH}/0'` && path !== "external") {
-      throw new import_core4.SignerError(`An external signer has one account; ${path} is not derivable from it.`);
+      throw new import_core5.SignerError(`An external signer has one account; ${path} is not derivable from it.`);
     }
     return this.signerAccount(key, signer, rel, (leaf, publicKey) => new WalletAccountNear(leaf, publicKey, key, this._config));
   }
@@ -1294,14 +1318,14 @@ var WalletManagerNear = class extends import_core4.WalletManager {
   /** NEAR has one protocol gas price (`gas_price` RPC, yoctoNEAR per gas); it can rise ~1%/block, so fast = ×1.1. */
   async getFeeRates() {
     const client = createClient(this._config);
-    if (!client) throw new import_core4.NetworkError("The wallet must be connected to a provider to read fee rates.");
+    if (!client) throw new import_core5.NetworkError("The wallet must be connected to a provider to read fee rates.");
     const price = await new NearRpc(client).gasPrice();
     return { slow: price, normal: price, fast: price * 11n / 10n };
   }
 };
 
 // src/history.ts
-var import_core5 = require("@anywalletkit/core");
+var import_core6 = require("@anywalletkit/core");
 var HistoryUnavailableError = class extends Error {
   chain;
   reason;
@@ -1355,7 +1379,8 @@ function decodeCursor(s) {
   const c = parsed;
   const ok = (v) => v === null || typeof v === "string";
   if (!c || c.v !== 1 || !ok(c.tx) || !ok(c.ft)) throw new Error("@anywalletkit/wallet-near: malformed history cursor");
-  return { v: 1, tx: c.tx, ft: c.ft };
+  if (c.skip !== void 0 && (!Array.isArray(c.skip) || c.skip.length > 4 || !c.skip.every((h) => typeof h === "string"))) throw new Error("@anywalletkit/wallet-near: malformed history cursor");
+  return { v: 1, tx: c.tx, ft: c.ft, ...c.skip?.length ? { skip: c.skip } : {} };
 }
 var TokenBucket = class {
   constructor(rate, burst = Math.max(2, Math.ceil(rate))) {
@@ -1448,7 +1473,7 @@ function big(v, approx) {
   return void 0;
 }
 var nsToSeconds = (ts) => {
-  if (typeof ts === "string" && /^\d+$/.test(ts)) return (0, import_core5.bigintToNumber)(BigInt(ts) / 1000000000n);
+  if (typeof ts === "string" && /^\d+$/.test(ts)) return (0, import_core6.bigintToNumber)(BigInt(ts) / 1000000000n);
   if (typeof ts === "number") return Math.floor(ts / 1e9);
   return 0;
 };
@@ -1722,30 +1747,57 @@ function createNearHistory(options = {}) {
       const limit = Math.min(MAX_LIMIT, Math.max(1, Math.floor(query.limit ?? DEFAULT_LIMIT)));
       const cursor = query.cursor ? decodeCursor(query.cursor) : { v: 1, tx: "", ft: "" };
       const acct = encodeURIComponent(address);
-      const perPage = Math.min(MAX_LIMIT, limit * 2);
-      const txRows = cursor.tx === null ? [] : (await get(`/v1/account/${acct}/txns?per_page=${perPage}&order=desc${cursor.tx ? `&cursor=${encodeURIComponent(cursor.tx)}` : ""}`))?.txns ?? [];
-      const ftRows = cursor.ft === null ? [] : (await get(`/v1/account/${acct}/ft-txns?per_page=${limit}&order=desc${cursor.ft ? `&cursor=${encodeURIComponent(cursor.ft)}` : ""}`))?.txns ?? [];
+      const perPage = Math.min(MAX_LIMIT - 1, limit * 2);
+      const ftPer = Math.min(MAX_LIMIT - 1, limit);
+      const txFetched = cursor.tx === null ? [] : (await get(`/v1/account/${acct}/txns?per_page=${perPage + 1}&order=desc${cursor.tx ? `&cursor=${encodeURIComponent(cursor.tx)}` : ""}`))?.txns ?? [];
+      const ftFetched = cursor.ft === null ? [] : (await get(`/v1/account/${acct}/ft-txns?per_page=${ftPer + 1}&order=desc${cursor.ft ? `&cursor=${encodeURIComponent(cursor.ft)}` : ""}`))?.txns ?? [];
+      const skip = new Set(cursor.skip ?? []);
+      const leading = (rows) => {
+        let n = 0;
+        while (n < rows.length && skip.has(rows[n].transaction_hash)) n++;
+        return n;
+      };
+      const txSkipped = leading(txFetched);
+      const ftSkipped = leading(ftFetched);
+      const txAll = txFetched.slice(txSkipped);
+      const ftAll = ftFetched.slice(ftSkipped);
+      const txRows = txAll.slice(0, perPage);
+      const ftRows = ftAll.slice(0, ftPer);
+      const txMore = txFetched.length > perPage;
+      const ftMore = ftFetched.length > ftPer;
       const key = (r) => BigInt(typeof r.block_timestamp === "string" ? r.block_timestamp : Math.trunc(r.block_timestamp));
       const all = [...txRows.map((r) => ({ k: key(r), h: r.transaction_hash })), ...ftRows.map((r) => ({ k: key(r), h: r.transaction_hash }))];
       all.sort((a, b) => a.k > b.k ? -1 : a.k < b.k ? 1 : 0);
+      const cut = /* @__PURE__ */ new Set();
+      const goesOnPast = (rows, all2, per, more2) => {
+        const last = rows[rows.length - 1];
+        if (!more2 || !last) return;
+        const next = all2[per];
+        if (next === void 0 || next.transaction_hash === last.transaction_hash) cut.add(last.transaction_hash);
+      };
+      goesOnPast(txRows, txAll, perPage, txMore);
+      goesOnPast(ftRows, ftAll, ftPer, ftMore);
+      const partial = all.length > 0 && all.every((e) => cut.has(e.h)) ? [...cut] : [];
+      if (partial.length) cut.clear();
       const chosen = /* @__PURE__ */ new Set();
       let boundary;
       for (const e of all) {
-        if (chosen.has(e.h)) continue;
+        if (chosen.has(e.h) || cut.has(e.h)) continue;
         if (chosen.size >= limit && boundary !== void 0 && e.k < boundary) break;
         chosen.add(e.h);
         if (chosen.size === limit) boundary = e.k;
       }
-      const consume = (rows, asked, wasAt, pos) => {
+      const consume = (fetched, skipped, rows, more2, wasAt, pos) => {
         if (wasAt === null) return { used: [], next: null };
         let n = 0;
         while (n < rows.length && chosen.has(rows[n].transaction_hash)) n++;
         const used = rows.slice(0, n);
-        if (rows.length < asked && n === rows.length) return { used, next: null };
-        return { used, next: n > 0 ? pos(used[n - 1]) : wasAt };
+        if (!more2 && n === rows.length) return { used, next: null };
+        const last = n > 0 ? used[n - 1] : skipped > 0 ? fetched[skipped - 1] : void 0;
+        return { used, next: last ? pos(last) : wasAt };
       };
-      const txC = consume(txRows, perPage, cursor.tx, (r) => r.id);
-      const ftC = consume(ftRows, limit, cursor.ft, (r) => r.event_index);
+      const txC = consume(txFetched, txSkipped, txRows, txMore, cursor.tx, (r) => r.id);
+      const ftC = consume(ftFetched, ftSkipped, ftRows, ftMore, cursor.ft, (r) => r.event_index);
       const nextTx = txC.next, nextFt = ftC.next;
       const groups = /* @__PURE__ */ new Map();
       for (const h of chosen) groups.set(h, { receipts: [], ft: [] });
@@ -1760,7 +1812,9 @@ function createNearHistory(options = {}) {
         items = items.filter((t) => t.time >= since);
       }
       const page = { items };
-      if (more) page.cursor = encodeCursor({ v: 1, tx: nextTx, ft: nextFt });
+      const goesOn = (fetched, skipped, rows) => rows.length === 0 && skipped > 0 && skipped === fetched.length ? [fetched[skipped - 1].transaction_hash] : [];
+      const nextSkip = [.../* @__PURE__ */ new Set([...partial, ...goesOn(txFetched, txSkipped, txRows), ...goesOn(ftFetched, ftSkipped, ftRows)])];
+      if (more) page.cursor = encodeCursor({ v: 1, tx: nextTx, ft: nextFt, ...nextSkip.length ? { skip: nextSkip } : {} });
       return page;
     },
     async getTransaction(hash, address) {