@0xtorch/evm 0.0.30 → 0.0.31

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,

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

@@ -103,10 +103,12 @@ export {
 } from './getTransactionFull'
 export { isHex, parsedLogSchema, toLowerHex } from './types'
 export type {
+  Erc1155NftId,
   Erc1155Token,
   Erc1155Transfer,
   Erc20Token,
   Erc20Transfer,
+  Erc721NftId,
   Erc721Token,
   Erc721Transfer,
   EvmAccount,
@@ -121,8 +123,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.31",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",

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'