@decibeltrade/sdk 0.2.0 → 0.2.2

package/src/admin.ts

@@ -39,6 +39,7 @@ export class DecibelAdminDex extends BaseSDK {
       function: `${this.config.deployment.package}::${vaultApiModule}::create_and_fund_vault`,
       typeArguments: [],
       functionArguments: [
+        null,
         collateralTokenAddr,
         "Decibel Protocol Vault",
         "(description)",

package/src/base.ts

@@ -19,7 +19,7 @@ import { DecibelConfig, NETNA_CONFIG, TESTNET_CONFIG } from "./constants";
 import { submitFeePaidTransaction } from "./fee-pay";
 import { GasPriceManager } from "./gas/gas-price-manager";
 import { buildSimpleTransactionSync } from "./transaction-builder";
-import { generateRandomReplayProtectionNonce } from "./utils";
+import { generateRandomReplayProtectionNonce, getPrimarySubaccountAddr } from "./utils";
 
 export interface Options {
   skipSimulate?: boolean;
@@ -215,4 +215,8 @@ export class BaseSDK {
       });
     }
   }
+
+  public getPrimarySubaccountAddress(addr: AccountAddress | string) {
+    return getPrimarySubaccountAddr(addr, this.config);
+  }
 }

package/src/constants.ts

@@ -24,11 +24,14 @@ export function getPerpEngineGlobalAddress(publisherAddr: string) {
 }
 
 export enum CompatVersion {
+  V0_0 = "v0.0", // decibel-testnet-release-v0.0
   V0_1 = "v0.1", // decibel-testnet-release-v0.1
-  V0_2 = "v0.2", // Current main branch (bumped when new branch is created)
+  V0_2 = "v0.2", // decibel-testnet-release-v0.2
+  V0_3 = "v0.3", // Current main branch (bumped when new branch is created)
 }
 
-export const DEFAULT_COMPAT_VERSION = CompatVersion.V0_2;
+export const TESTNET_COMPAT_VERSION = CompatVersion.V0_2;
+export const DEFAULT_COMPAT_VERSION = CompatVersion.V0_3;
 
 export interface DecibelConfig {
   network: Network;
@@ -70,11 +73,11 @@ export const NETNA_CONFIG: DecibelConfig = {
   tradingWsUrl: "wss://api.netna.aptoslabs.com/decibel/ws",
   gasStationUrl: "https://fee-payer-dev-netna-us-central1-410192433417.us-central1.run.app",
   deployment: NETNA_DEPLOYMENT,
-  chainId: 206,
+  chainId: 207,
   compatVersion: DEFAULT_COMPAT_VERSION,
 };
 
-const TESTNET_PACKAGE = "0x1f513904b7568445e3c291a6c58cb272db017d8a72aea563d5664666221d5f75";
+const TESTNET_PACKAGE = "0x9f830083a19fb8b87395983ca9edaea2b0379c97be6dfe234bb914e6c6672844";
 export const TESTNET_DEPLOYMENT: Deployment = {
   package: TESTNET_PACKAGE,
   usdc: getUsdcAddress(TESTNET_PACKAGE).toString(),
@@ -90,7 +93,7 @@ export const TESTNET_CONFIG: DecibelConfig = {
   gasStationUrl: "https://fee-payer-staging-testnet-us-central1-502735673999.us-central1.run.app",
   deployment: TESTNET_DEPLOYMENT,
   chainId: 2,
-  compatVersion: CompatVersion.V0_1,
+  compatVersion: TESTNET_COMPAT_VERSION,
 };
 
 export const LOCAL_CONFIG: DecibelConfig = {

package/src/read/user-positions/user-positions.types.ts

@@ -14,7 +14,6 @@ export const UserPositionSchema = z.object({
   user: z.string(),
   size: z.number(),
   // margin: z.number(),
-  max_allowed_leverage: z.number(),
   user_leverage: z.number(),
   entry_price: z.number(),
   is_isolated: z.boolean(),

package/src/read/vaults/vaults.reader.ts

@@ -19,6 +19,8 @@ export class VaultsReader extends BaseReader {
     if (args.vaultType) queryParams.set("vault_type", args.vaultType);
     if (args.limit) queryParams.set("limit", args.limit.toString());
     if (args.offset) queryParams.set("offset", args.offset.toString());
+    if (args.address) queryParams.set("vault_address", args.address);
+    if (args.search) queryParams.set("search", args.search);
 
     const response = await this.getRequest({
       schema: VaultsResponseSchema,

package/src/read/vaults/vaults.types.ts

@@ -12,11 +12,14 @@ export interface UserOwnedVaultsRequestArgs extends BaseRequestArgs {
   offset?: number;
 }
 
+export const vaultTypeValues = ["user", "protocol"] as const;
+export type VaultType = (typeof vaultTypeValues)[number];
 export interface PublicVaultsRequestArgs extends BaseRequestArgs {
   limit?: number;
   offset?: number;
-  vaultType?: "user" | "protocol";
+  vaultType?: VaultType;
   address?: string;
+  search?: string;
 }
 
 /**
@@ -50,7 +53,7 @@ export const VaultSchema = z.object({
   average_leverage: z.number().nullable(),
   depositors: z.number().nullable(),
   perp_equity: z.number().nullable(),
-  vault_type: z.string(),
+  vault_type: z.enum(vaultTypeValues),
   pnl_history: z.array(z.string()).nullable(),
   social_links: z.array(z.string()).nullable(),
 });

package/src/read/ws-subscription.ts

@@ -52,9 +52,9 @@ export class DecibelWsSubscription {
 
     ws.addEventListener("open", () => {
       this.#reconnectAttempts = 0;
-      for (const topic of this.#subscriptions.keys()) {
+      this.#subscriptions.keys().forEach((topic) => {
         ws.send(this.#getSubscribeMessage(topic));
-      }
+      });
     });
 
     ws.addEventListener("message", (event) => {

package/src/utils.ts

@@ -6,7 +6,7 @@ import {
 } from "@aptos-labs/ts-sdk";
 import { z, ZodError } from "zod/v4";
 
-import { QUERY_PARAM_KEYS } from "./constants";
+import { CompatVersion, DecibelConfig, QUERY_PARAM_KEYS } from "./constants";
 import { PageParams, SearchTermParams, SortParams } from "./read";
 
 export function getMarketAddr(name: string, perpEngineGlobalAddr: string) {
@@ -174,9 +174,37 @@ export function bigIntReviver(key: string, value: unknown) {
   return value;
 }
 
-export function getPrimarySubaccountAddr(addr: AccountAddress | string) {
+const baseSeed = "decibel_dex_primary";
+const getCompatVersionAsNumber = (compatVersion: CompatVersion) => {
+  return Number(compatVersion.split(".")[1]);
+};
+const createSeed = (compatVersion: CompatVersion) => {
+  return new TextEncoder().encode(
+    compatVersion === CompatVersion.V0_0
+      ? baseSeed
+      : `${baseSeed}_v${getCompatVersionAsNumber(compatVersion)}`,
+  );
+};
+
+export function getPrimarySubaccountAddr(
+  addr: AccountAddress | string,
+  config: DecibelConfig,
+  options?: { overrideCompatVersion?: CompatVersion },
+) {
   const account = typeof addr === "string" ? AccountAddress.fromString(addr) : addr;
-  const seed = new TextEncoder().encode("decibel_dex_primary");
+  if (
+    options?.overrideCompatVersion &&
+    getCompatVersionAsNumber(options.overrideCompatVersion) <=
+      getCompatVersionAsNumber(config.compatVersion)
+  ) {
+    return createObjectAddress(account, createSeed(options.overrideCompatVersion)).toString();
+  }
+  return createObjectAddress(account, createSeed(config.compatVersion)).toString();
+}
+
+export function getTradingCompetitionSubaccountAddr(addr: AccountAddress | string) {
+  const account = typeof addr === "string" ? AccountAddress.fromString(addr) : addr;
+  const seed = new TextEncoder().encode("trading_competition");
   return createObjectAddress(account, seed).toString();
 }
 
@@ -233,6 +261,24 @@ export function generateRandomReplayProtectionNonce() {
   return (BigInt(valueAtIndex0) << BigInt(32)) | BigInt(valueAtIndex1);
 }
 
+/**
+ * Round price to valid tick size.
+ * Prices must be multiples of tickSize in chain units.
+ */
+export function roundToTickSize(
+  price: number,
+  tickSize: number,
+  pxDecimals: number,
+  roundUp: boolean,
+): number {
+  if (price === 0) return 0;
+  const denormalized = price * 10 ** pxDecimals;
+  const rounded = roundUp
+    ? Math.ceil(denormalized / tickSize) * tickSize
+    : Math.floor(denormalized / tickSize) * tickSize;
+  return Number((rounded / 10 ** pxDecimals).toFixed(pxDecimals));
+}
+
 export const extractVaultAddressFromCreateTx = (createVaultTx: CommittedTransactionResponse) => {
   // Extract vault address from transaction events
   let vaultAddress: string | { inner: string } | null = null;

package/src/write.ts

@@ -106,14 +106,14 @@ export class DecibelWriteDex extends BaseSDK {
     subaccountAddr?: string,
   ) {
     if (!subaccountAddr) {
-      subaccountAddr = getPrimarySubaccountAddr(this.account.accountAddress);
+      subaccountAddr = getPrimarySubaccountAddr(this.account.accountAddress, this.config);
     }
     return await sendTx(subaccountAddr);
   }
 
   async withSubaccount<T>(fn: (subaccountAddr: string) => Promise<T>, subaccountAddr?: string) {
     if (!subaccountAddr) {
-      subaccountAddr = getPrimarySubaccountAddr(this.account.accountAddress);
+      subaccountAddr = getPrimarySubaccountAddr(this.account.accountAddress, this.config);
     }
     return await fn(subaccountAddr);
   }
@@ -729,6 +729,7 @@ export class DecibelWriteDex extends BaseSDK {
         function: `${this.config.deployment.package}::${vaultApiModule}::create_and_fund_vault`,
         typeArguments: [],
         functionArguments: [
+          null,
           contributionAssetType,
           vaultName,
           vaultDescription,
@@ -768,6 +769,7 @@ export class DecibelWriteDex extends BaseSDK {
             function: `${this.config.deployment.package}::${vaultApiModule}::create_and_fund_vault`,
             typeArguments: [],
             functionArguments: [
+              null,
               args.contributionAssetType,
               args.vaultName,
               args.vaultDescription,