@defisaver/positions-sdk 2.1.41 → 2.1.43-aave-v4-dev-1

package/esm/contracts.js

@@ -132,3 +132,4 @@ export const StkAAVEViem = createViemContractFromConfigFunc('StkAAVE');
 export const YearnViewContractViem = createViemContractFromConfigFunc('YearnView');
 export const MakerDsrContractViem = createViemContractFromConfigFunc('MakerDsr');
 export const SkySavingsContractView = createViemContractFromConfigFunc('SkySavings');
+export const AaveV4ViewContractViem = createViemContractFromConfigFunc('AaveV4View');

package/esm/helpers/morphoBlueHelpers/index.js

@@ -118,73 +118,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, provider, n
     return { borrowRate, supplyRate };
 });
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/esm/index.d.ts

@@ -1,5 +1,6 @@
 import './setup';
 import * as fluid from './fluid';
+import * as aaveV4 from './aaveV4';
 import * as aaveV3 from './aaveV3';
 import * as aaveV2 from './aaveV2';
 import * as compoundV3 from './compoundV3';
@@ -21,4 +22,4 @@ import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/esm/index.js

@@ -1,5 +1,6 @@
 import './setup';
 import * as fluid from './fluid';
+import * as aaveV4 from './aaveV4';
 import * as aaveV3 from './aaveV3';
 import * as aaveV2 from './aaveV2';
 import * as compoundV3 from './compoundV3';
@@ -21,4 +22,4 @@ import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

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

@@ -0,0 +1,6 @@
+import { AaveV4SpokeInfo } from '../../types';
+import { NetworkNumber } from '../../types/common';
+export declare const AAVE_V4_CORE_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
+export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
+    readonly aave_v4_core_spoke: AaveV4SpokeInfo;
+};

package/esm/markets/aaveV4/index.js

@@ -0,0 +1,15 @@
+import { AaveV4SpokesType } from '../../types';
+import { NetworkNumber } from '../../types/common';
+export const AAVE_V4_CORE_SPOKE = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Core Spoke',
+    value: AaveV4SpokesType.AaveV4CoreSpoke,
+    url: 'core',
+    address: '0xBa97c5E52cd5BC3D7950Ae70779F8FfE92d40CdC',
+    hubs: [
+        '0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
+    ],
+});
+export const AaveV4Spokes = (networkId) => ({
+    [AaveV4SpokesType.AaveV4CoreSpoke]: AAVE_V4_CORE_SPOKE(networkId),
+});

package/esm/markets/index.d.ts

@@ -7,3 +7,4 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
+export { AaveV4Spokes } from './aaveV4';

package/esm/markets/index.js

@@ -7,3 +7,4 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
+export { AaveV4Spokes } from './aaveV4';

package/esm/savings/morphoVaults/index.js

@@ -14,23 +14,23 @@ import * as morphoVaultsOptions from './options';
 import { getViemProvider } from '../../services/viem';
 import { getMorphoVaultContractViem } from '../../contracts';
 export { morphoVaultsOptions, };
-const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
-    }
-}
+const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
+vaultByAddress(chainId: 1, address: "${vaultAddress}") {
+    id,
+    dailyApy,
+    dailyApys {
+    apy, netApy
+    },
+    monthlyApys {
+    apy, netApy
+    },
+    liquidity {
+    underlying, usd,
+    },
+    asset {
+    priceUsd
+    }
+}
 }`;
 const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
 export const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/savings/morphoVaults/options.js

@@ -99,7 +99,7 @@ export const MORPHO_VAULT_STEAKHOUSE_USDT = {
 export const MORPHO_VAULT_STEAKHOUSE_USDC = {
     type: MorphoVaultType.MorphoVaultSteakhouseUSDC,
     name: 'Steakhouse USDC',
-    address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
+    address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
     asset: 'USDC',
     deploymentBlock: 18928285,
     isLegacy: false,
@@ -115,7 +115,7 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH = {
 export const MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     type: MorphoVaultType.MorphoVaultSteakhousePYUSD,
     name: 'Steakhouse PYUSD',
-    address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
+    address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
     deploymentBlock: 19043398,
     isLegacy: false,

package/esm/types/aaveV4.d.ts

@@ -0,0 +1,73 @@
+import { EthAddress, NetworkNumber } from './common';
+export declare enum AaveV4SpokesType {
+    AaveV4CoreSpoke = "aave_v4_core_spoke"
+}
+export declare enum AaveV4HubsType {
+    AaveV4CoreHub = "aave_v4_core_hub"
+}
+export interface AaveV4SpokeInfo {
+    chainIds: NetworkNumber[];
+    label: string;
+    value: AaveV4SpokesType;
+    url: string;
+    address: EthAddress;
+    hubs: EthAddress[];
+}
+export interface AaveV4HubAssetOnChainData {
+    assetId: number;
+    drawnRate: bigint;
+}
+export interface AaveV4HubOnChainData {
+    assets: Record<number, AaveV4HubAssetOnChainData>;
+}
+export interface AaveV4ReserveAssetOnChain {
+    underlying: EthAddress;
+    hub: EthAddress;
+    assetId: number;
+    decimals: number;
+    paused: boolean;
+    frozen: boolean;
+    borrowable: boolean;
+    collateralRisk: number;
+    collateralFactor: number;
+    maxLiquidationBonus: number;
+    liquidationFee: number;
+    price: bigint;
+    totalSupplied: bigint;
+    totalDrawn: bigint;
+    totalPremium: bigint;
+    totalDebt: bigint;
+    supplyCap: bigint;
+    borrowCap: bigint;
+    deficitRay: bigint;
+    spokeActive: boolean;
+    spokePaused: boolean;
+}
+export interface AaveV4ReserveAssetData {
+    symbol: string;
+    underlying: EthAddress;
+    hub: EthAddress;
+    assetId: number;
+    paused: boolean;
+    frozen: boolean;
+    borrowable: boolean;
+    collateralRisk: number;
+    collateralFactor: number;
+    liquidationFee: number;
+    price: string;
+    totalSupplied: string;
+    totalDrawn: string;
+    totalPremium: string;
+    totalDebt: string;
+    supplyCap: string;
+    borrowCap: string;
+    spokeActive: boolean;
+    spokePaused: boolean;
+    drawnRate: string;
+}
+export interface AaveV4SpokeData {
+    assetsData: Record<string, AaveV4ReserveAssetData>;
+    oracle: EthAddress;
+    oracleDecimals: number;
+    address: EthAddress;
+}

package/esm/types/aaveV4.js

@@ -0,0 +1,8 @@
+export var AaveV4SpokesType;
+(function (AaveV4SpokesType) {
+    AaveV4SpokesType["AaveV4CoreSpoke"] = "aave_v4_core_spoke";
+})(AaveV4SpokesType || (AaveV4SpokesType = {}));
+export var AaveV4HubsType;
+(function (AaveV4HubsType) {
+    AaveV4HubsType["AaveV4CoreHub"] = "aave_v4_core_hub";
+})(AaveV4HubsType || (AaveV4HubsType = {}));

package/esm/types/index.d.ts

@@ -13,3 +13,4 @@ export * from './portfolio';
 export * from './merit';
 export * from './merkl';
 export * from './savings';
+export * from './aaveV4';

package/esm/types/index.js

@@ -13,3 +13,4 @@ export * from './portfolio';
 export * from './merit';
 export * from './merkl';
 export * from './savings';
+export * from './aaveV4';

package/package.json

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