@ninsei-labs/sdk 0.51.2 → 0.52.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.52.0 — 2026-10-26
+
+THE NEXT CONTRACT VERSION IS WIRED IN.
+
+- `arbitrum-sepolia` moves to factory `0x69b5a6878b542960af4d239ecc60ad1c9e3e6932`, cashier
+  `0x05b7433f66f2b75cc7ece9ec00af0fb810f9c9e0`, registry
+  `0x4707a6684b654fbd74372ec624efc0f825af0537` and implementation code hash
+  `0xc6cde36301b6551a6ca8bd2c47fbd5ffd01ffcdf22d2f6909be2b3b2dcf360b4`
+  (deployment block `323014007`).
+- `OrderCreated` now carries `xmrAmount`. `findSwaps` reads it from the current event and reports
+  `xmrAmountReason: "event"`; orders from the previous event keep the clone word-18 fallback.
+- The previous event topic is still accepted, so an old factory remains searchable.
+
 ## 0.51.2 — 2026-10-22
 
 - The withdrawal window falls back to the full scan when `scanTxs` or the balance read fails, and reports

package/engine/core/config.js

@@ -363,35 +363,22 @@ export const CHAINS = [
     explorerName: "arbiscan (sepolia)",
     gasUsd: 0.01,
     routeType: "atomic",
-    // THE DEMO'S MAIN NETWORK: the Ninsei escrow factory and the interface's fee cashier live here; the
-    // ArrakisFeeRouter is gone. The factory is a FACT, not an intention:
-    // 0x3eE25f12758ec28e5b3045d16132D89Cd0bf341F (height 321430239, transaction
-    // 0x61da6d34c77dee1e1ada04dbbe9cbb1c86e5297acbc5a5b08320df20a2cf3ef6, code 2049 bytes, keccak256
-    // 0xf490764213ae9569f9ef19a174e237f4a22c3ff6613756852571672ae7dea2a8); every order is an EIP-1167 clone and
-    // the factory carries the pair (implementation(), implementationCodeHash()). The fee cashier is the second CREATE
-    // of the same pass - 0x1123A3875775Da25FA181Af0d91EB278E94a5dfb (height 321430248, code 582 bytes, keccak256
-    // 0xf5cb00c7974e6fab3f04dbd2cdc24976249dc4d55de2fa31524bce60205a1877). This release did NOT deploy a maker
-    // registry (DEPLOY_REGISTRY=false): the registry is a separate contract, and the node must name an existing one
-    // in RFQ_REGISTRY_ADDRESS until a fresh one is deployed and its keys are registered.
-    // `npm run check:deployed -- --address=0x3eE25f12758ec28e5b3045d16132D89Cd0bf341F`).
-    // PREVIOUS (the factory before claimTip): 0x1029D6bC53f6b9919F8ec6Ac922327F7e5A3DdF2 (height 318033203,
-    // transaction 0x0f82c556f056f2dcaba5c12da75a749c257dfb1ccbf0eb6962a4e7f0119d166d, code 4226 bytes, keccak256
-    // 0x4b515f600c641bffde054b3a98f4e26bd43d2dd2b2d8e60e8cfe36ee03686dd9). PREVIOUS (the ArrakisFeeRouter of
-    // the previous rules, now removed): 0xaEB1c0455C76551dcEb2E6B1245B65F0458b0aE8 (height 314323871, code 8223
-    // bytes, keccak256 0x90f26f641b48a2a630463195d4429b0818d29187563e09711a40811fcf08a0ba).
-    // PREVIOUS (ceiling 3%, no early refund): 0xEa619bDC78989627093B7830990367B2ECE52CE5 (height 314309038,
-    // code 8143 bytes). PREVIOUS live (router with a 10% ceiling): 0x9f856cd9c14fd9493961473b804039b09a4012ef
-    // (height 313597131, code 8723 bytes). PREVIOUS before it (factory without a fee):
-    // 0xcb54af9ec11344d448c7900ccb08530a23783259 (height 312222006, code 6035 bytes), and earlier ones still.
-    // mode: "live" - the form sends REAL transactions: order creation TOGETHER WITH THE MONEY in one transaction
-    // (createOrderAndFund; the escrow has no separate funding function - an order is born funded, see FACTORY_METHODS
-    // in www/js/evm/factory.js and ESCROW_METHODS in escrow.js). The old lock(sealedHalf) and hashlock are gone: the
-    // half is not sent but revealed by presentation. Switching back to "simulated" is one edit, to show a demo with
-    // no money movement. cashier: the INTERFACE's fee cashier, named in quotes and now deployed (the second CREATE of
-    // the same pass). implementationCodeHash: the escrow implementation the factory carries, checked against the chain.
-    // deploymentBlock: the height the factory was created at; a log search for its orders starts here, not at zero,
-    // because public RPCs cap a log query at about 10M blocks and would refuse a scan from genesis.
-    escrow: { address: "0x3eE25f12758ec28e5b3045d16132D89Cd0bf341F", mode: "live", deploymentBlock: 321430239, cashier: "0x1123A3875775Da25FA181Af0d91EB278E94a5dfb", implementationCodeHash: "0xf97af2b4eed8c646d82bce001e52ff03c065d43127073f8ee52271b65c35d659" },
+    // THE DEMO'S MAIN NETWORK: the Ninsei escrow factory and the interface's fee cashier live here. The next
+    // contract version (contracts-testnet-2026.10.26) is a FACT, not an intention:
+    //   factory 0x69b5a6878b542960af4d239ecc60ad1c9e3e6932 (height 323014007,
+    //   transaction 0xbe8244da0cb1429edc92d18c7c8b5ba1c6b17c42a5806609d930a6496e918408);
+    //   cashier 0x05b7433f66f2b75cc7ece9ec00af0fb810f9c9e0;
+    //   registry 0x4707a6684b654fbd74372ec624efc0f825af0537 (this release deploys it);
+    //   implementation 0x2E0214c6242fB794a4cC861D609Ecee544735170, codehash
+    //   0xc6cde36301b6551a6ca8bd2c47fbd5ffd01ffcdf22d2f6909be2b3b2dcf360b4.
+    // `OrderCreated` now carries xmrAmount; the SDK reads it from the event and keeps the clone fallback for the
+    // previous event. PREVIOUS factory before this version: 0x3eE25f12758ec28e5b3045d16132D89Cd0bf341F
+    // (height 321430239, cashier 0x1123A3875775Da25FA181Af0d91EB278E94a5dfb).
+    // mode: "live" - order creation TOGETHER WITH THE MONEY in one transaction (createOrderAndFund). cashier: the
+    // INTERFACE's fee cashier, named in quotes. implementationCodeHash: the escrow implementation the factory
+    // carries, checked against the chain. deploymentBlock: the height the factory was created at; a log search for
+    // its orders starts here, not at zero, because public RPCs cap a log query at about 10M blocks.
+    escrow: { address: "0x69b5a6878b542960af4d239ecc60ad1c9e3e6932", mode: "live", deploymentBlock: 323014007, cashier: "0x05b7433f66f2b75cc7ece9ec00af0fb810f9c9e0", implementationCodeHash: "0xc6cde36301b6551a6ca8bd2c47fbd5ffd01ffcdf22d2f6909be2b3b2dcf360b4" },
     tokens: [
       // Test USDC (Circle): decimals 6 and symbol "USDC" verified on chain by the same node.
       { symbol: "USDC", address: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d", decimals: 6, usd: 1, cls: "ar-token-usdc" },

package/engine/evm/factory.js

@@ -22,11 +22,18 @@ export const FACTORY_METHODS = {
   createOrderAndFund: "0x3a504547",
 };
 
-// The OrderCreated event topic. It grew the registry address, the provider and the signing key:
-//   cast keccak "OrderCreated(address,address,address,bytes32,bytes32,bytes32,bytes32,bytes32,uint256,uint64,uint64,bytes32,address,address,address)"
+// The OrderCreated event topic. It grew the registry address, the provider and the signing key, and now carries
+// `xmrAmount` in bulk (#32):
+//   cast keccak "OrderCreated(address,address,address,bytes32,bytes32,bytes32,bytes32,bytes32,uint256,uint256,uint64,uint64,bytes32,address,address,address)"
 // The topic lives in TWO places and both must match; a check pins them.
 export const ORDER_CREATED_TOPIC =
+  "0x09add13cca47b227c377447295bfaa00ef3169bfed0f5513d06f8be04af78aad";
+
+// THE PREVIOUS EVENT, KEPT FOR ORDERS ALREADY ON CHAIN. It has no `xmrAmount`, so those orders still fall back to
+// reading word 18 of the clone's code. A new order uses the topic above.
+export const ORDER_CREATED_TOPIC_V1 =
   "0xa22cdabaed3cce4f51dde71626a108ffe9c7bc4216fd14d5e719f892e2fd8ab0";
+export const ORDER_CREATED_TOPICS = Object.freeze([ORDER_CREATED_TOPIC, ORDER_CREATED_TOPIC_V1]);
 
 // QUOTE FIELDS IN CONTRACT ORDER. The order is part of the ABI: a swap gives another call. One list for both
 // functions, so they cannot diverge.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ninsei-labs/sdk",
-  "version": "0.51.2",
+  "version": "0.52.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/src/public/recovery.d.ts

@@ -333,10 +333,11 @@ export interface FoundSwap {
   readonly payToken: string | null;
   /** Why `payToken` is absent. `not-on-chain` means the order event and clone carry no token; do not infer one. */
   readonly payTokenReason: "not-on-chain";
-  /** The XMR side of the order in atomic units, read from the clone's condition word 18; null when no code reader
-   * was passed or the contract is not the expected clone. */
+  /** The XMR side of the order in atomic units. The current factory emits it in `OrderCreated`; for an older event
+   * it is read from the clone's condition word 18, and null when no code reader was passed or the contract is not
+   * the expected clone. */
   readonly xmrAmount: string | null;
-  readonly xmrAmountReason: "no-code-reader" | "code" | "not-clone" | null;
+  readonly xmrAmountReason: "event" | "no-code-reader" | "code" | "not-clone" | null;
   readonly index: number;
   readonly side: "locker" | "claimer";
   /** The Monero height a withdrawal may start from, derived from the order's block time. Null when the caller did

package/src/recovery-key.mjs

@@ -17,7 +17,7 @@ import { generateMnemonic, mnemonicToSeedSync, validateMnemonic } from "@scure/b
 import { wordlist } from "@scure/bip39/wordlists/english.js";
 import { createHalves } from "../engine/atomic/halves.js";
 import { halfCommitmentHex } from "../engine/atomic/orderHalfCommit.js";
-import { ORDER_CREATED_TOPIC } from "../engine/evm/factory.js";
+import { ORDER_CREATED_TOPIC, ORDER_CREATED_TOPICS } from "../engine/evm/factory.js";
 import { SdkError } from "./errors.mjs";
 import { probeMoneroNode } from "./probes.mjs";
 import { ed25519, keccak256, randomBytes, secp256k1 } from "./primitives.mjs";
@@ -359,10 +359,15 @@ function topicAddress(address) {
 
 function decodeOrderLog(log) {
   const topics = Array.isArray(log && log.topics) ? log.topics : [];
-  if (topics.length < 4 || String(topics[0]).toLowerCase() !== ORDER_CREATED_TOPIC) return null;
+  const topic0 = String(topics[0] || "").toLowerCase();
+  if (topics.length < 4 || !ORDER_CREATED_TOPICS.includes(topic0)) return null;
   const data = String(log.data || "").replace(/^0x/, "");
-  if (data.length < 64 * 2) return null;
+  const modern = topic0 === ORDER_CREATED_TOPIC;
+  if (data.length < 64 * (modern ? 13 : 12)) return null;
   const word = (i) => "0x" + data.slice(i * 64, (i + 1) * 64).toLowerCase();
+  // THE FIELD OFFSETS MOVED WHEN `xmrAmount` JOINED THE EVENT. The old topic has no XMR amount; its orders fall
+  // back to the clone read, and a caller can still tell why from `xmrAmountReason`.
+  const shift = modern ? 1 : 0;
   return {
     escrow: "0x" + String(topics[1]).slice(26).toLowerCase(),
     locker: "0x" + String(topics[2]).slice(26).toLowerCase(),
@@ -373,12 +378,13 @@ function decodeOrderLog(log) {
     edPointClaimer: word(3),
     edViewPointLocker: word(4),
     amount: BigInt(word(5)).toString(),
-    readyBy: Number(BigInt(word(6))),
-    t1: Number(BigInt(word(7))),
-    salt: word(8),
-    registry: "0x" + data.slice(9 * 64 + 24, 10 * 64),
-    provider: "0x" + data.slice(10 * 64 + 24, 11 * 64),
-    quoteKey: "0x" + data.slice(11 * 64 + 24, 12 * 64),
+    xmrAmount: modern ? BigInt(word(6)).toString() : null,
+    readyBy: Number(BigInt(word(6 + shift))),
+    t1: Number(BigInt(word(7 + shift))),
+    salt: word(8 + shift),
+    registry: "0x" + data.slice((9 + shift) * 64 + 24, (10 + shift) * 64),
+    provider: "0x" + data.slice((10 + shift) * 64 + 24, (11 + shift) * 64),
+    quoteKey: "0x" + data.slice((11 + shift) * 64 + 24, (12 + shift) * 64),
     transactionHash: log.transactionHash || null,
     blockNumber: log.blockNumber != null ? Number(log.blockNumber) : null,
     logIndex: log.logIndex != null ? Number(log.logIndex) : null,
@@ -431,7 +437,7 @@ async function readLogs(evmLogs, request) {
 export async function recoveryIndexTaken({ mnemonic, chainId, index, factory, evmLogs, fromBlock = 0, toBlock = "latest" } = {}) {
   if (typeof factory !== "string" || !ADDRESS_RE.test(factory)) throw bad("factory");
   const own = takerHalves({ mnemonic, chainId, index });
-  const logs = await readLogs(evmLogs, { address: factory, topics: [ORDER_CREATED_TOPIC], fromBlock, toBlock });
+  const logs = await readLogs(evmLogs, { address: factory, topics: [ORDER_CREATED_TOPICS], fromBlock, toBlock });
   return logs.map(decodeOrderLog).filter(Boolean).some((order) =>
     order.commitHalfLocker.toLowerCase() === own.spendCommitment.toLowerCase() ||
     order.commitHalfClaimer.toLowerCase() === own.spendCommitment.toLowerCase());
@@ -581,8 +587,8 @@ export async function findSwaps({ mnemonic, chainId, factory, address = null, ev
   if (address) {
     const padded = topicAddress(address);
     const [asLocker, asClaimer] = await Promise.all([
-      readLogs(evmLogs, { ...base, topics: [ORDER_CREATED_TOPIC, null, padded, null] }),
-      readLogs(evmLogs, { ...base, topics: [ORDER_CREATED_TOPIC, null, null, padded] }),
+      readLogs(evmLogs, { ...base, topics: [ORDER_CREATED_TOPICS, null, padded, null] }),
+      readLogs(evmLogs, { ...base, topics: [ORDER_CREATED_TOPICS, null, null, padded] }),
     ]);
     const seen = new Set();
     for (const log of asLocker.concat(asClaimer)) {
@@ -592,7 +598,7 @@ export async function findSwaps({ mnemonic, chainId, factory, address = null, ev
       logs.push(log);
     }
   } else {
-    logs = await readLogs(evmLogs, { ...base, topics: [ORDER_CREATED_TOPIC] });
+    logs = await readLogs(evmLogs, { ...base, topics: [ORDER_CREATED_TOPICS] });
   }
   const orders = logs.map(decodeOrderLog).filter(Boolean);
   const found = [];
@@ -637,9 +643,14 @@ export async function findSwaps({ mnemonic, chainId, factory, address = null, ev
   for (const order of found) {
     Object.assign(order, await recoveredStartHeight(order, { evmBlockTime, moneroTip: tip, moneroBlockTimestamp: header, cache, readersReason }));
   }
-  // THE XMR AMOUNT IS IN THE CLONE, NOT IN THE LOG. A caller without a code reader gets null and a named reason;
-  // an unreadable or differently-shaped contract does the same. This is data, not a withdrawal verdict.
+  // THE XMR AMOUNT COMES FROM THE EVENT IN THE CURRENT FACTORY. The previous event has no field; those orders fall
+  // back to the clone read, where word 18 is read only from a clone of the exact shape. This is data, not a
+  // withdrawal verdict.
   for (const order of found) {
+    if (order.xmrAmount !== null && order.xmrAmount !== undefined) {
+      order.xmrAmountReason = "event";
+      continue;
+    }
     if (typeof evmCode !== "function") {
       order.xmrAmount = null;
       order.xmrAmountReason = "no-code-reader";

package/src/version.mjs

@@ -6,4 +6,4 @@
 // tools/sync-version.mjs. Do not edit it by hand - set the version in package.json and run `npm run sync:version`.
 // The `version` check in tools/check.mjs refuses a mismatch, and refuses a runtime read of package.json here.
 
-export const SDK_VERSION = "0.51.2";
+export const SDK_VERSION = "0.52.0";