Deposit/withdraw fee setting (#26)

* deposit/withdraw with fees * patch version * remove zerofee
dydxprotocol · Sep 8, 2023 · 7dd1f9a · 7dd1f9a
1 parent cfdc9f2
commit 7dd1f9a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 24 deletions.
diff --git a/v4-client-js/__native__/__ios__/v4-native-client.js b/v4-client-js/__native__/__ios__/v4-native-client.js
diff --git a/v4-client-js/__tests__/modules/client/Transfers.test.ts b/v4-client-js/__tests__/modules/client/Transfers.test.ts
@@ -15,25 +15,25 @@ describe('Validator Client', () => {
   let subaccount: Subaccount;
   let client: ValidatorClient;
 
-  describe('Transfers', async () => {
+  describe('Transfers', () => {
     beforeEach(async () => {
       wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
       subaccount = new Subaccount(wallet, 0);
       client = await ValidatorClient.connect(Network.staging().validatorConfig);
+      await sleep(5000);  // wait for withdraw to complete
     });
 
     it('Withdraw', async () => {
       const tx = await client.post.withdraw(
         subaccount,
         0,
         new Long(1_00_000_000),
+        undefined,
       );
       console.log('**Withdraw Tx**');
       console.log(tx);
     });
 
-    await sleep(5000);  // wait for withdraw to complete
-
     it('Deposit', async () => {
       const tx = await client.post.deposit(
         subaccount,
@@ -42,10 +42,7 @@ describe('Validator Client', () => {
       );
       console.log('**Deposit Tx**');
       console.log(tx);
-    },
-    );
-
-    await sleep(5000);  // wait for withdraw to complete
+    });
 
     it('Transfer', async () => {
       const tx = await client.post.transfer(
@@ -57,7 +54,6 @@ describe('Validator Client', () => {
       );
       console.log('**Transfer Tx**');
       console.log(tx);
-    },
-    );
+    });
   });
 });
diff --git a/v4-client-js/examples/transfer_example_withdraw_other.ts b/v4-client-js/examples/transfer_example_withdraw_other.ts
@@ -57,7 +57,6 @@ async function test(): Promise<void> {
     0,
     amountAfterFee,
     TEST_RECIPIENT_ADDRESS,
-    false,
     Method.BroadcastTxCommit,
   );
   console.log('**Withdraw and Send**');

diff --git a/v4-client-js/src/clients/composite-client.ts b/v4-client-js/src/clients/composite-client.ts
@@ -459,7 +459,7 @@ export class CompositeClient {
     });
     return this.validatorClient.post.send(subaccount.wallet,
       () => msgs,
-      true);
+      false);
   }
 
   /**
@@ -512,7 +512,7 @@ export class CompositeClient {
     return this.send(
       subaccount.wallet,
       () => msgs,
-      true);
+      false);
   }
 
   /**

diff --git a/v4-client-js/src/clients/modules/post.ts b/v4-client-js/src/clients/modules/post.ts
@@ -415,7 +415,7 @@ export class Post {
         );
         resolve([msg]);
       });
-      return this.send(subaccount.wallet, () => msgs, true, undefined, undefined, broadcastMode);
+      return this.send(subaccount.wallet, () => msgs, false, undefined, undefined, broadcastMode);
     }
 
     async deposit(
@@ -433,15 +433,14 @@ export class Post {
         );
         resolve([msg]);
       });
-      return this.send(subaccount.wallet, () => msgs, true, undefined, undefined, broadcastMode);
+      return this.send(subaccount.wallet, () => msgs, false, undefined, undefined, broadcastMode);
     }
 
     async withdraw(
       subaccount: Subaccount,
       assetId: number,
       quantums: Long,
       recipient?: string,
-      zeroFee: boolean = true,
       broadcastMode?: BroadcastMode,
     ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
       const msgs: Promise<EncodeObject[]> = new Promise((resolve) => {
@@ -454,7 +453,7 @@ export class Post {
         );
         resolve([msg]);
       });
-      return this.send(subaccount.wallet, () => msgs, zeroFee, undefined, undefined, broadcastMode);
+      return this.send(subaccount.wallet, () => msgs, false, undefined, undefined, broadcastMode);
     }
 
     async sendToken(