@dydxprotocol/v4-client-js 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/__native__/__ios__/v4-native-client.js +16 -16
  2. package/__tests__/modules/client/Transfers.test.ts +3 -3
  3. package/__tests__/modules/client/ValidatorPostEndpoints.test.ts +2 -2
  4. package/build/__tests__/modules/client/Transfers.test.js +2 -2
  5. package/build/__tests__/modules/client/ValidatorPostEndpoints.test.js +2 -2
  6. package/build/examples/composite_example.js +2 -2
  7. package/build/examples/long_term_order_cancel_example.js +2 -2
  8. package/build/examples/short_term_order_cancel_example.js +2 -2
  9. package/build/examples/short_term_order_composite_example.js +2 -2
  10. package/build/examples/test.js +2 -2
  11. package/build/examples/transfer_example_deposit.js +2 -2
  12. package/build/examples/transfer_example_send.js +2 -2
  13. package/build/examples/transfer_example_subaccount_transfer.js +2 -2
  14. package/build/examples/transfer_example_withdraw.js +2 -2
  15. package/build/examples/transfer_example_withdraw_other.js +2 -2
  16. package/build/examples/validator_post_example.js +2 -2
  17. package/build/src/clients/composite-client.d.ts +13 -13
  18. package/build/src/clients/composite-client.js +1 -1
  19. package/build/src/clients/modules/post.d.ts +9 -9
  20. package/build/src/clients/modules/post.js +1 -1
  21. package/build/src/clients/native.js +10 -10
  22. package/build/src/clients/subaccount.d.ts +1 -1
  23. package/build/src/clients/subaccount.js +4 -4
  24. package/build/src/index.d.ts +1 -1
  25. package/build/src/index.js +2 -2
  26. package/examples/composite_example.ts +2 -2
  27. package/examples/long_term_order_cancel_example.ts +2 -2
  28. package/examples/short_term_order_cancel_example.ts +2 -2
  29. package/examples/short_term_order_composite_example.ts +2 -2
  30. package/examples/test.ts +2 -2
  31. package/examples/transfer_example_deposit.ts +2 -2
  32. package/examples/transfer_example_send.ts +2 -2
  33. package/examples/transfer_example_subaccount_transfer.ts +2 -2
  34. package/examples/transfer_example_withdraw.ts +2 -2
  35. package/examples/transfer_example_withdraw_other.ts +2 -2
  36. package/examples/validator_post_example.ts +2 -2
  37. package/package.json +1 -1
  38. package/src/clients/composite-client.ts +15 -15
  39. package/src/clients/modules/post.ts +9 -9
  40. package/src/clients/native.ts +10 -10
  41. package/src/clients/subaccount.ts +1 -1
  42. package/src/index.ts +1 -1
@@ -251,7 +251,7 @@ async function placeOrder(payload) {
251
251
  const triggerPrice = json.triggerPrice;
252
252
  const marketInfo = json.marketInfo;
253
253
  const currentHeight = json.currentHeight;
254
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
254
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
255
255
  const tx = await client.placeOrder(subaccount, marketId, type, side, price, size, clientId, timeInForce, goodTilTimeInSeconds, execution, postOnly, reduceOnly, triggerPrice, marketInfo, currentHeight);
256
256
  return (0, helpers_1.encodeJson)(tx);
257
257
  }
@@ -294,7 +294,7 @@ async function cancelOrder(payload) {
294
294
  }
295
295
  const goodTilBlock = json.goodTilBlock;
296
296
  const goodTilBlockTime = json.goodTilBlockTime;
297
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
297
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
298
298
  const tx = await client.cancelRawOrder(subaccount, clientId, orderFlags, clobPairId, goodTilBlock !== 0 ? goodTilBlock : undefined, goodTilBlockTime !== 0 ? goodTilBlockTime : undefined);
299
299
  return (0, helpers_1.encodeJson)(tx);
300
300
  }
@@ -322,7 +322,7 @@ async function deposit(payload) {
322
322
  if (amount === undefined) {
323
323
  throw new errors_1.UserError('amount is not set');
324
324
  }
325
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
325
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
326
326
  const tx = await client.depositToSubaccount(subaccount, amount);
327
327
  return (0, helpers_1.encodeJson)(tx);
328
328
  }
@@ -350,7 +350,7 @@ async function withdraw(payload) {
350
350
  if (amount === undefined) {
351
351
  throw new errors_1.UserError('amount is not set');
352
352
  }
353
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
353
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
354
354
  const tx = await client.withdrawFromSubaccount(subaccount, amount, json.recipient);
355
355
  return (0, helpers_1.encodeJson)(tx);
356
356
  }
@@ -403,7 +403,7 @@ async function withdrawToIBC(subaccountNumber, amount, payload) {
403
403
  typeUrl: json.msgTypeUrl,
404
404
  value: json.msg,
405
405
  };
406
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
406
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
407
407
  const subaccountMsg = client.withdrawFromSubaccountMessage(subaccount, amount);
408
408
  const msgs = [subaccountMsg, ibcMsg];
409
409
  const encodeObjects = new Promise((resolve) => resolve(msgs));
@@ -522,7 +522,7 @@ async function simulateDeposit(payload) {
522
522
  if (amount === undefined) {
523
523
  throw new errors_1.UserError('amount is not set');
524
524
  }
525
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
525
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
526
526
  const msg = client.depositToSubaccountMessage(subaccount, amount);
527
527
  const msgs = [msg];
528
528
  const encodeObjects = new Promise((resolve) => resolve(msgs));
@@ -555,7 +555,7 @@ async function simulateWithdraw(payload) {
555
555
  if (amount === undefined) {
556
556
  throw new errors_1.UserError('amount is not set');
557
557
  }
558
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
558
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
559
559
  const msg = client.withdrawFromSubaccountMessage(subaccount, amount, json.recipient);
560
560
  const msgs = [msg];
561
561
  const encodeObjects = new Promise((resolve) => resolve(msgs));
@@ -635,7 +635,7 @@ size, clientId, timeInForce, goodTilTimeInSeconds, execution, postOnly, reduceOn
635
635
  if (wallet === undefined) {
636
636
  throw new errors_1.UserError('wallet is not set. Call connectWallet() first');
637
637
  }
638
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
638
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
639
639
  const signed = await client.signPlaceOrder(subaccount, marketId, type, side, price, size, clientId, timeInForce, goodTilTimeInSeconds, execution, postOnly, reduceOnly);
640
640
  return signed;
641
641
  }
@@ -654,7 +654,7 @@ async function signCancelOrder(subaccountNumber, clientId, orderFlags, clobPairI
654
654
  if (wallet === undefined) {
655
655
  throw new errors_1.UserError('wallet is not set. Call connectWallet() first');
656
656
  }
657
- const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
657
+ const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
658
658
  const signed = await client.signCancelOrder(subaccount, clientId, orderFlags, clobPairId, goodTilBlock, goodTilBlockTime);
659
659
  return signed;
660
660
  }
@@ -821,4 +821,4 @@ async function getMarketPrice(payload) {
821
821
  }
822
822
  }
823
823
  exports.getMarketPrice = getMarketPrice;
824
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../src/clients/native.ts"],"names":[],"mappings":"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"}
824
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../src/clients/native.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import LocalWallet from './modules/local-wallet';
2
- export declare class Subaccount {
2
+ export declare class SubaccountInfo {
3
3
  readonly wallet: LocalWallet;
4
4
  readonly subaccountNumber: number;
5
5
  constructor(wallet: LocalWallet, subaccountNumber?: number);
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Subaccount = void 0;
4
- class Subaccount {
3
+ exports.SubaccountInfo = void 0;
4
+ class SubaccountInfo {
5
5
  constructor(wallet, subaccountNumber = 0) {
6
6
  if (subaccountNumber < 0 || subaccountNumber > 127) {
7
7
  throw new Error('Subaccount number must be between 0 and 127');
@@ -19,5 +19,5 @@ class Subaccount {
19
19
  }
20
20
  }
21
21
  }
22
- exports.Subaccount = Subaccount;
23
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ViYWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGllbnRzL3N1YmFjY291bnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsTUFBYSxVQUFVO0lBS25CLFlBQVksTUFBbUIsRUFBRSxtQkFBMkIsQ0FBQztRQUMzRCxJQUFJLGdCQUFnQixHQUFHLENBQUMsSUFBSSxnQkFBZ0IsR0FBRyxHQUFHLEVBQUU7WUFDbEQsTUFBTSxJQUFJLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO1NBQ2hFO1FBQ0QsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLGdCQUFnQixHQUFHLGdCQUFnQixDQUFDO0lBQzNDLENBQUM7SUFFRCxJQUFJLE9BQU87UUFDVCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQztRQUNwQyxJQUFJLE9BQU8sS0FBSyxTQUFTLEVBQUU7WUFDekIsT0FBTyxPQUFPLENBQUM7U0FDaEI7YUFBTTtZQUNMLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQztTQUNwQztJQUNILENBQUM7Q0FDSjtBQXJCRCxnQ0FxQkMifQ==
22
+ exports.SubaccountInfo = SubaccountInfo;
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ViYWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGllbnRzL3N1YmFjY291bnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsTUFBYSxjQUFjO0lBS3ZCLFlBQVksTUFBbUIsRUFBRSxtQkFBMkIsQ0FBQztRQUMzRCxJQUFJLGdCQUFnQixHQUFHLENBQUMsSUFBSSxnQkFBZ0IsR0FBRyxHQUFHLEVBQUU7WUFDbEQsTUFBTSxJQUFJLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO1NBQ2hFO1FBQ0QsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLGdCQUFnQixHQUFHLGdCQUFnQixDQUFDO0lBQzNDLENBQUM7SUFFRCxJQUFJLE9BQU87UUFDVCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQztRQUNwQyxJQUFJLE9BQU8sS0FBSyxTQUFTLEVBQUU7WUFDekIsT0FBTyxPQUFPLENBQUM7U0FDaEI7YUFBTTtZQUNMLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQztTQUNwQztJQUNILENBQUM7Q0FDSjtBQXJCRCx3Q0FxQkMifQ==
@@ -3,7 +3,7 @@ export * as utils from './lib/utils';
3
3
  export * as validation from './lib/validation';
4
4
  export * as onboarding from './lib/onboarding';
5
5
  export { default as LocalWallet } from './clients/modules/local-wallet';
6
- export { Subaccount as SubaccountClient } from './clients/subaccount';
6
+ export { SubaccountInfo as SubaccountClient } from './clients/subaccount';
7
7
  export { CompositeClient } from './clients/composite-client';
8
8
  export { IndexerClient } from './clients/indexer-client';
9
9
  export { ValidatorClient } from './clients/validator-client';
@@ -39,7 +39,7 @@ exports.onboarding = __importStar(require("./lib/onboarding"));
39
39
  var local_wallet_1 = require("./clients/modules/local-wallet");
40
40
  Object.defineProperty(exports, "LocalWallet", { enumerable: true, get: function () { return __importDefault(local_wallet_1).default; } });
41
41
  var subaccount_1 = require("./clients/subaccount");
42
- Object.defineProperty(exports, "SubaccountClient", { enumerable: true, get: function () { return subaccount_1.Subaccount; } });
42
+ Object.defineProperty(exports, "SubaccountClient", { enumerable: true, get: function () { return subaccount_1.SubaccountInfo; } });
43
43
  var composite_client_1 = require("./clients/composite-client");
44
44
  Object.defineProperty(exports, "CompositeClient", { enumerable: true, get: function () { return composite_client_1.CompositeClient; } });
45
45
  var indexer_client_1 = require("./clients/indexer-client");
@@ -54,4 +54,4 @@ var network_optimizer_1 = require("./network_optimizer");
54
54
  Object.defineProperty(exports, "NetworkOptimizer", { enumerable: true, get: function () { return network_optimizer_1.NetworkOptimizer; } });
55
55
  var helpers_1 = require("./lib/helpers");
56
56
  Object.defineProperty(exports, "encodeJson", { enumerable: true, get: function () { return helpers_1.encodeJson; } });
57
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxTQUFTO0FBQ1QsMENBQXdCO0FBRXhCLHFCQUFxQjtBQUNyQixxREFBcUM7QUFDckMsK0RBQStDO0FBQy9DLCtEQUErQztBQUUvQywrREFBd0U7QUFBL0QsNEhBQUEsT0FBTyxPQUFlO0FBQy9CLG1EQUFzRTtBQUE3RCw4R0FBQSxVQUFVLE9BQW9CO0FBQ3ZDLCtEQUE2RDtBQUFwRCxtSEFBQSxlQUFlLE9BQUE7QUFDeEIsMkRBQXlEO0FBQWhELCtHQUFBLGFBQWEsT0FBQTtBQUN0QiwrREFBNkQ7QUFBcEQsbUhBQUEsZUFBZSxPQUFBO0FBQ3hCLHlEQUF1RDtBQUE5Qyw2R0FBQSxZQUFZLE9BQUE7QUFDckIseURBQXVEO0FBQTlDLDZHQUFBLFlBQVksT0FBQTtBQUNyQix5REFBdUQ7QUFBOUMscUhBQUEsZ0JBQWdCLE9BQUE7QUFDekIseUNBQTJDO0FBQWxDLHFHQUFBLFVBQVUsT0FBQSJ9
57
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxTQUFTO0FBQ1QsMENBQXdCO0FBRXhCLHFCQUFxQjtBQUNyQixxREFBcUM7QUFDckMsK0RBQStDO0FBQy9DLCtEQUErQztBQUUvQywrREFBd0U7QUFBL0QsNEhBQUEsT0FBTyxPQUFlO0FBQy9CLG1EQUEwRTtBQUFqRSw4R0FBQSxjQUFjLE9BQW9CO0FBQzNDLCtEQUE2RDtBQUFwRCxtSEFBQSxlQUFlLE9BQUE7QUFDeEIsMkRBQXlEO0FBQWhELCtHQUFBLGFBQWEsT0FBQTtBQUN0QiwrREFBNkQ7QUFBcEQsbUhBQUEsZUFBZSxPQUFBO0FBQ3hCLHlEQUF1RDtBQUE5Qyw2R0FBQSxZQUFZLE9BQUE7QUFDckIseURBQXVEO0FBQTlDLDZHQUFBLFlBQVksT0FBQTtBQUNyQix5REFBdUQ7QUFBOUMscUhBQUEsZ0JBQWdCLE9BQUE7QUFDekIseUNBQTJDO0FBQWxDLHFHQUFBLFVBQVUsT0FBQSJ9
@@ -4,7 +4,7 @@ import {
4
4
  Network, OrderExecution, OrderSide, OrderTimeInForce, OrderType,
5
5
  } from '../src/clients/constants';
6
6
  import LocalWallet from '../src/clients/modules/local-wallet';
7
- import { Subaccount } from '../src/clients/subaccount';
7
+ import { SubaccountInfo } from '../src/clients/subaccount';
8
8
  import { randomInt } from '../src/lib/utils';
9
9
  import { DYDX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
10
10
  import ordersParams from './human_readable_orders.json';
@@ -20,7 +20,7 @@ async function test(): Promise<void> {
20
20
  const client = await CompositeClient.connect(network);
21
21
  console.log('**Client**');
22
22
  console.log(client);
23
- const subaccount = new Subaccount(wallet, 0);
23
+ const subaccount = new SubaccountInfo(wallet, 0);
24
24
  for (const orderParams of ordersParams) {
25
25
  try {
26
26
  const type = OrderType[orderParams.type as keyof typeof OrderType];
@@ -4,7 +4,7 @@ import {
4
4
  Network, OrderExecution, OrderSide, OrderTimeInForce, OrderType,
5
5
  } from '../src/clients/constants';
6
6
  import LocalWallet from '../src/clients/modules/local-wallet';
7
- import { Subaccount } from '../src/clients/subaccount';
7
+ import { SubaccountInfo } from '../src/clients/subaccount';
8
8
  import { randomInt } from '../src/lib/utils';
9
9
  import { DYDX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
10
10
 
@@ -19,7 +19,7 @@ async function test(): Promise<void> {
19
19
  const client = await CompositeClient.connect(network);
20
20
  console.log('**Client**');
21
21
  console.log(client);
22
- const subaccount = new Subaccount(wallet, 0);
22
+ const subaccount = new SubaccountInfo(wallet, 0);
23
23
 
24
24
  /*
25
25
  Note this example places a stateful order.
@@ -4,7 +4,7 @@ import {
4
4
  Network, OrderSide,
5
5
  } from '../src/clients/constants';
6
6
  import LocalWallet from '../src/clients/modules/local-wallet';
7
- import { Subaccount } from '../src/clients/subaccount';
7
+ import { SubaccountInfo } from '../src/clients/subaccount';
8
8
  import { randomInt, sleep } from '../src/lib/utils';
9
9
  import { DYDX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
10
10
 
@@ -15,7 +15,7 @@ async function test(): Promise<void> {
15
15
  const client = await CompositeClient.connect(network);
16
16
  console.log('**Client**');
17
17
  console.log(client);
18
- const subaccount = new Subaccount(wallet, 0);
18
+ const subaccount = new SubaccountInfo(wallet, 0);
19
19
 
20
20
  const currentBlock = await client.validatorClient.get.latestBlockHeight();
21
21
  const nextValidBlockHeight = currentBlock + 1;
@@ -6,7 +6,7 @@ import {
6
6
  Network, OrderExecution, OrderSide,
7
7
  } from '../src/clients/constants';
8
8
  import LocalWallet from '../src/clients/modules/local-wallet';
9
- import { Subaccount } from '../src/clients/subaccount';
9
+ import { SubaccountInfo } from '../src/clients/subaccount';
10
10
  import { randomInt } from '../src/lib/utils';
11
11
  import { DYDX_TEST_MNEMONIC } from './constants';
12
12
  import ordersParams from './human_readable_short_term_orders.json';
@@ -22,7 +22,7 @@ async function test(): Promise<void> {
22
22
  const client = await CompositeClient.connect(network);
23
23
  console.log('**Client**');
24
24
  console.log(client);
25
- const subaccount = new Subaccount(wallet, 0);
25
+ const subaccount = new SubaccountInfo(wallet, 0);
26
26
  for (const orderParams of ordersParams) {
27
27
  try {
28
28
  const side = OrderSide[orderParams.side as keyof typeof OrderSide];
package/examples/test.ts CHANGED
@@ -4,7 +4,7 @@ import {
4
4
  Network, OrderExecution, OrderSide, OrderTimeInForce, OrderType,
5
5
  } from '../src/clients/constants';
6
6
  import LocalWallet from '../src/clients/modules/local-wallet';
7
- import { Subaccount } from '../src/clients/subaccount';
7
+ import { SubaccountInfo } from '../src/clients/subaccount';
8
8
  import { randomInt } from '../src/lib/utils';
9
9
  import { DYDX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
10
10
  import ordersParams from './human_readable_orders.json';
@@ -20,7 +20,7 @@ async function test(): Promise<void> {
20
20
  const client = await CompositeClient.connect(network);
21
21
  console.log('**Client**');
22
22
  console.log(client);
23
- const subaccount = new Subaccount(wallet, 0);
23
+ const subaccount = new SubaccountInfo(wallet, 0);
24
24
  for (const orderParams of ordersParams) {
25
25
  try {
26
26
  const type = OrderType[orderParams.type as keyof typeof OrderType];
@@ -3,7 +3,7 @@ import Long from 'long';
3
3
  import { BECH32_PREFIX } from '../src';
4
4
  import { Network } from '../src/clients/constants';
5
5
  import LocalWallet from '../src/clients/modules/local-wallet';
6
- import { Subaccount } from '../src/clients/subaccount';
6
+ import { SubaccountInfo } from '../src/clients/subaccount';
7
7
  import { ValidatorClient } from '../src/clients/validator-client';
8
8
  import { DYDX_TEST_MNEMONIC } from './constants';
9
9
 
@@ -15,7 +15,7 @@ async function test(): Promise<void> {
15
15
  console.log('**Client**');
16
16
  console.log(client);
17
17
 
18
- const subaccount = new Subaccount(wallet, 0);
18
+ const subaccount = new SubaccountInfo(wallet, 0);
19
19
  const tx = await client.post.deposit(
20
20
  subaccount,
21
21
  0,
@@ -6,7 +6,7 @@ import { TEST_RECIPIENT_ADDRESS } from '../__tests__/helpers/constants';
6
6
  import { BECH32_PREFIX } from '../src';
7
7
  import { Network } from '../src/clients/constants';
8
8
  import LocalWallet from '../src/clients/modules/local-wallet';
9
- import { Subaccount } from '../src/clients/subaccount';
9
+ import { SubaccountInfo } from '../src/clients/subaccount';
10
10
  import { ValidatorClient } from '../src/clients/validator-client';
11
11
  import { DYDX_TEST_MNEMONIC } from './constants';
12
12
 
@@ -21,7 +21,7 @@ async function test(): Promise<void> {
21
21
  console.log('**Client**');
22
22
  console.log(client);
23
23
 
24
- const subaccount = new Subaccount(wallet, 0);
24
+ const subaccount = new SubaccountInfo(wallet, 0);
25
25
 
26
26
  const amount = new Long(100_000_000);
27
27
 
@@ -3,7 +3,7 @@ import Long from 'long';
3
3
  import { BECH32_PREFIX } from '../src';
4
4
  import { Network } from '../src/clients/constants';
5
5
  import LocalWallet from '../src/clients/modules/local-wallet';
6
- import { Subaccount } from '../src/clients/subaccount';
6
+ import { SubaccountInfo } from '../src/clients/subaccount';
7
7
  import { ValidatorClient } from '../src/clients/validator-client';
8
8
  import { DYDX_TEST_MNEMONIC } from './constants';
9
9
 
@@ -15,7 +15,7 @@ async function test(): Promise<void> {
15
15
  console.log('**Client**');
16
16
  console.log(client);
17
17
 
18
- const subaccount = new Subaccount(wallet, 0);
18
+ const subaccount = new SubaccountInfo(wallet, 0);
19
19
 
20
20
  const tx = await client.post.transfer(
21
21
  subaccount,
@@ -3,7 +3,7 @@ import Long from 'long';
3
3
  import { BECH32_PREFIX } from '../src';
4
4
  import { Network } from '../src/clients/constants';
5
5
  import LocalWallet from '../src/clients/modules/local-wallet';
6
- import { Subaccount } from '../src/clients/subaccount';
6
+ import { SubaccountInfo } from '../src/clients/subaccount';
7
7
  import { ValidatorClient } from '../src/clients/validator-client';
8
8
  import { DYDX_TEST_MNEMONIC } from './constants';
9
9
 
@@ -17,7 +17,7 @@ async function test(): Promise<void> {
17
17
  console.log('**Client**');
18
18
  console.log(client);
19
19
 
20
- const subaccount = new Subaccount(wallet, 0);
20
+ const subaccount = new SubaccountInfo(wallet, 0);
21
21
 
22
22
  const tx = await client.post.withdraw(
23
23
  subaccount,
@@ -6,7 +6,7 @@ import { TEST_RECIPIENT_ADDRESS } from '../__tests__/helpers/constants';
6
6
  import { BECH32_PREFIX } from '../src';
7
7
  import { Network } from '../src/clients/constants';
8
8
  import LocalWallet from '../src/clients/modules/local-wallet';
9
- import { Subaccount } from '../src/clients/subaccount';
9
+ import { SubaccountInfo } from '../src/clients/subaccount';
10
10
  import { ValidatorClient } from '../src/clients/validator-client';
11
11
  import { DYDX_TEST_MNEMONIC } from './constants';
12
12
 
@@ -18,7 +18,7 @@ async function test(): Promise<void> {
18
18
  console.log('**Client**');
19
19
  console.log(client);
20
20
 
21
- const subaccount = new Subaccount(wallet, 0);
21
+ const subaccount = new SubaccountInfo(wallet, 0);
22
22
 
23
23
  const amount = new Long(100_000_000);
24
24
 
@@ -4,7 +4,7 @@ import protobuf from 'protobufjs';
4
4
  import { BECH32_PREFIX } from '../src';
5
5
  import { Network } from '../src/clients/constants';
6
6
  import LocalWallet from '../src/clients/modules/local-wallet';
7
- import { Subaccount } from '../src/clients/subaccount';
7
+ import { SubaccountInfo } from '../src/clients/subaccount';
8
8
  import { IPlaceOrder } from '../src/clients/types';
9
9
  import { ValidatorClient } from '../src/clients/validator-client';
10
10
  import { randomInt } from '../src/lib/utils';
@@ -40,7 +40,7 @@ async function test(): Promise<void> {
40
40
  const value1 = Long.fromNumber(400000000000);
41
41
  console.log(value1.toString());
42
42
 
43
- const subaccount = new Subaccount(wallet, 0);
43
+ const subaccount = new SubaccountInfo(wallet, 0);
44
44
  for (const orderParams of ordersParams) {
45
45
  const height = await client.get.latestBlockHeight();
46
46
  const placeOrder = dummyOrder(height);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dydxprotocol/v4-client-js",
3
- "version": "1.0.1",
3
+ "version": "1.0.2",
4
4
  "description": "General client library for the new dYdX system (v4 decentralized)",
5
5
  "main": "build/src/index.js",
6
6
  "scripts": {
@@ -32,7 +32,7 @@ import {
32
32
  import { IndexerClient } from './indexer-client';
33
33
  import { UserError } from './lib/errors';
34
34
  import LocalWallet from './modules/local-wallet';
35
- import { Subaccount } from './subaccount';
35
+ import { SubaccountInfo } from './subaccount';
36
36
  import { ValidatorClient } from './validator-client';
37
37
 
38
38
  // Required for encoding and decoding queries that are of type Long.
@@ -268,7 +268,7 @@ export class CompositeClient {
268
268
  * @returns The transaction hash.
269
269
  */
270
270
  async placeShortTermOrder(
271
- subaccount: Subaccount,
271
+ subaccount: SubaccountInfo,
272
272
  marketId: string,
273
273
  side: OrderSide,
274
274
  price: number,
@@ -340,7 +340,7 @@ export class CompositeClient {
340
340
  * @returns The transaction hash.
341
341
  */
342
342
  async placeOrder(
343
- subaccount: Subaccount,
343
+ subaccount: SubaccountInfo,
344
344
  marketId: string,
345
345
  type: OrderType,
346
346
  side: OrderSide,
@@ -420,7 +420,7 @@ export class CompositeClient {
420
420
  * @returns The message to be passed into the protocol
421
421
  */
422
422
  private async placeOrderMessage(
423
- subaccount: Subaccount,
423
+ subaccount: SubaccountInfo,
424
424
  marketId: string,
425
425
  type: OrderType,
426
426
  side: OrderSide,
@@ -541,7 +541,7 @@ export class CompositeClient {
541
541
  * @returns The message to be passed into the protocol
542
542
  */
543
543
  private async placeShortTermOrderMessage(
544
- subaccount: Subaccount,
544
+ subaccount: SubaccountInfo,
545
545
  marketId: string,
546
546
  side: OrderSide,
547
547
  price: number,
@@ -607,7 +607,7 @@ export class CompositeClient {
607
607
  * @returns The transaction hash.
608
608
  */
609
609
  async cancelRawOrder(
610
- subaccount: Subaccount,
610
+ subaccount: SubaccountInfo,
611
611
  clientId: number,
612
612
  orderFlags: OrderFlags,
613
613
  clobPairId: number,
@@ -639,7 +639,7 @@ export class CompositeClient {
639
639
  * @returns The transaction hash.
640
640
  */
641
641
  async cancelOrder(
642
- subaccount: Subaccount,
642
+ subaccount: SubaccountInfo,
643
643
  clientId: number,
644
644
  orderFlags: OrderFlags,
645
645
  marketId: string,
@@ -699,7 +699,7 @@ export class CompositeClient {
699
699
  * @returns The transaction hash.
700
700
  */
701
701
  async transferToSubaccount(
702
- subaccount: Subaccount,
702
+ subaccount: SubaccountInfo,
703
703
  recipientAddress: string,
704
704
  recipientSubaccountNumber: number,
705
705
  amount: string,
@@ -733,7 +733,7 @@ export class CompositeClient {
733
733
  * @returns The message
734
734
  */
735
735
  transferToSubaccountMessage(
736
- subaccount: Subaccount,
736
+ subaccount: SubaccountInfo,
737
737
  recipientAddress: string,
738
738
  recipientSubaccountNumber: number,
739
739
  amount: string,
@@ -771,7 +771,7 @@ export class CompositeClient {
771
771
  * @returns The transaction hash.
772
772
  */
773
773
  async depositToSubaccount(
774
- subaccount: Subaccount,
774
+ subaccount: SubaccountInfo,
775
775
  amount: string,
776
776
  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
777
777
  const msgs: Promise<EncodeObject[]> = new Promise((resolve) => {
@@ -797,7 +797,7 @@ export class CompositeClient {
797
797
  * @returns The message
798
798
  */
799
799
  depositToSubaccountMessage(
800
- subaccount: Subaccount,
800
+ subaccount: SubaccountInfo,
801
801
  amount: string,
802
802
  ): EncodeObject {
803
803
  const validatorClient = this._validatorClient;
@@ -832,7 +832,7 @@ export class CompositeClient {
832
832
  * @returns The transaction hash
833
833
  */
834
834
  async withdrawFromSubaccount(
835
- subaccount: Subaccount,
835
+ subaccount: SubaccountInfo,
836
836
  amount: string,
837
837
  recipient?: string,
838
838
  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
@@ -863,7 +863,7 @@ export class CompositeClient {
863
863
  * @returns The message
864
864
  */
865
865
  withdrawFromSubaccountMessage(
866
- subaccount: Subaccount,
866
+ subaccount: SubaccountInfo,
867
867
  amount: string,
868
868
  recipient?: string,
869
869
  ): EncodeObject {
@@ -929,7 +929,7 @@ export class CompositeClient {
929
929
  }
930
930
 
931
931
  async signPlaceOrder(
932
- subaccount: Subaccount,
932
+ subaccount: SubaccountInfo,
933
933
  marketId: string,
934
934
  type: OrderType,
935
935
  side: OrderSide,
@@ -973,7 +973,7 @@ export class CompositeClient {
973
973
  }
974
974
 
975
975
  async signCancelOrder(
976
- subaccount: Subaccount,
976
+ subaccount: SubaccountInfo,
977
977
  clientId: number,
978
978
  orderFlags: OrderFlags,
979
979
  clobPairId: number,