@dydxprotocol/v4-client-js 0.38.4 → 0.38.6
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.
- package/__native__/__ios__/v4-native-client.js +902 -152
- package/build/examples/short_term_order_composite_example.js +2 -2
- package/build/src/clients/composite-client.d.ts +19 -5
- package/build/src/clients/composite-client.js +62 -26
- package/build/src/clients/constants.d.ts +1 -0
- package/build/src/clients/constants.js +3 -2
- package/build/src/clients/modules/post.d.ts +11 -4
- package/build/src/clients/modules/post.js +41 -16
- package/build/src/clients/native.js +4 -2
- package/build/src/network_optimizer.js +5 -5
- package/examples/short_term_order_composite_example.ts +1 -1
- package/package.json +1 -1
- package/src/clients/composite-client.ts +129 -23
- package/src/clients/constants.ts +2 -0
- package/src/clients/modules/post.ts +90 -12
- package/src/clients/native.ts +21 -7
- package/src/network_optimizer.ts +4 -4
- package/__native__/__ios__/v4-native-client.js.map +0 -1
|
@@ -230,8 +230,10 @@ async function placeOrder(payload) {
|
|
|
230
230
|
const postOnly = (_a = json.postOnly) !== null && _a !== void 0 ? _a : false;
|
|
231
231
|
const reduceOnly = (_b = json.reduceOnly) !== null && _b !== void 0 ? _b : false;
|
|
232
232
|
const triggerPrice = json.triggerPrice;
|
|
233
|
+
const marketInfo = json.marketInfo;
|
|
234
|
+
const currentHeight = json.currentHeight;
|
|
233
235
|
const subaccount = new subaccount_1.Subaccount(wallet, subaccountNumber);
|
|
234
|
-
const tx = await client.placeOrder(subaccount, marketId, type, side, price, size, clientId, timeInForce, goodTilTimeInSeconds, execution, postOnly, reduceOnly, triggerPrice);
|
|
236
|
+
const tx = await client.placeOrder(subaccount, marketId, type, side, price, size, clientId, timeInForce, goodTilTimeInSeconds, execution, postOnly, reduceOnly, triggerPrice, marketInfo, currentHeight);
|
|
235
237
|
return (0, helpers_1.encodeJson)(tx);
|
|
236
238
|
}
|
|
237
239
|
catch (error) {
|
|
@@ -809,4 +811,4 @@ async function getMarketPrice(payload) {
|
|
|
809
811
|
}
|
|
810
812
|
}
|
|
811
813
|
exports.getMarketPrice = getMarketPrice;
|
|
812
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../src/clients/native.ts"],"names":[],"mappings":"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"}
|
|
814
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../src/clients/native.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,8 +49,8 @@ class NetworkOptimizer {
|
|
|
49
49
|
}
|
|
50
50
|
const maxHeight = Math.max(...responses.map(({ height }) => height));
|
|
51
51
|
return responses
|
|
52
|
-
// Only consider nodes at `maxHeight`
|
|
53
|
-
.filter(({ height }) => height === maxHeight)
|
|
52
|
+
// Only consider nodes at `maxHeight` or `maxHeight - 1`
|
|
53
|
+
.filter(({ height }) => height === maxHeight || height === maxHeight - 1)
|
|
54
54
|
// Return the endpoint with the fastest response time
|
|
55
55
|
.sort((a, b) => a.time - b.time)[0]
|
|
56
56
|
.endpoint;
|
|
@@ -81,12 +81,12 @@ class NetworkOptimizer {
|
|
|
81
81
|
}
|
|
82
82
|
const maxHeight = Math.max(...responses.map(({ height }) => height));
|
|
83
83
|
return responses
|
|
84
|
-
// Only consider nodes at `maxHeight`
|
|
85
|
-
.filter(({ height }) => height === maxHeight)
|
|
84
|
+
// Only consider nodes at `maxHeight` or `maxHeight - 1`
|
|
85
|
+
.filter(({ height }) => height === maxHeight || height === maxHeight - 1)
|
|
86
86
|
// Return the endpoint with the fastest response time
|
|
87
87
|
.sort((a, b) => a.time - b.time)[0]
|
|
88
88
|
.endpoint;
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
exports.NetworkOptimizer = NetworkOptimizer;
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19vcHRpbWl6ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbmV0d29ya19vcHRpbWl6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkRBQXlEO0FBQ3pELGlFQUE2RDtBQUM3RCwyQ0FBMkM7QUFDM0MsbUNBQXlEO0FBRXpELE1BQU0sWUFBWTtJQUtkLFlBQ0UsTUFBYztRQUVkLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztJQUNqQyxDQUFDO0NBQ0o7QUFFTSxNQUFNLFFBQVEsR0FBRyxDQUFJLENBQW9DLEVBQVUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUEzRSxRQUFBLFFBQVEsWUFBbUU7QUFFeEYsTUFBYSxnQkFBZ0I7SUFDbkIsS0FBSyxDQUFDLGdCQUFnQixDQUM1QixZQUFzQixFQUN0QixPQUFlO1FBRWYsT0FBTyxDQUFDLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDdkIsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsa0NBQWUsQ0FBQyxPQUFPLENBQ3ZELElBQUksdUJBQWUsQ0FBQyxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7YUFDekMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FDekIsQ0FDRixDQUFDLENBQUMsTUFBTSxDQUFDLGdCQUFRLENBQUMsQ0FBQztJQUN0QixDQUFDO0lBRU8sY0FBYyxDQUNwQixZQUFzQjtRQUV0QixPQUFPLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLElBQUksOEJBQWE7UUFDeEQsNEZBQTRGO1FBQzVGLElBQUkscUJBQWEsQ0FBQyxXQUFXLEVBQUUsV0FBVyxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLENB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
|
package/package.json
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { EncodeObject } from '@cosmjs/proto-signing';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
Account, GasPrice, IndexedTx, StdFee,
|
|
4
|
+
} from '@cosmjs/stargate';
|
|
3
5
|
import { BroadcastTxAsyncResponse, BroadcastTxSyncResponse } from '@cosmjs/tendermint-rpc/build/tendermint37';
|
|
4
6
|
import { Order_ConditionType, Order_TimeInForce } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/clob/order';
|
|
5
7
|
import Long from 'long';
|
|
@@ -10,7 +12,13 @@ import { OrderFlags } from '../types';
|
|
|
10
12
|
import {
|
|
11
13
|
DYDX_DENOM,
|
|
12
14
|
GAS_PRICE,
|
|
13
|
-
Network,
|
|
15
|
+
Network,
|
|
16
|
+
OrderExecution,
|
|
17
|
+
OrderSide,
|
|
18
|
+
OrderTimeInForce,
|
|
19
|
+
OrderType,
|
|
20
|
+
SHORT_BLOCK_FORWARD,
|
|
21
|
+
SHORT_BLOCK_WINDOW,
|
|
14
22
|
} from './constants';
|
|
15
23
|
import {
|
|
16
24
|
calculateQuantums,
|
|
@@ -35,6 +43,14 @@ import { ValidatorClient } from './validator-client';
|
|
|
35
43
|
protobuf.util.Long = Long;
|
|
36
44
|
protobuf.configure();
|
|
37
45
|
|
|
46
|
+
export interface MarketInfo {
|
|
47
|
+
clobPairId: number;
|
|
48
|
+
atomicResolution: number;
|
|
49
|
+
stepBaseQuantums: number;
|
|
50
|
+
quantumConversionExponent: number;
|
|
51
|
+
subticksPerTick: number;
|
|
52
|
+
}
|
|
53
|
+
|
|
38
54
|
export class CompositeClient {
|
|
39
55
|
public readonly network: Network;
|
|
40
56
|
private _indexerClient: IndexerClient;
|
|
@@ -89,8 +105,16 @@ export class CompositeClient {
|
|
|
89
105
|
zeroFee: boolean,
|
|
90
106
|
gasPrice: GasPrice = GAS_PRICE,
|
|
91
107
|
memo?: string,
|
|
108
|
+
account?: () => Promise<Account>,
|
|
92
109
|
): Promise<Uint8Array> {
|
|
93
|
-
return this.validatorClient.post.sign(
|
|
110
|
+
return this.validatorClient.post.sign(
|
|
111
|
+
wallet,
|
|
112
|
+
messaging,
|
|
113
|
+
zeroFee,
|
|
114
|
+
gasPrice,
|
|
115
|
+
memo,
|
|
116
|
+
account,
|
|
117
|
+
);
|
|
94
118
|
}
|
|
95
119
|
|
|
96
120
|
/**
|
|
@@ -107,8 +131,17 @@ export class CompositeClient {
|
|
|
107
131
|
zeroFee: boolean,
|
|
108
132
|
gasPrice: GasPrice = GAS_PRICE,
|
|
109
133
|
memo?: string,
|
|
134
|
+
account?: () => Promise<Account>,
|
|
110
135
|
): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
|
|
111
|
-
return this.validatorClient.post.send(
|
|
136
|
+
return this.validatorClient.post.send(
|
|
137
|
+
wallet,
|
|
138
|
+
messaging,
|
|
139
|
+
zeroFee,
|
|
140
|
+
gasPrice,
|
|
141
|
+
memo,
|
|
142
|
+
undefined,
|
|
143
|
+
account,
|
|
144
|
+
);
|
|
112
145
|
}
|
|
113
146
|
|
|
114
147
|
/**
|
|
@@ -144,8 +177,15 @@ export class CompositeClient {
|
|
|
144
177
|
messaging: () => Promise<EncodeObject[]>,
|
|
145
178
|
gasPrice: GasPrice = GAS_PRICE,
|
|
146
179
|
memo?: string,
|
|
180
|
+
account?: () => Promise<Account>,
|
|
147
181
|
): Promise<StdFee> {
|
|
148
|
-
return this.validatorClient.post.simulate(
|
|
182
|
+
return this.validatorClient.post.simulate(
|
|
183
|
+
wallet,
|
|
184
|
+
messaging,
|
|
185
|
+
gasPrice,
|
|
186
|
+
memo,
|
|
187
|
+
account,
|
|
188
|
+
);
|
|
149
189
|
}
|
|
150
190
|
|
|
151
191
|
/**
|
|
@@ -155,9 +195,17 @@ export class CompositeClient {
|
|
|
155
195
|
* at any point.
|
|
156
196
|
* @returns The goodTilBlock value
|
|
157
197
|
*/
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
198
|
+
|
|
199
|
+
private async calculateGoodTilBlock(
|
|
200
|
+
orderFlags: OrderFlags,
|
|
201
|
+
currentHeight?: number,
|
|
202
|
+
): Promise<number> {
|
|
203
|
+
if (orderFlags === OrderFlags.SHORT_TERM) {
|
|
204
|
+
const height = currentHeight ?? await this.validatorClient.get.latestBlockHeight();
|
|
205
|
+
return height + SHORT_BLOCK_FORWARD;
|
|
206
|
+
} else {
|
|
207
|
+
return Promise.resolve(0);
|
|
208
|
+
}
|
|
161
209
|
}
|
|
162
210
|
|
|
163
211
|
/**
|
|
@@ -247,10 +295,18 @@ export class CompositeClient {
|
|
|
247
295
|
console.log(err);
|
|
248
296
|
});
|
|
249
297
|
});
|
|
298
|
+
const account: Promise<Account> = this.validatorClient.post.account(
|
|
299
|
+
subaccount.address,
|
|
300
|
+
undefined,
|
|
301
|
+
);
|
|
250
302
|
return this.send(
|
|
251
303
|
subaccount.wallet,
|
|
252
304
|
() => msgs,
|
|
253
|
-
true
|
|
305
|
+
true,
|
|
306
|
+
undefined,
|
|
307
|
+
undefined,
|
|
308
|
+
() => account,
|
|
309
|
+
);
|
|
254
310
|
}
|
|
255
311
|
|
|
256
312
|
/**
|
|
@@ -272,6 +328,12 @@ export class CompositeClient {
|
|
|
272
328
|
* @param execution The execution of the order to place.
|
|
273
329
|
* @param postOnly The postOnly of the order to place.
|
|
274
330
|
* @param reduceOnly The reduceOnly of the order to place.
|
|
331
|
+
* @param triggerPrice The trigger price of conditional orders.
|
|
332
|
+
* @param marketInfo optional market information for calculating quantums and subticks.
|
|
333
|
+
* This can be constructed from Indexer API. If set to null, additional round
|
|
334
|
+
* trip to Indexer API will be made.
|
|
335
|
+
* @param currentHeight Current block height. This can be obtained from ValidatorClient.
|
|
336
|
+
* If set to null, additional round trip to ValidatorClient will be made.
|
|
275
337
|
*
|
|
276
338
|
*
|
|
277
339
|
* @throws UnexpectedClientError if a malformed response is returned with no GRPC error
|
|
@@ -292,6 +354,8 @@ export class CompositeClient {
|
|
|
292
354
|
postOnly?: boolean,
|
|
293
355
|
reduceOnly?: boolean,
|
|
294
356
|
triggerPrice?: number,
|
|
357
|
+
marketInfo?: MarketInfo,
|
|
358
|
+
currentHeight?: number,
|
|
295
359
|
): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
|
|
296
360
|
const msgs: Promise<EncodeObject[]> = new Promise((resolve) => {
|
|
297
361
|
const msg = this.placeOrderMessage(
|
|
@@ -309,15 +373,26 @@ export class CompositeClient {
|
|
|
309
373
|
postOnly,
|
|
310
374
|
reduceOnly,
|
|
311
375
|
triggerPrice,
|
|
376
|
+
marketInfo,
|
|
377
|
+
currentHeight,
|
|
312
378
|
);
|
|
313
379
|
msg.then((it) => resolve([it])).catch((err) => {
|
|
314
380
|
console.log(err);
|
|
315
381
|
});
|
|
316
382
|
});
|
|
383
|
+
const orderFlags = calculateOrderFlags(type, timeInForce);
|
|
384
|
+
const account: Promise<Account> = this.validatorClient.post.account(
|
|
385
|
+
subaccount.address,
|
|
386
|
+
orderFlags,
|
|
387
|
+
);
|
|
317
388
|
return this.send(
|
|
318
389
|
subaccount.wallet,
|
|
319
390
|
() => msgs,
|
|
320
|
-
true
|
|
391
|
+
true,
|
|
392
|
+
undefined,
|
|
393
|
+
undefined,
|
|
394
|
+
() => account,
|
|
395
|
+
);
|
|
321
396
|
}
|
|
322
397
|
|
|
323
398
|
/**
|
|
@@ -360,14 +435,22 @@ export class CompositeClient {
|
|
|
360
435
|
postOnly?: boolean,
|
|
361
436
|
reduceOnly?: boolean,
|
|
362
437
|
triggerPrice?: number,
|
|
438
|
+
marketInfo?: MarketInfo,
|
|
439
|
+
currentHeight?: number,
|
|
363
440
|
): Promise<EncodeObject> {
|
|
364
|
-
const
|
|
365
|
-
|
|
366
|
-
const
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
441
|
+
const orderFlags = calculateOrderFlags(type, timeInForce);
|
|
442
|
+
|
|
443
|
+
const result = await Promise.all([
|
|
444
|
+
this.calculateGoodTilBlock(orderFlags, currentHeight),
|
|
445
|
+
this.retrieveMarketInfo(marketId, marketInfo),
|
|
446
|
+
],
|
|
447
|
+
);
|
|
448
|
+
const goodTilBlock = result[0];
|
|
449
|
+
const clobPairId = result[1].clobPairId;
|
|
450
|
+
const atomicResolution = result[1].atomicResolution;
|
|
451
|
+
const stepBaseQuantums = result[1].stepBaseQuantums;
|
|
452
|
+
const quantumConversionExponent = result[1].quantumConversionExponent;
|
|
453
|
+
const subticksPerTick = result[1].subticksPerTick;
|
|
371
454
|
const orderSide = calculateSide(side);
|
|
372
455
|
const quantums = calculateQuantums(
|
|
373
456
|
size,
|
|
@@ -380,16 +463,13 @@ export class CompositeClient {
|
|
|
380
463
|
quantumConversionExponent,
|
|
381
464
|
subticksPerTick,
|
|
382
465
|
);
|
|
383
|
-
const orderFlags = calculateOrderFlags(type, timeInForce);
|
|
384
466
|
const orderTimeInForce = calculateTimeInForce(type, timeInForce, execution, postOnly);
|
|
385
|
-
const goodTilBlock = (orderFlags === OrderFlags.SHORT_TERM)
|
|
386
|
-
? await this.calculateGoodTilBlock() : 0;
|
|
387
467
|
let goodTilBlockTime = 0;
|
|
388
468
|
if (orderFlags === OrderFlags.LONG_TERM || orderFlags === OrderFlags.CONDITIONAL) {
|
|
389
469
|
if (goodTilTimeInSeconds == null) {
|
|
390
470
|
throw new Error('goodTilTimeInSeconds must be set for LONG_TERM or CONDITIONAL order');
|
|
391
471
|
} else {
|
|
392
|
-
goodTilBlockTime =
|
|
472
|
+
goodTilBlockTime = this.calculateGoodTilBlockTime(goodTilTimeInSeconds);
|
|
393
473
|
}
|
|
394
474
|
}
|
|
395
475
|
const clientMetadata = calculateClientMetadata(type);
|
|
@@ -419,6 +499,27 @@ export class CompositeClient {
|
|
|
419
499
|
);
|
|
420
500
|
}
|
|
421
501
|
|
|
502
|
+
private async retrieveMarketInfo(marketId: string, marketInfo?:MarketInfo): Promise<MarketInfo> {
|
|
503
|
+
if (marketInfo) {
|
|
504
|
+
return Promise.resolve(marketInfo);
|
|
505
|
+
} else {
|
|
506
|
+
const marketsResponse = await this.indexerClient.markets.getPerpetualMarkets(marketId);
|
|
507
|
+
const market = marketsResponse.markets[marketId];
|
|
508
|
+
const clobPairId = market.clobPairId;
|
|
509
|
+
const atomicResolution = market.atomicResolution;
|
|
510
|
+
const stepBaseQuantums = market.stepBaseQuantums;
|
|
511
|
+
const quantumConversionExponent = market.quantumConversionExponent;
|
|
512
|
+
const subticksPerTick = market.subticksPerTick;
|
|
513
|
+
return {
|
|
514
|
+
clobPairId,
|
|
515
|
+
atomicResolution,
|
|
516
|
+
stepBaseQuantums,
|
|
517
|
+
quantumConversionExponent,
|
|
518
|
+
subticksPerTick,
|
|
519
|
+
};
|
|
520
|
+
}
|
|
521
|
+
}
|
|
522
|
+
|
|
422
523
|
/**
|
|
423
524
|
* @description Calculate and create the short term place order message
|
|
424
525
|
*
|
|
@@ -787,7 +888,8 @@ export class CompositeClient {
|
|
|
787
888
|
const signature = await this.sign(
|
|
788
889
|
wallet,
|
|
789
890
|
() => msgs,
|
|
790
|
-
true
|
|
891
|
+
true,
|
|
892
|
+
);
|
|
791
893
|
|
|
792
894
|
return Buffer.from(signature).toString('base64');
|
|
793
895
|
}
|
|
@@ -812,7 +914,11 @@ export class CompositeClient {
|
|
|
812
914
|
);
|
|
813
915
|
resolve([msg]);
|
|
814
916
|
});
|
|
815
|
-
const signature = await this.sign(
|
|
917
|
+
const signature = await this.sign(
|
|
918
|
+
subaccount.wallet,
|
|
919
|
+
() => msgs,
|
|
920
|
+
true,
|
|
921
|
+
);
|
|
816
922
|
|
|
817
923
|
return Buffer.from(signature).toString('base64');
|
|
818
924
|
}
|
package/src/clients/constants.ts
CHANGED