@defisaver/positions-sdk 0.0.30 → 0.0.33

package/src/types/spark.ts

@@ -1,107 +1,107 @@
-import { EModeCategoryData, EModeCategoryDataMapping } from './aave';
-import {
-  MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
-} from './common';
-
-export enum SparkVersions {
-  SparkV1 = 'v1default',
-}
-
-export interface SparkMarketData {
-  chainIds: NetworkNumber[],
-  label: string,
-  shortLabel: string,
-  url: string,
-  value: SparkVersions,
-  assets: readonly string[],
-  provider: '' | 'SparkPoolAddressesProvider',
-  providerAddress: string,
-  lendingPool: 'SparkLendingPool',
-  lendingPoolAddress: string,
-  protocolData: '' | 'SparkProtocolDataProvider',
-  protocolDataAddress: string
-  subVersionLabel?: string
-  // icon: Function,
-  protocolName: string,
-  disabled?: boolean,
-}
-
-export interface SparkAssetData extends MMAssetData {
-  totalBorrowVar: string,
-  sortIndex?: number,
-  usageAsCollateralEnabled: boolean,
-  isIsolated: boolean,
-  eModeCategory: number,
-  eModeCategoryData: EModeCategoryData,
-  liquidationRatio: string,
-}
-
-export interface SparkAssetsData {
-  [token: string]: SparkAssetData,
-}
-
-export type SparkMarketsData = { assetsData: SparkAssetsData };
-
-export interface SparkUsedAsset extends MMUsedAsset {
-  stableBorrowRate: string,
-  borrowedStable: string,
-  borrowedVariable: string,
-  borrowedUsdStable: string,
-  borrowedUsdVariable: string,
-  stableLimit: string,
-  variableLimit: string,
-  limit: string,
-  eModeCategory: number,
-}
-
-export interface SparkUsedAssets {
-  [token: string]: SparkUsedAsset,
-}
-
-export interface SparkHelperCommon {
-  usedAssets: SparkUsedAssets,
-  eModeCategory: number,
-  eModeCategories?: object,
-  assetsData: SparkAssetsData,
-  selectedMarket?: SparkMarketData,
-  network?: NetworkNumber,
-}
-
-export interface SparkAggregatedPositionData {
-  suppliedUsd: string,
-  suppliedCollateralUsd: string,
-  borrowedUsd: string,
-  borrowLimitUsd: string,
-  liquidationLimitUsd: string,
-  leftToBorrowUsd: string,
-  ratio: string,
-  collRatio: string,
-  netApy: string,
-  incentiveUsd: string,
-  totalInterestUsd: string,
-  liqRatio: string,
-  liqPercent: string,
-  leveragedType: string,
-  leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
-  liquidationPrice?: string,
-}
-
-export interface SparkPositionData extends MMPositionData {
-  ratio: string,
-  minRatio: string,
-  collRatio: string,
-  borrowedUsd: string,
-  borrowLimitUsd: string,
-  suppliedCollateralUsd: string,
-  incentiveUsd: string,
-  totalInterestUsd: string,
-  isSubscribedToAutomation?: boolean,
-  automationResubscribeRequired?: boolean,
-  totalSupplied: string,
-  usedAssets: SparkUsedAssets,
-  eModeCategory: number,
-  isInIsolationMode: boolean,
-  isInSiloedMode: boolean,
-  eModeCategories: { [key: number]: EModeCategoryDataMapping },
+import { EModeCategoryData, EModeCategoryDataMapping } from './aave';
+import {
+  MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
+} from './common';
+
+export enum SparkVersions {
+  SparkV1 = 'v1default',
+}
+
+export interface SparkMarketData {
+  chainIds: NetworkNumber[],
+  label: string,
+  shortLabel: string,
+  url: string,
+  value: SparkVersions,
+  assets: readonly string[],
+  provider: '' | 'SparkPoolAddressesProvider',
+  providerAddress: string,
+  lendingPool: 'SparkLendingPool',
+  lendingPoolAddress: string,
+  protocolData: '' | 'SparkProtocolDataProvider',
+  protocolDataAddress: string
+  subVersionLabel?: string
+  // icon: Function,
+  protocolName: string,
+  disabled?: boolean,
+}
+
+export interface SparkAssetData extends MMAssetData {
+  totalBorrowVar: string,
+  sortIndex?: number,
+  usageAsCollateralEnabled: boolean,
+  isIsolated: boolean,
+  eModeCategory: number,
+  eModeCategoryData: EModeCategoryData,
+  liquidationRatio: string,
+}
+
+export interface SparkAssetsData {
+  [token: string]: SparkAssetData,
+}
+
+export type SparkMarketsData = { assetsData: SparkAssetsData };
+
+export interface SparkUsedAsset extends MMUsedAsset {
+  stableBorrowRate: string,
+  borrowedStable: string,
+  borrowedVariable: string,
+  borrowedUsdStable: string,
+  borrowedUsdVariable: string,
+  stableLimit: string,
+  variableLimit: string,
+  limit: string,
+  eModeCategory: number,
+}
+
+export interface SparkUsedAssets {
+  [token: string]: SparkUsedAsset,
+}
+
+export interface SparkHelperCommon {
+  usedAssets: SparkUsedAssets,
+  eModeCategory: number,
+  eModeCategories?: object,
+  assetsData: SparkAssetsData,
+  selectedMarket?: SparkMarketData,
+  network?: NetworkNumber,
+}
+
+export interface SparkAggregatedPositionData {
+  suppliedUsd: string,
+  suppliedCollateralUsd: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  liquidationLimitUsd: string,
+  leftToBorrowUsd: string,
+  ratio: string,
+  collRatio: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  liqRatio: string,
+  liqPercent: string,
+  leveragedType: string,
+  leveragedAsset?: string,
+  leveragedLsdAssetRatio?: string,
+  liquidationPrice?: string,
+}
+
+export interface SparkPositionData extends MMPositionData {
+  ratio: string,
+  minRatio: string,
+  collRatio: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  suppliedCollateralUsd: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  isSubscribedToAutomation?: boolean,
+  automationResubscribeRequired?: boolean,
+  totalSupplied: string,
+  usedAssets: SparkUsedAssets,
+  eModeCategory: number,
+  isInIsolationMode: boolean,
+  isInSiloedMode: boolean,
+  eModeCategories: { [key: number]: EModeCategoryDataMapping },
 }

package/yarn-error.log

@@ -0,0 +1,64 @@
+Arguments: 
+  /Users/stefan/.nvm/versions/node/v14.19.0/bin/node /usr/local/Cellar/yarn/1.22.19/libexec/bin/yarn.js
+
+PATH: 
+  /Users/stefan/.nvm/versions/node/v14.19.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Applications/VMware Fusion.app/Contents/Public:/usr/local/go/bin:/Users/stefan/WebstormProjects/defisaver-positions-sdk/node_modules/.bin:/usr/local/go
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  14.19.0
+
+Platform: 
+  darwin x64
+
+Trace: 
+  Error: incorrect data check
+      at Zlib.zlibOnError [as onerror] (zlib.js:187:17)
+
+npm manifest: 
+  {
+    "name": "defisaver-positions-sdk",
+    "version": "0.0.1",
+    "description": "",
+    "main": "./cjs/index.js",
+    "module": "./esm/src/index.js",
+    "types": "./esm/src/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 build:cjs && npm run build:esm",
+      "dev": "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.4.56",
+      "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"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile

package/src/morpho/markets.ts

@@ -1,39 +0,0 @@
-import {morphoAaveV2AssetDefaultMarket, morphoAaveV3AssetEthMarket} from "../markets/aave/marketAssets";
-import {getConfigContractAddress} from "../contracts";
-import {AaveMarketInfo, AaveVersions} from "../types/aave";
-import {NetworkNumber} from "../types/common";
-
-export const MORPHO_AAVE_V2: AaveMarketInfo = {
-  chainIds: [1],
-  label: 'Morpho-Aave V2',
-  shortLabel: 'morpho-aave-v2',
-  value: AaveVersions.MorphoAaveV2,
-  url: '',
-  assets: morphoAaveV2AssetDefaultMarket,
-  provider: 'LendingPoolAddressesProvider',
-  providerAddress: getConfigContractAddress('LendingPoolAddressesProvider', 1), // rename
-  protocolData: 'AaveProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveProtocolDataProvider', 1),
-  lendingPool: 'AaveLendingPoolV2',
-  lendingPoolAddress: getConfigContractAddress('MorphoAaveV2Proxy', 1),
-  // icon: SvgAdapter(protocolIcons.morpho),
-  protocolName: 'morpho',
-};
-
-export const MORPHO_AAVE_V3_ETH = (networkId: NetworkNumber = NetworkNumber.Eth): AaveMarketInfo => ({
-  chainIds: [1],
-  label: 'Morpho-Aave V3',
-  shortLabel: 'morpho-aave-v3',
-  subVersionLabel: 'ETH Optimizer',
-  value: AaveVersions.MorphoAaveV3Eth,
-  url: 'eth-optimizer',
-  assets: morphoAaveV3AssetEthMarket,
-  provider: 'AaveV3PoolAddressesProvider',
-  providerAddress: getConfigContractAddress('AaveV3PoolAddressesProvider', networkId), // TODO - check if used and if value is good?
-  protocolData: 'AaveV3ProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveV3ProtocolDataProvider', networkId),
-  lendingPool: 'MorphoAaveV3ProxyEthMarket',
-  lendingPoolAddress: getConfigContractAddress('MorphoAaveV3ProxyEthMarket', networkId),
-  // icon: SvgAdapter(protocolIcons.morpho),
-  protocolName: 'morpho',
-});