@depthhq/maker-sdk 0.1.16 → 0.1.18

package/dist/chain/clock.d.ts

@@ -0,0 +1,2 @@
+import { Connection } from "@solana/web3.js";
+export declare function chainTime(connection: Pick<Connection, "getAccountInfo">): Promise<number>;

package/dist/hedge/wallet.d.ts

@@ -5,4 +5,7 @@ export type EthereumProvider = {
         params?: unknown[];
     }): Promise<unknown>;
 };
-export declare function connect_hyperliquid(provider: EthereumProvider): Promise<AbstractViemJsonRpcAccount>;
+export declare function connect_hyperliquid(provider: EthereumProvider, options?: {
+    timeoutMs?: number;
+    signal?: AbortSignal;
+}): Promise<AbstractViemJsonRpcAccount>;

package/dist/index.js

@@ -1313,6 +1313,19 @@ var resolveObjectURL = notimpl("resolveObjectURL");
 var isUtf8 = notimpl("isUtf8");
 var transcode = notimpl("transcode");
 
+// src/chain/clock.ts
+import { PublicKey, SYSVAR_CLOCK_PUBKEY } from "@solana/web3.js";
+var owner = new PublicKey("Sysvar1111111111111111111111111111111111111");
+async function chainTime(connection) {
+  const clock = await connection.getAccountInfo(SYSVAR_CLOCK_PUBKEY, "confirmed");
+  if (!clock?.owner.equals(owner) || clock.data.length !== 40)
+    throw new Error("Solana clock sysvar is unavailable");
+  const time = clock.data.readBigInt64LE(32);
+  if (time <= 0n || time > BigInt(Number.MAX_SAFE_INTEGER))
+    throw new Error("Solana clock timestamp is invalid");
+  return Number(time);
+}
+
 // src/client/client.ts
 import * as anchor6 from "@anchor-lang/core";
 
@@ -3722,7 +3735,7 @@ var { default: fs} = (() => ({}));
 import * as anchor from "@anchor-lang/core";
 import * as anchor__default from "@anchor-lang/core";
 import { BorshCoder, convertIdlToCamelCase, Program } from "@anchor-lang/core";
-import { AddressLookupTableProgram, PublicKey } from "@solana/web3.js";
+import { AddressLookupTableProgram, PublicKey as PublicKey2 } from "@solana/web3.js";
 var CURVE25519_SCALAR_FIELD_MODULUS = ed25519.CURVE.n;
 function serializeLE(val, lengthInBytes) {
   const result = new Uint8Array(lengthInBytes);
@@ -26329,7 +26342,7 @@ function findArciumPda(seeds) {
   return findPda(getArciumProgramId(), seeds);
 }
 function findPda(programId, seeds) {
-  return PublicKey.findProgramAddressSync(seeds, programId)[0];
+  return PublicKey2.findProgramAddressSync(seeds, programId)[0];
 }
 function assertIntegerInRange(value, min, max, label) {
   if (!Number.isInteger(value) || value < min || value > max) {
@@ -26401,7 +26414,7 @@ import {
 } from "@depthhq/bindings";
 import { DepthView } from "@depthhq/sdk/views";
 import { DepthRecovery } from "@depthhq/sdk/recovery";
-import { PublicKey as PublicKey7 } from "@solana/web3.js";
+import { PublicKey as PublicKey8 } from "@solana/web3.js";
 
 // src/chain/random.ts
 function randomBytes3(length) {
@@ -26421,8 +26434,8 @@ function order(value, receipt = false) {
     return true;
   return ["filled", "cancelled", "rejected"].includes(String(value.status)) && integer(value.completedAt) && value.completedAt >= value.nonce && amount(value.filledSize) && BigInt(value.filledSize) >= 0n && BigInt(value.filledSize) <= BigInt(value.size) && (value.filledAt === undefined || integer(value.filledAt) && value.filledAt >= value.nonce - 1000 && value.filledAt <= value.completedAt + 1000) && optional(value.orderId, integer) && optional(value.averagePriceE8, amount) && optional(value.fee, amount) && optional(value.reason, text) && optional(value.hashes, (hashes) => Array.isArray(hashes) && hashes.length <= 2000 && hashes.every((hash) => typeof hash === "string" && /^0x[0-9a-fA-F]{64}$/.test(hash)));
 }
-function hedgeView(value, owner) {
-  if (!object(value) || value.maker !== owner || typeof value.enabled !== "boolean")
+function hedgeView(value, owner2) {
+  if (!object(value) || value.maker !== owner2 || typeof value.enabled !== "boolean")
     throw new Error("Maker hedge response belongs to another wallet or is invalid");
   const snapshot = value.snapshot;
   if (snapshot !== null && (!value.enabled || !object(snapshot) || snapshot.venue !== "hyperliquid" || !["testnet", "mainnet"].includes(String(snapshot.network)) || typeof snapshot.account !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(snapshot.account) || !integer(snapshot.updatedAt) || !["balanced", "waiting", "pending", "blocked"].includes(String(snapshot.phase)) || !optional(snapshot.reason, text) || !optional(snapshot.depthPosition, amount) || !optional(snapshot.externalPosition, amount) || !optional(snapshot.unhedgedPosition, amount) || !optional(snapshot.pending, order) || !Array.isArray(snapshot.history) || snapshot.history.length > 50 || !snapshot.history.every((record) => order(record, true))))
@@ -26513,7 +26526,7 @@ class MakerAccess extends WalletSession {
 }
 
 // src/automation/automation.ts
-import { PublicKey as PublicKey3, SystemProgram, Transaction } from "@solana/web3.js";
+import { PublicKey as PublicKey4, SystemProgram, Transaction } from "@solana/web3.js";
 
 // src/hedge/setup.ts
 import { ExchangeClient, HttpTransport, InfoClient } from "@nktkas/hyperliquid";
@@ -26600,7 +26613,7 @@ async function setup_hyperliquid(options) {
 }
 
 // src/automation/types.ts
-import { PublicKey as PublicKey2 } from "@solana/web3.js";
+import { PublicKey as PublicKey3 } from "@solana/web3.js";
 
 // src/bot/policy.ts
 import { positionPnl } from "@depthhq/sdk";
@@ -26733,7 +26746,7 @@ function automationConfig(value) {
   };
 }
 var automationWire = (config) => JSON.parse(JSON.stringify(config, (_key, value) => typeof value === "bigint" ? value.toString() : value));
-function automationView(value, owner, environment) {
+function automationView(value, owner2, environment) {
   if (value === null)
     return null;
   const view = object2(value, [
@@ -26751,9 +26764,9 @@ function automationView(value, owner, environment) {
     "hedge",
     "funding"
   ]);
-  if (view.owner !== owner || view.environment !== environment)
+  if (view.owner !== owner2 || view.environment !== environment)
     throw new Error("Automation belongs to another wallet or network");
-  if (typeof view.operator !== "string" || new PublicKey2(view.operator).toBase58() !== view.operator || typeof view.agent !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(view.agent) || integer2(view.revision) < 1 || integer2(view.updatedAt) < 1 || !["running", "paused"].includes(String(view.desired)) || ![
+  if (typeof view.operator !== "string" || new PublicKey3(view.operator).toBase58() !== view.operator || typeof view.agent !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(view.agent) || integer2(view.revision) < 1 || integer2(view.updatedAt) < 1 || !["running", "paused"].includes(String(view.desired)) || ![
     "configured",
     "starting",
     "running",
@@ -26765,10 +26778,10 @@ function automationView(value, owner, environment) {
   automationConfig(view.config);
   if (view.bot !== undefined) {
     const bot = object2(view.bot, ["phase", "reason", "quoteId", "fillCount"]);
-    if (!["active", "pending", "idle", "stopped"].includes(String(bot.phase)) || integer2(bot.fillCount) < 0 || bot.reason !== undefined && typeof bot.reason !== "string" || bot.quoteId !== undefined && (typeof bot.quoteId !== "string" || new PublicKey2(bot.quoteId).toBase58() !== bot.quoteId))
+    if (!["active", "pending", "idle", "stopped"].includes(String(bot.phase)) || integer2(bot.fillCount) < 0 || bot.reason !== undefined && typeof bot.reason !== "string" || bot.quoteId !== undefined && (typeof bot.quoteId !== "string" || new PublicKey3(bot.quoteId).toBase58() !== bot.quoteId))
       throw new Error("Automation status is invalid");
   }
-  hedgeView(view.hedge, owner);
+  hedgeView(view.hedge, owner2);
   if (view.funding !== undefined) {
     const funding = object2(view.funding, ["signature", "lamports", "status"]);
     if (typeof funding.signature !== "string" || !/^[1-9A-HJ-NP-Za-km-z]{64,90}$/.test(funding.signature) || !["pending", "confirmed", "expired", "failed"].includes(String(funding.status)))
@@ -26840,7 +26853,7 @@ class MakerAutomation extends WalletSession {
           maxLeverage: config.hedge.policy.maxLeverage
         });
     }
-    const operator = new PublicKey3(profile.operator);
+    const operator = new PublicKey4(profile.operator);
     const balance = BigInt(await this.maker.options.connection.getBalance(operator, "confirmed"));
     const signatures = [];
     const recovered = this.view(await this.authorizedRequest("fund", { revision: current.revision }));
@@ -26952,7 +26965,7 @@ async function queueAccounts(provider, connection, name, offset) {
 import * as anchor2 from "@anchor-lang/core";
 import { DEPTH_PROGRAM_ID as DEPTH_PROGRAM_ID2, SOL_USD_MARKET_ID } from "@depthhq/bindings";
 import { DepthError } from "@depthhq/sdk";
-import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { PublicKey as PublicKey5 } from "@solana/web3.js";
 function u64(value, name) {
   if (typeof value !== "bigint" || value < 0n || value > (1n << 64n) - 1n)
     throw new RangeError(`${name} must be an unsigned 64-bit bigint`);
@@ -26969,7 +26982,7 @@ function timing(options) {
 }
 function address2(market, maker, nonce) {
   const bytes = u64(nonce, "clientNonce").toArrayLike(Buffer, "le", 8);
-  return PublicKey4.findProgramAddressSync([Buffer.from("backstop"), market.toBuffer(), maker.toBuffer(), bytes], DEPTH_PROGRAM_ID2)[0];
+  return PublicKey5.findProgramAddressSync([Buffer.from("backstop"), market.toBuffer(), maker.toBuffer(), bytes], DEPTH_PROGRAM_ID2)[0];
 }
 async function poll(read2, terminal, options) {
   const { timeoutMs, pollMs } = timing(options);
@@ -27011,7 +27024,7 @@ class BackstopHandle {
     ]);
     const now = Math.floor(Date.now() / 1000);
     const margin = (input.maxCapacity * BigInt(market.config.initialMarginBps) + 9999n) / 10000n;
-    if (!market.backstopOffer.equals(PublicKey4.default) || market.pendingOrders !== 0 || Object.keys(market.status)[0] === "settling" || input.maxCapacity > BigInt(market.config.maxAccountNotional.toString()) || margin < BigInt(market.config.backstopMinCollateral.toString()))
+    if (!market.backstopOffer.equals(PublicKey5.default) || market.pendingOrders !== 0 || Object.keys(market.status)[0] === "settling" || input.maxCapacity > BigInt(market.config.maxAccountNotional.toString()) || margin < BigInt(market.config.backstopMinCollateral.toString()))
       throw new Error("Backstop offer is outside the current market policy");
     if (!account.owner.equals(client.options.maker) || !account.market.equals(client.marketAddress) || !("ready" in account.status))
       throw new Error("Maker market account is unavailable");
@@ -27113,7 +27126,7 @@ class BackstopRelease {
 
 // src/fill/history.ts
 import * as anchor3 from "@anchor-lang/core";
-import { PublicKey as PublicKey5 } from "@solana/web3.js";
+import { PublicKey as PublicKey6 } from "@solana/web3.js";
 
 class FillHistory {
   client;
@@ -27176,7 +27189,7 @@ class FillHistory {
     const fills = [];
     for (let i2 = 0;i2 < addresses.length; i2 += 100) {
       const batch = addresses.slice(i2, i2 + 100);
-      const accounts2 = await connection.getMultipleAccountsInfo(batch.map((id) => new PublicKey5(id)), "finalized");
+      const accounts2 = await connection.getMultipleAccountsInfo(batch.map((id) => new PublicKey6(id)), "finalized");
       accounts2.forEach((info, index) => {
         if (!info || !info.owner.equals(this.client.program.programId))
           throw new Error("Finalized fill receipt is unavailable");
@@ -27321,7 +27334,7 @@ class QuoteHandle {
     const market = await this.client.read("Market", this.client.marketAddress);
     if (!Number.isSafeInteger(input.validForSeconds) || input.validForSeconds < 1 || input.validForSeconds > market.config.maxQuoteLifetimeSeconds)
       throw new RangeError("Quote duration is outside market policy");
-    const expiry = Math.floor(Date.now() / 1000) + input.validForSeconds;
+    const expiry = await chainTime(this.client.options.connection) + input.validForSeconds;
     const before = await this.status();
     if (before.status !== "active")
       throw new Error("Only active quotes can be renewed");
@@ -27587,7 +27600,7 @@ class QuoteHandle {
 // src/quote/replacement.ts
 import * as anchor5 from "@anchor-lang/core";
 import { DEPTH_PROGRAM_ID as DEPTH_PROGRAM_ID3 } from "@depthhq/bindings";
-import { PublicKey as PublicKey6 } from "@solana/web3.js";
+import { PublicKey as PublicKey7 } from "@solana/web3.js";
 import { quoteBounds as quoteBounds3 } from "@depthhq/bindings";
 
 class QuoteReplacement {
@@ -27603,7 +27616,7 @@ class QuoteReplacement {
       throw new RangeError("clientNonce must be an unsigned 64-bit bigint");
     }
     const bytes = new anchor5.BN(nonce.toString()).toArrayLike(Buffer, "le", 8);
-    this.nextId = PublicKey6.findProgramAddressSync([
+    this.nextId = PublicKey7.findProgramAddressSync([
       Buffer.from("quote"),
       client.marketAddress.toBuffer(),
       client.options.maker.toBuffer(),
@@ -27786,7 +27799,7 @@ async function cleanupQuotes(client, options = {}) {
     throw new RangeError("Cleanup limit must be between 1 and 12");
   const excluded = new Set(options.exclude);
   const actor = client.options.wallet.publicKey;
-  const owner = actor.equals(client.options.maker);
+  const owner2 = actor.equals(client.options.maker);
   const transaction = new Transaction2().add(ComputeBudgetProgram.setComputeUnitLimit({ units: 400000 }));
   let closed = 0;
   let reclaimedLamports = 0n;
@@ -27797,7 +27810,7 @@ async function cleanupQuotes(client, options = {}) {
       if (excluded.has(item.id.toBase58()))
         continue;
       const state = await client.quoteState(item.id);
-      if (!["cancelled", "filled", "rejected"].includes(Object.keys(state.status)[0]) || state.attachedOrders !== 0 || !owner && !state.operator.equals(actor))
+      if (!["cancelled", "filled", "rejected"].includes(Object.keys(state.status)[0]) || state.attachedOrders !== 0 || !owner2 && !state.operator.equals(actor))
         continue;
       if (state.replacementNonce != null) {
         const successor = client.quote.replacement(item.id, BigInt(state.replacementNonce.toString())).nextId;
@@ -27807,7 +27820,7 @@ async function cleanupQuotes(client, options = {}) {
       const info = await client.options.connection.getAccountInfo(item.id, "confirmed");
       if (!info)
         continue;
-      transaction.add(await (owner ? client.program.methods.closeQuote().accountsPartial({ maker: actor, quote: item.id }) : client.program.methods.closeOperatorQuote().accountsPartial({ operator: actor, quote: item.id })).instruction());
+      transaction.add(await (owner2 ? client.program.methods.closeQuote().accountsPartial({ maker: actor, quote: item.id }) : client.program.methods.closeOperatorQuote().accountsPartial({ operator: actor, quote: item.id })).instruction());
       reclaimedLamports += BigInt(info.lamports);
       if (++closed === limit)
         break;
@@ -27824,7 +27837,7 @@ async function cleanupQuotes(client, options = {}) {
 
 // src/client/client.ts
 function pda(seeds) {
-  return PublicKey7.findProgramAddressSync(seeds, DEPTH_PROGRAM_ID4)[0];
+  return PublicKey8.findProgramAddressSync(seeds, DEPTH_PROGRAM_ID4)[0];
 }
 function u642(value, name2) {
   if (typeof value !== "bigint" || value < 0n || value > (1n << 64n) - 1n) {
@@ -27898,7 +27911,7 @@ class MakerClient {
     this.backstop = Object.assign((id) => new BackstopHandle(id, this), { offer: (input) => BackstopHandle.offer(this, input) });
   }
   static async create(options) {
-    const appId = typeof options.appId === "string" ? new PublicKey7(options.appId) : options.appId;
+    const appId = typeof options.appId === "string" ? new PublicKey8(options.appId) : options.appId;
     if (options.maker && options.makerOwner && !options.maker.equals(options.makerOwner)) {
       throw new Error("maker and makerOwner identify different accounts");
     }
@@ -27944,7 +27957,7 @@ class MakerClient {
       summary: async () => (await this.owned()).account.summary(),
       pending: async () => (await this.owned()).account.pending(),
       deposit: async (sourceOrAmount, amount3, clientNonce) => {
-        if (sourceOrAmount instanceof PublicKey7) {
+        if (sourceOrAmount instanceof PublicKey8) {
           if (amount3 === undefined || clientNonce === undefined)
             throw new RangeError("Source deposits require amount and nonce");
           return this.funding.deposit(sourceOrAmount, amount3, clientNonce);
@@ -27954,7 +27967,7 @@ class MakerClient {
       withdrawalHandle: (clientNonce) => this.funding.withdrawalHandle(clientNonce),
       depositHandle: (nonce) => this.funding.depositHandle(nonce),
       withdraw: async (destinationOrAmount, amount3, clientNonce) => {
-        if (destinationOrAmount instanceof PublicKey7) {
+        if (destinationOrAmount instanceof PublicKey8) {
           if (amount3 === undefined || clientNonce === undefined)
             throw new RangeError("Destination withdrawals require amount and nonce");
           return this.funding.withdraw(destinationOrAmount, amount3, clientNonce);
@@ -28104,8 +28117,9 @@ class MakerClient {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }
         const market = await this.read("Market", this.marketAddress);
-        const input = "tiers" in request ? request : this.flatQuote(request, market, clientNonce);
-        this.validateQuote(input, market);
+        const time = await chainTime(this.options.connection);
+        const input = "tiers" in request ? request : this.flatQuote(request, market, clientNonce, time);
+        this.validateQuote(input, market, time);
         const grant = await this.grantFor(input.maxCapacity, input.expiresAt);
         const mxePublicKey = await getMXEPublicKey(this.provider, DEPTH_PROGRAM_ID4);
         if (!mxePublicKey)
@@ -28147,7 +28161,7 @@ class MakerClient {
       const limit = options.limit ?? 20;
       if (!Number.isSafeInteger(limit) || limit < 1 || limit > 100)
         throw new RangeError("limit must be an integer from 1 to 100");
-      const cursor = options.cursor ? new PublicKey7(options.cursor).toBase58() : undefined;
+      const cursor = options.cursor ? new PublicKey8(options.cursor).toBase58() : undefined;
       const accounts2 = await this.options.connection.getProgramAccounts(DEPTH_PROGRAM_ID4, {
         commitment: "confirmed",
         dataSlice: { offset: 0, length: 0 },
@@ -28213,7 +28227,7 @@ class MakerClient {
       return this.quote.replacement(prior, nonce).resume(input, options);
     }
   };
-  flatQuote(input, market, clientNonce) {
+  flatQuote(input, market, clientNonce, now) {
     if (input.marketId !== SOL_USD_MARKET_ID2)
       throw new Error("Only SOL-USD is supported");
     if (!Number.isSafeInteger(input.validForSeconds) || input.validForSeconds < 1 || input.validForSeconds > market.config.maxQuoteLifetimeSeconds)
@@ -28228,7 +28242,7 @@ class MakerClient {
     return {
       tiers,
       maxCapacity: input.maxCapacity,
-      expiresAt: Math.floor(Date.now() / 1000) + input.validForSeconds,
+      expiresAt: now + input.validForSeconds,
       clientNonce
     };
   }
@@ -28351,7 +28365,7 @@ class MakerClient {
       const store = createCursorStore(genesis, this.options.maker.toBase58(), this.options.cursorDirectory);
       const cursor = await store.load();
       return new FillHistory(this).subscribe(async (fill) => {
-        const execution = await this.fills.get(new PublicKey7(fill.id));
+        const execution = await this.fills.get(new PublicKey8(fill.id));
         if (execution.status !== "ready")
           throw new Error(`Private maker fill ${fill.id} is ${execution.status}`);
         await options.onFill({ ...fill, execution });
@@ -28370,8 +28384,7 @@ class MakerClient {
       return result;
     }
   };
-  validateQuote(input, market) {
-    const now = Math.floor(Date.now() / 1000);
+  validateQuote(input, market, now) {
     const reference = BigInt(market.oraclePriceE8.toString());
     const { preparationBps } = quoteBounds4(market.config.maxQuoteDeviationBps);
     if (!["draft", "active"].includes(stateName(market.status)))
@@ -28409,13 +28422,40 @@ async function createDepthMaker(options) {
   return MakerClient.create(options);
 }
 // src/hedge/wallet.ts
-async function connect_hyperliquid(provider) {
-  const accounts2 = await provider.request({ method: "eth_requestAccounts" });
+async function connect_hyperliquid(provider, options = {}) {
+  const timeoutMs = options.timeoutMs ?? 60000;
+  if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 1 || timeoutMs > 300000)
+    throw new RangeError("Wallet timeout must be 1 to 300000 milliseconds");
+  const request = (input) => new Promise((resolve, reject) => {
+    const signal = options.signal;
+    if (signal?.aborted) {
+      reject(new Error("Wallet connection cancelled"));
+      return;
+    }
+    let settled = false;
+    const finish = (action) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", abort);
+      action();
+    };
+    const abort = () => finish(() => reject(new Error("Wallet connection cancelled")));
+    const timer = setTimeout(() => finish(() => reject(new Error("Wallet did not respond. Open the extension and resolve its pending request."))), timeoutMs);
+    signal?.addEventListener("abort", abort, { once: true });
+    try {
+      provider.request(input).then((value) => finish(() => resolve(value)), (cause) => finish(() => reject(cause)));
+    } catch (cause) {
+      finish(() => reject(cause));
+    }
+  });
+  const accounts2 = await request({ method: "eth_requestAccounts" });
   if (!Array.isArray(accounts2) || typeof accounts2[0] !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(accounts2[0]))
     throw new Error("The Ethereum wallet did not provide an account");
   const address3 = accounts2[0];
   const check = async () => {
-    const current = await provider.request({ method: "eth_accounts" });
+    const current = await request({ method: "eth_accounts" });
     if (!Array.isArray(current) || typeof current[0] !== "string" || current[0].toLowerCase() !== address3.toLowerCase())
       throw new Error("The Ethereum wallet account changed; connect it again");
   };
@@ -28425,14 +28465,14 @@ async function connect_hyperliquid(provider) {
       return [address3];
     },
     async getChainId() {
-      const chain = await provider.request({ method: "eth_chainId" });
+      const chain = await request({ method: "eth_chainId" });
       if (typeof chain !== "string" || !/^0x[0-9a-fA-F]+$/.test(chain) || !Number.isSafeInteger(Number(chain)))
         throw new Error("Ethereum wallet chain is invalid");
       return Number(chain);
     },
     async signTypedData(params) {
       await check();
-      const signature = await provider.request({
+      const signature = await request({
         method: "eth_signTypedData_v4",
         params: [
           address3,

package/dist/index.node.js

@@ -1,5 +1,20 @@
 // src/client/client.ts
 import { Buffer as Buffer8 } from "buffer";
+
+// src/chain/clock.ts
+import { PublicKey, SYSVAR_CLOCK_PUBKEY } from "@solana/web3.js";
+var owner = new PublicKey("Sysvar1111111111111111111111111111111111111");
+async function chainTime(connection) {
+  const clock = await connection.getAccountInfo(SYSVAR_CLOCK_PUBKEY, "confirmed");
+  if (!clock?.owner.equals(owner) || clock.data.length !== 40)
+    throw new Error("Solana clock sysvar is unavailable");
+  const time = clock.data.readBigInt64LE(32);
+  if (time <= 0n || time > BigInt(Number.MAX_SAFE_INTEGER))
+    throw new Error("Solana clock timestamp is invalid");
+  return Number(time);
+}
+
+// src/client/client.ts
 import * as anchor6 from "@anchor-lang/core";
 
 // ../../node_modules/@arcium-hq/client/build/index.mjs
@@ -2233,7 +2248,7 @@ import * as anchor from "@anchor-lang/core";
 import { Buffer } from "buffer";
 import * as anchor__default from "@anchor-lang/core";
 import { BorshCoder, convertIdlToCamelCase, Program } from "@anchor-lang/core";
-import { AddressLookupTableProgram, PublicKey } from "@solana/web3.js";
+import { AddressLookupTableProgram, PublicKey as PublicKey2 } from "@solana/web3.js";
 var CURVE25519_SCALAR_FIELD_MODULUS = ed25519.CURVE.n;
 function serializeLE(val, lengthInBytes) {
   const result = new Uint8Array(lengthInBytes);
@@ -24840,7 +24855,7 @@ function findArciumPda(seeds) {
   return findPda(getArciumProgramId(), seeds);
 }
 function findPda(programId, seeds) {
-  return PublicKey.findProgramAddressSync(seeds, programId)[0];
+  return PublicKey2.findProgramAddressSync(seeds, programId)[0];
 }
 function assertIntegerInRange(value, min, max, label) {
   if (!Number.isInteger(value) || value < min || value > max) {
@@ -24912,7 +24927,7 @@ import {
 } from "@depthhq/bindings";
 import { DepthView } from "@depthhq/sdk/views";
 import { DepthRecovery } from "@depthhq/sdk/recovery";
-import { PublicKey as PublicKey7 } from "@solana/web3.js";
+import { PublicKey as PublicKey8 } from "@solana/web3.js";
 
 // src/chain/random.ts
 function randomBytes3(length) {
@@ -24935,8 +24950,8 @@ function order(value, receipt = false) {
     return true;
   return ["filled", "cancelled", "rejected"].includes(String(value.status)) && integer(value.completedAt) && value.completedAt >= value.nonce && amount(value.filledSize) && BigInt(value.filledSize) >= 0n && BigInt(value.filledSize) <= BigInt(value.size) && (value.filledAt === undefined || integer(value.filledAt) && value.filledAt >= value.nonce - 1000 && value.filledAt <= value.completedAt + 1000) && optional(value.orderId, integer) && optional(value.averagePriceE8, amount) && optional(value.fee, amount) && optional(value.reason, text) && optional(value.hashes, (hashes) => Array.isArray(hashes) && hashes.length <= 2000 && hashes.every((hash) => typeof hash === "string" && /^0x[0-9a-fA-F]{64}$/.test(hash)));
 }
-function hedgeView(value, owner) {
-  if (!object(value) || value.maker !== owner || typeof value.enabled !== "boolean")
+function hedgeView(value, owner2) {
+  if (!object(value) || value.maker !== owner2 || typeof value.enabled !== "boolean")
     throw new Error("Maker hedge response belongs to another wallet or is invalid");
   const snapshot = value.snapshot;
   if (snapshot !== null && (!value.enabled || !object(snapshot) || snapshot.venue !== "hyperliquid" || !["testnet", "mainnet"].includes(String(snapshot.network)) || typeof snapshot.account !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(snapshot.account) || !integer(snapshot.updatedAt) || !["balanced", "waiting", "pending", "blocked"].includes(String(snapshot.phase)) || !optional(snapshot.reason, text) || !optional(snapshot.depthPosition, amount) || !optional(snapshot.externalPosition, amount) || !optional(snapshot.unhedgedPosition, amount) || !optional(snapshot.pending, order) || !Array.isArray(snapshot.history) || snapshot.history.length > 50 || !snapshot.history.every((record) => order(record, true))))
@@ -25027,7 +25042,7 @@ class MakerAccess extends WalletSession {
 }
 
 // src/automation/automation.ts
-import { PublicKey as PublicKey3, SystemProgram, Transaction } from "@solana/web3.js";
+import { PublicKey as PublicKey4, SystemProgram, Transaction } from "@solana/web3.js";
 import { Buffer as Buffer3 } from "buffer";
 
 // src/hedge/setup.ts
@@ -25115,7 +25130,7 @@ async function setup_hyperliquid(options) {
 }
 
 // src/automation/types.ts
-import { PublicKey as PublicKey2 } from "@solana/web3.js";
+import { PublicKey as PublicKey3 } from "@solana/web3.js";
 
 // src/bot/policy.ts
 import { positionPnl } from "@depthhq/sdk";
@@ -25248,7 +25263,7 @@ function automationConfig(value) {
   };
 }
 var automationWire = (config) => JSON.parse(JSON.stringify(config, (_key, value) => typeof value === "bigint" ? value.toString() : value));
-function automationView(value, owner, environment) {
+function automationView(value, owner2, environment) {
   if (value === null)
     return null;
   const view = object2(value, [
@@ -25266,9 +25281,9 @@ function automationView(value, owner, environment) {
     "hedge",
     "funding"
   ]);
-  if (view.owner !== owner || view.environment !== environment)
+  if (view.owner !== owner2 || view.environment !== environment)
     throw new Error("Automation belongs to another wallet or network");
-  if (typeof view.operator !== "string" || new PublicKey2(view.operator).toBase58() !== view.operator || typeof view.agent !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(view.agent) || integer2(view.revision) < 1 || integer2(view.updatedAt) < 1 || !["running", "paused"].includes(String(view.desired)) || ![
+  if (typeof view.operator !== "string" || new PublicKey3(view.operator).toBase58() !== view.operator || typeof view.agent !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(view.agent) || integer2(view.revision) < 1 || integer2(view.updatedAt) < 1 || !["running", "paused"].includes(String(view.desired)) || ![
     "configured",
     "starting",
     "running",
@@ -25280,10 +25295,10 @@ function automationView(value, owner, environment) {
   automationConfig(view.config);
   if (view.bot !== undefined) {
     const bot = object2(view.bot, ["phase", "reason", "quoteId", "fillCount"]);
-    if (!["active", "pending", "idle", "stopped"].includes(String(bot.phase)) || integer2(bot.fillCount) < 0 || bot.reason !== undefined && typeof bot.reason !== "string" || bot.quoteId !== undefined && (typeof bot.quoteId !== "string" || new PublicKey2(bot.quoteId).toBase58() !== bot.quoteId))
+    if (!["active", "pending", "idle", "stopped"].includes(String(bot.phase)) || integer2(bot.fillCount) < 0 || bot.reason !== undefined && typeof bot.reason !== "string" || bot.quoteId !== undefined && (typeof bot.quoteId !== "string" || new PublicKey3(bot.quoteId).toBase58() !== bot.quoteId))
       throw new Error("Automation status is invalid");
   }
-  hedgeView(view.hedge, owner);
+  hedgeView(view.hedge, owner2);
   if (view.funding !== undefined) {
     const funding = object2(view.funding, ["signature", "lamports", "status"]);
     if (typeof funding.signature !== "string" || !/^[1-9A-HJ-NP-Za-km-z]{64,90}$/.test(funding.signature) || !["pending", "confirmed", "expired", "failed"].includes(String(funding.status)))
@@ -25355,7 +25370,7 @@ class MakerAutomation extends WalletSession {
           maxLeverage: config.hedge.policy.maxLeverage
         });
     }
-    const operator = new PublicKey3(profile.operator);
+    const operator = new PublicKey4(profile.operator);
     const balance = BigInt(await this.maker.options.connection.getBalance(operator, "confirmed"));
     const signatures = [];
     const recovered = this.view(await this.authorizedRequest("fund", { revision: current.revision }));
@@ -25469,7 +25484,7 @@ import { Buffer as Buffer5 } from "buffer";
 import * as anchor2 from "@anchor-lang/core";
 import { DEPTH_PROGRAM_ID as DEPTH_PROGRAM_ID2, SOL_USD_MARKET_ID } from "@depthhq/bindings";
 import { DepthError } from "@depthhq/sdk";
-import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { PublicKey as PublicKey5 } from "@solana/web3.js";
 function u64(value, name) {
   if (typeof value !== "bigint" || value < 0n || value > (1n << 64n) - 1n)
     throw new RangeError(`${name} must be an unsigned 64-bit bigint`);
@@ -25486,7 +25501,7 @@ function timing(options) {
 }
 function address2(market, maker, nonce) {
   const bytes = u64(nonce, "clientNonce").toArrayLike(Buffer5, "le", 8);
-  return PublicKey4.findProgramAddressSync([Buffer5.from("backstop"), market.toBuffer(), maker.toBuffer(), bytes], DEPTH_PROGRAM_ID2)[0];
+  return PublicKey5.findProgramAddressSync([Buffer5.from("backstop"), market.toBuffer(), maker.toBuffer(), bytes], DEPTH_PROGRAM_ID2)[0];
 }
 async function poll(read, terminal, options) {
   const { timeoutMs, pollMs } = timing(options);
@@ -25528,7 +25543,7 @@ class BackstopHandle {
     ]);
     const now = Math.floor(Date.now() / 1000);
     const margin = (input.maxCapacity * BigInt(market.config.initialMarginBps) + 9999n) / 10000n;
-    if (!market.backstopOffer.equals(PublicKey4.default) || market.pendingOrders !== 0 || Object.keys(market.status)[0] === "settling" || input.maxCapacity > BigInt(market.config.maxAccountNotional.toString()) || margin < BigInt(market.config.backstopMinCollateral.toString()))
+    if (!market.backstopOffer.equals(PublicKey5.default) || market.pendingOrders !== 0 || Object.keys(market.status)[0] === "settling" || input.maxCapacity > BigInt(market.config.maxAccountNotional.toString()) || margin < BigInt(market.config.backstopMinCollateral.toString()))
       throw new Error("Backstop offer is outside the current market policy");
     if (!account.owner.equals(client.options.maker) || !account.market.equals(client.marketAddress) || !("ready" in account.status))
       throw new Error("Maker market account is unavailable");
@@ -25631,7 +25646,7 @@ class BackstopRelease {
 // src/fill/history.ts
 import { Buffer as Buffer6 } from "buffer";
 import * as anchor3 from "@anchor-lang/core";
-import { PublicKey as PublicKey5 } from "@solana/web3.js";
+import { PublicKey as PublicKey6 } from "@solana/web3.js";
 
 class FillHistory {
   client;
@@ -25694,7 +25709,7 @@ class FillHistory {
     const fills = [];
     for (let i = 0;i < addresses.length; i += 100) {
       const batch = addresses.slice(i, i + 100);
-      const accounts2 = await connection.getMultipleAccountsInfo(batch.map((id) => new PublicKey5(id)), "finalized");
+      const accounts2 = await connection.getMultipleAccountsInfo(batch.map((id) => new PublicKey6(id)), "finalized");
       accounts2.forEach((info, index) => {
         if (!info || !info.owner.equals(this.client.program.programId))
           throw new Error("Finalized fill receipt is unavailable");
@@ -25840,7 +25855,7 @@ class QuoteHandle {
     const market = await this.client.read("Market", this.client.marketAddress);
     if (!Number.isSafeInteger(input.validForSeconds) || input.validForSeconds < 1 || input.validForSeconds > market.config.maxQuoteLifetimeSeconds)
       throw new RangeError("Quote duration is outside market policy");
-    const expiry = Math.floor(Date.now() / 1000) + input.validForSeconds;
+    const expiry = await chainTime(this.client.options.connection) + input.validForSeconds;
     const before = await this.status();
     if (before.status !== "active")
       throw new Error("Only active quotes can be renewed");
@@ -26106,7 +26121,7 @@ class QuoteHandle {
 // src/quote/replacement.ts
 import * as anchor5 from "@anchor-lang/core";
 import { DEPTH_PROGRAM_ID as DEPTH_PROGRAM_ID3 } from "@depthhq/bindings";
-import { PublicKey as PublicKey6 } from "@solana/web3.js";
+import { PublicKey as PublicKey7 } from "@solana/web3.js";
 import { Buffer as Buffer7 } from "buffer";
 import { quoteBounds as quoteBounds3 } from "@depthhq/bindings";
 
@@ -26123,7 +26138,7 @@ class QuoteReplacement {
       throw new RangeError("clientNonce must be an unsigned 64-bit bigint");
     }
     const bytes = new anchor5.BN(nonce.toString()).toArrayLike(Buffer7, "le", 8);
-    this.nextId = PublicKey6.findProgramAddressSync([
+    this.nextId = PublicKey7.findProgramAddressSync([
       Buffer7.from("quote"),
       client.marketAddress.toBuffer(),
       client.options.maker.toBuffer(),
@@ -26306,7 +26321,7 @@ async function cleanupQuotes(client, options = {}) {
     throw new RangeError("Cleanup limit must be between 1 and 12");
   const excluded = new Set(options.exclude);
   const actor = client.options.wallet.publicKey;
-  const owner = actor.equals(client.options.maker);
+  const owner2 = actor.equals(client.options.maker);
   const transaction = new Transaction2().add(ComputeBudgetProgram.setComputeUnitLimit({ units: 400000 }));
   let closed = 0;
   let reclaimedLamports = 0n;
@@ -26317,7 +26332,7 @@ async function cleanupQuotes(client, options = {}) {
       if (excluded.has(item.id.toBase58()))
         continue;
       const state = await client.quoteState(item.id);
-      if (!["cancelled", "filled", "rejected"].includes(Object.keys(state.status)[0]) || state.attachedOrders !== 0 || !owner && !state.operator.equals(actor))
+      if (!["cancelled", "filled", "rejected"].includes(Object.keys(state.status)[0]) || state.attachedOrders !== 0 || !owner2 && !state.operator.equals(actor))
         continue;
       if (state.replacementNonce != null) {
         const successor = client.quote.replacement(item.id, BigInt(state.replacementNonce.toString())).nextId;
@@ -26327,7 +26342,7 @@ async function cleanupQuotes(client, options = {}) {
       const info = await client.options.connection.getAccountInfo(item.id, "confirmed");
       if (!info)
         continue;
-      transaction.add(await (owner ? client.program.methods.closeQuote().accountsPartial({ maker: actor, quote: item.id }) : client.program.methods.closeOperatorQuote().accountsPartial({ operator: actor, quote: item.id })).instruction());
+      transaction.add(await (owner2 ? client.program.methods.closeQuote().accountsPartial({ maker: actor, quote: item.id }) : client.program.methods.closeOperatorQuote().accountsPartial({ operator: actor, quote: item.id })).instruction());
       reclaimedLamports += BigInt(info.lamports);
       if (++closed === limit)
         break;
@@ -26344,7 +26359,7 @@ async function cleanupQuotes(client, options = {}) {
 
 // src/client/client.ts
 function pda(seeds) {
-  return PublicKey7.findProgramAddressSync(seeds, DEPTH_PROGRAM_ID4)[0];
+  return PublicKey8.findProgramAddressSync(seeds, DEPTH_PROGRAM_ID4)[0];
 }
 function u642(value, name2) {
   if (typeof value !== "bigint" || value < 0n || value > (1n << 64n) - 1n) {
@@ -26418,7 +26433,7 @@ class MakerClient {
     this.backstop = Object.assign((id) => new BackstopHandle(id, this), { offer: (input) => BackstopHandle.offer(this, input) });
   }
   static async create(options) {
-    const appId = typeof options.appId === "string" ? new PublicKey7(options.appId) : options.appId;
+    const appId = typeof options.appId === "string" ? new PublicKey8(options.appId) : options.appId;
     if (options.maker && options.makerOwner && !options.maker.equals(options.makerOwner)) {
       throw new Error("maker and makerOwner identify different accounts");
     }
@@ -26464,7 +26479,7 @@ class MakerClient {
       summary: async () => (await this.owned()).account.summary(),
       pending: async () => (await this.owned()).account.pending(),
       deposit: async (sourceOrAmount, amount3, clientNonce) => {
-        if (sourceOrAmount instanceof PublicKey7) {
+        if (sourceOrAmount instanceof PublicKey8) {
           if (amount3 === undefined || clientNonce === undefined)
             throw new RangeError("Source deposits require amount and nonce");
           return this.funding.deposit(sourceOrAmount, amount3, clientNonce);
@@ -26474,7 +26489,7 @@ class MakerClient {
       withdrawalHandle: (clientNonce) => this.funding.withdrawalHandle(clientNonce),
       depositHandle: (nonce) => this.funding.depositHandle(nonce),
       withdraw: async (destinationOrAmount, amount3, clientNonce) => {
-        if (destinationOrAmount instanceof PublicKey7) {
+        if (destinationOrAmount instanceof PublicKey8) {
           if (amount3 === undefined || clientNonce === undefined)
             throw new RangeError("Destination withdrawals require amount and nonce");
           return this.funding.withdraw(destinationOrAmount, amount3, clientNonce);
@@ -26624,8 +26639,9 @@ class MakerClient {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }
         const market = await this.read("Market", this.marketAddress);
-        const input = "tiers" in request ? request : this.flatQuote(request, market, clientNonce);
-        this.validateQuote(input, market);
+        const time = await chainTime(this.options.connection);
+        const input = "tiers" in request ? request : this.flatQuote(request, market, clientNonce, time);
+        this.validateQuote(input, market, time);
         const grant = await this.grantFor(input.maxCapacity, input.expiresAt);
         const mxePublicKey = await getMXEPublicKey(this.provider, DEPTH_PROGRAM_ID4);
         if (!mxePublicKey)
@@ -26667,7 +26683,7 @@ class MakerClient {
       const limit = options.limit ?? 20;
       if (!Number.isSafeInteger(limit) || limit < 1 || limit > 100)
         throw new RangeError("limit must be an integer from 1 to 100");
-      const cursor = options.cursor ? new PublicKey7(options.cursor).toBase58() : undefined;
+      const cursor = options.cursor ? new PublicKey8(options.cursor).toBase58() : undefined;
       const accounts2 = await this.options.connection.getProgramAccounts(DEPTH_PROGRAM_ID4, {
         commitment: "confirmed",
         dataSlice: { offset: 0, length: 0 },
@@ -26733,7 +26749,7 @@ class MakerClient {
       return this.quote.replacement(prior, nonce).resume(input, options);
     }
   };
-  flatQuote(input, market, clientNonce) {
+  flatQuote(input, market, clientNonce, now) {
     if (input.marketId !== SOL_USD_MARKET_ID2)
       throw new Error("Only SOL-USD is supported");
     if (!Number.isSafeInteger(input.validForSeconds) || input.validForSeconds < 1 || input.validForSeconds > market.config.maxQuoteLifetimeSeconds)
@@ -26748,7 +26764,7 @@ class MakerClient {
     return {
       tiers,
       maxCapacity: input.maxCapacity,
-      expiresAt: Math.floor(Date.now() / 1000) + input.validForSeconds,
+      expiresAt: now + input.validForSeconds,
       clientNonce
     };
   }
@@ -26871,7 +26887,7 @@ class MakerClient {
       const store = createCursorStore(genesis, this.options.maker.toBase58(), this.options.cursorDirectory);
       const cursor = await store.load();
       return new FillHistory(this).subscribe(async (fill) => {
-        const execution = await this.fills.get(new PublicKey7(fill.id));
+        const execution = await this.fills.get(new PublicKey8(fill.id));
         if (execution.status !== "ready")
           throw new Error(`Private maker fill ${fill.id} is ${execution.status}`);
         await options.onFill({ ...fill, execution });
@@ -26890,8 +26906,7 @@ class MakerClient {
       return result;
     }
   };
-  validateQuote(input, market) {
-    const now = Math.floor(Date.now() / 1000);
+  validateQuote(input, market, now) {
     const reference = BigInt(market.oraclePriceE8.toString());
     const { preparationBps } = quoteBounds4(market.config.maxQuoteDeviationBps);
     if (!["draft", "active"].includes(stateName(market.status)))
@@ -26929,13 +26944,40 @@ async function createDepthMaker(options) {
   return MakerClient.create(options);
 }
 // src/hedge/wallet.ts
-async function connect_hyperliquid(provider) {
-  const accounts2 = await provider.request({ method: "eth_requestAccounts" });
+async function connect_hyperliquid(provider, options = {}) {
+  const timeoutMs = options.timeoutMs ?? 60000;
+  if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 1 || timeoutMs > 300000)
+    throw new RangeError("Wallet timeout must be 1 to 300000 milliseconds");
+  const request = (input) => new Promise((resolve, reject) => {
+    const signal = options.signal;
+    if (signal?.aborted) {
+      reject(new Error("Wallet connection cancelled"));
+      return;
+    }
+    let settled = false;
+    const finish = (action) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", abort);
+      action();
+    };
+    const abort = () => finish(() => reject(new Error("Wallet connection cancelled")));
+    const timer = setTimeout(() => finish(() => reject(new Error("Wallet did not respond. Open the extension and resolve its pending request."))), timeoutMs);
+    signal?.addEventListener("abort", abort, { once: true });
+    try {
+      provider.request(input).then((value) => finish(() => resolve(value)), (cause) => finish(() => reject(cause)));
+    } catch (cause) {
+      finish(() => reject(cause));
+    }
+  });
+  const accounts2 = await request({ method: "eth_requestAccounts" });
   if (!Array.isArray(accounts2) || typeof accounts2[0] !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(accounts2[0]))
     throw new Error("The Ethereum wallet did not provide an account");
   const address3 = accounts2[0];
   const check = async () => {
-    const current = await provider.request({ method: "eth_accounts" });
+    const current = await request({ method: "eth_accounts" });
     if (!Array.isArray(current) || typeof current[0] !== "string" || current[0].toLowerCase() !== address3.toLowerCase())
       throw new Error("The Ethereum wallet account changed; connect it again");
   };
@@ -26945,14 +26987,14 @@ async function connect_hyperliquid(provider) {
       return [address3];
     },
     async getChainId() {
-      const chain = await provider.request({ method: "eth_chainId" });
+      const chain = await request({ method: "eth_chainId" });
       if (typeof chain !== "string" || !/^0x[0-9a-fA-F]+$/.test(chain) || !Number.isSafeInteger(Number(chain)))
         throw new Error("Ethereum wallet chain is invalid");
       return Number(chain);
     },
     async signTypedData(params) {
       await check();
-      const signature = await provider.request({
+      const signature = await request({
         method: "eth_signTypedData_v4",
         params: [
           address3,

package/dist/node.js

@@ -44,7 +44,7 @@ class FillCursorStore {
 }
 // src/bot/bot.ts
 import { createHash, randomBytes as randomBytes3 } from "node:crypto";
-import { PublicKey } from "@solana/web3.js";
+import { PublicKey as PublicKey2 } from "@solana/web3.js";
 import { DEPTH_PROGRAM_ID } from "@depthhq/bindings";
 
 // src/bot/store.ts
@@ -372,6 +372,19 @@ function botQuote(policy, market, position, nonce, now, pricing, reservationCred
   };
 }
 
+// src/chain/clock.ts
+import { PublicKey, SYSVAR_CLOCK_PUBKEY } from "@solana/web3.js";
+var owner = new PublicKey("Sysvar1111111111111111111111111111111111111");
+async function chainTime(connection) {
+  const clock = await connection.getAccountInfo(SYSVAR_CLOCK_PUBKEY, "confirmed");
+  if (!clock?.owner.equals(owner) || clock.data.length !== 40)
+    throw new Error("Solana clock sysvar is unavailable");
+  const time = clock.data.readBigInt64LE(32);
+  if (time <= 0n || time > BigInt(Number.MAX_SAFE_INTEGER))
+    throw new Error("Solana clock timestamp is invalid");
+  return Number(time);
+}
+
 // src/bot/bot.ts
 var terminal = new Set(["filled", "cancelled", "rejected"]);
 var nonce = () => BigInt(`0x${randomBytes3(8).toString("hex")}`);
@@ -413,7 +426,7 @@ class MakerBot {
       if (options.hedge) {
         if (bot.state.hedge && bot.state.hedge.identity !== options.hedge.adapter.identity)
           throw new Error("Hedge checkpoint belongs to another account or network");
-        bot.hedgeLease = new BotStore(PublicKey.default.toBase58(), new PublicKey(createHash("sha256").update(options.hedge.adapter.identity).digest()).toBase58(), PublicKey.default.toBase58(), options.stateDirectory);
+        bot.hedgeLease = new BotStore(PublicKey2.default.toBase58(), new PublicKey2(createHash("sha256").update(options.hedge.adapter.identity).digest()).toBase58(), PublicKey2.default.toBase58(), options.stateDirectory);
         await bot.hedgeLease.acquire();
         const shared = await bot.hedgeLease.load();
         if (shared.hedge)
@@ -463,18 +476,18 @@ class MakerBot {
       const ids = [
         this.state.quote,
         write?.quote,
-        this.state.replacement ? this.maker.quote.replacement(new PublicKey(this.state.replacement.prior), this.state.replacement.nonce).nextId.toBase58() : undefined
+        this.state.replacement ? this.maker.quote.replacement(new PublicKey2(this.state.replacement.prior), this.state.replacement.nonce).nextId.toBase58() : undefined
       ];
       for (const id of new Set(ids.filter((id2) => Boolean(id2)))) {
-        const quote = await this.maker.quoteState(new PublicKey(id));
-        if ((("reserving" in quote.status) || ("releasing" in quote.status)) && quote.pendingComputation?.equals(confirmed.pendingComputation ?? PublicKey.default))
+        const quote = await this.maker.quoteState(new PublicKey2(id));
+        if ((("reserving" in quote.status) || ("releasing" in quote.status)) && quote.pendingComputation?.equals(confirmed.pendingComputation ?? PublicKey2.default))
           return "updating quote margin";
       }
     }
     let ready = "ready" in account.status && "ready" in confirmed.status && account.version.toString() === confirmed.version.toString();
     const currentVersion = BigInt(confirmed.version.toString());
     const candidate = write && this.position && "ready" in confirmed.status && currentVersion === write.version + 1n && (this.inventoryVersion ?? this.position.version) >= write.version && (this.inventoryVersion ?? this.position.version) <= currentVersion;
-    const completedQuote = write && "ready" in confirmed.status && currentVersion === write.version + 1n && await this.maker.quoteState(new PublicKey(write.quote));
+    const completedQuote = write && "ready" in confirmed.status && currentVersion === write.version + 1n && await this.maker.quoteState(new PublicKey2(write.quote));
     const completedWrite = candidate && completedQuote ? completedQuote.status : undefined;
     const ownCommit = write && completedWrite && (write.release ? "cancelled" in completedWrite || "filled" in completedWrite : ("active" in completedWrite));
     const riskWrite = [
@@ -535,7 +548,7 @@ class MakerBot {
         const market = await this.maker.read("Market", this.maker.marketAddress);
         const price = BigInt(market.oraclePriceE8.toString());
         const expected = risk.externalPosition + this.state.hedge.history.filter((fill) => fill.nonce > risk.hedgeNonce).reduce((total, fill) => total + (fill.buy ? fill.filledSize : -fill.filledSize), 0n);
-        const quote = await this.maker.quoteState(new PublicKey(risk.quote));
+        const quote = await this.maker.quoteState(new PublicKey2(risk.quote));
         const balanceNonce = Buffer.from(quote.balanceNonce).toString("hex");
         const unchanged = currentVersion === risk.version;
         const ownFill = "ready" in confirmed.status && currentVersion === risk.version + 1n && risk.balanceNonce !== undefined && balanceNonce !== risk.balanceNonce;
@@ -609,7 +622,7 @@ class MakerBot {
       return;
     const bytes = Buffer.alloc(8);
     bytes.writeBigUInt64LE(value);
-    return PublicKey.findProgramAddressSync([
+    return PublicKey2.findProgramAddressSync([
       Buffer.from("quote"),
       this.maker.marketAddress.toBuffer(),
       this.maker.options.maker.toBuffer(),
@@ -618,7 +631,7 @@ class MakerBot {
   }
   async reconcile() {
     const state = this.state;
-    if (state.quote && !await this.maker.options.connection.getAccountInfo(new PublicKey(state.quote), "confirmed")) {
+    if (state.quote && !await this.maker.options.connection.getAccountInfo(new PublicKey2(state.quote), "confirmed")) {
       if (!state.request || state.request.expiresAt + 180 < Math.floor(Date.now() / 1000)) {
         state.quote = undefined;
         state.request = undefined;
@@ -627,12 +640,27 @@ class MakerBot {
       }
     }
     if (state.replacement) {
-      const flow = this.maker.quote.replacement(new PublicKey(state.replacement.prior), state.replacement.nonce);
+      const flow = this.maker.quote.replacement(new PublicKey2(state.replacement.prior), state.replacement.nonce);
       const [prior, next] = await Promise.all([
-        this.maker.options.connection.getAccountInfo(new PublicKey(state.replacement.prior), "confirmed"),
+        this.maker.options.connection.getAccountInfo(new PublicKey2(state.replacement.prior), "confirmed"),
         this.maker.options.connection.getAccountInfo(flow.nextId, "confirmed")
       ]);
-      if (!prior && next) {
+      const successor = next && await this.maker.quoteState(flow.nextId);
+      const predecessor = prior && await this.maker.quoteState(new PublicKey2(state.replacement.prior));
+      const completed = predecessor && successor && terminal.has(Object.keys(predecessor.status)[0]) && "active" in successor.status && predecessor.replacementNonce?.toString() === state.replacement.nonce.toString();
+      if (successor && (!prior || completed)) {
+        if (!successor.operator.equals(this.maker.options.wallet.publicKey) || !state.replacement.request || BigInt(successor.capacity.toString()) !== state.replacement.request.maxCapacity)
+          throw new Error("Recovered successor does not match this operator's checkpoint");
+        const risk = state.replacement.risk;
+        if (risk && "active" in successor.status) {
+          const account = await this.maker.read("MarketAccount", this.maker.marketAccount());
+          const version = BigInt(account.version.toString());
+          if ("ready" in account.status && version === risk.version + 1n) {
+            risk.version = version;
+            risk.balanceNonce = Buffer.from(successor.balanceNonce).toString("hex");
+            state.quoteWrite = undefined;
+          }
+        }
         state.quote = flow.nextId.toBase58();
         state.request = state.replacement.request;
         state.referencePrice = state.replacement.referencePrice;
@@ -658,14 +686,14 @@ class MakerBot {
     const allowed = new Set([
       state.quote,
       state.replacement?.prior,
-      state.replacement ? this.maker.quote.replacement(new PublicKey(state.replacement.prior), state.replacement.nonce).nextId.toBase58() : undefined,
+      state.replacement ? this.maker.quote.replacement(new PublicKey2(state.replacement.prior), state.replacement.nonce).nextId.toBase58() : undefined,
       this.requestId()?.toBase58()
     ].filter(Boolean));
     for (const id of managed)
       if (!allowed.has(id)) {
-        const quote = await this.maker.quote.get(new PublicKey(id)).status();
+        const quote = await this.maker.quote.get(new PublicKey2(id)).status();
         if (["active", "waiting", "validated", "validating", "closing"].includes(quote.status))
-          await this.maker.quote.get(new PublicKey(id)).cancel();
+          await this.maker.quote.get(new PublicKey2(id)).cancel();
       }
   }
   async fills() {
@@ -702,7 +730,7 @@ class MakerBot {
     const state = this.state;
     let successorPending = false;
     if (state.replacement?.request) {
-      const next = this.maker.quote.replacement(new PublicKey(state.replacement.prior), state.replacement.nonce).nextId;
+      const next = this.maker.quote.replacement(new PublicKey2(state.replacement.prior), state.replacement.nonce).nextId;
       if (await this.maker.options.connection.getAccountInfo(next, "confirmed")) {
         const handle2 = this.maker.quote.get(next);
         const snapshot = await handle2.status();
@@ -733,7 +761,7 @@ class MakerBot {
         return true;
       }
     }
-    const handle = this.maker.quote.get(new PublicKey(state.quote));
+    const handle = this.maker.quote.get(new PublicKey2(state.quote));
     const quote = await handle.status();
     if (terminal.has(quote.status)) {
       if (successorPending)
@@ -760,7 +788,7 @@ class MakerBot {
   async replace(market, now) {
     const state = this.state;
     const replacement = state.replacement;
-    const flow = this.maker.quote.replacement(new PublicKey(replacement.prior), replacement.nonce);
+    const flow = this.maker.quote.replacement(new PublicKey2(replacement.prior), replacement.nonce);
     if (now - market.oracleTimestamp.toNumber() > market.config.maxOracleAgeSeconds - Math.min(Math.floor(market.config.maxOracleAgeSeconds / 2), this.policy.lifetimeSeconds))
       return this.snapshot("pending", "waiting for a fresh oracle update");
     if (!replacement.request) {
@@ -779,12 +807,12 @@ class MakerBot {
       }
       this.inventoryVersion = this.position.version;
       this.dirty = false;
-      const previous2 = await this.maker.quote.get(new PublicKey(replacement.prior)).status();
+      const previous2 = await this.maker.quote.get(new PublicKey2(replacement.prior)).status();
       const policy = this.quotePolicy(market);
       const planned = botQuote(policy, market, this.position, replacement.nonce, now, this.pricing);
       let credit = 0n;
       if (previous2.status === "active" && (!planned || planned.maxCapacity < policy.maxCapacity)) {
-        this.reservationView ??= this.maker.quote.get(new PublicKey(replacement.prior));
+        this.reservationView ??= this.maker.quote.get(new PublicKey2(replacement.prior));
         const margin = await this.reservationView.reservation();
         if (margin === undefined)
           return this.snapshot("pending", "reading remaining quote margin");
@@ -811,7 +839,7 @@ class MakerBot {
       await this.store.save(state);
       return this.snapshot("pending", "retrying expired successor");
     }
-    const prior = this.maker.quote.get(new PublicKey(replacement.prior));
+    const prior = this.maker.quote.get(new PublicKey2(replacement.prior));
     const previous = await prior.status();
     if (previous.status === "active" && ["validated", "reserving"].includes(snapshot.status)) {
       const price = BigInt(market.oraclePriceE8.toString());
@@ -869,16 +897,16 @@ class MakerBot {
             state.quote,
             state.replacement?.prior,
             this.requestId()?.toBase58(),
-            state.replacement ? this.maker.quote.replacement(new PublicKey(state.replacement.prior), state.replacement.nonce).nextId.toBase58() : undefined
+            state.replacement ? this.maker.quote.replacement(new PublicKey2(state.replacement.prior), state.replacement.nonce).nextId.toBase58() : undefined
           ].filter((id) => Boolean(id))
         });
         this.lastCleanup = Date.now();
       }
-      let [market, lamports] = await Promise.all([
+      let [market, lamports, now] = await Promise.all([
         this.maker.read("Market", this.maker.marketAddress),
-        this.maker.options.connection.getBalance(this.maker.options.wallet.publicKey, "confirmed")
+        this.maker.options.connection.getBalance(this.maker.options.wallet.publicKey, "confirmed"),
+        chainTime(this.maker.options.connection)
       ]);
-      let now = Math.floor(Date.now() / 1000);
       const reason = this.stopping ? "shutdown" : quoteHealth(market, now) ?? (BigInt(lamports) < (this.policy.gasReserveLamports ?? 50000000n) ? "operator SOL reserve" : undefined);
       if (reason) {
         const stopped = await this.cancel();
@@ -896,7 +924,7 @@ class MakerBot {
         return this.snapshot("pending", hedgeReason);
       if (this.hedge) {
         market = await this.maker.read("Market", this.maker.marketAddress);
-        now = Math.floor(Date.now() / 1000);
+        now = await chainTime(this.maker.options.connection);
         const changed = quoteHealth(market, now);
         if (changed) {
           const stopped = await this.cancel();
@@ -910,7 +938,7 @@ class MakerBot {
         await this.store.save(state);
       }
       if (state.quote) {
-        const handle2 = this.maker.quote.get(new PublicKey(state.quote));
+        const handle2 = this.maker.quote.get(new PublicKey2(state.quote));
         const quote = await handle2.status();
         if (terminal.has(quote.status)) {
           state.quote = undefined;
@@ -1010,7 +1038,7 @@ class MakerBot {
     const state = this.state;
     if (this.hedge && (state.hedge?.pending || state.inventoryPendingSince !== undefined && Date.now() - state.inventoryPendingSince >= this.hedge.policy.maxUnhedgedMs))
       return;
-    const handle = this.maker.quote.get(new PublicKey(state.quote));
+    const handle = this.maker.quote.get(new PublicKey2(state.quote));
     const quote = await this.maker.quoteState(handle.id);
     if (!("active" in quote.status) || quote.expiry.toNumber() <= now)
       return;
@@ -1022,7 +1050,24 @@ class MakerBot {
     const drift = price > reference ? price - reference : reference - price;
     if (!quote.marketRevision.eq(market.revision) || reference <= 0n || drift * 10000n > reference * BigInt(Math.min(Math.floor(market.config.maxQuoteDeviationBps / 4), 25)))
       return;
-    const renewed = await handle.renew({ validForSeconds: duration });
+    let renewed;
+    try {
+      renewed = await handle.renew({ validForSeconds: duration });
+    } catch (error) {
+      const code = error.error?.errorCode?.code;
+      if (!["InvalidQuote", "WrongQuoteStatus"].includes(code ?? ""))
+        throw error;
+      const [latest, current] = await Promise.all([
+        this.maker.read("Market", this.maker.marketAddress),
+        this.maker.quoteState(handle.id)
+      ]);
+      const currentPrice = BigInt(latest.oraclePriceE8.toString());
+      const quotedPrice = BigInt(current.oracleReferenceE8.toString());
+      const moved = currentPrice > quotedPrice ? currentPrice - quotedPrice : quotedPrice - currentPrice;
+      if (!("active" in current.status) || current.expiry.toNumber() <= Math.floor(Date.now() / 1000) || !current.marketRevision.eq(latest.revision) || quoteHealth(latest, Math.floor(Date.now() / 1000)) || moved * 10000n > quotedPrice * BigInt(Math.min(Math.floor(latest.config.maxQuoteDeviationBps / 4), 25)))
+        return;
+      throw error;
+    }
     if (state.request)
       state.request.expiresAt = renewed.expiresAt;
     await this.store.save(state);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@depthhq/maker-sdk",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "publishConfig": {
     "access": "public"
   },