@openzeppelin/upgrades-core 1.20.3 → 1.20.5
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/proxy/ERC1967/ERC1967Proxy.sol/ERC1967Proxy.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol/BeaconProxy.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.dbg.json +1 -1
- package/artifacts/build-info.json +17 -11
- package/dist/manifest-storage-layout.test.js +6 -6
- package/dist/manifest-storage-layout.test.js.map +1 -1
- package/dist/standalone.test.js +6 -0
- package/dist/standalone.test.js.map +1 -1
- package/dist/storage/compare.d.ts +2 -0
- package/dist/storage/compare.d.ts.map +1 -1
- package/dist/storage/compare.js +29 -4
- package/dist/storage/compare.js.map +1 -1
- package/dist/storage/report-retype-from-contract.test.d.ts +2 -0
- package/dist/storage/report-retype-from-contract.test.d.ts.map +1 -0
- package/dist/storage/report-retype-from-contract.test.js +148 -0
- package/dist/storage/report-retype-from-contract.test.js.map +1 -0
- package/dist/storage-memory-0.5.test.d.ts +2 -0
- package/dist/storage-memory-0.5.test.d.ts.map +1 -0
- package/dist/storage-memory-0.5.test.js +74 -0
- package/dist/storage-memory-0.5.test.js.map +1 -0
- package/dist/validate/data.d.ts +1 -1
- package/dist/validate/data.d.ts.map +1 -1
- package/dist/validate/data.js +1 -1
- package/dist/validate/query.d.ts +16 -1
- package/dist/validate/query.d.ts.map +1 -1
- package/dist/validate/query.js +49 -22
- package/dist/validate/query.js.map +1 -1
- package/dist/validate/run.d.ts.map +1 -1
- package/dist/validate/run.js +17 -13
- package/dist/validate/run.js.map +1 -1
- package/dist/validate.test.js +8 -0
- package/dist/validate.test.js.map +1 -1
- package/package.json +2 -2
- package/src/manifest-storage-layout.test.ts +8 -6
- package/src/standalone.test.ts +11 -0
- package/src/storage/compare.ts +35 -3
- package/src/storage/report-retype-from-contract.test.ts +169 -0
- package/src/storage-memory-0.5.test.ts +89 -0
- package/src/storage-memory-0.5.test.ts.md +175 -0
- package/src/storage-memory-0.5.test.ts.snap +0 -0
- package/src/validate/data.ts +2 -2
- package/src/validate/query.ts +51 -22
- package/src/validate/run.ts +19 -13
- package/src/validate.test.ts +13 -0
|
@@ -0,0 +1,148 @@
|
|
|
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 ast_dereferencer_1 = require("../ast-dereferencer");
|
|
10
|
+
const extract_1 = require("./extract");
|
|
11
|
+
const compare_1 = require("./compare");
|
|
12
|
+
const layout_1 = require("./layout");
|
|
13
|
+
const _1 = require(".");
|
|
14
|
+
const test = ava_1.default;
|
|
15
|
+
const dummyDecodeSrc = () => 'file.sol:1';
|
|
16
|
+
const testContracts = [
|
|
17
|
+
'contracts/test/RetypeFromContract.sol:RetypeContractToUint160V1',
|
|
18
|
+
'contracts/test/RetypeFromContract.sol:RetypeContractToUint160V2',
|
|
19
|
+
'contracts/test/RetypeFromContract.sol:RetypeUint160ToContractV1',
|
|
20
|
+
'contracts/test/RetypeFromContract.sol:RetypeUint160ToContractV2',
|
|
21
|
+
'contracts/test/RetypeFromContract.sol:RetypeContractToUint160MappingV1',
|
|
22
|
+
'contracts/test/RetypeFromContract.sol:RetypeContractToUint160MappingV2',
|
|
23
|
+
'contracts/test/RetypeFromContract.sol:RetypeUint160ToContractMappingV1',
|
|
24
|
+
'contracts/test/RetypeFromContract.sol:RetypeUint160ToContractMappingV2',
|
|
25
|
+
'contracts/test/RetypeFromContract.sol:ImplicitRetypeV1',
|
|
26
|
+
'contracts/test/RetypeFromContract.sol:ImplicitRetypeV2',
|
|
27
|
+
'contracts/test/RetypeFromContract.sol:ImplicitRetypeMappingV1',
|
|
28
|
+
'contracts/test/RetypeFromContract.sol:ImplicitRetypeMappingV2',
|
|
29
|
+
'contracts/test/RetypeFromContract.sol:RetypeStructV1',
|
|
30
|
+
'contracts/test/RetypeFromContract.sol:RetypeStructV2',
|
|
31
|
+
'contracts/test/RetypeFromContract.sol:RetypeStructV2Bad',
|
|
32
|
+
'contracts/test/RetypeFromContract.sol:RetypeEnumV1',
|
|
33
|
+
'contracts/test/RetypeFromContract.sol:RetypeEnumV2',
|
|
34
|
+
'contracts/test/RetypeFromContract.sol:RetypeEnumV2Bad',
|
|
35
|
+
];
|
|
36
|
+
test.before(async (t) => {
|
|
37
|
+
const contracts = {};
|
|
38
|
+
const deref = {};
|
|
39
|
+
const storageLayout = {};
|
|
40
|
+
for (const contract of testContracts) {
|
|
41
|
+
const buildInfo = await hardhat_1.artifacts.getBuildInfo(contract);
|
|
42
|
+
if (buildInfo === undefined) {
|
|
43
|
+
throw new Error(`Build info not found for contract ${contract}`);
|
|
44
|
+
}
|
|
45
|
+
const solcOutput = buildInfo.output;
|
|
46
|
+
for (const def of (0, utils_1.findAll)('ContractDefinition', solcOutput.sources['contracts/test/RetypeFromContract.sol'].ast)) {
|
|
47
|
+
contracts[def.name] = def;
|
|
48
|
+
deref[def.name] = (0, ast_dereferencer_1.astDereferencer)(solcOutput);
|
|
49
|
+
storageLayout[def.name] = solcOutput.contracts['contracts/test/RetypeFromContract.sol'][def.name].storageLayout;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
t.context.extractStorageLayout = name => (0, extract_1.extractStorageLayout)(contracts[name], dummyDecodeSrc, deref[name], storageLayout[name]);
|
|
53
|
+
});
|
|
54
|
+
function getReport(original, updated) {
|
|
55
|
+
const originalDetailed = (0, layout_1.getDetailedLayout)(original);
|
|
56
|
+
const updatedDetailed = (0, layout_1.getDetailedLayout)(updated);
|
|
57
|
+
const comparator = new compare_1.StorageLayoutComparator();
|
|
58
|
+
return comparator.compareLayouts(originalDetailed, updatedDetailed);
|
|
59
|
+
}
|
|
60
|
+
test('retype contract to uint160', t => {
|
|
61
|
+
const v1 = t.context.extractStorageLayout('RetypeContractToUint160V1');
|
|
62
|
+
const v2 = t.context.extractStorageLayout('RetypeContractToUint160V2');
|
|
63
|
+
const report = getReport(v1, v2);
|
|
64
|
+
t.true(report.ok, report.explain());
|
|
65
|
+
});
|
|
66
|
+
test('retype uint160 to contract', t => {
|
|
67
|
+
const v1 = t.context.extractStorageLayout('RetypeUint160ToContractV1');
|
|
68
|
+
const v2 = t.context.extractStorageLayout('RetypeUint160ToContractV2');
|
|
69
|
+
const report = getReport(v1, v2);
|
|
70
|
+
t.true(report.ok, report.explain());
|
|
71
|
+
});
|
|
72
|
+
test('retype contract to uint160 mapping', t => {
|
|
73
|
+
const v1 = t.context.extractStorageLayout('RetypeContractToUint160MappingV1');
|
|
74
|
+
const v2 = t.context.extractStorageLayout('RetypeContractToUint160MappingV2');
|
|
75
|
+
const report = getReport(v1, v2);
|
|
76
|
+
t.true(report.ok, report.explain());
|
|
77
|
+
});
|
|
78
|
+
test('retype uint160 to contract mapping', t => {
|
|
79
|
+
const v1 = t.context.extractStorageLayout('RetypeUint160ToContractMappingV1');
|
|
80
|
+
const v2 = t.context.extractStorageLayout('RetypeUint160ToContractMappingV2');
|
|
81
|
+
const report = getReport(v1, v2);
|
|
82
|
+
t.true(report.ok, report.explain());
|
|
83
|
+
});
|
|
84
|
+
test('implicit retype', t => {
|
|
85
|
+
const v1 = t.context.extractStorageLayout('ImplicitRetypeV1');
|
|
86
|
+
const v2 = t.context.extractStorageLayout('ImplicitRetypeV2');
|
|
87
|
+
const report = getReport(v1, v2);
|
|
88
|
+
t.true(report.ok, report.explain());
|
|
89
|
+
});
|
|
90
|
+
test('implicit retype mapping', t => {
|
|
91
|
+
const v1 = t.context.extractStorageLayout('ImplicitRetypeMappingV1');
|
|
92
|
+
const v2 = t.context.extractStorageLayout('ImplicitRetypeMappingV2');
|
|
93
|
+
const report = getReport(v1, v2);
|
|
94
|
+
t.true(report.ok, report.explain());
|
|
95
|
+
});
|
|
96
|
+
test('strip contract substrings', t => {
|
|
97
|
+
t.is((0, compare_1.stripContractSubstrings)(undefined), undefined);
|
|
98
|
+
t.is((0, compare_1.stripContractSubstrings)('address'), 'address');
|
|
99
|
+
t.is((0, compare_1.stripContractSubstrings)('CustomContract'), 'CustomContract');
|
|
100
|
+
t.is((0, compare_1.stripContractSubstrings)('contract CustomContract'), 'CustomContract');
|
|
101
|
+
t.is((0, compare_1.stripContractSubstrings)('mapping(uint8 => CustomContract)'), 'mapping(uint8 => CustomContract)');
|
|
102
|
+
t.is((0, compare_1.stripContractSubstrings)('mapping(uint8 => contract CustomContract)'), 'mapping(uint8 => CustomContract)');
|
|
103
|
+
t.is((0, compare_1.stripContractSubstrings)('mapping(contract CustomContract => uint8)'), 'mapping(CustomContract => uint8)');
|
|
104
|
+
t.is((0, compare_1.stripContractSubstrings)('mapping(contract A => contract B)'), 'mapping(A => B)');
|
|
105
|
+
t.is((0, compare_1.stripContractSubstrings)('mapping(Substringcontract => address)'), 'mapping(Substringcontract => address)');
|
|
106
|
+
t.is((0, compare_1.stripContractSubstrings)('mapping(contract Substringcontract => address)'), 'mapping(Substringcontract => address)');
|
|
107
|
+
t.is((0, compare_1.stripContractSubstrings)('Mystruct'), 'Mystruct');
|
|
108
|
+
t.is((0, compare_1.stripContractSubstrings)('struct Mystruct'), 'Mystruct');
|
|
109
|
+
t.is((0, compare_1.stripContractSubstrings)('Myenum'), 'Myenum');
|
|
110
|
+
t.is((0, compare_1.stripContractSubstrings)('enum Myenum'), 'Myenum');
|
|
111
|
+
});
|
|
112
|
+
test('retype from struct', t => {
|
|
113
|
+
const v1 = t.context.extractStorageLayout('RetypeStructV1');
|
|
114
|
+
const v2 = t.context.extractStorageLayout('RetypeStructV2');
|
|
115
|
+
const report = getReport(v1, v2);
|
|
116
|
+
t.true(report.ok, report.explain());
|
|
117
|
+
});
|
|
118
|
+
test('bad retype from struct', t => {
|
|
119
|
+
const v1 = t.context.extractStorageLayout('RetypeStructV1');
|
|
120
|
+
const v2 = t.context.extractStorageLayout('RetypeStructV2Bad');
|
|
121
|
+
t.like((0, _1.getStorageUpgradeErrors)(v1, v2), {
|
|
122
|
+
length: 1,
|
|
123
|
+
0: {
|
|
124
|
+
kind: 'layoutchange',
|
|
125
|
+
original: { label: 'x' },
|
|
126
|
+
updated: { label: 'x' },
|
|
127
|
+
},
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
test('retype from enum', t => {
|
|
131
|
+
const v1 = t.context.extractStorageLayout('RetypeEnumV1');
|
|
132
|
+
const v2 = t.context.extractStorageLayout('RetypeEnumV2');
|
|
133
|
+
const report = getReport(v1, v2);
|
|
134
|
+
t.true(report.ok, report.explain());
|
|
135
|
+
});
|
|
136
|
+
test('bad retype from enum', t => {
|
|
137
|
+
const v1 = t.context.extractStorageLayout('RetypeEnumV1');
|
|
138
|
+
const v2 = t.context.extractStorageLayout('RetypeEnumV2Bad');
|
|
139
|
+
t.like((0, _1.getStorageUpgradeErrors)(v1, v2), {
|
|
140
|
+
length: 1,
|
|
141
|
+
0: {
|
|
142
|
+
kind: 'layoutchange',
|
|
143
|
+
original: { label: 'x' },
|
|
144
|
+
updated: { label: 'x' },
|
|
145
|
+
},
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
//# sourceMappingURL=report-retype-from-contract.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"report-retype-from-contract.test.js","sourceRoot":"","sources":["../../src/storage/report-retype-from-contract.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage-memory-0.5.test.d.ts","sourceRoot":"","sources":["../src/storage-memory-0.5.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,74 @@
|
|
|
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 ast_dereferencer_1 = require("./ast-dereferencer");
|
|
10
|
+
const storage_1 = require("./storage");
|
|
11
|
+
const extract_1 = require("./storage/extract");
|
|
12
|
+
const stabilize_layout_1 = require("./utils/stabilize-layout");
|
|
13
|
+
const test = ava_1.default;
|
|
14
|
+
test.before(async (t) => {
|
|
15
|
+
const buildInfoCache = {};
|
|
16
|
+
t.context.extractStorageLayout = async (contractFile, contractName, withLayout = true) => {
|
|
17
|
+
const expectedContract = contractName ?? contractFile;
|
|
18
|
+
const [file] = contractFile.split('_');
|
|
19
|
+
const source = `contracts/test/${file}.sol`;
|
|
20
|
+
const buildInfo = (buildInfoCache[source] ?? (buildInfoCache[source] = await hardhat_1.artifacts.getBuildInfo(`${source}:${expectedContract}`)));
|
|
21
|
+
if (buildInfo === undefined) {
|
|
22
|
+
throw new Error(`Build info for ${source} not found`);
|
|
23
|
+
}
|
|
24
|
+
const solcOutput = buildInfo.output;
|
|
25
|
+
for (const def of (0, utils_1.findAll)('ContractDefinition', solcOutput.sources[source].ast)) {
|
|
26
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
27
|
+
const layout = solcOutput.contracts[source][def.name].storageLayout;
|
|
28
|
+
if (def.name === expectedContract) {
|
|
29
|
+
return (0, extract_1.extractStorageLayout)(def, dummyDecodeSrc, (0, ast_dereferencer_1.astDereferencer)(solcOutput), withLayout ? layout : undefined);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
throw new Error(`Contract ${expectedContract} not found in ${source}`);
|
|
33
|
+
};
|
|
34
|
+
});
|
|
35
|
+
const dummyDecodeSrc = () => 'file.sol:1';
|
|
36
|
+
test('memory 0.5.16', async (t) => {
|
|
37
|
+
const layout = await t.context.extractStorageLayout('Memory05');
|
|
38
|
+
t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(layout));
|
|
39
|
+
});
|
|
40
|
+
test('memory 0.8.9', async (t) => {
|
|
41
|
+
const layout = await t.context.extractStorageLayout('Memory08');
|
|
42
|
+
t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(layout));
|
|
43
|
+
});
|
|
44
|
+
test('memory - upgrade from 0.5.16 to 0.8.9', async (t) => {
|
|
45
|
+
const v1 = await t.context.extractStorageLayout('Memory05');
|
|
46
|
+
const v2 = await t.context.extractStorageLayout('Memory08');
|
|
47
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
48
|
+
t.deepEqual(comparison, []);
|
|
49
|
+
});
|
|
50
|
+
test('memory - bad upgrade from 0.5.16 to 0.8.9', async (t) => {
|
|
51
|
+
const v1 = await t.context.extractStorageLayout('Memory05');
|
|
52
|
+
const v2 = await t.context.extractStorageLayout('Memory08', 'Memory08Bad');
|
|
53
|
+
const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
|
|
54
|
+
t.like(comparison, {
|
|
55
|
+
length: 2,
|
|
56
|
+
0: {
|
|
57
|
+
kind: 'typechange',
|
|
58
|
+
change: {
|
|
59
|
+
kind: 'mapping key',
|
|
60
|
+
},
|
|
61
|
+
original: { label: 'a' },
|
|
62
|
+
updated: { label: 'a' },
|
|
63
|
+
},
|
|
64
|
+
1: {
|
|
65
|
+
kind: 'typechange',
|
|
66
|
+
change: {
|
|
67
|
+
kind: 'mapping key',
|
|
68
|
+
},
|
|
69
|
+
original: { label: 'b' },
|
|
70
|
+
updated: { label: 'b' },
|
|
71
|
+
},
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
//# sourceMappingURL=storage-memory-0.5.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage-memory-0.5.test.js","sourceRoot":"","sources":["../src/storage-memory-0.5.test.ts"],"names":[],"mappings":"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"}
|
package/dist/validate/data.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { ValidationRunData } from './run';
|
|
|
2
2
|
declare type ValidationDataV1 = ValidationRunData;
|
|
3
3
|
declare type ValidationDataV2 = ValidationRunData[];
|
|
4
4
|
interface ValidationDataV3 {
|
|
5
|
-
version: '3' | '3.1' | '3.2' | '3.3';
|
|
5
|
+
version: '3' | '3.1' | '3.2' | '3.3' | '3.4';
|
|
6
6
|
log: ValidationRunData[];
|
|
7
7
|
}
|
|
8
8
|
export declare type ValidationDataCurrent = ValidationDataV3;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/validate/data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE1C,aAAK,gBAAgB,GAAG,iBAAiB,CAAC;AAE1C,aAAK,gBAAgB,GAAG,iBAAiB,EAAE,CAAC;AAK5C,UAAU,gBAAgB;IACxB,OAAO,EAAE,GAAG,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/validate/data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE1C,aAAK,gBAAgB,GAAG,iBAAiB,CAAC;AAE1C,aAAK,gBAAgB,GAAG,iBAAiB,EAAE,CAAC;AAK5C,UAAU,gBAAgB;IACxB,OAAO,EAAE,GAAG,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IAC7C,GAAG,EAAE,iBAAiB,EAAE,CAAC;CAC1B;AAED,oBAAY,qBAAqB,GAAG,gBAAgB,CAAC;AAErD,oBAAY,cAAc,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAEpF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,cAAc,GAAG,qBAAqB,CAQnF;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,UAAO,GAAG,IAAI,IAAI,qBAAqB,CAczG;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,iBAAiB,EAC7B,YAAY,CAAC,EAAE,qBAAqB,GACnC,qBAAqB,CAKvB"}
|
package/dist/validate/data.js
CHANGED
|
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.concatRunData = exports.isCurrentValidationData = exports.normalizeValidationData = void 0;
|
|
27
27
|
const versions = __importStar(require("compare-versions"));
|
|
28
28
|
const currentMajor = '3';
|
|
29
|
-
const currentVersion = '3.
|
|
29
|
+
const currentVersion = '3.4';
|
|
30
30
|
function normalizeValidationData(data) {
|
|
31
31
|
if (isCurrentValidationData(data, false)) {
|
|
32
32
|
return data;
|
package/dist/validate/query.d.ts
CHANGED
|
@@ -5,10 +5,25 @@ import { ValidationOptions } from './overrides';
|
|
|
5
5
|
import { ValidationData } from './data';
|
|
6
6
|
import { ProxyDeployment } from '../manifest';
|
|
7
7
|
export declare function assertUpgradeSafe(data: ValidationData, version: Version, opts: ValidationOptions): void;
|
|
8
|
+
/**
|
|
9
|
+
* Gets the contract version object from the given validation run data and contract name (either fully qualified or simple contract name).
|
|
10
|
+
*
|
|
11
|
+
* @param runData The validation run data
|
|
12
|
+
* @param contractName Fully qualified or simple contract name
|
|
13
|
+
* @returns contract version object
|
|
14
|
+
* @throws {Error} if the given contract name is not found or is ambiguous
|
|
15
|
+
*/
|
|
8
16
|
export declare function getContractVersion(runData: ValidationRunData, contractName: string): Version;
|
|
17
|
+
/**
|
|
18
|
+
* Gets the fully qualified contract name and validation run data.
|
|
19
|
+
*
|
|
20
|
+
* @param data The validation data
|
|
21
|
+
* @param version The contract Version
|
|
22
|
+
* @returns fully qualified contract name and validation run data
|
|
23
|
+
*/
|
|
9
24
|
export declare function getContractNameAndRunValidation(data: ValidationData, version: Version): [string, ValidationRunData];
|
|
10
25
|
export declare function getStorageLayout(data: ValidationData, version: Version): StorageLayout;
|
|
11
|
-
export declare function unfoldStorageLayout(runData: ValidationRunData,
|
|
26
|
+
export declare function unfoldStorageLayout(runData: ValidationRunData, fullContractName: string): StorageLayout;
|
|
12
27
|
export declare function findVersionWithoutMetadataMatches(data: ValidationData, versionWithoutMetadata: string): Generator<[string, ValidationRunData]>;
|
|
13
28
|
export declare function getUnlinkedBytecode(data: ValidationData, bytecode: string): string;
|
|
14
29
|
export declare function getErrors(data: ValidationData, version: Version, opts?: ValidationOptions): ValidationError[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/validate/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAc,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAqB,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,cAAc,EAA2B,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAI9C,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,GAAG,IAAI,CASvG;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/validate/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAc,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAqB,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,cAAc,EAA2B,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAI9C,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,GAAG,IAAI,CASvG;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAkB5F;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAqBnH;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,CAItF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,GAAG,aAAa,CAiBvG;AAED,wBAAiB,iCAAiC,CAChD,IAAI,EAAE,cAAc,EACpB,sBAAsB,EAAE,MAAM,GAC7B,SAAS,CAAC,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAUxC;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAkBlF;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,GAAE,iBAAsB,GAAG,eAAe,EAAE,CAmBjH;AAoBD,wBAAgB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAG7E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAS9F"}
|
package/dist/validate/query.js
CHANGED
|
@@ -9,46 +9,73 @@ const data_1 = require("./data");
|
|
|
9
9
|
const upgradeToSignature = 'upgradeTo(address)';
|
|
10
10
|
function assertUpgradeSafe(data, version, opts) {
|
|
11
11
|
const dataV3 = (0, data_1.normalizeValidationData)(data);
|
|
12
|
-
const [
|
|
12
|
+
const [fullContractName] = getContractNameAndRunValidation(dataV3, version);
|
|
13
13
|
const errors = getErrors(dataV3, version, opts);
|
|
14
14
|
if (errors.length > 0) {
|
|
15
|
-
throw new error_1.ValidationErrors(
|
|
15
|
+
throw new error_1.ValidationErrors(fullContractName, errors);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
exports.assertUpgradeSafe = assertUpgradeSafe;
|
|
19
|
+
/**
|
|
20
|
+
* Gets the contract version object from the given validation run data and contract name (either fully qualified or simple contract name).
|
|
21
|
+
*
|
|
22
|
+
* @param runData The validation run data
|
|
23
|
+
* @param contractName Fully qualified or simple contract name
|
|
24
|
+
* @returns contract version object
|
|
25
|
+
* @throws {Error} if the given contract name is not found or is ambiguous
|
|
26
|
+
*/
|
|
19
27
|
function getContractVersion(runData, contractName) {
|
|
20
|
-
|
|
28
|
+
let version = undefined;
|
|
29
|
+
if (contractName.includes(':')) {
|
|
30
|
+
version = runData[contractName].version;
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
const foundNames = Object.keys(runData).filter(element => element.endsWith(`:${contractName}`));
|
|
34
|
+
if (foundNames.length > 1) {
|
|
35
|
+
throw new Error(`Contract ${contractName} is ambiguous. Use one of the following:\n${foundNames.join('\n')}`);
|
|
36
|
+
}
|
|
37
|
+
else if (foundNames.length === 1) {
|
|
38
|
+
version = runData[foundNames[0]].version;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
21
41
|
if (version === undefined) {
|
|
22
42
|
throw new Error(`Contract ${contractName} is abstract`);
|
|
23
43
|
}
|
|
24
44
|
return version;
|
|
25
45
|
}
|
|
26
46
|
exports.getContractVersion = getContractVersion;
|
|
47
|
+
/**
|
|
48
|
+
* Gets the fully qualified contract name and validation run data.
|
|
49
|
+
*
|
|
50
|
+
* @param data The validation data
|
|
51
|
+
* @param version The contract Version
|
|
52
|
+
* @returns fully qualified contract name and validation run data
|
|
53
|
+
*/
|
|
27
54
|
function getContractNameAndRunValidation(data, version) {
|
|
28
55
|
const dataV3 = (0, data_1.normalizeValidationData)(data);
|
|
29
56
|
let runValidation;
|
|
30
|
-
let
|
|
57
|
+
let fullContractName;
|
|
31
58
|
for (const validation of dataV3.log) {
|
|
32
|
-
|
|
33
|
-
if (
|
|
59
|
+
fullContractName = Object.keys(validation).find(name => validation[name].version?.withMetadata === version.withMetadata);
|
|
60
|
+
if (fullContractName !== undefined) {
|
|
34
61
|
runValidation = validation;
|
|
35
62
|
break;
|
|
36
63
|
}
|
|
37
64
|
}
|
|
38
|
-
if (
|
|
65
|
+
if (fullContractName === undefined || runValidation === undefined) {
|
|
39
66
|
throw new Error('The requested contract was not found. Make sure the source code is available for compilation');
|
|
40
67
|
}
|
|
41
|
-
return [
|
|
68
|
+
return [fullContractName, runValidation];
|
|
42
69
|
}
|
|
43
70
|
exports.getContractNameAndRunValidation = getContractNameAndRunValidation;
|
|
44
71
|
function getStorageLayout(data, version) {
|
|
45
72
|
const dataV3 = (0, data_1.normalizeValidationData)(data);
|
|
46
|
-
const [
|
|
47
|
-
return unfoldStorageLayout(runValidation,
|
|
73
|
+
const [fullContractName, runValidation] = getContractNameAndRunValidation(dataV3, version);
|
|
74
|
+
return unfoldStorageLayout(runValidation, fullContractName);
|
|
48
75
|
}
|
|
49
76
|
exports.getStorageLayout = getStorageLayout;
|
|
50
|
-
function unfoldStorageLayout(runData,
|
|
51
|
-
const c = runData[
|
|
77
|
+
function unfoldStorageLayout(runData, fullContractName) {
|
|
78
|
+
const c = runData[fullContractName];
|
|
52
79
|
const { solcVersion } = c;
|
|
53
80
|
if (c.layout.flat) {
|
|
54
81
|
return {
|
|
@@ -59,7 +86,7 @@ function unfoldStorageLayout(runData, contractName) {
|
|
|
59
86
|
}
|
|
60
87
|
else {
|
|
61
88
|
const layout = { solcVersion, storage: [], types: {} };
|
|
62
|
-
for (const name of [
|
|
89
|
+
for (const name of [fullContractName].concat(c.inherit)) {
|
|
63
90
|
layout.storage.unshift(...runData[name].layout.storage);
|
|
64
91
|
Object.assign(layout.types, runData[name].layout.types);
|
|
65
92
|
}
|
|
@@ -96,21 +123,21 @@ function getUnlinkedBytecode(data, bytecode) {
|
|
|
96
123
|
exports.getUnlinkedBytecode = getUnlinkedBytecode;
|
|
97
124
|
function getErrors(data, version, opts = {}) {
|
|
98
125
|
const dataV3 = (0, data_1.normalizeValidationData)(data);
|
|
99
|
-
const [
|
|
100
|
-
const c = runValidation[
|
|
101
|
-
const errors = getUsedContractsAndLibraries(
|
|
102
|
-
const selfAndInheritedMethods = getAllMethods(runValidation,
|
|
126
|
+
const [fullContractName, runValidation] = getContractNameAndRunValidation(dataV3, version);
|
|
127
|
+
const c = runValidation[fullContractName];
|
|
128
|
+
const errors = getUsedContractsAndLibraries(fullContractName, runValidation).flatMap(name => runValidation[name].errors);
|
|
129
|
+
const selfAndInheritedMethods = getAllMethods(runValidation, fullContractName);
|
|
103
130
|
if (!selfAndInheritedMethods.includes(upgradeToSignature)) {
|
|
104
131
|
errors.push({
|
|
105
132
|
src: c.src,
|
|
106
133
|
kind: 'missing-public-upgradeto',
|
|
107
134
|
});
|
|
108
135
|
}
|
|
109
|
-
return (0, overrides_1.processExceptions)(
|
|
136
|
+
return (0, overrides_1.processExceptions)(fullContractName, errors, opts);
|
|
110
137
|
}
|
|
111
138
|
exports.getErrors = getErrors;
|
|
112
|
-
function getAllMethods(runValidation,
|
|
113
|
-
const c = runValidation[
|
|
139
|
+
function getAllMethods(runValidation, fullContractName) {
|
|
140
|
+
const c = runValidation[fullContractName];
|
|
114
141
|
return c.methods.concat(...c.inherit.map(name => runValidation[name].methods));
|
|
115
142
|
}
|
|
116
143
|
function getUsedContractsAndLibraries(contractName, runValidation) {
|
|
@@ -132,8 +159,8 @@ function isUpgradeSafe(data, version) {
|
|
|
132
159
|
exports.isUpgradeSafe = isUpgradeSafe;
|
|
133
160
|
function inferProxyKind(data, version) {
|
|
134
161
|
const dataV3 = (0, data_1.normalizeValidationData)(data);
|
|
135
|
-
const [
|
|
136
|
-
const methods = getAllMethods(runValidation,
|
|
162
|
+
const [fullContractName, runValidation] = getContractNameAndRunValidation(dataV3, version);
|
|
163
|
+
const methods = getAllMethods(runValidation, fullContractName);
|
|
137
164
|
if (methods.includes(upgradeToSignature)) {
|
|
138
165
|
return 'uups';
|
|
139
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/validate/query.ts"],"names":[],"mappings":";;;AAAA,wCAAiD;AAGjD,4CAA8C;AAC9C,2CAAmE;AACnE,mCAA2C;AAC3C,iCAAiE;AAGjE,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEhD,SAAgB,iBAAiB,CAAC,IAAoB,EAAE,OAAgB,EAAE,IAAuB;IAC/F,MAAM,MAAM,GAAG,IAAA,8BAAuB,EAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/validate/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/validate/run.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAgB,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,OAAO,EAAE,OAAO,EAAc,MAAM,YAAY,CAAC;AACjD,OAAO,EAAyB,aAAa,EAAE,MAAM,cAAc,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,oBAAY,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAEnE,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,QAAA,MAAM,UAAU,mNAUN,CAAC;AAEX,oBAAY,eAAe,GACvB,0BAA0B,GAC1B,qBAAqB,GACrB,uBAAuB,GACvB,6BAA6B,CAAC;AAElC,UAAU,mBAAmB;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,UAAU,uBAAwB,SAAQ,mBAAmB;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EACA,2BAA2B,GAC3B,0BAA0B,GAC1B,0BAA0B,GAC1B,mBAAmB,GACnB,iBAAiB,CAAC;CACvB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,IAAI,EAAE,aAAa,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,qBAAsB,SAAQ,mBAAmB;IACzD,IAAI,EAAE,cAAc,GAAG,cAAc,CAAC;CACvC;AAED,UAAU,6BAA8B,SAAQ,mBAAmB;IACjE,IAAI,EAAE,0BAA0B,CAAC;CAClC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/validate/run.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAgB,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,OAAO,EAAE,OAAO,EAAc,MAAM,YAAY,CAAC;AACjD,OAAO,EAAyB,aAAa,EAAE,MAAM,cAAc,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,oBAAY,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAEnE,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,QAAA,MAAM,UAAU,mNAUN,CAAC;AAEX,oBAAY,eAAe,GACvB,0BAA0B,GAC1B,qBAAqB,GACrB,uBAAuB,GACvB,6BAA6B,CAAC;AAElC,UAAU,mBAAmB;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,UAAU,uBAAwB,SAAQ,mBAAmB;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EACA,2BAA2B,GAC3B,0BAA0B,GAC1B,0BAA0B,GAC1B,mBAAmB,GACnB,iBAAiB,CAAC;CACvB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,IAAI,EAAE,aAAa,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,qBAAsB,SAAQ,mBAAmB;IACzD,IAAI,EAAE,cAAc,GAAG,cAAc,CAAC;CACvC;AAED,UAAU,6BAA8B,SAAQ,mBAAmB;IACjE,IAAI,EAAE,0BAA0B,CAAC;CAClC;AAgDD,wBAAgB,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,iBAAiB,CA0E/G"}
|
package/dist/validate/run.js
CHANGED
|
@@ -54,6 +54,9 @@ function getAllowed(node) {
|
|
|
54
54
|
function skipCheck(error, node) {
|
|
55
55
|
return getAllowed(node).includes(error);
|
|
56
56
|
}
|
|
57
|
+
function getFullyQualifiedName(source, contractName) {
|
|
58
|
+
return `${source}:${contractName}`;
|
|
59
|
+
}
|
|
57
60
|
function validate(solcOutput, decodeSrc, solcVersion) {
|
|
58
61
|
const validation = {};
|
|
59
62
|
const fromId = {};
|
|
@@ -65,7 +68,7 @@ function validate(solcOutput, decodeSrc, solcVersion) {
|
|
|
65
68
|
const bytecode = solcOutput.contracts[source][contractName].evm.bytecode;
|
|
66
69
|
const version = bytecode.object === '' ? undefined : (0, version_1.getVersion)(bytecode.object);
|
|
67
70
|
const linkReferences = (0, link_refs_1.extractLinkReferences)(bytecode);
|
|
68
|
-
validation[contractName] = {
|
|
71
|
+
validation[getFullyQualifiedName(source, contractName)] = {
|
|
69
72
|
src: contractName,
|
|
70
73
|
version,
|
|
71
74
|
inherit: [],
|
|
@@ -81,14 +84,15 @@ function validate(solcOutput, decodeSrc, solcVersion) {
|
|
|
81
84
|
};
|
|
82
85
|
}
|
|
83
86
|
for (const contractDef of (0, utils_1.findAll)('ContractDefinition', solcOutput.sources[source].ast)) {
|
|
84
|
-
|
|
87
|
+
const key = getFullyQualifiedName(source, contractDef.name);
|
|
88
|
+
fromId[contractDef.id] = key;
|
|
85
89
|
// May be undefined in case of duplicate contract names in Truffle
|
|
86
90
|
const bytecode = solcOutput.contracts[source][contractDef.name]?.evm.bytecode;
|
|
87
|
-
if (
|
|
88
|
-
inheritIds[
|
|
89
|
-
libraryIds[
|
|
90
|
-
validation[
|
|
91
|
-
validation[
|
|
91
|
+
if (key in validation && bytecode !== undefined) {
|
|
92
|
+
inheritIds[key] = contractDef.linearizedBaseContracts.slice(1);
|
|
93
|
+
libraryIds[key] = getReferencedLibraryIds(contractDef);
|
|
94
|
+
validation[key].src = decodeSrc(contractDef);
|
|
95
|
+
validation[key].errors = [
|
|
92
96
|
...getConstructorErrors(contractDef, decodeSrc),
|
|
93
97
|
...getOpcodeErrors(contractDef, decodeSrc),
|
|
94
98
|
...getStateVariableErrors(contractDef, decodeSrc),
|
|
@@ -96,18 +100,18 @@ function validate(solcOutput, decodeSrc, solcVersion) {
|
|
|
96
100
|
// https://github.com/OpenZeppelin/openzeppelin-upgrades/issues/52
|
|
97
101
|
...getLinkingErrors(contractDef, bytecode),
|
|
98
102
|
];
|
|
99
|
-
validation[
|
|
100
|
-
validation[
|
|
103
|
+
validation[key].layout = (0, extract_1.extractStorageLayout)(contractDef, decodeSrc, deref, solcOutput.contracts[source][contractDef.name].storageLayout);
|
|
104
|
+
validation[key].methods = [...(0, utils_1.findAll)('FunctionDefinition', contractDef)]
|
|
101
105
|
.filter(fnDef => ['external', 'public'].includes(fnDef.visibility))
|
|
102
106
|
.map(fnDef => (0, function_1.getFunctionSignature)(fnDef, deref));
|
|
103
107
|
}
|
|
104
108
|
}
|
|
105
109
|
}
|
|
106
|
-
for (const
|
|
107
|
-
validation[
|
|
110
|
+
for (const key in inheritIds) {
|
|
111
|
+
validation[key].inherit = inheritIds[key].map(id => fromId[id]);
|
|
108
112
|
}
|
|
109
|
-
for (const
|
|
110
|
-
validation[
|
|
113
|
+
for (const key in libraryIds) {
|
|
114
|
+
validation[key].libraries = libraryIds[key].map(id => fromId[id]);
|
|
111
115
|
}
|
|
112
116
|
return validation;
|
|
113
117
|
}
|
package/dist/validate/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/validate/run.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/validate/run.ts"],"names":[],"mappings":"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"}
|
package/dist/validate.test.js
CHANGED
|
@@ -115,4 +115,12 @@ testValid('UsesExplicitSafeExternalLibraryNatspec', 'transparent', true);
|
|
|
115
115
|
testValid('UsesExplicitUnsafeInternalLibraryNatspec', 'transparent', true);
|
|
116
116
|
testValid('UsesExplicitUnsafeExternalLibraryNatspec', 'transparent', true);
|
|
117
117
|
testValid('TransitiveLibraryIsUnsafe', 'transparent', false);
|
|
118
|
+
testValid('contracts/test/ValidationsSameNameSafe.sol:SameName', 'transparent', true);
|
|
119
|
+
testValid('contracts/test/ValidationsSameNameUnsafe.sol:SameName', 'transparent', false);
|
|
120
|
+
test('ambiguous name', t => {
|
|
121
|
+
const error = t.throws(() => (0, validate_1.getContractVersion)(t.context.validation, 'SameName'));
|
|
122
|
+
t.is(error?.message, 'Contract SameName is ambiguous. Use one of the following:\n' +
|
|
123
|
+
'contracts/test/ValidationsSameNameSafe.sol:SameName\n' +
|
|
124
|
+
'contracts/test/ValidationsSameNameUnsafe.sol:SameName');
|
|
125
|
+
});
|
|
118
126
|
//# sourceMappingURL=validate.test.js.map
|