@0xtorch/evm 0.0.75 → 0.0.77

package/_types/logic/analyzeTransaction/createActions/json/simpleValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simpleValue.d.ts","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/simpleValue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,KAAK,EAKV,QAAQ,EACR,kBAAkB,EACnB,MAAM,mBAAmB,CAAA;AAG1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAEjD,eAAO,MAAM,cAAc,+CAIxB;IACD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;IAClD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAA;IACxC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;CACzC,KAAG,MA2TH,CAAA"}
+{"version":3,"file":"simpleValue.d.ts","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/simpleValue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,KAAK,EAKV,QAAQ,EACR,kBAAkB,EACnB,MAAM,mBAAmB,CAAA;AAG1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAEjD,eAAO,MAAM,cAAc,+CAIxB;IACD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;IAClD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAA;IACxC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;CACzC,KAAG,MA8TH,CAAA"}

package/_types/logic/analyzeTransaction/createActions/json/transferGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transferGenerator.d.ts","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/transferGenerator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,QAAQ,EACR,kBAAkB,EACnB,MAAM,mBAAmB,CAAA;AAO1B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAEvD,eAAO,MAAM,iBAAiB,gGAQ3B;IACD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;IACxD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAA;IACxC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAA;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAA;IAC3C,QAAQ,CAAC,aAAa,CAAC,EAAE,oBAAoB,CAAA;CAC9C,KAAG,SAAS,QAAQ,EA0HpB,CAAA"}
+{"version":3,"file":"transferGenerator.d.ts","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/transferGenerator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,QAAQ,EACR,kBAAkB,EACnB,MAAM,mBAAmB,CAAA;AAU1B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAEvD,eAAO,MAAM,iBAAiB,gGAQ3B;IACD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;IACxD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAA;IACxC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAA;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAA;IAC3C,QAAQ,CAAC,aAAa,CAAC,EAAE,oBAAoB,CAAA;CAC9C,KAAG,SAAS,QAAQ,EAqLpB,CAAA"}

package/logic/analyzeTransaction/createActions/json/schema.ts

@@ -36,6 +36,10 @@ export const addressInSchema = z.object({
     .min(1),
 })
 
+const chainIdValueSchema = z.object({
+  type: z.literal('chain-id'),
+})
+
 const fromValueSchema = z.object({
   type: z.literal('from'),
 })
@@ -128,6 +132,7 @@ const erc1155ValueSchema = z.object({
 
 export const simpleValueSchema = z.union([
   z.string(),
+  chainIdValueSchema,
   fromValueSchema,
   toValueSchema,
   valueValueSchema,

package/logic/analyzeTransaction/createActions/json/simpleValue.ts

@@ -27,6 +27,9 @@ export const getSimpleValue = ({
   }
 
   switch (schema.type) {
+    case 'chain-id': {
+      return transaction.chainId.toString()
+    }
     case 'from': {
       return transaction.from.address
     }

package/logic/analyzeTransaction/createActions/json/transferGenerator.ts

@@ -10,6 +10,9 @@ import type {
   TransactionDecoded,
 } from '../../../../types'
 import { createEvmAddressId } from '../../../../utils'
+import { getAllValue } from './allValue'
+import { checkValueIsArrayIn } from './arrayIn'
+import { checkValueIsBetweenBigInt } from './betweenBigInt'
 import { generateCustomTransfer } from './customTransferGenerator'
 import { generateTransfersByErc20Transfer } from './erc20TransferGenerator'
 import { generateTransfersByErc721Transfer } from './erc721TransferGenerator'
@@ -36,6 +39,65 @@ export const generateTransfers = ({
 }): readonly Transfer[] => {
   switch (schema.type) {
     case 'value': {
+      // from
+      if (
+        schema.from !== undefined &&
+        !checkValueIsArrayIn({
+          value: transaction.from.address,
+          schema: schema.from,
+          transaction,
+          relatedAddresses,
+        })
+      ) {
+        return []
+      }
+
+      // to
+      if (
+        schema.to !== undefined &&
+        !checkValueIsArrayIn({
+          value: transaction.to?.address ?? '',
+          schema: schema.to,
+          transaction,
+          relatedAddresses,
+        })
+      ) {
+        return []
+      }
+
+      // value
+      if (schema.value !== undefined) {
+        if (typeof schema.value === 'string') {
+          if (transaction.value.toString() !== schema.value) {
+            return []
+          }
+        } else {
+          switch (schema.value.type) {
+            case 'between': {
+              if (
+                !checkValueIsBetweenBigInt({
+                  value: transaction.value,
+                  schema: schema.value,
+                })
+              ) {
+                return []
+              }
+              break
+            }
+            default: {
+              const value = getAllValue({
+                schema: schema.value,
+                transaction,
+                relatedAddresses,
+              })
+              if (transaction.value.toString() !== value) {
+                return []
+              }
+            }
+          }
+        }
+      }
+
       return [
         {
           direction: schema.direction,

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

@@ -380,4 +380,4 @@
     "name": "swapTokensForExactTokens",
     "interface": "swapTokensForExactTokens(uint256, uint256, address[], address, uint256)"
   }
-}
+}

package/logic/analyzeTransaction/decodeTransaction/decodeLog.ts

@@ -92,10 +92,13 @@ const decodeInputByEventAbi = (log: Log, abiText: string): Log | undefined => {
   }
 }
 
-const createLogArgs = (args: Record<string, unknown>, abiItem: AbiEventType) =>
-  abiItem.inputs.map(({ indexed, name, type }) => ({
+const createLogArgs = (
+  args: Record<string, unknown> | unknown[],
+  abiItem: AbiEventType,
+) =>
+  abiItem.inputs.map(({ indexed, name, type }, index) => ({
     indexed: indexed ?? false,
     name: name ?? '',
     type: type,
-    value: args[name ?? ''],
+    value: Array.isArray(args) ? args[index] : args[name ?? ''],
   }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/evm",
-  "version": "0.0.75",
+  "version": "0.0.77",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",

package/types/primitive.ts

@@ -5,7 +5,7 @@ export const bigintTextSchema = z.string().regex(/^\d+$/).transform(BigInt)
 
 export const lowerHexSchema = z
   .string()
-  .regex(/^0x[0-9a-f]+$/)
+  .regex(/^0x[0-9a-f]*$/)
   .transform((v) => v as LowerHex)
 
 export const txHashSchema = z