@decibeltrade/sdk 0.3.0 → 0.4.0

package/dist/write.js

@@ -103,7 +103,7 @@ export class DecibelWriteDex extends BaseSDK {
      */
     async withdraw(amount, subaccountAddr) {
         return await this.sendSubaccountTx((subaccountAddr) => this.sendTx({
-            function: `${this.config.deployment.package}::dex_accounts_entry::withdraw_from_subaccount`,
+            function: `${this.config.deployment.package}::dex_accounts_entry::withdraw_from_cross_collateral`,
             typeArguments: [],
             functionArguments: [subaccountAddr, this.config.deployment.usdc, amount],
         }), subaccountAddr);
@@ -172,7 +172,7 @@ export class DecibelWriteDex extends BaseSDK {
     }
     async triggerMatching({ marketAddr, maxWorkUnit }) {
         const txResponse = await this.sendTx({
-            function: `${this.config.deployment.package}::public_apis::trigger_matching`,
+            function: `${this.config.deployment.package}::public_apis::process_perp_market_pending_requests`,
             typeArguments: [],
             functionArguments: [marketAddr, maxWorkUnit],
         });
@@ -233,6 +233,16 @@ export class DecibelWriteDex extends BaseSDK {
             functionArguments: [subaccountAddr, clientOrderId, marketAddr.toString()],
         }, accountOverride), subaccountAddr);
     }
+    async cancelBulkOrder({ subaccountAddr, accountOverride, ...args }) {
+        const marketAddr = "marketName" in args
+            ? getMarketAddr(args.marketName, this.config.deployment.perpEngineGlobal)
+            : args.marketAddr;
+        return await this.sendSubaccountTx((subaccountAddr) => this.sendTx({
+            function: `${this.config.deployment.package}::dex_accounts_entry::cancel_bulk_order_to_subaccount`,
+            typeArguments: [],
+            functionArguments: [subaccountAddr, marketAddr.toString()],
+        }, accountOverride), subaccountAddr);
+    }
     async delegateTradingToForSubaccount({ subaccountAddr, accountToDelegateTo, expirationTimestampSecs, }) {
         return await this.sendSubaccountTx((subaccountAddr) => this.sendTx({
             function: `${this.config.deployment.package}::dex_accounts_entry::delegate_trading_to_for_subaccount`,
@@ -345,11 +355,12 @@ export class DecibelWriteDex extends 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 signerPrimarySubaccount = this.getPrimarySubaccountAddress(signerAddress);
         const transaction = await this.buildTx({
             function: `${this.config.deployment.package}::vault_api::create_and_fund_vault`,
             typeArguments: [],
             functionArguments: [
-                null,
+                signerPrimarySubaccount,
                 contributionAssetType,
                 vaultName,
                 vaultDescription,
@@ -372,7 +383,8 @@ export class DecibelWriteDex extends BaseSDK {
             function: `${this.config.deployment.package}::vault_api::create_and_fund_vault`,
             typeArguments: [],
             functionArguments: [
-                args.subaccountAddr ?? null,
+                args.subaccountAddr ??
+                    this.getPrimarySubaccountAddress((args.accountOverride ?? this.account).accountAddress),
                 args.contributionAssetType,
                 args.vaultName,
                 args.vaultDescription,
@@ -405,9 +417,14 @@ export class DecibelWriteDex extends BaseSDK {
      */
     async buildDepositToVaultTx({ vaultAddress, amount, signerAddress, }) {
         return await this.buildTx({
-            function: `${this.config.deployment.package}::vault_api::contribute`,
+            function: `${this.config.deployment.package}::dex_accounts_entry::contribute_to_vault`,
             typeArguments: [],
-            functionArguments: [vaultAddress, amount],
+            functionArguments: [
+                this.getPrimarySubaccountAddress(signerAddress), // todo - select correct subaccount
+                vaultAddress,
+                this.config.deployment.usdc,
+                amount,
+            ],
         }, signerAddress);
     }
     async depositToVault(args) {
@@ -446,7 +463,7 @@ export class DecibelWriteDex extends BaseSDK {
      */
     async buildDelegateDexActionsToTx({ vaultAddress, accountToDelegateTo, signerAddress, expirationTimestampSecs, }) {
         return await this.buildTx({
-            function: `${this.config.deployment.package}::vault::delegate_dex_actions_to`,
+            function: `${this.config.deployment.package}::vault_admin_api::delegate_dex_actions_to`,
             typeArguments: [],
             functionArguments: [vaultAddress, accountToDelegateTo, expirationTimestampSecs],
         }, signerAddress);

package/package.json

@@ -50,5 +50,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "0.3.0"
+  "version": "0.4.0"
 }

package/readme.md

@@ -143,7 +143,8 @@ const customConfig: DecibelConfig = {
   fullnodeUrl: "https://api.testnet.aptoslabs.com/v1",
   tradingHttpUrl: "https://api.testnet.aptoslabs.com/decibel",
   tradingWsUrl: "wss://api.testnet.aptoslabs.com/decibel/ws",
-  gasStationUrl: "https://your-fee-payer.com",
+  gasStationUrl: "https://api.testnet.aptoslabs.com/gs/v1", // optional: enables gas sponsorship
+  gasStationApiKey: "your-gas-station-api-key", // optional: enables gas sponsorship
   deployment: {
     package: "0x...",
     usdc: "0x...",
@@ -904,20 +905,17 @@ class DecibelTransactionManager {
   private aptos: Aptos;
   private config: DecibelConfig;
   private skipSimulate: boolean;
-  private noFeePayer: boolean;
 
   constructor(
     config: DecibelConfig,
     private account: Account,
     options?: {
       skipSimulate?: boolean;
-      noFeePayer?: boolean;
       nodeApiKey?: string;
     },
   ) {
     this.config = config;
     this.skipSimulate = options?.skipSimulate ?? false;
-    this.noFeePayer = options?.noFeePayer ?? false;
 
     const aptosConfig = new AptosConfig({
       network: config.network,
@@ -958,45 +956,6 @@ class DecibelTransactionManager {
     });
   }
 
-  private async submitTransaction(
-    transaction: SimpleTransaction,
-    senderAuthenticator: AccountAuthenticator,
-  ): Promise<PendingTransactionResponse> {
-    if (this.noFeePayer) {
-      return await this.aptos.transaction.submit.simple({
-        transaction,
-        senderAuthenticator,
-      });
-    } else {
-      return await this.submitFeePaidTransaction(transaction, senderAuthenticator);
-    }
-  }
-
-  private async submitFeePaidTransaction(
-    transaction: SimpleTransaction,
-    senderAuthenticator: AccountAuthenticator,
-  ): Promise<PendingTransactionResponse> {
-    const signatureBcs = Array.from(senderAuthenticator.bcsToBytes());
-    const transactionBcs = Array.from(transaction.rawTransaction.bcsToBytes());
-
-    const response = await fetch(this.config.gasStationUrl + "/transactions", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        signature: signatureBcs,
-        transaction: transactionBcs,
-      }),
-    });
-
-    if (!response.ok) {
-      throw new Error(`Fee payer service error: ${response.status}`);
-    }
-
-    return (await response.json()) as PendingTransactionResponse;
-  }
-
   async sendTransaction(
     payload: InputGenerateTransactionPayloadData,
     accountOverride?: Account,
@@ -1009,11 +968,9 @@ class DecibelTransactionManager {
     if (!this.skipSimulate) {
       transaction = await this.getSimulatedTransaction(payload, sender);
     } else {
-      const withFeePayer = !this.noFeePayer;
       transaction = await this.aptos.transaction.build.simple({
         sender,
         data: payload,
-        withFeePayer,
       });
     }
 
@@ -1022,7 +979,10 @@ class DecibelTransactionManager {
       transaction,
     });
 
-    const pendingTransaction = await this.submitTransaction(transaction, senderAuthenticator);
+    const pendingTransaction = await this.aptos.transaction.submit.simple({
+      transaction,
+      senderAuthenticator,
+    });
     return await this.aptos.waitForTransaction({
       transactionHash: pendingTransaction.hash,
     });
@@ -1123,7 +1083,7 @@ async function withdrawCollateral(
     subaccountAddr ?? getPrimarySubaccountAddress(transactionManager.account.accountAddress);
 
   return await transactionManager.sendTransaction({
-    function: `${config.deployment.package}::dex_accounts::withdraw_from_subaccount`,
+    function: `${config.deployment.package}::dex_accounts::withdraw_from_cross_collateral`,
     typeArguments: [],
     functionArguments: [subaccount, config.deployment.usdc, amount],
   });
@@ -1408,7 +1368,6 @@ async function basicTradingExample() {
   const account = Account.fromPrivateKey({ privateKey });
   const transactionManager = new DecibelTransactionManager(NETNA_CONFIG, account, {
     skipSimulate: false,
-    noFeePayer: false,
   });
 
   try {