@0xtorch/evm 0.0.75 → 0.0.76

package/_cjs/logic/analyzeTransaction/createActions/json/transferGenerator.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTransfers = void 0;
 const big_decimal_1 = require("@0xtorch/big-decimal");
 const utils_1 = require("../../../../utils");
+const allValue_1 = require("./allValue");
+const arrayIn_1 = require("./arrayIn");
+const betweenBigInt_1 = require("./betweenBigInt");
 const customTransferGenerator_1 = require("./customTransferGenerator");
 const erc20TransferGenerator_1 = require("./erc20TransferGenerator");
 const erc721TransferGenerator_1 = require("./erc721TransferGenerator");
@@ -11,6 +14,54 @@ const internalTransferGenerator_1 = require("./internalTransferGenerator");
 const generateTransfers = ({ schema, chain, transaction, relatedAddresses, erc20Target, erc721Target, erc1155Target, }) => {
     switch (schema.type) {
         case 'value': {
+            if (schema.from !== undefined &&
+                !(0, arrayIn_1.checkValueIsArrayIn)({
+                    value: transaction.from.address,
+                    schema: schema.from,
+                    transaction,
+                    relatedAddresses,
+                })) {
+                return [];
+            }
+            if (schema.to !== undefined &&
+                !(0, arrayIn_1.checkValueIsArrayIn)({
+                    value: transaction.to?.address ?? '',
+                    schema: schema.to,
+                    transaction,
+                    relatedAddresses,
+                })) {
+                return [];
+            }
+            if (schema.value !== undefined) {
+                if (typeof schema.value === 'string') {
+                    if (transaction.value.toString() !== schema.value) {
+                        return [];
+                    }
+                }
+                else {
+                    switch (schema.value.type) {
+                        case 'between': {
+                            if (!(0, betweenBigInt_1.checkValueIsBetweenBigInt)({
+                                value: transaction.value,
+                                schema: schema.value,
+                            })) {
+                                return [];
+                            }
+                            break;
+                        }
+                        default: {
+                            const value = (0, allValue_1.getAllValue)({
+                                schema: schema.value,
+                                transaction,
+                                relatedAddresses,
+                            });
+                            if (transaction.value.toString() !== value) {
+                                return [];
+                            }
+                        }
+                    }
+                }
+            }
             return [
                 {
                     direction: schema.direction,

package/_cjs/logic/analyzeTransaction/createActions/json/transferGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"transferGenerator.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/transferGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transferGenerator.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/transferGenerator.ts"],"names":[],"mappings":"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"}

package/_cjs/logic/analyzeTransaction/decodeTransaction/decodeLog.js

@@ -75,10 +75,10 @@ const decodeInputByEventAbi = (log, abiText) => {
         return undefined;
     }
 };
-const createLogArgs = (args, abiItem) => abiItem.inputs.map(({ indexed, name, type }) => ({
+const createLogArgs = (args, abiItem) => 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 ?? ''],
 }));
 //# sourceMappingURL=decodeLog.js.map

package/_cjs/logic/analyzeTransaction/decodeTransaction/decodeLog.js.map

@@ -1 +1 @@
-{"version":3,"file":"decodeLog.js","sourceRoot":"","sources":["../../../../logic/analyzeTransaction/decodeTransaction/decodeLog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decodeLog.js","sourceRoot":"","sources":["../../../../logic/analyzeTransaction/decodeTransaction/decodeLog.ts"],"names":[],"mappings":"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"}

package/_esm/logic/analyzeTransaction/createActions/json/transferGenerator.js

@@ -1,5 +1,8 @@
 import { createBigDecimal } from '@0xtorch/big-decimal';
 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';
@@ -8,6 +11,57 @@ import { generateTransfersByInternalTransactions } from './internalTransferGener
 export const generateTransfers = ({ schema, chain, transaction, relatedAddresses, erc20Target, erc721Target, erc1155Target, }) => {
     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/_esm/logic/analyzeTransaction/createActions/json/transferGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"transferGenerator.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/transferGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transferGenerator.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/transferGenerator.ts"],"names":[],"mappings":"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"}

package/_esm/logic/analyzeTransaction/decodeTransaction/decodeLog.js

@@ -73,10 +73,10 @@ const decodeInputByEventAbi = (log, abiText) => {
         return undefined;
     }
 };
-const createLogArgs = (args, abiItem) => abiItem.inputs.map(({ indexed, name, type }) => ({
+const createLogArgs = (args, abiItem) => 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 ?? ''],
 }));
 //# sourceMappingURL=decodeLog.js.map

package/_esm/logic/analyzeTransaction/decodeTransaction/decodeLog.js.map

@@ -1 +1 @@
-{"version":3,"file":"decodeLog.js","sourceRoot":"","sources":["../../../../logic/analyzeTransaction/decodeTransaction/decodeLog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decodeLog.js","sourceRoot":"","sources":["../../../../logic/analyzeTransaction/decodeTransaction/decodeLog.ts"],"names":[],"mappings":"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"}

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/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.76",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",