diff --git a/bridge-aggregators/socket/index.ts b/bridge-aggregators/socket/index.ts index 5b880c1596..cb7012996e 100644 --- a/bridge-aggregators/socket/index.ts +++ b/bridge-aggregators/socket/index.ts @@ -1,7 +1,7 @@ import { Interface } from "ethers"; import { FetchOptions, FetchResultVolume, SimpleAdapter } from "../../adapters/types"; import { SocketVaults } from "./contracts"; -import { normalizeAddress } from "@defillama/sdk/build/util"; +import * as sdk from '@defillama/sdk' const SocketVaultAbis = { TokensDeposited: 'event TokensDeposited(address connector, address depositor, address receiver, uint256 depositAmount)', @@ -11,9 +11,11 @@ const SocketVaultAbis = { } export function getToken(chain: string, vaultAddress: string): string | null { + vaultAddress = sdk.util.normalizeAddress(vaultAddress) + if (SocketVaults[chain]) { for (const [vault, token] of Object.entries(SocketVaults[chain])) { - if (normalizeAddress(vault) === normalizeAddress(vaultAddress)) { + if (sdk.util.normalizeAddress(vault) === vaultAddress) { return token; } } diff --git a/cli/utils.ts b/cli/utils.ts index b98861c425..fd5638db2a 100644 --- a/cli/utils.ts +++ b/cli/utils.ts @@ -1,9 +1,8 @@ -import { getLatestBlock } from "@defillama/sdk/build/util"; import { SimpleAdapter, whitelistedDimensionKeys, } from "../adapters/types"; -import { humanizeNumber } from "@defillama/sdk/build/computeTVL/humanizeNumber"; - -import * as sdk from "@defillama/sdk" +import * as sdk from "@defillama/sdk" +const humanizeNumber = sdk.util.humanizeNumber; +const getLatestBlock = sdk.blocks.getLatestBlock; export const ERROR_STRING = '------ ERROR ------' export function checkArguments(argv: string[]) { diff --git a/dexs/kyo-fi-v3.ts b/dexs/kyo-fi-v3.ts index c58afd9511..9a4ce7a8a2 100644 --- a/dexs/kyo-fi-v3.ts +++ b/dexs/kyo-fi-v3.ts @@ -1,4 +1,4 @@ -import { sliceIntoChunks } from "@defillama/sdk/build/util"; +import * as sdk from '@defillama/sdk' import { FetchOptions, FetchResult, SimpleAdapter } from "../adapters/types"; import { CHAIN } from "../helpers/chains"; @@ -28,7 +28,7 @@ const fetch = async (_: any, _1: any, fetchOptions: FetchOptions): Promise => { const pools = await httpPost('https://aftermath.finance/api/pools', {}) const poolObjectIds = pools.map((pool: any) => pool.objectId) - const chunks = sliceIntoChunks(poolObjectIds, 42) + const chunks = sdk.util.sliceIntoChunks(poolObjectIds, 42) let i = 0 let dailyVolume = 0 let dailyFees = 0 diff --git a/fees/beraborrow/index.ts b/fees/beraborrow/index.ts index f0875bcae3..96c59db8c4 100644 --- a/fees/beraborrow/index.ts +++ b/fees/beraborrow/index.ts @@ -2,7 +2,9 @@ import { Interface, ZeroAddress } from "ethers"; import { FetchOptions, SimpleAdapter } from "../../adapters/types"; import { CHAIN } from "../../helpers/chains"; import BigNumber from "bignumber.js"; -import { normalizeAddress } from "@defillama/sdk/build/util"; +import * as sdk from '@defillama/sdk' + +const normalizeAddress = sdk.util.normalizeAddress; const TRANSFER_TOPIC = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef'; diff --git a/fees/jup-ape.ts b/fees/jup-ape.ts index 0848d24d2f..cec788c7c8 100644 --- a/fees/jup-ape.ts +++ b/fees/jup-ape.ts @@ -1,8 +1,6 @@ import { Dependencies, FetchOptions, SimpleAdapter } from "../adapters/types"; -// import { queryAllium } from "../helpers/allium"; import { queryDuneSql } from "../helpers/dune"; import { CHAIN } from "../helpers/chains"; -// import { getSolanaReceived } from "../helpers/token"; const JUP_FEE_RECEIVER = '5YET3YapxD6to6rqPqTWB3R9pSbURy6yduuUtoZkzoPX'; diff --git a/fees/resolv/index.ts b/fees/resolv/index.ts index 50aed788d0..373ddcf632 100644 --- a/fees/resolv/index.ts +++ b/fees/resolv/index.ts @@ -1,7 +1,8 @@ -import { getTokenTransfers } from "@defillama/sdk/build/util/indexer"; + import { FetchOptions, SimpleAdapter } from "../../adapters/types"; import { CHAIN } from "../../helpers/chains"; import { METRIC } from "../../helpers/metrics"; +import * as sdk from '@defillama/sdk' const USR = '0x66a1e37c9b0eaddca17d3662d6c05f4decf3e110'; const ST_USR = '0x6c8984bc7DBBeDAf4F6b2FD766f16eBB7d10AAb4'; @@ -38,7 +39,7 @@ const breakdownMethodology = { const getOtherRevenues = async (options: FetchOptions) => { const [fromBlock, toBlock] = await Promise.all([options.getStartBlock(), options.api.getBlock()]) - return getTokenTransfers({ + return sdk.indexer.getTokenTransfers({ chain: options.chain, target: FEE_COLLECTOR, fromAddressFilter: ADDRESSES_FROM, diff --git a/helpers/aave/index.ts b/helpers/aave/index.ts index 6c8d494824..fa2aa5c28c 100644 --- a/helpers/aave/index.ts +++ b/helpers/aave/index.ts @@ -2,7 +2,6 @@ import { BaseAdapter, FetchOptions, IStartTimestamp } from "../../adapters/types import * as sdk from "@defillama/sdk"; import AaveAbis from './abi'; import {decodeReserveConfig} from "./helper"; -import { normalizeAddress } from "@defillama/sdk/build/util"; import { METRIC } from '../../helpers/metrics'; export interface AaveLendingPoolConfig { @@ -167,7 +166,7 @@ export async function getPoolFees(pool: AaveLendingPoolConfig, options: FetchOpt protocolFee: number; }} = {} for (let i = 0; i < reservesList.length; i++) { - reserveLiquidationConfigs[normalizeAddress(reservesList[i])] = { + reserveLiquidationConfigs[sdk.util.normalizeAddress(reservesList[i])] = { bonus: Number(reserveConfigs[i].liquidationBonus), protocolFee: liquidationProtocolFees[i], } @@ -198,8 +197,8 @@ export async function getPoolFees(pool: AaveLendingPoolConfig, options: FetchOpt */ const e = Number(event.liquidatedCollateralAmount) - const x = reserveLiquidationConfigs[normalizeAddress(event.collateralAsset)].bonus / PercentageMathDecimals - const y = reserveLiquidationConfigs[normalizeAddress(event.collateralAsset)].protocolFee / PercentageMathDecimals + const x = reserveLiquidationConfigs[sdk.util.normalizeAddress(event.collateralAsset)].bonus / PercentageMathDecimals + const y = reserveLiquidationConfigs[sdk.util.normalizeAddress(event.collateralAsset)].protocolFee / PercentageMathDecimals // protocol fees from liquidation bonus const b = (e - e / x) diff --git a/helpers/alliumDex.ts b/helpers/alliumDex.ts index a3b95db2c5..67909371cd 100644 --- a/helpers/alliumDex.ts +++ b/helpers/alliumDex.ts @@ -1,4 +1,4 @@ -import { FetchOptions } from "../adapters/types" +import { Dependencies, FetchOptions } from "../adapters/types" import { queryAllium } from "./allium" import { CHAIN } from "./chains" @@ -21,6 +21,7 @@ export function alliumSolanaDexExport(dex_id: string, protocol: string, start: s } return { + dependencies: [Dependencies.ALLIUM], adapter: { [CHAIN.SOLANA]: { fetch, diff --git a/helpers/curve/helpers.ts b/helpers/curve/helpers.ts index 03e6c4be57..fce99c5099 100644 --- a/helpers/curve/helpers.ts +++ b/helpers/curve/helpers.ts @@ -1,4 +1,3 @@ -import { CallsParams } from "@defillama/sdk/build/types"; import { FetchOptions } from "../../adapters/types"; import { formatAddress } from "../../utils/utils"; @@ -154,7 +153,7 @@ export async function getAllPools(options: FetchOptions, config: ICurveDexConfig export async function getPoolTokens(options: FetchOptions, poolAddresses: Array, config: ICurveDexConfig): Promise<{[key: string]: IDexPool}> { const pools: {[key: string]: IDexPool} = {} - const coinsCalls: Array = [] + const coinsCalls: Array = [] for (const poolAddress of poolAddresses) { for (let i = 0; i < MAX_TOKENS_COUNT; i++) { coinsCalls.push({