impermax-sdk 2.1.93 → 2.1.95

package/lib/config/subgraphs.js

@@ -223,21 +223,21 @@ exports.IMPERMAX_CHEF_SUBGRAPH_URL = {
 };
 exports.BLOCKS_SUBGRAPH_URL = {
     [types_1.Networks.Ropsten]: "",
-    [types_1.Networks.Mainnet]: "https://api.thegraph.com/subgraphs/name/blocklytics/ethereum-blocks",
-    [types_1.Networks.Polygon]: "https://api.thegraph.com/subgraphs/name/matthewlilley/polygon-blocks",
-    [types_1.Networks.Arbitrum]: "https://api.thegraph.com/subgraphs/name/sushiswap/arbitrum-blocks",
-    [types_1.Networks.Avalanche]: "https://api.thegraph.com/subgraphs/name/dasconnor/avalanche-blocks",
-    [types_1.Networks.Moonriver]: "https://api.thegraph.com/subgraphs/name/sushiswap/moonriver-blocks",
+    [types_1.Networks.Mainnet]: "",
+    [types_1.Networks.Polygon]: "",
+    [types_1.Networks.Arbitrum]: "",
+    [types_1.Networks.Avalanche]: "",
+    [types_1.Networks.Moonriver]: "",
     [types_1.Networks.Aurora]: "",
     [types_1.Networks.Cronos]: "",
-    [types_1.Networks.Fantom]: "https://gateway.thegraph.com/api/031cf65e6bf1e03a781f69aeba9770d2/subgraphs/id/3drjZDpA9hAuYGA19ttEkhW432mVe2XHy5YarBDVYHbz",
-    [types_1.Networks.Canto]: "https://api.impermax.finance/subgraphs/name/blocklytics/canto-blocks",
-    [types_1.Networks.ZksyncEra]: "https://api.impermax.finance/subgraphs/name/blocklytics/canto-blocks",
+    [types_1.Networks.Fantom]: "",
+    [types_1.Networks.Canto]: "",
+    [types_1.Networks.ZksyncEra]: "",
     [types_1.Networks.Blast]: "",
     [types_1.Networks.Harmony]: "",
     [types_1.Networks.Moonbeam]: "",
     [types_1.Networks.Sxnetwork]: "",
-    [types_1.Networks.Base]: "https://api.thegraph.com/subgraphs/name/blocklytics/base-blocks",
+    [types_1.Networks.Base]: "",
     [types_1.Networks.Mantle]: "",
     [types_1.Networks.Scroll]: "",
     [types_1.Networks.Real]: "",

package/lib/offchain/offchainInitializer.js

@@ -577,6 +577,8 @@ function fetchUserData(account) {
             const subgraphs = subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network][factory];
             // We pass network + factory to get the actual factory address in case we use multiple factories in 1 api
             const result = yield this.endpointManager.fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.userQuery(account, this.network, factory));
+            if (!result)
+                continue;
             const user = result.data.user;
             if (!user)
                 continue;
@@ -799,6 +801,8 @@ function fetchVaultsUserData(account) {
             if (!subgraphs || subgraphs.length === 0)
                 continue;
             const result = results[i++];
+            if (!result)
+                continue;
             const user = result.data.user;
             if (user && user.positions) {
                 userVaultData[vaultType] = user.positions.map((position) => (Object.assign(Object.assign({}, position), { vaultType })));

package/lib/offchain/queries/apis/ponder/index.js

@@ -240,6 +240,8 @@ class PonderQueryBuilder {
         supplyPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}"}) {
           items { 
             balance
+            cumulativeEarnings
+            lastExchangeRate
             borrowable {
               underlying {
                 id

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlpUniswapV3.js

@@ -117,7 +117,7 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
             // Mint
             if (depositADelta > 0 || depositBDelta > 0) {
                 console.log("depositADelta, depositBDelta", depositADelta, depositBDelta);
-                console.log((_a = (yield borrowableA.toBigNumber(depositADelta))) === null || _a === void 0 ? void 0 : _a.toString(), (_b = (yield borrowableA.toBigNumber(depositBDelta))) === null || _b === void 0 ? void 0 : _b.toString(), (_c = (yield borrowableA.toBigNumber(depositADelta / this.getUiMargin()))) === null || _c === void 0 ? void 0 : _c.toString(), (_d = (yield borrowableA.toBigNumber(depositBDelta / this.getUiMargin()))) === null || _d === void 0 ? void 0 : _d.toString());
+                console.log((_a = (yield borrowableA.toBigNumber(depositADelta))) === null || _a === void 0 ? void 0 : _a.toString(), (_b = (yield borrowableB.toBigNumber(depositBDelta))) === null || _b === void 0 ? void 0 : _b.toString(), (_c = (yield borrowableA.toBigNumber(depositADelta / this.getUiMargin()))) === null || _c === void 0 ? void 0 : _c.toString(), (_d = (yield borrowableB.toBigNumber(depositBDelta / this.getUiMargin()))) === null || _d === void 0 ? void 0 : _d.toString());
                 actions.push(yield actionsGetter.methods.getMintUniV3Action(yield borrowableA.toBigNumber(depositADelta), yield borrowableB.toBigNumber(depositBDelta), yield borrowableA.toBigNumber(depositADelta / this.getUiMargin()), yield borrowableB.toBigNumber(depositBDelta / this.getUiMargin())).call());
                 if (isEthA) {
                     ethValue += depositADelta;
@@ -205,9 +205,7 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
                 }
             }
             if (ethValue > 0 || doWithdrawEth) {
-                //actions.push(await actionsGetter.methods.getWithdrawEthAction(
-                //  this.getAccountAddress()
-                //).call());
+                actions.push(yield actionsGetter.methods.getWithdrawEthAction(this.getAccountAddress()).call());
             }
             return {
                 actions,

package/lib/onchain/interactions/onchainInteractionsPoolToken.d.ts

@@ -1,8 +1,9 @@
-import { ethers, BigNumber } from "ethers";
+import { BigNumber } from "ethers";
 import { Contract, Permit, Permits } from "../onchainTypes";
 import OnchainInteractions from './index';
 import OnchainPoolToken from '../onchainPoolToken';
 import OnchainAccountPoolToken from '../account/onchainAccountPoolToken';
+import { Extension, Factory } from "../../config/types";
 export default abstract class OnchainInteractionsPoolToken {
     protected poolToken: OnchainPoolToken;
     getPoolToken: () => OnchainPoolToken;
@@ -13,20 +14,20 @@ export default abstract class OnchainInteractionsPoolToken {
     protected getOnchain: () => import("..").default;
     protected getPermitHelper: () => import("../onchainPermitHelper").default;
     protected send(method: any, onTransactionHash: Function, value?: BigNumber): Promise<any>;
-    getOwnerSpender(): {
+    getOwnerSpender(factory?: Factory, extension?: Extension): {
         owner: string;
         spender: any;
     };
     isWETH(): Promise<boolean>;
-    getPoolTokenAllowance(): Promise<ethers.BigNumber>;
-    getUnderlyingAllowance(): Promise<ethers.BigNumber>;
-    getPermit2Allowance(): Promise<ethers.BigNumber>;
-    approvePoolToken(amount: BigNumber, onTransactionHash: Function): Promise<any>;
-    permitPoolToken(amount: BigNumber): Promise<Permit>;
-    approveUnderlying(amount: BigNumber, onTransactionHash: Function): Promise<any>;
-    approvePermit2(amount: BigNumber, onTransactionHash: Function): Promise<any>;
-    permitUnderlying(amount: BigNumber): Promise<Permit>;
-    permit2Underlying(amount: BigNumber): Promise<Permit>;
+    getPoolTokenAllowance(factory?: undefined, extension?: undefined): Promise<BigNumber>;
+    getUnderlyingAllowance(factory?: undefined, extension?: undefined): Promise<BigNumber>;
+    getPermit2Allowance(factory?: undefined, extension?: undefined): Promise<BigNumber>;
+    approvePoolToken(amount: BigNumber, onTransactionHash: Function, factory?: undefined, extension?: undefined): Promise<any>;
+    permitPoolToken(amount: BigNumber, factory?: undefined, extension?: undefined): Promise<Permit>;
+    approveUnderlying(amount: BigNumber, onTransactionHash: Function, factory?: undefined, extension?: undefined): Promise<any>;
+    approvePermit2(amount: BigNumber, onTransactionHash: Function, factory?: undefined, extension?: undefined): Promise<any>;
+    permitUnderlying(amount: BigNumber, factory?: undefined, extension?: undefined): Promise<Permit>;
+    permit2Underlying(amount: BigNumber, factory?: undefined, extension?: undefined): Promise<Permit>;
     protected getSendData(permits: Permits): Promise<{
         router: any;
         ptAddress: any;

package/lib/onchain/interactions/onchainInteractionsPoolToken.js

@@ -12,6 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const weths_1 = require("../../config/contracts/weths");
 const general_1 = require("../../config/general");
+const types_1 = require("../../config/types");
+const routers_1 = require("../../config/contracts/routers");
 const MAX_UINT256 = ethers_1.ethers.constants.MaxUint256;
 const EIP712DOMAIN = [
     { name: "name", type: "string" },
@@ -43,11 +45,12 @@ class OnchainInteractionsPoolToken {
         return this.getInteractions().send(method, onTransactionHash, value);
     }
     //send = this.getInteractions().send;
-    getOwnerSpender() {
-        return {
-            owner: this.getAccountAddress(),
-            spender: this.getPoolTokenRouter()._address,
-        };
+    getOwnerSpender(factory, extension) {
+        const owner = this.getAccountAddress();
+        const network = this.getOnchain().network;
+        const spender = factory == types_1.Factory.V3 && extension ? routers_1.ROUTER_V3[network][extension]
+            : factory ? routers_1.ROUTER[network][factory] : this.getPoolTokenRouter()._address;
+        return { owner, spender };
     }
     isWETH() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -55,64 +58,64 @@ class OnchainInteractionsPoolToken {
             return token._address.toLowerCase() == weths_1.WETH[this.getOnchain().network].toLowerCase();
         });
     }
-    getPoolTokenAllowance() {
+    getPoolTokenAllowance(factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
             const poolToken = yield this.poolToken.getPoolToken();
-            const { owner, spender } = this.getOwnerSpender();
+            const { owner, spender } = this.getOwnerSpender(factory, extension);
             const allowance = yield poolToken.methods.allowance(owner, spender).call();
             return ethers_1.BigNumber.from(allowance);
         });
     }
-    getUnderlyingAllowance() {
+    getUnderlyingAllowance(factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
             if (yield this.isWETH())
                 return MAX_UINT256;
             const token = yield this.poolToken.getToken();
-            const { owner, spender } = this.getOwnerSpender();
+            const { owner, spender } = this.getOwnerSpender(factory, extension);
             const allowance = yield token.methods.allowance(owner, spender).call();
             return ethers_1.BigNumber.from(allowance);
         });
     }
-    getPermit2Allowance() {
+    getPermit2Allowance(factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
             if (yield this.isWETH())
                 return MAX_UINT256;
             const token = yield this.poolToken.getToken();
-            const { owner } = this.getOwnerSpender();
+            const { owner } = this.getOwnerSpender(factory, extension);
             const allowance = yield token.methods.allowance(owner, general_1.PERMIT2_ADDRESS).call();
             return ethers_1.BigNumber.from(allowance);
         });
     }
-    approvePoolToken(amount, onTransactionHash) {
+    approvePoolToken(amount, onTransactionHash, factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { spender } = this.getOwnerSpender();
+            const { spender } = this.getOwnerSpender(factory, extension);
             const poolToken = yield this.poolToken.getPoolToken();
             return this.send(poolToken.methods.approve(spender, amount), onTransactionHash);
         });
     }
-    permitPoolToken(amount) {
+    permitPoolToken(amount, factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { owner, spender } = this.getOwnerSpender();
+            const { owner, spender } = this.getOwnerSpender(factory, extension);
             const poolToken = yield this.poolToken.getPoolToken();
             return this.getPermitHelper().getTokenPermit(poolToken, owner, spender, amount);
         });
     }
-    approveUnderlying(amount, onTransactionHash) {
+    approveUnderlying(amount, onTransactionHash, factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { spender } = this.getOwnerSpender();
+            const { spender } = this.getOwnerSpender(factory, extension);
             const token = yield this.poolToken.getToken();
             return this.send(token.methods.approve(spender, amount), onTransactionHash);
         });
     }
-    approvePermit2(amount, onTransactionHash) {
+    approvePermit2(amount, onTransactionHash, factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
             const token = yield this.poolToken.getToken();
             return this.send(token.methods.approve(general_1.PERMIT2_ADDRESS, amount), onTransactionHash);
         });
     }
-    permitUnderlying(amount) {
+    permitUnderlying(amount, factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { owner, spender } = this.getOwnerSpender();
+            const { owner, spender } = this.getOwnerSpender(factory, extension);
             const token = yield this.poolToken.getToken();
             // experimental feature: check if the token supports permit by getting the DOMAIN_SEPARATOR
             const domain = yield token.methods.DOMAIN_SEPARATOR().call();
@@ -124,9 +127,9 @@ class OnchainInteractionsPoolToken {
             return this.getPermitHelper().getTokenPermit(token, owner, spender, amount, version);
         });
     }
-    permit2Underlying(amount) {
+    permit2Underlying(amount, factory = undefined, extension = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { owner, spender } = this.getOwnerSpender();
+            const { owner, spender } = this.getOwnerSpender(factory, extension);
             const token = yield this.poolToken.getToken();
             return this.getPermitHelper().getPermit2Single(token, owner, spender, amount);
         });

package/package.json

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