@0xtorch/evm 0.0.29 → 0.0.31

package/_types/utils/create.d.ts

@@ -1,4 +1,4 @@
-import type { Hex, LowerHex } from '../types';
+import type { Erc1155NftId, Erc721NftId, Hex, LowerHex } from '../types';
 type CreateEvmAddressIdParameters = {
     readonly chainId: number;
     readonly address: LowerHex;
@@ -17,11 +17,18 @@ export declare const createEvmCurrencyId: ({ chainId, address, }: {
     readonly chainId: number;
     readonly address: LowerHex;
 }) => `evm_${number}_0x${Lowercase<string>}`;
-export declare const createEvmNftId: ({ chainId, address, tokenId, }: {
+export declare const createErc721NftId: ({ chainId, address, tokenId, }: {
     readonly chainId: number;
     readonly address: LowerHex;
     tokenId: bigint;
-}) => `evm_${number}_0x${Lowercase<string>}_${bigint}`;
+}) => Erc721NftId;
+export declare const isErc721NftId: (value: string) => value is `evm_721_${number}_0x${Lowercase<string>}_${bigint}`;
+export declare const createErc1155NftId: ({ chainId, address, tokenId, }: {
+    readonly chainId: number;
+    readonly address: LowerHex;
+    tokenId: bigint;
+}) => Erc1155NftId;
+export declare const isErc1155NftId: (value: string) => value is `evm_1155_${number}_0x${Lowercase<string>}_${bigint}`;
 export declare const getEvmAddressDataOfEvmAddressId: (id: string) => GetEvmAddressDataOfEvmAddressIdReturnType;
 type IncludesEvmAddressIdParameters = {
     readonly addresses: readonly LowerHex[];

package/_types/utils/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../utils/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAG7C,KAAK,4BAA4B,GAAG;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,kBAAkB,0BAG5B,4BAA4B,WAAwC,CAAA;AAEvE,KAAK,+BAA+B,GAAG;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,qBAAqB,kCAG/B,+BAA+B,WACe,CAAA;AAEjD,KAAK,yCAAyC,GAAG;IAC/C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,mBAAmB;sBAIZ,MAAM;sBACN,QAAQ;MACxB,OAAO,MAAM,MAAM,UAAU,MAAM,CAAC,EAAiC,CAAA;AAEzE,eAAO,MAAM,cAAc;sBAKP,MAAM;sBACN,QAAQ;aACjB,MAAM;MACb,OAAO,MAAM,MAAM,UAAU,MAAM,CAAC,IAAI,MAAM,EACV,CAAA;AAExC,eAAO,MAAM,+BAA+B,OACtC,MAAM,KACT,yCASF,CAAA;AAED,KAAK,8BAA8B,GAAG;IACpC,QAAQ,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,CAAA;IACvC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,oBAAoB,uBAG9B,8BAA8B,YAMhC,CAAA"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../utils/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGxE,KAAK,4BAA4B,GAAG;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,kBAAkB,0BAG5B,4BAA4B,WAAwC,CAAA;AAEvE,KAAK,+BAA+B,GAAG;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,qBAAqB,kCAG/B,+BAA+B,WACe,CAAA;AAEjD,KAAK,yCAAyC,GAAG;IAC/C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,mBAAmB;sBAIZ,MAAM;sBACN,QAAQ;MACxB,OAAO,MAAM,MAAM,UAAU,MAAM,CAAC,EAAiC,CAAA;AAEzE,eAAO,MAAM,iBAAiB;sBAKV,MAAM;sBACN,QAAQ;aACjB,MAAM;MACb,WAAyD,CAAA;AAE7D,eAAO,MAAM,aAAa,UAAW,MAAM,kEACO,CAAA;AAElD,eAAO,MAAM,kBAAkB;sBAKX,MAAM;sBACN,QAAQ;aACjB,MAAM;MACb,YAA2D,CAAA;AAE/D,eAAO,MAAM,cAAc,UAAW,MAAM,mEACO,CAAA;AAEnD,eAAO,MAAM,+BAA+B,OACtC,MAAM,KACT,yCASF,CAAA;AAED,KAAK,8BAA8B,GAAG;IACpC,QAAQ,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,CAAA;IACvC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,oBAAoB,uBAG9B,8BAA8B,YAMhC,CAAA"}

package/_types/utils/index.d.ts

@@ -1,5 +1,5 @@
 export { bigIntMax, bigIntMin } from './bigint';
-export { createEvmActionSource, createEvmAddressId, createEvmCurrencyId, createEvmNftId, } from './create';
+export { createErc1155NftId, createErc721NftId, createEvmActionSource, createEvmAddressId, createEvmCurrencyId, isErc1155NftId, isErc721NftId, } from './create';
 export { checkTimeout } from './timeout';
 export type { Prettify } from './types';
 //# sourceMappingURL=index.d.ts.map

package/_types/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,GACf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,EACd,aAAa,GACd,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}

package/analyzer/json/components/targetAsset.ts

@@ -2,7 +2,7 @@ import type { CryptoCurrencyPrice, Nft } from '@0xtorch/core'
 import type { Chain } from '../../../chains'
 import type { LowerHex, TransactionDecoded } from '../../../types'
 import { isHex, toLowerHex } from '../../../types'
-import { createEvmNftId } from '../../../utils'
+import { createErc1155NftId, createErc721NftId } from '../../../utils'
 import type { Target, TargetAssetComponent } from '../types'
 import { getErc1155Component } from './erc1155'
 import { getLogArgumentComponent } from './logArgument'
@@ -124,11 +124,15 @@ export const createTargetAssetByTargetAssetComponent = <
       }
       return {
         type: 'Nft',
-        id: createEvmNftId({ chainId: chain.id, address, tokenId }),
+        id:
+          component.tokenType === 'erc721'
+            ? createErc721NftId({ chainId: chain.id, address, tokenId })
+            : createErc1155NftId({ chainId: chain.id, address, tokenId }),
         name: undefined,
         symbol: undefined,
         image: undefined,
         metadata: undefined,
+        updatedAt: 0,
       }
     }
   }

package/analyzer/json/schemas/generator.ts

@@ -386,6 +386,7 @@ export const targetAssetComponentSchema = z.union([
       // log
       logArgumentComponentSchema,
     ]),
+    tokenType: z.union([z.literal('erc721'), z.literal('erc1155')]),
     tokenId: z.union([
       z.bigint(),
       // erc1155

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,
@@ -288,6 +288,7 @@ const getErcTransfers = (
               symbol: undefined,
               image: undefined,
               metadata: undefined,
+              updatedAt: 0,
             },
           }),
         ),

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,
@@ -44,6 +44,7 @@ export const parseErc1155TransferSingleLogs = (
           symbol: undefined,
           image: undefined,
           metadata: undefined,
+          updatedAt: 0,
         },
       }
     })

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,
@@ -44,6 +44,7 @@ export const parseErc721TransferLogs = (
           symbol: undefined,
           image: undefined,
           metadata: undefined,
+          updatedAt: 0,
         },
       }
     })

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.29",
+  "version": "0.0.31",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@0xtorch/big-decimal": "^0.0.10",
-    "@0xtorch/core": "^0.0.27",
+    "@0xtorch/core": "^0.0.28",
     "@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'