@openzeppelin/upgrades-core 1.42.2 → 1.44.0
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/artifacts/@openzeppelin/contracts-v5/proxy/ERC1967/ERC1967Proxy.sol/ERC1967Proxy.json +3 -3
- package/artifacts/@openzeppelin/contracts-v5/proxy/beacon/BeaconProxy.sol/BeaconProxy.json +3 -3
- package/artifacts/@openzeppelin/contracts-v5/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json +2 -2
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/ProxyAdmin.sol/ProxyAdmin.json +2 -2
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/ITransparentUpgradeableProxy.json +2 -2
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json +3 -3
- package/artifacts/build-info-v5.json +5159 -2886
- package/dist/provider.d.ts.map +1 -1
- package/dist/provider.js +1 -0
- package/dist/provider.js.map +1 -1
- package/dist/solidity-version.json +1 -1
- package/dist/storage/extract.d.ts.map +1 -1
- package/dist/storage/extract.js +14 -0
- package/dist/storage/extract.js.map +1 -1
- package/dist/storage/index.d.ts.map +1 -1
- package/dist/storage/index.js +23 -0
- package/dist/storage/index.js.map +1 -1
- package/dist/storage/layout.d.ts +1 -0
- package/dist/storage/layout.d.ts.map +1 -1
- package/dist/storage/layout.js.map +1 -1
- package/dist/storage/namespace.d.ts.map +1 -1
- package/dist/storage/namespace.js +47 -1
- package/dist/storage/namespace.js.map +1 -1
- package/dist/storage-custom-layout.test.d.ts +2 -0
- package/dist/storage-custom-layout.test.d.ts.map +1 -0
- package/dist/storage-custom-layout.test.js +314 -0
- package/dist/storage-custom-layout.test.js.map +1 -0
- package/dist/utils/erc7201.d.ts +10 -0
- package/dist/utils/erc7201.d.ts.map +1 -0
- package/dist/utils/erc7201.js +24 -0
- package/dist/utils/erc7201.js.map +1 -0
- package/dist/utils/erc7201.test.d.ts +2 -0
- package/dist/utils/erc7201.test.d.ts.map +1 -0
- package/dist/utils/erc7201.test.js +11 -0
- package/dist/utils/erc7201.test.js.map +1 -0
- package/dist/utils/integer-literals.d.ts +15 -0
- package/dist/utils/integer-literals.d.ts.map +1 -0
- package/dist/utils/integer-literals.js +34 -0
- package/dist/utils/integer-literals.js.map +1 -0
- package/dist/utils/integer-literals.test.d.ts +2 -0
- package/dist/utils/integer-literals.test.d.ts.map +1 -0
- package/dist/utils/integer-literals.test.js +57 -0
- package/dist/utils/integer-literals.test.js.map +1 -0
- package/dist/utils/make-namespaced.d.ts.map +1 -1
- package/dist/utils/make-namespaced.js +4 -0
- package/dist/utils/make-namespaced.js.map +1 -1
- package/dist/utils/make-namespaced.test.js +4 -0
- package/dist/utils/make-namespaced.test.js.map +1 -1
- package/dist/utils/stabilize-layout.d.ts +1 -0
- package/dist/utils/stabilize-layout.d.ts.map +1 -1
- package/dist/utils/stabilize-layout.js +1 -0
- package/dist/utils/stabilize-layout.js.map +1 -1
- package/dist/validate/run/initializer.d.ts.map +1 -1
- package/dist/validate/run/initializer.js +42 -10
- package/dist/validate/run/initializer.js.map +1 -1
- package/dist/validate-initializers.test.js +23 -5
- package/dist/validate-initializers.test.js.map +1 -1
- package/package.json +7 -4
- package/src/provider.ts +1 -0
- package/src/solidity-version.json +1 -1
- package/src/storage/extract.ts +21 -0
- package/src/storage/index.ts +29 -0
- package/src/storage/layout.ts +1 -0
- package/src/storage/namespace.ts +67 -1
- package/src/storage-0.8.test.ts.md +4 -0
- package/src/storage-0.8.test.ts.snap +0 -0
- package/src/storage-custom-layout.test.ts +358 -0
- package/src/storage-custom-layout.test.ts.md +353 -0
- package/src/storage-custom-layout.test.ts.snap +0 -0
- package/src/storage-memory-0.5.test.ts.md +2 -0
- package/src/storage-memory-0.5.test.ts.snap +0 -0
- package/src/storage-namespaced-layout.test.ts.md +1 -0
- package/src/storage-namespaced-layout.test.ts.snap +0 -0
- package/src/storage-namespaced.test.ts.md +2 -0
- package/src/storage-namespaced.test.ts.snap +0 -0
- package/src/storage.test.ts.md +2 -0
- package/src/storage.test.ts.snap +0 -0
- package/src/utils/erc7201.test.ts +10 -0
- package/src/utils/erc7201.ts +25 -0
- package/src/utils/integer-literals.test.ts +73 -0
- package/src/utils/integer-literals.ts +29 -0
- package/src/utils/make-namespaced.test.ts +7 -0
- package/src/utils/make-namespaced.test.ts.md +50 -0
- package/src/utils/make-namespaced.test.ts.snap +0 -0
- package/src/utils/make-namespaced.ts +5 -0
- package/src/utils/stabilize-layout.ts +1 -0
- package/src/validate/run/initializer.ts +65 -19
- package/src/validate-initializers.test.ts +28 -6
|
@@ -0,0 +1,314 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const ava_1 = __importDefault(require("ava"));
|
|
7
|
+
const utils_1 = require("solidity-ast/utils");
|
|
8
|
+
const hardhat_1 = require("hardhat");
|
|
9
|
+
const storage_1 = require("./storage");
|
|
10
|
+
const extract_1 = require("./storage/extract");
|
|
11
|
+
const stabilize_layout_1 = require("./utils/stabilize-layout");
|
|
12
|
+
const test = ava_1.default;
|
|
13
|
+
test.before(async (t) => {
|
|
14
|
+
const buildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/CustomLayout.sol:CustomLayout');
|
|
15
|
+
if (buildInfo === undefined) {
|
|
16
|
+
throw new Error('Build info not found');
|
|
17
|
+
}
|
|
18
|
+
const solcOutput = buildInfo.output;
|
|
19
|
+
const contracts = {};
|
|
20
|
+
const storageLayouts = {};
|
|
21
|
+
for (const def of (0, utils_1.findAll)('ContractDefinition', solcOutput.sources['contracts/test/CustomLayout.sol'].ast)) {
|
|
22
|
+
contracts[def.name] = def;
|
|
23
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
24
|
+
storageLayouts[def.name] = solcOutput.contracts['contracts/test/CustomLayout.sol'][def.name].storageLayout;
|
|
25
|
+
}
|
|
26
|
+
const deref = (0, utils_1.astDereferencer)(solcOutput);
|
|
27
|
+
t.context.extractStorageLayout = name => (0, extract_1.extractStorageLayout)(contracts[name], dummyDecodeSrc, deref, storageLayouts[name]);
|
|
28
|
+
// For testing fallback behavior when storage layout is missing from compilation output
|
|
29
|
+
t.context.extractStorageLayoutFallback = name => (0, extract_1.extractStorageLayout)(contracts[name], dummyDecodeSrc, deref, undefined);
|
|
30
|
+
});
|
|
31
|
+
const dummyDecodeSrc = () => 'file.sol:1';
|
|
32
|
+
test('CustomLayout', t => {
|
|
33
|
+
const layout = t.context.extractStorageLayout('CustomLayout');
|
|
34
|
+
t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(layout));
|
|
35
|
+
});
|
|
36
|
+
test('CustomLayout - fallback', t => {
|
|
37
|
+
const layout = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
38
|
+
t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(layout));
|
|
39
|
+
});
|
|
40
|
+
test('CustomLayout same root - ok', t => {
|
|
41
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
42
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Same_Root_Ok');
|
|
43
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
44
|
+
t.deepEqual(comparison, []);
|
|
45
|
+
});
|
|
46
|
+
test('CustomLayout same root - fallback - ok', t => {
|
|
47
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
48
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Same_Root_Ok');
|
|
49
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
50
|
+
t.deepEqual(comparison, []);
|
|
51
|
+
});
|
|
52
|
+
test('CustomLayout same root decimal - ok', t => {
|
|
53
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
54
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Same_Root_Decimal_Ok');
|
|
55
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
56
|
+
t.deepEqual(comparison, []);
|
|
57
|
+
});
|
|
58
|
+
test('CustomLayout same root decimal - fallback - ok', t => {
|
|
59
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
60
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Same_Root_Decimal_Ok');
|
|
61
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
62
|
+
t.deepEqual(comparison, []);
|
|
63
|
+
});
|
|
64
|
+
test('CustomLayout same root scientific notation - ok', t => {
|
|
65
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
66
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Same_Root_ScientificNotation_Ok');
|
|
67
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
68
|
+
t.deepEqual(comparison, []);
|
|
69
|
+
});
|
|
70
|
+
test('CustomLayout same root scientific notation - fallback - ok', t => {
|
|
71
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
72
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Same_Root_ScientificNotation_Ok');
|
|
73
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
74
|
+
t.deepEqual(comparison, []);
|
|
75
|
+
});
|
|
76
|
+
test('CustomLayout changed root - bad', t => {
|
|
77
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
78
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Changed_Root_Bad');
|
|
79
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
80
|
+
t.like(comparison, {
|
|
81
|
+
length: 2,
|
|
82
|
+
0: {
|
|
83
|
+
kind: 'layoutchange',
|
|
84
|
+
change: {
|
|
85
|
+
slot: {
|
|
86
|
+
from: '1',
|
|
87
|
+
to: '2',
|
|
88
|
+
},
|
|
89
|
+
},
|
|
90
|
+
original: { label: 'x' },
|
|
91
|
+
updated: { label: 'x' },
|
|
92
|
+
},
|
|
93
|
+
1: {
|
|
94
|
+
kind: 'layoutchange',
|
|
95
|
+
change: {
|
|
96
|
+
slot: {
|
|
97
|
+
from: '2',
|
|
98
|
+
to: '3',
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
original: { label: 'y' },
|
|
102
|
+
updated: { label: 'y' },
|
|
103
|
+
},
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
test('CustomLayout changed root - fallback - bad', t => {
|
|
107
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
108
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Changed_Root_Bad');
|
|
109
|
+
const error = t.throws(() => (0, storage_1.getStorageUpgradeErrors)(v1, v2));
|
|
110
|
+
t.snapshot(error?.message);
|
|
111
|
+
});
|
|
112
|
+
test('CustomLayout changed root decimal - bad', t => {
|
|
113
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
114
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Changed_Root_Decimal_Bad');
|
|
115
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
116
|
+
t.like(comparison, {
|
|
117
|
+
length: 2,
|
|
118
|
+
0: {
|
|
119
|
+
kind: 'layoutchange',
|
|
120
|
+
change: {
|
|
121
|
+
slot: {
|
|
122
|
+
from: '1',
|
|
123
|
+
to: '2',
|
|
124
|
+
},
|
|
125
|
+
},
|
|
126
|
+
original: { label: 'x' },
|
|
127
|
+
updated: { label: 'x' },
|
|
128
|
+
},
|
|
129
|
+
1: {
|
|
130
|
+
kind: 'layoutchange',
|
|
131
|
+
change: {
|
|
132
|
+
slot: {
|
|
133
|
+
from: '2',
|
|
134
|
+
to: '3',
|
|
135
|
+
},
|
|
136
|
+
},
|
|
137
|
+
original: { label: 'y' },
|
|
138
|
+
updated: { label: 'y' },
|
|
139
|
+
},
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
test('CustomLayout changed root decimal - fallback - bad', t => {
|
|
143
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
144
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Changed_Root_Decimal_Bad');
|
|
145
|
+
const error = t.throws(() => (0, storage_1.getStorageUpgradeErrors)(v1, v2));
|
|
146
|
+
t.snapshot(error?.message);
|
|
147
|
+
});
|
|
148
|
+
test('CustomLayout changed root scientific notation - bad', t => {
|
|
149
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
150
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Changed_Root_ScientificNotation_Bad');
|
|
151
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
152
|
+
t.like(comparison, {
|
|
153
|
+
length: 2,
|
|
154
|
+
0: {
|
|
155
|
+
kind: 'layoutchange',
|
|
156
|
+
change: {
|
|
157
|
+
slot: {
|
|
158
|
+
from: '1',
|
|
159
|
+
to: '20000000000',
|
|
160
|
+
},
|
|
161
|
+
},
|
|
162
|
+
original: { label: 'x' },
|
|
163
|
+
updated: { label: 'x' },
|
|
164
|
+
},
|
|
165
|
+
1: {
|
|
166
|
+
kind: 'layoutchange',
|
|
167
|
+
change: {
|
|
168
|
+
slot: {
|
|
169
|
+
from: '2',
|
|
170
|
+
to: '20000000001',
|
|
171
|
+
},
|
|
172
|
+
},
|
|
173
|
+
original: { label: 'y' },
|
|
174
|
+
updated: { label: 'y' },
|
|
175
|
+
},
|
|
176
|
+
});
|
|
177
|
+
});
|
|
178
|
+
test('CustomLayout changed root scientific notation - fallback - bad', t => {
|
|
179
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
180
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Changed_Root_ScientificNotation_Bad');
|
|
181
|
+
const error = t.throws(() => (0, storage_1.getStorageUpgradeErrors)(v1, v2));
|
|
182
|
+
t.snapshot(error?.message);
|
|
183
|
+
});
|
|
184
|
+
test('CustomLayout changed to default - bad', t => {
|
|
185
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
186
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Changed_To_Default_Bad');
|
|
187
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
188
|
+
t.like(comparison, {
|
|
189
|
+
length: 2,
|
|
190
|
+
0: {
|
|
191
|
+
kind: 'layoutchange',
|
|
192
|
+
change: {
|
|
193
|
+
slot: {
|
|
194
|
+
from: '1',
|
|
195
|
+
to: '0',
|
|
196
|
+
},
|
|
197
|
+
},
|
|
198
|
+
original: { label: 'x' },
|
|
199
|
+
updated: { label: 'x' },
|
|
200
|
+
},
|
|
201
|
+
1: {
|
|
202
|
+
kind: 'layoutchange',
|
|
203
|
+
change: {
|
|
204
|
+
slot: {
|
|
205
|
+
from: '2',
|
|
206
|
+
to: '1',
|
|
207
|
+
},
|
|
208
|
+
},
|
|
209
|
+
original: { label: 'y' },
|
|
210
|
+
updated: { label: 'y' },
|
|
211
|
+
},
|
|
212
|
+
});
|
|
213
|
+
});
|
|
214
|
+
test('CustomLayout changed to default - fallback - bad', t => {
|
|
215
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
216
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Changed_To_Default_Bad');
|
|
217
|
+
const error = t.throws(() => (0, storage_1.getStorageUpgradeErrors)(v1, v2));
|
|
218
|
+
t.snapshot(error?.message);
|
|
219
|
+
});
|
|
220
|
+
test('CustomLayout changed root - ok', t => {
|
|
221
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
222
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Changed_Root_Ok');
|
|
223
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
224
|
+
t.deepEqual(comparison, []);
|
|
225
|
+
});
|
|
226
|
+
test('CustomLayout changed root - fallback - bad (no layout info)', t => {
|
|
227
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
228
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Changed_Root_Ok');
|
|
229
|
+
const error = t.throws(() => (0, storage_1.getStorageUpgradeErrors)(v1, v2));
|
|
230
|
+
t.snapshot(error?.message);
|
|
231
|
+
});
|
|
232
|
+
test('CustomLayout changed root - fallback - unsafeSkipStorageCheck', t => {
|
|
233
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
234
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Changed_Root_Ok');
|
|
235
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2, { unsafeSkipStorageCheck: true });
|
|
236
|
+
t.deepEqual(comparison, []);
|
|
237
|
+
});
|
|
238
|
+
test('CustomLayout changed to default - ok', t => {
|
|
239
|
+
const v1 = t.context.extractStorageLayout('CustomLayout');
|
|
240
|
+
const v2 = t.context.extractStorageLayout('CustomLayout_Changed_To_Default_Ok');
|
|
241
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
242
|
+
t.deepEqual(comparison, []);
|
|
243
|
+
});
|
|
244
|
+
test('CustomLayout changed to default - fallback - bad (no layout info)', t => {
|
|
245
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
246
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Changed_To_Default_Ok');
|
|
247
|
+
const error = t.throws(() => (0, storage_1.getStorageUpgradeErrors)(v1, v2));
|
|
248
|
+
t.snapshot(error?.message);
|
|
249
|
+
});
|
|
250
|
+
test('CustomLayout changed to default - fallback - unsafeSkipStorageCheck', t => {
|
|
251
|
+
const v1 = t.context.extractStorageLayoutFallback('CustomLayout');
|
|
252
|
+
const v2 = t.context.extractStorageLayoutFallback('CustomLayout_Changed_To_Default_Ok');
|
|
253
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2, { unsafeSkipStorageCheck: true });
|
|
254
|
+
t.deepEqual(comparison, []);
|
|
255
|
+
});
|
|
256
|
+
test('CustomLayout unsupported node type', t => {
|
|
257
|
+
const error = t.throws(() => t.context.extractStorageLayout('CustomLayout_Unsupported_Node_Type'));
|
|
258
|
+
t.snapshot(error?.message);
|
|
259
|
+
});
|
|
260
|
+
test('Namespaced - default to custom layout without regular variables - ok', t => {
|
|
261
|
+
const v1 = t.context.extractStorageLayout('Namespaced_Default_Layout');
|
|
262
|
+
const v2 = t.context.extractStorageLayout('Namespaced_Custom_Layout_Unaffected');
|
|
263
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
264
|
+
t.deepEqual(comparison, []);
|
|
265
|
+
});
|
|
266
|
+
test('Namespaced - default to custom layout without regular variables - fallback - ok', t => {
|
|
267
|
+
const v1 = t.context.extractStorageLayoutFallback('Namespaced_Default_Layout');
|
|
268
|
+
const v2 = t.context.extractStorageLayoutFallback('Namespaced_Custom_Layout_Unaffected');
|
|
269
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
270
|
+
t.deepEqual(comparison, []);
|
|
271
|
+
});
|
|
272
|
+
test('Namespaced - custom layout clash', t => {
|
|
273
|
+
const error = t.throws(() => t.context.extractStorageLayout('Namespaced_Custom_Layout_Clash'));
|
|
274
|
+
t.snapshot(error?.message);
|
|
275
|
+
});
|
|
276
|
+
test('Namespaced - custom layout clash decimal', t => {
|
|
277
|
+
const error = t.throws(() => t.context.extractStorageLayout('Namespaced_Custom_Layout_Clash_Decimal'));
|
|
278
|
+
t.snapshot(error?.message);
|
|
279
|
+
});
|
|
280
|
+
test('Namespaced - custom layout clash extra colon', t => {
|
|
281
|
+
const error = t.throws(() => t.context.extractStorageLayout('Namespaced_Custom_Layout_Clash_Extra_Colon'));
|
|
282
|
+
t.snapshot(error?.message);
|
|
283
|
+
});
|
|
284
|
+
test('CustomLayout no namespace formula - ok', t => {
|
|
285
|
+
const layout = t.context.extractStorageLayout('CustomLayout_No_Namespace_Formula');
|
|
286
|
+
t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(layout));
|
|
287
|
+
});
|
|
288
|
+
test('CustomLayout unknown namespace formula - ok', t => {
|
|
289
|
+
const layout = t.context.extractStorageLayout('CustomLayout_Unknown_Namespace_Formula');
|
|
290
|
+
t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(layout));
|
|
291
|
+
});
|
|
292
|
+
test('CustomLayout multiple namespaces', t => {
|
|
293
|
+
const layout = t.context.extractStorageLayout('CustomLayout_Multiple_Namespaces');
|
|
294
|
+
t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(layout));
|
|
295
|
+
});
|
|
296
|
+
test('Gap - changed root - ok', t => {
|
|
297
|
+
const v1 = t.context.extractStorageLayout('Gap');
|
|
298
|
+
const v2 = t.context.extractStorageLayout('Gap_Changed_Root_Ok');
|
|
299
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
300
|
+
t.deepEqual(comparison, []);
|
|
301
|
+
});
|
|
302
|
+
test('Gap - changed root - fallback - bad (no layout info)', t => {
|
|
303
|
+
const v1 = t.context.extractStorageLayoutFallback('Gap');
|
|
304
|
+
const v2 = t.context.extractStorageLayoutFallback('Gap_Changed_Root_Ok');
|
|
305
|
+
const error = t.throws(() => (0, storage_1.getStorageUpgradeErrors)(v1, v2));
|
|
306
|
+
t.snapshot(error?.message);
|
|
307
|
+
});
|
|
308
|
+
test('Gap - changed root - fallback - unsafeSkipStorageCheck', t => {
|
|
309
|
+
const v1 = t.context.extractStorageLayoutFallback('Gap');
|
|
310
|
+
const v2 = t.context.extractStorageLayoutFallback('Gap_Changed_Root_Ok');
|
|
311
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2, { unsafeSkipStorageCheck: true });
|
|
312
|
+
t.deepEqual(comparison, []);
|
|
313
|
+
});
|
|
314
|
+
//# sourceMappingURL=storage-custom-layout.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage-custom-layout.test.js","sourceRoot":"","sources":["../src/storage-custom-layout.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare const ERC7201_FORMULA_PREFIX = "erc7201:";
|
|
2
|
+
/**
|
|
3
|
+
* Returns the ERC-7201 storage location hash for a given namespace id using formula:
|
|
4
|
+
* keccak256(abi.encode(uint256(keccak256(bytes(id))) - 1)) & ~bytes32(uint256(0xff))
|
|
5
|
+
*
|
|
6
|
+
* @param id The namespace id, not including the 'erc7201:' prefix
|
|
7
|
+
* @returns The ERC-7201 storage location hash as a hex string
|
|
8
|
+
*/
|
|
9
|
+
export declare function calculateERC7201StorageLocation(id: string): string;
|
|
10
|
+
//# sourceMappingURL=erc7201.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erc7201.d.ts","sourceRoot":"","sources":["../../src/utils/erc7201.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB,aAAa,CAAC;AAEjD;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAalE"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ERC7201_FORMULA_PREFIX = void 0;
|
|
4
|
+
exports.calculateERC7201StorageLocation = calculateERC7201StorageLocation;
|
|
5
|
+
const ethereumjs_util_1 = require("ethereumjs-util");
|
|
6
|
+
exports.ERC7201_FORMULA_PREFIX = 'erc7201:';
|
|
7
|
+
/**
|
|
8
|
+
* Returns the ERC-7201 storage location hash for a given namespace id using formula:
|
|
9
|
+
* keccak256(abi.encode(uint256(keccak256(bytes(id))) - 1)) & ~bytes32(uint256(0xff))
|
|
10
|
+
*
|
|
11
|
+
* @param id The namespace id, not including the 'erc7201:' prefix
|
|
12
|
+
* @returns The ERC-7201 storage location hash as a hex string
|
|
13
|
+
*/
|
|
14
|
+
function calculateERC7201StorageLocation(id) {
|
|
15
|
+
const firstHash = (0, ethereumjs_util_1.keccak256)(Buffer.from(id));
|
|
16
|
+
const minusOne = BigInt(`0x${firstHash.toString('hex')}`) - 1n;
|
|
17
|
+
const minusOneBuffer = Buffer.from(minusOne.toString(16), 'hex');
|
|
18
|
+
const secondHash = (0, ethereumjs_util_1.keccak256)(minusOneBuffer);
|
|
19
|
+
const mask = BigInt('0xff');
|
|
20
|
+
const masked = BigInt(`0x${secondHash.toString('hex')}`) & ~mask;
|
|
21
|
+
const padded = masked.toString(16).padStart(64, '0');
|
|
22
|
+
return `0x${padded}`;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=erc7201.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erc7201.js","sourceRoot":"","sources":["../../src/utils/erc7201.ts"],"names":[],"mappings":";;;AAWA,0EAaC;AAxBD,qDAA4C;AAE/B,QAAA,sBAAsB,GAAG,UAAU,CAAC;AAEjD;;;;;;GAMG;AACH,SAAgB,+BAA+B,CAAC,EAAU;IACxD,MAAM,SAAS,GAAG,IAAA,2BAAS,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;IAC/D,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,IAAA,2BAAS,EAAC,cAAc,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;IAEjE,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAErD,OAAO,KAAK,MAAM,EAAE,CAAC;AACvB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erc7201.test.d.ts","sourceRoot":"","sources":["../../src/utils/erc7201.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const ava_1 = __importDefault(require("ava"));
|
|
7
|
+
const erc7201_1 = require("./erc7201");
|
|
8
|
+
(0, ava_1.default)('calculateERC7201StorageLocation', t => {
|
|
9
|
+
t.is((0, erc7201_1.calculateERC7201StorageLocation)('example.main'), '0x183a6125c38840424c4a85fa12bab2ab606c4b6d0e7cc73c0c06ba5300eab500');
|
|
10
|
+
});
|
|
11
|
+
//# sourceMappingURL=erc7201.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erc7201.test.js","sourceRoot":"","sources":["../../src/utils/erc7201.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,uCAA4D;AAE5D,IAAA,aAAI,EAAC,iCAAiC,EAAE,CAAC,CAAC,EAAE;IAC1C,CAAC,CAAC,EAAE,CACF,IAAA,yCAA+B,EAAC,cAAc,CAAC,EAC/C,oEAAoE,CACrE,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Converts a Solidity unsigned integer literal according to https://docs.soliditylang.org/en/latest/types.html#rational-literals
|
|
3
|
+
* to a 64-byte padded hex string.
|
|
4
|
+
*
|
|
5
|
+
* Accepts decimal, hexadecimal, and scientific notation formats.
|
|
6
|
+
*
|
|
7
|
+
* If the input is null or undefined, returns '0x0000000000000000000000000000000000000000000000000000000000000000'.
|
|
8
|
+
*
|
|
9
|
+
* Assumes the input is a valid uint256-compatible literal for Solidity, and only performs minimal validation.
|
|
10
|
+
*
|
|
11
|
+
* @param literal Integer literal to convert
|
|
12
|
+
* @returns Hex string with 0x prefix, padded to 64 bytes with leading zeroes
|
|
13
|
+
*/
|
|
14
|
+
export declare function normalizeUint256Literal(literal: string | null | undefined): string;
|
|
15
|
+
//# sourceMappingURL=integer-literals.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"integer-literals.d.ts","sourceRoot":"","sources":["../../src/utils/integer-literals.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAalF"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.normalizeUint256Literal = normalizeUint256Literal;
|
|
7
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
|
+
/**
|
|
9
|
+
* Converts a Solidity unsigned integer literal according to https://docs.soliditylang.org/en/latest/types.html#rational-literals
|
|
10
|
+
* to a 64-byte padded hex string.
|
|
11
|
+
*
|
|
12
|
+
* Accepts decimal, hexadecimal, and scientific notation formats.
|
|
13
|
+
*
|
|
14
|
+
* If the input is null or undefined, returns '0x0000000000000000000000000000000000000000000000000000000000000000'.
|
|
15
|
+
*
|
|
16
|
+
* Assumes the input is a valid uint256-compatible literal for Solidity, and only performs minimal validation.
|
|
17
|
+
*
|
|
18
|
+
* @param literal Integer literal to convert
|
|
19
|
+
* @returns Hex string with 0x prefix, padded to 64 bytes with leading zeroes
|
|
20
|
+
*/
|
|
21
|
+
function normalizeUint256Literal(literal) {
|
|
22
|
+
if (!literal) {
|
|
23
|
+
return '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
24
|
+
}
|
|
25
|
+
const lowercaseNoUnderscores = literal.replace(/_/g, '').toLowerCase();
|
|
26
|
+
const parsed = new bignumber_js_1.default(lowercaseNoUnderscores);
|
|
27
|
+
if (!parsed.isInteger()) {
|
|
28
|
+
throw new Error(`Invalid integer literal: ${literal}`);
|
|
29
|
+
}
|
|
30
|
+
const calculatedValueAsHex = parsed.toString(16);
|
|
31
|
+
const padded = calculatedValueAsHex.padStart(64, '0');
|
|
32
|
+
return `0x${padded}`;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=integer-literals.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"integer-literals.js","sourceRoot":"","sources":["../../src/utils/integer-literals.ts"],"names":[],"mappings":";;;;;AAeA,0DAaC;AA5BD,gEAAqC;AAErC;;;;;;;;;;;;GAYG;AACH,SAAgB,uBAAuB,CAAC,OAAkC;IACxE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,oEAAoE,CAAC;IAC9E,CAAC;IACD,MAAM,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAEvE,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,sBAAsB,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtD,OAAO,KAAK,MAAM,EAAE,CAAC;AACvB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"integer-literals.test.d.ts","sourceRoot":"","sources":["../../src/utils/integer-literals.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const ava_1 = __importDefault(require("ava"));
|
|
7
|
+
const integer_literals_1 = require("./integer-literals");
|
|
8
|
+
const ZEROES = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
9
|
+
(0, ava_1.default)('falsy', t => {
|
|
10
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)(undefined), ZEROES);
|
|
11
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)(null), ZEROES);
|
|
12
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)(''), ZEROES);
|
|
13
|
+
});
|
|
14
|
+
(0, ava_1.default)('hex', t => {
|
|
15
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x12e3'), '0x00000000000000000000000000000000000000000000000000000000000012e3');
|
|
16
|
+
});
|
|
17
|
+
(0, ava_1.default)('hex - leading zeroes', t => {
|
|
18
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x0012e3'), '0x00000000000000000000000000000000000000000000000000000000000012e3');
|
|
19
|
+
});
|
|
20
|
+
(0, ava_1.default)('hex - capital', t => {
|
|
21
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x12E3'), '0x00000000000000000000000000000000000000000000000000000000000012e3');
|
|
22
|
+
});
|
|
23
|
+
(0, ava_1.default)('decimal', t => {
|
|
24
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('1234'), '0x00000000000000000000000000000000000000000000000000000000000004d2');
|
|
25
|
+
});
|
|
26
|
+
(0, ava_1.default)('zeroes', t => {
|
|
27
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0'), ZEROES);
|
|
28
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x000'), ZEROES);
|
|
29
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)(ZEROES), ZEROES);
|
|
30
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('-0'), ZEROES);
|
|
31
|
+
});
|
|
32
|
+
(0, ava_1.default)('underscores', t => {
|
|
33
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('1_23_4'), '0x00000000000000000000000000000000000000000000000000000000000004d2');
|
|
34
|
+
});
|
|
35
|
+
(0, ava_1.default)('scientific notation', t => {
|
|
36
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('20e10'), '0x0000000000000000000000000000000000000000000000000000002e90edd000');
|
|
37
|
+
});
|
|
38
|
+
(0, ava_1.default)('scientific notation - capital', t => {
|
|
39
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('20E10'), '0x0000000000000000000000000000000000000000000000000000002e90edd000');
|
|
40
|
+
});
|
|
41
|
+
(0, ava_1.default)('scientific notation - fractional base', t => {
|
|
42
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('2.5e3'), '0x00000000000000000000000000000000000000000000000000000000000009c4');
|
|
43
|
+
});
|
|
44
|
+
(0, ava_1.default)('scientific notation - negative exponent', t => {
|
|
45
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('250000e-2'), '0x00000000000000000000000000000000000000000000000000000000000009c4');
|
|
46
|
+
});
|
|
47
|
+
(0, ava_1.default)('scientific notation - invalid integer literal', t => {
|
|
48
|
+
const error = t.throws(() => (0, integer_literals_1.normalizeUint256Literal)('2e-3'));
|
|
49
|
+
t.is(error?.message, 'Invalid integer literal: 2e-3');
|
|
50
|
+
});
|
|
51
|
+
(0, ava_1.default)('full hex', t => {
|
|
52
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'), '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff');
|
|
53
|
+
});
|
|
54
|
+
(0, ava_1.default)('full hex with leading and trailing zeroes', t => {
|
|
55
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00'), '0x00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00');
|
|
56
|
+
});
|
|
57
|
+
//# sourceMappingURL=integer-literals.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"integer-literals.test.js","sourceRoot":"","sources":["../../src/utils/integer-literals.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-namespaced.d.ts","sourceRoot":"","sources":["../../src/utils/make-namespaced.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAYpD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"make-namespaced.d.ts","sourceRoot":"","sources":["../../src/utils/make-namespaced.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAYpD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAuI1G;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAOtG"}
|
|
@@ -55,6 +55,10 @@ function makeNamespacedInput(input, output, _solcVersion) {
|
|
|
55
55
|
if (contractDef.contractKind === 'contract' && !contractDef.abstract) {
|
|
56
56
|
modifications.push(makeInsertBefore(contractDef, 'abstract '));
|
|
57
57
|
}
|
|
58
|
+
// Remove custom layout annotation
|
|
59
|
+
if (contractDef.storageLayout !== undefined) {
|
|
60
|
+
modifications.push(makeDelete(contractDef.storageLayout, orig));
|
|
61
|
+
}
|
|
58
62
|
// Remove any calls to parent constructors from the inheritance list
|
|
59
63
|
const inherits = contractDef.baseContracts;
|
|
60
64
|
for (const inherit of inherits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-namespaced.js","sourceRoot":"","sources":["../../src/utils/make-namespaced.ts"],"names":[],"mappings":";;AAuCA,
|
|
1
|
+
{"version":3,"file":"make-namespaced.js","sourceRoot":"","sources":["../../src/utils/make-namespaced.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,10 @@ const make_namespaced_1 = require("./make-namespaced");
|
|
|
20
20
|
const origBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedToModify07.sol:HasFunction');
|
|
21
21
|
await testMakeNamespaced(origBuildInfo, t, '0.7.6');
|
|
22
22
|
});
|
|
23
|
+
(0, ava_1.default)('make namespaced input - custom layout', async (t) => {
|
|
24
|
+
const origBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedToModifyCustomLayout.sol:ExampleCustomLayout');
|
|
25
|
+
await testMakeNamespaced(origBuildInfo, t, '0.8.29');
|
|
26
|
+
});
|
|
23
27
|
async function testMakeNamespaced(origBuildInfo, t, solcVersion, keepAllNatSpec = false) {
|
|
24
28
|
if (origBuildInfo === undefined) {
|
|
25
29
|
throw new Error('Build info not found');
|