@decibeltrade/sdk 0.2.2 → 0.2.4

package/dist/utils.js

@@ -1,26 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractVaultAddressFromCreateTx = exports.PARAM_MAP = void 0;
-exports.getMarketAddr = getMarketAddr;
-exports.postRequest = postRequest;
-exports.patchRequest = patchRequest;
-exports.getRequest = getRequest;
-exports.prettifyMaybeZodError = prettifyMaybeZodError;
-exports.bigIntReviver = bigIntReviver;
-exports.getPrimarySubaccountAddr = getPrimarySubaccountAddr;
-exports.getTradingCompetitionSubaccountAddr = getTradingCompetitionSubaccountAddr;
-exports.getVaultShareAddress = getVaultShareAddress;
-exports.constructKnownQueryParams = constructKnownQueryParams;
-exports.generateRandomReplayProtectionNonce = generateRandomReplayProtectionNonce;
-exports.roundToTickSize = roundToTickSize;
-const ts_sdk_1 = require("@aptos-labs/ts-sdk");
-const v4_1 = require("zod/v4");
-const constants_1 = require("./constants");
-function getMarketAddr(name, perpEngineGlobalAddr) {
-    const marketNameBytes = new ts_sdk_1.MoveString(name).bcsToBytes();
-    return (0, ts_sdk_1.createObjectAddress)(ts_sdk_1.AccountAddress.fromString(perpEngineGlobalAddr), marketNameBytes);
+import { AccountAddress, createObjectAddress, MoveString, } from "@aptos-labs/ts-sdk";
+import { z, ZodError } from "zod/v4";
+import { CompatVersion, QUERY_PARAM_KEYS } from "./constants";
+export function getMarketAddr(name, perpEngineGlobalAddr) {
+    const marketNameBytes = new MoveString(name).bcsToBytes();
+    return createObjectAddress(AccountAddress.fromString(perpEngineGlobalAddr), marketNameBytes);
 }
-async function postRequest({ schema, url, body, options = {}, apiKey, }) {
+export async function postRequest({ schema, url, body, options = {}, apiKey, }) {
     return baseRequest({
         schema,
         url,
@@ -31,7 +16,7 @@ async function postRequest({ schema, url, body, options = {}, apiKey, }) {
         apiKey,
     });
 }
-async function patchRequest({ schema, url, body, options = {}, apiKey, }) {
+export async function patchRequest({ schema, url, body, options = {}, apiKey, }) {
     return baseRequest({
         schema,
         url,
@@ -42,7 +27,7 @@ async function patchRequest({ schema, url, body, options = {}, apiKey, }) {
         apiKey,
     });
 }
-async function getRequest({ schema, url, queryParams, options = {}, apiKey, }) {
+export async function getRequest({ schema, url, queryParams, options = {}, apiKey, }) {
     return baseRequest({
         schema,
         url,
@@ -87,13 +72,13 @@ async function baseRequest({ schema, url, method, options = {}, body, queryParam
         throw prettifyMaybeZodError(e);
     }
 }
-function prettifyMaybeZodError(e) {
-    if (e instanceof v4_1.ZodError) {
-        return new Error(v4_1.z.prettifyError(e), { cause: e });
+export function prettifyMaybeZodError(e) {
+    if (e instanceof ZodError) {
+        return new Error(z.prettifyError(e), { cause: e });
     }
     return e;
 }
-function bigIntReviver(key, value) {
+export function bigIntReviver(key, value) {
     if (value &&
         typeof value === "object" &&
         "$bigint" in value &&
@@ -102,45 +87,58 @@ function bigIntReviver(key, value) {
     }
     return value;
 }
-function getPrimarySubaccountAddr(addr, variant = "v2") {
-    const account = typeof addr === "string" ? ts_sdk_1.AccountAddress.fromString(addr) : addr;
-    const seed = new TextEncoder().encode(variant === "v1" ? "decibel_dex_primary" : "decibel_dex_primary_v2");
-    return (0, ts_sdk_1.createObjectAddress)(account, seed).toString();
+const baseSeed = "decibel_dex_primary";
+const getCompatVersionAsNumber = (compatVersion) => {
+    return Number(compatVersion.split(".")[1]);
+};
+const createSeed = (compatVersion) => {
+    return new TextEncoder().encode(compatVersion === CompatVersion.V0_0
+        ? baseSeed
+        : `${baseSeed}_v${getCompatVersionAsNumber(compatVersion)}`);
+};
+export function getPrimarySubaccountAddr(addr, config, options) {
+    const account = typeof addr === "string" ? AccountAddress.fromString(addr) : addr;
+    if (options?.overrideCompatVersion &&
+        getCompatVersionAsNumber(options.overrideCompatVersion) <=
+            getCompatVersionAsNumber(config.compatVersion)) {
+        return createObjectAddress(account, createSeed(options.overrideCompatVersion)).toString();
+    }
+    return createObjectAddress(account, createSeed(config.compatVersion)).toString();
 }
-function getTradingCompetitionSubaccountAddr(addr) {
-    const account = typeof addr === "string" ? ts_sdk_1.AccountAddress.fromString(addr) : addr;
+export function getTradingCompetitionSubaccountAddr(addr) {
+    const account = typeof addr === "string" ? AccountAddress.fromString(addr) : addr;
     const seed = new TextEncoder().encode("trading_competition");
-    return (0, ts_sdk_1.createObjectAddress)(account, seed).toString();
+    return createObjectAddress(account, seed).toString();
 }
-function getVaultShareAddress(vaultAddress) {
+export function getVaultShareAddress(vaultAddress) {
     const seed = new TextEncoder().encode("vault_share_asset");
-    return (0, ts_sdk_1.createObjectAddress)(ts_sdk_1.AccountAddress.fromString(vaultAddress), seed).toString();
+    return createObjectAddress(AccountAddress.fromString(vaultAddress), seed).toString();
 }
-exports.PARAM_MAP = {
-    limit: constants_1.QUERY_PARAM_KEYS.limit,
-    offset: constants_1.QUERY_PARAM_KEYS.offset,
-    sortKey: constants_1.QUERY_PARAM_KEYS.sortKey,
-    sortDir: constants_1.QUERY_PARAM_KEYS.sortDir,
-    searchTerm: constants_1.QUERY_PARAM_KEYS.searchTerm,
+export const PARAM_MAP = {
+    limit: QUERY_PARAM_KEYS.limit,
+    offset: QUERY_PARAM_KEYS.offset,
+    sortKey: QUERY_PARAM_KEYS.sortKey,
+    sortDir: QUERY_PARAM_KEYS.sortDir,
+    searchTerm: QUERY_PARAM_KEYS.searchTerm,
 };
 /**
  * Construct query params from an args object, supporting optional PageParams, SearchTermParams, and generic SortParams.
  * @param args - The argument object, which may include page, search, and sort params.
  * @returns URLSearchParams instance with the constructed query parameters.
  */
-function constructKnownQueryParams(args) {
+export function constructKnownQueryParams(args) {
     const queryParams = new URLSearchParams();
     Object.keys(args).forEach((_argKey) => {
         const argKey = _argKey;
         const value = args[argKey];
-        const paramKey = exports.PARAM_MAP[argKey];
+        const paramKey = PARAM_MAP[argKey];
         if (paramKey && value !== undefined && !(typeof value === "string" && value.trim() === "")) {
             queryParams.set(paramKey, String(value));
         }
     });
     return queryParams;
 }
-function generateRandomReplayProtectionNonce() {
+export function generateRandomReplayProtectionNonce() {
     const buf = new Uint32Array(2);
     crypto.getRandomValues(buf);
     const valueAtIndex0 = buf[0];
@@ -154,7 +152,7 @@ function generateRandomReplayProtectionNonce() {
  * Round price to valid tick size.
  * Prices must be multiples of tickSize in chain units.
  */
-function roundToTickSize(price, tickSize, pxDecimals, roundUp) {
+export function roundToTickSize(price, tickSize, pxDecimals, roundUp) {
     if (price === 0)
         return 0;
     const denormalized = price * 10 ** pxDecimals;
@@ -163,7 +161,7 @@ function roundToTickSize(price, tickSize, pxDecimals, roundUp) {
         : Math.floor(denormalized / tickSize) * tickSize;
     return Number((rounded / 10 ** pxDecimals).toFixed(pxDecimals));
 }
-const extractVaultAddressFromCreateTx = (createVaultTx) => {
+export const extractVaultAddressFromCreateTx = (createVaultTx) => {
     // Extract vault address from transaction events
     let vaultAddress = null;
     if ("events" in createVaultTx && Array.isArray(createVaultTx.events)) {
@@ -181,4 +179,3 @@ const extractVaultAddressFromCreateTx = (createVaultTx) => {
         typeof vaultAddress === "object" && "inner" in vaultAddress ? vaultAddress.inner : vaultAddress;
     return vaultAddress;
 };
-exports.extractVaultAddressFromCreateTx = extractVaultAddressFromCreateTx;

package/dist/write.d.ts

@@ -133,8 +133,8 @@ export declare class DecibelWriteDex extends BaseSDK {
          */
         accountOverride?: Account;
     }): Promise<CommittedTransactionResponse>;
-    delegateTradingTo({ subaccountAddr, accountToDelegateTo, }: {
-        subaccountAddr?: string;
+    delegateTradingToForSubaccount({ subaccountAddr, accountToDelegateTo, }: {
+        subaccountAddr: string;
         accountToDelegateTo: string;
     }): Promise<CommittedTransactionResponse>;
     revokeDelegation({ subaccountAddr, accountToRevoke, }: {

package/dist/write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"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"}

package/dist/write.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DecibelWriteDex = exports.TimeInForce = void 0;
-const base_1 = require("./base");
-const constants_1 = require("./constants");
-const order_status_1 = require("./order-status");
-const subaccount_types_1 = require("./subaccount-types");
-const utils_1 = require("./utils");
-exports.TimeInForce = {
+import { BaseSDK } from "./base";
+import { getVaultApiModule } from "./constants";
+import { OrderStatusClient } from "./order-status";
+import { RenameSubaccountSchema } from "./subaccount-types";
+import { getMarketAddr, getPrimarySubaccountAddr, postRequest } from "./utils";
+export const TimeInForce = {
     GoodTillCanceled: 0,
     PostOnly: 1,
     ImmediateOrCancel: 2,
@@ -22,13 +19,13 @@ function roundToTickSize(price, tickSize) {
         return 0;
     return Math.round(price / tickSize) * tickSize;
 }
-class DecibelWriteDex extends base_1.BaseSDK {
+export class DecibelWriteDex extends BaseSDK {
     cache;
     orderStatusClient;
     constructor(config, account, opts) {
         super(config, account, opts);
         this.cache = {};
-        this.orderStatusClient = new order_status_1.OrderStatusClient(config);
+        this.orderStatusClient = new OrderStatusClient(config);
     }
     /**
      * Extract order_id from OrderEvent in transaction response
@@ -64,8 +61,8 @@ class DecibelWriteDex extends base_1.BaseSDK {
         }
     }
     async renameSubaccount({ subaccountAddress, newName }) {
-        return await (0, utils_1.postRequest)({
-            schema: subaccount_types_1.RenameSubaccountSchema,
+        return await postRequest({
+            schema: RenameSubaccountSchema,
             url: `${this.config.tradingHttpUrl}/api/v1/subaccounts/${subaccountAddress}`,
             body: { name: newName },
         });
@@ -79,13 +76,13 @@ class DecibelWriteDex extends base_1.BaseSDK {
     }
     async sendSubaccountTx(sendTx, subaccountAddr) {
         if (!subaccountAddr) {
-            subaccountAddr = (0, utils_1.getPrimarySubaccountAddr)(this.account.accountAddress);
+            subaccountAddr = getPrimarySubaccountAddr(this.account.accountAddress, this.config);
         }
         return await sendTx(subaccountAddr);
     }
     async withSubaccount(fn, subaccountAddr) {
         if (!subaccountAddr) {
-            subaccountAddr = (0, utils_1.getPrimarySubaccountAddr)(this.account.accountAddress);
+            subaccountAddr = getPrimarySubaccountAddr(this.account.accountAddress, this.config);
         }
         return await fn(subaccountAddr);
     }
@@ -127,7 +124,7 @@ class DecibelWriteDex extends base_1.BaseSDK {
     }
     async placeOrder({ marketName, price, size, isBuy, timeInForce, isReduceOnly, clientOrderId, stopPrice, tpTriggerPrice, tpLimitPrice, slTriggerPrice, slLimitPrice, builderAddr, builderFee, subaccountAddr, accountOverride, tickSize, }) {
         try {
-            const marketAddr = (0, utils_1.getMarketAddr)(marketName, this.config.deployment.perpEngineGlobal);
+            const marketAddr = getMarketAddr(marketName, this.config.deployment.perpEngineGlobal);
             // Apply tick size rounding if tickSize is provided
             const roundedPrice = tickSize ? roundToTickSize(price, tickSize) : price;
             const roundedStopPrice = stopPrice !== undefined && tickSize ? roundToTickSize(stopPrice, tickSize) : stopPrice;
@@ -194,7 +191,7 @@ class DecibelWriteDex extends base_1.BaseSDK {
     async placeTwapOrder({ marketName, size, isBuy, isReduceOnly, 
     // clientOrderId,
     twapFrequencySeconds, twapDurationSeconds, builderAddress, builderFees, subaccountAddr, accountOverride, }) {
-        const marketAddr = (0, utils_1.getMarketAddr)(marketName, this.config.deployment.perpEngineGlobal);
+        const marketAddr = getMarketAddr(marketName, this.config.deployment.perpEngineGlobal);
         const txResponse = await this.sendSubaccountTx((subaccountAddr) => this.sendTx({
             // TODO: update to place_twap_order_to_subaccount_v2 once available
             function: `${this.config.deployment.package}::dex_accounts::place_twap_order_to_subaccount`,
@@ -229,7 +226,7 @@ class DecibelWriteDex extends base_1.BaseSDK {
     async cancelOrder({ orderId, subaccountAddr, accountOverride, ...args }) {
         // Either marketName or marketAddr must be provided
         const marketAddr = "marketName" in args
-            ? (0, utils_1.getMarketAddr)(args.marketName, this.config.deployment.perpEngineGlobal)
+            ? getMarketAddr(args.marketName, this.config.deployment.perpEngineGlobal)
             : args.marketAddr;
         return await this.sendSubaccountTx((subaccountAddr) => this.sendTx({
             function: `${this.config.deployment.package}::dex_accounts::cancel_order_to_subaccount`,
@@ -238,16 +235,16 @@ class DecibelWriteDex extends base_1.BaseSDK {
         }, accountOverride), subaccountAddr);
     }
     async cancelClientOrder({ clientOrderId, marketName, subaccountAddr, accountOverride, }) {
-        const marketAddr = (0, utils_1.getMarketAddr)(marketName, this.config.deployment.perpEngineGlobal);
+        const marketAddr = getMarketAddr(marketName, this.config.deployment.perpEngineGlobal);
         return await this.sendSubaccountTx((subaccountAddr) => this.sendTx({
             function: `${this.config.deployment.package}::dex_accounts::cancel_client_order_to_subaccount`,
             typeArguments: [],
             functionArguments: [subaccountAddr, clientOrderId, marketAddr.toString()],
         }, accountOverride), subaccountAddr);
     }
-    async delegateTradingTo({ subaccountAddr, accountToDelegateTo, }) {
+    async delegateTradingToForSubaccount({ subaccountAddr, accountToDelegateTo, }) {
         return await this.sendSubaccountTx((subaccountAddr) => this.sendTx({
-            function: `${this.config.deployment.package}::dex_accounts::delegate_trading_to`,
+            function: `${this.config.deployment.package}::dex_accounts::delegate_trading_to_for_subaccount`,
             typeArguments: [],
             functionArguments: [subaccountAddr, accountToDelegateTo],
         }), subaccountAddr);
@@ -357,7 +354,7 @@ class DecibelWriteDex extends base_1.BaseSDK {
      * Create a new vault with optional initial funding
      */
     async buildCreateVaultTx({ contributionAssetType, vaultName, vaultShareSymbol, vaultShareIconUri = "", vaultShareProjectUri = "", feeBps, feeIntervalS, contributionLockupDurationS, initialFunding = 0, acceptsContributions = false, delegateToCreator = false, signerAddress, vaultDescription, vaultSocialLinks, }) {
-        const vaultApiModule = (0, constants_1.getVaultApiModule)(this.config.compatVersion);
+        const vaultApiModule = getVaultApiModule(this.config.compatVersion);
         const transaction = await this.buildTx({
             function: `${this.config.deployment.package}::${vaultApiModule}::create_and_fund_vault`,
             typeArguments: [],
@@ -381,7 +378,7 @@ class DecibelWriteDex extends base_1.BaseSDK {
         return transaction;
     }
     async createVault(args) {
-        const vaultApiModule = (0, constants_1.getVaultApiModule)(this.config.compatVersion);
+        const vaultApiModule = getVaultApiModule(this.config.compatVersion);
         const txResponse = await this.sendSubaccountTx(() => this.sendTx({
             function: `${this.config.deployment.package}::${vaultApiModule}::create_and_fund_vault`,
             typeArguments: [],
@@ -408,7 +405,7 @@ class DecibelWriteDex extends base_1.BaseSDK {
      * Activate a vault to accept contributions
      */
     async buildActivateVaultTx({ vaultAddress, additionalFunding = 0, signerAddress, }) {
-        const vaultApiModule = (0, constants_1.getVaultApiModule)(this.config.compatVersion);
+        const vaultApiModule = getVaultApiModule(this.config.compatVersion);
         return await this.buildTx({
             function: `${this.config.deployment.package}::${vaultApiModule}::activate_vault`,
             typeArguments: [],
@@ -419,7 +416,7 @@ class DecibelWriteDex extends base_1.BaseSDK {
      * Contribute funds to a vault in exchange for shares
      */
     async buildDepositToVaultTx({ vaultAddress, amount, signerAddress, }) {
-        const vaultApiModule = (0, constants_1.getVaultApiModule)(this.config.compatVersion);
+        const vaultApiModule = getVaultApiModule(this.config.compatVersion);
         return await this.buildTx({
             function: `${this.config.deployment.package}::${vaultApiModule}::contribute`,
             typeArguments: [],
@@ -493,4 +490,3 @@ class DecibelWriteDex extends base_1.BaseSDK {
         }), subaccountAddr);
     }
 }
-exports.DecibelWriteDex = DecibelWriteDex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decibeltrade/sdk",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {

package/src/read/ws-subscription.ts

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

package/src/write.ts

@@ -439,17 +439,17 @@ export class DecibelWriteDex extends BaseSDK {
     );
   }
 
-  async delegateTradingTo({
+  async delegateTradingToForSubaccount({
     subaccountAddr,
     accountToDelegateTo,
   }: {
-    subaccountAddr?: string;
+    subaccountAddr: string;
     accountToDelegateTo: string;
   }) {
     return await this.sendSubaccountTx(
       (subaccountAddr) =>
         this.sendTx({
-          function: `${this.config.deployment.package}::dex_accounts::delegate_trading_to`,
+          function: `${this.config.deployment.package}::dex_accounts::delegate_trading_to_for_subaccount`,
           typeArguments: [],
           functionArguments: [subaccountAddr, accountToDelegateTo],
         }),