@0xtorch/evm 0.0.77 → 0.0.79

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,20 +7,36 @@ const simpleValue_1 = require("./simpleValue");
7
7
  const slice_1 = require("./slice");
8
8
  const getAllValue = ({ schema, transaction, relatedAddresses, }) => {
9
9
  if (typeof schema === 'string') {
10
- return (0, simpleValue_1.getSimpleValue)({ schema, transaction, relatedAddresses });
10
+ return (0, simpleValue_1.getSimpleValue)({
11
+ schema,
12
+ transaction,
13
+ relatedAddresses,
14
+ });
11
15
  }
12
16
  switch (schema.type) {
13
17
  case 'math': {
14
18
  return (0, math_1.getMathValue)({ schema, transaction, relatedAddresses }).toString();
15
19
  }
16
20
  case 'slice': {
17
- return (0, slice_1.getSliceValue)({ schema, transaction, relatedAddresses });
21
+ return (0, slice_1.getSliceValue)({
22
+ schema,
23
+ transaction,
24
+ relatedAddresses,
25
+ });
18
26
  }
19
27
  case 'join': {
20
- return (0, join_1.getJoinValue)({ schema, transaction, relatedAddresses });
28
+ return (0, join_1.getJoinValue)({
29
+ schema,
30
+ transaction,
31
+ relatedAddresses,
32
+ });
21
33
  }
22
34
  default: {
23
- return (0, simpleValue_1.getSimpleValue)({ schema, transaction, relatedAddresses });
35
+ return (0, simpleValue_1.getSimpleValue)({
36
+ schema,
37
+ transaction,
38
+ relatedAddresses,
39
+ });
24
40
  }
25
41
  }
26
42
  };
@@ -1 +1 @@
1
- {"version":3,"file":"allValue.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/allValue.ts"],"names":[],"mappings":";;;AAEA,iCAAqC;AACrC,iCAAqC;AAErC,+CAA8C;AAC9C,mCAAuC;AAEhC,MAAM,WAAW,GAAG,CAAC,EAC1B,MAAM,EACN,WAAW,EACX,gBAAgB,GAKjB,EAAU,EAAE;IACX,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAE/B,OAAO,IAAA,4BAAc,EAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;IAClE,CAAC;IAED,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,CAAC,CAAC;YAEZ,OAAO,IAAA,mBAAY,EAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC3E,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YAEb,OAAO,IAAA,qBAAa,EAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;QACjE,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YAEZ,OAAO,IAAA,mBAAY,EAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAChE,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YAER,OAAO,IAAA,4BAAc,EAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAhCY,QAAA,WAAW,eAgCvB"}
1
+ {"version":3,"file":"allValue.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/allValue.ts"],"names":[],"mappings":";;;AAEA,iCAAqC;AACrC,iCAAqC;AAErC,+CAA8C;AAC9C,mCAAuC;AAEhC,MAAM,WAAW,GAAG,CAAC,EAC1B,MAAM,EACN,WAAW,EACX,gBAAgB,GAKjB,EAAU,EAAE;IACX,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAE/B,OAAO,IAAA,4BAAc,EAAC;YACpB,MAAM;YACN,WAAW;YACX,gBAAgB;SACjB,CAAC,CAAA;IACJ,CAAC;IAED,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,CAAC,CAAC;YAEZ,OAAO,IAAA,mBAAY,EAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC3E,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YAEb,OAAO,IAAA,qBAAa,EAAC;gBACnB,MAAM;gBACN,WAAW;gBACX,gBAAgB;aACjB,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YAEZ,OAAO,IAAA,mBAAY,EAAC;gBAClB,MAAM;gBACN,WAAW;gBACX,gBAAgB;aACjB,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YAER,OAAO,IAAA,4BAAc,EAAC;gBACpB,MAAM;gBACN,WAAW;gBACX,gBAAgB;aACjB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAhDY,QAAA,WAAW,eAgDvB"}
@@ -23,7 +23,7 @@ const getSimpleValue = ({ schema, transaction, relatedAddresses, }) => {
23
23
  return transaction.value.toString();
24
24
  }
25
25
  case 'function': {
26
- return (0, core_1.stringify)(transaction.function?.args[schema.index].value) ?? '';
26
+ return ((0, core_1.stringify)(transaction.function?.args[schema.index].value).toLowerCase() ?? '');
27
27
  }
28
28
  case 'log': {
29
29
  const targetLogs = [];
@@ -46,7 +46,26 @@ const getSimpleValue = ({ schema, transaction, relatedAddresses, }) => {
46
46
  continue;
47
47
  }
48
48
  if (schema.args !== undefined) {
49
- continue;
49
+ if (log.args === undefined) {
50
+ continue;
51
+ }
52
+ let unmatched = false;
53
+ for (const argSchema of schema.args) {
54
+ const argValue = (0, core_1.stringify)(log.args[argSchema.index].value).toLowerCase();
55
+ if (typeof argSchema.value === 'string' &&
56
+ argSchema.value !== argValue) {
57
+ unmatched = true;
58
+ break;
59
+ }
60
+ if (typeof argSchema.value !== 'string' &&
61
+ !argSchema.value.values.includes(argValue)) {
62
+ unmatched = true;
63
+ break;
64
+ }
65
+ }
66
+ if (unmatched) {
67
+ continue;
68
+ }
50
69
  }
51
70
  targetLogs.push(log);
52
71
  }
@@ -54,7 +73,9 @@ const getSimpleValue = ({ schema, transaction, relatedAddresses, }) => {
54
73
  if (schema.value === 'address') {
55
74
  return log.address;
56
75
  }
57
- return log.args === undefined ? '' : (0, core_1.stringify)(log.args[schema.value]);
76
+ return log.args === undefined
77
+ ? ''
78
+ : (0, core_1.stringify)(log.args[schema.value].value).toLowerCase();
58
79
  }
59
80
  case 'erc20': {
60
81
  const targetTransfers = [];
@@ -1 +1 @@
1
- {"version":3,"file":"simpleValue.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/simpleValue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"simpleValue.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/simpleValue.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,11 @@ import { getSliceValue } from './slice';
5
5
  export const getAllValue = ({ schema, transaction, relatedAddresses, }) => {
6
6
  if (typeof schema === 'string') {
7
7
  // simple value
8
- return getSimpleValue({ schema, transaction, relatedAddresses });
8
+ return getSimpleValue({
9
+ schema,
10
+ transaction,
11
+ relatedAddresses,
12
+ });
9
13
  }
10
14
  switch (schema.type) {
11
15
  case 'math': {
@@ -14,15 +18,27 @@ export const getAllValue = ({ schema, transaction, relatedAddresses, }) => {
14
18
  }
15
19
  case 'slice': {
16
20
  // slice value
17
- return getSliceValue({ schema, transaction, relatedAddresses });
21
+ return getSliceValue({
22
+ schema,
23
+ transaction,
24
+ relatedAddresses,
25
+ });
18
26
  }
19
27
  case 'join': {
20
28
  // join value
21
- return getJoinValue({ schema, transaction, relatedAddresses });
29
+ return getJoinValue({
30
+ schema,
31
+ transaction,
32
+ relatedAddresses,
33
+ });
22
34
  }
23
35
  default: {
24
36
  // simple value
25
- return getSimpleValue({ schema, transaction, relatedAddresses });
37
+ return getSimpleValue({
38
+ schema,
39
+ transaction,
40
+ relatedAddresses,
41
+ });
26
42
  }
27
43
  }
28
44
  };
@@ -1 +1 @@
1
- {"version":3,"file":"allValue.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/allValue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,MAAM,EACN,WAAW,EACX,gBAAgB,GAKjB,EAAU,EAAE;IACX,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,eAAe;QACf,OAAO,cAAc,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;IAClE,CAAC;IAED,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,aAAa;YACb,OAAO,YAAY,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC3E,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,cAAc;YACd,OAAO,aAAa,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;QACjE,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,aAAa;YACb,OAAO,YAAY,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAChE,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,eAAe;YACf,OAAO,cAAc,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"allValue.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/allValue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,MAAM,EACN,WAAW,EACX,gBAAgB,GAKjB,EAAU,EAAE;IACX,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,eAAe;QACf,OAAO,cAAc,CAAC;YACpB,MAAM;YACN,WAAW;YACX,gBAAgB;SACjB,CAAC,CAAA;IACJ,CAAC;IAED,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,aAAa;YACb,OAAO,YAAY,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC3E,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,cAAc;YACd,OAAO,aAAa,CAAC;gBACnB,MAAM;gBACN,WAAW;gBACX,gBAAgB;aACjB,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,aAAa;YACb,OAAO,YAAY,CAAC;gBAClB,MAAM;gBACN,WAAW;gBACX,gBAAgB;aACjB,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,eAAe;YACf,OAAO,cAAc,CAAC;gBACpB,MAAM;gBACN,WAAW;gBACX,gBAAgB;aACjB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;AACH,CAAC,CAAA"}
@@ -20,7 +20,7 @@ export const getSimpleValue = ({ schema, transaction, relatedAddresses, }) => {
20
20
  return transaction.value.toString();
21
21
  }
22
22
  case 'function': {
23
- return stringify(transaction.function?.args[schema.index].value) ?? '';
23
+ return (stringify(transaction.function?.args[schema.index].value).toLowerCase() ?? '');
24
24
  }
25
25
  case 'log': {
26
26
  const targetLogs = [];
@@ -47,7 +47,26 @@ export const getSimpleValue = ({ schema, transaction, relatedAddresses, }) => {
47
47
  }
48
48
  // args
49
49
  if (schema.args !== undefined) {
50
- continue;
50
+ if (log.args === undefined) {
51
+ continue;
52
+ }
53
+ let unmatched = false;
54
+ for (const argSchema of schema.args) {
55
+ const argValue = stringify(log.args[argSchema.index].value).toLowerCase();
56
+ if (typeof argSchema.value === 'string' &&
57
+ argSchema.value !== argValue) {
58
+ unmatched = true;
59
+ break;
60
+ }
61
+ if (typeof argSchema.value !== 'string' &&
62
+ !argSchema.value.values.includes(argValue)) {
63
+ unmatched = true;
64
+ break;
65
+ }
66
+ }
67
+ if (unmatched) {
68
+ continue;
69
+ }
51
70
  }
52
71
  targetLogs.push(log);
53
72
  }
@@ -55,7 +74,9 @@ export const getSimpleValue = ({ schema, transaction, relatedAddresses, }) => {
55
74
  if (schema.value === 'address') {
56
75
  return log.address;
57
76
  }
58
- return log.args === undefined ? '' : stringify(log.args[schema.value]);
77
+ return log.args === undefined
78
+ ? ''
79
+ : stringify(log.args[schema.value].value).toLowerCase();
59
80
  }
60
81
  case 'erc20': {
61
82
  const targetTransfers = [];
@@ -1 +1 @@
1
- {"version":3,"file":"simpleValue.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/simpleValue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"simpleValue.js","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/simpleValue.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"allValue.d.ts","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/allValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAGrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAI9C,eAAO,MAAM,WAAW,+CAIrB;IACD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;IAC/C,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAA;IACxC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;CACzC,KAAG,MAwBH,CAAA"}
1
+ {"version":3,"file":"allValue.d.ts","sourceRoot":"","sources":["../../../../../logic/analyzeTransaction/createActions/json/allValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAGrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAI9C,eAAO,MAAM,WAAW,+CAIrB;IACD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;IAC/C,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAA;IACxC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;CACzC,KAAG,MAwCH,CAAA"}
@@ -1 +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,MA8TH,CAAA"}
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,MA8VH,CAAA"}
@@ -17,7 +17,11 @@ export const getAllValue = ({
17
17
  }): string => {
18
18
  if (typeof schema === 'string') {
19
19
  // simple value
20
- return getSimpleValue({ schema, transaction, relatedAddresses })
20
+ return getSimpleValue({
21
+ schema,
22
+ transaction,
23
+ relatedAddresses,
24
+ })
21
25
  }
22
26
 
23
27
  switch (schema.type) {
@@ -27,15 +31,27 @@ export const getAllValue = ({
27
31
  }
28
32
  case 'slice': {
29
33
  // slice value
30
- return getSliceValue({ schema, transaction, relatedAddresses })
34
+ return getSliceValue({
35
+ schema,
36
+ transaction,
37
+ relatedAddresses,
38
+ })
31
39
  }
32
40
  case 'join': {
33
41
  // join value
34
- return getJoinValue({ schema, transaction, relatedAddresses })
42
+ return getJoinValue({
43
+ schema,
44
+ transaction,
45
+ relatedAddresses,
46
+ })
35
47
  }
36
48
  default: {
37
49
  // simple value
38
- return getSimpleValue({ schema, transaction, relatedAddresses })
50
+ return getSimpleValue({
51
+ schema,
52
+ transaction,
53
+ relatedAddresses,
54
+ })
39
55
  }
40
56
  }
41
57
  }
@@ -40,7 +40,11 @@ export const getSimpleValue = ({
40
40
  return transaction.value.toString()
41
41
  }
42
42
  case 'function': {
43
- return stringify(transaction.function?.args[schema.index].value) ?? ''
43
+ return (
44
+ stringify(
45
+ transaction.function?.args[schema.index].value,
46
+ ).toLowerCase() ?? ''
47
+ )
44
48
  }
45
49
  case 'log': {
46
50
  const targetLogs: Log[] = []
@@ -76,7 +80,33 @@ export const getSimpleValue = ({
76
80
 
77
81
  // args
78
82
  if (schema.args !== undefined) {
79
- continue
83
+ if (log.args === undefined) {
84
+ continue
85
+ }
86
+
87
+ let unmatched = false
88
+ for (const argSchema of schema.args) {
89
+ const argValue = stringify(
90
+ log.args[argSchema.index].value,
91
+ ).toLowerCase()
92
+ if (
93
+ typeof argSchema.value === 'string' &&
94
+ argSchema.value !== argValue
95
+ ) {
96
+ unmatched = true
97
+ break
98
+ }
99
+ if (
100
+ typeof argSchema.value !== 'string' &&
101
+ !argSchema.value.values.includes(argValue)
102
+ ) {
103
+ unmatched = true
104
+ break
105
+ }
106
+ }
107
+ if (unmatched) {
108
+ continue
109
+ }
80
110
  }
81
111
 
82
112
  targetLogs.push(log)
@@ -86,7 +116,9 @@ export const getSimpleValue = ({
86
116
  if (schema.value === 'address') {
87
117
  return log.address
88
118
  }
89
- return log.args === undefined ? '' : stringify(log.args[schema.value])
119
+ return log.args === undefined
120
+ ? ''
121
+ : stringify(log.args[schema.value].value).toLowerCase()
90
122
  }
91
123
  case 'erc20': {
92
124
  const targetTransfers: Erc20TokenTransfer[] = []
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@0xtorch/evm",
3
- "version": "0.0.77",
3
+ "version": "0.0.79",
4
4
  "description": "Cryptorch EVM extension",
5
5
  "keywords": [
6
6
  "cryptorch",