@d8x/perpetuals-sdk 0.7.4 → 0.7.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/dist/cjs/accountTrade.js +134 -239
- package/dist/cjs/accountTrade.js.map +1 -1
- package/dist/cjs/brokerTool.js +144 -290
- package/dist/cjs/brokerTool.js.map +1 -1
- package/dist/cjs/contracts/factories/ERC20__factory.js +9 -12
- package/dist/cjs/contracts/factories/ERC20__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/IPerpetualManager__factory.js +9 -12
- package/dist/cjs/contracts/factories/IPerpetualManager__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/LimitOrderBookFactory__factory.js +9 -12
- package/dist/cjs/contracts/factories/LimitOrderBookFactory__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/LimitOrderBook__factory.js +9 -12
- package/dist/cjs/contracts/factories/LimitOrderBook__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/MockTokenSwap__factory.js +9 -12
- package/dist/cjs/contracts/factories/MockTokenSwap__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/ShareToken__factory.js +9 -12
- package/dist/cjs/contracts/factories/ShareToken__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/zkevmTestnet/IPerpetualManager__factory.js +9 -12
- package/dist/cjs/contracts/factories/zkevmTestnet/IPerpetualManager__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/zkevmTestnet/LimitOrderBookFactory__factory.js +9 -12
- package/dist/cjs/contracts/factories/zkevmTestnet/LimitOrderBookFactory__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/zkevmTestnet/LimitOrderBook__factory.js +9 -12
- package/dist/cjs/contracts/factories/zkevmTestnet/LimitOrderBook__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/zkevmTestnet/ShareToken__factory.js +9 -12
- package/dist/cjs/contracts/factories/zkevmTestnet/ShareToken__factory.js.map +1 -1
- package/dist/cjs/contracts/index.js +1 -1
- package/dist/cjs/d8XMath.d.ts +7 -0
- package/dist/cjs/d8XMath.js +81 -61
- package/dist/cjs/d8XMath.js.map +1 -1
- package/dist/cjs/index.js +11 -11
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/liquidatorTool.js +80 -137
- package/dist/cjs/liquidatorTool.js.map +1 -1
- package/dist/cjs/liquidityProviderTool.js +33 -64
- package/dist/cjs/liquidityProviderTool.js.map +1 -1
- package/dist/cjs/marketData.d.ts +8 -1
- package/dist/cjs/marketData.js +641 -949
- package/dist/cjs/marketData.js.map +1 -1
- package/dist/cjs/nodeSDKTypes.d.ts +1 -0
- package/dist/cjs/nodeSDKTypes.js +10 -22
- package/dist/cjs/nodeSDKTypes.js.map +1 -1
- package/dist/cjs/orderReferrerTool.js +200 -321
- package/dist/cjs/orderReferrerTool.js.map +1 -1
- package/dist/cjs/perpetualDataHandler.d.ts +11 -0
- package/dist/cjs/perpetualDataHandler.js +422 -535
- package/dist/cjs/perpetualDataHandler.js.map +1 -1
- package/dist/cjs/perpetualEventHandler.js +129 -190
- package/dist/cjs/perpetualEventHandler.js.map +1 -1
- package/dist/cjs/priceFeeds.js +223 -335
- package/dist/cjs/priceFeeds.js.map +1 -1
- package/dist/cjs/traderDigests.js +20 -23
- package/dist/cjs/traderDigests.js.map +1 -1
- package/dist/cjs/traderInterface.js +54 -87
- package/dist/cjs/traderInterface.js.map +1 -1
- package/dist/cjs/triangulator.js +34 -38
- package/dist/cjs/triangulator.js.map +1 -1
- package/dist/cjs/utils.js +18 -32
- package/dist/cjs/utils.js.map +1 -1
- package/dist/cjs/version.d.ts +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/writeAccessHandler.js +78 -112
- package/dist/cjs/writeAccessHandler.js.map +1 -1
- package/dist/esm/accountTrade.js +126 -233
- package/dist/esm/accountTrade.js.map +1 -1
- package/dist/esm/brokerTool.js +136 -284
- package/dist/esm/brokerTool.js.map +1 -1
- package/dist/esm/contracts/factories/ERC20__factory.js +8 -12
- package/dist/esm/contracts/factories/ERC20__factory.js.map +1 -1
- package/dist/esm/contracts/factories/IPerpetualManager__factory.js +8 -12
- package/dist/esm/contracts/factories/IPerpetualManager__factory.js.map +1 -1
- package/dist/esm/contracts/factories/LimitOrderBookFactory__factory.js +8 -12
- package/dist/esm/contracts/factories/LimitOrderBookFactory__factory.js.map +1 -1
- package/dist/esm/contracts/factories/LimitOrderBook__factory.js +8 -12
- package/dist/esm/contracts/factories/LimitOrderBook__factory.js.map +1 -1
- package/dist/esm/contracts/factories/MockTokenSwap__factory.js +8 -12
- package/dist/esm/contracts/factories/MockTokenSwap__factory.js.map +1 -1
- package/dist/esm/contracts/factories/ShareToken__factory.js +8 -12
- package/dist/esm/contracts/factories/ShareToken__factory.js.map +1 -1
- package/dist/esm/contracts/factories/zkevmTestnet/IPerpetualManager__factory.js +8 -12
- package/dist/esm/contracts/factories/zkevmTestnet/IPerpetualManager__factory.js.map +1 -1
- package/dist/esm/contracts/factories/zkevmTestnet/LimitOrderBookFactory__factory.js +8 -12
- package/dist/esm/contracts/factories/zkevmTestnet/LimitOrderBookFactory__factory.js.map +1 -1
- package/dist/esm/contracts/factories/zkevmTestnet/LimitOrderBook__factory.js +8 -12
- package/dist/esm/contracts/factories/zkevmTestnet/LimitOrderBook__factory.js.map +1 -1
- package/dist/esm/contracts/factories/zkevmTestnet/ShareToken__factory.js +8 -12
- package/dist/esm/contracts/factories/zkevmTestnet/ShareToken__factory.js.map +1 -1
- package/dist/esm/d8XMath.d.ts +7 -0
- package/dist/esm/d8XMath.js +77 -58
- package/dist/esm/d8XMath.js.map +1 -1
- package/dist/esm/liquidatorTool.js +77 -136
- package/dist/esm/liquidatorTool.js.map +1 -1
- package/dist/esm/liquidityProviderTool.js +30 -63
- package/dist/esm/liquidityProviderTool.js.map +1 -1
- package/dist/esm/marketData.d.ts +8 -1
- package/dist/esm/marketData.js +632 -942
- package/dist/esm/marketData.js.map +1 -1
- package/dist/esm/nodeSDKTypes.d.ts +1 -0
- package/dist/esm/nodeSDKTypes.js +36 -48
- package/dist/esm/nodeSDKTypes.js.map +1 -1
- package/dist/esm/orderReferrerTool.js +194 -317
- package/dist/esm/orderReferrerTool.js.map +1 -1
- package/dist/esm/perpetualDataHandler.d.ts +11 -0
- package/dist/esm/perpetualDataHandler.js +413 -528
- package/dist/esm/perpetualDataHandler.js.map +1 -1
- package/dist/esm/perpetualEventHandler.js +126 -188
- package/dist/esm/perpetualEventHandler.js.map +1 -1
- package/dist/esm/priceFeeds.js +218 -332
- package/dist/esm/priceFeeds.js.map +1 -1
- package/dist/esm/traderDigests.js +15 -19
- package/dist/esm/traderDigests.js.map +1 -1
- package/dist/esm/traderInterface.js +48 -83
- package/dist/esm/traderInterface.js.map +1 -1
- package/dist/esm/triangulator.js +34 -39
- package/dist/esm/triangulator.js.map +1 -1
- package/dist/esm/utils.js +16 -30
- package/dist/esm/utils.js.map +1 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/esm/writeAccessHandler.js +70 -106
- package/dist/esm/writeAccessHandler.js.map +1 -1
- package/package.json +1 -1
- package/src/d8XMath.ts +21 -0
- package/src/liquidityProviderTool.ts +5 -4
- package/src/marketData.ts +26 -0
- package/src/nodeSDKTypes.ts +1 -0
- package/src/perpetualDataHandler.ts +27 -0
- package/src/version.ts +1 -1
- package/src/writeAccessHandler.ts +3 -3
package/dist/esm/accountTrade.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { __assign, __awaiter, __extends, __generator, __read } from "tslib";
|
|
2
1
|
import { Buffer } from "buffer";
|
|
3
2
|
import { ABK64x64ToFloat, floatToABK64x64 } from "./d8XMath";
|
|
4
3
|
import MarketData from "./marketData";
|
|
@@ -12,8 +11,7 @@ import WriteAccessHandler from "./writeAccessHandler";
|
|
|
12
11
|
* require gas-payments.
|
|
13
12
|
* @extends WriteAccessHandler
|
|
14
13
|
*/
|
|
15
|
-
|
|
16
|
-
__extends(AccountTrade, _super);
|
|
14
|
+
export default class AccountTrade extends WriteAccessHandler {
|
|
17
15
|
/**
|
|
18
16
|
* Constructor
|
|
19
17
|
* @param {NodeSDKConfig} config Configuration object, see PerpetualDataHandler.
|
|
@@ -34,10 +32,9 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
34
32
|
*
|
|
35
33
|
* @param {string | Signer} signer Private key or ethers Signer of the account
|
|
36
34
|
*/
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return _this;
|
|
35
|
+
constructor(config, signer) {
|
|
36
|
+
super(config, signer);
|
|
37
|
+
this.digestTool = new TraderDigests();
|
|
41
38
|
}
|
|
42
39
|
/**
|
|
43
40
|
* Cancels an existing order on the exchange.
|
|
@@ -60,28 +57,16 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
60
57
|
* main();
|
|
61
58
|
* @returns {ContractTransaction} Contract Transaction (containing events).
|
|
62
59
|
*/
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
return [4 /*yield*/, this.fetchLatestFeedPriceInfo(symbol)];
|
|
74
|
-
case 1:
|
|
75
|
-
submission = _a.sent();
|
|
76
|
-
_a.label = 2;
|
|
77
|
-
case 2:
|
|
78
|
-
orderBookContract = this.getOrderBookContract(symbol);
|
|
79
|
-
return [4 /*yield*/, this._cancelOrder(symbol, orderId, orderBookContract, submission, overrides)];
|
|
80
|
-
case 3: return [2 /*return*/, _a.sent()];
|
|
81
|
-
}
|
|
82
|
-
});
|
|
83
|
-
});
|
|
84
|
-
};
|
|
60
|
+
async cancelOrder(symbol, orderId, submission, overrides) {
|
|
61
|
+
if (this.proxyContract == null || this.signer == null) {
|
|
62
|
+
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
63
|
+
}
|
|
64
|
+
if (submission == undefined) {
|
|
65
|
+
submission = await this.fetchLatestFeedPriceInfo(symbol);
|
|
66
|
+
}
|
|
67
|
+
const orderBookContract = this.getOrderBookContract(symbol);
|
|
68
|
+
return await this._cancelOrder(symbol, orderId, orderBookContract, submission, overrides);
|
|
69
|
+
}
|
|
85
70
|
/**
|
|
86
71
|
* Submits an order to the exchange.
|
|
87
72
|
* @param {Order} order Order structure. As a minimum the structure needs to
|
|
@@ -140,28 +125,18 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
140
125
|
*
|
|
141
126
|
* @returns {ContractTransaction} Contract Transaction (containing events).
|
|
142
127
|
*/
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
}
|
|
156
|
-
orderBookContract = this.getOrderBookContract(order.symbol);
|
|
157
|
-
return [4 /*yield*/, this._order(order, this.traderAddr, this.symbolToPerpStaticInfo, this.proxyContract, orderBookContract, this.chainId, this.signer, parentChildIds, overrides)];
|
|
158
|
-
case 1:
|
|
159
|
-
res = _a.sent();
|
|
160
|
-
return [2 /*return*/, res];
|
|
161
|
-
}
|
|
162
|
-
});
|
|
163
|
-
});
|
|
164
|
-
};
|
|
128
|
+
async order(order, parentChildIds, overrides) {
|
|
129
|
+
if (this.proxyContract == null || this.signer == null) {
|
|
130
|
+
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
131
|
+
}
|
|
132
|
+
let minSize = PerpetualDataHandler._getMinimalPositionSize(order.symbol, this.symbolToPerpStaticInfo);
|
|
133
|
+
if (Math.abs(order.quantity) < minSize) {
|
|
134
|
+
throw Error("order size too small");
|
|
135
|
+
}
|
|
136
|
+
let orderBookContract = this.getOrderBookContract(order.symbol);
|
|
137
|
+
let res = await this._order(order, this.traderAddr, this.symbolToPerpStaticInfo, this.proxyContract, orderBookContract, this.chainId, this.signer, parentChildIds, overrides);
|
|
138
|
+
return res;
|
|
139
|
+
}
|
|
165
140
|
/**
|
|
166
141
|
* Fee charged by the exchange for trading any perpetual on a given pool.
|
|
167
142
|
* It accounts for the current trader's fee tier (based on the trader's D8X balance and trading volume).
|
|
@@ -186,27 +161,17 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
186
161
|
*
|
|
187
162
|
* @returns Exchange fee, in decimals (i.e. 0.1% is 0.001).
|
|
188
163
|
*/
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
}
|
|
201
|
-
poolId = PerpetualDataHandler._getPoolIdFromSymbol(poolSymbolName, this.poolStaticInfos);
|
|
202
|
-
return [4 /*yield*/, this.proxyContract.queryExchangeFee(poolId, this.traderAddr, brokerAddr, overrides || {})];
|
|
203
|
-
case 1:
|
|
204
|
-
feeTbps = _a.sent();
|
|
205
|
-
return [2 /*return*/, feeTbps / 100000];
|
|
206
|
-
}
|
|
207
|
-
});
|
|
208
|
-
});
|
|
209
|
-
};
|
|
164
|
+
async queryExchangeFee(poolSymbolName, brokerAddr, overrides) {
|
|
165
|
+
if (this.proxyContract == null) {
|
|
166
|
+
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
167
|
+
}
|
|
168
|
+
if (typeof brokerAddr == "undefined") {
|
|
169
|
+
brokerAddr = ZERO_ADDRESS;
|
|
170
|
+
}
|
|
171
|
+
let poolId = PerpetualDataHandler._getPoolIdFromSymbol(poolSymbolName, this.poolStaticInfos);
|
|
172
|
+
let feeTbps = await this.proxyContract.queryExchangeFee(poolId, this.traderAddr, brokerAddr, overrides || {});
|
|
173
|
+
return feeTbps / 100000;
|
|
174
|
+
}
|
|
210
175
|
/**
|
|
211
176
|
* Exponentially weighted EMA of the total USD trading volume of all trades performed by this trader.
|
|
212
177
|
* The weights are chosen so that in average this coincides with the 30 day volume.
|
|
@@ -228,24 +193,14 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
228
193
|
*
|
|
229
194
|
* @returns {number} Current trading volume for this trader, in USD.
|
|
230
195
|
*/
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
}
|
|
240
|
-
poolId = WriteAccessHandler._getPoolIdFromSymbol(poolSymbolName, this.poolStaticInfos);
|
|
241
|
-
return [4 /*yield*/, this.proxyContract.getCurrentTraderVolume(poolId, this.traderAddr, overrides || {})];
|
|
242
|
-
case 1:
|
|
243
|
-
volume = _a.sent();
|
|
244
|
-
return [2 /*return*/, ABK64x64ToFloat(volume)];
|
|
245
|
-
}
|
|
246
|
-
});
|
|
247
|
-
});
|
|
248
|
-
};
|
|
196
|
+
async getCurrentTraderVolume(poolSymbolName, overrides) {
|
|
197
|
+
if (this.proxyContract == null || this.signer == null) {
|
|
198
|
+
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
199
|
+
}
|
|
200
|
+
let poolId = WriteAccessHandler._getPoolIdFromSymbol(poolSymbolName, this.poolStaticInfos);
|
|
201
|
+
let volume = await this.proxyContract.getCurrentTraderVolume(poolId, this.traderAddr, overrides || {});
|
|
202
|
+
return ABK64x64ToFloat(volume);
|
|
203
|
+
}
|
|
249
204
|
/**
|
|
250
205
|
*
|
|
251
206
|
* @param symbol Symbol of the form ETH-USD-MATIC.
|
|
@@ -266,22 +221,13 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
266
221
|
*
|
|
267
222
|
* @returns {string[]} Array of Ids for all the orders currently open by this trader.
|
|
268
223
|
*/
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
277
|
-
}
|
|
278
|
-
orderBookContract = this.getOrderBookContract(symbol);
|
|
279
|
-
return [4 /*yield*/, MarketData.orderIdsOfTrader(this.traderAddr, orderBookContract, overrides)];
|
|
280
|
-
case 1: return [2 /*return*/, _a.sent()];
|
|
281
|
-
}
|
|
282
|
-
});
|
|
283
|
-
});
|
|
284
|
-
};
|
|
224
|
+
async getOrderIds(symbol, overrides) {
|
|
225
|
+
if (this.proxyContract == null || this.signer == null) {
|
|
226
|
+
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
227
|
+
}
|
|
228
|
+
let orderBookContract = this.getOrderBookContract(symbol);
|
|
229
|
+
return await MarketData.orderIdsOfTrader(this.traderAddr, orderBookContract, overrides);
|
|
230
|
+
}
|
|
285
231
|
/**
|
|
286
232
|
* Static order function
|
|
287
233
|
* @param order order type (not SmartContractOrder but Order)
|
|
@@ -295,59 +241,37 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
295
241
|
* @returns [transaction hash, order id]
|
|
296
242
|
* @ignore
|
|
297
243
|
*/
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
}
|
|
330
|
-
if (!(submission == undefined)) return [3 /*break*/, 2];
|
|
331
|
-
return [4 /*yield*/, this.fetchLatestFeedPriceInfo(symbol)];
|
|
332
|
-
case 1:
|
|
333
|
-
submission = _c.sent();
|
|
334
|
-
_c.label = 2;
|
|
335
|
-
case 2: return [4 /*yield*/, orderBookContract.orderOfDigest(orderId)];
|
|
336
|
-
case 3:
|
|
337
|
-
scOrder = _c.sent();
|
|
338
|
-
return [4 /*yield*/, this._createSignature(scOrder, this.chainId, false, this.signer, this.proxyAddr)];
|
|
339
|
-
case 4:
|
|
340
|
-
_b = __read.apply(void 0, [_c.sent(), 1]), signature = _b[0];
|
|
341
|
-
// value is minimal necessary by default, but can be overriden
|
|
342
|
-
if (!overrides || overrides.value == undefined) {
|
|
343
|
-
overrides = __assign({ value: submission.timestamps.length * this.PRICE_UPDATE_FEE_GWEI, gasLimit: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.gasLimit) !== null && _a !== void 0 ? _a : this.gasLimit }, overrides);
|
|
344
|
-
}
|
|
345
|
-
return [4 /*yield*/, orderBookContract.cancelOrder(orderId, signature, submission.priceFeedVaas, submission.timestamps, overrides)];
|
|
346
|
-
case 5: return [2 /*return*/, _c.sent()];
|
|
347
|
-
}
|
|
348
|
-
});
|
|
349
|
-
});
|
|
350
|
-
};
|
|
244
|
+
async _order(order, traderAddr, symbolToPerpetualMap, proxyContract, orderBookContract, chainId, signer, parentChildIds, overrides) {
|
|
245
|
+
let scOrder = AccountTrade.toSmartContractOrder(order, traderAddr, symbolToPerpetualMap);
|
|
246
|
+
let clientOrder = AccountTrade.fromSmartContratOrderToClientOrder(scOrder, parentChildIds);
|
|
247
|
+
// if we are here, we have a clean order
|
|
248
|
+
// decide whether to send order to Limit Order Book or AMM based on order type
|
|
249
|
+
let tx;
|
|
250
|
+
// all orders are sent to the order-book
|
|
251
|
+
let [signature, digest] = await this._createSignature(scOrder, chainId, true, signer, proxyContract.address);
|
|
252
|
+
tx = await orderBookContract.postOrder(clientOrder, signature, overrides || { gasLimit: this.gasLimit });
|
|
253
|
+
let id = await this.digestTool.createOrderId(digest);
|
|
254
|
+
return { tx: tx, orderId: id };
|
|
255
|
+
}
|
|
256
|
+
async _cancelOrder(symbol, orderId, orderBookContract, submission, overrides) {
|
|
257
|
+
if (orderBookContract == null || this.signer == null) {
|
|
258
|
+
throw Error(`Order Book contract for symbol ${symbol} or signer not defined`);
|
|
259
|
+
}
|
|
260
|
+
if (submission == undefined) {
|
|
261
|
+
submission = await this.fetchLatestFeedPriceInfo(symbol);
|
|
262
|
+
}
|
|
263
|
+
let scOrder = await orderBookContract.orderOfDigest(orderId);
|
|
264
|
+
let [signature] = await this._createSignature(scOrder, this.chainId, false, this.signer, this.proxyAddr);
|
|
265
|
+
// value is minimal necessary by default, but can be overriden
|
|
266
|
+
if (!overrides || overrides.value == undefined) {
|
|
267
|
+
overrides = {
|
|
268
|
+
value: submission.timestamps.length * this.PRICE_UPDATE_FEE_GWEI,
|
|
269
|
+
gasLimit: overrides?.gasLimit ?? this.gasLimit,
|
|
270
|
+
...overrides,
|
|
271
|
+
};
|
|
272
|
+
}
|
|
273
|
+
return await orderBookContract.cancelOrder(orderId, signature, submission.priceFeedVaas, submission.timestamps, overrides);
|
|
274
|
+
}
|
|
351
275
|
/**
|
|
352
276
|
* Creates a signature
|
|
353
277
|
* @param order smart-contract-type order
|
|
@@ -358,88 +282,57 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
358
282
|
* @returns signature as string
|
|
359
283
|
* @ignore
|
|
360
284
|
*/
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
case 1:
|
|
368
|
-
digest = _a.sent();
|
|
369
|
-
digestBuffer = Buffer.from(digest.substring(2, digest.length), "hex");
|
|
370
|
-
return [4 /*yield*/, signer.signMessage(digestBuffer)];
|
|
371
|
-
case 2:
|
|
372
|
-
signature = _a.sent();
|
|
373
|
-
return [2 /*return*/, [signature, digest]];
|
|
374
|
-
}
|
|
375
|
-
});
|
|
376
|
-
});
|
|
377
|
-
};
|
|
285
|
+
async _createSignature(order, chainId, isNewOrder, signer, proxyAddress) {
|
|
286
|
+
let digest = await this.digestTool.createDigest(order, chainId, isNewOrder, proxyAddress);
|
|
287
|
+
let digestBuffer = Buffer.from(digest.substring(2, digest.length), "hex");
|
|
288
|
+
let signature = await signer.signMessage(digestBuffer);
|
|
289
|
+
return [signature, digest];
|
|
290
|
+
}
|
|
378
291
|
/**
|
|
379
292
|
*
|
|
380
293
|
* @param {string} symbol Symbol of the form ETH-USD-MATIC.
|
|
381
294
|
* @param {number} amount How much collateral to add, in units of collateral currency, e.g. MATIC
|
|
382
295
|
*/
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
if (!overrides || overrides.value == undefined) {
|
|
402
|
-
overrides = __assign({ value: submission.timestamps.length * this.PRICE_UPDATE_FEE_GWEI, gasLimit: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.gasLimit) !== null && _a !== void 0 ? _a : this.gasLimit }, overrides);
|
|
403
|
-
}
|
|
404
|
-
return [4 /*yield*/, this.proxyContract.deposit(perpId, fAmountCC, submission.priceFeedVaas, submission.timestamps, overrides || { gasLimit: this.gasLimit })];
|
|
405
|
-
case 3: return [2 /*return*/, _b.sent()];
|
|
406
|
-
}
|
|
407
|
-
});
|
|
408
|
-
});
|
|
409
|
-
};
|
|
296
|
+
async addCollateral(symbol, amount, submission, overrides) {
|
|
297
|
+
if (this.proxyContract == null || this.signer == null) {
|
|
298
|
+
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
299
|
+
}
|
|
300
|
+
let perpId = this.getPerpIdFromSymbol(symbol);
|
|
301
|
+
let fAmountCC = floatToABK64x64(amount);
|
|
302
|
+
if (submission == undefined) {
|
|
303
|
+
submission = await this.fetchLatestFeedPriceInfo(symbol);
|
|
304
|
+
}
|
|
305
|
+
if (!overrides || overrides.value == undefined) {
|
|
306
|
+
overrides = {
|
|
307
|
+
value: submission.timestamps.length * this.PRICE_UPDATE_FEE_GWEI,
|
|
308
|
+
gasLimit: overrides?.gasLimit ?? this.gasLimit,
|
|
309
|
+
...overrides,
|
|
310
|
+
};
|
|
311
|
+
}
|
|
312
|
+
return await this.proxyContract.deposit(perpId, fAmountCC, submission.priceFeedVaas, submission.timestamps, overrides || { gasLimit: this.gasLimit });
|
|
313
|
+
}
|
|
410
314
|
/**
|
|
411
315
|
*
|
|
412
316
|
* @param {string} symbol Symbol of the form ETH-USD-MATIC.
|
|
413
317
|
* @param {number} amount How much collateral to remove, in units of collateral currency, e.g. MATIC
|
|
414
318
|
*/
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
overrides = __assign({ value: submission.timestamps.length * this.PRICE_UPDATE_FEE_GWEI, gasLimit: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.gasLimit) !== null && _a !== void 0 ? _a : this.gasLimit }, overrides);
|
|
435
|
-
}
|
|
436
|
-
return [4 /*yield*/, this.proxyContract.withdraw(perpId, fAmountCC, submission.priceFeedVaas, submission.timestamps, overrides || { gasLimit: this.gasLimit })];
|
|
437
|
-
case 3: return [2 /*return*/, _b.sent()];
|
|
438
|
-
}
|
|
439
|
-
});
|
|
440
|
-
});
|
|
441
|
-
};
|
|
442
|
-
return AccountTrade;
|
|
443
|
-
}(WriteAccessHandler));
|
|
444
|
-
export default AccountTrade;
|
|
319
|
+
async removeCollateral(symbol, amount, submission, overrides) {
|
|
320
|
+
if (this.proxyContract == null || this.signer == null) {
|
|
321
|
+
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
322
|
+
}
|
|
323
|
+
let perpId = this.getPerpIdFromSymbol(symbol);
|
|
324
|
+
let fAmountCC = floatToABK64x64(amount);
|
|
325
|
+
if (submission == undefined) {
|
|
326
|
+
submission = await this.fetchLatestFeedPriceInfo(symbol);
|
|
327
|
+
}
|
|
328
|
+
if (!overrides || overrides.value == undefined) {
|
|
329
|
+
overrides = {
|
|
330
|
+
value: submission.timestamps.length * this.PRICE_UPDATE_FEE_GWEI,
|
|
331
|
+
gasLimit: overrides?.gasLimit ?? this.gasLimit,
|
|
332
|
+
...overrides,
|
|
333
|
+
};
|
|
334
|
+
}
|
|
335
|
+
return await this.proxyContract.withdraw(perpId, fAmountCC, submission.priceFeedVaas, submission.timestamps, overrides || { gasLimit: this.gasLimit });
|
|
336
|
+
}
|
|
337
|
+
}
|
|
445
338
|
//# sourceMappingURL=accountTrade.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountTrade.js","sourceRoot":"","sources":["../../src/accountTrade.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accountTrade.js","sourceRoot":"","sources":["../../src/accountTrade.ts"],"names":[],"mappings":"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"}
|