@defisaver/positions-sdk 0.0.33 → 0.0.34

package/src/assets/index.ts

@@ -1,61 +1,61 @@
-import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
-import Web3 from 'web3';
-import { EthAddress, NetworkNumber } from '../types/common';
-import { compareAddresses, isAddress } from '../services/utils';
-import { BalanceScannerContract, getErc20Contract } from '../contracts';
-
-export const getAssetBalance = async (
-  asset: string,
-  address: EthAddress,
-  chainId: NetworkNumber,
-  web3: Web3,
-): Promise<string> => {
-  if (!address) return '0';
-  // noinspection JSUnusedAssignment
-  let data = '';
-
-  const isAssetAddress = isAddress(asset);
-
-  const network: NetworkNumber = chainId;
-  const isOptimism = network === 10;
-
-  if (
-    !isOptimism
-      && (asset === 'ETH' || compareAddresses(asset, '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'))
-  ) {
-    data = await web3.eth.getBalance(address);
-  } else {
-    let _asset = isAssetAddress ? asset : getAssetInfo(asset).address;
-
-    if (isOptimism && compareAddresses(_asset, '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee')) {
-      _asset = '0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000';
-    }
-
-    const contract = await getErc20Contract(_asset, web3);
-    data = (await contract.methods.balanceOf(address).call()).toString();
-  }
-
-  return isAssetAddress
-  // @ts-ignore
-    ? getEthAmountForDecimals(data, (await getERC20TokenData(asset)).decimals)
-    : assetAmountInEth(data, asset);
-};
-
-export const getAssetsBalances = async (assets: string[], address: EthAddress, networkId: NetworkNumber, web3: Web3): Promise<string[]> => {
-  const contract = BalanceScannerContract(web3, networkId);
-
-  const balancesFromChain = [...await contract.methods.tokensBalance(address, assets.map(a => getAssetInfo(a, networkId).address)).call()];
-
-  const balances: string[] = balancesFromChain.map((item, i) => (
-    item.success
-      ? assetAmountInEth(web3.utils.hexToNumberString(item.data), assets[i])
-      : '0'
-  ));
-
-  const ethIndex = assets.indexOf('ETH');
-  if (ethIndex !== -1) {
-    balances[ethIndex] = await getAssetBalance('ETH', address, networkId, web3);
-  }
-
-  return balances;
+import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import Web3 from 'web3';
+import { EthAddress, NetworkNumber } from '../types/common';
+import { compareAddresses, isAddress } from '../services/utils';
+import { BalanceScannerContract, getErc20Contract } from '../contracts';
+
+export const getAssetBalance = async (
+  asset: string,
+  address: EthAddress,
+  chainId: NetworkNumber,
+  web3: Web3,
+): Promise<string> => {
+  if (!address) return '0';
+  // noinspection JSUnusedAssignment
+  let data = '';
+
+  const isAssetAddress = isAddress(asset);
+
+  const network: NetworkNumber = chainId;
+  const isOptimism = network === 10;
+
+  if (
+    !isOptimism
+      && (asset === 'ETH' || compareAddresses(asset, '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'))
+  ) {
+    data = await web3.eth.getBalance(address);
+  } else {
+    let _asset = isAssetAddress ? asset : getAssetInfo(asset).address;
+
+    if (isOptimism && compareAddresses(_asset, '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee')) {
+      _asset = '0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000';
+    }
+
+    const contract = await getErc20Contract(_asset, web3);
+    data = (await contract.methods.balanceOf(address).call()).toString();
+  }
+
+  return isAssetAddress
+  // @ts-ignore
+    ? getEthAmountForDecimals(data, (await getERC20TokenData(asset)).decimals)
+    : assetAmountInEth(data, asset);
+};
+
+export const getAssetsBalances = async (assets: string[], address: EthAddress, networkId: NetworkNumber, web3: Web3): Promise<string[]> => {
+  const contract = BalanceScannerContract(web3, networkId);
+
+  const balancesFromChain = [...await contract.methods.tokensBalance(address, assets.map(a => getAssetInfo(a, networkId).address)).call()];
+
+  const balances: string[] = balancesFromChain.map((item, i) => (
+    item.success
+      ? assetAmountInEth(web3.utils.hexToNumberString(item.data), assets[i])
+      : '0'
+  ));
+
+  const ethIndex = assets.indexOf('ETH');
+  if (ethIndex !== -1) {
+    balances[ethIndex] = await getAssetBalance('ETH', address, networkId, web3);
+  }
+
+  return balances;
 };

package/src/chickenBonds/index.ts

@@ -1,123 +1,123 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-
-import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
-import {
-  Blockish, NetworkNumber, PositionBalances,
-} from '../types/common';
-
-import { ChickenBondsManagerContract, ChickenBondsViewContract } from '../contracts';
-import { BondInfoBasic, ChickenBondsSystemInfoBasic } from '../types';
-import { multicall } from '../multicall';
-import { calcAverageBondAgeMs, calcCBondsBLUSDFloorPrice, decodeTokenURIToSvg } from '../helpers/chickenBondsHelpers';
-
-export const getChickenBondsAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, bondId: string): Promise<PositionBalances> => {
-  const viewContract = ChickenBondsViewContract(web3, network, block);
-
-  const fullBondInfo = await viewContract.methods.getBondFullInfo(bondId).call({}, block);
-
-  return {
-    deposited: {
-      [addressMapping ? getAssetInfo('LUSD', network).address.toLowerCase() : 'LUSD']: fullBondInfo.lusdAmount,
-    },
-  };
-};
-
-export const fetchCBondsSystemInfo = async (web3: Web3, network: NetworkNumber): Promise<ChickenBondsSystemInfoBasic> => {
-  const cBondsView = ChickenBondsViewContract(web3, network);
-  const cBondsManager = ChickenBondsManagerContract(web3, network);
-  const multicallData = [
-    {
-      target: cBondsView.options.address,
-      abiItem: cBondsView.options.jsonInterface.find(({ name }) => name === 'getSystemInfo'),
-      params: [],
-    },
-    {
-      target: cBondsManager.options.address,
-      abiItem: cBondsManager.options.jsonInterface.find(({ name }) => name === 'totalWeightedStartTimes'),
-      params: [],
-    },
-    {
-      target: cBondsManager.options.address,
-      abiItem: cBondsManager.options.jsonInterface.find(({ name }) => name === 'getAcquiredLUSDInSP'),
-      params: [],
-    },
-    {
-      target: cBondsManager.options.address,
-      abiItem: cBondsManager.options.jsonInterface.find(({ name }) => name === 'getAcquiredLUSDInCurve'),
-      params: [],
-    },
-    {
-      target: cBondsManager.options.address,
-      abiItem: cBondsManager.options.jsonInterface.find(({ name }) => name === 'yTokensHeldByCBM'),
-      params: [],
-    },
-  ];
-  const [{ 0: systemInfo }, { 0: totalWeightedStartTimes }, { 0: acquiredLUSDInSP }, { 0: acquiredLUSDInCurve }, { 0: yTokensHeldByCBM }] = await multicall(multicallData, web3, network);
-  const payload = {
-    numPendingBonds: systemInfo.numPendingBonds,
-    numChickenInBonds: systemInfo.numChickenInBonds,
-    numChickenOutBonds: systemInfo.numChickenOutBonds,
-    accrualParameter: new Dec(assetAmountInEth(systemInfo.accrualParameter)).mul(1000).toString(),
-    bLUSDSupply: assetAmountInEth(systemInfo.bLUSDSupply, 'bLUSD'),
-    chickenInAMMFee: assetAmountInEth(systemInfo.chickenInAMMFee),
-    ownedLUSDInCurve: assetAmountInEth(systemInfo.ownedLUSDInCurve, 'LUSD'),
-    systemBackingRatio: assetAmountInEth(systemInfo.systemBackingRatio),
-    ownedLUSDInSP: assetAmountInEth(systemInfo.ownedLUSDInSP, 'LUSD'),
-    totalPendingLUSD: assetAmountInEth(systemInfo.totalPendingLUSD, 'LUSD'),
-    totalPermanentLUSD: assetAmountInEth(systemInfo.totalPermanentLUSD, 'LUSD'),
-    totalReserveLUSD: assetAmountInEth(systemInfo.totalReserveLUSD, 'LUSD'),
-    targetAverageAgeMs: 1296000000,
-    totalWeightedStartTimes: assetAmountInEth(totalWeightedStartTimes),
-    acquiredLUSDInSP: assetAmountInEth(acquiredLUSDInSP, 'LUSD'),
-    acquiredLUSDInCurve: assetAmountInEth(acquiredLUSDInCurve, 'LUSD'),
-    yTokensHeldByCBM: assetAmountInEth(yTokensHeldByCBM, 'ETH'), // yTokens is 18 decimals
-  };
-
-  const floorPrice = calcCBondsBLUSDFloorPrice(payload.bLUSDSupply, payload.totalReserveLUSD);
-  const averageBondAgeMs = calcAverageBondAgeMs(payload.totalWeightedStartTimes, payload.totalPendingLUSD);
-
-  return {
-    ...payload,
-    floorPrice,
-    averageBondAgeMs,
-  };
-};
-
-export const fetchCBondsForUser = async (web3: Web3, network: NetworkNumber, address: string): Promise<BondInfoBasic[]> => {
-  const cBondsView = ChickenBondsViewContract(web3, network);
-
-  const bonds = await cBondsView.methods.getUsersBonds(address).call();
-
-  return bonds.map(({
-    bondID, accruedBLUSD, claimedBLUSD, endTime, lusdAmount, maxAmountBLUSD, startTime, status, tokenURI,
-  }) => ({
-    bondId: bondID,
-    status,
-    tokenURI: decodeTokenURIToSvg(tokenURI),
-    startTime: new Date(+startTime * 1000),
-    endTime: new Date(+endTime * 1000),
-    accruedBLUSD: assetAmountInEth(accruedBLUSD, 'bLUSD'),
-    claimedBLUSD: assetAmountInEth(claimedBLUSD, 'bLUSD'),
-    lusdAmount: assetAmountInEth(lusdAmount, 'LUSD'),
-    maxAmountBLUSD: assetAmountInEth(maxAmountBLUSD, 'bLUSD'),
-  }));
-};
-
-export const fetchCBondForId = async (web3: Web3, network: NetworkNumber, bondId: string): Promise<BondInfoBasic> => {
-  const cBondsView = ChickenBondsViewContract(web3, network);
-
-  const bond = await cBondsView.methods.getBondFullInfo(bondId).call();
-
-  return {
-    bondId,
-    status: bond.status,
-    startTime: new Date(+bond.startTime * 1000),
-    endTime: new Date(+bond.endTime * 1000),
-    accruedBLUSD: assetAmountInEth(bond.accruedBLUSD, 'bLUSD'),
-    claimedBLUSD: assetAmountInEth(bond.claimedBLUSD, 'bLUSD'),
-    lusdAmount: assetAmountInEth(bond.lusdAmount, 'LUSD'),
-    maxAmountBLUSD: assetAmountInEth(bond.maxAmountBLUSD, 'bLUSD'),
-    tokenURI: decodeTokenURIToSvg(bond.tokenURI),
-  };
-};
+import Web3 from 'web3';
+import Dec from 'decimal.js';
+
+import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import {
+  Blockish, NetworkNumber, PositionBalances,
+} from '../types/common';
+
+import { ChickenBondsManagerContract, ChickenBondsViewContract } from '../contracts';
+import { BondInfoBasic, ChickenBondsSystemInfoBasic } from '../types';
+import { multicall } from '../multicall';
+import { calcAverageBondAgeMs, calcCBondsBLUSDFloorPrice, decodeTokenURIToSvg } from '../helpers/chickenBondsHelpers';
+
+export const getChickenBondsAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, bondId: string): Promise<PositionBalances> => {
+  const viewContract = ChickenBondsViewContract(web3, network, block);
+
+  const fullBondInfo = await viewContract.methods.getBondFullInfo(bondId).call({}, block);
+
+  return {
+    deposited: {
+      [addressMapping ? getAssetInfo('LUSD', network).address.toLowerCase() : 'LUSD']: fullBondInfo.lusdAmount,
+    },
+  };
+};
+
+export const fetchCBondsSystemInfo = async (web3: Web3, network: NetworkNumber): Promise<ChickenBondsSystemInfoBasic> => {
+  const cBondsView = ChickenBondsViewContract(web3, network);
+  const cBondsManager = ChickenBondsManagerContract(web3, network);
+  const multicallData = [
+    {
+      target: cBondsView.options.address,
+      abiItem: cBondsView.options.jsonInterface.find(({ name }) => name === 'getSystemInfo'),
+      params: [],
+    },
+    {
+      target: cBondsManager.options.address,
+      abiItem: cBondsManager.options.jsonInterface.find(({ name }) => name === 'totalWeightedStartTimes'),
+      params: [],
+    },
+    {
+      target: cBondsManager.options.address,
+      abiItem: cBondsManager.options.jsonInterface.find(({ name }) => name === 'getAcquiredLUSDInSP'),
+      params: [],
+    },
+    {
+      target: cBondsManager.options.address,
+      abiItem: cBondsManager.options.jsonInterface.find(({ name }) => name === 'getAcquiredLUSDInCurve'),
+      params: [],
+    },
+    {
+      target: cBondsManager.options.address,
+      abiItem: cBondsManager.options.jsonInterface.find(({ name }) => name === 'yTokensHeldByCBM'),
+      params: [],
+    },
+  ];
+  const [{ 0: systemInfo }, { 0: totalWeightedStartTimes }, { 0: acquiredLUSDInSP }, { 0: acquiredLUSDInCurve }, { 0: yTokensHeldByCBM }] = await multicall(multicallData, web3, network);
+  const payload = {
+    numPendingBonds: systemInfo.numPendingBonds,
+    numChickenInBonds: systemInfo.numChickenInBonds,
+    numChickenOutBonds: systemInfo.numChickenOutBonds,
+    accrualParameter: new Dec(assetAmountInEth(systemInfo.accrualParameter)).mul(1000).toString(),
+    bLUSDSupply: assetAmountInEth(systemInfo.bLUSDSupply, 'bLUSD'),
+    chickenInAMMFee: assetAmountInEth(systemInfo.chickenInAMMFee),
+    ownedLUSDInCurve: assetAmountInEth(systemInfo.ownedLUSDInCurve, 'LUSD'),
+    systemBackingRatio: assetAmountInEth(systemInfo.systemBackingRatio),
+    ownedLUSDInSP: assetAmountInEth(systemInfo.ownedLUSDInSP, 'LUSD'),
+    totalPendingLUSD: assetAmountInEth(systemInfo.totalPendingLUSD, 'LUSD'),
+    totalPermanentLUSD: assetAmountInEth(systemInfo.totalPermanentLUSD, 'LUSD'),
+    totalReserveLUSD: assetAmountInEth(systemInfo.totalReserveLUSD, 'LUSD'),
+    targetAverageAgeMs: 1296000000,
+    totalWeightedStartTimes: assetAmountInEth(totalWeightedStartTimes),
+    acquiredLUSDInSP: assetAmountInEth(acquiredLUSDInSP, 'LUSD'),
+    acquiredLUSDInCurve: assetAmountInEth(acquiredLUSDInCurve, 'LUSD'),
+    yTokensHeldByCBM: assetAmountInEth(yTokensHeldByCBM, 'ETH'), // yTokens is 18 decimals
+  };
+
+  const floorPrice = calcCBondsBLUSDFloorPrice(payload.bLUSDSupply, payload.totalReserveLUSD);
+  const averageBondAgeMs = calcAverageBondAgeMs(payload.totalWeightedStartTimes, payload.totalPendingLUSD);
+
+  return {
+    ...payload,
+    floorPrice,
+    averageBondAgeMs,
+  };
+};
+
+export const fetchCBondsForUser = async (web3: Web3, network: NetworkNumber, address: string): Promise<BondInfoBasic[]> => {
+  const cBondsView = ChickenBondsViewContract(web3, network);
+
+  const bonds = await cBondsView.methods.getUsersBonds(address).call();
+
+  return bonds.map(({
+    bondID, accruedBLUSD, claimedBLUSD, endTime, lusdAmount, maxAmountBLUSD, startTime, status, tokenURI,
+  }) => ({
+    bondId: bondID,
+    status,
+    tokenURI: decodeTokenURIToSvg(tokenURI),
+    startTime: new Date(+startTime * 1000),
+    endTime: new Date(+endTime * 1000),
+    accruedBLUSD: assetAmountInEth(accruedBLUSD, 'bLUSD'),
+    claimedBLUSD: assetAmountInEth(claimedBLUSD, 'bLUSD'),
+    lusdAmount: assetAmountInEth(lusdAmount, 'LUSD'),
+    maxAmountBLUSD: assetAmountInEth(maxAmountBLUSD, 'bLUSD'),
+  }));
+};
+
+export const fetchCBondForId = async (web3: Web3, network: NetworkNumber, bondId: string): Promise<BondInfoBasic> => {
+  const cBondsView = ChickenBondsViewContract(web3, network);
+
+  const bond = await cBondsView.methods.getBondFullInfo(bondId).call();
+
+  return {
+    bondId,
+    status: bond.status,
+    startTime: new Date(+bond.startTime * 1000),
+    endTime: new Date(+bond.endTime * 1000),
+    accruedBLUSD: assetAmountInEth(bond.accruedBLUSD, 'bLUSD'),
+    claimedBLUSD: assetAmountInEth(bond.claimedBLUSD, 'bLUSD'),
+    lusdAmount: assetAmountInEth(bond.lusdAmount, 'LUSD'),
+    maxAmountBLUSD: assetAmountInEth(bond.maxAmountBLUSD, 'bLUSD'),
+    tokenURI: decodeTokenURIToSvg(bond.tokenURI),
+  };
+};