@defisaver/positions-sdk 0.0.20 → 0.0.22

package/cjs/types/contracts/generated/CUSDCev3.d.ts

@@ -0,0 +1,441 @@
+/// <reference types="node" />
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, NonPayableTransactionObject, BlockType, ContractEventLog, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export declare namespace CometConfiguration {
+    type AssetConfigStruct = [
+        string,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+    ] | {
+        asset: string;
+        priceFeed: string;
+        decimals: number | string | BN;
+        borrowCollateralFactor: number | string | BN;
+        liquidateCollateralFactor: number | string | BN;
+        liquidationFactor: number | string | BN;
+        supplyCap: number | string | BN;
+    };
+    type AssetConfigStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string
+    ];
+    type AssetConfigStructOutputStruct = {
+        asset: string;
+        priceFeed: string;
+        decimals: string;
+        borrowCollateralFactor: string;
+        liquidateCollateralFactor: string;
+        liquidationFactor: string;
+        supplyCap: string;
+    };
+    type AssetConfigStructOutput = AssetConfigStructOutputArray & AssetConfigStructOutputStruct;
+    type ConfigurationStruct = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        CometConfiguration.AssetConfigStruct[]
+    ] | {
+        governor: string;
+        pauseGuardian: string;
+        baseToken: string;
+        baseTokenPriceFeed: string;
+        extensionDelegate: string;
+        supplyKink: number | string | BN;
+        supplyPerYearInterestRateSlopeLow: number | string | BN;
+        supplyPerYearInterestRateSlopeHigh: number | string | BN;
+        supplyPerYearInterestRateBase: number | string | BN;
+        borrowKink: number | string | BN;
+        borrowPerYearInterestRateSlopeLow: number | string | BN;
+        borrowPerYearInterestRateSlopeHigh: number | string | BN;
+        borrowPerYearInterestRateBase: number | string | BN;
+        storeFrontPriceFactor: number | string | BN;
+        trackingIndexScale: number | string | BN;
+        baseTrackingSupplySpeed: number | string | BN;
+        baseTrackingBorrowSpeed: number | string | BN;
+        baseMinForRewards: number | string | BN;
+        baseBorrowMin: number | string | BN;
+        targetReserves: number | string | BN;
+        assetConfigs: CometConfiguration.AssetConfigStruct[];
+    };
+    type ConfigurationStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        CometConfiguration.AssetConfigStructOutput[]
+    ];
+    type ConfigurationStructOutputStruct = {
+        governor: string;
+        pauseGuardian: string;
+        baseToken: string;
+        baseTokenPriceFeed: string;
+        extensionDelegate: string;
+        supplyKink: string;
+        supplyPerYearInterestRateSlopeLow: string;
+        supplyPerYearInterestRateSlopeHigh: string;
+        supplyPerYearInterestRateBase: string;
+        borrowKink: string;
+        borrowPerYearInterestRateSlopeLow: string;
+        borrowPerYearInterestRateSlopeHigh: string;
+        borrowPerYearInterestRateBase: string;
+        storeFrontPriceFactor: string;
+        trackingIndexScale: string;
+        baseTrackingSupplySpeed: string;
+        baseTrackingBorrowSpeed: string;
+        baseMinForRewards: string;
+        baseBorrowMin: string;
+        targetReserves: string;
+        assetConfigs: CometConfiguration.AssetConfigStructOutput[];
+    };
+    type ConfigurationStructOutput = ConfigurationStructOutputArray & ConfigurationStructOutputStruct;
+}
+export declare namespace CometCore {
+    type AssetInfoStruct = [
+        number | string | BN,
+        string,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+    ] | {
+        offset: number | string | BN;
+        asset: string;
+        priceFeed: string;
+        scale: number | string | BN;
+        borrowCollateralFactor: number | string | BN;
+        liquidateCollateralFactor: number | string | BN;
+        liquidationFactor: number | string | BN;
+        supplyCap: number | string | BN;
+    };
+    type AssetInfoStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string
+    ];
+    type AssetInfoStructOutputStruct = {
+        offset: string;
+        asset: string;
+        priceFeed: string;
+        scale: string;
+        borrowCollateralFactor: string;
+        liquidateCollateralFactor: string;
+        liquidationFactor: string;
+        supplyCap: string;
+    };
+    type AssetInfoStructOutput = AssetInfoStructOutputArray & AssetInfoStructOutputStruct;
+}
+export type AbsorbCollateral = ContractEventLog<{
+    absorber: string;
+    borrower: string;
+    asset: string;
+    collateralAbsorbed: string;
+    usdValue: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+}>;
+export type AbsorbDebt = ContractEventLog<{
+    absorber: string;
+    borrower: string;
+    basePaidOut: string;
+    usdValue: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+}>;
+export type BuyCollateral = ContractEventLog<{
+    buyer: string;
+    asset: string;
+    baseAmount: string;
+    collateralAmount: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+}>;
+export type PauseAction = ContractEventLog<{
+    supplyPaused: boolean;
+    transferPaused: boolean;
+    withdrawPaused: boolean;
+    absorbPaused: boolean;
+    buyPaused: boolean;
+    0: boolean;
+    1: boolean;
+    2: boolean;
+    3: boolean;
+    4: boolean;
+}>;
+export type Supply = ContractEventLog<{
+    from: string;
+    dst: string;
+    amount: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type SupplyCollateral = ContractEventLog<{
+    from: string;
+    dst: string;
+    asset: string;
+    amount: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+}>;
+export type Transfer = ContractEventLog<{
+    from: string;
+    to: string;
+    amount: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type TransferCollateral = ContractEventLog<{
+    from: string;
+    to: string;
+    asset: string;
+    amount: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+}>;
+export type Withdraw = ContractEventLog<{
+    src: string;
+    to: string;
+    amount: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type WithdrawCollateral = ContractEventLog<{
+    src: string;
+    to: string;
+    asset: string;
+    amount: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+}>;
+export type WithdrawReserves = ContractEventLog<{
+    to: string;
+    amount: string;
+    0: string;
+    1: string;
+}>;
+export interface CUSDCev3 extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): CUSDCev3;
+    clone(): CUSDCev3;
+    methods: {
+        absorb(absorber: string, accounts: string[]): NonPayableTransactionObject<void>;
+        accrueAccount(account: string): NonPayableTransactionObject<void>;
+        approveThis(manager: string, asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        balanceOf(account: string): NonPayableTransactionObject<string>;
+        baseBorrowMin(): NonPayableTransactionObject<string>;
+        baseMinForRewards(): NonPayableTransactionObject<string>;
+        baseScale(): NonPayableTransactionObject<string>;
+        baseToken(): NonPayableTransactionObject<string>;
+        baseTokenPriceFeed(): NonPayableTransactionObject<string>;
+        baseTrackingBorrowSpeed(): NonPayableTransactionObject<string>;
+        baseTrackingSupplySpeed(): NonPayableTransactionObject<string>;
+        borrowBalanceOf(account: string): NonPayableTransactionObject<string>;
+        borrowKink(): NonPayableTransactionObject<string>;
+        borrowPerSecondInterestRateBase(): NonPayableTransactionObject<string>;
+        borrowPerSecondInterestRateSlopeHigh(): NonPayableTransactionObject<string>;
+        borrowPerSecondInterestRateSlopeLow(): NonPayableTransactionObject<string>;
+        buyCollateral(asset: string, minAmount: number | string | BN, baseAmount: number | string | BN, recipient: string): NonPayableTransactionObject<void>;
+        decimals(): NonPayableTransactionObject<string>;
+        extensionDelegate(): NonPayableTransactionObject<string>;
+        getAssetInfo(i: number | string | BN): NonPayableTransactionObject<CometCore.AssetInfoStructOutput>;
+        getAssetInfoByAddress(asset: string): NonPayableTransactionObject<CometCore.AssetInfoStructOutput>;
+        getBorrowRate(utilization: number | string | BN): NonPayableTransactionObject<string>;
+        getCollateralReserves(asset: string): NonPayableTransactionObject<string>;
+        getPrice(priceFeed: string): NonPayableTransactionObject<string>;
+        getReserves(): NonPayableTransactionObject<string>;
+        getSupplyRate(utilization: number | string | BN): NonPayableTransactionObject<string>;
+        getUtilization(): NonPayableTransactionObject<string>;
+        governor(): NonPayableTransactionObject<string>;
+        hasPermission(owner: string, manager: string): NonPayableTransactionObject<boolean>;
+        initializeStorage(): NonPayableTransactionObject<void>;
+        isAbsorbPaused(): NonPayableTransactionObject<boolean>;
+        isAllowed(arg0: string, arg1: string): NonPayableTransactionObject<boolean>;
+        isBorrowCollateralized(account: string): NonPayableTransactionObject<boolean>;
+        isBuyPaused(): NonPayableTransactionObject<boolean>;
+        isLiquidatable(account: string): NonPayableTransactionObject<boolean>;
+        isSupplyPaused(): NonPayableTransactionObject<boolean>;
+        isTransferPaused(): NonPayableTransactionObject<boolean>;
+        isWithdrawPaused(): NonPayableTransactionObject<boolean>;
+        liquidatorPoints(arg0: string): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string
+        ] & {
+            numAbsorbs: string;
+            numAbsorbed: string;
+            approxSpend: string;
+            _reserved: string;
+        }>;
+        numAssets(): NonPayableTransactionObject<string>;
+        pause(supplyPaused: boolean, transferPaused: boolean, withdrawPaused: boolean, absorbPaused: boolean, buyPaused: boolean): NonPayableTransactionObject<void>;
+        pauseGuardian(): NonPayableTransactionObject<string>;
+        quoteCollateral(asset: string, baseAmount: number | string | BN): NonPayableTransactionObject<string>;
+        storeFrontPriceFactor(): NonPayableTransactionObject<string>;
+        supply(asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        supplyFrom(from: string, dst: string, asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        supplyKink(): NonPayableTransactionObject<string>;
+        supplyPerSecondInterestRateBase(): NonPayableTransactionObject<string>;
+        supplyPerSecondInterestRateSlopeHigh(): NonPayableTransactionObject<string>;
+        supplyPerSecondInterestRateSlopeLow(): NonPayableTransactionObject<string>;
+        supplyTo(dst: string, asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        targetReserves(): NonPayableTransactionObject<string>;
+        totalBorrow(): NonPayableTransactionObject<string>;
+        totalSupply(): NonPayableTransactionObject<string>;
+        totalsCollateral(arg0: string): NonPayableTransactionObject<[
+            string,
+            string
+        ] & {
+            totalSupplyAsset: string;
+            _reserved: string;
+        }>;
+        trackingIndexScale(): NonPayableTransactionObject<string>;
+        transfer(dst: string, amount: number | string | BN): NonPayableTransactionObject<boolean>;
+        transferAsset(dst: string, asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        transferAssetFrom(src: string, dst: string, asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        transferFrom(src: string, dst: string, amount: number | string | BN): NonPayableTransactionObject<boolean>;
+        userBasic(arg0: string): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            principal: string;
+            baseTrackingIndex: string;
+            baseTrackingAccrued: string;
+            assetsIn: string;
+            _reserved: string;
+        }>;
+        userCollateral(arg0: string, arg1: string): NonPayableTransactionObject<[
+            string,
+            string
+        ] & {
+            balance: string;
+            _reserved: string;
+        }>;
+        userNonce(arg0: string): NonPayableTransactionObject<string>;
+        withdraw(asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        withdrawFrom(src: string, to: string, asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        withdrawReserves(to: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+        withdrawTo(to: string, asset: string, amount: number | string | BN): NonPayableTransactionObject<void>;
+    };
+    events: {
+        AbsorbCollateral(cb?: Callback<AbsorbCollateral>): EventEmitter;
+        AbsorbCollateral(options?: EventOptions, cb?: Callback<AbsorbCollateral>): EventEmitter;
+        AbsorbDebt(cb?: Callback<AbsorbDebt>): EventEmitter;
+        AbsorbDebt(options?: EventOptions, cb?: Callback<AbsorbDebt>): EventEmitter;
+        BuyCollateral(cb?: Callback<BuyCollateral>): EventEmitter;
+        BuyCollateral(options?: EventOptions, cb?: Callback<BuyCollateral>): EventEmitter;
+        PauseAction(cb?: Callback<PauseAction>): EventEmitter;
+        PauseAction(options?: EventOptions, cb?: Callback<PauseAction>): EventEmitter;
+        Supply(cb?: Callback<Supply>): EventEmitter;
+        Supply(options?: EventOptions, cb?: Callback<Supply>): EventEmitter;
+        SupplyCollateral(cb?: Callback<SupplyCollateral>): EventEmitter;
+        SupplyCollateral(options?: EventOptions, cb?: Callback<SupplyCollateral>): EventEmitter;
+        Transfer(cb?: Callback<Transfer>): EventEmitter;
+        Transfer(options?: EventOptions, cb?: Callback<Transfer>): EventEmitter;
+        TransferCollateral(cb?: Callback<TransferCollateral>): EventEmitter;
+        TransferCollateral(options?: EventOptions, cb?: Callback<TransferCollateral>): EventEmitter;
+        Withdraw(cb?: Callback<Withdraw>): EventEmitter;
+        Withdraw(options?: EventOptions, cb?: Callback<Withdraw>): EventEmitter;
+        WithdrawCollateral(cb?: Callback<WithdrawCollateral>): EventEmitter;
+        WithdrawCollateral(options?: EventOptions, cb?: Callback<WithdrawCollateral>): EventEmitter;
+        WithdrawReserves(cb?: Callback<WithdrawReserves>): EventEmitter;
+        WithdrawReserves(options?: EventOptions, cb?: Callback<WithdrawReserves>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "AbsorbCollateral", cb: Callback<AbsorbCollateral>): void;
+    once(event: "AbsorbCollateral", options: EventOptions, cb: Callback<AbsorbCollateral>): void;
+    once(event: "AbsorbDebt", cb: Callback<AbsorbDebt>): void;
+    once(event: "AbsorbDebt", options: EventOptions, cb: Callback<AbsorbDebt>): void;
+    once(event: "BuyCollateral", cb: Callback<BuyCollateral>): void;
+    once(event: "BuyCollateral", options: EventOptions, cb: Callback<BuyCollateral>): void;
+    once(event: "PauseAction", cb: Callback<PauseAction>): void;
+    once(event: "PauseAction", options: EventOptions, cb: Callback<PauseAction>): void;
+    once(event: "Supply", cb: Callback<Supply>): void;
+    once(event: "Supply", options: EventOptions, cb: Callback<Supply>): void;
+    once(event: "SupplyCollateral", cb: Callback<SupplyCollateral>): void;
+    once(event: "SupplyCollateral", options: EventOptions, cb: Callback<SupplyCollateral>): void;
+    once(event: "Transfer", cb: Callback<Transfer>): void;
+    once(event: "Transfer", options: EventOptions, cb: Callback<Transfer>): void;
+    once(event: "TransferCollateral", cb: Callback<TransferCollateral>): void;
+    once(event: "TransferCollateral", options: EventOptions, cb: Callback<TransferCollateral>): void;
+    once(event: "Withdraw", cb: Callback<Withdraw>): void;
+    once(event: "Withdraw", options: EventOptions, cb: Callback<Withdraw>): void;
+    once(event: "WithdrawCollateral", cb: Callback<WithdrawCollateral>): void;
+    once(event: "WithdrawCollateral", options: EventOptions, cb: Callback<WithdrawCollateral>): void;
+    once(event: "WithdrawReserves", cb: Callback<WithdrawReserves>): void;
+    once(event: "WithdrawReserves", options: EventOptions, cb: Callback<WithdrawReserves>): void;
+}

package/cjs/types/contracts/generated/CUSDCev3.js

@@ -0,0 +1,5 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/types/contracts/generated/CompV3USDCBulkerArb.d.ts

@@ -0,0 +1,41 @@
+/// <reference types="node" />
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, PayableTransactionObject, NonPayableTransactionObject, BlockType, ContractEventLog, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export type AdminTransferred = ContractEventLog<{
+    oldAdmin: string;
+    newAdmin: string;
+    0: string;
+    1: string;
+}>;
+export interface CompV3USDCBulkerArb extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): CompV3USDCBulkerArb;
+    clone(): CompV3USDCBulkerArb;
+    methods: {
+        ACTION_CLAIM_REWARD(): NonPayableTransactionObject<string>;
+        ACTION_SUPPLY_ASSET(): NonPayableTransactionObject<string>;
+        ACTION_SUPPLY_NATIVE_TOKEN(): NonPayableTransactionObject<string>;
+        ACTION_TRANSFER_ASSET(): NonPayableTransactionObject<string>;
+        ACTION_WITHDRAW_ASSET(): NonPayableTransactionObject<string>;
+        ACTION_WITHDRAW_NATIVE_TOKEN(): NonPayableTransactionObject<string>;
+        admin(): NonPayableTransactionObject<string>;
+        invoke(actions: string | number[][], data: string | number[][]): PayableTransactionObject<void>;
+        sweepNativeToken(recipient: string): NonPayableTransactionObject<void>;
+        sweepToken(recipient: string, asset: string): NonPayableTransactionObject<void>;
+        transferAdmin(newAdmin: string): NonPayableTransactionObject<void>;
+        wrappedNativeToken(): NonPayableTransactionObject<string>;
+    };
+    events: {
+        AdminTransferred(cb?: Callback<AdminTransferred>): EventEmitter;
+        AdminTransferred(options?: EventOptions, cb?: Callback<AdminTransferred>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "AdminTransferred", cb: Callback<AdminTransferred>): void;
+    once(event: "AdminTransferred", options: EventOptions, cb: Callback<AdminTransferred>): void;
+}

package/cjs/types/contracts/generated/CompV3USDCBulkerArb.js

@@ -0,0 +1,5 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/types/contracts/generated/index.d.ts

@@ -14,6 +14,7 @@ export type { ChickenBondsView } from "./ChickenBondsView";
 export type { CollSurplusPool } from "./CollSurplusPool";
 export type { CompV3ETHBulker } from "./CompV3ETHBulker";
 export type { CompV3USDCBulker } from "./CompV3USDCBulker";
+export type { CompV3USDCBulkerArb } from "./CompV3USDCBulkerArb";
 export type { CompV3USDbCBulker } from "./CompV3USDbCBulker";
 export type { CompV3View } from "./CompV3View";
 export type { CompoundLoanInfo } from "./CompoundLoanInfo";
@@ -48,6 +49,7 @@ export type { TroveManager } from "./TroveManager";
 export type { USDCPriceFeed } from "./USDCPriceFeed";
 export type { UniMulticall } from "./UniMulticall";
 export type { CETHv3 } from "./CETHv3";
+export type { CUSDCev3 } from "./CUSDCev3";
 export type { CUSDCv3 } from "./CUSDCv3";
 export type { CUSDbCv3 } from "./CUSDbCv3";
 export type { CrvUSDETHAmm } from "./CrvUSDETHAmm";

package/esm/aaveV2/index.js

@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { calculateNetApy, getStETHApr } from '../staking';
-import { ethToWeth, wethToEth } from '../services/utils';
-import { AaveLoanInfoV2Contract } from '../contracts';
+import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
+import { AaveLoanInfoV2Contract, createContractWrapper } from '../contracts';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { AAVE_V2 } from '../markets/aave';
@@ -87,18 +87,23 @@ export const getAaveV2AccountBalances = (web3, network, block, addressMapping, a
     const market = AAVE_V2;
     const loanInfoContract = AaveLoanInfoV2Contract(web3, network, block);
     const marketAddress = market.providerAddress;
-    const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
+    // @ts-ignore
+    const protocolDataProviderContract = createContractWrapper(web3, network, market.protocolData, market.protocolDataAddress);
+    const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
+    const symbols = reserveTokens.map(({ symbol }) => symbol);
+    const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);
     const loanInfo = yield loanInfoContract.methods.getTokenBalances(marketAddress, address, _addresses).call({}, block);
     loanInfo.forEach((_tokenInfo, i) => {
-        const asset = wethToEth(market.assets[i]);
+        const asset = wethToEth(symbols[i]);
+        const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
         const tokenInfo = Object.assign({}, _tokenInfo);
         // known bug: stETH leaves 1 wei on every transfer
         if (asset === 'stETH' && tokenInfo.balance.toString() === '1') {
             tokenInfo.balance = '0';
         }
         balances = {
-            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: tokenInfo.balance.toString() }),
-            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString() }),
+            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString() }),
+            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString() }),
         };
     });
     return balances;

package/esm/aaveV3/index.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
-import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
-import { addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth, } from '../services/utils';
+import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
+import { addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { NetworkNumber, } from '../types/common';
 import { getStakingApy } from '../staking';
 import { multicall } from '../multicall';
@@ -251,7 +251,11 @@ export const getAaveV3AccountBalances = (web3, network, block, addressMapping, a
     const loanInfoContract = AaveV3ViewContract(web3, network, block);
     const market = AAVE_V3(network);
     const marketAddress = market.providerAddress;
-    const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
+    // @ts-ignore
+    const protocolDataProviderContract = createContractWrapper(web3, network, market.protocolData, market.protocolDataAddress);
+    const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
+    const symbols = reserveTokens.map(({ symbol }) => symbol);
+    const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);
     // split addresses in half to avoid gas limit by multicall
     const middleAddressIndex = Math.floor(_addresses.length / 2);
     const multicallData = [
@@ -269,10 +273,11 @@ export const getAaveV3AccountBalances = (web3, network, block, addressMapping, a
     const multicallRes = yield multicall(multicallData, web3, network, block);
     const loanInfo = [...multicallRes[0][0], ...multicallRes[1][0]];
     loanInfo.forEach((tokenInfo, i) => {
-        const asset = wethToEth(market.assets[i]);
+        const asset = wethToEth(symbols[i]);
+        const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
         balances = {
-            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: tokenInfo.balance.toString() }),
-            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString() }),
+            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString() }),
+            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString() }),
         };
     });
     return balances;

package/esm/compoundV2/index.d.ts

@@ -16,6 +16,7 @@ export declare const EMPTY_COMPOUND_DATA: {
     borrowStableSupplyUnstable: boolean;
 };
 export declare const getCollateralAssetsAddresses: (web3: Web3, network: NetworkNumber, account: string) => Promise<string[]>;
+export declare const getAllMarketAddresses: (web3: Web3, network: NetworkNumber, block: Blockish) => Promise<string[]>;
 export declare const getCompoundV2AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const getCompoundV2AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: CompoundV2AssetsData) => Promise<CompoundV2PositionData>;
 export declare const getCompoundV2FullPositionData: (web3: Web3, network: NetworkNumber, address: string) => Promise<CompoundV2PositionData>;

package/esm/compoundV2/index.js

@@ -88,6 +88,10 @@ export const getCollateralAssetsAddresses = (web3, network, account) => __awaite
     const contract = ComptrollerContract(web3, network);
     return contract.methods.getAssetsIn(account).call();
 });
+export const getAllMarketAddresses = (web3, network, block) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = ComptrollerContract(web3, network);
+    return contract.methods.getAllMarkets().call({}, block);
+});
 export const getCompoundV2AccountBalances = (web3, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
@@ -96,20 +100,22 @@ export const getCompoundV2AccountBalances = (web3, network, block, addressMappin
     if (!address) {
         return balances;
     }
+    const assets = yield getAllMarketAddresses(web3, network, block);
+    const assetInfo = assets.map(a => getAssetInfoByAddress(a, network));
     const loanInfoContract = CompoundLoanInfoContract(web3, network, block);
-    const loanInfo = yield loanInfoContract.methods.getTokenBalances(address, compoundV2CollateralAssets.map(a => a.address)).call({}, block);
+    const loanInfo = yield loanInfoContract.methods.getTokenBalances(address, assets).call({}, block);
     loanInfo.balances.forEach((weiAmount, i) => {
-        const asset = wethToEth(compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
-            ? `${compoundV2CollateralAssets[i].underlyingAsset} Legacy`
-            : compoundV2CollateralAssets[i].underlyingAsset);
+        const asset = wethToEth(assetInfo[i].symbol === 'cWBTC Legacy'
+            ? `${assetInfo[i].underlyingAsset} Legacy`
+            : assetInfo[i].underlyingAsset);
         balances = {
             collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: weiAmount.toString() }),
         };
     });
     loanInfo.borrows.forEach((weiAmount, i) => {
-        const asset = wethToEth(compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
-            ? `${compoundV2CollateralAssets[i].underlyingAsset} Legacy`
-            : compoundV2CollateralAssets[i].underlyingAsset);
+        const asset = wethToEth(assetInfo[i].symbol === 'cWBTC Legacy'
+            ? `${assetInfo[i].underlyingAsset} Legacy`
+            : assetInfo[i].underlyingAsset);
         balances = Object.assign(Object.assign({}, balances), { debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: weiAmount.toString() }) });
     });
     return balances;