@d8x/perpetuals-sdk 0.4.4 → 0.4.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/README.md +10 -10
- package/dist/cjs/accountTrade.d.ts +7 -6
- package/dist/cjs/accountTrade.js +1 -1
- package/dist/cjs/accountTrade.js.map +1 -1
- package/dist/cjs/brokerTool.d.ts +6 -6
- package/dist/cjs/brokerTool.js +16 -14
- package/dist/cjs/brokerTool.js.map +1 -1
- package/dist/cjs/config/priceFeedConfig.json +2 -2
- package/dist/cjs/d8XMath.d.ts +1 -1
- package/dist/cjs/d8XMath.js +10 -10
- package/dist/cjs/d8XMath.js.map +1 -1
- package/dist/cjs/liquidatorTool.d.ts +3 -3
- package/dist/cjs/liquidatorTool.js +1 -1
- package/dist/cjs/liquidatorTool.js.map +1 -1
- package/dist/cjs/liquidityProviderTool.d.ts +4 -4
- package/dist/cjs/liquidityProviderTool.js +2 -2
- package/dist/cjs/liquidityProviderTool.js.map +1 -1
- package/dist/cjs/marketData.d.ts +7 -7
- package/dist/cjs/marketData.js +8 -7
- package/dist/cjs/marketData.js.map +1 -1
- package/dist/cjs/nodeSDKTypes.d.ts +14 -1
- package/dist/cjs/nodeSDKTypes.js +13 -12
- package/dist/cjs/nodeSDKTypes.js.map +1 -1
- package/dist/cjs/orderReferrerTool.d.ts +5 -4
- package/dist/cjs/orderReferrerTool.js +5 -4
- package/dist/cjs/orderReferrerTool.js.map +1 -1
- package/dist/cjs/perpetualDataHandler.d.ts +24 -21
- package/dist/cjs/perpetualDataHandler.js +29 -26
- package/dist/cjs/perpetualDataHandler.js.map +1 -1
- package/dist/cjs/perpetualEventHandler.d.ts +1 -1
- package/dist/cjs/priceFeeds.js +8 -7
- package/dist/cjs/priceFeeds.js.map +1 -1
- package/dist/cjs/traderDigests.js +12 -11
- package/dist/cjs/traderDigests.js.map +1 -1
- package/dist/cjs/traderInterface.d.ts +1 -1
- package/dist/cjs/traderInterface.js +2 -2
- package/dist/cjs/traderInterface.js.map +1 -1
- package/dist/cjs/utils.d.ts +1 -1
- package/dist/cjs/utils.js +2 -2
- 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.d.ts +10 -7
- package/dist/cjs/writeAccessHandler.js +9 -6
- package/dist/cjs/writeAccessHandler.js.map +1 -1
- package/dist/esm/accountTrade.d.ts +7 -6
- package/dist/esm/accountTrade.js +1 -1
- package/dist/esm/accountTrade.js.map +1 -1
- package/dist/esm/brokerTool.d.ts +6 -6
- package/dist/esm/brokerTool.js +14 -12
- package/dist/esm/brokerTool.js.map +1 -1
- package/dist/esm/config/priceFeedConfig.json +2 -2
- package/dist/esm/d8XMath.d.ts +1 -1
- package/dist/esm/d8XMath.js +1 -1
- package/dist/esm/d8XMath.js.map +1 -1
- package/dist/esm/liquidatorTool.d.ts +3 -3
- package/dist/esm/liquidatorTool.js +1 -1
- package/dist/esm/liquidatorTool.js.map +1 -1
- package/dist/esm/liquidityProviderTool.d.ts +4 -4
- package/dist/esm/liquidityProviderTool.js +2 -2
- package/dist/esm/liquidityProviderTool.js.map +1 -1
- package/dist/esm/marketData.d.ts +7 -7
- package/dist/esm/marketData.js +5 -4
- package/dist/esm/marketData.js.map +1 -1
- package/dist/esm/nodeSDKTypes.d.ts +14 -1
- package/dist/esm/nodeSDKTypes.js +4 -3
- package/dist/esm/nodeSDKTypes.js.map +1 -1
- package/dist/esm/orderReferrerTool.d.ts +5 -4
- package/dist/esm/orderReferrerTool.js +4 -3
- package/dist/esm/orderReferrerTool.js.map +1 -1
- package/dist/esm/perpetualDataHandler.d.ts +24 -21
- package/dist/esm/perpetualDataHandler.js +13 -10
- package/dist/esm/perpetualDataHandler.js.map +1 -1
- package/dist/esm/perpetualEventHandler.d.ts +1 -1
- package/dist/esm/priceFeeds.js +6 -5
- package/dist/esm/priceFeeds.js.map +1 -1
- package/dist/esm/traderDigests.js +11 -10
- package/dist/esm/traderDigests.js.map +1 -1
- package/dist/esm/traderInterface.d.ts +1 -1
- package/dist/esm/traderInterface.js +2 -2
- package/dist/esm/traderInterface.js.map +1 -1
- package/dist/esm/utils.d.ts +1 -1
- package/dist/esm/utils.js +1 -1
- 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/writeAccessHandler.d.ts +10 -7
- package/dist/esm/writeAccessHandler.js +9 -6
- package/dist/esm/writeAccessHandler.js.map +1 -1
- package/doc/brokerTool.md +6 -6
- package/doc/d8x-perpetuals-sdk.md +6 -6
- package/package.json +12 -2
- package/dist/cjs/abi/central-park/IPerpetualManager.json +0 -5215
- package/dist/cjs/abi/central-park/LimitOrderBook.json +0 -1075
- package/dist/cjs/abi/central-park/LimitOrderBookFactory.json +0 -135
- package/dist/esm/abi/central-park/IPerpetualManager.json +0 -5215
- package/dist/esm/abi/central-park/LimitOrderBook.json +0 -1075
- package/dist/esm/abi/central-park/LimitOrderBookFactory.json +0 -135
package/README.md
CHANGED
|
@@ -13,17 +13,17 @@ Node TypeScript SDK for D8X Perpetual Futures
|
|
|
13
13
|
- open directory of repo and type `yarn` to install packages
|
|
14
14
|
|
|
15
15
|
#### Optional
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
-
|
|
20
|
-
|
|
21
|
-
- For the D8X fork (with `api/latest_vaas_px`) to run, you need to build the image as described in the last [paragraph of the Readme here](https://github.com/D8-X/pyth-crosschain-d8x/tree/main/price_service/server).
|
|
16
|
+
|
|
17
|
+
- Pyth recommends to run your own Pyth-price service
|
|
18
|
+
- Follow the instructions on [Wormhole Spy](https://github.com/pyth-network/pyth-crosschain/tree/main/price_service/server), specifically
|
|
19
|
+
- Copy `.env.example` into `.env` and edit as described in the Readme
|
|
20
|
+
- To run the price service, you need to build the image as described in the last [paragraph of the Readme here](https://github.com/pyth-network/pyth-crosschain/tree/main/price_service/server).
|
|
22
21
|
Ensure your own price server is enabled in docker-compose:
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
```
|
|
23
|
+
# image: public.ecr.aws/pyth-network/xc-server:v3.0.0
|
|
24
|
+
image: pyth_price_server
|
|
25
|
+
```
|
|
26
|
+
|
|
27
27
|
### Test
|
|
28
28
|
|
|
29
29
|
`yarn test`
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Signer } from "@ethersproject/abstract-signer";
|
|
2
|
+
import { Contract, ContractTransaction } from "@ethersproject/contracts";
|
|
2
3
|
import { NodeSDKConfig, Order, OrderResponse, PerpetualStaticInfo, PriceFeedSubmission } from "./nodeSDKTypes";
|
|
3
4
|
import TraderDigests from "./traderDigests";
|
|
4
5
|
import WriteAccessHandler from "./writeAccessHandler";
|
|
@@ -52,7 +53,7 @@ export default class AccountTrade extends WriteAccessHandler {
|
|
|
52
53
|
* main();
|
|
53
54
|
* @returns {ContractTransaction} Contract Transaction (containing events).
|
|
54
55
|
*/
|
|
55
|
-
cancelOrder(symbol: string, orderId: string, submission?: PriceFeedSubmission): Promise<
|
|
56
|
+
cancelOrder(symbol: string, orderId: string, submission?: PriceFeedSubmission): Promise<ContractTransaction>;
|
|
56
57
|
/**
|
|
57
58
|
* Submits an order to the exchange.
|
|
58
59
|
* @param {Order} order Order structure. As a minimum the structure needs to
|
|
@@ -193,8 +194,8 @@ export default class AccountTrade extends WriteAccessHandler {
|
|
|
193
194
|
* @returns [transaction hash, order id]
|
|
194
195
|
* @ignore
|
|
195
196
|
*/
|
|
196
|
-
_order(order: Order, traderAddr: string, symbolToPerpetualMap: Map<string, PerpetualStaticInfo>, proxyContract:
|
|
197
|
-
protected _cancelOrder(symbol: string, orderId: string, orderBookContract:
|
|
197
|
+
_order(order: Order, traderAddr: string, symbolToPerpetualMap: Map<string, PerpetualStaticInfo>, proxyContract: Contract, orderBookContract: Contract, chainId: number, signer: Signer, gasLimit: number, parentChildIds?: [string, string]): Promise<OrderResponse>;
|
|
198
|
+
protected _cancelOrder(symbol: string, orderId: string, orderBookContract: Contract | null, submission?: PriceFeedSubmission): Promise<ContractTransaction>;
|
|
198
199
|
/**
|
|
199
200
|
* Creates a signature
|
|
200
201
|
* @param order smart-contract-type order
|
|
@@ -211,11 +212,11 @@ export default class AccountTrade extends WriteAccessHandler {
|
|
|
211
212
|
* @param {string} symbol Symbol of the form ETH-USD-MATIC.
|
|
212
213
|
* @param {number} amount How much collateral to add, in units of collateral currency, e.g. MATIC
|
|
213
214
|
*/
|
|
214
|
-
addCollateral(symbol: string, amount: number, submission?: PriceFeedSubmission): Promise<
|
|
215
|
+
addCollateral(symbol: string, amount: number, submission?: PriceFeedSubmission): Promise<ContractTransaction>;
|
|
215
216
|
/**
|
|
216
217
|
*
|
|
217
218
|
* @param {string} symbol Symbol of the form ETH-USD-MATIC.
|
|
218
219
|
* @param {number} amount How much collateral to remove, in units of collateral currency, e.g. MATIC
|
|
219
220
|
*/
|
|
220
|
-
removeCollateral(symbol: string, amount: number, submission?: PriceFeedSubmission): Promise<
|
|
221
|
+
removeCollateral(symbol: string, amount: number, submission?: PriceFeedSubmission): Promise<ContractTransaction>;
|
|
221
222
|
}
|
package/dist/cjs/accountTrade.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
+
var buffer_1 = require("buffer");
|
|
4
5
|
var d8XMath_1 = require("./d8XMath");
|
|
5
6
|
var marketData_1 = tslib_1.__importDefault(require("./marketData"));
|
|
6
7
|
var nodeSDKTypes_1 = require("./nodeSDKTypes");
|
|
7
8
|
var perpetualDataHandler_1 = tslib_1.__importDefault(require("./perpetualDataHandler"));
|
|
8
9
|
var traderDigests_1 = tslib_1.__importDefault(require("./traderDigests"));
|
|
9
10
|
var writeAccessHandler_1 = tslib_1.__importDefault(require("./writeAccessHandler"));
|
|
10
|
-
var buffer_1 = require("buffer");
|
|
11
11
|
/**
|
|
12
12
|
* Functions to create, submit and cancel orders on the exchange.
|
|
13
13
|
* This class requires a private key and executes smart-contract interactions that
|
|
@@ -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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"}
|
package/dist/cjs/brokerTool.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { ContractTransaction } from "@ethersproject/contracts";
|
|
2
2
|
import { NodeSDKConfig, Order } from "./nodeSDKTypes";
|
|
3
|
-
import
|
|
3
|
+
import WriteAccessHandler from "./writeAccessHandler";
|
|
4
4
|
/**
|
|
5
5
|
* Functions for brokers to determine fees, deposit lots, and sign-up traders.
|
|
6
6
|
* This class requires a private key and executes smart-contract interactions that
|
|
@@ -243,9 +243,9 @@ export default class BrokerTool extends WriteAccessHandler {
|
|
|
243
243
|
* }
|
|
244
244
|
* main();
|
|
245
245
|
*
|
|
246
|
-
* @returns {
|
|
246
|
+
* @returns {ContractTransaction} ContractTransaction object.
|
|
247
247
|
*/
|
|
248
|
-
brokerDepositToDefaultFund(poolSymbolName: string, lots: number): Promise<
|
|
248
|
+
brokerDepositToDefaultFund(poolSymbolName: string, lots: number): Promise<ContractTransaction>;
|
|
249
249
|
/**
|
|
250
250
|
* Adds this broker's signature to an order. An order signed by a broker is considered
|
|
251
251
|
* to be routed through this broker and benefits from the broker's fee conditions.
|
|
@@ -312,7 +312,7 @@ export default class BrokerTool extends WriteAccessHandler {
|
|
|
312
312
|
* }
|
|
313
313
|
* main();
|
|
314
314
|
*
|
|
315
|
-
* @returns {
|
|
315
|
+
* @returns {ContractTransaction} ethers transaction object
|
|
316
316
|
*/
|
|
317
|
-
transferOwnership(poolSymbolName: string, newAddress: string): Promise<
|
|
317
|
+
transferOwnership(poolSymbolName: string, newAddress: string): Promise<ContractTransaction>;
|
|
318
318
|
}
|
package/dist/cjs/brokerTool.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
-
var
|
|
5
|
-
var
|
|
4
|
+
var abi_1 = require("@ethersproject/abi");
|
|
5
|
+
var bignumber_1 = require("@ethersproject/bignumber");
|
|
6
|
+
var keccak256_1 = require("@ethersproject/keccak256");
|
|
6
7
|
var d8XMath_1 = require("./d8XMath");
|
|
7
|
-
var
|
|
8
|
-
var
|
|
8
|
+
var perpetualDataHandler_1 = tslib_1.__importDefault(require("./perpetualDataHandler"));
|
|
9
|
+
var writeAccessHandler_1 = tslib_1.__importDefault(require("./writeAccessHandler"));
|
|
9
10
|
var buffer_1 = require("buffer");
|
|
11
|
+
var accountTrade_1 = tslib_1.__importDefault(require("./accountTrade"));
|
|
10
12
|
/**
|
|
11
13
|
* Functions for brokers to determine fees, deposit lots, and sign-up traders.
|
|
12
14
|
* This class requires a private key and executes smart-contract interactions that
|
|
@@ -406,7 +408,7 @@ var BrokerTool = /** @class */ (function (_super) {
|
|
|
406
408
|
* }
|
|
407
409
|
* main();
|
|
408
410
|
*
|
|
409
|
-
* @returns {
|
|
411
|
+
* @returns {ContractTransaction} ContractTransaction object.
|
|
410
412
|
*/
|
|
411
413
|
BrokerTool.prototype.brokerDepositToDefaultFund = function (poolSymbolName, lots) {
|
|
412
414
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
@@ -470,7 +472,7 @@ var BrokerTool = /** @class */ (function (_super) {
|
|
|
470
472
|
}
|
|
471
473
|
order.brokerAddr = this.traderAddr;
|
|
472
474
|
_a = order;
|
|
473
|
-
return [4 /*yield*/, BrokerTool._signOrder(order.symbol, order.brokerFeeTbps, traderAddr,
|
|
475
|
+
return [4 /*yield*/, BrokerTool._signOrder(order.symbol, order.brokerFeeTbps, traderAddr, bignumber_1.BigNumber.from(order.deadline), this.signer, this.chainId, this.proxyAddr, this.symbolToPerpStaticInfo)];
|
|
474
476
|
case 1:
|
|
475
477
|
_a.brokerSignature = _b.sent();
|
|
476
478
|
return [2 /*return*/, order];
|
|
@@ -497,7 +499,7 @@ var BrokerTool = /** @class */ (function (_super) {
|
|
|
497
499
|
if (this.proxyContract == null || this.signer == null) {
|
|
498
500
|
throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
|
|
499
501
|
}
|
|
500
|
-
iDeadline =
|
|
502
|
+
iDeadline = bignumber_1.BigNumber.from(deadline);
|
|
501
503
|
brokerFeeTbps = 100000 * brokerFee;
|
|
502
504
|
return [4 /*yield*/, BrokerTool._signOrder(symbol, brokerFeeTbps, traderAddr, iDeadline, this.signer, this.chainId, this.proxyAddr, this.symbolToPerpStaticInfo)];
|
|
503
505
|
case 1: return [2 /*return*/, _a.sent()];
|
|
@@ -512,13 +514,13 @@ var BrokerTool = /** @class */ (function (_super) {
|
|
|
512
514
|
switch (_a.label) {
|
|
513
515
|
case 0:
|
|
514
516
|
NAME = "Perpetual Trade Manager";
|
|
515
|
-
DOMAIN_TYPEHASH =
|
|
516
|
-
abiCoder =
|
|
517
|
-
domainSeparator =
|
|
518
|
-
TRADE_BROKER_TYPEHASH =
|
|
517
|
+
DOMAIN_TYPEHASH = (0, keccak256_1.keccak256)(buffer_1.Buffer.from("EIP712Domain(string name,uint256 chainId,address verifyingContract)"));
|
|
518
|
+
abiCoder = abi_1.defaultAbiCoder;
|
|
519
|
+
domainSeparator = (0, keccak256_1.keccak256)(abiCoder.encode(["bytes32", "bytes32", "uint256", "address"], [DOMAIN_TYPEHASH, (0, keccak256_1.keccak256)(buffer_1.Buffer.from(NAME)), chainId, proxyAddress]));
|
|
520
|
+
TRADE_BROKER_TYPEHASH = (0, keccak256_1.keccak256)(buffer_1.Buffer.from("Order(uint24 iPerpetualId,uint16 brokerFeeTbps,address traderAddr,uint64 iDeadline)"));
|
|
519
521
|
iPerpetualId = perpetualDataHandler_1.default.symbolToPerpetualId(symbol, symbolToPerpStaticInfo);
|
|
520
|
-
structHash =
|
|
521
|
-
digest =
|
|
522
|
+
structHash = (0, keccak256_1.keccak256)(abiCoder.encode(["bytes32", "uint24", "uint16", "address", "uint64"], [TRADE_BROKER_TYPEHASH, iPerpetualId, brokerFeeTbps, traderAddr, iDeadline]));
|
|
523
|
+
digest = (0, keccak256_1.keccak256)(abiCoder.encode(["bytes32", "bytes32"], [domainSeparator, structHash]));
|
|
522
524
|
digestBuffer = buffer_1.Buffer.from(digest.substring(2, digest.length), "hex");
|
|
523
525
|
return [4 /*yield*/, signer.signMessage(digestBuffer)];
|
|
524
526
|
case 1: return [2 /*return*/, _a.sent()];
|
|
@@ -548,7 +550,7 @@ var BrokerTool = /** @class */ (function (_super) {
|
|
|
548
550
|
* }
|
|
549
551
|
* main();
|
|
550
552
|
*
|
|
551
|
-
* @returns {
|
|
553
|
+
* @returns {ContractTransaction} ethers transaction object
|
|
552
554
|
*/
|
|
553
555
|
BrokerTool.prototype.transferOwnership = function (poolSymbolName, newAddress) {
|
|
554
556
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brokerTool.js","sourceRoot":"","sources":["../../src/brokerTool.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"brokerTool.js","sourceRoot":"","sources":["../../src/brokerTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"origin": "FX.USD/JPY"
|
|
58
58
|
}
|
|
59
59
|
],
|
|
60
|
-
"endpoints": [{ "type": "pyth", "endpoint": "https://
|
|
60
|
+
"endpoints": [{ "type": "pyth", "endpoint": "https://xc-testnet.pyth.network/api" }]
|
|
61
61
|
},
|
|
62
62
|
{
|
|
63
63
|
"network": "mainnet",
|
|
@@ -99,6 +99,6 @@
|
|
|
99
99
|
"origin": "Metal.XAU/USD"
|
|
100
100
|
}
|
|
101
101
|
],
|
|
102
|
-
"endpoints": [{ "type": "pyth", "endpoint": "" }]
|
|
102
|
+
"endpoints": [{ "type": "pyth", "endpoint": "https://xc-mainnet.pyth.network/api" }]
|
|
103
103
|
}
|
|
104
104
|
]
|
package/dist/cjs/d8XMath.d.ts
CHANGED
package/dist/cjs/d8XMath.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getDepositAmountForLvgTrade = exports.getNewPositionLeverage = exports.getMaxSignedPositionSize = exports.getMarginRequiredForLeveragedTrade = exports.calculateLiquidationPriceCollateralQuote = exports.calculateLiquidationPriceCollateralQuanto = exports.calculateLiquidationPriceCollateralBase = exports.div64x64 = exports.mul64x64 = exports.roundToLotString = exports.countDecimalsOf = exports.floatToDec18 = exports.floatToABK64x64 = exports.dec18ToFloat = exports.decNToFloat = exports.ABK64x64ToFloat = exports.ABDK29ToFloat = void 0;
|
|
4
|
-
var
|
|
4
|
+
var bignumber_1 = require("@ethersproject/bignumber");
|
|
5
5
|
var nodeSDKTypes_1 = require("./nodeSDKTypes");
|
|
6
6
|
/**
|
|
7
7
|
* @module d8xMath
|
|
@@ -30,7 +30,7 @@ function ABK64x64ToFloat(x) {
|
|
|
30
30
|
var s = x.lt(0) ? -1 : 1;
|
|
31
31
|
x = x.mul(s);
|
|
32
32
|
var xInt = x.div(nodeSDKTypes_1.ONE_64x64);
|
|
33
|
-
var dec18 =
|
|
33
|
+
var dec18 = bignumber_1.BigNumber.from(10).pow(bignumber_1.BigNumber.from(18));
|
|
34
34
|
var xDec = x.sub(xInt.mul(nodeSDKTypes_1.ONE_64x64));
|
|
35
35
|
xDec = xDec.mul(dec18).div(nodeSDKTypes_1.ONE_64x64);
|
|
36
36
|
var k = 18 - xDec.toString().length;
|
|
@@ -47,7 +47,7 @@ exports.ABK64x64ToFloat = ABK64x64ToFloat;
|
|
|
47
47
|
*/
|
|
48
48
|
function decNToFloat(x, numDec) {
|
|
49
49
|
//x: BigNumber in DecN format to float
|
|
50
|
-
var DECIMALS =
|
|
50
|
+
var DECIMALS = bignumber_1.BigNumber.from(10).pow(bignumber_1.BigNumber.from(numDec));
|
|
51
51
|
var s = x.lt(0) ? -1 : 1;
|
|
52
52
|
x = x.mul(s);
|
|
53
53
|
var xInt = x.div(DECIMALS);
|
|
@@ -84,16 +84,16 @@ function floatToABK64x64(x) {
|
|
|
84
84
|
// convert float to ABK64x64 bigint-format
|
|
85
85
|
// Create string from number with 18 decimals
|
|
86
86
|
if (x === 0) {
|
|
87
|
-
return
|
|
87
|
+
return bignumber_1.BigNumber.from(0);
|
|
88
88
|
}
|
|
89
89
|
var sg = Math.sign(x);
|
|
90
90
|
x = Math.abs(x);
|
|
91
91
|
var strX = Number(x).toFixed(18);
|
|
92
92
|
var arrX = strX.split(".");
|
|
93
|
-
var xInt =
|
|
94
|
-
var xDec =
|
|
93
|
+
var xInt = bignumber_1.BigNumber.from(arrX[0]);
|
|
94
|
+
var xDec = bignumber_1.BigNumber.from(arrX[1]);
|
|
95
95
|
var xIntBig = xInt.mul(nodeSDKTypes_1.ONE_64x64);
|
|
96
|
-
var dec18 =
|
|
96
|
+
var dec18 = bignumber_1.BigNumber.from(10).pow(bignumber_1.BigNumber.from(18));
|
|
97
97
|
var xDecBig = xDec.mul(nodeSDKTypes_1.ONE_64x64).div(dec18);
|
|
98
98
|
return xIntBig.add(xDecBig).mul(sg);
|
|
99
99
|
}
|
|
@@ -106,14 +106,14 @@ exports.floatToABK64x64 = floatToABK64x64;
|
|
|
106
106
|
function floatToDec18(x) {
|
|
107
107
|
// float number to dec 18
|
|
108
108
|
if (x === 0) {
|
|
109
|
-
return
|
|
109
|
+
return bignumber_1.BigNumber.from(0);
|
|
110
110
|
}
|
|
111
111
|
var sg = Math.sign(x);
|
|
112
112
|
x = Math.abs(x);
|
|
113
113
|
var strX = x.toFixed(18);
|
|
114
114
|
var arrX = strX.split(".");
|
|
115
|
-
var xInt =
|
|
116
|
-
var xDec =
|
|
115
|
+
var xInt = bignumber_1.BigNumber.from(arrX[0]);
|
|
116
|
+
var xDec = bignumber_1.BigNumber.from(arrX[1]);
|
|
117
117
|
var xIntBig = xInt.mul(nodeSDKTypes_1.DECIMALS);
|
|
118
118
|
return xIntBig.add(xDec).mul(sg);
|
|
119
119
|
}
|
package/dist/cjs/d8XMath.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d8XMath.js","sourceRoot":"","sources":["../../src/d8XMath.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"d8XMath.js","sourceRoot":"","sources":["../../src/d8XMath.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { ContractTransaction } from "@ethersproject/contracts";
|
|
2
2
|
import { NodeSDKConfig, PriceFeedSubmission } from "./nodeSDKTypes";
|
|
3
|
-
import
|
|
3
|
+
import WriteAccessHandler from "./writeAccessHandler";
|
|
4
4
|
/**
|
|
5
5
|
* Functions to liquidate traders. This class requires a private key
|
|
6
6
|
* and executes smart-contract interactions that require gas-payments.
|
|
@@ -53,7 +53,7 @@ export default class LiquidatorTool extends WriteAccessHandler {
|
|
|
53
53
|
*
|
|
54
54
|
* @returns Transaction object.
|
|
55
55
|
*/
|
|
56
|
-
liquidateTrader(symbol: string, traderAddr: string, liquidatorAddr?: string, priceFeedData?: PriceFeedSubmission): Promise<
|
|
56
|
+
liquidateTrader(symbol: string, traderAddr: string, liquidatorAddr?: string, priceFeedData?: PriceFeedSubmission): Promise<ContractTransaction>;
|
|
57
57
|
/**
|
|
58
58
|
* Check if the collateral of a trader is above the maintenance margin ("maintenance margin safe").
|
|
59
59
|
* If not, the position can be liquidated.
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
-
var writeAccessHandler_1 = tslib_1.__importDefault(require("./writeAccessHandler"));
|
|
5
4
|
var d8XMath_1 = require("./d8XMath");
|
|
5
|
+
var writeAccessHandler_1 = tslib_1.__importDefault(require("./writeAccessHandler"));
|
|
6
6
|
/**
|
|
7
7
|
* Functions to liquidate traders. This class requires a private key
|
|
8
8
|
* and executes smart-contract interactions that require gas-payments.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liquidatorTool.js","sourceRoot":"","sources":["../../src/liquidatorTool.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"liquidatorTool.js","sourceRoot":"","sources":["../../src/liquidatorTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ContractTransaction } from "@ethersproject/contracts";
|
|
2
2
|
import { NodeSDKConfig } from "./nodeSDKTypes";
|
|
3
3
|
import WriteAccessHandler from "./writeAccessHandler";
|
|
4
4
|
/**
|
|
@@ -76,7 +76,7 @@ export default class LiquidityProviderTool extends WriteAccessHandler {
|
|
|
76
76
|
*
|
|
77
77
|
* @return Transaction object
|
|
78
78
|
*/
|
|
79
|
-
addLiquidity(poolSymbolName: string, amountCC: number): Promise<
|
|
79
|
+
addLiquidity(poolSymbolName: string, amountCC: number): Promise<ContractTransaction>;
|
|
80
80
|
/**
|
|
81
81
|
* Initiates a liquidity withdrawal from the pool
|
|
82
82
|
* It triggers a time-delayed unlocking of the given number of pool shares.
|
|
@@ -100,7 +100,7 @@ export default class LiquidityProviderTool extends WriteAccessHandler {
|
|
|
100
100
|
*
|
|
101
101
|
* @return Transaction object.
|
|
102
102
|
*/
|
|
103
|
-
initiateLiquidityWithdrawal(poolSymbolName: string, amountPoolShares: number): Promise<
|
|
103
|
+
initiateLiquidityWithdrawal(poolSymbolName: string, amountPoolShares: number): Promise<ContractTransaction>;
|
|
104
104
|
/**
|
|
105
105
|
* Withdraws as much liquidity as there is available after a call to initiateLiquidityWithdrawal.
|
|
106
106
|
* The address loses pool shares in return.
|
|
@@ -122,5 +122,5 @@ export default class LiquidityProviderTool extends WriteAccessHandler {
|
|
|
122
122
|
*
|
|
123
123
|
* @returns Transaction object.
|
|
124
124
|
*/
|
|
125
|
-
executeLiquidityWithdrawal(poolSymbolName: string): Promise<
|
|
125
|
+
executeLiquidityWithdrawal(poolSymbolName: string): Promise<ContractTransaction>;
|
|
126
126
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
-
var
|
|
4
|
+
var contracts_1 = require("@ethersproject/contracts");
|
|
5
5
|
var d8XMath_1 = require("./d8XMath");
|
|
6
6
|
var nodeSDKTypes_1 = require("./nodeSDKTypes");
|
|
7
7
|
var perpetualDataHandler_1 = tslib_1.__importDefault(require("./perpetualDataHandler"));
|
|
@@ -71,7 +71,7 @@ var LiquidityProviderTool = /** @class */ (function (_super) {
|
|
|
71
71
|
}
|
|
72
72
|
poolId = perpetualDataHandler_1.default._getPoolIdFromSymbol(poolSymbolName, this.poolStaticInfos);
|
|
73
73
|
shareTokenAddr = this.poolStaticInfos[poolId - 1].shareTokenAddr;
|
|
74
|
-
shareToken = new
|
|
74
|
+
shareToken = new contracts_1.Contract(shareTokenAddr, nodeSDKTypes_1.ERC20_ABI, this.signer);
|
|
75
75
|
return [4 /*yield*/, shareToken.balanceOf(this.traderAddr)];
|
|
76
76
|
case 1:
|
|
77
77
|
dShareTokenBalanceOfAddr = _a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liquidityProviderTool.js","sourceRoot":"","sources":["../../src/liquidityProviderTool.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"liquidityProviderTool.js","sourceRoot":"","sources":["../../src/liquidityProviderTool.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/marketData.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import "
|
|
1
|
+
import { Contract } from "@ethersproject/contracts";
|
|
2
|
+
import { Provider } from "@ethersproject/providers";
|
|
3
3
|
import { ExchangeInfo, MarginAccount, NodeSDKConfig, Order, PerpetualState, PerpetualStaticInfo, PoolStaticInfo, SmartContractOrder } from "./nodeSDKTypes";
|
|
4
4
|
import PerpetualDataHandler from "./perpetualDataHandler";
|
|
5
5
|
import PriceFeeds from "./priceFeeds";
|
|
@@ -35,7 +35,7 @@ export default class MarketData extends PerpetualDataHandler {
|
|
|
35
35
|
* about perpetual currencies
|
|
36
36
|
* @param provider optional provider
|
|
37
37
|
*/
|
|
38
|
-
createProxyInstance(provider?:
|
|
38
|
+
createProxyInstance(provider?: Provider): Promise<void>;
|
|
39
39
|
/**
|
|
40
40
|
* Get the proxy address
|
|
41
41
|
* @returns Address of the perpetual proxy contract
|
|
@@ -65,7 +65,7 @@ export default class MarketData extends PerpetualDataHandler {
|
|
|
65
65
|
*
|
|
66
66
|
* @returns read-only proxy instance
|
|
67
67
|
*/
|
|
68
|
-
getReadOnlyProxyInstance():
|
|
68
|
+
getReadOnlyProxyInstance(): Contract;
|
|
69
69
|
/**
|
|
70
70
|
* Information about the products traded in the exchange.
|
|
71
71
|
* @example
|
|
@@ -280,7 +280,7 @@ export default class MarketData extends PerpetualDataHandler {
|
|
|
280
280
|
* @returns {Order[]} Array of user friendly order struct.
|
|
281
281
|
* @ignore
|
|
282
282
|
*/
|
|
283
|
-
protected openOrdersOnOrderBook(traderAddr: string, orderBookContract:
|
|
283
|
+
protected openOrdersOnOrderBook(traderAddr: string, orderBookContract: Contract): Promise<Order[]>;
|
|
284
284
|
/**
|
|
285
285
|
*
|
|
286
286
|
* @param traderAddr Address of the trader
|
|
@@ -288,7 +288,7 @@ export default class MarketData extends PerpetualDataHandler {
|
|
|
288
288
|
* @returns Array of order-id's
|
|
289
289
|
* @ignore
|
|
290
290
|
*/
|
|
291
|
-
static orderIdsOfTrader(traderAddr: string, orderBookContract:
|
|
291
|
+
static orderIdsOfTrader(traderAddr: string, orderBookContract: Contract): Promise<string[]>;
|
|
292
292
|
/**
|
|
293
293
|
* Query the available margin conditional on the given (or current) index prices
|
|
294
294
|
* Result is in collateral currency
|
|
@@ -331,5 +331,5 @@ export default class MarketData extends PerpetualDataHandler {
|
|
|
331
331
|
private static _queryMidPrices;
|
|
332
332
|
private static _queryPoolStates;
|
|
333
333
|
private static _queryPerpetualStates;
|
|
334
|
-
static _exchangeInfo(_proxyContract:
|
|
334
|
+
static _exchangeInfo(_proxyContract: Contract, _poolStaticInfos: Array<PoolStaticInfo>, _symbolToPerpStaticInfo: Map<string, PerpetualStaticInfo>, _perpetualIdToSymbol: Map<number, string>, _nestedPerpetualIDs: Array<Array<number>>, _symbolList: Map<string, string>, _priceFeedGetter: PriceFeeds): Promise<ExchangeInfo>;
|
|
335
335
|
}
|