@0xtorch/evm 0.0.73 → 0.0.75

package/logic/analyzeTransaction/createActions/spam.ts

@@ -3,24 +3,27 @@ import {
   type Transfer,
   checkIfActionsIsValid,
 } from '@0xtorch/core'
+import type { LowerHex } from '../../../types'
 import type { TransactionDecoded } from '../../../types/transactionDecoded'
 import { containsUrlOrDomain } from './utils/containsUrlOrDomain'
 
 type CreateActionsBySpamAnalyzerParameters = {
-  transaction: TransactionDecoded
-  transfers: readonly Transfer[]
-  accountIds: Set<string>
-  source: string
+  readonly transaction: TransactionDecoded
+  readonly transfers: readonly Transfer[]
+  readonly relatedAddresses: Set<LowerHex>
+  readonly accountIds: Set<string>
+  readonly source: string
 }
 
 export const createActionsBySpamAnalyzer = ({
   transaction,
   transfers,
+  relatedAddresses,
   accountIds,
   source,
 }: CreateActionsBySpamAnalyzerParameters): readonly Action[] | undefined => {
-  // accountIds に transaction.from が含まれている場合、 spam とは判定しない
-  if (accountIds.has(transaction.from.address)) {
+  // related addresses に transaction.from が含まれている場合、 spam とは判定しない
+  if (relatedAddresses.has(transaction.from.address)) {
     return undefined
   }
 

package/logic/analyzeTransaction/createActions/tests/tx-1-0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128.json

@@ -0,0 +1,383 @@
+{
+  "blockNumber": 20861299,
+  "chainId": 1,
+  "effectiveGasPrice": "5612328002",
+  "erc20Transfers": [
+    {
+      "address": "0xdac17f958d2ee523a2206206994597c13d831ec7",
+      "logIndex": 118,
+      "from": "0xacbcb2724cfafb839c752d71997a8a7a16989b2e",
+      "to": "0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852",
+      "value": "1046972465",
+      "token": {
+        "symbol": "USDT",
+        "address": "0xdac17f958d2ee523a2206206994597c13d831ec7",
+        "name": "USDT",
+        "decimals": 6,
+        "currency": {
+          "symbol": "USDT",
+          "type": "CryptoCurrency",
+          "id": "usdt",
+          "name": "USDT",
+          "updatedAt": 0
+        }
+      }
+    },
+    {
+      "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+      "logIndex": 119,
+      "from": "0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852",
+      "to": "0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d",
+      "value": "397068982400674713",
+      "token": {
+        "symbol": "WETH",
+        "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+        "name": "WETH",
+        "decimals": 18,
+        "currency": {
+          "symbol": "WETH",
+          "type": "CryptoCurrency",
+          "id": "weth",
+          "name": "WETH",
+          "updatedAt": 0
+        }
+      }
+    },
+    {
+      "address": "0xaaee1a9723aadb7afa2810263653a34ba2c21c7a",
+      "logIndex": 122,
+      "from": "0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d",
+      "to": "0xaaee1a9723aadb7afa2810263653a34ba2c21c7a",
+      "value": "0",
+      "token": {
+        "symbol": "MOG",
+        "address": "0xaaee1a9723aadb7afa2810263653a34ba2c21c7a",
+        "name": "MOG",
+        "decimals": 18,
+        "currency": {
+          "symbol": "MOG",
+          "type": "CryptoCurrency",
+          "id": "mog",
+          "name": "MOG",
+          "updatedAt": 0
+        }
+      }
+    },
+    {
+      "address": "0xaaee1a9723aadb7afa2810263653a34ba2c21c7a",
+      "logIndex": 123,
+      "from": "0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d",
+      "to": "0xacbcb2724cfafb839c752d71997a8a7a16989b2e",
+      "value": "669847820000000000000000000",
+      "token": {
+        "symbol": "MOG",
+        "address": "0xaaee1a9723aadb7afa2810263653a34ba2c21c7a",
+        "name": "MOG",
+        "decimals": 18,
+        "currency": {
+          "symbol": "MOG",
+          "type": "CryptoCurrency",
+          "id": "mog",
+          "name": "MOG",
+          "updatedAt": 0
+        }
+      }
+    }
+  ],
+  "erc721Transfers": [],
+  "erc1155Transfers": [],
+  "from": {
+    "chainId": 1,
+    "address": "0xacbcb2724cfafb839c752d71997a8a7a16989b2e"
+  },
+  "gasUsed": "210739",
+  "hash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128",
+  "input": "0x8803dbee0000000000000000000000000000000000000000022a15cb157cb21d7cb00000000000000000000000000000000000000000000000000000000000004096aba800000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000acbcb2724cfafb839c752d71997a8a7a16989b2e0000000000000000000000000000000000000000000000000000000066fa35c30000000000000000000000000000000000000000000000000000000000000003000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000aaee1a9723aadb7afa2810263653a34ba2c21c7a",
+  "internalTransactions": [],
+  "logs": [
+    {
+      "address": "0xdac17f958d2ee523a2206206994597c13d831ec7",
+      "data": "0x000000000000000000000000000000000000000000000000000000003e678831",
+      "logIndex": 118,
+      "topics": [
+        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+        "0x000000000000000000000000acbcb2724cfafb839c752d71997a8a7a16989b2e",
+        "0x0000000000000000000000000d4a11d5eeaac28ec3f61d100daf4d40471f1852"
+      ],
+      "transactionHash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128",
+      "eventName": "Transfer",
+      "args": [
+        {
+          "indexed": true,
+          "name": "from",
+          "type": "address",
+          "value": "0xacbcb2724cfafb839c752d71997a8a7a16989b2e"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address",
+          "value": "0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256",
+          "value": "1046972465"
+        }
+      ]
+    },
+    {
+      "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+      "data": "0x0000000000000000000000000000000000000000000000000582ac22bf516b99",
+      "logIndex": 119,
+      "topics": [
+        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+        "0x0000000000000000000000000d4a11d5eeaac28ec3f61d100daf4d40471f1852",
+        "0x000000000000000000000000c2eab7d33d3cb97692ecb231a5d0e4a649cb539d"
+      ],
+      "transactionHash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128",
+      "eventName": "Transfer",
+      "args": [
+        {
+          "indexed": true,
+          "name": "from",
+          "type": "address",
+          "value": "0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address",
+          "value": "0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256",
+          "value": "397068982400674713"
+        }
+      ]
+    },
+    {
+      "address": "0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852",
+      "data": "0x000000000000000000000000000000000000000000000557df677ff69b8a0bda00000000000000000000000000000000000000000000000000003c549b3c51dd",
+      "logIndex": 120,
+      "topics": [
+        "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+      ],
+      "transactionHash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128"
+    },
+    {
+      "address": "0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852",
+      "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003e6788310000000000000000000000000000000000000000000000000582ac22bf516b990000000000000000000000000000000000000000000000000000000000000000",
+      "logIndex": 121,
+      "topics": [
+        "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+        "0x0000000000000000000000007a250d5630b4cf539739df2c5dacb4c659f2488d",
+        "0x000000000000000000000000c2eab7d33d3cb97692ecb231a5d0e4a649cb539d"
+      ],
+      "transactionHash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128",
+      "eventName": "Swap",
+      "args": [
+        {
+          "indexed": true,
+          "name": "sender",
+          "type": "address",
+          "value": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"
+        },
+        {
+          "indexed": false,
+          "name": "amount0In",
+          "type": "uint256",
+          "value": "0"
+        },
+        {
+          "indexed": false,
+          "name": "amount1In",
+          "type": "uint256",
+          "value": "1046972465"
+        },
+        {
+          "indexed": false,
+          "name": "amount0Out",
+          "type": "uint256",
+          "value": "397068982400674713"
+        },
+        {
+          "indexed": false,
+          "name": "amount1Out",
+          "type": "uint256",
+          "value": "0"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address",
+          "value": "0xc2eaB7d33d3cB97692eCB231A5D0e4A649Cb539d"
+        }
+      ]
+    },
+    {
+      "address": "0xaaee1a9723aadb7afa2810263653a34ba2c21c7a",
+      "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "logIndex": 122,
+      "topics": [
+        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+        "0x000000000000000000000000c2eab7d33d3cb97692ecb231a5d0e4a649cb539d",
+        "0x000000000000000000000000aaee1a9723aadb7afa2810263653a34ba2c21c7a"
+      ],
+      "transactionHash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128",
+      "eventName": "Transfer",
+      "args": [
+        {
+          "indexed": true,
+          "name": "from",
+          "type": "address",
+          "value": "0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address",
+          "value": "0xaaee1a9723aadb7afa2810263653a34ba2c21c7a"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "address": "0xaaee1a9723aadb7afa2810263653a34ba2c21c7a",
+      "data": "0x0000000000000000000000000000000000000000022a15cb157cb21d7cb00000",
+      "logIndex": 123,
+      "topics": [
+        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+        "0x000000000000000000000000c2eab7d33d3cb97692ecb231a5d0e4a649cb539d",
+        "0x000000000000000000000000acbcb2724cfafb839c752d71997a8a7a16989b2e"
+      ],
+      "transactionHash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128",
+      "eventName": "Transfer",
+      "args": [
+        {
+          "indexed": true,
+          "name": "from",
+          "type": "address",
+          "value": "0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address",
+          "value": "0xacbcb2724cfafb839c752d71997a8a7a16989b2e"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256",
+          "value": "669847820000000000000000000"
+        }
+      ]
+    },
+    {
+      "address": "0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d",
+      "data": "0x000000000000000000000000000000000000003d53d85741981ef6a8e8c8b01000000000000000000000000000000000000000000000009bb099a14b8e459e48",
+      "logIndex": 124,
+      "topics": [
+        "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+      ],
+      "transactionHash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128"
+    },
+    {
+      "address": "0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d",
+      "data": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000582ac22bf516b990000000000000000000000000000000000000000022a15cb157cb21d7cb000000000000000000000000000000000000000000000000000000000000000000000",
+      "logIndex": 125,
+      "topics": [
+        "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+        "0x0000000000000000000000007a250d5630b4cf539739df2c5dacb4c659f2488d",
+        "0x000000000000000000000000acbcb2724cfafb839c752d71997a8a7a16989b2e"
+      ],
+      "transactionHash": "0x5c1345e9b83106f657de5a20d75de3e9f56725697b4ef47cafd019c1fa944128",
+      "eventName": "Swap",
+      "args": [
+        {
+          "indexed": true,
+          "name": "sender",
+          "type": "address",
+          "value": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"
+        },
+        {
+          "indexed": false,
+          "name": "amount0In",
+          "type": "uint256",
+          "value": "0"
+        },
+        {
+          "indexed": false,
+          "name": "amount1In",
+          "type": "uint256",
+          "value": "397068982400674713"
+        },
+        {
+          "indexed": false,
+          "name": "amount0Out",
+          "type": "uint256",
+          "value": "669847820000000000000000000"
+        },
+        {
+          "indexed": false,
+          "name": "amount1Out",
+          "type": "uint256",
+          "value": "0"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address",
+          "value": "0xACBCB2724CFafb839C752d71997A8a7a16989b2e"
+        }
+      ]
+    }
+  ],
+  "status": "success",
+  "timestamp": 1727673203000,
+  "value": "0",
+  "function": {
+    "args": [
+      {
+        "type": "uint256",
+        "name": "amountOut",
+        "value": "669847820000000000000000000"
+      },
+      {
+        "type": "uint256",
+        "name": "amountInMax",
+        "value": "1083616168"
+      },
+      {
+        "type": "address[]",
+        "name": "path",
+        "value": [
+          "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+          "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+          "0xaaeE1A9723aaDB7afA2810263653A34bA2C21C7a"
+        ]
+      },
+      {
+        "type": "address",
+        "name": "to",
+        "value": "0xACBCB2724CFafb839C752d71997A8a7a16989b2e"
+      },
+      {
+        "type": "uint256",
+        "name": "deadline",
+        "value": "1727673795"
+      }
+    ],
+    "name": "swapTokensForExactTokens",
+    "interface": "swapTokensForExactTokens(uint256, uint256, address[], address, uint256)"
+  }
+}

package/logic/analyzeTransaction/createActions/utils/containsUrlOrDomain.ts

@@ -15,7 +15,7 @@
 export const containsUrlOrDomain = (text: string): boolean => {
   // URL または ドメイン名のパターンを定義
   const urlPattern =
-    /^\[?(https?:\/\/)?([\da-z][\da-z-]*[\da-z]*\.)+[a-z]{2,}[#/?]?.*]?$/i
+    /^\[?(https?:\/\/)?([\da-z][\da-z-]*[\da-z]*\.)+[a-z]{2,}[#/?]?[\w\*-\._]*]?$/i
 
   // 文字列内の単語を空白で分割
   const words = text.split(/\s+/)

package/logic/analyzeTransaction/createActions/utils/createDirection.ts

@@ -1,25 +1,27 @@
+import type { LowerHex } from '../../../../types'
+
 type CreateDirectionParameters = {
-  from: string | undefined
-  to: string | undefined
-  accountIds: Set<string>
+  readonly from: LowerHex | undefined
+  readonly to: LowerHex | undefined
+  readonly relatedAddresses: Set<LowerHex>
 }
 
 export const createDirection = ({
   from,
   to,
-  accountIds,
+  relatedAddresses,
 }: CreateDirectionParameters): 'in' | 'out' | 'none' => {
   if (
     from !== undefined &&
-    accountIds.has(from) &&
-    (to === undefined || !accountIds.has(to))
+    relatedAddresses.has(from) &&
+    (to === undefined || !relatedAddresses.has(to))
   ) {
     return 'out'
   }
   if (
     to !== undefined &&
-    accountIds.has(to) &&
-    (from === undefined || !accountIds.has(from))
+    relatedAddresses.has(to) &&
+    (from === undefined || !relatedAddresses.has(from))
   ) {
     return 'in'
   }