@openzeppelin/upgrades-core 1.27.0 → 1.27.1
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-info-file.d.ts","sourceRoot":"","sources":["../../../src/cli/validate/build-info-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"build-info-file.d.ts","sourceRoot":"","sources":["../../../src/cli/validate/build-info-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AA6B9C;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC;CACpB;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,4BAI5D"}
|
|
@@ -8,23 +8,27 @@ const fs_1 = require("fs");
|
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const error_1 = require("./error");
|
|
10
10
|
const HARDHAT_COMPILE_COMMAND = 'npx hardhat clean && npx hardhat compile';
|
|
11
|
-
const FOUNDRY_COMPILE_COMMAND = 'forge clean && forge build
|
|
11
|
+
const FOUNDRY_COMPILE_COMMAND = 'forge clean && forge build';
|
|
12
12
|
const STORAGE_LAYOUT_HELP = `\
|
|
13
13
|
If using Hardhat, include the 'storageLayout' output selection in your Hardhat config:
|
|
14
|
-
module.exports = {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
module.exports = {
|
|
15
|
+
solidity: {
|
|
16
|
+
settings: {
|
|
17
|
+
outputSelection: {
|
|
18
|
+
'*': {
|
|
19
|
+
'*': ['storageLayout'],
|
|
20
|
+
},
|
|
20
21
|
},
|
|
21
22
|
},
|
|
22
23
|
},
|
|
23
|
-
}
|
|
24
|
-
};
|
|
24
|
+
};
|
|
25
25
|
Then recompile your contracts with '${HARDHAT_COMPILE_COMMAND}' and try again.
|
|
26
26
|
|
|
27
|
-
If using Foundry,
|
|
27
|
+
If using Foundry, include the "storageLayout" extra output in foundry.toml:
|
|
28
|
+
[profile.default]
|
|
29
|
+
build_info = true
|
|
30
|
+
extra_output = ["storageLayout"]
|
|
31
|
+
Then recompile your contracts with '${FOUNDRY_COMPILE_COMMAND}' and try again.`;
|
|
28
32
|
/**
|
|
29
33
|
* Gets the build info files from the build info directory.
|
|
30
34
|
*
|
|
@@ -39,7 +43,9 @@ async function getBuildInfoFiles(buildInfoDir) {
|
|
|
39
43
|
exports.getBuildInfoFiles = getBuildInfoFiles;
|
|
40
44
|
async function findDir(buildInfoDir) {
|
|
41
45
|
if (buildInfoDir !== undefined && !(await hasJsonFiles(buildInfoDir))) {
|
|
42
|
-
throw new error_1.ValidateCommandError(`The directory '${buildInfoDir}' does not exist or does not contain any build info files.`, () =>
|
|
46
|
+
throw new error_1.ValidateCommandError(`The directory '${buildInfoDir}' does not exist or does not contain any build info files.`, () => `\
|
|
47
|
+
If using Foundry, ensure your foundry.toml file has build_info = true.
|
|
48
|
+
Compile your contracts with '${HARDHAT_COMPILE_COMMAND}' or '${FOUNDRY_COMPILE_COMMAND}' and try again with the correct path to the build info directory.`);
|
|
43
49
|
}
|
|
44
50
|
const dir = buildInfoDir ?? (await findDefaultDir());
|
|
45
51
|
return dir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-info-file.js","sourceRoot":"","sources":["../../../src/cli/validate/build-info-file.ts"],"names":[],"mappings":";;;;;;AAEA,2BAAoC;AACpC,gDAAwB;AACxB,mCAA+C;AAE/C,MAAM,uBAAuB,GAAG,0CAA0C,CAAC;AAC3E,MAAM,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"build-info-file.js","sourceRoot":"","sources":["../../../src/cli/validate/build-info-file.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openzeppelin/upgrades-core",
|
|
3
|
-
"version": "1.27.
|
|
3
|
+
"version": "1.27.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": "https://github.com/OpenZeppelin/openzeppelin-upgrades/tree/master/packages/core",
|
|
6
6
|
"license": "MIT",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"proper-lockfile": "^4.1.1",
|
|
66
66
|
"solidity-ast": "^0.4.15"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "fc55c0dc8a992f649ec415f47797d5b5c8088b0c"
|
|
69
69
|
}
|
|
@@ -5,23 +5,27 @@ import path from 'path';
|
|
|
5
5
|
import { ValidateCommandError } from './error';
|
|
6
6
|
|
|
7
7
|
const HARDHAT_COMPILE_COMMAND = 'npx hardhat clean && npx hardhat compile';
|
|
8
|
-
const FOUNDRY_COMPILE_COMMAND = 'forge clean && forge build
|
|
8
|
+
const FOUNDRY_COMPILE_COMMAND = 'forge clean && forge build';
|
|
9
9
|
const STORAGE_LAYOUT_HELP = `\
|
|
10
10
|
If using Hardhat, include the 'storageLayout' output selection in your Hardhat config:
|
|
11
|
-
module.exports = {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
11
|
+
module.exports = {
|
|
12
|
+
solidity: {
|
|
13
|
+
settings: {
|
|
14
|
+
outputSelection: {
|
|
15
|
+
'*': {
|
|
16
|
+
'*': ['storageLayout'],
|
|
17
|
+
},
|
|
17
18
|
},
|
|
18
19
|
},
|
|
19
20
|
},
|
|
20
|
-
}
|
|
21
|
-
};
|
|
21
|
+
};
|
|
22
22
|
Then recompile your contracts with '${HARDHAT_COMPILE_COMMAND}' and try again.
|
|
23
23
|
|
|
24
|
-
If using Foundry,
|
|
24
|
+
If using Foundry, include the "storageLayout" extra output in foundry.toml:
|
|
25
|
+
[profile.default]
|
|
26
|
+
build_info = true
|
|
27
|
+
extra_output = ["storageLayout"]
|
|
28
|
+
Then recompile your contracts with '${FOUNDRY_COMPILE_COMMAND}' and try again.`;
|
|
25
29
|
|
|
26
30
|
/**
|
|
27
31
|
* A build info file containing Solidity compiler input and output JSON objects.
|
|
@@ -54,8 +58,9 @@ async function findDir(buildInfoDir: string | undefined) {
|
|
|
54
58
|
if (buildInfoDir !== undefined && !(await hasJsonFiles(buildInfoDir))) {
|
|
55
59
|
throw new ValidateCommandError(
|
|
56
60
|
`The directory '${buildInfoDir}' does not exist or does not contain any build info files.`,
|
|
57
|
-
() =>
|
|
58
|
-
|
|
61
|
+
() => `\
|
|
62
|
+
If using Foundry, ensure your foundry.toml file has build_info = true.
|
|
63
|
+
Compile your contracts with '${HARDHAT_COMPILE_COMMAND}' or '${FOUNDRY_COMPILE_COMMAND}' and try again with the correct path to the build info directory.`,
|
|
59
64
|
);
|
|
60
65
|
}
|
|
61
66
|
const dir = buildInfoDir ?? (await findDefaultDir());
|