@defisaver/positions-sdk 0.0.99 → 0.0.100

package/esm/maker/index.js

@@ -23,7 +23,7 @@ export const getMakerAccountBalances = (web3, network, block, addressMapping, cd
     }
     const viewContract = McdViewContract(web3, network, block);
     let ilk;
-    const needsIlk = new Dec(block).lt(14410792) && new Dec(block).gte(14384301);
+    const needsIlk = block !== 'latest' && new Dec(block).lt(14410792) && new Dec(block).gte(14384301);
     if (needsIlk) {
         ilk = (yield viewContract.methods.getUrnAndIlk(managerAddress, cdpId).call({}, block)).ilk;
     }

package/esm/types/contracts/generated/AaveV3View.d.ts

@@ -10,6 +10,30 @@ export interface EventOptions {
     topics?: string[];
 }
 export declare namespace AaveV3View {
+    type LiquidityChangeParamsStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        liquidityAdded: number | string | BN;
+        liquidityTaken: number | string | BN;
+    };
+    type LiquidityChangeParamsStructOutputArray = [string, string, string];
+    type LiquidityChangeParamsStructOutputStruct = {
+        reserveAddress: string;
+        liquidityAdded: string;
+        liquidityTaken: string;
+    };
+    type LiquidityChangeParamsStructOutput = LiquidityChangeParamsStructOutputArray & LiquidityChangeParamsStructOutputStruct;
+    type EstimatedRatesStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        supplyRate: number | string | BN;
+        variableBorrowRate: number | string | BN;
+    };
+    type EstimatedRatesStructOutputArray = [string, string, string];
+    type EstimatedRatesStructOutputStruct = {
+        reserveAddress: string;
+        supplyRate: string;
+        variableBorrowRate: string;
+    };
+    type EstimatedRatesStructOutput = EstimatedRatesStructOutputArray & EstimatedRatesStructOutputStruct;
     type TokenInfoFullStruct = [
         string,
         string,
@@ -159,6 +183,7 @@ export declare namespace AaveV3View {
         number | string | BN,
         number | string | BN,
         string[],
+        boolean[],
         string[],
         number | string | BN[],
         number | string | BN[],
@@ -173,6 +198,7 @@ export declare namespace AaveV3View {
         ratio: number | string | BN;
         eMode: number | string | BN;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: number | string | BN[];
         borrowStableAmounts: number | string | BN[];
@@ -188,6 +214,7 @@ export declare namespace AaveV3View {
         string,
         string,
         string[],
+        boolean[],
         string[],
         string[],
         string[],
@@ -203,6 +230,7 @@ export declare namespace AaveV3View {
         ratio: string;
         eMode: string;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: string[];
         borrowStableAmounts: string[];
@@ -276,8 +304,7 @@ export interface AaveV3View extends BaseContract {
     clone(): AaveV3View;
     methods: {
         AAVE_REFERRAL_CODE(): NonPayableTransactionObject<string>;
-        STABLE_ID(): NonPayableTransactionObject<string>;
-        VARIABLE_ID(): NonPayableTransactionObject<string>;
+        getApyAfterValuesEstimation(_market: string, _reserveParams: AaveV3View.LiquidityChangeParamsStruct[]): NonPayableTransactionObject<AaveV3View.EstimatedRatesStructOutput[]>;
         getAssetPrice(_market: string, _tokenAddr: string): NonPayableTransactionObject<string>;
         getCollFactors(_market: string, _tokens: string[]): NonPayableTransactionObject<string[]>;
         getEModeCollateralFactor(emodeCategory: number | string | BN, lendingPool: string): NonPayableTransactionObject<string>;

package/esm/types/contracts/generated/SparkView.d.ts

@@ -10,6 +10,30 @@ export interface EventOptions {
     topics?: string[];
 }
 export declare namespace SparkView {
+    type LiquidityChangeParamsStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        liquidityAdded: number | string | BN;
+        liquidityTaken: number | string | BN;
+    };
+    type LiquidityChangeParamsStructOutputArray = [string, string, string];
+    type LiquidityChangeParamsStructOutputStruct = {
+        reserveAddress: string;
+        liquidityAdded: string;
+        liquidityTaken: string;
+    };
+    type LiquidityChangeParamsStructOutput = LiquidityChangeParamsStructOutputArray & LiquidityChangeParamsStructOutputStruct;
+    type EstimatedRatesStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        supplyRate: number | string | BN;
+        variableBorrowRate: number | string | BN;
+    };
+    type EstimatedRatesStructOutputArray = [string, string, string];
+    type EstimatedRatesStructOutputStruct = {
+        reserveAddress: string;
+        supplyRate: string;
+        variableBorrowRate: string;
+    };
+    type EstimatedRatesStructOutput = EstimatedRatesStructOutputArray & EstimatedRatesStructOutputStruct;
     type TokenInfoFullStruct = [
         string,
         string,
@@ -159,6 +183,7 @@ export declare namespace SparkView {
         number | string | BN,
         number | string | BN,
         string[],
+        boolean[],
         string[],
         number | string | BN[],
         number | string | BN[],
@@ -173,6 +198,7 @@ export declare namespace SparkView {
         ratio: number | string | BN;
         eMode: number | string | BN;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: number | string | BN[];
         borrowStableAmounts: number | string | BN[];
@@ -188,6 +214,7 @@ export declare namespace SparkView {
         string,
         string,
         string[],
+        boolean[],
         string[],
         string[],
         string[],
@@ -203,6 +230,7 @@ export declare namespace SparkView {
         ratio: string;
         eMode: string;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: string[];
         borrowStableAmounts: string[];
@@ -276,8 +304,7 @@ export interface SparkView extends BaseContract {
     clone(): SparkView;
     methods: {
         SPARK_REFERRAL_CODE(): NonPayableTransactionObject<string>;
-        STABLE_ID(): NonPayableTransactionObject<string>;
-        VARIABLE_ID(): NonPayableTransactionObject<string>;
+        getApyAfterValuesEstimation(_market: string, _reserveParams: SparkView.LiquidityChangeParamsStruct[]): NonPayableTransactionObject<SparkView.EstimatedRatesStructOutput[]>;
         getAssetPrice(_market: string, _tokenAddr: string): NonPayableTransactionObject<string>;
         getCollFactors(_market: string, _tokens: string[]): NonPayableTransactionObject<string[]>;
         getEModeCollateralFactor(emodeCategory: number | string | BN, lendingPool: string): NonPayableTransactionObject<string>;

package/package.json

@@ -1,40 +1,41 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.99",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
-    "lint": "eslint src/ --fix",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "build-test": "npm run build && mocha tests/*"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.5.26",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "decimal.js": "^10.4.3"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "mocha": "^10.2.0",
-    "typechain": "^8.3.1",
-    "typechain-target-web3-v1-3mihai3": "^6.0.2",
-    "typescript": "^5.2.2"
-  },
-  "peerDependencies": {
-    "web3": "^1.10.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "0.0.100",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
+    "lint": "eslint src/ --fix",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "build-test": "npm run build && mocha tests/*"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.5.27",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "decimal.js": "^10.4.3"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "mocha": "^10.2.0",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}