impermax-sdk 1.2.9 → 1.2.11

package/lib/config/contracts/routers.js

@@ -16,9 +16,9 @@ exports.ROUTER = {
         [types_1.Factory.SOL_STABLE]: '0x509f26e44F5D8814879ABB27a9eB72159FA92F53',
     },
     [types_1.Networks.Arbitrum]: {
-        [types_1.Factory.V2V1_1]: '0x5475aEd9d11BeaA822e122C36ACDfa0dA2eb086f',
-        [types_1.Factory.V2V2]: '0xaf82ee9246a608484e8567fadbef64ac1b8a87ab',
-        [types_1.Factory.SOLV2]: '0xFB8Bd40C0a13D141b26eE190Ca87991Ec54932E9',
+        [types_1.Factory.V2V1_1]: '0xd0543EA38f433Dd3Dc87B8e784aE715bD7154BD8',
+        [types_1.Factory.V2V2]: '0x6e6a0c7131f273c6BdC4860a7C4610A1F5978869',
+        [types_1.Factory.SOLV2]: '0x0B13BeC190E71DaCB101bC02f8f4d28A376Ff623',
     },
     [types_1.Networks.Avalanche]: {
         [types_1.Factory.V2V1_2]: '0x3039C26F9126833bAca8EdBF61c761CD909F461f',
@@ -50,7 +50,7 @@ exports.DEFAULT_ROUTER = {
     [types_1.Networks.Ropsten]: '0xbFf4acF789297A8507Eb7493AE18EB2C3A3A9632',
     [types_1.Networks.Mainnet]: '0x5e169082fff23cee6766062b96051a78c543127d',
     [types_1.Networks.Polygon]: '0x4e69Cf49FF3aF82eFe304a3C723556efB7434736',
-    [types_1.Networks.Arbitrum]: '0xaf82ee9246a608484e8567fadbef64ac1b8a87ab',
+    [types_1.Networks.Arbitrum]: '0x6e6a0c7131f273c6BdC4860a7C4610A1F5978869',
     [types_1.Networks.Avalanche]: '0xaf82ee9246a608484e8567fadbef64ac1b8a87ab',
     [types_1.Networks.Moonriver]: '0x3271cc175577465691e48196955e09d638fa05d5',
     [types_1.Networks.Aurora]: '0xBB92270716C8c424849F17cCc12F4F24AD4064D6',

package/lib/offchain/account/offchainAccount.d.ts

@@ -5,10 +5,12 @@ import OffchainAccountLendingVault from './offchainAccountLendingVault';
 import { LendingVaultPosition, UserData } from '../offchainTypes';
 export default class OffchainAccount {
     private readonly offchain;
-    private readonly account;
+    private readonly accountAddress;
     private lendingPools;
     private lendingVaults;
     constructor(offchain: Offchain, account: Address);
+    getOnchain: () => Offchain;
+    getAccountAddress: () => string;
     private initializeLendingPool;
     getLendingPool(factory: Factory, pair: Address): Promise<OffchainAccountLendingPool>;
     private initializeLendingVault;

package/lib/offchain/account/offchainAccount.js

@@ -16,8 +16,10 @@ const lendingPool_1 = __importDefault(require("./lendingPool"));
 const offchainAccountLendingVault_1 = __importDefault(require("./offchainAccountLendingVault"));
 class OffchainAccount {
     constructor(offchain, account) {
+        this.getOnchain = () => this.offchain;
+        this.getAccountAddress = () => this.accountAddress;
         this.offchain = offchain;
-        this.account = account;
+        this.accountAddress = account;
         this.lendingPools = {};
         this.lendingVaults = {};
     }
@@ -52,12 +54,12 @@ class OffchainAccount {
     }
     getUserData() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.offchain.getUserData(this.account);
+            return this.offchain.getUserData(this.accountAddress);
         });
     }
     getLendingVaultsUserData() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.offchain.getLendingVaultsUserData(this.account);
+            return this.offchain.getLendingVaultsUserData(this.accountAddress);
         });
     }
     getBorrowPositions() {

package/lib/onchain/account/lendingPool/onchainAccountBorrowable.js

@@ -109,7 +109,7 @@ class OnchainAccountBorrowable extends onchainAccountPoolToken_1.default {
                     borrowAmount += jump;
                 }
             }
-            return bestAmount / this.getDust();
+            return bestAmount;
         });
     }
     // Farming Shares

package/lib/onchain/account/lendingPool/onchainAccountCollateral.js

@@ -102,7 +102,7 @@ class OnchainAccountCollateral extends onchainAccountPoolToken_1.default {
                         break;
                 }
             }
-            return bestAmount / this.getDust();
+            return bestAmount * this.getDust();
         });
     }
 }

package/lib/onchain/account/onchainAccountLendingVault.js

@@ -39,7 +39,9 @@ class OnchainAccountLendingVault extends onchainAccountPoolToken_1.default {
     // OnchainInteractions
     getMaxWithdrawable() {
         return __awaiter(this, void 0, void 0, function* () {
-            return Math.min(yield this.getDeposited(), (yield this.poolToken.getAvailableLiquidity()) / this.getDust());
+            const deposited = (yield this.getDeposited()) * this.getDust();
+            const availableCash = (yield this.poolToken.getAvailableLiquidity()) / this.getDust();
+            return Math.min(deposited, availableCash);
         });
     }
 }

package/lib/onchain/account/onchainAccountPoolToken.js

@@ -30,10 +30,10 @@ class OnchainAccountPoolToken {
         return __awaiter(this, void 0, void 0, function* () {
             const token = yield this.poolToken.getToken();
             if (token._address.toLowerCase() == weths_1.WETH[this.getNetwork()].toLowerCase()) {
-                return (yield this.getEth().getBalance(this.getAccountAddress())) / 1e18 / this.getDust();
+                return (yield this.getEth().getBalance(this.getAccountAddress())) / 1e18;
             }
             const balance = yield token.methods.balanceOf(this.getAccountAddress()).call();
-            return (yield this.poolToken.normalize(balance)) / this.getDust();
+            return (yield this.poolToken.normalize(balance));
         });
     }
     getAvailableBalance() {
@@ -76,7 +76,7 @@ class OnchainAccountPoolToken {
     // Max Withdrawable
     getMaxWithdrawable() {
         return __awaiter(this, void 0, void 0, function* () {
-            const deposited = yield this.getDeposited();
+            const deposited = (yield this.getDeposited()) * this.getDust();
             const availableCash = (yield this.poolToken.getTotalBalance()) / this.getDust();
             return Math.min(deposited, availableCash);
         });

package/lib/onchain/onchain.js

@@ -19,7 +19,7 @@ class Onchain {
         this.web3 = cfg.web3;
         this.chainId = cfg.chainId;
         this.uiMargin = 1.1;
-        this.dust = 1.000001;
+        this.dust = 1.00000001;
         this.priceInverted = cfg.priceInverted ? cfg.priceInverted : false;
         this.contractsHelper = new onchainContractsHelper_1.default(this);
         this.configManager = new configManager_1.default(this);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impermax-sdk",
-  "version": "1.2.9",
+  "version": "1.2.11",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",