@0xtorch/evm 0.0.30 → 0.0.32

package/decoder/decode.ts

@@ -23,7 +23,7 @@ import type {
   TransactionDecoded,
 } from '../types'
 import { parsedLogSchema, toLowerHex } from '../types'
-import { checkTimeout, createEvmCurrencyId, createEvmNftId } from '../utils'
+import { checkTimeout, createErc1155NftId, createEvmCurrencyId } from '../utils'
 import { parseErc1155TransferSingleLogs } from './parseErc1155TransferSingleLogs'
 import { parseErc20TransferLogs } from './parseErc20TransferLogs'
 import { parseErc721TransferLogs } from './parseErc721TransferLogs'
@@ -279,7 +279,7 @@ const getErcTransfers = (
             value: log.args.values[index],
             nft: {
               type: 'Nft',
-              id: createEvmNftId({
+              id: createErc1155NftId({
                 chainId: chain.id,
                 address: toLowerHex(log.address),
                 tokenId: id,
@@ -537,6 +537,7 @@ const getErc20Token = async (
         coingeckoId: coin?.id,
         marketCapUsd: undefined,
       },
+      priceDatasourceId: undefined,
       updatedAt: Date.now(),
     },
   }

package/decoder/parseErc1155TransferSingleLogs.ts

@@ -1,7 +1,7 @@
 import type { Log } from 'viem'
 import type { Erc1155Transfer } from '../types'
 import { toLowerHex } from '../types'
-import { createEvmNftId } from '../utils'
+import { createErc1155NftId } from '../utils'
 
 const transferSingleSignature =
   '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62'
@@ -35,7 +35,7 @@ export const parseErc1155TransferSingleLogs = (
         value: BigInt(`0x${log.data.slice(66, 130)}`),
         nft: {
           type: 'Nft',
-          id: createEvmNftId({
+          id: createErc1155NftId({
             chainId,
             address: toLowerHex(log.address),
             tokenId: id,

package/decoder/parseErc721TransferLogs.ts

@@ -1,7 +1,7 @@
 import type { Log } from 'viem'
 import type { Erc721Transfer, LowerHex } from '../types'
 import { toLowerHex } from '../types'
-import { createEvmNftId } from '../utils'
+import { createErc721NftId } from '../utils'
 
 const signature =
   '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef'
@@ -35,7 +35,7 @@ export const parseErc721TransferLogs = (
         tokenId,
         nft: {
           type: 'Nft',
-          id: createEvmNftId({
+          id: createErc721NftId({
             chainId,
             address: toLowerHex(log.address),
             tokenId,

package/index.ts

@@ -92,21 +92,15 @@ export {
   createRoninExplorer,
 } from './explorers'
 export type { Explorer } from './explorers'
-export {
-  getAccountsTransactionFulls,
-  getAccountsTransactionFullsCustom,
-} from './getAccountsTransactionFulls'
 export { getTransactionDetail } from './getTransactionDetail'
-export {
-  getTransactionFull,
-  getTransactionFullCustom,
-} from './getTransactionFull'
 export { isHex, parsedLogSchema, toLowerHex } from './types'
 export type {
+  Erc1155NftId,
   Erc1155Token,
   Erc1155Transfer,
   Erc20Token,
   Erc20Transfer,
+  Erc721NftId,
   Erc721Token,
   Erc721Transfer,
   EvmAccount,
@@ -121,8 +115,11 @@ export type {
   TransactionSource,
 } from './types'
 export {
+  createErc1155NftId,
+  createErc721NftId,
   createEvmActionSource,
   createEvmAddressId,
   createEvmCurrencyId,
-  createEvmNftId,
+  isErc1155NftId,
+  isErc721NftId,
 } from './utils'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/evm",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@0xtorch/big-decimal": "^0.0.10",
-    "@0xtorch/core": "^0.0.28",
+    "@0xtorch/core": "^0.0.29",
     "@supercharge/promise-pool": "^3.1.1",
     "viem": "^2.9.16",
     "zod": "^3.22.4"

package/types/erc1155.ts

@@ -15,3 +15,5 @@ export type Erc1155Transfer = {
   readonly value: bigint
   readonly nft: Nft
 }
+
+export type Erc1155NftId = `evm_1155_${number}_${LowerHex}_${bigint}`

package/types/erc721.ts

@@ -17,3 +17,5 @@ export type Erc721Transfer = {
   readonly tokenId: bigint
   readonly nft: Nft
 }
+
+export type Erc721NftId = `evm_721_${number}_${LowerHex}_${bigint}`

package/types/index.ts

@@ -1,6 +1,6 @@
-export type { Erc1155Token, Erc1155Transfer } from './erc1155'
+export type { Erc1155NftId, Erc1155Token, Erc1155Transfer } from './erc1155'
 export type { Erc20Token, Erc20Transfer } from './erc20'
-export type { Erc721Token, Erc721Transfer } from './erc721'
+export type { Erc721NftId, Erc721Token, Erc721Transfer } from './erc721'
 export type { EvmAccount } from './evmAccount'
 export { isHex, toLowerHex } from './hex'
 export type { Hex, LowerHex } from './hex'

package/utils/create.ts

@@ -1,4 +1,4 @@
-import type { Hex, LowerHex } from '../types'
+import type { Erc1155NftId, Erc721NftId, Hex, LowerHex } from '../types'
 import { isHex, toLowerHex } from '../types'
 
 type CreateEvmAddressIdParameters = {
@@ -35,7 +35,7 @@ export const createEvmCurrencyId = ({
   readonly address: LowerHex
 }): `evm_${number}_0x${Lowercase<string>}` => `evm_${chainId}_${address}`
 
-export const createEvmNftId = ({
+export const createErc721NftId = ({
   chainId,
   address,
   tokenId,
@@ -43,8 +43,23 @@ export const createEvmNftId = ({
   readonly chainId: number
   readonly address: LowerHex
   tokenId: bigint
-}): `evm_${number}_0x${Lowercase<string>}_${bigint}` =>
-  `evm_${chainId}_${address}_${tokenId}`
+}): Erc721NftId => `evm_721_${chainId}_${address}_${tokenId}`
+
+export const isErc721NftId = (value: string): value is Erc721NftId =>
+  /^evm_721_\d+_0x[\dA-Fa-f]{40}_\d+$/.test(value)
+
+export const createErc1155NftId = ({
+  chainId,
+  address,
+  tokenId,
+}: {
+  readonly chainId: number
+  readonly address: LowerHex
+  tokenId: bigint
+}): Erc1155NftId => `evm_1155_${chainId}_${address}_${tokenId}`
+
+export const isErc1155NftId = (value: string): value is Erc1155NftId =>
+  /^evm_1155_\d+_0x[\dA-Fa-f]{40}_\d+$/.test(value)
 
 export const getEvmAddressDataOfEvmAddressId = (
   id: string,

package/utils/index.ts

@@ -1,9 +1,12 @@
 export { bigIntMax, bigIntMin } from './bigint'
 export {
+  createErc1155NftId,
+  createErc721NftId,
   createEvmActionSource,
   createEvmAddressId,
   createEvmCurrencyId,
-  createEvmNftId,
+  isErc1155NftId,
+  isErc721NftId,
 } from './create'
 export { checkTimeout } from './timeout'
 export type { Prettify } from './types'

package/getAccountsTransactionFulls/getAccountsTransactionFulls.ts

@@ -1,46 +0,0 @@
-import type { Config, FiatCurrency } from '@0xtorch/core'
-import { coingeckoCryptoCurrencyDataSource, usd } from '@0xtorch/core'
-import { analyzer } from '../analyzer'
-import type { Chain } from '../chains'
-import { decoder } from '../decoder'
-import type { LowerHex } from '../types'
-import { getAccountsTransactionFullsCustom } from './getAccountsTransactionFullsCustom'
-
-type GetAccountsTransactionFullsParameters = {
-  readonly chain: Chain
-  readonly addresses: readonly LowerHex[]
-  readonly fromBlock: bigint
-  readonly toBlock: bigint
-  readonly fiat?: FiatCurrency
-  readonly onFetchHashes?: (hashes: readonly LowerHex[]) => void
-  readonly onFetchTransaction?: (hash: LowerHex) => void
-}
-
-export const getAccountsTransactionFulls = async (
-  {
-    chain,
-    addresses,
-    fromBlock,
-    toBlock,
-    fiat = usd,
-    onFetchHashes,
-    onFetchTransaction,
-  }: GetAccountsTransactionFullsParameters,
-  config?: Config,
-) =>
-  await getAccountsTransactionFullsCustom(
-    {
-      chain,
-      addresses,
-      fromBlock,
-      toBlock,
-      appDataSource: undefined,
-      priceDataSource: coingeckoCryptoCurrencyDataSource,
-      fiat,
-      decoder,
-      analyzer,
-      onFetchHashes,
-      onFetchTransaction,
-    },
-    config,
-  )

package/getAccountsTransactionFulls/getAccountsTransactionFullsCustom.ts

@@ -1,106 +0,0 @@
-import type { Config } from '@0xtorch/core'
-import type {
-  GetAccountsTransactionFullsCustomParameters,
-  GetAccountsTransactionFullsCustomParametersAllUndefined,
-  GetAccountsTransactionFullsCustomParametersD,
-  GetAccountsTransactionFullsCustomParametersDA,
-  GetAccountsTransactionFullsCustomParametersP,
-  GetAccountsTransactionFullsCustomParametersPD,
-  GetAccountsTransactionFullsCustomParametersPDA,
-  GetAccountsTransactionFullsCustomReturnType,
-} from './types'
-import { getAccountsTransactionFullsCustomWithD } from './withD'
-import { getAccountsTransactionFullsCustomWithDA } from './withDA'
-import { getAccountsTransactionFullsCustomWithP } from './withP'
-import { getAccountsTransactionFullsCustomWithPD } from './withPD'
-import { getAccountsTransactionFullsCustomWithPDA } from './withPDA'
-import { getAccountsTransactionFullsCustomWithAllUndefined } from './withUndefined'
-
-export const getAccountsTransactionFullsCustom = async <
-  T extends GetAccountsTransactionFullsCustomParameters,
->(
-  parameters: T,
-  config?: Config,
-): Promise<GetAccountsTransactionFullsCustomReturnType<T>> => {
-  if (isParametersAllUndefined(parameters)) {
-    const data = await getAccountsTransactionFullsCustomWithAllUndefined(
-      parameters,
-      config,
-    )
-    return data as GetAccountsTransactionFullsCustomReturnType<T>
-  }
-  if (isParametersP(parameters)) {
-    const data = await getAccountsTransactionFullsCustomWithP(
-      parameters,
-      config,
-    )
-    return data as GetAccountsTransactionFullsCustomReturnType<T>
-  }
-  if (isParametersPD(parameters)) {
-    const data = await getAccountsTransactionFullsCustomWithPD(
-      parameters,
-      config,
-    )
-    return data as GetAccountsTransactionFullsCustomReturnType<T>
-  }
-  if (isParametersPDA(parameters)) {
-    const data = await getAccountsTransactionFullsCustomWithPDA(
-      parameters,
-      config,
-    )
-    return data as GetAccountsTransactionFullsCustomReturnType<T>
-  }
-  if (isParametersD(parameters)) {
-    const data = await getAccountsTransactionFullsCustomWithD(
-      parameters,
-      config,
-    )
-    return data as GetAccountsTransactionFullsCustomReturnType<T>
-  }
-  if (isParametersDA(parameters)) {
-    const data = await getAccountsTransactionFullsCustomWithDA(
-      parameters,
-      config,
-    )
-    return data as GetAccountsTransactionFullsCustomReturnType<T>
-  }
-  throw new Error('not implemented')
-}
-
-const isParametersAllUndefined = (
-  parameters: GetAccountsTransactionFullsCustomParameters,
-): parameters is GetAccountsTransactionFullsCustomParametersAllUndefined =>
-  parameters.priceDataSource === undefined && parameters.decoder === undefined
-
-const isParametersP = (
-  parameters: GetAccountsTransactionFullsCustomParameters,
-): parameters is GetAccountsTransactionFullsCustomParametersP =>
-  parameters.priceDataSource !== undefined && parameters.decoder === undefined
-
-const isParametersPD = (
-  parameters: GetAccountsTransactionFullsCustomParameters,
-): parameters is GetAccountsTransactionFullsCustomParametersPD =>
-  parameters.priceDataSource !== undefined &&
-  parameters.decoder !== undefined &&
-  parameters.analyzer === undefined
-
-const isParametersPDA = (
-  parameters: GetAccountsTransactionFullsCustomParameters,
-): parameters is GetAccountsTransactionFullsCustomParametersPDA =>
-  parameters.priceDataSource !== undefined &&
-  parameters.decoder !== undefined &&
-  parameters.analyzer !== undefined
-
-const isParametersD = (
-  parameters: GetAccountsTransactionFullsCustomParameters,
-): parameters is GetAccountsTransactionFullsCustomParametersD =>
-  parameters.priceDataSource === undefined &&
-  parameters.decoder !== undefined &&
-  parameters.analyzer === undefined
-
-const isParametersDA = (
-  parameters: GetAccountsTransactionFullsCustomParameters,
-): parameters is GetAccountsTransactionFullsCustomParametersDA =>
-  parameters.priceDataSource === undefined &&
-  parameters.decoder !== undefined &&
-  parameters.analyzer !== undefined

package/getAccountsTransactionFulls/getDecodedTransactionsPrices.ts

@@ -1,97 +0,0 @@
-import type {
-  Config,
-  CryptoCurrency,
-  CryptoCurrencyDataSource,
-  CryptoCurrencyPrice,
-  FiatCurrency,
-} from '@0xtorch/core'
-import type { Chain } from '../chains'
-import type { TransactionDecoded } from '../types'
-
-export const getDecodedTransactionsPrices = async (
-  chain: Chain,
-  priceDataSource: CryptoCurrencyDataSource,
-  fiat: FiatCurrency,
-  transactions: readonly TransactionDecoded<undefined>[],
-  config?: Config,
-): Promise<readonly CryptoCurrencyPrice[]> => {
-  const timeoutTimestamp =
-    Date.now() + (config?.timeout === undefined ? 60_000 : config.timeout)
-
-  // create currency timestamp range
-  const mut_currencyTimestamps: {
-    readonly currency: CryptoCurrency
-    minTimestamp: number
-    maxTimestamp: number
-  }[] = []
-  for (const transaction of transactions) {
-    const timestampMs = Number(transaction.block.timestamp) * 1000
-
-    // native token currency
-    const mut_nativeCurrency = mut_currencyTimestamps.find(
-      ({ currency }) => currency.id === chain.nativeToken.currency.id,
-    )
-    if (mut_nativeCurrency === undefined) {
-      mut_currencyTimestamps.push({
-        currency: chain.nativeToken.currency,
-        minTimestamp: timestampMs,
-        maxTimestamp: timestampMs,
-      })
-    } else {
-      mut_nativeCurrency.minTimestamp = Math.min(
-        mut_nativeCurrency.minTimestamp,
-        timestampMs,
-      )
-      mut_nativeCurrency.maxTimestamp = Math.max(
-        mut_nativeCurrency.maxTimestamp,
-        timestampMs,
-      )
-    }
-
-    // erc20 token currency
-    for (const { token } of transaction.erc20Transfers) {
-      if (token.currency.market.coingeckoId === undefined) {
-        continue
-      }
-      const mut_currency = mut_currencyTimestamps.find(
-        ({ currency }) => currency.id === token.currency.id,
-      )
-      if (mut_currency === undefined) {
-        mut_currencyTimestamps.push({
-          currency: token.currency,
-          minTimestamp: timestampMs,
-          maxTimestamp: timestampMs,
-        })
-      } else {
-        mut_currency.minTimestamp = Math.min(
-          mut_currency.minTimestamp,
-          timestampMs,
-        )
-        mut_currency.maxTimestamp = Math.max(
-          mut_currency.maxTimestamp,
-          timestampMs,
-        )
-      }
-    }
-  }
-
-  // get token price
-  const mut_prices: CryptoCurrencyPrice[] = []
-  for (const currencyTimestamp of mut_currencyTimestamps) {
-    const prices = await priceDataSource.getHistoricalPrices(
-      {
-        targetCurrencies: [currencyTimestamp.currency],
-        vsCurrency: fiat,
-        from: currencyTimestamp.minTimestamp - 1000 * 60 * 60,
-        to: currencyTimestamp.maxTimestamp + 1000 * 60 * 60,
-      },
-      {
-        timeout: timeoutTimestamp - Date.now(),
-        logger: config?.logger,
-      },
-    )
-    mut_prices.push(...prices)
-  }
-
-  return mut_prices
-}

package/getAccountsTransactionFulls/getHashesAndInternalTxs.ts

@@ -1,65 +0,0 @@
-import type { Config } from '@0xtorch/core'
-import type { Chain } from '../chains'
-import type { Hex, InternalTransaction, LowerHex } from '../types'
-import { checkTimeout } from '../utils'
-
-export const getHashesAndInternalTxs = async (
-  chain: Chain,
-  addresses: readonly LowerHex[],
-  fromBlock: bigint,
-  toBlock: bigint,
-  config?: Config,
-): Promise<{
-  readonly hashes: readonly Hex[]
-  readonly internalTransactions: readonly InternalTransaction<undefined>[]
-}> => {
-  const timeoutTimestamp =
-    Date.now() + (config?.timeout === undefined ? 60_000 : config.timeout)
-
-  const mut_internalTransactions: InternalTransaction<undefined>[] = []
-  const hashSet = new Set<Hex>()
-  for (const address of addresses) {
-    const normalTxHashes = await chain.explorer.getAddressTransactionHashes({
-      address,
-      startBlock: fromBlock,
-      endBlock: toBlock,
-      logger: config?.logger,
-    })
-    checkTimeout(timeoutTimestamp)
-
-    for (const hash of normalTxHashes) {
-      hashSet.add(hash)
-    }
-    const transferTxHashes = await chain.explorer.getAddressTokenTransferHashes(
-      {
-        address,
-        startBlock: fromBlock,
-        endBlock: toBlock,
-        logger: config?.logger,
-      },
-    )
-    checkTimeout(timeoutTimestamp)
-
-    for (const hash of transferTxHashes) {
-      hashSet.add(hash)
-    }
-    const internalTransactions =
-      await chain.explorer.getAddressInternalTransactions({
-        address,
-        startBlock: fromBlock,
-        endBlock: toBlock,
-        nativeCurrency: chain.nativeToken.currency,
-        logger: config?.logger,
-      })
-    checkTimeout(timeoutTimestamp)
-
-    for (const internalTransaction of internalTransactions) {
-      mut_internalTransactions.push(internalTransaction)
-      hashSet.add(internalTransaction.transactionHash)
-    }
-  }
-  return {
-    hashes: [...hashSet],
-    internalTransactions: mut_internalTransactions,
-  }
-}

package/getAccountsTransactionFulls/getTransactionDetails.ts

@@ -1,41 +0,0 @@
-import type { Config } from '@0xtorch/core'
-import { PromisePool } from '@supercharge/promise-pool'
-import type { Chain } from '../chains'
-import { getTransactionDetail } from '../getTransactionDetail'
-import type { Hex, InternalTransaction, TransactionDetail } from '../types'
-import { toLowerHex } from '../types'
-
-export const getTransactionDetails = async (
-  chain: Chain,
-  hashes: readonly Hex[],
-  internalTransactions: readonly InternalTransaction<undefined>[],
-  onFetchTransaction: ((hash: `0x${Lowercase<string>}`) => void) | undefined,
-  config?: Config,
-): Promise<readonly TransactionDetail[]> => {
-  const mut_transactions: TransactionDetail[] = []
-
-  const { errors } = await PromisePool.for(hashes)
-    .withConcurrency(chain.client.httpRpcCount)
-    .process(async (hash) => {
-      const transactionDetail = await getTransactionDetail(
-        {
-          chain,
-          hash,
-          internalTransactions: internalTransactions.filter(
-            ({ transactionHash }) => transactionHash === hash,
-          ),
-        },
-        config,
-      )
-      if (onFetchTransaction !== undefined) {
-        onFetchTransaction(toLowerHex(hash))
-      }
-      mut_transactions.push(transactionDetail)
-    })
-
-  if (errors.length > 0) {
-    throw errors[0]
-  }
-
-  return mut_transactions
-}

package/getAccountsTransactionFulls/getTransactionsApps.ts

@@ -1,42 +0,0 @@
-import type { App, Config } from '@0xtorch/core'
-import type { AppDataSource } from '../apps'
-import type { LowerHex, TransactionDetail } from '../types'
-import { toLowerHex } from '../types'
-
-export const getTransactionsApps = async (
-  appDataSource: AppDataSource | undefined,
-  transactionos: readonly TransactionDetail[],
-  config?: Config,
-): Promise<
-  {
-    readonly address: LowerHex
-    readonly app: App | undefined
-  }[]
-> => {
-  if (transactionos.length === 0) {
-    return []
-  }
-  const { chainId } = transactionos[0]
-
-  // to addresses
-  const toAddresses = [
-    ...new Set(
-      transactionos
-        .map(({ to }) => (to === null ? undefined : toLowerHex(to)))
-        .filter((toAddress): toAddress is LowerHex => toAddress !== undefined),
-    ),
-  ]
-
-  const apps = await Promise.all(
-    toAddresses.map((toAddress) =>
-      appDataSource === undefined
-        ? undefined
-        : appDataSource.getApp(chainId, toAddress, config),
-    ),
-  )
-
-  return toAddresses.map((address, index) => ({
-    address,
-    app: apps[index],
-  }))
-}

package/getAccountsTransactionFulls/index.ts

@@ -1,2 +0,0 @@
-export { getAccountsTransactionFulls } from './getAccountsTransactionFulls'
-export { getAccountsTransactionFullsCustom } from './getAccountsTransactionFullsCustom'