dequanto 0.1.69 → 0.1.72
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.
- package/lib/cjs/evm/OpcodesWalker.js +2 -2
- package/lib/cjs/evm/OpcodesWalker.js.map +1 -1
- package/lib/cjs/evm/utils/$bytecode.js +19 -8
- package/lib/cjs/evm/utils/$bytecode.js.map +1 -1
- package/lib/esm/evm/OpcodesWalker.js.map +1 -1
- package/lib/esm/evm/OpcodesWalker.mjs +2 -2
- package/lib/esm/evm/utils/$bytecode.js.map +1 -1
- package/lib/esm/evm/utils/$bytecode.mjs +19 -8
- package/package.json +8 -1
- package/src/evm/OpcodesWalker.ts +2 -2
- package/src/evm/utils/$bytecode.ts +23 -9
|
@@ -106,8 +106,8 @@ class OpcodesWalker {
|
|
|
106
106
|
if (typeof dest === 'number') {
|
|
107
107
|
let opcode = this.opcodes.find(x => x.pc === dest);
|
|
108
108
|
if (opcode == null) {
|
|
109
|
-
console.log(this.opcodes.map(x => `${x.pc
|
|
110
|
-
throw new Error(`No OPCODE found at ${dest
|
|
109
|
+
console.log(this.opcodes.map(x => `${x.pc} ${x.name}`).join('\n'));
|
|
110
|
+
throw new Error(`No OPCODE found at ${dest}`);
|
|
111
111
|
}
|
|
112
112
|
this.current = opcode;
|
|
113
113
|
this.evm.pc = this.current.pc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpcodesWalker.js","sourceRoot":"","sources":["../../../src/evm/OpcodesWalker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OpcodesWalker.js","sourceRoot":"","sources":["../../../src/evm/OpcodesWalker.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,11 @@ var $bytecode;
|
|
|
11
11
|
* remove the constructor code, leave the runtime bytecode only
|
|
12
12
|
*/
|
|
13
13
|
function trimConstructorCode(code) {
|
|
14
|
-
let
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
let rgx = /6080(\d\d)?6040/g;
|
|
15
|
+
rgx.lastIndex = 4;
|
|
16
|
+
let initCode = rgx.exec(code);
|
|
17
|
+
if (initCode != null) {
|
|
18
|
+
code = `0x${code.substring(initCode.index)}`;
|
|
17
19
|
}
|
|
18
20
|
return code;
|
|
19
21
|
}
|
|
@@ -39,8 +41,9 @@ var $bytecode;
|
|
|
39
41
|
*/
|
|
40
42
|
// match 60806040 the beginning of the contract code
|
|
41
43
|
let ctorCodeIdx = indexOf(opcodes, [
|
|
42
|
-
(op) => op.opcode === 0x60 && op.pushData[0] === 0x80,
|
|
43
|
-
(op) => op.opcode ===
|
|
44
|
+
{ match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x80 },
|
|
45
|
+
{ match: (op) => op.opcode === 0x80, optional: true },
|
|
46
|
+
{ match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x40 },
|
|
44
47
|
], 2);
|
|
45
48
|
let codeSizeIdx = opcodes.findIndex(x => x.name === 'CODESIZE');
|
|
46
49
|
if (codeSizeIdx === -1 || codeSizeIdx > ctorCodeIdx) {
|
|
@@ -48,6 +51,9 @@ var $bytecode;
|
|
|
48
51
|
return { arguments: null };
|
|
49
52
|
}
|
|
50
53
|
let prev = opcodes[codeSizeIdx - 1];
|
|
54
|
+
if (/PUSH/.test(prev.name) === false) {
|
|
55
|
+
prev = opcodes[codeSizeIdx - 2];
|
|
56
|
+
}
|
|
51
57
|
_require_1.$require.True(/PUSH/.test(prev.name), `PUSH expected but got ${prev.name}`);
|
|
52
58
|
let codeSizeValue = _buffer_1.$buffer.toBigInt(prev.pushData) * 2n;
|
|
53
59
|
return {
|
|
@@ -57,11 +63,16 @@ var $bytecode;
|
|
|
57
63
|
$bytecode.parseContractCreation = parseContractCreation;
|
|
58
64
|
function indexOf(opcodes, matchers, startIdx = 0) {
|
|
59
65
|
outer: for (let i = startIdx; i < opcodes.length - matchers.length; i++) {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
66
|
+
let cursor = 0;
|
|
67
|
+
inner: for (let j = 0; j < matchers.length; j++) {
|
|
68
|
+
let op = opcodes[i + cursor];
|
|
69
|
+
if (matchers[j].match(op, i + cursor) === false) {
|
|
70
|
+
if (matchers[j].optional) {
|
|
71
|
+
continue inner;
|
|
72
|
+
}
|
|
63
73
|
continue outer;
|
|
64
74
|
}
|
|
75
|
+
cursor++;
|
|
65
76
|
}
|
|
66
77
|
return i;
|
|
67
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$bytecode.js","sourceRoot":"","sources":["../../../../src/evm/utils/$bytecode.ts"],"names":[],"mappings":";;;AAEA,gDAA6C;AAC7C,uDAAoD;AACpD,qDAAkD;AAClD,+CAA4C;AAE5C,IAAiB,SAAS,
|
|
1
|
+
{"version":3,"file":"$bytecode.js","sourceRoot":"","sources":["../../../../src/evm/utils/$bytecode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpcodesWalker.js","sourceRoot":"","sources":["../../../src/evm/OpcodesWalker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OpcodesWalker.js","sourceRoot":"","sources":["../../../src/evm/OpcodesWalker.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,8 +100,8 @@ export class OpcodesWalker {
|
|
|
100
100
|
if (typeof dest === 'number') {
|
|
101
101
|
let opcode = this.opcodes.find(x => x.pc === dest);
|
|
102
102
|
if (opcode == null) {
|
|
103
|
-
console.log(this.opcodes.map(x => `${x.pc
|
|
104
|
-
throw new Error(`No OPCODE found at ${dest
|
|
103
|
+
console.log(this.opcodes.map(x => `${x.pc} ${x.name}`).join('\n'));
|
|
104
|
+
throw new Error(`No OPCODE found at ${dest}`);
|
|
105
105
|
}
|
|
106
106
|
this.current = opcode;
|
|
107
107
|
this.evm.pc = this.current.pc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$bytecode.js","sourceRoot":"","sources":["../../../../src/evm/utils/$bytecode.ts"],"names":[],"mappings":";;;AAEA,gDAA6C;AAC7C,uDAAoD;AACpD,qDAAkD;AAClD,+CAA4C;AAE5C,IAAiB,SAAS,
|
|
1
|
+
{"version":3,"file":"$bytecode.js","sourceRoot":"","sources":["../../../../src/evm/utils/$bytecode.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,11 @@ export var $bytecode;
|
|
|
8
8
|
* remove the constructor code, leave the runtime bytecode only
|
|
9
9
|
*/
|
|
10
10
|
function trimConstructorCode(code) {
|
|
11
|
-
let
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
let rgx = /6080(\d\d)?6040/g;
|
|
12
|
+
rgx.lastIndex = 4;
|
|
13
|
+
let initCode = rgx.exec(code);
|
|
14
|
+
if (initCode != null) {
|
|
15
|
+
code = `0x${code.substring(initCode.index)}`;
|
|
14
16
|
}
|
|
15
17
|
return code;
|
|
16
18
|
}
|
|
@@ -36,8 +38,9 @@ export var $bytecode;
|
|
|
36
38
|
*/
|
|
37
39
|
// match 60806040 the beginning of the contract code
|
|
38
40
|
let ctorCodeIdx = indexOf(opcodes, [
|
|
39
|
-
(op) => op.opcode === 0x60 && op.pushData[0] === 0x80,
|
|
40
|
-
(op) => op.opcode ===
|
|
41
|
+
{ match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x80 },
|
|
42
|
+
{ match: (op) => op.opcode === 0x80, optional: true },
|
|
43
|
+
{ match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x40 },
|
|
41
44
|
], 2);
|
|
42
45
|
let codeSizeIdx = opcodes.findIndex(x => x.name === 'CODESIZE');
|
|
43
46
|
if (codeSizeIdx === -1 || codeSizeIdx > ctorCodeIdx) {
|
|
@@ -45,6 +48,9 @@ export var $bytecode;
|
|
|
45
48
|
return { arguments: null };
|
|
46
49
|
}
|
|
47
50
|
let prev = opcodes[codeSizeIdx - 1];
|
|
51
|
+
if (/PUSH/.test(prev.name) === false) {
|
|
52
|
+
prev = opcodes[codeSizeIdx - 2];
|
|
53
|
+
}
|
|
48
54
|
$require.True(/PUSH/.test(prev.name), `PUSH expected but got ${prev.name}`);
|
|
49
55
|
let codeSizeValue = $buffer.toBigInt(prev.pushData) * 2n;
|
|
50
56
|
return {
|
|
@@ -54,11 +60,16 @@ export var $bytecode;
|
|
|
54
60
|
$bytecode.parseContractCreation = parseContractCreation;
|
|
55
61
|
function indexOf(opcodes, matchers, startIdx = 0) {
|
|
56
62
|
outer: for (let i = startIdx; i < opcodes.length - matchers.length; i++) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
63
|
+
let cursor = 0;
|
|
64
|
+
inner: for (let j = 0; j < matchers.length; j++) {
|
|
65
|
+
let op = opcodes[i + cursor];
|
|
66
|
+
if (matchers[j].match(op, i + cursor) === false) {
|
|
67
|
+
if (matchers[j].optional) {
|
|
68
|
+
continue inner;
|
|
69
|
+
}
|
|
60
70
|
continue outer;
|
|
61
71
|
}
|
|
72
|
+
cursor++;
|
|
62
73
|
}
|
|
63
74
|
return i;
|
|
64
75
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dequanto",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.72",
|
|
4
4
|
"author": {
|
|
5
5
|
"name": "Alex Kit",
|
|
6
6
|
"email": "alex.kit@atmajs.com"
|
|
@@ -16,6 +16,13 @@
|
|
|
16
16
|
"require": "./lib/cjs/*.js"
|
|
17
17
|
}
|
|
18
18
|
},
|
|
19
|
+
"typesVersions": {
|
|
20
|
+
"*": {
|
|
21
|
+
"*": [
|
|
22
|
+
"lib/types/*"
|
|
23
|
+
]
|
|
24
|
+
}
|
|
25
|
+
},
|
|
19
26
|
"scripts": {
|
|
20
27
|
"hardhat": "node --openssl-legacy-provider ./node_modules/hardhat/internal/cli/cli.js node --hostname 127.0.0.1 --verbose",
|
|
21
28
|
"build:tsc": "tsc -p tsconfig-src.json",
|
package/src/evm/OpcodesWalker.ts
CHANGED
|
@@ -119,8 +119,8 @@ export class OpcodesWalker {
|
|
|
119
119
|
if (typeof dest === 'number') {
|
|
120
120
|
let opcode = this.opcodes.find(x => x.pc === dest);
|
|
121
121
|
if (opcode == null) {
|
|
122
|
-
console.log(this.opcodes.map(x => `${x.pc
|
|
123
|
-
throw new Error(`No OPCODE found at ${dest
|
|
122
|
+
console.log(this.opcodes.map(x => `${x.pc} ${x.name}`).join('\n'));
|
|
123
|
+
throw new Error(`No OPCODE found at ${dest}`);
|
|
124
124
|
}
|
|
125
125
|
this.current = opcode;
|
|
126
126
|
this.evm.pc = this.current.pc;
|
|
@@ -11,9 +11,11 @@ export namespace $bytecode {
|
|
|
11
11
|
* remove the constructor code, leave the runtime bytecode only
|
|
12
12
|
*/
|
|
13
13
|
export function trimConstructorCode (code: TEth.Hex) {
|
|
14
|
-
let
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
let rgx = /6080(\d\d)?6040/g;
|
|
15
|
+
rgx.lastIndex = 4;
|
|
16
|
+
let initCode = rgx.exec(code);
|
|
17
|
+
if (initCode != null) {
|
|
18
|
+
code = `0x${code.substring(initCode.index)}`;
|
|
17
19
|
}
|
|
18
20
|
return code;
|
|
19
21
|
}
|
|
@@ -42,8 +44,9 @@ export namespace $bytecode {
|
|
|
42
44
|
|
|
43
45
|
// match 60806040 the beginning of the contract code
|
|
44
46
|
let ctorCodeIdx = indexOf(opcodes, [
|
|
45
|
-
(op) => op.opcode === 0x60 && op.pushData[0] === 0x80,
|
|
46
|
-
(op) => op.opcode ===
|
|
47
|
+
{ match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x80 },
|
|
48
|
+
{ match: (op) => op.opcode === 0x80, optional: true },
|
|
49
|
+
{ match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x40 },
|
|
47
50
|
], 2);
|
|
48
51
|
|
|
49
52
|
let codeSizeIdx = opcodes.findIndex(x => x.name === 'CODESIZE');
|
|
@@ -53,6 +56,9 @@ export namespace $bytecode {
|
|
|
53
56
|
}
|
|
54
57
|
|
|
55
58
|
let prev = opcodes[codeSizeIdx - 1];
|
|
59
|
+
if (/PUSH/.test(prev.name) === false) {
|
|
60
|
+
prev = opcodes[codeSizeIdx - 2];
|
|
61
|
+
}
|
|
56
62
|
$require.True(/PUSH/.test(prev.name), `PUSH expected but got ${prev.name}`);
|
|
57
63
|
|
|
58
64
|
let codeSizeValue = $buffer.toBigInt(prev.pushData) * 2n;
|
|
@@ -61,13 +67,21 @@ export namespace $bytecode {
|
|
|
61
67
|
};
|
|
62
68
|
}
|
|
63
69
|
|
|
64
|
-
function indexOf(opcodes: IOpcode[], matchers:
|
|
70
|
+
function indexOf(opcodes: IOpcode[], matchers: {
|
|
71
|
+
match: ((op: IOpcode, i?: number) => boolean),
|
|
72
|
+
optional?: boolean
|
|
73
|
+
}[], startIdx: number = 0) {
|
|
65
74
|
outer: for (let i = startIdx; i < opcodes.length - matchers.length; i++) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
75
|
+
let cursor = 0;
|
|
76
|
+
inner: for (let j = 0; j < matchers.length; j++) {
|
|
77
|
+
let op = opcodes[i + cursor];
|
|
78
|
+
if (matchers[j].match(op, i + cursor) === false) {
|
|
79
|
+
if (matchers[j].optional) {
|
|
80
|
+
continue inner;
|
|
81
|
+
}
|
|
69
82
|
continue outer;
|
|
70
83
|
}
|
|
84
|
+
cursor++;
|
|
71
85
|
}
|
|
72
86
|
return i;
|
|
73
87
|
}
|