impermax-sdk 1.0.21 → 1.0.23

package/lib/config/contracts/impermax-chef.js

@@ -6,7 +6,8 @@ exports.IMPERMAX_CHEF = {
     [types_1.Networks.Ropsten]: '',
     [types_1.Networks.Mainnet]: '',
     [types_1.Networks.Polygon]: '0x89703cA5c6C3BD35f9D288Ff9710BecBFA8C6f7b',
-    [types_1.Networks.Arbitrum]: '0x99CF05461dd5F94761d4Fae6a2abDa47A93451f5',
+    [types_1.Networks.Arbitrum]: '0xcF16FF305eab2E44B568d3148E2EBBBfD48DB126',
+    //[Networks.Arbitrum]: '0x99CF05461dd5F94761d4Fae6a2abDa47A93451f5',
     [types_1.Networks.Avalanche]: '0x5475aEd9d11BeaA822e122C36ACDfa0dA2eb086f',
     [types_1.Networks.Moonriver]: '0xD299D53Fc3B09038765af2091a0647e2304a7caa',
     [types_1.Networks.Aurora]: '',

package/lib/config/subgraphs.js

@@ -42,7 +42,8 @@ exports.IMPERMAX_CHEF_SUBGRAPH_URL = {
     [types_1.Networks.Ropsten]: '',
     [types_1.Networks.Mainnet]: '',
     [types_1.Networks.Polygon]: 'https://api.thegraph.com/subgraphs/name/impermax-finance/impermax-chef-polygon',
-    [types_1.Networks.Arbitrum]: 'https://api.thegraph.com/subgraphs/name/impermax-finance/impermax-chef-arbitrum',
+    //[Networks.Arbitrum]: 'https://api.thegraph.com/subgraphs/name/impermax-finance/impermax-chef-arbitrum',
+    [types_1.Networks.Arbitrum]: 'https://api.thegraph.com/subgraphs/name/impermax-finance/impermax-chef-arbitrum-ibex',
     [types_1.Networks.Avalanche]: 'https://api.thegraph.com/subgraphs/name/impermax-finance/impermax-chef-avalanche',
     [types_1.Networks.Moonriver]: 'https://api.thegraph.com/subgraphs/name/impermax-finance/impermax-chef-moonriver',
     [types_1.Networks.Fantom]: 'https://api.thegraph.com/subgraphs/name/impermax-finance/impermax-chef-fantom',

package/lib/impermax-router/Account.js

@@ -60,6 +60,7 @@ class Account {
             for (const factory of factories) {
                 const requestsLocal = [];
                 for (const pairAddress of pairs[factory]) {
+                    // TODO remove await
                     requestsLocal.push((yield this.getAccountLendingPool(factory, pairAddress)).getAvailableReward());
                 }
                 requests.push(Promise.all(requestsLocal));

package/lib/impermax-router/AccountBorrowable.d.ts

@@ -5,7 +5,7 @@ export default class AccountBorrowable extends AccountPoolToken {
     borrowableCache: {
         borrowed?: Promise<number>;
         farmingShares?: Promise<number>;
-        availableIMXReward?: Promise<number>;
+        availableFarmingReward?: Promise<number>;
         availableRewarderReward?: Promise<number>;
     };
     cleanCache(): void;
@@ -15,8 +15,8 @@ export default class AccountBorrowable extends AccountPoolToken {
     getMaxBorrowable(): Promise<number>;
     private initializeFarmingShares;
     getFarmingShares(): Promise<number>;
-    private initializeAvailableIMXReward;
-    getAvailableIMXReward(): Promise<number>;
+    private initializeAvailableFarmingReward;
+    getAvailableFarmingReward(): Promise<number>;
     private initializeAvailableRewarderReward;
     getAvailableRewarderReward(): Promise<number>;
 }

package/lib/impermax-router/AccountBorrowable.js

@@ -68,16 +68,9 @@ class AccountBorrowable extends AccountPoolToken_1.default {
     // Farming Shares
     initializeFarmingShares() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.poolToken.hasFarming()))
+            if (!(yield this.poolToken.hasImpermaxChef()))
                 return 0;
-            if (yield this.poolToken.hasImpermaxChef()) {
-                const c = (yield this.poolToken.getImpermaxChef().methods.userInfo(yield this.poolToken.getPoolTokenAddress(), this.getAccount()).call()).shares;
-                return c;
-            }
-            else {
-                const farmingPool = yield this.poolToken.getFarmingPool();
-                return (yield farmingPool.methods.recipients(this.getAccount()).call()).shares;
-            }
+            return (yield this.poolToken.getImpermaxChef().methods.userInfo(yield this.poolToken.getPoolTokenAddress(), this.getAccount()).call()).shares;
         });
     }
     getFarmingShares() {
@@ -88,31 +81,25 @@ class AccountBorrowable extends AccountPoolToken_1.default {
         });
     }
     // Available Reward
-    initializeAvailableIMXReward() {
+    initializeAvailableFarmingReward() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.poolToken.hasFarming()))
+            if (!(yield this.poolToken.hasImpermaxChef()))
                 return 0;
-            if (yield this.poolToken.hasImpermaxChef()) {
-                const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
-                try {
-                    return (yield this.poolToken.getImpermaxChef().methods.pendingReward(borrowableAddress, this.getAccount()).call()) / 1e18;
-                }
-                catch (_a) {
-                    console.log("Warning: pending reward negative");
-                    return 0;
-                }
+            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
+            try {
+                return (yield this.poolToken.getImpermaxChef().methods.pendingReward(borrowableAddress, this.getAccount()).call()) / 1e18;
             }
-            else {
-                const farmingPool = yield this.poolToken.getFarmingPool();
-                return (yield farmingPool.methods.claim().call({ from: this.getAccount() })) / 1e18;
+            catch (_a) {
+                console.log("Warning: pending reward negative");
+                return 0;
             }
         });
     }
-    getAvailableIMXReward() {
+    getAvailableFarmingReward() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.availableIMXReward)
-                this.borrowableCache.availableIMXReward = this.initializeAvailableIMXReward();
-            return this.borrowableCache.availableIMXReward;
+            if (!this.borrowableCache.availableFarmingReward)
+                this.borrowableCache.availableFarmingReward = this.initializeAvailableFarmingReward();
+            return this.borrowableCache.availableFarmingReward;
         });
     }
     initializeAvailableRewarderReward() {

package/lib/impermax-router/AccountLendingPool.js

@@ -226,13 +226,15 @@ class AccountLendingPool {
     getAvailableReward() {
         return __awaiter(this, void 0, void 0, function* () {
             const result = [];
-            const imxAmount = (yield this.pta().getAvailableIMXReward()) + (yield this.ptb().getAvailableIMXReward());
-            if (imxAmount > 0)
+            const farmingAmount = (yield this.pta().getAvailableFarmingReward()) + (yield this.ptb().getAvailableFarmingReward());
+            if (farmingAmount > 0) {
+                const farmingSymbol = yield this.pta().poolToken.getRewarderTokenSymbol();
                 result.push({
-                    symbol: "IMX",
-                    amount: imxAmount
+                    symbol: farmingSymbol,
+                    amount: farmingAmount
                 });
-            const symbols = [
+            }
+            const rewarderSymbols = [
                 yield this.pta().poolToken.getRewarderTokenSymbol(),
                 yield this.ptb().poolToken.getRewarderTokenSymbol()
             ];
@@ -240,12 +242,12 @@ class AccountLendingPool {
                 yield this.pta().getAvailableRewarderReward(),
                 yield this.ptb().getAvailableRewarderReward()
             ];
-            if (symbols[0] === symbols[1]) {
+            if (rewarderSymbols[0] === rewarderSymbols[1]) {
                 const rewarderAmount = rewarderAmounts[0] + rewarderAmounts[1];
                 if (rewarderAmount === 0)
                     return result;
                 result.push({
-                    symbol: symbols[0],
+                    symbol: rewarderSymbols[0],
                     amount: rewarderAmount
                 });
             }
@@ -254,7 +256,7 @@ class AccountLendingPool {
                     if (rewarderAmounts[i] === 0)
                         continue;
                     result.push({
-                        symbol: symbols[i],
+                        symbol: rewarderSymbols[i],
                         amount: rewarderAmounts[i]
                     });
                 }

package/lib/impermax-router/Borrowable.d.ts

@@ -6,6 +6,7 @@ export default class Borrowable extends PoolToken {
         borrowTracker?: Promise<Address>;
         rewarder?: Promise<Contract>;
         rewarderTokenSymbol?: Promise<string>;
+        farmingTokenSymbol?: Promise<string>;
         rewardSpeed?: Promise<number>;
     };
     cleanCache(): void;
@@ -16,9 +17,10 @@ export default class Borrowable extends PoolToken {
     private initializeBorrowTracker;
     getBorrowTracker(): Promise<string>;
     hasFarming(): Promise<boolean>;
-    hasImpermaxChef(): Promise<boolean>;
-    getFarmingPool(): Promise<Contract>;
     getImpermaxChef: () => any;
+    hasImpermaxChef(): Promise<boolean>;
+    private initializeFarmingTokenSymbol;
+    getFarmingTokenSymbol(): Promise<string>;
     private initializeRewarder;
     getRewarder(): Promise<any>;
     hasRewarder(): Promise<boolean>;

package/lib/impermax-router/Borrowable.js

@@ -18,6 +18,7 @@ class Borrowable extends PoolToken_1.default {
     constructor() {
         super(...arguments);
         this.borrowableCache = {};
+        // Impermax Chef
         this.getImpermaxChef = () => this.getContractHelper().impermaxChef;
     }
     cleanCache() {
@@ -64,8 +65,8 @@ class Borrowable extends PoolToken_1.default {
     }
     hasFarming() {
         return __awaiter(this, void 0, void 0, function* () {
-            const borrowTracker = yield this.getBorrowTracker();
-            return borrowTracker !== '0x0000000000000000000000000000000000000000';
+            // remove old farming contracts, now it only has farming if it has the impermaxChef
+            return this.hasImpermaxChef();
         });
     }
     hasImpermaxChef() {
@@ -75,13 +76,23 @@ class Borrowable extends PoolToken_1.default {
             return borrowTracker.toLowerCase() === ((_a = this.getImpermaxChef()._address) !== null && _a !== void 0 ? _a : "").toLowerCase();
         });
     }
-    getFarmingPool() {
+    initializeFarmingTokenSymbol() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.hasFarming()) || (yield this.hasImpermaxChef()))
-                return null;
-            return this.getContractHelper().newFarmingPool(yield this.getBorrowTracker());
+            if (!(yield this.hasImpermaxChef()))
+                return "";
+            const impermaxChef = yield this.getImpermaxChef();
+            const farmingTokenAddress = yield impermaxChef.methods.rewardToken().call();
+            return this.getContractHelper().newERC20(farmingTokenAddress).methods.symbol().call();
+        });
+    }
+    getFarmingTokenSymbol() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.farmingTokenSymbol)
+                this.borrowableCache.farmingTokenSymbol = this.initializeFarmingTokenSymbol();
+            return this.borrowableCache.farmingTokenSymbol;
         });
     }
+    // Farming Pool Rewarder
     initializeRewarder() {
         return __awaiter(this, void 0, void 0, function* () {
             const poolTokenAddress = yield this.getPoolTokenAddress();

package/lib/impermax-router/Interactions.js

@@ -61,11 +61,10 @@ class Interactions {
                         requests.push((() => __awaiter(this, void 0, void 0, function* () {
                             const accountBorrowable = (yield this.account.getAccountLendingPool(factory, pairAddress)).accountPoolTokens[poolToken];
                             const borrowable = accountBorrowable.poolToken;
-                            const pendingReward = (yield accountBorrowable.getAvailableIMXReward()) + (yield accountBorrowable.getAvailableRewarderReward());
+                            const pendingReward = (yield accountBorrowable.getAvailableFarmingReward()) + (yield accountBorrowable.getAvailableRewarderReward());
                             return {
                                 hasPendingReward: pendingReward > 0,
                                 hasImpermaxChef: yield borrowable.hasImpermaxChef(),
-                                farmingPool: yield borrowable.getFarmingPool(),
                                 borrowableAddress: yield borrowable.getPoolTokenAddress(),
                             };
                         }))());
@@ -73,25 +72,15 @@ class Interactions {
                 }
             }
             const data = yield Promise.all(requests);
-            const toClaimThroughChef = [];
-            const toClaimThroughAggregator = [];
+            const toClaim = [];
             for (const borrowable of data) {
                 if (!borrowable.hasPendingReward)
                     continue;
-                if (borrowable.hasImpermaxChef) {
-                    toClaimThroughChef.push(borrowable.borrowableAddress);
-                }
-                else {
-                    toClaimThroughAggregator.push(borrowable.farmingPool._address);
-                }
-            }
-            if (toClaimThroughAggregator.length > 0) {
-                const claimAggregator = this.account.router.contractsHelper.claimAggregator;
-                return this.send(claimAggregator.methods.claims(this.account.account, toClaimThroughAggregator), onTransactionHash);
+                toClaim.push(borrowable.borrowableAddress);
             }
-            else if (toClaimThroughChef.length > 0) {
+            if (toClaim.length > 0) {
                 const impermaxChef = this.account.router.contractsHelper.impermaxChef;
-                return this.send(impermaxChef.methods.massHarvest(toClaimThroughChef, this.account.account), onTransactionHash);
+                return this.send(impermaxChef.methods.massHarvest(toClaim, this.account.account), onTransactionHash);
             }
         });
     }

package/lib/subgraph/PoolToken.js

@@ -321,7 +321,14 @@ class PoolToken {
                     APR: (0, utils_1.toAPR)((rewardPrice * reward.rewardRate) / totalBorrowedUSD),
                     symbol: reward.rewardToken == "0x98878b06940ae243284ca214f92bb71a2b032b8a" ? "WMOVR" :
                         reward.rewardToken == "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270" ? "WMATIC" :
-                            "IMX",
+                            reward.rewardToken == "0x6659a9c5cd313974343e30b4fdffd95bd4b4dcd2" ? "IMX" :
+                                reward.rewardToken == "0x7b35ce522cb72e4077baeb96cb923a5529764a00" ? "IMX" :
+                                    reward.rewardToken == "0x60bb3d364b765c497c8ce50ae0ae3f0882c5bd05" ? "IMX" :
+                                        reward.rewardToken == "0x9c67ee39e3c4954396b9142010653f17257dd39c" ? "IMX" :
+                                            reward.rewardToken == "0xea6887e4a9cda1b77e70129e5fba830cdb5cddef" ? "IMX" :
+                                                reward.rewardToken == "0x900f1Ec5819FA087d368877cD03B265Bf1802667" ? "IMX" :
+                                                    reward.rewardToken == "0xea38f1ccf77bf43f352636241b05dd8f6f5f52b2" ? "IMX" :
+                                                        "IBEX",
                 });
             }
             return rewards;

package/package.json

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