@defisaver/positions-sdk 2.1.52 → 2.1.53-aave-v4

package/src/services/utils.ts

@@ -1,116 +1,116 @@
-import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { NetworkNumber } from '../types/common';
-
-export const isLayer2Network = (networkId: NetworkNumber) => [NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Linea, NetworkNumber.Plasma].includes(+networkId);
-
-export const addToObjectIf = (condition: any, item: any) => (condition ? item : {});
-
-
-export const addToArrayIf = (condition: any, ...items: any[]) => (condition ? items : []);
-
-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 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
-
-/**
- * Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
- * @param value
- */
-export const convertHybridArraysToObjects = (value: any): any => {
-  if (Array.isArray(value)) {
-    const keys = Object.keys(value);
-    const hasNamedKeys = keys.some((key) => Number.isNaN(Number(key)));
-
-    // If array has named keys, treat it as an object and keep only those
-    if (hasNamedKeys) {
-      const result: Record<string, any> = {};
-      for (const [key, val] of Object.entries(value)) {
-        if (Number.isNaN(Number(key))) {
-          result[key] = convertHybridArraysToObjects(val);
-        }
-      }
-      return result;
-    }
-
-    // Else, treat as a regular array
-    return value.map(convertHybridArraysToObjects);
-  }
-
-  // If it's an object (but not an array), recurse into its values
-  if (value && typeof value === 'object') {
-    const result: Record<string, any> = {};
-    for (const [key, val] of Object.entries(value)) {
-      result[key] = convertHybridArraysToObjects(val);
-    }
-    return result;
-  }
-
-  return value;
-};
-
-export const ethToWeth = (maybeEth: string) => maybeEth?.replace(/^ETH$/, 'WETH');
-
-export const wethToEth = (maybeWeth: string) => maybeWeth?.replace(/^WETH$/, 'ETH');
-
-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 xplToWxpl = (maybeXpl: string) => maybeXpl?.replace(/^XPL$/, 'WXPL');
-
-export const wxplToXpl = (maybeWxpl: string) => maybeWxpl?.replace(/^WXPL$/, 'XPL');
-
-export const getWrappedNativeAssetFromUnwrapped = (symbol: string) => {
-  if (symbol === 'ETH') return 'WETH';
-  if (symbol === 'XPL') return 'WXPL';
-  return symbol;
-};
-
-export const getNativeAssetFromWrapped = (symbol: string) => {
-  if (symbol === 'WETH') return 'ETH';
-  if (symbol === 'WXPL') return 'XPL';
-  return symbol;
+import Dec from 'decimal.js';
+import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { NetworkNumber } from '../types/common';
+
+export const isLayer2Network = (networkId: NetworkNumber) => [NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Linea, NetworkNumber.Plasma].includes(+networkId);
+
+export const addToObjectIf = (condition: any, item: any) => (condition ? item : {});
+
+
+export const addToArrayIf = (condition: any, ...items: any[]) => (condition ? items : []);
+
+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 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
+
+/**
+ * Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
+ * @param value
+ */
+export const convertHybridArraysToObjects = (value: any): any => {
+  if (Array.isArray(value)) {
+    const keys = Object.keys(value);
+    const hasNamedKeys = keys.some((key) => Number.isNaN(Number(key)));
+
+    // If array has named keys, treat it as an object and keep only those
+    if (hasNamedKeys) {
+      const result: Record<string, any> = {};
+      for (const [key, val] of Object.entries(value)) {
+        if (Number.isNaN(Number(key))) {
+          result[key] = convertHybridArraysToObjects(val);
+        }
+      }
+      return result;
+    }
+
+    // Else, treat as a regular array
+    return value.map(convertHybridArraysToObjects);
+  }
+
+  // If it's an object (but not an array), recurse into its values
+  if (value && typeof value === 'object') {
+    const result: Record<string, any> = {};
+    for (const [key, val] of Object.entries(value)) {
+      result[key] = convertHybridArraysToObjects(val);
+    }
+    return result;
+  }
+
+  return value;
+};
+
+export const ethToWeth = (maybeEth: string) => maybeEth?.replace(/^ETH$/, 'WETH');
+
+export const wethToEth = (maybeWeth: string) => maybeWeth?.replace(/^WETH$/, 'ETH');
+
+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 xplToWxpl = (maybeXpl: string) => maybeXpl?.replace(/^XPL$/, 'WXPL');
+
+export const wxplToXpl = (maybeWxpl: string) => maybeWxpl?.replace(/^WXPL$/, 'XPL');
+
+export const getWrappedNativeAssetFromUnwrapped = (symbol: string) => {
+  if (symbol === 'ETH') return 'WETH';
+  if (symbol === 'XPL') return 'WXPL';
+  return symbol;
+};
+
+export const getNativeAssetFromWrapped = (symbol: string) => {
+  if (symbol === 'WETH') return 'ETH';
+  if (symbol === 'WXPL') return 'XPL';
+  return symbol;
 };

package/src/services/viem.ts

@@ -1,57 +1,57 @@
-import {
-  createPublicClient,
-  custom,
-  encodeFunctionData,
-  type Abi,
-} from 'viem';
-import {
-  arbitrum, base, mainnet, optimism, linea, plasma,
-} 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;
-    case NetworkNumber.Linea:
-      return linea;
-    case NetworkNumber.Plasma:
-      return plasma;
-    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) };
-};
-
-/**
- * Utility function to return callData
- * Useful for Tenderly simulation
- *
- * @param contract
- * @param functionName
- * @param args
- */
-export function encodeCalldata(
-  contract: { abi: Abi },
-  functionName: string,
-  args?: readonly unknown[],
-): `0x${string}` {
-  const callDescriptor = { abi: contract.abi, functionName } as const;
-  return encodeFunctionData((args ? { ...callDescriptor, args } : callDescriptor) as any);
-}
+import {
+  createPublicClient,
+  custom,
+  encodeFunctionData,
+  type Abi,
+} from 'viem';
+import {
+  arbitrum, base, mainnet, optimism, linea, plasma,
+} 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;
+    case NetworkNumber.Linea:
+      return linea;
+    case NetworkNumber.Plasma:
+      return plasma;
+    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) };
+};
+
+/**
+ * Utility function to return callData
+ * Useful for Tenderly simulation
+ *
+ * @param contract
+ * @param functionName
+ * @param args
+ */
+export function encodeCalldata(
+  contract: { abi: Abi },
+  functionName: string,
+  args?: readonly unknown[],
+): `0x${string}` {
+  const callDescriptor = { abi: contract.abi, functionName } as const;
+  return encodeFunctionData((args ? { ...callDescriptor, args } : callDescriptor) as any);
+}

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,
+});