@defisaver/positions-sdk 0.0.20 → 0.0.22

package/esm/config/contracts.js

@@ -184,6 +184,17 @@ module.exports = {
         "networks": {
             "1": {
                 "address": "0xc3d688B66703497DAA19211EEdff47f25384cdc3"
+            },
+            "42161": {
+                "address": "0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf"
+            }
+        }
+    },
+    "cUSDCev3": {
+        "abi": [{ "inputs": [{ "components": [{ "internalType": "address", "name": "governor", "type": "address" }, { "internalType": "address", "name": "pauseGuardian", "type": "address" }, { "internalType": "address", "name": "baseToken", "type": "address" }, { "internalType": "address", "name": "baseTokenPriceFeed", "type": "address" }, { "internalType": "address", "name": "extensionDelegate", "type": "address" }, { "internalType": "uint64", "name": "supplyKink", "type": "uint64" }, { "internalType": "uint64", "name": "supplyPerYearInterestRateSlopeLow", "type": "uint64" }, { "internalType": "uint64", "name": "supplyPerYearInterestRateSlopeHigh", "type": "uint64" }, { "internalType": "uint64", "name": "supplyPerYearInterestRateBase", "type": "uint64" }, { "internalType": "uint64", "name": "borrowKink", "type": "uint64" }, { "internalType": "uint64", "name": "borrowPerYearInterestRateSlopeLow", "type": "uint64" }, { "internalType": "uint64", "name": "borrowPerYearInterestRateSlopeHigh", "type": "uint64" }, { "internalType": "uint64", "name": "borrowPerYearInterestRateBase", "type": "uint64" }, { "internalType": "uint64", "name": "storeFrontPriceFactor", "type": "uint64" }, { "internalType": "uint64", "name": "trackingIndexScale", "type": "uint64" }, { "internalType": "uint64", "name": "baseTrackingSupplySpeed", "type": "uint64" }, { "internalType": "uint64", "name": "baseTrackingBorrowSpeed", "type": "uint64" }, { "internalType": "uint104", "name": "baseMinForRewards", "type": "uint104" }, { "internalType": "uint104", "name": "baseBorrowMin", "type": "uint104" }, { "internalType": "uint104", "name": "targetReserves", "type": "uint104" }, { "components": [{ "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "address", "name": "priceFeed", "type": "address" }, { "internalType": "uint8", "name": "decimals", "type": "uint8" }, { "internalType": "uint64", "name": "borrowCollateralFactor", "type": "uint64" }, { "internalType": "uint64", "name": "liquidateCollateralFactor", "type": "uint64" }, { "internalType": "uint64", "name": "liquidationFactor", "type": "uint64" }, { "internalType": "uint128", "name": "supplyCap", "type": "uint128" }], "internalType": "struct CometConfiguration.AssetConfig[]", "name": "assetConfigs", "type": "tuple[]" }], "internalType": "struct CometConfiguration.Configuration", "name": "config", "type": "tuple" }], "stateMutability": "nonpayable", "type": "constructor" }, { "inputs": [], "name": "Absurd", "type": "error" }, { "inputs": [], "name": "AlreadyInitialized", "type": "error" }, { "inputs": [], "name": "BadAsset", "type": "error" }, { "inputs": [], "name": "BadDecimals", "type": "error" }, { "inputs": [], "name": "BadDiscount", "type": "error" }, { "inputs": [], "name": "BadMinimum", "type": "error" }, { "inputs": [], "name": "BadPrice", "type": "error" }, { "inputs": [], "name": "BorrowCFTooLarge", "type": "error" }, { "inputs": [], "name": "BorrowTooSmall", "type": "error" }, { "inputs": [], "name": "InsufficientReserves", "type": "error" }, { "inputs": [], "name": "InvalidInt104", "type": "error" }, { "inputs": [], "name": "InvalidInt256", "type": "error" }, { "inputs": [], "name": "InvalidUInt104", "type": "error" }, { "inputs": [], "name": "InvalidUInt128", "type": "error" }, { "inputs": [], "name": "InvalidUInt64", "type": "error" }, { "inputs": [], "name": "LiquidateCFTooLarge", "type": "error" }, { "inputs": [], "name": "NegativeNumber", "type": "error" }, { "inputs": [], "name": "NoSelfTransfer", "type": "error" }, { "inputs": [], "name": "NotCollateralized", "type": "error" }, { "inputs": [], "name": "NotForSale", "type": "error" }, { "inputs": [], "name": "NotLiquidatable", "type": "error" }, { "inputs": [], "name": "Paused", "type": "error" }, { "inputs": [], "name": "SupplyCapExceeded", "type": "error" }, { "inputs": [], "name": "TimestampTooLarge", "type": "error" }, { "inputs": [], "name": "TooManyAssets", "type": "error" }, { "inputs": [], "name": "TooMuchSlippage", "type": "error" }, { "inputs": [], "name": "TransferInFailed", "type": "error" }, { "inputs": [], "name": "TransferOutFailed", "type": "error" }, { "inputs": [], "name": "Unauthorized", "type": "error" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "absorber", "type": "address" }, { "indexed": true, "internalType": "address", "name": "borrower", "type": "address" }, { "indexed": true, "internalType": "address", "name": "asset", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "collateralAbsorbed", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "usdValue", "type": "uint256" }], "name": "AbsorbCollateral", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "absorber", "type": "address" }, { "indexed": true, "internalType": "address", "name": "borrower", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "basePaidOut", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "usdValue", "type": "uint256" }], "name": "AbsorbDebt", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "buyer", "type": "address" }, { "indexed": true, "internalType": "address", "name": "asset", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "baseAmount", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "collateralAmount", "type": "uint256" }], "name": "BuyCollateral", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": false, "internalType": "bool", "name": "supplyPaused", "type": "bool" }, { "indexed": false, "internalType": "bool", "name": "transferPaused", "type": "bool" }, { "indexed": false, "internalType": "bool", "name": "withdrawPaused", "type": "bool" }, { "indexed": false, "internalType": "bool", "name": "absorbPaused", "type": "bool" }, { "indexed": false, "internalType": "bool", "name": "buyPaused", "type": "bool" }], "name": "PauseAction", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "from", "type": "address" }, { "indexed": true, "internalType": "address", "name": "dst", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "Supply", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "from", "type": "address" }, { "indexed": true, "internalType": "address", "name": "dst", "type": "address" }, { "indexed": true, "internalType": "address", "name": "asset", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "SupplyCollateral", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "from", "type": "address" }, { "indexed": true, "internalType": "address", "name": "to", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "Transfer", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "from", "type": "address" }, { "indexed": true, "internalType": "address", "name": "to", "type": "address" }, { "indexed": true, "internalType": "address", "name": "asset", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "TransferCollateral", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "src", "type": "address" }, { "indexed": true, "internalType": "address", "name": "to", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "Withdraw", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "src", "type": "address" }, { "indexed": true, "internalType": "address", "name": "to", "type": "address" }, { "indexed": true, "internalType": "address", "name": "asset", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "WithdrawCollateral", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "to", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "WithdrawReserves", "type": "event" }, { "stateMutability": "payable", "type": "fallback" }, { "inputs": [{ "internalType": "address", "name": "absorber", "type": "address" }, { "internalType": "address[]", "name": "accounts", "type": "address[]" }], "name": "absorb", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "account", "type": "address" }], "name": "accrueAccount", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "manager", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "approveThis", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "account", "type": "address" }], "name": "balanceOf", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "baseBorrowMin", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "baseMinForRewards", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "baseScale", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "baseToken", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "baseTokenPriceFeed", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "baseTrackingBorrowSpeed", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "baseTrackingSupplySpeed", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "account", "type": "address" }], "name": "borrowBalanceOf", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "borrowKink", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "borrowPerSecondInterestRateBase", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "borrowPerSecondInterestRateSlopeHigh", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "borrowPerSecondInterestRateSlopeLow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "minAmount", "type": "uint256" }, { "internalType": "uint256", "name": "baseAmount", "type": "uint256" }, { "internalType": "address", "name": "recipient", "type": "address" }], "name": "buyCollateral", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "decimals", "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "extensionDelegate", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint8", "name": "i", "type": "uint8" }], "name": "getAssetInfo", "outputs": [{ "components": [{ "internalType": "uint8", "name": "offset", "type": "uint8" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "address", "name": "priceFeed", "type": "address" }, { "internalType": "uint64", "name": "scale", "type": "uint64" }, { "internalType": "uint64", "name": "borrowCollateralFactor", "type": "uint64" }, { "internalType": "uint64", "name": "liquidateCollateralFactor", "type": "uint64" }, { "internalType": "uint64", "name": "liquidationFactor", "type": "uint64" }, { "internalType": "uint128", "name": "supplyCap", "type": "uint128" }], "internalType": "struct CometCore.AssetInfo", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "asset", "type": "address" }], "name": "getAssetInfoByAddress", "outputs": [{ "components": [{ "internalType": "uint8", "name": "offset", "type": "uint8" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "address", "name": "priceFeed", "type": "address" }, { "internalType": "uint64", "name": "scale", "type": "uint64" }, { "internalType": "uint64", "name": "borrowCollateralFactor", "type": "uint64" }, { "internalType": "uint64", "name": "liquidateCollateralFactor", "type": "uint64" }, { "internalType": "uint64", "name": "liquidationFactor", "type": "uint64" }, { "internalType": "uint128", "name": "supplyCap", "type": "uint128" }], "internalType": "struct CometCore.AssetInfo", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "utilization", "type": "uint256" }], "name": "getBorrowRate", "outputs": [{ "internalType": "uint64", "name": "", "type": "uint64" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "asset", "type": "address" }], "name": "getCollateralReserves", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "priceFeed", "type": "address" }], "name": "getPrice", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "getReserves", "outputs": [{ "internalType": "int256", "name": "", "type": "int256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "utilization", "type": "uint256" }], "name": "getSupplyRate", "outputs": [{ "internalType": "uint64", "name": "", "type": "uint64" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "getUtilization", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "governor", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }, { "internalType": "address", "name": "manager", "type": "address" }], "name": "hasPermission", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "initializeStorage", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "isAbsorbPaused", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }], "name": "isAllowed", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "account", "type": "address" }], "name": "isBorrowCollateralized", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "isBuyPaused", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "account", "type": "address" }], "name": "isLiquidatable", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "isSupplyPaused", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "isTransferPaused", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "isWithdrawPaused", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }], "name": "liquidatorPoints", "outputs": [{ "internalType": "uint32", "name": "numAbsorbs", "type": "uint32" }, { "internalType": "uint64", "name": "numAbsorbed", "type": "uint64" }, { "internalType": "uint128", "name": "approxSpend", "type": "uint128" }, { "internalType": "uint32", "name": "_reserved", "type": "uint32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "numAssets", "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bool", "name": "supplyPaused", "type": "bool" }, { "internalType": "bool", "name": "transferPaused", "type": "bool" }, { "internalType": "bool", "name": "withdrawPaused", "type": "bool" }, { "internalType": "bool", "name": "absorbPaused", "type": "bool" }, { "internalType": "bool", "name": "buyPaused", "type": "bool" }], "name": "pause", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "pauseGuardian", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "baseAmount", "type": "uint256" }], "name": "quoteCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "storeFrontPriceFactor", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "supply", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "from", "type": "address" }, { "internalType": "address", "name": "dst", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "supplyFrom", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "supplyKink", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "supplyPerSecondInterestRateBase", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "supplyPerSecondInterestRateSlopeHigh", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "supplyPerSecondInterestRateSlopeLow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "dst", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "supplyTo", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "targetReserves", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "totalBorrow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "totalSupply", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }], "name": "totalsCollateral", "outputs": [{ "internalType": "uint128", "name": "totalSupplyAsset", "type": "uint128" }, { "internalType": "uint128", "name": "_reserved", "type": "uint128" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "trackingIndexScale", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "dst", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "transfer", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "dst", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "transferAsset", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "src", "type": "address" }, { "internalType": "address", "name": "dst", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "transferAssetFrom", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "src", "type": "address" }, { "internalType": "address", "name": "dst", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "transferFrom", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }], "name": "userBasic", "outputs": [{ "internalType": "int104", "name": "principal", "type": "int104" }, { "internalType": "uint64", "name": "baseTrackingIndex", "type": "uint64" }, { "internalType": "uint64", "name": "baseTrackingAccrued", "type": "uint64" }, { "internalType": "uint16", "name": "assetsIn", "type": "uint16" }, { "internalType": "uint8", "name": "_reserved", "type": "uint8" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }], "name": "userCollateral", "outputs": [{ "internalType": "uint128", "name": "balance", "type": "uint128" }, { "internalType": "uint128", "name": "_reserved", "type": "uint128" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }], "name": "userNonce", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "withdraw", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "src", "type": "address" }, { "internalType": "address", "name": "to", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "withdrawFrom", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "to", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "withdrawReserves", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "to", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "withdrawTo", "outputs": [], "stateMutability": "nonpayable", "type": "function" }],
+        "networks": {
+            "42161": {
+                "address": "0xA5EDBDD9646f8dFF606d7448e414884C7d905dCA"
             }
         }
     },
@@ -218,6 +229,9 @@ module.exports = {
             },
             "8453": {
                 "address": "0x22591183c0eb7B2Fe07F6F44fd360d1117D07b4f"
+            },
+            "42161": {
+                "address": "0x3A07Bb9eb0d71bf03295a84655d82b00A1450CD6"
             }
         }
     },
@@ -248,6 +262,14 @@ module.exports = {
             }
         }
     },
+    "CompV3USDCBulkerArb": {
+        "abi": [{ "inputs": [{ "internalType": "address", "name": "admin_", "type": "address" }, { "internalType": "address payable", "name": "wrappedNativeToken_", "type": "address" }], "stateMutability": "nonpayable", "type": "constructor" }, { "inputs": [], "name": "FailedToSendNativeToken", "type": "error" }, { "inputs": [], "name": "InvalidAddress", "type": "error" }, { "inputs": [], "name": "InvalidArgument", "type": "error" }, { "inputs": [], "name": "TransferInFailed", "type": "error" }, { "inputs": [], "name": "TransferOutFailed", "type": "error" }, { "inputs": [], "name": "Unauthorized", "type": "error" }, { "inputs": [], "name": "UnhandledAction", "type": "error" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "oldAdmin", "type": "address" }, { "indexed": true, "internalType": "address", "name": "newAdmin", "type": "address" }], "name": "AdminTransferred", "type": "event" }, { "inputs": [], "name": "ACTION_CLAIM_REWARD", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_SUPPLY_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_SUPPLY_NATIVE_TOKEN", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_TRANSFER_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_WITHDRAW_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_WITHDRAW_NATIVE_TOKEN", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "admin", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32[]", "name": "actions", "type": "bytes32[]" }, { "internalType": "bytes[]", "name": "data", "type": "bytes[]" }], "name": "invoke", "outputs": [], "stateMutability": "payable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "recipient", "type": "address" }], "name": "sweepNativeToken", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "recipient", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }], "name": "sweepToken", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "newAdmin", "type": "address" }], "name": "transferAdmin", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "wrappedNativeToken", "outputs": [{ "internalType": "address payable", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "stateMutability": "payable", "type": "receive" }],
+        "networks": {
+            "42161": {
+                "address": "0xbdE8F31D2DdDA895264e27DD990faB3DC87b372d"
+            }
+        }
+    },
     "wstETH": {
         "abi": [{ "inputs": [{ "internalType": "contract IStETH", "name": "_stETH", "type": "address" }], "stateMutability": "nonpayable", "type": "constructor" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "owner", "type": "address" }, { "indexed": true, "internalType": "address", "name": "spender", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "value", "type": "uint256" }], "name": "Approval", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "from", "type": "address" }, { "indexed": true, "internalType": "address", "name": "to", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "value", "type": "uint256" }], "name": "Transfer", "type": "event" }, { "inputs": [], "name": "DOMAIN_SEPARATOR", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }, { "internalType": "address", "name": "spender", "type": "address" }], "name": "allowance", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "spender", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "approve", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "account", "type": "address" }], "name": "balanceOf", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "decimals", "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "spender", "type": "address" }, { "internalType": "uint256", "name": "subtractedValue", "type": "uint256" }], "name": "decreaseAllowance", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "_wstETHAmount", "type": "uint256" }], "name": "getStETHByWstETH", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "_stETHAmount", "type": "uint256" }], "name": "getWstETHByStETH", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "spender", "type": "address" }, { "internalType": "uint256", "name": "addedValue", "type": "uint256" }], "name": "increaseAllowance", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "name", "outputs": [{ "internalType": "string", "name": "", "type": "string" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }], "name": "nonces", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }, { "internalType": "address", "name": "spender", "type": "address" }, { "internalType": "uint256", "name": "value", "type": "uint256" }, { "internalType": "uint256", "name": "deadline", "type": "uint256" }, { "internalType": "uint8", "name": "v", "type": "uint8" }, { "internalType": "bytes32", "name": "r", "type": "bytes32" }, { "internalType": "bytes32", "name": "s", "type": "bytes32" }], "name": "permit", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "stETH", "outputs": [{ "internalType": "contract IStETH", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "stEthPerToken", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "symbol", "outputs": [{ "internalType": "string", "name": "", "type": "string" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "tokensPerStEth", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "totalSupply", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "recipient", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "transfer", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "sender", "type": "address" }, { "internalType": "address", "name": "recipient", "type": "address" }, { "internalType": "uint256", "name": "amount", "type": "uint256" }], "name": "transferFrom", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "_wstETHAmount", "type": "uint256" }], "name": "unwrap", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "_stETHAmount", "type": "uint256" }], "name": "wrap", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "nonpayable", "type": "function" }, { "stateMutability": "payable", "type": "receive" }],
         "networks": {

package/esm/helpers/aaveHelpers/index.js

@@ -98,10 +98,5 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
-    payload.suppliedEth = new Dec(payload.suppliedUsd).div(assetsData.ETH.price).toString();
-    payload.borrowedEth = new Dec(payload.borrowedUsd).div(assetsData.ETH.price).toString();
-    payload.leftToBorrowEth = new Dec(payload.leftToBorrowUsd).div(assetsData.ETH.price).toString();
-    payload.borrowLimitEth = new Dec(payload.borrowLimitUsd).div(assetsData.ETH.price).toString();
-    payload.liquidationLimitEth = new Dec(payload.liquidationLimitUsd).div(assetsData.ETH.price).toString();
     return payload;
 };

package/esm/helpers/compoundHelpers/index.js

@@ -34,8 +34,8 @@ export const formatBaseData = (data, network, baseAssetPrice) => {
         totalBorrow, marketLiquidity: new Dec(totalSupply).minus(totalBorrow).toString(), symbol: wethToEth(assetInfo.symbol), priceInBaseAsset: getEthAmountForDecimals(data.price, 8), price: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: getEthAmountForDecimals(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: getEthAmountForDecimals(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: getEthAmountForDecimals(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
 };
 export const getIncentiveApys = (baseData, compPrice) => {
-    const incentiveSupplyApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.priceInBaseAsset / +baseData.totalSupply).toString();
-    const incentiveBorrowApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.priceInBaseAsset / +baseData.totalBorrow).toString();
+    const incentiveSupplyApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString();
+    const incentiveBorrowApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString();
     return {
         incentiveSupplyApy,
         incentiveBorrowApy,

package/esm/markets/compound/index.d.ts

@@ -2,6 +2,7 @@ import { CompoundMarketData } from '../../types';
 import { NetworkNumber } from '../../types/common';
 export declare const COMPOUND_V2: CompoundMarketData;
 export declare const COMPOUND_V3_USDC: (networkId: NetworkNumber) => CompoundMarketData;
+export declare const COMPOUND_V3_USDCe: (networkId: NetworkNumber) => CompoundMarketData;
 export declare const COMPOUND_V3_ETH: (networkId: NetworkNumber) => CompoundMarketData;
 export declare const COMPOUND_V3_USDBC: (networkId: NetworkNumber) => CompoundMarketData;
 export declare const CompoundMarkets: (networkId: NetworkNumber) => {
@@ -9,4 +10,5 @@ export declare const CompoundMarkets: (networkId: NetworkNumber) => {
     readonly "v3-ETH": CompoundMarketData;
     readonly "v3-USDC": CompoundMarketData;
     readonly "v3-USDbC": CompoundMarketData;
+    readonly "v3-USDC.e": CompoundMarketData;
 };

package/esm/markets/compound/index.js

@@ -1,17 +1,47 @@
 import { getConfigContractAddress } from '../../contracts';
 import { CompoundVersions } from '../../types';
 import { NetworkNumber } from '../../types/common';
-import { compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCollAssets, v3USDCCollAssets, } from './marketsAssets';
-const USDC_BULKER_OPTIONS = {
-    supply: 2,
-    withdraw: 5,
-};
+import { compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCollAssets, v3USDCCollAssets, v3USDCeCollAssets, } from './marketsAssets';
+const EMPTY_BULKER_OPTIONS = { supply: '', withdraw: '' };
 const STANDARD_BULKER_OPTIONS = {
     supply: '0x414354494f4e5f535550504c595f4e41544956455f544f4b454e000000000000',
     withdraw: '0x414354494f4e5f57495448445241575f4e41544956455f544f4b454e00000000',
 };
+const BULKER_OPTIONS = {
+    [NetworkNumber.Eth]: {
+        [CompoundVersions.CompoundV3USDC]: { supply: 2, withdraw: 5 },
+        [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
+        // Non-existing markets, keeping it because of typescript
+        [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+    },
+    [NetworkNumber.Arb]: {
+        [CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDCe]: STANDARD_BULKER_OPTIONS,
+        // Non-existing markets, keeping it because of typescript
+        [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+    },
+    [NetworkNumber.Base]: {
+        [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDbC]: STANDARD_BULKER_OPTIONS,
+        // Non-existing markets, keeping it because of typescript
+        [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+    },
+    [NetworkNumber.Opt]: {
+        [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+    },
+};
 export const COMPOUND_V2 = {
-    chainIds: [1],
+    chainIds: [NetworkNumber.Eth],
     label: 'Compound V2',
     shortLabel: 'v2',
     value: CompoundVersions.CompoundV2,
@@ -22,11 +52,11 @@ export const COMPOUND_V2 = {
     secondLabel: '',
     bulkerName: '',
     bulkerAddress: '',
-    bulkerOptions: { supply: '', withdraw: '' },
+    bulkerOptions: BULKER_OPTIONS[NetworkNumber.Eth][CompoundVersions.CompoundV2],
     // icon: SvgAdapter(protocolIcons.compound),
 };
 export const COMPOUND_V3_USDC = (networkId) => ({
-    chainIds: [NetworkNumber.Eth],
+    chainIds: [NetworkNumber.Eth, NetworkNumber.Arb],
     label: 'Compound V3 - USDC',
     shortLabel: 'v3',
     value: CompoundVersions.CompoundV3USDC,
@@ -35,9 +65,24 @@ export const COMPOUND_V3_USDC = (networkId) => ({
     baseMarket: 'cUSDCv3',
     baseMarketAddress: getConfigContractAddress('cUSDCv3', networkId),
     secondLabel: 'Market',
-    bulkerName: 'CompV3USDCBulker',
-    bulkerAddress: getConfigContractAddress('CompV3USDCBulker', networkId),
-    bulkerOptions: USDC_BULKER_OPTIONS,
+    bulkerName: networkId === NetworkNumber.Arb ? 'CompV3USDCBulkerArb' : 'CompV3USDCBulker',
+    bulkerAddress: getConfigContractAddress(networkId === NetworkNumber.Arb ? 'CompV3USDCBulkerArb' : 'CompV3USDCBulker', networkId),
+    bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDC],
+    // icon: SvgAdapter(protocolIcons.compoundv3),
+});
+export const COMPOUND_V3_USDCe = (networkId) => ({
+    chainIds: [NetworkNumber.Arb],
+    label: 'Compound V3 - USDC.e',
+    shortLabel: 'v3',
+    value: CompoundVersions.CompoundV3USDCe,
+    baseAsset: 'USDC.e',
+    collAssets: networkId ? v3USDCeCollAssets[networkId] : [],
+    baseMarket: 'cUSDCev3',
+    baseMarketAddress: getConfigContractAddress('cUSDCev3', networkId),
+    secondLabel: 'Market',
+    bulkerName: 'CompV3USDCBulkerArb',
+    bulkerAddress: getConfigContractAddress('CompV3USDCBulkerArb', networkId),
+    bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDCe],
     // icon: SvgAdapter(protocolIcons.compoundv3),
 });
 export const COMPOUND_V3_ETH = (networkId) => ({
@@ -52,7 +97,7 @@ export const COMPOUND_V3_ETH = (networkId) => ({
     secondLabel: 'Market',
     bulkerName: 'CompV3ETHBulker',
     bulkerAddress: getConfigContractAddress('CompV3ETHBulker', networkId),
-    bulkerOptions: STANDARD_BULKER_OPTIONS,
+    bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3ETH],
     // icon: SvgAdapter(protocolIcons.compoundv3),
 });
 export const COMPOUND_V3_USDBC = (networkId) => ({
@@ -67,7 +112,7 @@ export const COMPOUND_V3_USDBC = (networkId) => ({
     secondLabel: 'Market',
     bulkerName: 'CompV3USDbCBulker',
     bulkerAddress: getConfigContractAddress('CompV3USDbCBulker', networkId),
-    bulkerOptions: STANDARD_BULKER_OPTIONS,
+    bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDbC],
     // icon: SvgAdapter(protocolIcons.compoundv3),
 });
 export const CompoundMarkets = (networkId) => ({
@@ -75,4 +120,5 @@ export const CompoundMarkets = (networkId) => ({
     [CompoundVersions.CompoundV3ETH]: COMPOUND_V3_ETH(networkId),
     [CompoundVersions.CompoundV3USDC]: COMPOUND_V3_USDC(networkId),
     [CompoundVersions.CompoundV3USDbC]: COMPOUND_V3_USDBC(networkId),
+    [CompoundVersions.CompoundV3USDCe]: COMPOUND_V3_USDCe(networkId),
 });

package/esm/markets/compound/marketsAssets.d.ts

@@ -2,7 +2,13 @@ export declare const compoundV2CollateralAssets: import("@defisaver/tokens/esm/t
 export declare const v3USDCCollAssets: {
     readonly 1: readonly ["ETH", "COMP", "WBTC", "UNI", "LINK"];
     readonly 10: readonly [];
-    readonly 42161: readonly [];
+    readonly 42161: readonly ["ARB", "ETH", "GMX", "WBTC"];
+    readonly 8453: readonly [];
+};
+export declare const v3USDCeCollAssets: {
+    readonly 1: readonly [];
+    readonly 10: readonly [];
+    readonly 42161: readonly ["ARB", "ETH", "GMX", "WBTC"];
     readonly 8453: readonly [];
 };
 export declare const v3ETHCollAssets: {

package/esm/markets/compound/marketsAssets.js

@@ -9,7 +9,17 @@ export const v3USDCCollAssets = {
         'ETH', 'COMP', 'WBTC', 'UNI', 'LINK',
     ],
     [NetworkNumber.Opt]: [],
-    [NetworkNumber.Arb]: [],
+    [NetworkNumber.Arb]: [
+        'ARB', 'ETH', 'GMX', 'WBTC',
+    ],
+    [NetworkNumber.Base]: [],
+};
+export const v3USDCeCollAssets = {
+    [NetworkNumber.Eth]: [],
+    [NetworkNumber.Opt]: [],
+    [NetworkNumber.Arb]: [
+        'ARB', 'ETH', 'GMX', 'WBTC',
+    ],
     [NetworkNumber.Base]: [],
 };
 export const v3ETHCollAssets = {

package/esm/morphoAaveV2/index.js

@@ -117,10 +117,11 @@ export const getMorphoAaveV2AccountBalances = (web3, network, block, addressMapp
         return balances;
     }
     userBalances.forEach((balance) => {
-        const { symbol, address: assetAddr } = getAssetInfoByAddress(wethToEthByAddress(balance.underlying, network), network);
+        const assetAddr = wethToEthByAddress(balance.underlying, network).toLowerCase();
+        const { symbol } = getAssetInfoByAddress(assetAddr, network);
         balances = {
-            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? assetAddr.toLowerCase() : symbol]: new Dec(balance.supplyBalanceInP2P).add(balance.supplyBalanceOnPool).toString() }),
-            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? assetAddr.toLowerCase() : symbol]: new Dec(balance.borrowBalanceInP2P).add(balance.borrowBalanceOnPool).toString() }),
+            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? assetAddr : symbol]: new Dec(balance.supplyBalanceInP2P).add(balance.supplyBalanceOnPool).toString() }),
+            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? assetAddr : symbol]: new Dec(balance.borrowBalanceInP2P).add(balance.borrowBalanceOnPool).toString() }),
         };
     });
     return balances;

package/esm/morphoAaveV3/index.js

@@ -252,7 +252,11 @@ export const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapp
     const selectedMarket = MORPHO_AAVE_V3_ETH(network);
     // @ts-ignore
     const lendingPoolContract = createContractWrapper(web3, network, selectedMarket.lendingPool, selectedMarket.lendingPoolAddress);
-    const _addresses = selectedMarket.assets.map((a) => getAssetInfo(ethToWeth(a), network).address);
+    // @ts-ignore
+    const protocolDataProviderContract = createContractWrapper(web3, network, selectedMarket.protocolData, selectedMarket.protocolDataAddress);
+    const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
+    const symbols = reserveTokens.map(({ symbol }) => symbol);
+    const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);
     const multicallArray = [
         ...(_addresses.map((underlyingAddress) => ([
             {
@@ -292,7 +296,8 @@ export const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapp
     _addresses.forEach((underlyingAddr, i) => {
         const currentMulticallIndex = numberOfMultiCalls * i;
         const morphoMarketData = multicallResponse[currentMulticallIndex][0];
-        const { symbol, address: assetAddr } = getAssetInfoByAddress(wethToEthByAddress(underlyingAddr, network), network);
+        const assetAddr = wethToEthByAddress(underlyingAddr, network).toLowerCase();
+        const { symbol } = getAssetInfoByAddress(assetAddr, network);
         const suppliedP2P = morphoAaveMath.indexMul(multicallResponse[currentMulticallIndex + 1][0], morphoMarketData.indexes.supply.p2pIndex).toString();
         const suppliedPool = morphoAaveMath.indexMul(multicallResponse[currentMulticallIndex + 2][0], morphoMarketData.indexes.supply.poolIndex).toString();
         const suppliedTotal = new Dec(suppliedP2P).add(suppliedPool).toString();
@@ -302,8 +307,8 @@ export const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapp
         const borrowedPool = morphoAaveMath.indexMul(multicallResponse[currentMulticallIndex + 5][0], morphoMarketData.indexes.borrow.poolIndex).toString();
         const borrowed = new Dec(borrowedP2P).add(borrowedPool).toString();
         balances = {
-            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? assetAddr.toLowerCase() : symbol]: supplied }),
-            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? assetAddr.toLowerCase() : symbol]: borrowed }),
+            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? assetAddr : symbol]: supplied }),
+            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? assetAddr : symbol]: borrowed }),
         };
     });
     return balances;

package/esm/spark/index.js

@@ -9,10 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
-import { ethToWeth, getAbiItem, isLayer2Network, wethToEth, } from '../services/utils';
+import { ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { calculateNetApy, getCbETHApr, getREthApr, getStETHApr, } from '../staking';
 import { getDsrApy } from '../services/dsrService';
-import { SparkIncentiveDataProviderContract, SparkViewContract, getConfigContractAbi, } from '../contracts';
+import { SparkIncentiveDataProviderContract, SparkViewContract, getConfigContractAbi, createContractWrapper, } from '../contracts';
 import { multicall } from '../multicall';
 import { sparkGetAggregatedPositionData, sparkIsInIsolationMode } from '../helpers/sparkHelpers';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
@@ -204,7 +204,11 @@ export const getSparkAccountBalances = (web3, network, block, addressMapping, ad
     const loanInfoContract = SparkViewContract(web3, network, block);
     const market = SPARK_V1(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 = [
@@ -222,10 +226,11 @@ export const getSparkAccountBalances = (web3, network, block, addressMapping, ad
     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/types/aave.d.ts

@@ -199,16 +199,11 @@ export interface AaveV3IncentiveData {
 }
 export interface AaveV3AggregatedPositionData {
     suppliedUsd: string;
-    suppliedEth: string;
     suppliedCollateralUsd: string;
     borrowedUsd: string;
-    borrowedEth: string;
     borrowLimitUsd: string;
-    borrowLimitEth: string;
     liquidationLimitUsd: string;
-    liquidationLimitEth: string;
     leftToBorrowUsd: string;
-    leftToBorrowEth: string;
     ratio: string;
     collRatio: string;
     netApy: string;

package/esm/types/compound.d.ts

@@ -2,9 +2,14 @@ import { MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './commo
 export declare enum CompoundVersions {
     'CompoundV2' = "v2",
     'CompoundV3USDC' = "v3-USDC",
+    'CompoundV3USDCe' = "v3-USDC.e",
     'CompoundV3ETH' = "v3-ETH",
     'CompoundV3USDbC' = "v3-USDbC"
 }
+export interface CompoundBulkerOptions {
+    supply: number | string;
+    withdraw: number | string;
+}
 export interface CompoundMarketData {
     chainIds: NetworkNumber[];
     label: string;
@@ -17,10 +22,7 @@ export interface CompoundMarketData {
     secondLabel: string;
     bulkerName: string;
     bulkerAddress: string;
-    bulkerOptions: {
-        supply: string | number;
-        withdraw: string | number;
-    };
+    bulkerOptions: CompoundBulkerOptions;
 }
 export interface CompoundUsedAsset extends MMUsedAsset {
     collateral: boolean;

package/esm/types/compound.js

@@ -2,6 +2,7 @@ export var CompoundVersions;
 (function (CompoundVersions) {
     CompoundVersions["CompoundV2"] = "v2";
     CompoundVersions["CompoundV3USDC"] = "v3-USDC";
+    CompoundVersions["CompoundV3USDCe"] = "v3-USDC.e";
     CompoundVersions["CompoundV3ETH"] = "v3-ETH";
     CompoundVersions["CompoundV3USDbC"] = "v3-USDbC";
 })(CompoundVersions || (CompoundVersions = {}));