@defisaver/positions-sdk 2.0.11 → 2.0.12

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,64 +1,64 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    provider,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    provider,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/aaveV3/index.js

@@ -58,7 +58,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
         const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
         const marketAddress = market.providerAddress;
-        const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt];
+        const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Linea];
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo] = yield Promise.all([
             loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber)),

package/cjs/config/contracts.d.ts

@@ -23639,6 +23639,11 @@ export declare const AaveV3View: {
                 };
             };
         };
+        readonly "59144": {
+            readonly address: "0xc9D6EfA6e08B66a5Cdc516Bcd5807c2fa69E0f2A";
+            readonly createdBlock: 22819962;
+            readonly oldVersions: {};
+        };
     };
 };
 export declare const AaveV3PoolAddressesProvider: {
@@ -24096,6 +24101,9 @@ export declare const AaveV3PoolAddressesProvider: {
         readonly "8453": {
             readonly address: "0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D";
         };
+        readonly "59144": {
+            readonly address: "0x89502c3731F69DDC95B65753708A07F8Cd0373F4";
+        };
     };
 };
 export declare const AaveV3LidoPoolAddressesProvider: {
@@ -26463,6 +26471,9 @@ export declare const AaveV3LendingPool: {
         readonly "8453": {
             readonly address: "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5";
         };
+        readonly "59144": {
+            readonly address: "0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac";
+        };
     };
 };
 export declare const AaveV3LidoLendingPool: {
@@ -29794,6 +29805,9 @@ export declare const AaveV3ProtocolDataProvider: {
         readonly "8453": {
             readonly address: "0x2d8A3C5677189723C4cB8873CfC9C8976FDF38Ac";
         };
+        readonly "59144": {
+            readonly address: "0x47cd4b507B81cB831669c71c7077f4daF6762FF4";
+        };
     };
 };
 export declare const AaveV3LidoProtocolDataProvider: {
@@ -30598,8 +30612,12 @@ export declare const AaveUiIncentiveDataProviderV3: {
             readonly internalType: "contract IPoolAddressesProvider";
             readonly name: "provider";
             readonly type: "address";
+        }, {
+            readonly internalType: "address";
+            readonly name: "user";
+            readonly type: "address";
         }];
-        readonly name: "getReservesIncentivesData";
+        readonly name: "getFullReservesIncentiveData";
         readonly outputs: readonly [{
             readonly components: readonly [{
                 readonly internalType: "address";
@@ -30729,6 +30747,15 @@ export declare const AaveUiIncentiveDataProviderV3: {
                 readonly internalType: "struct IUiIncentiveDataProviderV3.IncentiveData";
                 readonly name: "vIncentiveData";
                 readonly type: "tuple";
+            }];
+            readonly internalType: "struct IUiIncentiveDataProviderV3.AggregatedReserveIncentiveData[]";
+            readonly name: "";
+            readonly type: "tuple[]";
+        }, {
+            readonly components: readonly [{
+                readonly internalType: "address";
+                readonly name: "underlyingAsset";
+                readonly type: "address";
             }, {
                 readonly components: readonly [{
                     readonly internalType: "address";
@@ -30745,27 +30772,69 @@ export declare const AaveUiIncentiveDataProviderV3: {
                         readonly type: "string";
                     }, {
                         readonly internalType: "address";
-                        readonly name: "rewardTokenAddress";
+                        readonly name: "rewardOracleAddress";
                         readonly type: "address";
                     }, {
                         readonly internalType: "address";
-                        readonly name: "rewardOracleAddress";
+                        readonly name: "rewardTokenAddress";
                         readonly type: "address";
                     }, {
                         readonly internalType: "uint256";
-                        readonly name: "emissionPerSecond";
+                        readonly name: "userUnclaimedRewards";
                         readonly type: "uint256";
                     }, {
                         readonly internalType: "uint256";
-                        readonly name: "incentivesLastUpdateTimestamp";
+                        readonly name: "tokenIncentivesUserIndex";
                         readonly type: "uint256";
+                    }, {
+                        readonly internalType: "int256";
+                        readonly name: "rewardPriceFeed";
+                        readonly type: "int256";
+                    }, {
+                        readonly internalType: "uint8";
+                        readonly name: "priceFeedDecimals";
+                        readonly type: "uint8";
+                    }, {
+                        readonly internalType: "uint8";
+                        readonly name: "rewardTokenDecimals";
+                        readonly type: "uint8";
+                    }];
+                    readonly internalType: "struct IUiIncentiveDataProviderV3.UserRewardInfo[]";
+                    readonly name: "userRewardsInformation";
+                    readonly type: "tuple[]";
+                }];
+                readonly internalType: "struct IUiIncentiveDataProviderV3.UserIncentiveData";
+                readonly name: "aTokenIncentivesUserData";
+                readonly type: "tuple";
+            }, {
+                readonly components: readonly [{
+                    readonly internalType: "address";
+                    readonly name: "tokenAddress";
+                    readonly type: "address";
+                }, {
+                    readonly internalType: "address";
+                    readonly name: "incentiveControllerAddress";
+                    readonly type: "address";
+                }, {
+                    readonly components: readonly [{
+                        readonly internalType: "string";
+                        readonly name: "rewardTokenSymbol";
+                        readonly type: "string";
+                    }, {
+                        readonly internalType: "address";
+                        readonly name: "rewardOracleAddress";
+                        readonly type: "address";
+                    }, {
+                        readonly internalType: "address";
+                        readonly name: "rewardTokenAddress";
+                        readonly type: "address";
                     }, {
                         readonly internalType: "uint256";
-                        readonly name: "tokenIncentivesIndex";
+                        readonly name: "userUnclaimedRewards";
                         readonly type: "uint256";
                     }, {
                         readonly internalType: "uint256";
-                        readonly name: "emissionEndTimestamp";
+                        readonly name: "tokenIncentivesUserIndex";
                         readonly type: "uint256";
                     }, {
                         readonly internalType: "int256";
@@ -30773,26 +30842,22 @@ export declare const AaveUiIncentiveDataProviderV3: {
                         readonly type: "int256";
                     }, {
                         readonly internalType: "uint8";
-                        readonly name: "rewardTokenDecimals";
-                        readonly type: "uint8";
-                    }, {
-                        readonly internalType: "uint8";
-                        readonly name: "precision";
+                        readonly name: "priceFeedDecimals";
                         readonly type: "uint8";
                     }, {
                         readonly internalType: "uint8";
-                        readonly name: "priceFeedDecimals";
+                        readonly name: "rewardTokenDecimals";
                         readonly type: "uint8";
                     }];
-                    readonly internalType: "struct IUiIncentiveDataProviderV3.RewardInfo[]";
-                    readonly name: "rewardsTokenInformation";
+                    readonly internalType: "struct IUiIncentiveDataProviderV3.UserRewardInfo[]";
+                    readonly name: "userRewardsInformation";
                     readonly type: "tuple[]";
                 }];
-                readonly internalType: "struct IUiIncentiveDataProviderV3.IncentiveData";
-                readonly name: "sIncentiveData";
+                readonly internalType: "struct IUiIncentiveDataProviderV3.UserIncentiveData";
+                readonly name: "vTokenIncentivesUserData";
                 readonly type: "tuple";
             }];
-            readonly internalType: "struct IUiIncentiveDataProviderV3.AggregatedReserveIncentiveData[]";
+            readonly internalType: "struct IUiIncentiveDataProviderV3.UserReserveIncentiveData[]";
             readonly name: "";
             readonly type: "tuple[]";
         }];
@@ -30803,12 +30868,8 @@ export declare const AaveUiIncentiveDataProviderV3: {
             readonly internalType: "contract IPoolAddressesProvider";
             readonly name: "provider";
             readonly type: "address";
-        }, {
-            readonly internalType: "address";
-            readonly name: "user";
-            readonly type: "address";
         }];
-        readonly name: "getUserReservesIncentivesData";
+        readonly name: "getReservesIncentivesData";
         readonly outputs: readonly [{
             readonly components: readonly [{
                 readonly internalType: "address";
@@ -30830,40 +30891,137 @@ export declare const AaveUiIncentiveDataProviderV3: {
                         readonly type: "string";
                     }, {
                         readonly internalType: "address";
-                        readonly name: "rewardOracleAddress";
+                        readonly name: "rewardTokenAddress";
                         readonly type: "address";
                     }, {
                         readonly internalType: "address";
-                        readonly name: "rewardTokenAddress";
+                        readonly name: "rewardOracleAddress";
                         readonly type: "address";
                     }, {
                         readonly internalType: "uint256";
-                        readonly name: "userUnclaimedRewards";
+                        readonly name: "emissionPerSecond";
                         readonly type: "uint256";
                     }, {
                         readonly internalType: "uint256";
-                        readonly name: "tokenIncentivesUserIndex";
+                        readonly name: "incentivesLastUpdateTimestamp";
+                        readonly type: "uint256";
+                    }, {
+                        readonly internalType: "uint256";
+                        readonly name: "tokenIncentivesIndex";
+                        readonly type: "uint256";
+                    }, {
+                        readonly internalType: "uint256";
+                        readonly name: "emissionEndTimestamp";
                         readonly type: "uint256";
                     }, {
                         readonly internalType: "int256";
                         readonly name: "rewardPriceFeed";
                         readonly type: "int256";
+                    }, {
+                        readonly internalType: "uint8";
+                        readonly name: "rewardTokenDecimals";
+                        readonly type: "uint8";
+                    }, {
+                        readonly internalType: "uint8";
+                        readonly name: "precision";
+                        readonly type: "uint8";
                     }, {
                         readonly internalType: "uint8";
                         readonly name: "priceFeedDecimals";
                         readonly type: "uint8";
+                    }];
+                    readonly internalType: "struct IUiIncentiveDataProviderV3.RewardInfo[]";
+                    readonly name: "rewardsTokenInformation";
+                    readonly type: "tuple[]";
+                }];
+                readonly internalType: "struct IUiIncentiveDataProviderV3.IncentiveData";
+                readonly name: "aIncentiveData";
+                readonly type: "tuple";
+            }, {
+                readonly components: readonly [{
+                    readonly internalType: "address";
+                    readonly name: "tokenAddress";
+                    readonly type: "address";
+                }, {
+                    readonly internalType: "address";
+                    readonly name: "incentiveControllerAddress";
+                    readonly type: "address";
+                }, {
+                    readonly components: readonly [{
+                        readonly internalType: "string";
+                        readonly name: "rewardTokenSymbol";
+                        readonly type: "string";
+                    }, {
+                        readonly internalType: "address";
+                        readonly name: "rewardTokenAddress";
+                        readonly type: "address";
+                    }, {
+                        readonly internalType: "address";
+                        readonly name: "rewardOracleAddress";
+                        readonly type: "address";
+                    }, {
+                        readonly internalType: "uint256";
+                        readonly name: "emissionPerSecond";
+                        readonly type: "uint256";
+                    }, {
+                        readonly internalType: "uint256";
+                        readonly name: "incentivesLastUpdateTimestamp";
+                        readonly type: "uint256";
+                    }, {
+                        readonly internalType: "uint256";
+                        readonly name: "tokenIncentivesIndex";
+                        readonly type: "uint256";
+                    }, {
+                        readonly internalType: "uint256";
+                        readonly name: "emissionEndTimestamp";
+                        readonly type: "uint256";
+                    }, {
+                        readonly internalType: "int256";
+                        readonly name: "rewardPriceFeed";
+                        readonly type: "int256";
                     }, {
                         readonly internalType: "uint8";
                         readonly name: "rewardTokenDecimals";
                         readonly type: "uint8";
+                    }, {
+                        readonly internalType: "uint8";
+                        readonly name: "precision";
+                        readonly type: "uint8";
+                    }, {
+                        readonly internalType: "uint8";
+                        readonly name: "priceFeedDecimals";
+                        readonly type: "uint8";
                     }];
-                    readonly internalType: "struct IUiIncentiveDataProviderV3.UserRewardInfo[]";
-                    readonly name: "userRewardsInformation";
+                    readonly internalType: "struct IUiIncentiveDataProviderV3.RewardInfo[]";
+                    readonly name: "rewardsTokenInformation";
                     readonly type: "tuple[]";
                 }];
-                readonly internalType: "struct IUiIncentiveDataProviderV3.UserIncentiveData";
-                readonly name: "aTokenIncentivesUserData";
+                readonly internalType: "struct IUiIncentiveDataProviderV3.IncentiveData";
+                readonly name: "vIncentiveData";
                 readonly type: "tuple";
+            }];
+            readonly internalType: "struct IUiIncentiveDataProviderV3.AggregatedReserveIncentiveData[]";
+            readonly name: "";
+            readonly type: "tuple[]";
+        }];
+        readonly stateMutability: "view";
+        readonly type: "function";
+    }, {
+        readonly inputs: readonly [{
+            readonly internalType: "contract IPoolAddressesProvider";
+            readonly name: "provider";
+            readonly type: "address";
+        }, {
+            readonly internalType: "address";
+            readonly name: "user";
+            readonly type: "address";
+        }];
+        readonly name: "getUserReservesIncentivesData";
+        readonly outputs: readonly [{
+            readonly components: readonly [{
+                readonly internalType: "address";
+                readonly name: "underlyingAsset";
+                readonly type: "address";
             }, {
                 readonly components: readonly [{
                     readonly internalType: "address";
@@ -30912,7 +31070,7 @@ export declare const AaveUiIncentiveDataProviderV3: {
                     readonly type: "tuple[]";
                 }];
                 readonly internalType: "struct IUiIncentiveDataProviderV3.UserIncentiveData";
-                readonly name: "vTokenIncentivesUserData";
+                readonly name: "aTokenIncentivesUserData";
                 readonly type: "tuple";
             }, {
                 readonly components: readonly [{
@@ -30962,7 +31120,7 @@ export declare const AaveUiIncentiveDataProviderV3: {
                     readonly type: "tuple[]";
                 }];
                 readonly internalType: "struct IUiIncentiveDataProviderV3.UserIncentiveData";
-                readonly name: "sTokenIncentivesUserData";
+                readonly name: "vTokenIncentivesUserData";
                 readonly type: "tuple";
             }];
             readonly internalType: "struct IUiIncentiveDataProviderV3.UserReserveIncentiveData[]";
@@ -30985,6 +31143,9 @@ export declare const AaveUiIncentiveDataProviderV3: {
         readonly "42161": {
             readonly address: "0xE92cd6164CE7DC68e740765BC1f2a091B6CBc3e4";
         };
+        readonly "59144": {
+            readonly address: "0x117684358D990E42Eb1649E7e8C4691951dc1E71";
+        };
     };
 };
 export declare const cUSDCv3: {