@defisaver/positions-sdk 2.0.0 → 2.0.4

package/src/services/priceService.ts

@@ -1,159 +1,159 @@
-import Dec from 'decimal.js';
-import { getAssetInfo } from '@defisaver/tokens';
-import { Client, PublicClient } from 'viem';
-import {
-  COMPPriceFeedContractViem,
-  BTCPriceFeedContractViem,
-  ETHPriceFeedContractViem,
-  USDCPriceFeedContractViem,
-  WstETHPriceFeedContractViem,
-  WeETHPriceFeedContractViem,
-} from '../contracts';
-import { EthAddress, NetworkNumber } from '../types/common';
-import { getEthAmountForDecimals } from './utils';
-
-export const getEthPrice = async (client: Client) => {
-  const contract = ETHPriceFeedContractViem(client, NetworkNumber.Eth);
-  const price = await contract.read.latestAnswer();
-  return new Dec(price.toString()).div(1e8).toString();
-};
-
-export const getUSDCPrice = async (client: Client) => {
-  const contract = USDCPriceFeedContractViem(client, NetworkNumber.Eth);
-  const price = await contract.read.latestAnswer();
-  return new Dec(price.toString()).div(1e8).toString();
-};
-
-export const getCompPrice = async (client: Client) => {
-  const contract = COMPPriceFeedContractViem(client, NetworkNumber.Eth);
-  const price = await contract.read.latestAnswer();
-  return new Dec(price.toString()).div(1e8).toString();
-};
-
-export const getWstETHPrice = async (client: Client, network: NetworkNumber = NetworkNumber.Eth) => {
-  const wstETHFeedContract = WstETHPriceFeedContractViem(client, network);
-  const ethFeedContract = ETHPriceFeedContractViem(client, network);
-
-  const [ethPriceWei, wstETHRateWei, decimals] = await Promise.all([
-    ethFeedContract.read.latestAnswer(),
-    wstETHFeedContract.read.latestRoundData(),
-    wstETHFeedContract.read.decimals(),
-  ]);
-
-  const ethPrice = new Dec(ethPriceWei.toString()).div(1e8);
-
-  const wstETHRate = getEthAmountForDecimals(wstETHRateWei[1].toString(), decimals);
-
-  return new Dec(ethPrice).mul(wstETHRate).toString();
-};
-
-export const getWeETHPrice = async (client: Client, network: NetworkNumber = NetworkNumber.Eth) => {
-  const weETHFeedContract = WeETHPriceFeedContractViem(client, network);
-  const ethFeedContract = ETHPriceFeedContractViem(client, network);
-
-  const [ethPriceWei, weETHRateWei, decimals] = await Promise.all([
-    ethFeedContract.read.latestAnswer(),
-    weETHFeedContract.read.latestRoundData(),
-    weETHFeedContract.read.decimals(),
-  ]);
-
-  const ethPrice = new Dec(ethPriceWei.toString()).div(1e8);
-
-  const weETHRate = getEthAmountForDecimals(weETHRateWei[1].toString(), decimals);
-
-  return new Dec(ethPrice).mul(weETHRate).toString();
-};
-
-export const getWstETHChainLinkPriceCalls = (client: PublicClient, network: NetworkNumber) => {
-  const wstETHFeedContract = WstETHPriceFeedContractViem(client, network);
-  const ethFeedContract = ETHPriceFeedContractViem(client, network);
-  const calls = [
-    {
-      address: ethFeedContract.address,
-      abi: ethFeedContract.abi,
-      functionName: 'latestAnswer',
-      args: [],
-    },
-    {
-      address: wstETHFeedContract.address,
-      abi: wstETHFeedContract.abi,
-      functionName: 'latestRoundData',
-      args: [],
-    },
-    {
-      address: wstETHFeedContract.address,
-      abi: wstETHFeedContract.abi,
-      functionName: 'decimals',
-      args: [],
-    },
-  ];
-  return calls;
-};
-
-export const getWeETHChainLinkPriceCalls = (client: PublicClient, network: NetworkNumber) => {
-  const weETHFeedContract = WeETHPriceFeedContractViem(client, network);
-  const ethFeedContract = ETHPriceFeedContractViem(client, network);
-  const calls = [
-    {
-      address: ethFeedContract.address,
-      abi: ethFeedContract.abi,
-      functionName: 'latestAnswer',
-      args: [],
-    },
-    {
-      address: weETHFeedContract.address,
-      abi: weETHFeedContract.abi,
-      functionName: 'latestRoundData',
-      args: [],
-    },
-    {
-      address: weETHFeedContract.address,
-      abi: weETHFeedContract.abi,
-      functionName: 'decimals',
-      args: [],
-    },
-  ];
-  return calls;
-};
-
-export const parseWstETHPriceCalls = (_ethPrice: string, wstETHrateAnswer: string, decimals: string) => {
-  const ethPrice = new Dec(_ethPrice).div(1e8);
-  const wstETHRate = getEthAmountForDecimals(wstETHrateAnswer, decimals);
-  return { ethPrice, wstETHRate };
-};
-
-export const parseWeETHPriceCalls = (_ethPrice: string, weETHrateAnswer: string, decimals: string) => {
-  const ethPrice = new Dec(_ethPrice).div(1e8);
-  const weETHRate = getEthAmountForDecimals(weETHrateAnswer, decimals);
-  return { ethPrice, weETHRate };
-};
-
-// this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
-export const getWstETHPriceFluid = async (client: PublicClient, network: NetworkNumber) => {
-  const calls = getWstETHChainLinkPriceCalls(client, network);
-  const results = await client.multicall({ contracts: calls });
-  // @ts-ignore
-  const { ethPrice, wstETHRate } = parseWstETHPriceCalls(results[0].result!.toString(), results[1].result[1]!.toString(), results[2].result!.toString());
-
-  return new Dec(ethPrice).mul(wstETHRate).toString();
-};
-
-export const getBTCPriceForFluid = async (client: PublicClient, network: NetworkNumber) => {
-  const contract = BTCPriceFeedContractViem(client, network);
-  const price = await contract.read.latestAnswer();
-  return new Dec(price).div(1e8).toString();
-};
-
-export const getEthPriceForFluid = async (client: PublicClient, network: NetworkNumber) => {
-  const contract = ETHPriceFeedContractViem(client, network);
-  const price = await contract.read.latestAnswer();
-  return new Dec(price).div(1e8).toString();
-};
-
-// chainlink price feed available only on mainnet
-export const getChainlinkAssetAddress = (symbol: string, network: NetworkNumber): EthAddress => {
-  // Chainlink only has BTC/USD feed so we use that for BTC derivatives
-  if (['WBTC', 'RENBTC'].includes(symbol?.toUpperCase())) return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
-  if (symbol?.toUpperCase() === 'WETH') return getAssetInfo('ETH').addresses[network] as EthAddress;
-  return getAssetInfo(symbol).addresses[network] as EthAddress;
-};
+import Dec from 'decimal.js';
+import { getAssetInfo } from '@defisaver/tokens';
+import { Client, PublicClient } from 'viem';
+import {
+  COMPPriceFeedContractViem,
+  BTCPriceFeedContractViem,
+  ETHPriceFeedContractViem,
+  USDCPriceFeedContractViem,
+  WstETHPriceFeedContractViem,
+  WeETHPriceFeedContractViem,
+} from '../contracts';
+import { EthAddress, NetworkNumber } from '../types/common';
+import { getEthAmountForDecimals } from './utils';
+
+export const getEthPrice = async (client: Client) => {
+  const contract = ETHPriceFeedContractViem(client, NetworkNumber.Eth);
+  const price = await contract.read.latestAnswer();
+  return new Dec(price.toString()).div(1e8).toString();
+};
+
+export const getUSDCPrice = async (client: Client) => {
+  const contract = USDCPriceFeedContractViem(client, NetworkNumber.Eth);
+  const price = await contract.read.latestAnswer();
+  return new Dec(price.toString()).div(1e8).toString();
+};
+
+export const getCompPrice = async (client: Client) => {
+  const contract = COMPPriceFeedContractViem(client, NetworkNumber.Eth);
+  const price = await contract.read.latestAnswer();
+  return new Dec(price.toString()).div(1e8).toString();
+};
+
+export const getWstETHPrice = async (client: Client, network: NetworkNumber = NetworkNumber.Eth) => {
+  const wstETHFeedContract = WstETHPriceFeedContractViem(client, network);
+  const ethFeedContract = ETHPriceFeedContractViem(client, network);
+
+  const [ethPriceWei, wstETHRateWei, decimals] = await Promise.all([
+    ethFeedContract.read.latestAnswer(),
+    wstETHFeedContract.read.latestRoundData(),
+    wstETHFeedContract.read.decimals(),
+  ]);
+
+  const ethPrice = new Dec(ethPriceWei.toString()).div(1e8);
+
+  const wstETHRate = getEthAmountForDecimals(wstETHRateWei[1].toString(), decimals);
+
+  return new Dec(ethPrice).mul(wstETHRate).toString();
+};
+
+export const getWeETHPrice = async (client: Client, network: NetworkNumber = NetworkNumber.Eth) => {
+  const weETHFeedContract = WeETHPriceFeedContractViem(client, network);
+  const ethFeedContract = ETHPriceFeedContractViem(client, network);
+
+  const [ethPriceWei, weETHRateWei, decimals] = await Promise.all([
+    ethFeedContract.read.latestAnswer(),
+    weETHFeedContract.read.latestRoundData(),
+    weETHFeedContract.read.decimals(),
+  ]);
+
+  const ethPrice = new Dec(ethPriceWei.toString()).div(1e8);
+
+  const weETHRate = getEthAmountForDecimals(weETHRateWei[1].toString(), decimals);
+
+  return new Dec(ethPrice).mul(weETHRate).toString();
+};
+
+export const getWstETHChainLinkPriceCalls = (client: PublicClient, network: NetworkNumber) => {
+  const wstETHFeedContract = WstETHPriceFeedContractViem(client, network);
+  const ethFeedContract = ETHPriceFeedContractViem(client, network);
+  const calls = [
+    {
+      address: ethFeedContract.address,
+      abi: ethFeedContract.abi,
+      functionName: 'latestAnswer',
+      args: [],
+    },
+    {
+      address: wstETHFeedContract.address,
+      abi: wstETHFeedContract.abi,
+      functionName: 'latestRoundData',
+      args: [],
+    },
+    {
+      address: wstETHFeedContract.address,
+      abi: wstETHFeedContract.abi,
+      functionName: 'decimals',
+      args: [],
+    },
+  ];
+  return calls;
+};
+
+export const getWeETHChainLinkPriceCalls = (client: PublicClient, network: NetworkNumber) => {
+  const weETHFeedContract = WeETHPriceFeedContractViem(client, network);
+  const ethFeedContract = ETHPriceFeedContractViem(client, network);
+  const calls = [
+    {
+      address: ethFeedContract.address,
+      abi: ethFeedContract.abi,
+      functionName: 'latestAnswer',
+      args: [],
+    },
+    {
+      address: weETHFeedContract.address,
+      abi: weETHFeedContract.abi,
+      functionName: 'latestRoundData',
+      args: [],
+    },
+    {
+      address: weETHFeedContract.address,
+      abi: weETHFeedContract.abi,
+      functionName: 'decimals',
+      args: [],
+    },
+  ];
+  return calls;
+};
+
+export const parseWstETHPriceCalls = (_ethPrice: string, wstETHrateAnswer: string, decimals: string) => {
+  const ethPrice = new Dec(_ethPrice).div(1e8);
+  const wstETHRate = getEthAmountForDecimals(wstETHrateAnswer, decimals);
+  return { ethPrice, wstETHRate };
+};
+
+export const parseWeETHPriceCalls = (_ethPrice: string, weETHrateAnswer: string, decimals: string) => {
+  const ethPrice = new Dec(_ethPrice).div(1e8);
+  const weETHRate = getEthAmountForDecimals(weETHrateAnswer, decimals);
+  return { ethPrice, weETHRate };
+};
+
+// this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
+export const getWstETHPriceFluid = async (client: PublicClient, network: NetworkNumber) => {
+  const calls = getWstETHChainLinkPriceCalls(client, network);
+  const results = await client.multicall({ contracts: calls });
+  // @ts-ignore
+  const { ethPrice, wstETHRate } = parseWstETHPriceCalls(results[0].result!.toString(), results[1].result[1]!.toString(), results[2].result!.toString());
+
+  return new Dec(ethPrice).mul(wstETHRate).toString();
+};
+
+export const getBTCPriceForFluid = async (client: PublicClient, network: NetworkNumber) => {
+  const contract = BTCPriceFeedContractViem(client, network);
+  const price = await contract.read.latestAnswer();
+  return new Dec(price).div(1e8).toString();
+};
+
+export const getEthPriceForFluid = async (client: PublicClient, network: NetworkNumber) => {
+  const contract = ETHPriceFeedContractViem(client, network);
+  const price = await contract.read.latestAnswer();
+  return new Dec(price).div(1e8).toString();
+};
+
+// chainlink price feed available only on mainnet
+export const getChainlinkAssetAddress = (symbol: string, network: NetworkNumber): EthAddress => {
+  // Chainlink only has BTC/USD feed so we use that for BTC derivatives
+  if (['WBTC', 'RENBTC'].includes(symbol?.toUpperCase())) return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
+  if (symbol?.toUpperCase() === 'WETH') return getAssetInfo('ETH').addresses[network] as EthAddress;
+  return getAssetInfo(symbol).addresses[network] as EthAddress;
+};

package/src/services/utils.ts

@@ -1,62 +1,64 @@
-import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { NetworkNumber } from '../types/common';
-
-export const isLayer2Network = (networkId: NetworkNumber) => [10, 42161, 8453].includes(+networkId);
-
-export const addToObjectIf = (condition: any, item: any) => (condition ? item : {});
-
-
-export const addToArrayIf = (condition: any, ...items: any[]) => (condition ? items : []);
-
-export const ethToWeth = (maybeEth: any) => maybeEth?.replace(/^ETH$/, 'WETH');
-
-export const wethToEth = (maybeWeth: any) => maybeWeth?.replace(/^WETH$/, 'ETH');
-
-export const stEthToWstEth = (maybeStEth: any) => maybeStEth?.replace(/^stETH$/, 'wstETH');
-
-export const wstEthToStEth = (maybeStEth: any) => maybeStEth?.replace(/^wstETH$/, 'stETH');
-
-export const getAbiItem = (abi: any, methodName: string) => abi.find((i: any) => i.name === methodName);
-
-export const ADDRESS_REGEX = /0x[0-9a-fA-F]{40}/;
-export const isAddress = (address: string) => typeof address === 'string' && (new RegExp(ADDRESS_REGEX).test(address));
-
-export const compareAddresses = (addr1 = '', addr2 = '') => addr1.toLowerCase() === addr2.toLowerCase();
-
-export const getWeiAmountForDecimals = (amount: string | number, decimals: number) => new Dec(amount).mul(10 ** decimals).floor().toString();
-
-export const getEthAmountForDecimals = (amount: string | number, decimals: string | number) => new Dec(amount).div(10 ** +decimals).toString();
-
-export const handleWbtcLegacy = (asset: string) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);
-
-export const wethToEthByAddress = (maybeWethAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(wethToEth(getAssetInfoByAddress(maybeWethAddr, chainId).symbol), chainId).address;
-
-export const ethToWethByAddress = (maybeEthAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(ethToWeth(getAssetInfoByAddress(maybeEthAddr, chainId).symbol), chainId).address;
-
-export const bytesToString = (hex: string) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
-  .toString()
-  // eslint-disable-next-line no-control-regex
-  .replace(/\x00/g, '');
-
-/**
- * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
- */
-export const mapRange = (input: number | string, minInput: number | string, maxInput: number | string, minOutput:number | string, maxOutput: number | string) => {
-  // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
-  const inputDiff = new Dec(maxInput).minus(minInput);
-  const outputDiff = new Dec(maxOutput).minus(minOutput);
-  const slope = new Dec(outputDiff).div(inputDiff);
-
-  // output = output_start + slope * (input - input_start)
-  return new Dec(minOutput).plus(new Dec(slope).mul(new Dec(input).minus(minInput))).toDP(2).toNumber();
-};
-
-// eslint-disable-next-line no-bitwise
-export const isEnabledOnBitmap = (bitmap: number, assetId: number) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
-
-export const MAXUINT:string = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-
-export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);
-
-export const isMainnetNetwork = (network: NetworkNumber) => network === NetworkNumber.Eth;
+import Dec from 'decimal.js';
+import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { NetworkNumber } from '../types/common';
+
+export const isLayer2Network = (networkId: NetworkNumber) => [10, 42161, 8453].includes(+networkId);
+
+export const addToObjectIf = (condition: any, item: any) => (condition ? item : {});
+
+
+export const addToArrayIf = (condition: any, ...items: any[]) => (condition ? items : []);
+
+export const ethToWeth = (maybeEth: any) => maybeEth?.replace(/^ETH$/, 'WETH');
+
+export const wethToEth = (maybeWeth: any) => maybeWeth?.replace(/^WETH$/, 'ETH');
+
+export const stEthToWstEth = (maybeStEth: any) => maybeStEth?.replace(/^stETH$/, 'wstETH');
+
+export const wstEthToStEth = (maybeStEth: any) => maybeStEth?.replace(/^wstETH$/, 'stETH');
+
+export const getAbiItem = (abi: any, methodName: string) => abi.find((i: any) => i.name === methodName);
+
+export const ADDRESS_REGEX = /0x[0-9a-fA-F]{40}/;
+export const isAddress = (address: string) => typeof address === 'string' && (new RegExp(ADDRESS_REGEX).test(address));
+
+export const compareAddresses = (addr1 = '', addr2 = '') => addr1.toLowerCase() === addr2.toLowerCase();
+
+export const getWeiAmountForDecimals = (amount: string | number, decimals: number) => new Dec(amount).mul(10 ** decimals).floor().toString();
+
+export const getEthAmountForDecimals = (amount: string | number, decimals: string | number) => new Dec(amount).div(10 ** +decimals).toString();
+
+export const handleWbtcLegacy = (asset: string) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);
+
+export const wethToEthByAddress = (maybeWethAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(wethToEth(getAssetInfoByAddress(maybeWethAddr, chainId).symbol), chainId).address;
+
+export const ethToWethByAddress = (maybeEthAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(ethToWeth(getAssetInfoByAddress(maybeEthAddr, chainId).symbol), chainId).address;
+
+export const bytesToString = (hex: string) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
+  .toString()
+  // eslint-disable-next-line no-control-regex
+  .replace(/\x00/g, '');
+
+/**
+ * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
+ */
+export const mapRange = (input: number | string, minInput: number | string, maxInput: number | string, minOutput:number | string, maxOutput: number | string) => {
+  // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
+  const inputDiff = new Dec(maxInput).minus(minInput);
+  const outputDiff = new Dec(maxOutput).minus(minOutput);
+  const slope = new Dec(outputDiff).div(inputDiff);
+
+  // output = output_start + slope * (input - input_start)
+  return new Dec(minOutput).plus(new Dec(slope).mul(new Dec(input).minus(minInput))).toDP(2).toNumber();
+};
+
+// eslint-disable-next-line no-bitwise
+export const isEnabledOnBitmap = (bitmap: number, assetId: number) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
+
+export const MAXUINT:string = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
+
+export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);
+
+export const isMainnetNetwork = (network: NetworkNumber) => network === NetworkNumber.Eth;
+
+export const DEFAULT_TIMEOUT = 2000; // 2 seconds

package/src/services/viem.ts

@@ -1,31 +1,31 @@
-import { createPublicClient, custom } from 'viem';
-import {
-  arbitrum, base, mainnet, optimism,
-} from 'viem/chains';
-import { Blockish, EthereumProvider, NetworkNumber } from '../types/common';
-
-export const getViemChain = (network: NetworkNumber) => {
-  switch (network) {
-    case NetworkNumber.Eth:
-      return mainnet;
-    case NetworkNumber.Opt:
-      return optimism;
-    case NetworkNumber.Arb:
-      return arbitrum;
-    case NetworkNumber.Base:
-      return base;
-    default:
-      throw new Error(`Unsupported network: ${network}`);
-  }
-};
-
-export const getViemProvider = (provider: EthereumProvider, network: NetworkNumber, options?: any) => createPublicClient({
-  transport: custom(provider),
-  chain: getViemChain(network),
-  ...options,
-});
-
-export const setViemBlockNumber = (block: Blockish) => {
-  if (block === 'latest') return {};
-  return { blockNumber: BigInt(block) };
+import { createPublicClient, custom } from 'viem';
+import {
+  arbitrum, base, mainnet, optimism,
+} from 'viem/chains';
+import { Blockish, EthereumProvider, NetworkNumber } from '../types/common';
+
+export const getViemChain = (network: NetworkNumber) => {
+  switch (network) {
+    case NetworkNumber.Eth:
+      return mainnet;
+    case NetworkNumber.Opt:
+      return optimism;
+    case NetworkNumber.Arb:
+      return arbitrum;
+    case NetworkNumber.Base:
+      return base;
+    default:
+      throw new Error(`Unsupported network: ${network}`);
+  }
+};
+
+export const getViemProvider = (provider: EthereumProvider, network: NetworkNumber, options?: any) => createPublicClient({
+  transport: custom(provider),
+  chain: getViemChain(network),
+  ...options,
+});
+
+export const setViemBlockNumber = (block: Blockish) => {
+  if (block === 'latest') return {};
+  return { blockNumber: BigInt(block) };
 };

package/src/setup.ts

@@ -1,8 +1,8 @@
-import Decimal from 'decimal.js';
-
-Decimal.set({
-  rounding: Decimal.ROUND_DOWN,
-  toExpPos: 9e15,
-  toExpNeg: -9e15,
-  precision: 50,
-});
+import Decimal from 'decimal.js';
+
+Decimal.set({
+  rounding: Decimal.ROUND_DOWN,
+  toExpPos: 9e15,
+  toExpNeg: -9e15,
+  precision: 50,
+});