@0xtorch/evm 0.0.134 → 0.0.136

package/logic/getTransactionDetail/decodeTokenTransferLogs.ts

@@ -50,6 +50,14 @@ export const decodeTokenTransferLogs = (
   }
 }
 
+const erc20NftAddress = new Set<LowerHex>([
+  '0xf5b0a3efb8e8e4c201e2a935f110eaaf3ffecb8d',
+])
+
+const noIndexErc721Address = new Set<LowerHex>([
+  '0xda9f43015749056182352e9dc6d3ee0b6293d80a',
+])
+
 const decodeTokenTransferLog = (
   log: Log,
   wrappedTokenAddresses: Set<LowerHex>,
@@ -59,6 +67,16 @@ const decodeTokenTransferLog = (
   erc721Transfer?: Erc721Transfer
   erc1155Transfers?: Erc1155Transfer[]
 } => {
+  // ERC20 形式の NFT token の場合、別で処理する
+  if (erc20NftAddress.has(log.address)) {
+    return decodeErc20NftTransferLog(log)
+  }
+
+  // NoIndex ERC721 の場合、別で処理する
+  if (noIndexErc721Address.has(log.address)) {
+    return decodeNoIndexLog(log)
+  }
+
   // decode by ERC20
   const decodedByErc20 = decodeErc20TransferLog(log)
   if (decodedByErc20 !== undefined) {
@@ -106,6 +124,40 @@ const decodeTokenTransferLog = (
   return { log }
 }
 
+const decodeErc20NftTransferLog = (
+  log: Log,
+): {
+  log: Log
+  erc20Transfer?: Erc20Transfer
+  erc721Transfer?: Erc721Transfer
+  erc1155Transfers?: Erc1155Transfer[]
+} => {
+  // decode by ERC20 as ERC721
+  const decodedByErc20AsErc721 = decodeErc20TransferLogAsErc721Transfer(log)
+  if (decodedByErc20AsErc721 !== undefined) {
+    return decodedByErc20AsErc721
+  }
+
+  return { log }
+}
+
+const decodeNoIndexLog = (
+  log: Log,
+): {
+  log: Log
+  erc20Transfer?: Erc20Transfer
+  erc721Transfer?: Erc721Transfer
+  erc1155Transfers?: Erc1155Transfer[]
+} => {
+  // decode by NoIndex ERC721
+  const decodedByNoIndexTransfer = decodeNoIndexErc721TransferLog(log)
+  if (decodedByNoIndexTransfer !== undefined) {
+    return decodedByNoIndexTransfer
+  }
+
+  return { log }
+}
+
 const erc20TransferSignature =
   '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef'
 const erc20TransferIndexedCount = 2
@@ -161,6 +213,57 @@ const decodeErc20TransferLog = (
   }
 }
 
+const decodeErc20TransferLogAsErc721Transfer = (
+  log: Log,
+): { log: Log; erc721Transfer: Erc721Transfer } | undefined => {
+  if (
+    log.topics.length !== erc20TransferIndexedCount + 1 ||
+    log.topics[0] !== erc20TransferSignature ||
+    log.topics[1]?.slice(0, 26) !== '0x000000000000000000000000' ||
+    log.topics[2]?.slice(0, 26) !== '0x000000000000000000000000' ||
+    log.data.length !== 66
+  ) {
+    return undefined
+  }
+
+  const from = toLowerHex(`0x${log.topics[1].slice(26)}`)
+  const to = toLowerHex(`0x${log.topics[2].slice(26)}`)
+  const tokenId = BigInt(log.data)
+
+  log.eventName = 'Transfer'
+  log.args = [
+    {
+      indexed: true,
+      name: 'from',
+      type: 'address',
+      value: from,
+    },
+    {
+      indexed: true,
+      name: 'to',
+      type: 'address',
+      value: to,
+    },
+    {
+      indexed: true,
+      name: 'tokenId',
+      type: 'uint256',
+      value: tokenId,
+    },
+  ]
+
+  return {
+    log,
+    erc721Transfer: {
+      address: log.address,
+      logIndex: log.logIndex,
+      from,
+      to,
+      tokenId,
+    },
+  }
+}
+
 const wrappedTokenDepositSignature =
   '0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c'
 const wrappedTokenDepositIndexedCount = 1
@@ -392,6 +495,55 @@ const decodeErc721TransferLog = (
   }
 }
 
+const decodeNoIndexErc721TransferLog = (
+  log: Log,
+): { log: Log; erc721Transfer: Erc721Transfer } | undefined => {
+  if (
+    log.topics.length !== 1 ||
+    log.topics[0] !== erc721TransferSignature ||
+    log.data.length !== 192
+  ) {
+    return undefined
+  }
+
+  const from = toLowerHex(`0x${log.data.slice(26, 66)}`)
+  const to = toLowerHex(`0x${log.data.slice(90, 130)}`)
+  const tokenId = BigInt(log.data.slice(130))
+
+  log.eventName = 'Transfer'
+  log.args = [
+    {
+      indexed: true,
+      name: 'from',
+      type: 'address',
+      value: from,
+    },
+    {
+      indexed: true,
+      name: 'to',
+      type: 'address',
+      value: to,
+    },
+    {
+      indexed: true,
+      name: 'tokenId',
+      type: 'uint256',
+      value: tokenId,
+    },
+  ]
+
+  return {
+    log,
+    erc721Transfer: {
+      address: log.address,
+      logIndex: log.logIndex,
+      from,
+      to,
+      tokenId,
+    },
+  }
+}
+
 const erc1155TransferSingleSignature =
   '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62'
 const erc1155TransferSingleIndexedCount = 3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/evm",
-  "version": "0.0.134",
+  "version": "0.0.136",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",
@@ -38,9 +38,9 @@
   ],
   "dependencies": {
     "@0xtorch/big-decimal": "^0.0.14",
-    "@0xtorch/core": "^0.0.64",
+    "@0xtorch/core": "^0.0.65",
     "abitype": "^1.0.8",
-    "viem": "^2.29.2",
+    "viem": "^2.31.4",
     "zod": "^3.24.4"
   }
 }