@hyperbridge/simplex 0.18.1 → 0.18.2

package/dist/sqlite.cjs

@@ -479,18 +479,31 @@ var BID_COLUMNS = `
 	retracted_at as retractedAt,
 	retract_extrinsic_hash as retractExtrinsicHash,
 	dead,
-	bid,
+	on_orderbook as onOrderbook,
+	priced_by as pricedBy,
 	reservations
 `;
-function parseHolds(raw) {
-  if (!raw) return [];
+function parseJson(raw) {
+  if (!raw) return null;
   try {
-    const parsed = JSON.parse(raw);
-    return Array.isArray(parsed) ? parsed : [];
+    return JSON.parse(raw);
   } catch {
-    return [];
+    return null;
   }
 }
+function pricedBy(row) {
+  const current = parseJson(row.pricedBy);
+  if (current && typeof current === "object") return current;
+  const legacy = parseJson(row.reservations);
+  const first = Array.isArray(legacy) ? legacy[0] : null;
+  if (!first || typeof first !== "object" || typeof first.limitOrderId !== "string") return null;
+  return {
+    limitOrderId: first.limitOrderId,
+    payout: String(first.payout ?? first.amount),
+    ...first.take !== void 0 ? { take: String(first.take) } : {},
+    ...first.takeDecimals !== void 0 ? { takeDecimals: Number(first.takeDecimals) } : {}
+  };
+}
 var SqliteBidStore = class {
   constructor(db, loggers = defaultLoggerContext()) {
     this.db = db;
@@ -513,7 +526,11 @@ var SqliteBidStore = class {
 				retracted_at TEXT,
 				retract_extrinsic_hash TEXT,
 				dead INTEGER NOT NULL DEFAULT 0,
-				reservations TEXT
+				on_orderbook INTEGER NOT NULL DEFAULT 0,
+				-- Only read, as the provenance of a bid written before priced_by. Kept, and
+				-- never written, so a rollback to a build that still reads it finds the column.
+				reservations TEXT,
+				priced_by TEXT
 			);
 
 			CREATE INDEX IF NOT EXISTS idx_bids_commitment ON bids(commitment);
@@ -522,12 +539,12 @@ var SqliteBidStore = class {
 			CREATE INDEX IF NOT EXISTS idx_bids_created_at ON bids(created_at);
 		`);
     const columns = columnNames(this.db, "bids");
-    for (const column of ["dead", "pending"]) {
+    for (const column of ["dead", "pending", "on_orderbook"]) {
       if (columns.has(column)) continue;
       this.db.exec(`ALTER TABLE bids ADD COLUMN ${column} INTEGER NOT NULL DEFAULT 0`);
       this.logger.info({ column }, "Migrated bid storage schema");
     }
-    for (const column of ["bid", "reservations"]) {
+    for (const column of ["bid", "reservations", "priced_by"]) {
       if (columns.has(column)) continue;
       this.db.exec(`ALTER TABLE bids ADD COLUMN ${column} TEXT`);
       this.logger.info({ column }, "Migrated bid storage schema");
@@ -536,19 +553,21 @@ var SqliteBidStore = class {
   }
   // biome-ignore lint/suspicious/noExplicitAny: raw sqlite row
   toStoredBid(row) {
+    const { reservations: _legacy, ...rest } = row;
     return {
-      ...row,
+      ...rest,
       success: Boolean(row.success),
       pending: Boolean(row.pending),
       retracted: Boolean(row.retracted),
       dead: Boolean(row.dead),
-      reservations: parseHolds(row.reservations)
+      onOrderbook: Boolean(row.onOrderbook),
+      pricedBy: pricedBy(row)
     };
   }
   async store(bid) {
     const result = this.db.prepare(`
-				INSERT INTO bids (commitment, bid, extrinsic_hash, block_hash, success, pending, error, reservations)
-				VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+				INSERT INTO bids (commitment, bid, extrinsic_hash, block_hash, success, pending, error, on_orderbook, priced_by)
+				VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
 			`).run(
       bid.commitment,
       bid.bid ?? null,
@@ -557,7 +576,8 @@ var SqliteBidStore = class {
       bid.success ? 1 : 0,
       bid.pending ? 1 : 0,
       bid.error || null,
-      bid.reservations?.length ? JSON.stringify(bid.reservations) : null
+      bid.onOrderbook ? 1 : 0,
+      bid.pricedBy ? JSON.stringify(bid.pricedBy) : null
     );
     this.logger.debug({ id: result.lastInsertRowid, commitment: bid.commitment, success: bid.success }, "Bid stored");
   }
@@ -583,37 +603,33 @@ var SqliteBidStore = class {
     const rows = this.db.prepare(`SELECT ${BID_COLUMNS} FROM bids WHERE created_at BETWEEN ? AND ? ORDER BY created_at DESC`).all(sqliteDatetime(from), sqliteDatetime(to));
     return rows.map((row) => this.toStoredBid(row));
   }
-  async markRetracted(commitment, retractExtrinsicHash) {
+  async markRetracted(commitment, retractExtrinsicHash, rows) {
+    if (rows?.length === 0) return false;
     const result = this.db.prepare(`
 				UPDATE bids
 				SET retracted = 1, retracted_at = datetime('now'), retract_extrinsic_hash = ?
-				WHERE commitment = ? AND retracted = 0
-			`).run(retractExtrinsicHash, commitment);
+				WHERE commitment = ? AND retracted = 0${rows ? ` AND id IN (${rows.map(() => "?").join(",")})` : ""}
+			`).run(retractExtrinsicHash, commitment, ...rows ?? []);
     if (result.changes > 0) {
       this.logger.info({ commitment, retractExtrinsicHash }, "Bid marked as retracted");
       return true;
     }
     return false;
   }
-  async claimReservation(commitment, bid) {
-    const rows = bid === void 0 ? this.db.prepare("SELECT id, reservations FROM bids WHERE commitment = ? AND reservations IS NOT NULL ORDER BY id").all(commitment) : this.db.prepare(
-      "SELECT id, reservations FROM bids WHERE commitment = ? AND bid = ? AND reservations IS NOT NULL ORDER BY id"
-    ).all(commitment, bid);
-    const claimed = [];
-    for (const row of rows) {
-      const result = this.db.prepare("UPDATE bids SET reservations = NULL WHERE id = ? AND reservations = ?").run(row.id, row.reservations);
-      if (result.changes === 1) claimed.push(...parseHolds(row.reservations));
-    }
-    return claimed;
-  }
   async byLimitOrder(limitOrderId, limit = 100) {
-    const rows = this.db.prepare(`SELECT ${BID_COLUMNS} FROM bids WHERE reservations LIKE ? ORDER BY id DESC LIMIT ?`).all(`%${limitOrderId}%`, Math.min(Math.max(limit, 1), 500));
-    return rows.map((row) => this.toStoredBid(row)).filter((bid) => bid.reservations.some((hold) => hold.limitOrderId === limitOrderId));
+    const pattern = `%${limitOrderId}%`;
+    const rows = this.db.prepare(
+      `SELECT ${BID_COLUMNS} FROM bids WHERE priced_by LIKE ? OR (priced_by IS NULL AND reservations LIKE ?) ORDER BY id DESC LIMIT ?`
+    ).all(pattern, pattern, Math.min(Math.max(limit, 1), 500));
+    return rows.map((row) => this.toStoredBid(row)).filter((bid) => bid.pricedBy?.limitOrderId === limitOrderId);
   }
-  async markDead(commitment) {
-    const result = this.db.prepare("UPDATE bids SET dead = 1 WHERE commitment = ? AND retracted = 0 AND dead = 0").run(commitment);
+  async markDead(commitment, rows) {
+    if (rows?.length === 0) return false;
+    const result = this.db.prepare(
+      `UPDATE bids SET dead = 1 WHERE commitment = ? AND retracted = 0 AND dead = 0${rows ? ` AND id IN (${rows.map(() => "?").join(",")})` : ""}`
+    ).run(commitment, ...rows ?? []);
     if (result.changes > 0) {
-      this.logger.debug({ commitment }, "Bid marked as dead (order filled on-chain)");
+      this.logger.debug({ commitment }, "Bid marked dead, due for retraction on the next sweep");
       return true;
     }
     return false;
@@ -622,8 +638,8 @@ var SqliteBidStore = class {
     const stats = this.db.prepare(`
 				SELECT
 					COUNT(*) as total,
-					SUM(CASE WHEN success = 1 THEN 1 ELSE 0 END) as successful,
-					SUM(CASE WHEN success = 0 THEN 1 ELSE 0 END) as failed,
+					SUM(CASE WHEN success = 1 OR on_orderbook = 1 THEN 1 ELSE 0 END) as successful,
+					SUM(CASE WHEN success = 0 AND on_orderbook = 0 THEN 1 ELSE 0 END) as failed,
 					SUM(CASE WHEN retracted = 1 THEN 1 ELSE 0 END) as retracted,
 					SUM(CASE WHEN (success = 1 OR pending = 1) AND retracted = 0 THEN 1 ELSE 0 END) as pendingRetraction
 				FROM bids
@@ -637,7 +653,7 @@ var SqliteBidStore = class {
     };
   }
   async failed(limit = 100) {
-    const rows = this.db.prepare(`SELECT ${BID_COLUMNS} FROM bids WHERE success = 0 ORDER BY created_at DESC LIMIT ?`).all(limit);
+    const rows = this.db.prepare(`SELECT ${BID_COLUMNS} FROM bids WHERE success = 0 AND on_orderbook = 0 ORDER BY created_at DESC LIMIT ?`).all(limit);
     return rows.map((row) => this.toStoredBid(row));
   }
   async byCommitments(commitments) {
@@ -697,7 +713,6 @@ var LIMIT_ORDER_COLUMNS = `
 	price,
 	size,
 	remaining,
-	reserved,
 	accepted_sources as acceptedSources,
 	ttl_secs as ttlSecs,
 	expires_at as expiresAt,
@@ -711,11 +726,13 @@ var LIMIT_ORDER_COLUMNS = `
 	created_at as createdAt,
 	updated_at as updatedAt
 `;
-var LimitOrderWriteError = class extends Error {
-};
 function statusGuard(only) {
   return only && only.length > 0 ? ` AND status IN (${only.map(() => "?").join(", ")})` : "";
 }
+function clampable(only) {
+  const live = ["open", "resizing"];
+  return only && only.length > 0 ? live.filter((status) => only.includes(status)) : live;
+}
 var SqliteLimitOrderStore = class {
   constructor(db, loggers = defaultLoggerContext()) {
     this.db = db;
@@ -734,6 +751,9 @@ var SqliteLimitOrderStore = class {
 				price TEXT NOT NULL,
 				size TEXT NOT NULL,
 				remaining TEXT NOT NULL,
+				-- Never read or written: limit orders keep no local holds. Kept, and reset to
+				-- '0' on every start, so a rollback to a build that still reads it finds the
+				-- column and no stale hold.
 				reserved TEXT NOT NULL DEFAULT '0',
 				accepted_sources TEXT NOT NULL,
 				ttl_secs INTEGER NOT NULL,
@@ -761,11 +781,15 @@ var SqliteLimitOrderStore = class {
 				amount TEXT NOT NULL,
 				amount_in TEXT,
 				transaction_hash TEXT,
+				log_index INTEGER,
 				filled_at TEXT NOT NULL DEFAULT (datetime('now'))
 			);
 
 			CREATE INDEX IF NOT EXISTS idx_limit_order_fills_order ON limit_order_fills(limit_order_id);
 		`);
+    if (columnNames(this.db, "limit_orders").has("reserved") && this.db.prepare("SELECT 1 FROM limit_orders WHERE reserved <> '0' LIMIT 1").get()) {
+      this.db.exec("UPDATE limit_orders SET reserved = '0' WHERE reserved <> '0'");
+    }
     if (!columnNames(this.db, "limit_orders").has("entry_point")) {
       this.db.exec("ALTER TABLE limit_orders ADD COLUMN entry_point TEXT");
       this.logger.info({ column: "entry_point" }, "Migrated limit order storage schema");
@@ -774,6 +798,10 @@ var SqliteLimitOrderStore = class {
       this.db.exec("ALTER TABLE limit_order_fills ADD COLUMN amount_in TEXT");
       this.logger.info({ column: "amount_in" }, "Migrated limit order fill schema");
     }
+    if (!columnNames(this.db, "limit_order_fills").has("log_index")) {
+      this.db.exec("ALTER TABLE limit_order_fills ADD COLUMN log_index INTEGER");
+      this.logger.info({ column: "log_index" }, "Migrated limit order fill schema");
+    }
   }
   // biome-ignore lint/suspicious/noExplicitAny: raw sqlite row
   toLimitOrder(row) {
@@ -855,43 +883,17 @@ var SqliteLimitOrderStore = class {
     ).run(status, lastError, id, ...only ?? []);
     return result.changes === 1 ? this.read(id) : null;
   }
-  async reserve(id, amount) {
-    const order = this.read(id);
-    if (!order || order.status !== "open") return false;
-    if (BigInt(amount) > BigInt(order.remaining)) return false;
-    const reserved = BigInt(order.reserved) + BigInt(amount);
-    const result = this.db.prepare(`
-				UPDATE limit_orders SET reserved = ?, updated_at = datetime('now')
-				WHERE id = ? AND reserved = ? AND status = 'open'
-			`).run(reserved.toString(), id, order.reserved);
-    return result.changes === 1;
-  }
-  async transaction(settle) {
-    this.db.exec("BEGIN");
-    try {
-      const result = await settle();
-      this.db.exec("COMMIT");
-      return result;
-    } catch (err) {
-      if (this.db.isTransaction !== false) {
-        try {
-          this.db.exec("ROLLBACK");
-        } catch {
-        }
-      }
-      throw err;
-    }
-  }
   async recordFill(fill) {
     this.db.prepare(
-      "INSERT INTO limit_order_fills (limit_order_id, commitment, bid, amount, amount_in, transaction_hash) VALUES (?, ?, ?, ?, ?, ?)"
+      "INSERT INTO limit_order_fills (limit_order_id, commitment, bid, amount, amount_in, transaction_hash, log_index) VALUES (?, ?, ?, ?, ?, ?, ?)"
     ).run(
       fill.limitOrderId,
       fill.commitment,
       fill.bid ?? null,
       fill.amount,
       fill.amountIn ?? null,
-      fill.transactionHash ?? null
+      fill.transactionHash ?? null,
+      fill.logIndex ?? null
     );
   }
   async fillHistory() {
@@ -904,38 +906,23 @@ var SqliteLimitOrderStore = class {
   }
   async fills(limitOrderId, limit = 100) {
     return this.db.prepare(
-      `SELECT id, limit_order_id as limitOrderId, commitment, bid, amount, amount_in as amountIn, transaction_hash as transactionHash,
+      `SELECT id, limit_order_id as limitOrderId, commitment, bid, amount, amount_in as amountIn, transaction_hash as transactionHash, log_index as logIndex,
 					filled_at as filledAt
 				FROM limit_order_fills WHERE limit_order_id = ? ORDER BY id DESC LIMIT ?`
     ).all(limitOrderId, Math.min(Math.max(limit, 1), 500));
   }
-  async drawDown(id, amount) {
-    const order = this.read(id);
-    if (!order) return null;
-    const remaining = BigInt(order.remaining) - BigInt(amount);
-    const result = this.db.prepare("UPDATE limit_orders SET remaining = ?, updated_at = datetime('now') WHERE id = ? AND remaining = ?").run((remaining > 0n ? remaining : 0n).toString(), id, order.remaining);
-    if (result.changes !== 1) throw new LimitOrderWriteError(`Another writer moved limit order '${id}' mid draw-down`);
-    return this.read(id);
-  }
-  async clampRemaining(id, room) {
+  async clampRemaining(id, room, only) {
+    const statuses = clampable(only);
     const order = this.read(id);
-    if (!order || order.status !== "open") return null;
-    const sum = BigInt(room) + BigInt(order.reserved);
-    const target = sum > 0n ? sum : 0n;
+    if (!order || !statuses.includes(order.status)) return null;
+    const target = BigInt(room) > 0n ? BigInt(room) : 0n;
     if (target >= BigInt(order.remaining)) return null;
     const result = this.db.prepare(`
 				UPDATE limit_orders SET remaining = ?, updated_at = datetime('now')
-				WHERE id = ? AND remaining = ? AND reserved = ? AND status = 'open'
-			`).run(target.toString(), id, order.remaining, order.reserved);
+				WHERE id = ? AND remaining = ? AND status IN (${statuses.map(() => "?").join(", ")})
+			`).run(target.toString(), id, order.remaining, ...statuses);
     return result.changes === 1 ? this.read(id) : null;
   }
-  async release(id, amount) {
-    const order = this.read(id);
-    if (!order) return;
-    const reserved = BigInt(order.reserved) - BigInt(amount);
-    const result = this.db.prepare("UPDATE limit_orders SET reserved = ?, updated_at = datetime('now') WHERE id = ? AND reserved = ?").run((reserved > 0n ? reserved : 0n).toString(), id, order.reserved);
-    if (result.changes !== 1) throw new LimitOrderWriteError(`Another writer moved limit order '${id}' mid release`);
-  }
 };
 
 // src/data/sqlite/state.ts