@depthhq/sdk 0.1.11 → 0.1.13

package/dist/catalog/data.js

@@ -9,7 +9,7 @@ var environments = {
   },
   devnet: {
     rpc: "https://api.devnet.solana.com",
-    service: "https://depth.supply",
+    service: "https://api.trydepth.xyz",
     genesis: "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG"
   },
   "mainnet-beta": {

package/dist/chain/network.d.ts

@@ -6,7 +6,7 @@ export declare const environments: {
     };
     readonly devnet: {
         readonly rpc: "https://api.devnet.solana.com";
-        readonly service: "https://depth.supply";
+        readonly service: "https://api.trydepth.xyz";
         readonly genesis: "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG";
     };
     readonly "mainnet-beta": {

package/dist/index.js

@@ -44575,7 +44575,7 @@ var environments = {
   },
   devnet: {
     rpc: "https://api.devnet.solana.com",
-    service: "https://depth.supply",
+    service: "https://api.trydepth.xyz",
     genesis: "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG"
   },
   "mainnet-beta": {
@@ -44617,6 +44617,10 @@ class DepthError extends Error {
     this.name = "DepthError";
   }
 }
+function admissionChanged(cause) {
+  const error = cause instanceof AnchorError ? cause : cause instanceof SendTransactionError && cause.logs ? AnchorError.parse(cause.logs) : undefined;
+  return ["WrongQuoteSnapshot", "WrongOrderStatus"].includes(error?.error.errorCode.code ?? "");
+}
 function submissionError(operationId, cause) {
   if (cause instanceof DepthError)
     throw cause;
@@ -47881,62 +47885,88 @@ class DepthClient {
     const cipher = new RescueCipher(x25519.getSharedSecret(secret, mxePublicKey));
     const offset2 = nonce();
     const queue = await this.queue("match_order", offset2);
-    let keys = [];
-    const quoteDeadline = Date.now() + 60000;
-    for (;; ) {
+    let worstPriceE8;
+    let signedDeadline;
+    for (let attempt = 0;attempt < 3; attempt++) {
+      let keys = [];
+      const quoteDeadline = Date.now() + 60000;
+      for (;; ) {
+        try {
+          const snapshot = await quoteSnapshot(this.options.connection, this.program, this.marketAddress, market.state);
+          market = { ...market, state: snapshot.market };
+          deadline = signedDeadline ?? tradeDeadline(input, Math.floor(Date.now() / 1000), market.state.config.maxOrderQueueSeconds);
+          this.validateTrade(market.state, protocol, account, app, appId, intent, deadline);
+          if (!account.version.eq(new anchor9.BN(position.version.toString())))
+            throw new Error("Private position changed while preparing the trade");
+          keys = snapshot.keys;
+          break;
+        } catch (error) {
+          if (!(error instanceof Error) || ![
+            "Waiting for maker liquidity",
+            "Market is processing another order",
+            "Market account is processing another operation",
+            "Waiting for a fresh oracle update",
+            "Oracle update is stale"
+          ].includes(error.message) || Date.now() >= quoteDeadline)
+            throw error;
+          [market, protocol, account, app] = await this.waitForMarket(input, appId, intent);
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+        }
+      }
+      signedDeadline = deadline;
+      worstPriceE8 ??= tradeLimit(input, direction, BigInt(market.state.oraclePriceE8.toString()));
+      const ciphertexts = cipher.encrypt(circuits2.OrderInput.pack({
+        side: encodeSide(direction),
+        amount,
+        margin: position.collateral,
+        limit_price: worstPriceE8,
+        max_fee: input.maxFee,
+        intent: BigInt(["increase", "reduce", "close", "reverse"].indexOf(intent)),
+        version: position.version
+      }), inputNonce);
+      let signature;
       try {
-        const snapshot = await quoteSnapshot(this.options.connection, this.program, this.marketAddress, market.state);
-        market = { ...market, state: snapshot.market };
-        deadline = tradeDeadline(input, Math.floor(Date.now() / 1000), market.state.config.maxOrderQueueSeconds);
-        this.validateTrade(market.state, protocol, account, app, appId, intent, deadline);
-        if (!account.version.eq(new anchor9.BN(position.version.toString())))
-          throw new Error("Private position changed while preparing the trade");
-        keys = snapshot.keys;
-        break;
+        signature = await this.program.methods.submitOrder(offset2, orderNonce, appId, app.feeBps, app.version, new anchor9.BN(deadline), market.state.revision, market.state.oracleTimestamp, ciphertexts, Array.from(inputKey), new anchor9.BN(inputNonce, "le")).accountsPartial({
+          ...queue,
+          trader: this.options.wallet.publicKey,
+          protocol: this.protocolAddress,
+          appConfig: appAddress2(appId),
+          market: this.marketAddress,
+          marketAccount: this.accountAddress(),
+          order
+        }).remainingAccounts([
+          ...keys.map((pubkey) => ({
+            pubkey,
+            isSigner: false,
+            isWritable: false
+          })),
+          {
+            pubkey: recoveryConfigAddress2(),
+            isSigner: false,
+            isWritable: false
+          },
+          {
+            pubkey: pda([Buffer2.from("fee-recovery"), order.toBuffer()]),
+            isSigner: false,
+            isWritable: true
+          }
+        ]).rpc({ commitment: "confirmed" });
       } catch (error) {
-        if (!(error instanceof Error) || ![
-          "Waiting for maker liquidity",
-          "Market is processing another order",
-          "Waiting for a fresh oracle update",
-          "Oracle update is stale"
-        ].includes(error.message) || Date.now() >= quoteDeadline)
-          throw error;
-        [market, protocol, account, app] = await this.waitForMarket(input, appId, intent);
-        await new Promise((resolve) => setTimeout(resolve, 1000));
+        if (attempt === 2 || !admissionChanged(error))
+          submissionError(order.toBase58(), error);
+        if (await this.options.connection.getAccountInfo(order, "confirmed")) {
+          const operation = this.trade.operation(clientNonce);
+          const snapshot = await operation.status();
+          if (snapshot.owner !== this.options.wallet.publicKey.toBase58())
+            throw new Error("Order owner does not match");
+          return operation;
+        }
+        [market, protocol, account, app] = await this.waitForMarket({ ...input, validForSeconds: undefined, expiresAt: signedDeadline }, appId, intent);
+        continue;
       }
+      return new DepthOperation(order, signature, this.program, this.options.connection, (id) => this.requestFillView(id), position);
     }
-    const worstPriceE8 = tradeLimit(input, direction, BigInt(market.state.oraclePriceE8.toString()));
-    const ciphertexts = cipher.encrypt(circuits2.OrderInput.pack({
-      side: encodeSide(direction),
-      amount,
-      margin: position.collateral,
-      limit_price: worstPriceE8,
-      max_fee: input.maxFee,
-      intent: BigInt(["increase", "reduce", "close", "reverse"].indexOf(intent)),
-      version: position.version
-    }), inputNonce);
-    const signature = await this.program.methods.submitOrder(offset2, orderNonce, appId, app.feeBps, app.version, new anchor9.BN(deadline), market.state.revision, market.state.oracleTimestamp, ciphertexts, Array.from(inputKey), new anchor9.BN(inputNonce, "le")).accountsPartial({
-      ...queue,
-      trader: this.options.wallet.publicKey,
-      protocol: this.protocolAddress,
-      appConfig: appAddress2(appId),
-      market: this.marketAddress,
-      marketAccount: this.accountAddress(),
-      order
-    }).remainingAccounts([
-      ...keys.map((pubkey) => ({
-        pubkey,
-        isSigner: false,
-        isWritable: false
-      })),
-      { pubkey: recoveryConfigAddress2(), isSigner: false, isWritable: false },
-      {
-        pubkey: pda([Buffer2.from("fee-recovery"), order.toBuffer()]),
-        isSigner: false,
-        isWritable: true
-      }
-    ]).rpc({ commitment: "confirmed" }).catch((error) => submissionError(order.toBase58(), error));
-    return new DepthOperation(order, signature, this.program, this.options.connection, (id) => this.requestFillView(id), position);
+    throw new Error("Quote snapshot did not stabilize before submission");
   }
   async waitForMarket(input, appId, intent) {
     const until = Date.now() + 60000;
@@ -47955,6 +47985,7 @@ class DepthClient {
         if (!(error instanceof Error) || ![
           "Waiting for maker liquidity",
           "Market is processing another order",
+          "Market account is processing another operation",
           "Waiting for a fresh oracle update",
           "Oracle update is stale"
         ].includes(error.message) || Date.now() >= until)
@@ -47972,9 +48003,11 @@ class DepthClient {
     if (!app.active || !app.app.equals(appId)) {
       throw new Error("App registration is inactive");
     }
-    if (enumName2(account.status) !== "ready" || !account.market.equals(this.marketAddress) || !account.owner.equals(this.options.wallet.publicKey)) {
+    if (!account.market.equals(this.marketAddress) || !account.owner.equals(this.options.wallet.publicKey)) {
       throw new Error("Market account is unavailable");
     }
+    if (enumName2(account.status) !== "ready")
+      throw new Error("Market account is processing another operation");
     if (market.pendingOrders !== 0)
       throw new Error("Market is processing another order");
     if (market.activeQuoteCount === 0)

package/dist/operation/error.d.ts

@@ -7,4 +7,5 @@ export declare class DepthError extends Error {
     readonly operationId?: string | undefined;
     constructor(code: string, stage: ErrorStage, message: string, retryable: boolean, nextAction: string, operationId?: string | undefined, options?: ErrorOptions);
 }
+export declare function admissionChanged(cause: unknown): boolean;
 export declare function submissionError(operationId: string, cause: unknown): never;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@depthhq/sdk",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "publishConfig": {
     "access": "public"
   },