@defisaver/positions-sdk 1.0.11-fluid-dev12 → 1.0.11-fluid-dev13

package/esm/helpers/morphoBlueHelpers/index.js

@@ -107,73 +107,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, web3, netwo
     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/markets/fluid/index.d.ts

@@ -95,7 +95,6 @@ export declare const FLUID_ETH_USDC_USDT_23_ARB: (networkId?: NetworkNumber) =>
 export declare const FLUID_WSTETH_USDC_USDT_24_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_WEETH_USDC_USDT_25_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_WBTC_USDC_USDT_26_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const FLUID_SUSDS_USDC_USDT_30_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_ETH_USDC_1_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_WSTETH_USDC_2_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_WSTETH_ETH_3_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
@@ -213,7 +212,6 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     FLUID_WSTETH_USDC_USDT_24_ARB: FluidMarketInfo;
     FLUID_WEETH_USDC_USDT_25_ARB: FluidMarketInfo;
     FLUID_WBTC_USDC_USDT_26_ARB: FluidMarketInfo;
-    FLUID_SUSDS_USDC_USDT_30_ARB: FluidMarketInfo;
     FLUID_ETH_USDC_1_BASE: FluidMarketInfo;
     FLUID_WSTETH_USDC_2_BASE: FluidMarketInfo;
     FLUID_WSTETH_ETH_3_BASE: FluidMarketInfo;

package/esm/markets/fluid/index.js

@@ -1759,25 +1759,28 @@ export const FLUID_WBTC_USDC_USDT_26_ARB = (networkId = NetworkNumber.Eth) => ({
     debtAsset0: 'USDC',
     debtAsset1: 'USDT',
 });
-export const FLUID_SUSDS_USDC_USDT_30_ARB = (networkId = NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: false,
-    ethBased: false,
-    type: FluidVaultType.T3,
-    id: 30,
-    chainIds: [NetworkNumber.Arb],
-    label: '#30 (sUSDS / USDC-USDT)',
-    shortLabel: 'sUSDS/USDC-USDT',
-    value: FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB,
-    url: 'susds_usdc_usdt_30_arb',
-    marketAddress: '0xE6b5D1CdC4935295c84772C4700932b4BFC93274',
-    hasSmartCollateral: false,
-    hasSmartDebt: true,
-    collateralAsset0: 'sUSDS',
-    debtAsset0: 'USDC',
-    debtAsset1: 'USDT',
-});
+// TODO: This issue is due to sUSDS price fetching via multicall on arbi fails and it's not handled correctly
+/*
+export const FLUID_SUSDS_USDC_USDT_30_ARB = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
+  stableBased: true,
+  btcBased: false,
+  wstETHBased: false,
+  ethBased: false,
+  type: FluidVaultType.T3,
+  id: 30,
+  chainIds: [NetworkNumber.Arb],
+  label: '#30 (sUSDS / USDC-USDT)',
+  shortLabel: 'sUSDS/USDC-USDT',
+  value: FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB,
+  url: 'susds_usdc_usdt_30_arb',
+  marketAddress: '0xE6b5D1CdC4935295c84772C4700932b4BFC93274',
+  hasSmartCollateral: false,
+  hasSmartDebt: true,
+  collateralAsset0: 'sUSDS',
+  debtAsset0: 'USDC',
+  debtAsset1: 'USDT',
+});
+*/
 export const FLUID_ETH_USDC_1_BASE = (networkId = NetworkNumber.Eth) => ({
     stableBased: true,
     btcBased: false,
@@ -2082,7 +2085,7 @@ export const FLUID_ETH_SUSDS_17_BASE = (networkId = NetworkNumber.Eth) => ({
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset0: 'ETH',
-    debtAsset0: 'sSUDS',
+    debtAsset0: 'sUSDS',
 });
 export const FLUID_WSTETH_SUSDS_18_BASE = (networkId = NetworkNumber.Eth) => ({
     stableBased: true,
@@ -2253,7 +2256,7 @@ export const FluidMarkets = (networkId) => ({
     [FluidArbitrumVersion.FLUID_WSTETH_USDC_USDT_24_ARB]: FLUID_WSTETH_USDC_USDT_24_ARB(networkId),
     [FluidArbitrumVersion.FLUID_WEETH_USDC_USDT_25_ARB]: FLUID_WEETH_USDC_USDT_25_ARB(networkId),
     [FluidArbitrumVersion.FLUID_WBTC_USDC_USDT_26_ARB]: FLUID_WBTC_USDC_USDT_26_ARB(networkId),
-    [FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB]: FLUID_SUSDS_USDC_USDT_30_ARB(networkId),
+    // [FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB]: FLUID_SUSDS_USDC_USDT_30_ARB(networkId),
     // base
     [FluidBaseVersions.FLUID_ETH_USDC_1_BASE]: FLUID_ETH_USDC_1_BASE(networkId),
     [FluidBaseVersions.FLUID_WSTETH_USDC_2_BASE]: FLUID_WSTETH_USDC_2_BASE(networkId),

package/esm/services/priceService.d.ts

@@ -28,4 +28,6 @@ export declare const parseWeETHPriceCalls: (_ethPrice: string, weETHrate: {
     weETHRate: string;
 };
 export declare const getWstETHPriceFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
+export declare const getBTCPriceForFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
+export declare const getEthPriceForFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
 export declare const getChainlinkAssetAddress: (symbol: string, network: NetworkNumber) => string;

package/esm/services/priceService.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { getAssetInfo } from '@defisaver/tokens';
-import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract, WeETHPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
+import { COMPPriceFeedContract, ETHPriceFeedContract, BTCPriceFeedContract, USDCPriceFeedContract, WeETHPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { multicall } from '../multicall';
 import { getEthAmountForDecimals } from './utils';
@@ -109,6 +109,16 @@ export const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0,
     const { ethPrice, wstETHRate } = parseWstETHPriceCalls(multicallRes[0][0], multicallRes[1], multicallRes[2][0]);
     return new Dec(ethPrice).mul(wstETHRate).toString();
 });
+export const getBTCPriceForFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = BTCPriceFeedContract(web3, network);
+    const price = yield contract.methods.latestAnswer().call();
+    return new Dec(price).div(1e8).toString();
+});
+export const getEthPriceForFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = ETHPriceFeedContract(web3, network);
+    const price = yield contract.methods.latestAnswer().call();
+    return new Dec(price).div(1e8).toString();
+});
 // chainlink price feed available only on mainnet
 export const getChainlinkAssetAddress = (symbol, network) => {
     // Chainlink only has BTC/USD feed so we use that for BTC derivatives

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

@@ -0,0 +1,135 @@
+/// <reference types="node" />
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, NonPayableTransactionObject, BlockType, ContractEventLog, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export type AnswerUpdated = ContractEventLog<{
+    current: string;
+    roundId: string;
+    updatedAt: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type NewRound = ContractEventLog<{
+    roundId: string;
+    startedBy: string;
+    startedAt: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type OwnershipTransferRequested = ContractEventLog<{
+    from: string;
+    to: string;
+    0: string;
+    1: string;
+}>;
+export type OwnershipTransferred = ContractEventLog<{
+    from: string;
+    to: string;
+    0: string;
+    1: string;
+}>;
+export interface BTCPriceFeed extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): BTCPriceFeed;
+    clone(): BTCPriceFeed;
+    methods: {
+        acceptOwnership(): NonPayableTransactionObject<void>;
+        accessController(): NonPayableTransactionObject<string>;
+        aggregator(): NonPayableTransactionObject<string>;
+        confirmAggregator(_aggregator: string): NonPayableTransactionObject<void>;
+        decimals(): NonPayableTransactionObject<string>;
+        description(): NonPayableTransactionObject<string>;
+        getAnswer(_roundId: number | string | BN): NonPayableTransactionObject<string>;
+        getRoundData(_roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        getTimestamp(_roundId: number | string | BN): NonPayableTransactionObject<string>;
+        latestAnswer(): NonPayableTransactionObject<string>;
+        latestRound(): NonPayableTransactionObject<string>;
+        latestRoundData(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        latestTimestamp(): NonPayableTransactionObject<string>;
+        owner(): NonPayableTransactionObject<string>;
+        phaseAggregators(arg0: number | string | BN): NonPayableTransactionObject<string>;
+        phaseId(): NonPayableTransactionObject<string>;
+        proposeAggregator(_aggregator: string): NonPayableTransactionObject<void>;
+        proposedAggregator(): NonPayableTransactionObject<string>;
+        proposedGetRoundData(_roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        proposedLatestRoundData(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        setController(_accessController: string): NonPayableTransactionObject<void>;
+        transferOwnership(_to: string): NonPayableTransactionObject<void>;
+        version(): NonPayableTransactionObject<string>;
+    };
+    events: {
+        AnswerUpdated(cb?: Callback<AnswerUpdated>): EventEmitter;
+        AnswerUpdated(options?: EventOptions, cb?: Callback<AnswerUpdated>): EventEmitter;
+        NewRound(cb?: Callback<NewRound>): EventEmitter;
+        NewRound(options?: EventOptions, cb?: Callback<NewRound>): EventEmitter;
+        OwnershipTransferRequested(cb?: Callback<OwnershipTransferRequested>): EventEmitter;
+        OwnershipTransferRequested(options?: EventOptions, cb?: Callback<OwnershipTransferRequested>): EventEmitter;
+        OwnershipTransferred(cb?: Callback<OwnershipTransferred>): EventEmitter;
+        OwnershipTransferred(options?: EventOptions, cb?: Callback<OwnershipTransferred>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "AnswerUpdated", cb: Callback<AnswerUpdated>): void;
+    once(event: "AnswerUpdated", options: EventOptions, cb: Callback<AnswerUpdated>): void;
+    once(event: "NewRound", cb: Callback<NewRound>): void;
+    once(event: "NewRound", options: EventOptions, cb: Callback<NewRound>): void;
+    once(event: "OwnershipTransferRequested", cb: Callback<OwnershipTransferRequested>): void;
+    once(event: "OwnershipTransferRequested", options: EventOptions, cb: Callback<OwnershipTransferRequested>): void;
+    once(event: "OwnershipTransferred", cb: Callback<OwnershipTransferred>): void;
+    once(event: "OwnershipTransferred", options: EventOptions, cb: Callback<OwnershipTransferred>): void;
+}

package/esm/types/contracts/generated/BTCPriceFeed.js

@@ -0,0 +1,4 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export {};

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

@@ -12,6 +12,7 @@ export type { AaveV3LidoProtocolDataProvider } from "./AaveV3LidoProtocolDataPro
 export type { AaveV3PoolAddressesProvider } from "./AaveV3PoolAddressesProvider";
 export type { AaveV3ProtocolDataProvider } from "./AaveV3ProtocolDataProvider";
 export type { AaveV3View } from "./AaveV3View";
+export type { BTCPriceFeed } from "./BTCPriceFeed";
 export type { BalanceScanner } from "./BalanceScanner";
 export type { COMPPriceFeed } from "./COMPPriceFeed";
 export type { CbEth } from "./CbEth";

package/package.json

@@ -1,54 +1,54 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "1.0.11-fluid-dev12",
-  "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 generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
-    "lint": "eslint src/ --fix",
-    "lint-check": "eslint src/",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "test-single": "mocha ./tests/$npm_config_name.ts",
-    "test:debugger": "mocha --inspect-brk tests/*",
-    "build-test": "npm run build && npm run test",
-    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.6.2",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "@types/lodash": "^4.17.15",
-    "@types/memoizee": "^0.4.12",
-    "decimal.js": "^10.4.3",
-    "lodash": "^4.17.21",
-    "memoizee": "^0.4.17"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@types/chai": "^5.0.0",
-    "@types/mocha": "^10.0.9",
-    "@types/web3": "^1.0.20",
-    "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",
-    "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": "1.0.11-fluid-dev13",
+  "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 generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
+    "lint": "eslint src/ --fix",
+    "lint-check": "eslint src/",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "build-test": "npm run build && npm run test",
+    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.6.6",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "@types/lodash": "^4.17.15",
+    "@types/memoizee": "^0.4.12",
+    "decimal.js": "^10.4.3",
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.17"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "@types/chai": "^5.0.0",
+    "@types/mocha": "^10.0.9",
+    "@types/web3": "^1.0.20",
+    "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",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}