@d8x/perpetuals-sdk 0.7.4 → 0.7.6

package/dist/esm/utils.js

@@ -1,4 +1,3 @@
-import { __read, __values } from "tslib";
 import { BigNumber } from "@ethersproject/bignumber";
 import { Buffer } from "buffer";
 /**
@@ -17,7 +16,7 @@ export function to4Chars(s) {
     while (s.length < 4) {
         s = s + "\0";
     }
-    var k = s.length - 1;
+    let k = s.length - 1;
     while (s.length > 4 && k >= 0) {
         // chop off vocals from the end of string
         // e.g. MATIC -> MATC
@@ -40,7 +39,7 @@ export function to4Chars(s) {
  */
 export function toBytes4(s) {
     s = to4Chars(s);
-    var valBuff = Buffer.from(s, "ascii");
+    let valBuff = Buffer.from(s, "ascii");
     return valBuff;
 }
 /**
@@ -51,7 +50,7 @@ export function toBytes4(s) {
  * @returns {string} String decoded into to4Chars-type string without null characters
  */
 export function fromBytes4(b) {
-    var val = b.toString("ascii");
+    let val = b.toString("ascii");
     val = val.replace(/\0/g, "");
     return val;
 }
@@ -64,8 +63,8 @@ export function fromBytes4(b) {
  * returned by the smart contract as bytes4
  */
 export function fromBytes4HexString(s) {
-    var res = "";
-    for (var k = 2; k < s.length; k = k + 2) {
+    let res = "";
+    for (let k = 2; k < s.length; k = k + 2) {
         res = res + String.fromCharCode(parseInt(s.substring(k, k + 2), 16));
     }
     res = res.replace(/\0/g, "");
@@ -78,10 +77,9 @@ export function fromBytes4HexString(s) {
  * @returns {string} User friendly currency symbol, e.g. "MATIC"
  */
 export function contractSymbolToSymbol(s, mapping) {
-    var _a;
-    var shortCCY = fromBytes4HexString(s);
+    let shortCCY = fromBytes4HexString(s);
     // assume CCY is already short if not in the mapping file
-    var longCCY = (_a = mapping.get(shortCCY)) !== null && _a !== void 0 ? _a : shortCCY;
+    let longCCY = mapping.get(shortCCY) ?? shortCCY;
     return longCCY;
 }
 /**
@@ -91,25 +89,14 @@ export function contractSymbolToSymbol(s, mapping) {
  * @returns {Buffer} Buffer that can be used with smart contract to identify tokens
  */
 export function symbolToContractSymbol(s, mapping) {
-    var e_1, _a;
-    var shortCCY = undefined;
-    try {
-        for (var mapping_1 = __values(mapping), mapping_1_1 = mapping_1.next(); !mapping_1_1.done; mapping_1_1 = mapping_1.next()) {
-            var _b = __read(mapping_1_1.value, 2), k = _b[0], v = _b[1];
-            if (v == s) {
-                shortCCY = k;
-            }
+    let shortCCY = undefined;
+    for (let [k, v] of mapping) {
+        if (v == s) {
+            shortCCY = k;
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (mapping_1_1 && !mapping_1_1.done && (_a = mapping_1.return)) _a.call(mapping_1);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
     // if not in the mapping file, assume ccy is already valid
-    shortCCY = shortCCY !== null && shortCCY !== void 0 ? shortCCY : s;
+    shortCCY = shortCCY ?? s;
     return toBytes4(shortCCY);
 }
 /**
@@ -119,11 +106,10 @@ export function symbolToContractSymbol(s, mapping) {
  * @returns {string} long format e.g. MATIC. if not found the element is ""
  */
 export function symbol4BToLongSymbol(s, mapping) {
-    var _a;
-    var ccy = s.split("-");
-    var longCCY = "";
-    for (var k = 0; k < ccy.length; k++) {
-        var sym = (_a = mapping.get(ccy[k])) !== null && _a !== void 0 ? _a : to4Chars(ccy[k]);
+    let ccy = s.split("-");
+    let longCCY = "";
+    for (let k = 0; k < ccy.length; k++) {
+        let sym = mapping.get(ccy[k]) ?? to4Chars(ccy[k]);
         sym = sym.replace(/\0/g, "");
         longCCY = longCCY + "-" + sym;
     }

package/dist/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const D8X_SDK_VERSION = "0.7.4";
+export declare const D8X_SDK_VERSION = "0.7.6";

package/dist/esm/version.js

@@ -1,2 +1,2 @@
-export var D8X_SDK_VERSION = "0.7.4";
+export const D8X_SDK_VERSION = "0.7.6";
 //# sourceMappingURL=version.js.map

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,eAAe,GAAG,OAAO,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC"}

package/dist/esm/writeAccessHandler.js

@@ -1,10 +1,9 @@
-import { __assign, __awaiter, __extends, __generator } from "tslib";
 import { Contract } from "@ethersproject/contracts";
 import { StaticJsonRpcProvider } from "@ethersproject/providers";
 import { parseEther } from "@ethersproject/units";
 import { Wallet } from "@ethersproject/wallet";
 import { ERC20__factory } from "./contracts";
-import { floatToDec18 } from "./d8XMath";
+import { floatToDecN } from "./d8XMath";
 import { MAX_UINT_256, MOCK_TOKEN_SWAP_ABI } from "./nodeSDKTypes";
 import PerpetualDataHandler from "./perpetualDataHandler";
 /**
@@ -14,27 +13,25 @@ import PerpetualDataHandler from "./perpetualDataHandler";
  * require gas-payments.
  * @extends PerpetualDataHandler
  */
-var WriteAccessHandler = /** @class */ (function (_super) {
-    __extends(WriteAccessHandler, _super);
+export default class WriteAccessHandler extends PerpetualDataHandler {
     /**
      * Constructor
      * @param {string | Signer} signer Private key or ethers Signer of the account
      */
-    function WriteAccessHandler(config, signer) {
-        var _this = _super.call(this, config) || this;
-        _this.traderAddr = "";
-        _this.signer = null;
-        _this.gasLimit = 15000000;
+    constructor(config, signer) {
+        super(config);
+        this.traderAddr = "";
+        this.signer = null;
+        this.gasLimit = 15000000;
         if (typeof signer == "string") {
-            _this.privateKey = signer;
+            this.privateKey = signer;
         }
         else {
-            _this.signer = signer;
+            this.signer = signer;
         }
         if (config.gasLimit != undefined) {
-            _this.gasLimit = config.gasLimit;
+            this.gasLimit = config.gasLimit;
         }
-        return _this;
     }
     /**
      * Initialize the writeAccessHandler-Class with this function
@@ -42,80 +39,55 @@ var WriteAccessHandler = /** @class */ (function (_super) {
      * about perpetual currencies
      * @param provider optional provider
      */
-    WriteAccessHandler.prototype.createProxyInstance = function (provider, overrides) {
-        return __awaiter(this, void 0, void 0, function () {
-            var wallet, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (provider == undefined) {
-                            this.provider = new StaticJsonRpcProvider(this.nodeURL);
-                        }
-                        else {
-                            this.provider = provider;
-                        }
-                        if (!this.signer) {
-                            wallet = new Wallet(this.privateKey);
-                            this.signer = wallet.connect(this.provider);
-                        }
-                        return [4 /*yield*/, this.initContractsAndData(this.signer, overrides)];
-                    case 1:
-                        _b.sent();
-                        _a = this;
-                        return [4 /*yield*/, this.signer.getAddress()];
-                    case 2:
-                        _a.traderAddr = _b.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async createProxyInstance(provider, overrides) {
+        if (provider == undefined) {
+            this.provider = new StaticJsonRpcProvider(this.nodeURL);
+        }
+        else {
+            this.provider = provider;
+        }
+        if (!this.signer) {
+            const wallet = new Wallet(this.privateKey);
+            this.signer = wallet.connect(this.provider);
+        }
+        await this.initContractsAndData(this.signer, overrides);
+        this.traderAddr = await this.signer.getAddress();
+    }
     /**
      * Set allowance for ar margin token (e.g., MATIC, ETH, USDC)
      * @param symbol token in 'long-form' such as MATIC, symbol also fine (ETH-USD-MATIC)
      * @param amount optional, amount to approve if not 'infinity'
      * @returns ContractTransaction
      */
-    WriteAccessHandler.prototype.setAllowance = function (symbol, amount, overrides) {
-        return __awaiter(this, void 0, void 0, function () {
-            var symbolarr, marginTokenAddr, amountDec18;
-            return __generator(this, function (_a) {
-                symbolarr = symbol.split("-");
-                symbol = symbol.length == 3 ? symbolarr[2] : symbolarr[0];
-                marginTokenAddr = this.symbolToTokenAddrMap.get(symbol);
-                if (marginTokenAddr == undefined || this.signer == null) {
-                    throw Error("No margin token or signer defined, call createProxyInstance");
-                }
-                if (amount == undefined) {
-                    amountDec18 = MAX_UINT_256;
-                }
-                else {
-                    amountDec18 = floatToDec18(amount);
-                }
-                return [2 /*return*/, WriteAccessHandler._setAllowance(marginTokenAddr, this.proxyAddr, this.signer, amountDec18, overrides)];
-            });
-        });
-    };
-    WriteAccessHandler._setAllowance = function (tokenAddr, proxyAddr, signer, amount, overrides) {
-        return __awaiter(this, void 0, void 0, function () {
-            var marginToken;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        marginToken = ERC20__factory.connect(tokenAddr, signer);
-                        return [4 /*yield*/, marginToken.approve(proxyAddr, amount, overrides || {})];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
+    async setAllowance(symbol, amount, overrides) {
+        //extract margin-currency name
+        let symbolarr = symbol.split("-");
+        symbol = symbol.length == 3 ? symbolarr[2] : symbolarr[0];
+        //note: symbol is in long format
+        let marginTokenAddr = this.symbolToTokenAddrMap.get(symbol);
+        if (marginTokenAddr == undefined || this.signer == null) {
+            throw Error("No margin token or signer defined, call createProxyInstance");
+        }
+        let amountDec18;
+        if (amount == undefined) {
+            amountDec18 = MAX_UINT_256;
+        }
+        else {
+            amountDec18 = floatToDecN(amount, this.getMarginTokenDecimalsFromSymbol(symbol));
+        }
+        return WriteAccessHandler._setAllowance(marginTokenAddr, this.proxyAddr, this.signer, amountDec18, overrides);
+    }
+    static async _setAllowance(tokenAddr, proxyAddr, signer, amount, overrides) {
+        const marginToken = ERC20__factory.connect(tokenAddr, signer);
+        return await marginToken.approve(proxyAddr, amount, overrides || {});
+    }
     /**
      * Address corresponding to the private key used to instantiate this class.
      * @returns {string} Address of this wallet.
      */
-    WriteAccessHandler.prototype.getAddress = function () {
+    getAddress() {
         return this.traderAddr;
-    };
+    }
     /**
      * Converts a given amount of chain native currency (test MATIC)
      * into a mock token used for trading on testnet, with a rate of 1:100_000
@@ -123,35 +95,27 @@ var WriteAccessHandler = /** @class */ (function (_super) {
      * @param amountToPay Amount in chain currency, e.g. "0.1" for 0.1 MATIC
      * @returns Transaction object
      */
-    WriteAccessHandler.prototype.swapForMockToken = function (symbol, amountToPay, overrides) {
-        return __awaiter(this, void 0, void 0, function () {
-            var tokenAddress, tokenToSwap, swapAddress, contract;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (this.signer == null) {
-                            throw Error("no wallet initialized. Use createProxyInstance().");
-                        }
-                        tokenAddress = this.getMarginTokenFromSymbol(symbol);
-                        if (tokenAddress == undefined) {
-                            throw Error("symbols not found");
-                        }
-                        tokenToSwap = new Map(Object.entries(require("./config/mockSwap.json")));
-                        swapAddress = tokenToSwap.get(tokenAddress);
-                        if (swapAddress == undefined) {
-                            throw Error("No swap contract found for symbol.");
-                        }
-                        contract = new Contract(swapAddress, MOCK_TOKEN_SWAP_ABI, this.signer);
-                        if (overrides && overrides.value !== undefined) {
-                            throw Error("Pass value to send in function call, not overrides.");
-                        }
-                        return [4 /*yield*/, contract.swapToMockToken(__assign({ value: parseEther(amountToPay) }, overrides))];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
+    async swapForMockToken(symbol, amountToPay, overrides) {
+        if (this.signer == null) {
+            throw Error("no wallet initialized. Use createProxyInstance().");
+        }
+        let tokenAddress = this.getMarginTokenFromSymbol(symbol);
+        if (tokenAddress == undefined) {
+            throw Error("symbols not found");
+        }
+        let tokenToSwap = new Map(Object.entries(require("./config/mockSwap.json")));
+        let swapAddress = tokenToSwap.get(tokenAddress);
+        if (swapAddress == undefined) {
+            throw Error("No swap contract found for symbol.");
+        }
+        let contract = new Contract(swapAddress, MOCK_TOKEN_SWAP_ABI, this.signer);
+        if (overrides && overrides.value !== undefined) {
+            throw Error("Pass value to send in function call, not overrides.");
+        }
+        return await contract.swapToMockToken({
+            value: parseEther(amountToPay),
+            ...overrides,
         });
-    };
-    return WriteAccessHandler;
-}(PerpetualDataHandler));
-export default WriteAccessHandler;
+    }
+}
 //# sourceMappingURL=writeAccessHandler.js.map

package/dist/esm/writeAccessHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeAccessHandler.js","sourceRoot":"","sources":["../../src/writeAccessHandler.ts"],"names":[],"mappings":";AAEA,OAAO,EAAiB,QAAQ,EAAoD,MAAM,0BAA0B,CAAC;AACrH,OAAO,EAAY,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAa,YAAY,EAAE,mBAAmB,EAAiB,MAAM,gBAAgB,CAAC;AAC7F,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D;;;;;;GAMG;AACH;IAAgD,sCAAoB;IAKlE;;;OAGG;IACH,4BAAmB,MAAqB,EAAE,MAAuB;QAAjE,YACE,kBAAM,MAAM,CAAC,SASd;QAjBS,gBAAU,GAAW,EAAE,CAAC;QACxB,YAAM,GAAkB,IAAI,CAAC;QAC7B,cAAQ,GAAW,QAAU,CAAC;QAOtC,IAAI,OAAO,MAAM,IAAI,QAAQ,EAAE;YAC7B,KAAI,CAAC,UAAU,GAAG,MAAM,CAAC;SAC1B;aAAM;YACL,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;QACD,IAAI,MAAM,CAAC,QAAQ,IAAI,SAAS,EAAE;YAChC,KAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;SACjC;;IACH,CAAC;IAED;;;;;OAKG;IACU,gDAAmB,GAAhC,UAAiC,QAAmB,EAAE,SAAyB;;;;;;wBAC7E,IAAI,QAAQ,IAAI,SAAS,EAAE;4BACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;yBACzD;6BAAM;4BACL,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;yBAC1B;wBACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;4BACV,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;4BAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;yBAC7C;wBACD,qBAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,EAAA;;wBAAvD,SAAuD,CAAC;wBACxD,KAAA,IAAI,CAAA;wBAAc,qBAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;wBAAhD,GAAK,UAAU,GAAG,SAA8B,CAAC;;;;;KAClD;IAED;;;;;OAKG;IACU,yCAAY,GAAzB,UAA0B,MAAc,EAAE,MAAe,EAAE,SAAqB;;;;gBAE1E,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAEtD,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC5D,IAAI,eAAe,IAAI,SAAS,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE;oBACvD,MAAM,KAAK,CAAC,6DAA6D,CAAC,CAAC;iBAC5E;gBAED,IAAI,MAAM,IAAI,SAAS,EAAE;oBACvB,WAAW,GAAG,YAAY,CAAC;iBAC5B;qBAAM;oBACL,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;iBACpC;gBACD,sBAAO,kBAAkB,CAAC,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,CAAC,EAAC;;;KAC/G;IAEsB,gCAAa,GAApC,UACE,SAAiB,EACjB,SAAiB,EACjB,MAAc,EACd,MAAiB,EACjB,SAAqB;;;;;;wBAEf,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;wBACvD,qBAAM,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,EAAA;4BAApE,sBAAO,SAA6D,EAAC;;;;KACtE;IAED;;;OAGG;IACI,uCAAU,GAAjB;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACU,6CAAgB,GAA7B,UACE,MAAc,EACd,WAAmB,EACnB,SAA4B;;;;;;wBAE5B,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE;4BACvB,MAAM,KAAK,CAAC,mDAAmD,CAAC,CAAC;yBAClE;wBACG,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;wBACzD,IAAI,YAAY,IAAI,SAAS,EAAE;4BAC7B,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC;yBAClC;wBACG,WAAW,GAAG,IAAI,GAAG,CAAiB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;wBACzF,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;wBAChD,IAAI,WAAW,IAAI,SAAS,EAAE;4BAC5B,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;yBACnD;wBACG,QAAQ,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC3E,IAAI,SAAS,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,EAAE;4BAC9C,MAAM,KAAK,CAAC,qDAAqD,CAAC,CAAC;yBACpE;wBACM,qBAAM,QAAQ,CAAC,eAAe,CAAC,WACpC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,IAC3B,SAAS,CACO,CAAC,EAAA;4BAHtB,sBAAO,SAGe,EAAC;;;;KACxB;IACH,yBAAC;AAAD,CAAC,AArHD,CAAgD,oBAAoB,GAqHnE"}
+{"version":3,"file":"writeAccessHandler.js","sourceRoot":"","sources":["../../src/writeAccessHandler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d8x/perpetuals-sdk",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "Node TypeScript SDK for D8X Perpetual Futures",
   "author": "D8X",
   "homepage": "https://github.com/D8-X/d8x-futures-node-sdk#readme",

package/src/d8XMath.ts

@@ -117,6 +117,27 @@ export function floatToDec18(x: number): BigNumber {
   return xIntBig.add(xDec).mul(sg);
 }
 
+/**
+ *
+ * @param {number} x number (float)
+ * @param {number} decimals number of decimals
+ * @returns {BigNumber} x as a BigNumber in Dec18 format
+ */
+export function floatToDecN(x: number, decimals: number): BigNumber {
+  // float number to dec 18
+  if (x === 0) {
+    return BigNumber.from(0);
+  }
+  let sg = Math.sign(x);
+  x = Math.abs(x);
+  let strX = x.toFixed(decimals);
+  const arrX = strX.split(".");
+  let xInt = BigNumber.from(arrX[0]);
+  let xDec = BigNumber.from(arrX[1]);
+  let xIntBig = xInt.mul(BigNumber.from(10).pow(BigNumber.from(decimals)));
+  return xIntBig.add(xDec).mul(sg);
+}
+
 /**
  * 9 are rounded up regardless of precision, e.g, 0.1899000 at precision 6 results in 3
  * @param x

package/src/liquidityProviderTool.ts

@@ -1,7 +1,7 @@
-import { Contract, ContractTransaction, Overrides } from "@ethersproject/contracts";
+import { ContractTransaction, Overrides } from "@ethersproject/contracts";
 import { Signer } from "@ethersproject/abstract-signer";
-import { dec18ToFloat, floatToDec18 } from "./d8XMath";
-import { ERC20_ABI, NodeSDKConfig } from "./nodeSDKTypes";
+import { floatToDec18, floatToDecN } from "./d8XMath";
+import { NodeSDKConfig } from "./nodeSDKTypes";
 import PerpetualDataHandler from "./perpetualDataHandler";
 import WriteAccessHandler from "./writeAccessHandler";
 /**
@@ -65,9 +65,10 @@ export default class LiquidityProviderTool extends WriteAccessHandler {
       throw Error("no proxy contract or wallet initialized. Use createProxyInstance().");
     }
     let poolId = PerpetualDataHandler._getPoolIdFromSymbol(poolSymbolName, this.poolStaticInfos);
+    let decimals = this.getMarginTokenDecimalsFromSymbol(poolSymbolName);
     let tx = await this.proxyContract.addLiquidity(
       poolId,
-      floatToDec18(amountCC),
+      floatToDecN(amountCC, decimals!),
       overrides || { gasLimit: this.gasLimit }
     );
     return tx;

package/src/marketData.ts

@@ -874,6 +874,32 @@ export default class MarketData extends PerpetualDataHandler {
     return state;
   }
 
+  /**
+   * Query recent pool state from blockchain, not including perpetual states
+   * @param symbol symbol of the form USDC
+   * @param indexPrices S2 and S3 prices/isMarketOpen if not provided fetch via REST API
+   * @returns PoolState reference
+   */
+  public async getPoolState(poolSymbol: string, overrides?: CallOverrides): Promise<PoolState> {
+    if (this.proxyContract == null) {
+      throw Error("no proxy contract initialized. Use createProxyInstance().");
+    }
+    const poolId = this._poolSymbolOrIdToPoolId(poolSymbol);
+    const pool = await this.proxyContract.getLiquidityPool(poolId, overrides || {});
+    let state: PoolState = {
+      isRunning: pool.isRunning,
+      poolSymbol: poolSymbol,
+      marginTokenAddr: pool.marginTokenAddress,
+      poolShareTokenAddr: pool.shareTokenAddress,
+      defaultFundCashCC: ABK64x64ToFloat(pool.fDefaultFundCashCC),
+      pnlParticipantCashCC: ABK64x64ToFloat(pool.fPnLparticipantsCashCC),
+      totalTargetAMMFundSizeCC: ABK64x64ToFloat(pool.fTargetAMMFundSize),
+      brokerCollateralLotSize: ABK64x64ToFloat(pool.fBrokerCollateralLotSize),
+      perpetuals: [],
+    };
+    return state;
+  }
+
   /**
    * Query perpetual static info.
    * This information is queried once at createProxyInstance-time and remains static after that.

package/src/nodeSDKTypes.ts

@@ -77,6 +77,7 @@ export interface PoolStaticInfo {
   poolId: number;
   poolMarginSymbol: string;
   poolMarginTokenAddr: string;
+  poolMarginTokenDecimals?: number;
   shareTokenAddr: string;
   oracleFactoryAddr: string;
   isRunning: boolean;

package/src/perpetualDataHandler.ts

@@ -5,6 +5,7 @@ import { AddressZero } from "@ethersproject/constants";
 import { CallOverrides, Contract, ContractInterface } from "@ethersproject/contracts";
 import { Network, Provider } from "@ethersproject/providers";
 import {
+  ERC20__factory,
   IPerpetualManager,
   IPerpetualManager__factory,
   LimitOrderBook,
@@ -166,10 +167,12 @@ export default class PerpetualDataHandler {
     this.nestedPerpetualIDs = poolInfo.nestedPerpetualIDs;
 
     for (let j = 0; j < poolInfo.nestedPerpetualIDs.length; j++) {
+      let decimals = await ERC20__factory.connect(poolInfo.poolMarginTokenAddr[j], this.provider!).decimals();
       let info: PoolStaticInfo = {
         poolId: j + 1,
         poolMarginSymbol: "", //fill later
         poolMarginTokenAddr: poolInfo.poolMarginTokenAddr[j],
+        poolMarginTokenDecimals: decimals,
         shareTokenAddr: poolInfo.poolShareTokenAddr[j],
         oracleFactoryAddr: poolInfo.oracleFactory,
         isRunning: poolInfo.poolShareTokenAddr[j] != AddressZero,
@@ -1083,6 +1086,11 @@ export default class PerpetualDataHandler {
     return -1;
   }
 
+  /**
+   *
+   * @param symbol Symbol of the form USDC
+   * @returns Address of the corresponding token
+   */
   public getMarginTokenFromSymbol(symbol: string): string | undefined {
     let pools = this.poolStaticInfos!;
     let poolId = PerpetualDataHandler._getPoolIdFromSymbol(symbol, this.poolStaticInfos);
@@ -1097,6 +1105,25 @@ export default class PerpetualDataHandler {
     return undefined;
   }
 
+  /**
+   *
+   * @param symbol Symbol of the form USDC
+   * @returns Decimals of the corresponding token
+   */
+  public getMarginTokenDecimalsFromSymbol(symbol: string): number | undefined {
+    let pools = this.poolStaticInfos!;
+    let poolId = PerpetualDataHandler._getPoolIdFromSymbol(symbol, this.poolStaticInfos);
+    let k = 0;
+    while (k < pools.length) {
+      if (pools[k].poolId == poolId) {
+        // pool found
+        return pools[k].poolMarginTokenDecimals;
+      }
+      k++;
+    }
+    return undefined;
+  }
+
   /**
    * Get ABI for LimitOrderBook, Proxy, or Share Pool Token
    * @param contract name of contract: proxy|lob|sharetoken

package/src/version.ts

@@ -1 +1 @@
-export const D8X_SDK_VERSION = "0.7.4";
+export const D8X_SDK_VERSION = "0.7.6";

package/src/writeAccessHandler.ts

@@ -5,8 +5,8 @@ import { Provider, StaticJsonRpcProvider } from "@ethersproject/providers";
 import { parseEther } from "@ethersproject/units";
 import { Wallet } from "@ethersproject/wallet";
 import { ERC20__factory } from "./contracts";
-import { floatToDec18 } from "./d8XMath";
-import { ERC20_ABI, MAX_UINT_256, MOCK_TOKEN_SWAP_ABI, NodeSDKConfig } from "./nodeSDKTypes";
+import { floatToDecN } from "./d8XMath";
+import { MAX_UINT_256, MOCK_TOKEN_SWAP_ABI, NodeSDKConfig } from "./nodeSDKTypes";
 import PerpetualDataHandler from "./perpetualDataHandler";
 
 /**
@@ -76,7 +76,7 @@ export default class WriteAccessHandler extends PerpetualDataHandler {
     if (amount == undefined) {
       amountDec18 = MAX_UINT_256;
     } else {
-      amountDec18 = floatToDec18(amount);
+      amountDec18 = floatToDecN(amount, this.getMarginTokenDecimalsFromSymbol(symbol)!);
     }
     return WriteAccessHandler._setAllowance(marginTokenAddr, this.proxyAddr, this.signer, amountDec18, overrides);
   }