@defisaver/positions-sdk 1.0.26-dev-portfolio-4 → 1.0.26-dev-portfolio-6

package/cjs/helpers/eulerHelpers/index.d.ts

@@ -24,3 +24,4 @@ export declare const getApyAfterValuesEstimationEulerV2: (actions: {
     asset: string;
     vaultAddress: EthAddress;
 }[], provider: EthereumProvider, network: NetworkNumber) => Promise<any>;
+export declare const getEulerV2SubAccounts: (address: EthAddress) => EthAddress[];

package/cjs/helpers/eulerHelpers/index.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getApyAfterValuesEstimationEulerV2 = exports.getEulerV2SupplyRate = exports.getUtilizationRate = exports.getEulerV2BorrowRate = exports.getEulerV2AggregatedData = exports.calculateNetApy = exports.isLeveragedPos = void 0;
+exports.getEulerV2SubAccounts = exports.getApyAfterValuesEstimationEulerV2 = exports.getEulerV2SupplyRate = exports.getUtilizationRate = exports.getEulerV2BorrowRate = exports.getEulerV2AggregatedData = exports.calculateNetApy = exports.isLeveragedPos = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const moneymarket_1 = require("../../moneymarket");
@@ -228,3 +228,23 @@ const getApyAfterValuesEstimationEulerV2 = (actions, provider, network) => __awa
     return data;
 });
 exports.getApyAfterValuesEstimationEulerV2 = getApyAfterValuesEstimationEulerV2;
+const xorLastByte = (address, xorValue) => {
+    // Extract the last byte (2 hex characters)
+    const lastByte = address.slice(-2);
+    // XOR the last byte with the given xorValue
+    // eslint-disable-next-line no-bitwise
+    const xorResult = [...lastByte].map((char, i) => (parseInt(char, 16) ^ parseInt(xorValue[i], 16)).toString(16)).join('');
+    // Return the full address with the last byte XORed
+    return `0x${address.slice(0, -2)}${xorResult.padStart(2, '0')}`;
+};
+const getEulerV2SubAccounts = (address) => {
+    // Clean the address by removing "0x"
+    const cleanAddress = address.toLowerCase().replace(/^0x/, '');
+    // XOR the last byte with 0x01, 0x02, and 0x03
+    const xorWith01 = xorLastByte(cleanAddress, '01');
+    const xorWith02 = xorLastByte(cleanAddress, '02');
+    const xorWith03 = xorLastByte(cleanAddress, '03');
+    // Return an array with all three modified addresses
+    return [xorWith01, xorWith02, xorWith03];
+};
+exports.getEulerV2SubAccounts = getEulerV2SubAccounts;

package/cjs/maker/index.js

@@ -105,7 +105,7 @@ const _getMakerCdpData = (provider, network, cdp) => __awaiter(void 0, void 0, v
         dogContract.read.chop([cdp.ilk]),
     ]);
     const collInfo = (0, makerHelpers_1.parseCollateralInfo)(cdp.ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), duty.toString(), futureRate.toString(), chop.toString());
-    const collateral = (0, tokens_1.assetAmountInEth)(ink.toString(), cdp.asset);
+    const collateral = (0, tokens_1.assetAmountInEth)(ink.toString(), `MCD-${cdp.asset}`);
     const collateralUsd = new decimal_js_1.default(collateral).mul(collInfo.assetPrice).toString();
     const debt = new decimal_js_1.default(art).times(collInfo.currentRate).div(1e27).floor()
         .toString();

package/cjs/portfolio/index.js

@@ -33,6 +33,7 @@ const viem_1 = require("../services/viem");
 const liquity_1 = require("../liquity");
 const liquityV2_1 = require("../liquityV2");
 const fluid_1 = require("../fluid");
+const eulerHelpers_1 = require("../helpers/eulerHelpers");
 function getPortfolioData(provider, network, defaultProvider, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const isMainnet = network === common_1.NetworkNumber.Eth;
@@ -136,12 +137,19 @@ function getPortfolioData(provider, network, defaultProvider, addresses) {
                 if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
                     positions[address.toLowerCase()].spark[market.value] = accData;
             }))).flat(),
-            ...eulerV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                const accData = yield (0, eulerV2_1._getEulerV2AccountData)(client, network, address, address, Object.assign({ selectedMarket: market }, eulerV2MarketsData[market.value]));
-                if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
-                    positions[address.toLowerCase()].eulerV2[market.value] = accData;
-                }
-            }))).flat(),
+            ...eulerV2Markets.map((market) => addresses.map((address) => {
+                const eulerV2SubAccounts = (0, eulerHelpers_1.getEulerV2SubAccounts)(address);
+                const eulerV2Addresses = [address, ...eulerV2SubAccounts];
+                return Promise.all(eulerV2Addresses.map((eulerAddress) => __awaiter(this, void 0, void 0, function* () {
+                    const accData = yield (0, eulerV2_1._getEulerV2AccountData)(client, network, eulerAddress, eulerAddress, Object.assign({ selectedMarket: market }, eulerV2MarketsData[market.value]));
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
+                        if (!positions[address.toLowerCase()].eulerV2[market.value]) {
+                            positions[address.toLowerCase()].eulerV2[market.value] = {};
+                        }
+                        positions[address.toLowerCase()].eulerV2[market.value][eulerAddress.toLowerCase()] = accData;
+                    }
+                })));
+            }).flat()).flat(),
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {

package/cjs/types/portfolio.d.ts

@@ -24,7 +24,7 @@ export interface PortfolioPositionsDataForAddress {
         [key in SparkVersions]?: SparkPositionData;
     };
     eulerV2: {
-        [key in EulerV2Versions]?: EulerV2PositionData;
+        [key in EulerV2Versions]?: Record<EthAddress, EulerV2PositionData>;
     };
     maker: {
         [key: string]: CdpData;

package/esm/helpers/eulerHelpers/index.d.ts

@@ -24,3 +24,4 @@ export declare const getApyAfterValuesEstimationEulerV2: (actions: {
     asset: string;
     vaultAddress: EthAddress;
 }[], provider: EthereumProvider, network: NetworkNumber) => Promise<any>;
+export declare const getEulerV2SubAccounts: (address: EthAddress) => EthAddress[];

package/esm/helpers/eulerHelpers/index.js

@@ -215,3 +215,22 @@ export const getApyAfterValuesEstimationEulerV2 = (actions, provider, network) =
     }
     return data;
 });
+const xorLastByte = (address, xorValue) => {
+    // Extract the last byte (2 hex characters)
+    const lastByte = address.slice(-2);
+    // XOR the last byte with the given xorValue
+    // eslint-disable-next-line no-bitwise
+    const xorResult = [...lastByte].map((char, i) => (parseInt(char, 16) ^ parseInt(xorValue[i], 16)).toString(16)).join('');
+    // Return the full address with the last byte XORed
+    return `0x${address.slice(0, -2)}${xorResult.padStart(2, '0')}`;
+};
+export const getEulerV2SubAccounts = (address) => {
+    // Clean the address by removing "0x"
+    const cleanAddress = address.toLowerCase().replace(/^0x/, '');
+    // XOR the last byte with 0x01, 0x02, and 0x03
+    const xorWith01 = xorLastByte(cleanAddress, '01');
+    const xorWith02 = xorLastByte(cleanAddress, '02');
+    const xorWith03 = xorLastByte(cleanAddress, '03');
+    // Return an array with all three modified addresses
+    return [xorWith01, xorWith02, xorWith03];
+};

package/esm/maker/index.js

@@ -95,7 +95,7 @@ export const _getMakerCdpData = (provider, network, cdp) => __awaiter(void 0, vo
         dogContract.read.chop([cdp.ilk]),
     ]);
     const collInfo = parseCollateralInfo(cdp.ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), duty.toString(), futureRate.toString(), chop.toString());
-    const collateral = assetAmountInEth(ink.toString(), cdp.asset);
+    const collateral = assetAmountInEth(ink.toString(), `MCD-${cdp.asset}`);
     const collateralUsd = new Dec(collateral).mul(collInfo.assetPrice).toString();
     const debt = new Dec(art).times(collInfo.currentRate).div(1e27).floor()
         .toString();

package/esm/portfolio/index.js

@@ -26,6 +26,7 @@ import { getViemProvider } from '../services/viem';
 import { _getLiquityTroveInfo } from '../liquity';
 import { _getLiquityV2MarketData, _getLiquityV2TroveData, _getLiquityV2UserTroveIds } from '../liquityV2';
 import { _getUserPositions } from '../fluid';
+import { getEulerV2SubAccounts } from '../helpers/eulerHelpers';
 export function getPortfolioData(provider, network, defaultProvider, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const isMainnet = network === NetworkNumber.Eth;
@@ -129,12 +130,19 @@ export function getPortfolioData(provider, network, defaultProvider, addresses)
                 if (new Dec(accData.suppliedUsd).gt(0))
                     positions[address.toLowerCase()].spark[market.value] = accData;
             }))).flat(),
-            ...eulerV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                const accData = yield _getEulerV2AccountData(client, network, address, address, Object.assign({ selectedMarket: market }, eulerV2MarketsData[market.value]));
-                if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-                    positions[address.toLowerCase()].eulerV2[market.value] = accData;
-                }
-            }))).flat(),
+            ...eulerV2Markets.map((market) => addresses.map((address) => {
+                const eulerV2SubAccounts = getEulerV2SubAccounts(address);
+                const eulerV2Addresses = [address, ...eulerV2SubAccounts];
+                return Promise.all(eulerV2Addresses.map((eulerAddress) => __awaiter(this, void 0, void 0, function* () {
+                    const accData = yield _getEulerV2AccountData(client, network, eulerAddress, eulerAddress, Object.assign({ selectedMarket: market }, eulerV2MarketsData[market.value]));
+                    if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
+                        if (!positions[address.toLowerCase()].eulerV2[market.value]) {
+                            positions[address.toLowerCase()].eulerV2[market.value] = {};
+                        }
+                        positions[address.toLowerCase()].eulerV2[market.value][eulerAddress.toLowerCase()] = accData;
+                    }
+                })));
+            }).flat()).flat(),
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {

package/esm/types/portfolio.d.ts

@@ -24,7 +24,7 @@ export interface PortfolioPositionsDataForAddress {
         [key in SparkVersions]?: SparkPositionData;
     };
     eulerV2: {
-        [key in EulerV2Versions]?: EulerV2PositionData;
+        [key in EulerV2Versions]?: Record<EthAddress, EulerV2PositionData>;
     };
     maker: {
         [key: string]: CdpData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "1.0.26-dev-portfolio-4",
+  "version": "1.0.26-dev-portfolio-6",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -12,7 +12,7 @@
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint src/ --fix",
     "lint-check": "eslint src/",
-    "test": "mocha tests/maker.ts",
+    "test": "mocha tests/portfolio.ts",
     "test-single": "mocha ./tests/$npm_config_name.ts",
     "test:debugger": "mocha --inspect-brk tests/*",
     "build-test": "npm run build && npm run test",

package/src/helpers/eulerHelpers/index.ts

@@ -230,4 +230,31 @@ export const getApyAfterValuesEstimationEulerV2 = async (actions: { action: stri
     };
   }
   return data;
+};
+
+const xorLastByte = (address: string, xorValue: string): EthAddress => {
+  // Extract the last byte (2 hex characters)
+  const lastByte = address.slice(-2);
+
+  // XOR the last byte with the given xorValue
+
+  // eslint-disable-next-line no-bitwise
+  const xorResult = [...lastByte].map((char, i) => (parseInt(char, 16) ^ parseInt(xorValue[i], 16)).toString(16),
+  ).join('');
+
+  // Return the full address with the last byte XORed
+  return `0x${address.slice(0, -2)}${xorResult.padStart(2, '0')}`;
+};
+
+export const getEulerV2SubAccounts = (address: EthAddress): EthAddress[] => {
+  // Clean the address by removing "0x"
+  const cleanAddress = address.toLowerCase().replace(/^0x/, '');
+
+  // XOR the last byte with 0x01, 0x02, and 0x03
+  const xorWith01 = xorLastByte(cleanAddress, '01');
+  const xorWith02 = xorLastByte(cleanAddress, '02');
+  const xorWith03 = xorLastByte(cleanAddress, '03');
+
+  // Return an array with all three modified addresses
+  return [xorWith01, xorWith02, xorWith03];
 };

package/src/maker/index.ts

@@ -167,7 +167,7 @@ export const _getMakerCdpData = async (provider: Client, network: NetworkNumber,
     chop.toString(),
   );
 
-  const collateral = assetAmountInEth(ink.toString(), cdp.asset);
+  const collateral = assetAmountInEth(ink.toString(), `MCD-${cdp.asset}`);
 
   const collateralUsd = new Dec(collateral).mul(collInfo.assetPrice).toString();
   const debt = new Dec(art).times(collInfo.currentRate).div(1e27).floor()

package/src/portfolio/index.ts

@@ -37,6 +37,7 @@ import { getViemProvider } from '../services/viem';
 import { _getLiquityTroveInfo } from '../liquity';
 import { _getLiquityV2MarketData, _getLiquityV2TroveData, _getLiquityV2UserTroveIds } from '../liquityV2';
 import { _getUserPositions } from '../fluid';
+import { getEulerV2SubAccounts } from '../helpers/eulerHelpers';
 
 export async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[]): Promise<PortfolioPositionsData> {
   const isMainnet = network === NetworkNumber.Eth;
@@ -141,12 +142,19 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
       const accData = await _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
       if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].spark[market.value] = accData;
     })).flat(),
-    ...eulerV2Markets.map((market) => addresses.map(async (address) => {
-      const accData = await _getEulerV2AccountData(client, network, address, address, { selectedMarket: market, ...eulerV2MarketsData[market.value] });
-      if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-        positions[address.toLowerCase() as EthAddress].eulerV2[market.value] = accData;
-      }
-    })).flat(),
+    ...eulerV2Markets.map((market) => addresses.map((address) => {
+      const eulerV2SubAccounts = getEulerV2SubAccounts(address);
+      const eulerV2Addresses = [address, ...eulerV2SubAccounts];
+      return Promise.all(eulerV2Addresses.map(async (eulerAddress) => {
+        const accData = await _getEulerV2AccountData(client, network, eulerAddress, eulerAddress, { selectedMarket: market, ...eulerV2MarketsData[market.value] });
+        if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
+          if (!positions[address.toLowerCase() as EthAddress].eulerV2[market.value]) {
+            positions[address.toLowerCase() as EthAddress].eulerV2[market.value] = {};
+          }
+          positions[address.toLowerCase() as EthAddress].eulerV2[market.value]![eulerAddress.toLowerCase() as EthAddress] = accData;
+        }
+      }));
+    }).flat()).flat(),
     ...addresses.map(async (address) => makerCdps[address.toLowerCase() as EthAddress]?.map(async (cdpInfo) => {
       const cdpData = await _getMakerCdpData(client, network, cdpInfo);
       if (cdpData) {

package/src/types/portfolio.ts

@@ -25,7 +25,7 @@ export interface PortfolioPositionsDataForAddress {
     [key in SparkVersions]?: SparkPositionData;
   }
   eulerV2: {
-    [key in EulerV2Versions]?: EulerV2PositionData;
+    [key in EulerV2Versions]?: Record<EthAddress, EulerV2PositionData>;
   };
   maker: {
     [key: string]: CdpData;