@defisaver/positions-sdk 2.0.12 → 2.0.14-dev-portfolio

package/esm/umbrella/index.d.ts

@@ -0,0 +1,5 @@
+import { Client } from 'viem';
+import { EthAddress, NetworkNumber } from '../types/common';
+export declare const getUmbrellaData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
+    [k: string]: any;
+}>;

package/esm/umbrella/index.js

@@ -0,0 +1,46 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { AaveUmbrellaViewViem, AaveV3ViewContractViem } from '../contracts';
+import { compareAddresses, convertHybridArraysToObjects, getEthAmountForDecimals } from '../services/utils';
+import { findMatching, tokenEntries } from './umbrellaUtils';
+const umbrella = '0xD400fc38ED4732893174325693a63C30ee3881a8';
+const aaveOracle = '0x54586bE62E3c3580375aE3723C145253060Ca0C2';
+export const getUmbrellaData = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () {
+    const umbrellaView = AaveUmbrellaViewViem(provider, network);
+    const aaveV3View = AaveV3ViewContractViem(provider, network);
+    const [tokensAggregatedData, additionalUmbrellaStakingData, userAggregatedData] = yield Promise.all([
+        umbrellaView.read.getTokensAggregatedData([umbrella, aaveOracle]),
+        aaveV3View.read.getAdditionalUmbrellaStakingData([umbrella, address]),
+        umbrellaView.read.getUserAggregatedData([umbrella, address]),
+    ]);
+    return Object.fromEntries(tokenEntries.map(([symbol, tokenAddr]) => {
+        // @ts-ignore
+        const fromTokens = convertHybridArraysToObjects(findMatching(tokensAggregatedData, tokenAddr));
+        // @ts-ignore
+        const fromUser = convertHybridArraysToObjects(findMatching(userAggregatedData, tokenAddr));
+        // @ts-ignore
+        const fromAdditionalData = convertHybridArraysToObjects(findMatching(additionalUmbrellaStakingData, tokenAddr));
+        const data = Object.assign(Object.assign(Object.assign(Object.assign({}, fromTokens), fromUser), fromAdditionalData), { account: {
+                stakeUserBalance: (fromUser === null || fromUser === void 0 ? void 0 : fromUser.stakeUserBalance) || '0',
+                rewardsTokenUserData: convertHybridArraysToObjects(fromUser === null || fromUser === void 0 ? void 0 : fromUser.rewardsTokenUserData) || [],
+                userCooldownAmount: (fromAdditionalData === null || fromAdditionalData === void 0 ? void 0 : fromAdditionalData.userCooldownAmount) || '0',
+                userEndOfCooldown: (fromAdditionalData === null || fromAdditionalData === void 0 ? void 0 : fromAdditionalData.userEndOfCooldown) || '0',
+                userWithdrawalWindow: (fromAdditionalData === null || fromAdditionalData === void 0 ? void 0 : fromAdditionalData.userWithdrawalWindow) || '0',
+            } });
+        const stakeTokenData = data.stakeTokenData;
+        return [symbol, Object.assign(Object.assign({}, data), { stakeTokenData: Object.assign(Object.assign({}, stakeTokenData), { price: getEthAmountForDecimals(stakeTokenData.price, 8) }), stkTokenToWaTokenRate: getEthAmountForDecimals(data.stkTokenToWaTokenRate, stakeTokenData.decimals), waTokenToATokenRate: getEthAmountForDecimals(data.waTokenToATokenRate, stakeTokenData.decimals), totalShares: getEthAmountForDecimals(data.totalShares, stakeTokenData.decimals), totalAssets: getEthAmountForDecimals(data.totalAssets, stakeTokenData.decimals), targetLiquidity: getEthAmountForDecimals(data.targetLiquidity, stakeTokenData.decimals), rewardsTokenData: data.rewardsTokenData.map((tokenData) => (Object.assign(Object.assign({}, tokenData), { rewardTokenData: Object.assign(Object.assign({}, tokenData.rewardTokenData), { price: getEthAmountForDecimals(tokenData.rewardTokenData.price, 8) }) }))), rewardsEmissionRates: data.rewardsEmissionRates.map((rate, i) => {
+                    const tokenData = data.rewardsTokenData[i].rewardTokenData;
+                    return getEthAmountForDecimals(rate, tokenData.decimals);
+                }), account: Object.assign(Object.assign({}, data.account), { stakeUserBalance: getEthAmountForDecimals(data.account.stakeUserBalance, stakeTokenData.decimals), userCooldownAmount: getEthAmountForDecimals(data.account.userCooldownAmount, stakeTokenData.decimals), rewardsTokenUserData: data.account.rewardsTokenUserData.map((reward) => {
+                        const tokenData = data.rewardsTokenData.find((tknData) => compareAddresses(tknData.rewardTokenData.token, reward.reward));
+                        return (Object.assign(Object.assign({}, reward), { currentReward: getEthAmountForDecimals(reward.currentReward, tokenData.rewardTokenData.decimals) }));
+                    }) }) })];
+    }));
+});

package/esm/umbrella/umbrellaUtils.d.ts

@@ -0,0 +1,22 @@
+export declare enum UmbrellaStaking {
+    UmbrellaGHO = "UmbrellaGHO",
+    UmbrellaUSDC = "UmbrellaUSDC",
+    UmbrellaUSDT = "UmbrellaUSDT",
+    UmbrellaETH = "UmbrellaETH"
+}
+export declare const tokenMapping: {
+    readonly UmbrellaUSDC: "0x6bf183243FdD1e306ad2C4450BC7dcf6f0bf8Aa6";
+    readonly UmbrellaUSDT: "0xA484Ab92fe32B143AEE7019fC1502b1dAA522D31";
+    readonly UmbrellaETH: "0xaAFD07D53A7365D3e9fb6F3a3B09EC19676B73Ce";
+    readonly UmbrellaGHO: "0x4f827A63755855cDf3e8f3bcD20265C833f15033";
+};
+export declare const normalize: (addr?: string) => string;
+export declare const tokenEntries: string[][];
+export declare const extractAddress: (item?: {
+    stakeToken?: string;
+    stkToken?: string;
+    stakeTokenData?: {
+        token?: string;
+    };
+}) => string;
+export declare const findMatching: (dataset: any[], targetAddr: string) => any;

package/esm/umbrella/umbrellaUtils.js

@@ -0,0 +1,28 @@
+export var UmbrellaStaking;
+(function (UmbrellaStaking) {
+    UmbrellaStaking["UmbrellaGHO"] = "UmbrellaGHO";
+    UmbrellaStaking["UmbrellaUSDC"] = "UmbrellaUSDC";
+    UmbrellaStaking["UmbrellaUSDT"] = "UmbrellaUSDT";
+    UmbrellaStaking["UmbrellaETH"] = "UmbrellaETH";
+})(UmbrellaStaking || (UmbrellaStaking = {}));
+export const tokenMapping = {
+    [UmbrellaStaking.UmbrellaUSDC]: '0x6bf183243FdD1e306ad2C4450BC7dcf6f0bf8Aa6',
+    [UmbrellaStaking.UmbrellaUSDT]: '0xA484Ab92fe32B143AEE7019fC1502b1dAA522D31',
+    [UmbrellaStaking.UmbrellaETH]: '0xaAFD07D53A7365D3e9fb6F3a3B09EC19676B73Ce',
+    [UmbrellaStaking.UmbrellaGHO]: '0x4f827A63755855cDf3e8f3bcD20265C833f15033',
+};
+// ----- chat gpt code for result mapping ---------
+export const normalize = (addr) => { var _a, _b; return (_b = (_a = addr === null || addr === void 0 ? void 0 : addr.toLowerCase) === null || _a === void 0 ? void 0 : _a.call(addr)) !== null && _b !== void 0 ? _b : ''; };
+export const tokenEntries = Object.entries(tokenMapping).map(([symbol, address]) => [
+    symbol,
+    normalize(address),
+]);
+// 👇 Define how to extract the token address from each source type
+export const extractAddress = (item) => {
+    var _a;
+    return normalize((item === null || item === void 0 ? void 0 : item.stakeToken)
+        || (item === null || item === void 0 ? void 0 : item.stkToken)
+        || ((_a = item === null || item === void 0 ? void 0 : item.stakeTokenData) === null || _a === void 0 ? void 0 : _a.token));
+};
+// 👇 Utility to find the matching object in a dataset
+export const findMatching = (dataset, targetAddr) => dataset.find((item) => extractAddress(item) === targetAddr);

package/package.json

@@ -1,47 +1,47 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "2.0.12",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run lint && npm run build:cjs && npm run build:esm",
-    "dev": "tsc -p tsconfig.json --watch",
-    "lint": "eslint src/ --fix",
-    "lint-check": "eslint src/",
-    "test": "mocha tests/*",
-    "test-single": "mocha ./tests/$npm_config_name.ts",
-    "test:debugger": "mocha --inspect-brk tests/*",
-    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.7.0",
-    "@types/lodash": "^4.17.15",
-    "@types/memoizee": "^0.4.12",
-    "decimal.js": "^10.6.0",
-    "lodash": "^4.17.21",
-    "memoizee": "^0.4.17",
-    "viem": "^2.31.4"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@metamask/eth-json-rpc-middleware": "^15.0.1",
-    "@metamask/eth-json-rpc-provider": "^4.1.6",
-    "@types/chai": "^5.0.0",
-    "@types/mocha": "^10.0.9",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "eslint-plugin-import": "^2.31.0",
-    "mocha": "^10.2.0",
-    "nock": "^14.0.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.2.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "2.0.14-dev-portfolio",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run lint && npm run build:cjs && npm run build:esm",
+    "dev": "tsc -p tsconfig.json --watch",
+    "lint": "eslint src/ --fix",
+    "lint-check": "eslint src/",
+    "test": "mocha tests/*",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.7.1",
+    "@types/lodash": "^4.17.15",
+    "@types/memoizee": "^0.4.12",
+    "decimal.js": "^10.6.0",
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.17",
+    "viem": "^2.31.4"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "@metamask/eth-json-rpc-middleware": "^15.0.1",
+    "@metamask/eth-json-rpc-provider": "^4.1.6",
+    "@types/chai": "^5.0.0",
+    "@types/mocha": "^10.0.9",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "eslint-plugin-import": "^2.31.0",
+    "mocha": "^10.2.0",
+    "nock": "^14.0.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.2.2"
+  }
+}