dequanto 0.1.85 → 0.1.88
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/contracts/deploy/proxy/$proxyDeploy.js +17 -12
- package/lib/cjs/contracts/deploy/proxy/$proxyDeploy.js.map +1 -1
- package/lib/esm/contracts/deploy/proxy/$proxyDeploy.js.map +1 -1
- package/lib/esm/contracts/deploy/proxy/$proxyDeploy.mjs +17 -12
- package/package.json +1 -1
- package/src/contracts/deploy/proxy/$proxyDeploy.ts +18 -12
|
@@ -28,7 +28,9 @@ var $proxyDeploy;
|
|
|
28
28
|
$proxyDeploy.compareStorageLayout = compareStorageLayout;
|
|
29
29
|
async function compareStorageLayoutInner(oldVars, newVars, ctx) {
|
|
30
30
|
ctx ??= {};
|
|
31
|
-
|
|
31
|
+
// When resolving state variables
|
|
32
|
+
// we append '$' char(s) to the overriden variables to avoid name conflicts, so here we check also for __gap with possible $ sfx.
|
|
33
|
+
let rgxGap = /^_+gap\$*$/;
|
|
32
34
|
let oldMemory = oldVars.map(getMemoryPosition);
|
|
33
35
|
let oldLastSlot = (0, alot_1.default)(oldVars).max(x => x.slot);
|
|
34
36
|
for (let i = 0; i < newVars.length; i++) {
|
|
@@ -39,30 +41,28 @@ var $proxyDeploy;
|
|
|
39
41
|
return new BaseError(ELayoutError.MEMORY_OVERFLOW, newVar, [], ctx);
|
|
40
42
|
}
|
|
41
43
|
// Find the new variable name in old storage
|
|
44
|
+
// Exclude those with the same position, as they might be pushed logically down by __gap pattern
|
|
42
45
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
43
|
-
if (oldVarWithName != null) {
|
|
46
|
+
if (oldVarWithName != null && !Variables.eqLocation(oldVarWithName, newVar) && !rgxGap.test(newVar.name)) {
|
|
44
47
|
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [oldVarWithName], ctx);
|
|
45
48
|
}
|
|
46
49
|
continue;
|
|
47
50
|
}
|
|
48
|
-
if (rgxGap.test(newVar.name)) {
|
|
49
|
-
continue;
|
|
50
|
-
}
|
|
51
51
|
let isLastVariable = newVar.slot === oldLastSlot;
|
|
52
|
-
let
|
|
53
|
-
if (
|
|
54
|
-
if (
|
|
52
|
+
let oldVarAtSamePos = oldVars.find(x => x.slot === newVar.slot && x.position === newVar.position);
|
|
53
|
+
if (oldVarAtSamePos != null) {
|
|
54
|
+
if (oldVarAtSamePos.type === newVar.type) {
|
|
55
55
|
// New variable is the same
|
|
56
|
-
if (
|
|
56
|
+
if (oldVarAtSamePos.name !== newVar.name) {
|
|
57
57
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
58
58
|
if (oldVarWithName != null) {
|
|
59
|
-
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [
|
|
59
|
+
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [oldVarAtSamePos, oldVarWithName], ctx);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
continue;
|
|
63
63
|
}
|
|
64
64
|
if (isDynamicVariable(newVar)) {
|
|
65
|
-
let error = await Variables.compare(
|
|
65
|
+
let error = await Variables.compare(oldVarAtSamePos, newVar, ctx);
|
|
66
66
|
if (error != null) {
|
|
67
67
|
return error;
|
|
68
68
|
}
|
|
@@ -74,7 +74,7 @@ var $proxyDeploy;
|
|
|
74
74
|
if (current.offset + current.length <= mem.offset) {
|
|
75
75
|
return false;
|
|
76
76
|
}
|
|
77
|
-
if (current.offset
|
|
77
|
+
if (current.offset >= mem.offset + mem.length) {
|
|
78
78
|
return false;
|
|
79
79
|
}
|
|
80
80
|
return true;
|
|
@@ -101,6 +101,11 @@ var $proxyDeploy;
|
|
|
101
101
|
}
|
|
102
102
|
let Variables;
|
|
103
103
|
(function (Variables) {
|
|
104
|
+
function eqLocation(a, b) {
|
|
105
|
+
return a.slot === b.slot && a.position === b.position;
|
|
106
|
+
}
|
|
107
|
+
Variables.eqLocation = eqLocation;
|
|
108
|
+
;
|
|
104
109
|
async function compare(oldVar, newVar, ctx) {
|
|
105
110
|
if (_types_1.$types.isDynamicArray(newVar.type)) {
|
|
106
111
|
if (!_types_1.$types.isDynamicArray(oldVar.type)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":";;;;;;AAAA,gEAA6D;AAE7D,4DAAyD;AACzD,uDAAoD;AACpD,gDAAwB;AAExB,IAAiB,YAAY,
|
|
1
|
+
{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":";;;;;;AAAA,gEAA6D;AAE7D,4DAAyD;AACzD,uDAAoD;AACpD,gDAAwB;AAExB,IAAiB,YAAY,
|
|
1
|
+
{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,9 @@ export var $proxyDeploy;
|
|
|
22
22
|
$proxyDeploy.compareStorageLayout = compareStorageLayout;
|
|
23
23
|
async function compareStorageLayoutInner(oldVars, newVars, ctx) {
|
|
24
24
|
ctx ??= {};
|
|
25
|
-
|
|
25
|
+
// When resolving state variables
|
|
26
|
+
// we append '$' char(s) to the overriden variables to avoid name conflicts, so here we check also for __gap with possible $ sfx.
|
|
27
|
+
let rgxGap = /^_+gap\$*$/;
|
|
26
28
|
let oldMemory = oldVars.map(getMemoryPosition);
|
|
27
29
|
let oldLastSlot = alot(oldVars).max(x => x.slot);
|
|
28
30
|
for (let i = 0; i < newVars.length; i++) {
|
|
@@ -33,30 +35,28 @@ export var $proxyDeploy;
|
|
|
33
35
|
return new BaseError(ELayoutError.MEMORY_OVERFLOW, newVar, [], ctx);
|
|
34
36
|
}
|
|
35
37
|
// Find the new variable name in old storage
|
|
38
|
+
// Exclude those with the same position, as they might be pushed logically down by __gap pattern
|
|
36
39
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
37
|
-
if (oldVarWithName != null) {
|
|
40
|
+
if (oldVarWithName != null && !Variables.eqLocation(oldVarWithName, newVar) && !rgxGap.test(newVar.name)) {
|
|
38
41
|
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [oldVarWithName], ctx);
|
|
39
42
|
}
|
|
40
43
|
continue;
|
|
41
44
|
}
|
|
42
|
-
if (rgxGap.test(newVar.name)) {
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
45
|
let isLastVariable = newVar.slot === oldLastSlot;
|
|
46
|
-
let
|
|
47
|
-
if (
|
|
48
|
-
if (
|
|
46
|
+
let oldVarAtSamePos = oldVars.find(x => x.slot === newVar.slot && x.position === newVar.position);
|
|
47
|
+
if (oldVarAtSamePos != null) {
|
|
48
|
+
if (oldVarAtSamePos.type === newVar.type) {
|
|
49
49
|
// New variable is the same
|
|
50
|
-
if (
|
|
50
|
+
if (oldVarAtSamePos.name !== newVar.name) {
|
|
51
51
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
52
52
|
if (oldVarWithName != null) {
|
|
53
|
-
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [
|
|
53
|
+
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [oldVarAtSamePos, oldVarWithName], ctx);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
continue;
|
|
57
57
|
}
|
|
58
58
|
if (isDynamicVariable(newVar)) {
|
|
59
|
-
let error = await Variables.compare(
|
|
59
|
+
let error = await Variables.compare(oldVarAtSamePos, newVar, ctx);
|
|
60
60
|
if (error != null) {
|
|
61
61
|
return error;
|
|
62
62
|
}
|
|
@@ -68,7 +68,7 @@ export var $proxyDeploy;
|
|
|
68
68
|
if (current.offset + current.length <= mem.offset) {
|
|
69
69
|
return false;
|
|
70
70
|
}
|
|
71
|
-
if (current.offset
|
|
71
|
+
if (current.offset >= mem.offset + mem.length) {
|
|
72
72
|
return false;
|
|
73
73
|
}
|
|
74
74
|
return true;
|
|
@@ -95,6 +95,11 @@ export var $proxyDeploy;
|
|
|
95
95
|
}
|
|
96
96
|
let Variables;
|
|
97
97
|
(function (Variables) {
|
|
98
|
+
function eqLocation(a, b) {
|
|
99
|
+
return a.slot === b.slot && a.position === b.position;
|
|
100
|
+
}
|
|
101
|
+
Variables.eqLocation = eqLocation;
|
|
102
|
+
;
|
|
98
103
|
async function compare(oldVar, newVar, ctx) {
|
|
99
104
|
if ($types.isDynamicArray(newVar.type)) {
|
|
100
105
|
if (!$types.isDynamicArray(oldVar.type)) {
|
package/package.json
CHANGED
|
@@ -34,7 +34,9 @@ export namespace $proxyDeploy {
|
|
|
34
34
|
|
|
35
35
|
ctx ??= {};
|
|
36
36
|
|
|
37
|
-
|
|
37
|
+
// When resolving state variables
|
|
38
|
+
// we append '$' char(s) to the overriden variables to avoid name conflicts, so here we check also for __gap with possible $ sfx.
|
|
39
|
+
let rgxGap = /^_+gap\$*$/;
|
|
38
40
|
let oldMemory = oldVars.map(getMemoryPosition);
|
|
39
41
|
let oldLastSlot = alot(oldVars).max(x => x.slot);
|
|
40
42
|
for (let i = 0; i < newVars.length; i++) {
|
|
@@ -49,9 +51,11 @@ export namespace $proxyDeploy {
|
|
|
49
51
|
ctx
|
|
50
52
|
);
|
|
51
53
|
}
|
|
54
|
+
|
|
52
55
|
// Find the new variable name in old storage
|
|
56
|
+
// Exclude those with the same position, as they might be pushed logically down by __gap pattern
|
|
53
57
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
54
|
-
if (oldVarWithName != null) {
|
|
58
|
+
if (oldVarWithName != null && !Variables.eqLocation(oldVarWithName, newVar) && !rgxGap.test(newVar.name)) {
|
|
55
59
|
return new BaseError(
|
|
56
60
|
ELayoutError.NAME_MISMATCH,
|
|
57
61
|
newVar,
|
|
@@ -61,21 +65,18 @@ export namespace $proxyDeploy {
|
|
|
61
65
|
}
|
|
62
66
|
continue;
|
|
63
67
|
}
|
|
64
|
-
if (rgxGap.test(newVar.name)) {
|
|
65
|
-
continue;
|
|
66
|
-
}
|
|
67
68
|
let isLastVariable = newVar.slot === oldLastSlot;
|
|
68
|
-
let
|
|
69
|
-
if (
|
|
70
|
-
if (
|
|
69
|
+
let oldVarAtSamePos = oldVars.find(x => x.slot === newVar.slot && x.position === newVar.position);
|
|
70
|
+
if (oldVarAtSamePos != null) {
|
|
71
|
+
if (oldVarAtSamePos.type === newVar.type) {
|
|
71
72
|
// New variable is the same
|
|
72
|
-
if (
|
|
73
|
+
if (oldVarAtSamePos.name !== newVar.name) {
|
|
73
74
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
74
75
|
if (oldVarWithName != null) {
|
|
75
76
|
return new BaseError(
|
|
76
77
|
ELayoutError.NAME_MISMATCH,
|
|
77
78
|
newVar,
|
|
78
|
-
[
|
|
79
|
+
[oldVarAtSamePos, oldVarWithName],
|
|
79
80
|
ctx
|
|
80
81
|
);
|
|
81
82
|
}
|
|
@@ -83,7 +84,7 @@ export namespace $proxyDeploy {
|
|
|
83
84
|
continue;
|
|
84
85
|
}
|
|
85
86
|
if (isDynamicVariable(newVar)) {
|
|
86
|
-
let error = await Variables.compare(
|
|
87
|
+
let error = await Variables.compare(oldVarAtSamePos, newVar, ctx);
|
|
87
88
|
if (error != null) {
|
|
88
89
|
return error;
|
|
89
90
|
}
|
|
@@ -96,11 +97,12 @@ export namespace $proxyDeploy {
|
|
|
96
97
|
if (current.offset + current.length <= mem.offset) {
|
|
97
98
|
return false;
|
|
98
99
|
}
|
|
99
|
-
if (current.offset
|
|
100
|
+
if (current.offset >= mem.offset + mem.length) {
|
|
100
101
|
return false;
|
|
101
102
|
}
|
|
102
103
|
return true;
|
|
103
104
|
});
|
|
105
|
+
|
|
104
106
|
collisions = collisions.filter(x => {
|
|
105
107
|
return rgxGap.test(x.variable.name) === false;
|
|
106
108
|
});
|
|
@@ -130,6 +132,10 @@ export namespace $proxyDeploy {
|
|
|
130
132
|
|
|
131
133
|
|
|
132
134
|
namespace Variables {
|
|
135
|
+
export function eqLocation (a: ISlotVarDefinition, b: ISlotVarDefinition) {
|
|
136
|
+
return a.slot === b.slot && a.position === b.position;
|
|
137
|
+
};
|
|
138
|
+
|
|
133
139
|
export async function compare (oldVar: ISlotVarDefinition, newVar: ISlotVarDefinition, ctx: ICtx) {
|
|
134
140
|
if ($types.isDynamicArray(newVar.type)) {
|
|
135
141
|
if (!$types.isDynamicArray(oldVar.type)) {
|