@openzeppelin/upgrades-core 1.31.3 → 1.32.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 +76 -0
- package/artifacts/@openzeppelin/contracts-v5/proxy/beacon/BeaconProxy.sol/BeaconProxy.json +87 -0
- package/artifacts/@openzeppelin/contracts-v5/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json +151 -0
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/ProxyAdmin.sol/ProxyAdmin.json +132 -0
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/ITransparentUpgradeableProxy.json +74 -0
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json +116 -0
- package/artifacts/build-info-v5.json +13993 -0
- package/dist/impl-store.d.ts.map +1 -1
- package/dist/impl-store.js +24 -14
- package/dist/impl-store.js.map +1 -1
- package/dist/impl-store.test.js +73 -4
- package/dist/impl-store.test.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/scripts/migratable-manifest.test.json +175 -0
- package/dist/scripts/project-file.test.json +25 -0
- package/dist/solidity-version.json +1 -0
- package/dist/standalone.test.js +9 -8
- package/dist/standalone.test.js.map +1 -1
- package/dist/usage-error.d.ts +3 -0
- package/dist/usage-error.d.ts.map +1 -1
- package/dist/usage-error.js +7 -1
- package/dist/usage-error.js.map +1 -1
- package/package.json +20 -13
- package/src/impl-store.test.ts +128 -4
- package/src/impl-store.ts +27 -16
- package/src/index.ts +1 -0
- package/src/solidity-version.json +1 -0
- package/src/standalone.test.ts +41 -7
- package/src/usage-error.ts +9 -0
- package/artifacts/@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol/ERC1967Proxy.dbg.json +0 -4
- package/artifacts/@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol/BeaconProxy.dbg.json +0 -4
- package/artifacts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.dbg.json +0 -4
package/dist/impl-store.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impl-store.d.ts","sourceRoot":"","sources":["../src/impl-store.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,cAAc,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAwB,MAAM,YAAY,CAAC;AACpE,OAAO,EACL,UAAU,EAEV,gBAAgB,EAIjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAQ/B,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IACrB,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;IAChC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;CACpC;
|
|
1
|
+
{"version":3,"file":"impl-store.d.ts","sourceRoot":"","sources":["../src/impl-store.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,cAAc,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAwB,MAAM,YAAY,CAAC;AACpE,OAAO,EACL,UAAU,EAEV,gBAAgB,EAIjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAQ/B,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IACrB,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;IAChC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;CACpC;AAmFD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,QAErE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,EACrC,IAAI,CAAC,EAAE,UAAU,EACjB,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,0BAA0B,CAAC,CAAC,SAAS,cAAc,EACvE,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACxB,IAAI,CAAC,EAAE,UAAU,EACjB,KAAK,CAAC,EAAE,OAAO,EACf,mBAAmB,CAAC,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,GAC1F,OAAO,CAAC,CAAC,GAAG,UAAU,CAAC,CASzB;AAsBD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc;;;EAU7E;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,EACjC,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,MAAM,CAAC,CAEjB"}
|
package/dist/impl-store.js
CHANGED
|
@@ -36,13 +36,11 @@ async function fetchOrDeployGeneric(lens, provider, deploy, opts, merge, getRemo
|
|
|
36
36
|
const updated = await (0, deployment_1.resumeOrDeploy)(provider, stored, deploy, lens.type, opts, deployment, merge, getRemoteDeployment);
|
|
37
37
|
if (updated !== stored) {
|
|
38
38
|
if (merge && deployment.merge) {
|
|
39
|
-
|
|
40
|
-
// but the above updated and stored objects are different instances representing the same entry
|
|
41
|
-
await checkForAddressClash(provider, data, updated, false);
|
|
39
|
+
await checkForAddressClash(provider, data, updated, true);
|
|
42
40
|
deployment.merge(updated);
|
|
43
41
|
}
|
|
44
42
|
else {
|
|
45
|
-
await checkForAddressClash(provider, data, updated,
|
|
43
|
+
await checkForAddressClash(provider, data, updated, false);
|
|
46
44
|
deployment.set(updated);
|
|
47
45
|
}
|
|
48
46
|
await manifest.write(data);
|
|
@@ -118,7 +116,12 @@ const implLens = (versionWithoutMetadata) => lens(`implementation ${versionWitho
|
|
|
118
116
|
const existing = data.impls[versionWithoutMetadata];
|
|
119
117
|
if (existing !== undefined && value !== undefined) {
|
|
120
118
|
const { address, allAddresses } = mergeAddresses(existing, value);
|
|
121
|
-
data.impls[versionWithoutMetadata] = {
|
|
119
|
+
data.impls[versionWithoutMetadata] = {
|
|
120
|
+
...existing,
|
|
121
|
+
address,
|
|
122
|
+
allAddresses,
|
|
123
|
+
remoteDeploymentId: value.remoteDeploymentId,
|
|
124
|
+
};
|
|
122
125
|
}
|
|
123
126
|
else {
|
|
124
127
|
data.impls[versionWithoutMetadata] = value;
|
|
@@ -151,24 +154,31 @@ const adminLens = lens('proxy admin', 'proxy admin', data => ({
|
|
|
151
154
|
function lens(description, type, fn) {
|
|
152
155
|
return Object.assign(fn, { description, type });
|
|
153
156
|
}
|
|
154
|
-
async function checkForAddressClash(provider, data, updated,
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
157
|
+
async function checkForAddressClash(provider, data, updated, merge) {
|
|
158
|
+
let clash;
|
|
159
|
+
const findClash = () => lookupDeployment(data, updated.address, !merge);
|
|
160
|
+
if (await (0, provider_1.isDevelopmentNetwork)(provider)) {
|
|
161
|
+
// Look for clashes so that we can delete deployments from older runs.
|
|
162
|
+
// `merge` only checks primary addresses for clashes, since the address could already exist in an allAddresses field
|
|
163
|
+
// but the updated and stored objects are different instances representing the same entry.
|
|
164
|
+
clash = findClash();
|
|
165
|
+
if (clash !== undefined) {
|
|
158
166
|
(0, debug_1.default)('deleting a previous deployment at address', updated.address);
|
|
159
167
|
clash.set(undefined);
|
|
160
168
|
}
|
|
161
|
-
|
|
169
|
+
}
|
|
170
|
+
else if (!merge) {
|
|
171
|
+
clash = findClash();
|
|
172
|
+
if (clash !== undefined) {
|
|
162
173
|
const existing = clash.get();
|
|
163
174
|
// it's a clash if there is no deployment id or if deployment ids don't match
|
|
164
175
|
if (existing !== undefined &&
|
|
165
176
|
(existing.remoteDeploymentId === undefined || existing.remoteDeploymentId !== updated.remoteDeploymentId)) {
|
|
166
|
-
throw new Error(`The
|
|
167
|
-
JSON.stringify(updated, null, 2)
|
|
168
|
-
`\n\n`);
|
|
177
|
+
throw new Error(`The deployment clashes with an existing one at ${updated.address}.\n\n` +
|
|
178
|
+
`Deployments: ${JSON.stringify({ existing, updated }, null, 2)}\n\n`);
|
|
169
179
|
}
|
|
170
180
|
}
|
|
171
|
-
}
|
|
181
|
+
} // else, merge indicates that the user is force-importing or redeploying an implementation, so we simply allow merging the entries
|
|
172
182
|
}
|
|
173
183
|
function lookupDeployment(data, address, checkAllAddresses) {
|
|
174
184
|
if (data.admin?.address === address) {
|
package/dist/impl-store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impl-store.js","sourceRoot":"","sources":["../src/impl-store.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAClC,yCAAoE;AACpE,yCAAoE;AACpE,6CAOsB;AAEtB,oDAA4B;AAe5B;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,oBAAoB,CACjC,IAAqB,EACrB,QAA0B,EAC1B,MAAwB,EACxB,IAAiB,EACjB,KAAe,EACf,mBAA2F;IAE3F,MAAM,QAAQ,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAErD,IAAI;QACF,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;YACrD,IAAA,eAAK,EAAC,wBAAwB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;gBAC9B,MAAM,IAAI,KAAK,CACb,+GAA+G,CAChH,CAAC;aACH;YAED,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,MAAM,IAAA,2BAAc,EAClC,QAAQ,EACR,MAAM,EACN,MAAM,EACN,IAAI,CAAC,IAAI,EACT,IAAI,EACJ,UAAU,EACV,KAAK,EACL,mBAAmB,CACpB,CAAC;YACF,IAAI,OAAO,KAAK,MAAM,EAAE;gBACtB,IAAI,KAAK,IAAI,UAAU,CAAC,KAAK,EAAE;oBAC7B,
|
|
1
|
+
{"version":3,"file":"impl-store.js","sourceRoot":"","sources":["../src/impl-store.ts"],"names":[],"mappings":"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"}
|
package/dist/impl-store.test.js
CHANGED
|
@@ -54,28 +54,28 @@ const version2 = (0, version_1.getVersion)('02', '02');
|
|
|
54
54
|
(0, ava_1.default)('merge addresses', async (t) => {
|
|
55
55
|
const depl1 = { address: '0x1' };
|
|
56
56
|
const depl2 = { address: '0x2' };
|
|
57
|
-
const { address, allAddresses } =
|
|
57
|
+
const { address, allAddresses } = (0, impl_store_1.mergeAddresses)(depl1, depl2);
|
|
58
58
|
t.is(address, '0x1');
|
|
59
59
|
t.true(unorderedEqual(allAddresses, ['0x1', '0x2']), allAddresses.toString());
|
|
60
60
|
});
|
|
61
61
|
(0, ava_1.default)('merge multiple existing addresses', async (t) => {
|
|
62
62
|
const depl1 = { address: '0x1', allAddresses: ['0x1a', '0x1b'] };
|
|
63
63
|
const depl2 = { address: '0x2' };
|
|
64
|
-
const { address, allAddresses } =
|
|
64
|
+
const { address, allAddresses } = (0, impl_store_1.mergeAddresses)(depl1, depl2);
|
|
65
65
|
t.is(address, '0x1');
|
|
66
66
|
t.true(unorderedEqual(allAddresses, ['0x1', '0x1a', '0x1b', '0x2']), allAddresses.toString());
|
|
67
67
|
});
|
|
68
68
|
(0, ava_1.default)('merge all addresses', async (t) => {
|
|
69
69
|
const depl1 = { address: '0x1', allAddresses: ['0x1a', '0x1b'] };
|
|
70
70
|
const depl2 = { address: '0x2', allAddresses: ['0x2a', '0x2b'] };
|
|
71
|
-
const { address, allAddresses } =
|
|
71
|
+
const { address, allAddresses } = (0, impl_store_1.mergeAddresses)(depl1, depl2);
|
|
72
72
|
t.is(address, '0x1');
|
|
73
73
|
t.true(unorderedEqual(allAddresses, ['0x1', '0x1a', '0x1b', '0x2', '0x2a', '0x2b']), allAddresses.toString());
|
|
74
74
|
});
|
|
75
75
|
function unorderedEqual(arr1, arr2) {
|
|
76
76
|
return arr1.every(i => arr2.includes(i)) && arr2.every(i => arr1.includes(i));
|
|
77
77
|
}
|
|
78
|
-
(0, ava_1.default)('
|
|
78
|
+
(0, ava_1.default)('defender - replace tx hash for deployment', async (t) => {
|
|
79
79
|
const provider = (0, stub_provider_1.stubProvider)();
|
|
80
80
|
// create a pending deployment with id
|
|
81
81
|
const fakeDeploy = await provider.deployPending();
|
|
@@ -104,4 +104,73 @@ function unorderedEqual(arr1, arr2) {
|
|
|
104
104
|
t.is(deployment.address, fakeDeploy.address);
|
|
105
105
|
t.is(deployment.txHash, '0x2');
|
|
106
106
|
});
|
|
107
|
+
(0, ava_1.default)('defender - address clash', async (t) => {
|
|
108
|
+
const provider = (0, stub_provider_1.stubProvider)();
|
|
109
|
+
// create a pending deployment with id
|
|
110
|
+
const fakeDeploy = await provider.deployPending();
|
|
111
|
+
provider.removeContract(fakeDeploy.address);
|
|
112
|
+
async function deployment1() {
|
|
113
|
+
return {
|
|
114
|
+
...fakeDeploy,
|
|
115
|
+
txHash: '0x1',
|
|
116
|
+
remoteDeploymentId: 'abc',
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
const mockPendingDeployment = sinon_1.default.stub().returns({
|
|
120
|
+
status: 'submitted',
|
|
121
|
+
txHash: '0x1',
|
|
122
|
+
});
|
|
123
|
+
// let it timeout
|
|
124
|
+
await t.throwsAsync((0, impl_store_1.fetchOrDeployGetDeployment)(version1, provider, deployment1, { timeout: 1, pollingInterval: 0 }, undefined, mockPendingDeployment));
|
|
125
|
+
// simulate a new deployment with the same address, but different tx hash and deployment id
|
|
126
|
+
async function deployment2() {
|
|
127
|
+
return {
|
|
128
|
+
...fakeDeploy,
|
|
129
|
+
txHash: '0x2',
|
|
130
|
+
remoteDeploymentId: 'def',
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
// deploy with a different version hash
|
|
134
|
+
const error = await t.throwsAsync((0, impl_store_1.fetchOrDeployGetDeployment)(version2, provider, deployment2, { timeout: 1, pollingInterval: 0 }, undefined, mockPendingDeployment));
|
|
135
|
+
t.true(error?.message.startsWith(`The deployment clashes with an existing one at ${fakeDeploy.address}`), error?.message);
|
|
136
|
+
});
|
|
137
|
+
(0, ava_1.default)('defender - merge avoids address clash, replaces deployment id', async (t) => {
|
|
138
|
+
const provider = (0, stub_provider_1.stubProvider)();
|
|
139
|
+
const MERGE = true;
|
|
140
|
+
// create a pending deployment with id
|
|
141
|
+
const fakeDeploy = await provider.deployPending();
|
|
142
|
+
provider.removeContract(fakeDeploy.address);
|
|
143
|
+
async function deployment1() {
|
|
144
|
+
return {
|
|
145
|
+
...fakeDeploy,
|
|
146
|
+
txHash: '0x1',
|
|
147
|
+
remoteDeploymentId: 'abc',
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
const getDeploymentResponse1 = sinon_1.default.stub().returns({
|
|
151
|
+
status: 'submitted',
|
|
152
|
+
txHash: '0x1',
|
|
153
|
+
});
|
|
154
|
+
// let it timeout
|
|
155
|
+
await t.throwsAsync((0, impl_store_1.fetchOrDeployGetDeployment)(version1, provider, deployment1, { timeout: 1, pollingInterval: 0 }, MERGE, getDeploymentResponse1));
|
|
156
|
+
// simulate a failed previous deployment
|
|
157
|
+
const getDeploymentResponse2 = sinon_1.default.stub().returns({
|
|
158
|
+
status: 'failed',
|
|
159
|
+
txHash: '0x1',
|
|
160
|
+
});
|
|
161
|
+
// redeploy with a new deployment id
|
|
162
|
+
async function deployment2() {
|
|
163
|
+
return {
|
|
164
|
+
...fakeDeploy,
|
|
165
|
+
txHash: '0x2',
|
|
166
|
+
remoteDeploymentId: 'def',
|
|
167
|
+
};
|
|
168
|
+
}
|
|
169
|
+
// make the contract code exist
|
|
170
|
+
provider.addContract(fakeDeploy.address);
|
|
171
|
+
const deployment = await (0, impl_store_1.fetchOrDeployGetDeployment)(version1, provider, deployment2, { timeout: 1, pollingInterval: 0 }, MERGE, getDeploymentResponse2);
|
|
172
|
+
t.is(deployment.address, fakeDeploy.address);
|
|
173
|
+
t.is(deployment.txHash, '0x2');
|
|
174
|
+
t.is(deployment.remoteDeploymentId, 'def');
|
|
175
|
+
});
|
|
107
176
|
//# sourceMappingURL=impl-store.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impl-store.test.js","sourceRoot":"","sources":["../src/impl-store.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,2BAAoC;AACpC,mCAAgC;AAChC,gDAAwB;AACxB,4CAAoB;AACpB,kDAA0B;AAE1B,6CAAyF;AACzF,uCAAuC;AACvC,mDAA+C;
|
|
1
|
+
{"version":3,"file":"impl-store.test.js","sourceRoot":"","sources":["../src/impl-store.test.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export { isTransparentOrUUPSProxy, isBeaconProxy, isTransparentProxy } from './e
|
|
|
19
19
|
export { getImplementationAddressFromBeacon, getImplementationAddressFromProxy } from './impl-address';
|
|
20
20
|
export { isBeacon } from './beacon';
|
|
21
21
|
export { addProxyToManifest } from './add-proxy-to-manifest';
|
|
22
|
-
export { BeaconProxyUnsupportedError, LoadProxyUnsupportedError, PrepareUpgradeUnsupportedError, DeployBeaconProxyUnsupportedError, DeployBeaconProxyImplUnknownError, DeployBeaconProxyKindError, ForceImportUnsupportedError, NoContractImportError, ValidateUpdateRequiresKindError, PrepareUpgradeRequiresKindError, assertNotProxy, } from './usage-error';
|
|
22
|
+
export { BeaconProxyUnsupportedError, LoadProxyUnsupportedError, PrepareUpgradeUnsupportedError, DeployBeaconProxyUnsupportedError, DeployBeaconProxyImplUnknownError, DeployBeaconProxyKindError, ForceImportUnsupportedError, NoContractImportError, ValidateUpdateRequiresKindError, PrepareUpgradeRequiresKindError, InitialOwnerUnsupportedKindError, assertNotProxy, } from './usage-error';
|
|
23
23
|
export { ValidateUpgradeSafetyOptions, validateUpgradeSafety, ProjectReport, ReferenceContractNotFound } from './cli';
|
|
24
24
|
export { getUpgradeInterfaceVersion } from './upgrade-interface-version';
|
|
25
25
|
export { makeNamespacedInput } from './utils/make-namespaced';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC7F,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,OAAO,EACL,qBAAqB,EACrB,6BAA6B,EAC7B,eAAe,EACf,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,EACb,qBAAqB,EACrB,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AAExB,OAAO,EACL,YAAY,EACZ,cAAc,EACd,eAAe,EACf,QAAQ,EACR,eAAe,EACf,kBAAkB,GACnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEvE,cAAc,kCAAkC,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,kCAAkC,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AACvG,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EACzB,8BAA8B,EAC9B,iCAAiC,EACjC,iCAAiC,EACjC,0BAA0B,EAC1B,2BAA2B,EAC3B,qBAAqB,EACrB,+BAA+B,EAC/B,+BAA+B,EAC/B,cAAc,GACf,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AAEtH,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC7F,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,OAAO,EACL,qBAAqB,EACrB,6BAA6B,EAC7B,eAAe,EACf,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,EACb,qBAAqB,EACrB,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AAExB,OAAO,EACL,YAAY,EACZ,cAAc,EACd,eAAe,EACf,QAAQ,EACR,eAAe,EACf,kBAAkB,GACnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEvE,cAAc,kCAAkC,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,kCAAkC,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AACvG,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EACzB,8BAA8B,EAC9B,iCAAiC,EACjC,iCAAiC,EACjC,0BAA0B,EAC1B,2BAA2B,EAC3B,qBAAqB,EACrB,+BAA+B,EAC/B,+BAA+B,EAC/B,gCAAgC,EAChC,cAAc,GACf,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AAEtH,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.isNamespaceSupported = exports.makeNamespacedInput = exports.getUpgradeInterfaceVersion = exports.ReferenceContractNotFound = exports.ProjectReport = exports.validateUpgradeSafety = exports.assertNotProxy = exports.PrepareUpgradeRequiresKindError = exports.ValidateUpdateRequiresKindError = exports.NoContractImportError = exports.ForceImportUnsupportedError = exports.DeployBeaconProxyKindError = exports.DeployBeaconProxyImplUnknownError = exports.DeployBeaconProxyUnsupportedError = exports.PrepareUpgradeUnsupportedError = exports.LoadProxyUnsupportedError = exports.BeaconProxyUnsupportedError = exports.addProxyToManifest = exports.isBeacon = exports.getImplementationAddressFromProxy = exports.getImplementationAddressFromBeacon = exports.isTransparentProxy = exports.isBeaconProxy = exports.isTransparentOrUUPSProxy = exports.UpgradeableContract = exports.detectProxyKind = exports.processProxyKind = exports.setProxyKind = exports.logWarning = exports.getStorageLayoutForAddress = exports.DeploymentNotFound = exports.migrateManifest = exports.Manifest = exports.isEmptySlot = exports.toFallbackEip1967Hash = exports.toEip1967Hash = exports.getImplementationAddress = exports.getBeaconAddress = exports.getAdminAddress = exports.EIP1967ImplementationNotFound = exports.EIP1967BeaconNotFound = exports.fetchOrDeployGetDeployment = exports.fetchOrDeployAdmin = exports.fetchOrDeploy = void 0;
|
|
17
|
+
exports.isNamespaceSupported = exports.makeNamespacedInput = exports.getUpgradeInterfaceVersion = exports.ReferenceContractNotFound = exports.ProjectReport = exports.validateUpgradeSafety = exports.assertNotProxy = exports.InitialOwnerUnsupportedKindError = exports.PrepareUpgradeRequiresKindError = exports.ValidateUpdateRequiresKindError = exports.NoContractImportError = exports.ForceImportUnsupportedError = exports.DeployBeaconProxyKindError = exports.DeployBeaconProxyImplUnknownError = exports.DeployBeaconProxyUnsupportedError = exports.PrepareUpgradeUnsupportedError = exports.LoadProxyUnsupportedError = exports.BeaconProxyUnsupportedError = exports.addProxyToManifest = exports.isBeacon = exports.getImplementationAddressFromProxy = exports.getImplementationAddressFromBeacon = exports.isTransparentProxy = exports.isBeaconProxy = exports.isTransparentOrUUPSProxy = exports.UpgradeableContract = exports.detectProxyKind = exports.processProxyKind = exports.setProxyKind = exports.logWarning = exports.getStorageLayoutForAddress = exports.DeploymentNotFound = exports.migrateManifest = exports.Manifest = exports.isEmptySlot = exports.toFallbackEip1967Hash = exports.toEip1967Hash = exports.getImplementationAddress = exports.getBeaconAddress = exports.getAdminAddress = exports.EIP1967ImplementationNotFound = exports.EIP1967BeaconNotFound = exports.fetchOrDeployGetDeployment = exports.fetchOrDeployAdmin = exports.fetchOrDeploy = void 0;
|
|
18
18
|
__exportStar(require("./validate"), exports);
|
|
19
19
|
var impl_store_1 = require("./impl-store");
|
|
20
20
|
Object.defineProperty(exports, "fetchOrDeploy", { enumerable: true, get: function () { return impl_store_1.fetchOrDeploy; } });
|
|
@@ -74,6 +74,7 @@ Object.defineProperty(exports, "ForceImportUnsupportedError", { enumerable: true
|
|
|
74
74
|
Object.defineProperty(exports, "NoContractImportError", { enumerable: true, get: function () { return usage_error_1.NoContractImportError; } });
|
|
75
75
|
Object.defineProperty(exports, "ValidateUpdateRequiresKindError", { enumerable: true, get: function () { return usage_error_1.ValidateUpdateRequiresKindError; } });
|
|
76
76
|
Object.defineProperty(exports, "PrepareUpgradeRequiresKindError", { enumerable: true, get: function () { return usage_error_1.PrepareUpgradeRequiresKindError; } });
|
|
77
|
+
Object.defineProperty(exports, "InitialOwnerUnsupportedKindError", { enumerable: true, get: function () { return usage_error_1.InitialOwnerUnsupportedKindError; } });
|
|
77
78
|
Object.defineProperty(exports, "assertNotProxy", { enumerable: true, get: function () { return usage_error_1.assertNotProxy; } });
|
|
78
79
|
var cli_1 = require("./cli");
|
|
79
80
|
Object.defineProperty(exports, "validateUpgradeSafety", { enumerable: true, get: function () { return cli_1.validateUpgradeSafety; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,2CAA6F;AAApF,2GAAA,aAAa,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AAAE,wHAAA,0BAA0B,OAAA;AACtE,4CAA0B;AAC1B,4CAA0B;AAC1B,uCASoB;AARlB,iHAAA,qBAAqB,OAAA;AACrB,yHAAA,6BAA6B,OAAA;AAC7B,2GAAA,eAAe,OAAA;AACf,4GAAA,gBAAgB,OAAA;AAChB,oHAAA,wBAAwB,OAAA;AACxB,yGAAA,aAAa,OAAA;AACb,iHAAA,qBAAqB,OAAA;AACrB,uGAAA,WAAW,OAAA;AAEb,6CAA2B;AAC3B,gDAA8B;AAC9B,6CAA2B;AAC3B,+CAA6B;AAC7B,8CAA4B;AAC5B,0CAAwB;AAExB,uCAOoB;AAHlB,oGAAA,QAAQ,OAAA;AACR,2GAAA,eAAe,OAAA;AACf,8GAAA,kBAAkB,OAAA;AAGpB,qEAAuE;AAA9D,qIAAA,0BAA0B,OAAA;AAEnC,mEAAiD;AAEjD,mCAAyC;AAAhC,iGAAA,UAAU,OAAA;AACnB,2CAA+E;AAAtE,0GAAA,YAAY,OAAA;AAAE,8GAAA,gBAAgB,OAAA;AAAE,6GAAA,eAAe,OAAA;AAExD,2CAAmD;AAA1C,iHAAA,mBAAmB,OAAA;AAE5B,iDAA8F;AAArF,yHAAA,wBAAwB,OAAA;AAAE,8GAAA,aAAa,OAAA;AAAE,mHAAA,kBAAkB,OAAA;AACpE,+CAAuG;AAA9F,kIAAA,kCAAkC,OAAA;AAAE,iIAAA,iCAAiC,OAAA;AAC9E,mCAAoC;AAA3B,kGAAA,QAAQ,OAAA;AACjB,iEAA6D;AAApD,2HAAA,kBAAkB,OAAA;AAE3B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,2CAA6F;AAApF,2GAAA,aAAa,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AAAE,wHAAA,0BAA0B,OAAA;AACtE,4CAA0B;AAC1B,4CAA0B;AAC1B,uCASoB;AARlB,iHAAA,qBAAqB,OAAA;AACrB,yHAAA,6BAA6B,OAAA;AAC7B,2GAAA,eAAe,OAAA;AACf,4GAAA,gBAAgB,OAAA;AAChB,oHAAA,wBAAwB,OAAA;AACxB,yGAAA,aAAa,OAAA;AACb,iHAAA,qBAAqB,OAAA;AACrB,uGAAA,WAAW,OAAA;AAEb,6CAA2B;AAC3B,gDAA8B;AAC9B,6CAA2B;AAC3B,+CAA6B;AAC7B,8CAA4B;AAC5B,0CAAwB;AAExB,uCAOoB;AAHlB,oGAAA,QAAQ,OAAA;AACR,2GAAA,eAAe,OAAA;AACf,8GAAA,kBAAkB,OAAA;AAGpB,qEAAuE;AAA9D,qIAAA,0BAA0B,OAAA;AAEnC,mEAAiD;AAEjD,mCAAyC;AAAhC,iGAAA,UAAU,OAAA;AACnB,2CAA+E;AAAtE,0GAAA,YAAY,OAAA;AAAE,8GAAA,gBAAgB,OAAA;AAAE,6GAAA,eAAe,OAAA;AAExD,2CAAmD;AAA1C,iHAAA,mBAAmB,OAAA;AAE5B,iDAA8F;AAArF,yHAAA,wBAAwB,OAAA;AAAE,8GAAA,aAAa,OAAA;AAAE,mHAAA,kBAAkB,OAAA;AACpE,+CAAuG;AAA9F,kIAAA,kCAAkC,OAAA;AAAE,iIAAA,iCAAiC,OAAA;AAC9E,mCAAoC;AAA3B,kGAAA,QAAQ,OAAA;AACjB,iEAA6D;AAApD,2HAAA,kBAAkB,OAAA;AAE3B,6CAauB;AAZrB,0HAAA,2BAA2B,OAAA;AAC3B,wHAAA,yBAAyB,OAAA;AACzB,6HAAA,8BAA8B,OAAA;AAC9B,gIAAA,iCAAiC,OAAA;AACjC,gIAAA,iCAAiC,OAAA;AACjC,yHAAA,0BAA0B,OAAA;AAC1B,0HAAA,2BAA2B,OAAA;AAC3B,oHAAA,qBAAqB,OAAA;AACrB,8HAAA,+BAA+B,OAAA;AAC/B,8HAAA,+BAA+B,OAAA;AAC/B,+HAAA,gCAAgC,OAAA;AAChC,6GAAA,cAAc,OAAA;AAGhB,6BAAsH;AAA/E,4GAAA,qBAAqB,OAAA;AAAE,oGAAA,aAAa,OAAA;AAAE,gHAAA,yBAAyB,OAAA;AAEtG,yEAAyE;AAAhE,uIAAA,0BAA0B,OAAA;AACnC,2DAA8D;AAArD,sHAAA,mBAAmB,OAAA;AAC5B,iDAA2D;AAAlD,iHAAA,oBAAoB,OAAA"}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
{
|
|
2
|
+
"contracts": {
|
|
3
|
+
"Box": {
|
|
4
|
+
"address": "0xb682dEEf4f8e298d86bFc3e21f50c675151FB974",
|
|
5
|
+
"constructorCode": "608060405234801561001057600080fd5b506101a3806100206000396000f3fe",
|
|
6
|
+
"bodyBytecodeHash": "0e331fb885de0fa7c715c4819b6ded2449542cb3cce682718791be28ae0789e8",
|
|
7
|
+
"localBytecodeHash": "08100f44a71d905a66088b4c5d72f12417a580d454357e06dcc5ad12b3fa2cbc",
|
|
8
|
+
"deployedBytecodeHash": "08100f44a71d905a66088b4c5d72f12417a580d454357e06dcc5ad12b3fa2cbc",
|
|
9
|
+
"types": {
|
|
10
|
+
"t_uint256": {
|
|
11
|
+
"id": "t_uint256",
|
|
12
|
+
"kind": "elementary",
|
|
13
|
+
"label": "uint256"
|
|
14
|
+
},
|
|
15
|
+
"t_bool": {
|
|
16
|
+
"id": "t_bool",
|
|
17
|
+
"kind": "elementary",
|
|
18
|
+
"label": "bool"
|
|
19
|
+
},
|
|
20
|
+
"t_mapping<t_bool>": {
|
|
21
|
+
"id": "t_mapping<t_bool>",
|
|
22
|
+
"valueType": "t_bool",
|
|
23
|
+
"label": "mapping(key => bool)",
|
|
24
|
+
"kind": "mapping"
|
|
25
|
+
},
|
|
26
|
+
"t_struct<Box.MyStruct>": {
|
|
27
|
+
"id": "t_struct<Box.MyStruct>",
|
|
28
|
+
"kind": "struct",
|
|
29
|
+
"label": "Box.MyStruct",
|
|
30
|
+
"members": [
|
|
31
|
+
{
|
|
32
|
+
"label": "x",
|
|
33
|
+
"astId": 3,
|
|
34
|
+
"type": "t_bool",
|
|
35
|
+
"src": "124:6:0"
|
|
36
|
+
}
|
|
37
|
+
]
|
|
38
|
+
},
|
|
39
|
+
"t_enum<Box.MyEnum>": {
|
|
40
|
+
"id": "t_enum<Box.MyEnum>",
|
|
41
|
+
"kind": "enum",
|
|
42
|
+
"label": "Box.MyEnum",
|
|
43
|
+
"members": [
|
|
44
|
+
"UP",
|
|
45
|
+
"DOWN"
|
|
46
|
+
]
|
|
47
|
+
},
|
|
48
|
+
"t_array:dyn<t_uint256>": {
|
|
49
|
+
"id": "t_array:dyn<t_uint256>",
|
|
50
|
+
"valueType": "t_uint256",
|
|
51
|
+
"length": "dyn",
|
|
52
|
+
"kind": "array",
|
|
53
|
+
"label": "uint256[]"
|
|
54
|
+
},
|
|
55
|
+
"t_array:10<t_uint256>": {
|
|
56
|
+
"id": "t_array:10<t_uint256>",
|
|
57
|
+
"valueType": "t_uint256",
|
|
58
|
+
"length": "10",
|
|
59
|
+
"kind": "array",
|
|
60
|
+
"label": "uint256[10]"
|
|
61
|
+
},
|
|
62
|
+
"t_array:dyn<t_enum<Box.MyEnum>>": {
|
|
63
|
+
"id": "t_array:dyn<t_enum<Box.MyEnum>>",
|
|
64
|
+
"valueType": "t_enum<Box.MyEnum>",
|
|
65
|
+
"length": "dyn",
|
|
66
|
+
"kind": "array",
|
|
67
|
+
"label": "Box.MyEnum[]"
|
|
68
|
+
},
|
|
69
|
+
"t_bytes8": {
|
|
70
|
+
"id": "t_bytes8",
|
|
71
|
+
"kind": "elementary",
|
|
72
|
+
"label": "bytes8"
|
|
73
|
+
}
|
|
74
|
+
},
|
|
75
|
+
"storage": [
|
|
76
|
+
{
|
|
77
|
+
"contract": "Box",
|
|
78
|
+
"path": "contracts/Box.sol",
|
|
79
|
+
"label": "value",
|
|
80
|
+
"astId": 9,
|
|
81
|
+
"type": "t_uint256",
|
|
82
|
+
"src": "173:21:0"
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
"contract": "Box",
|
|
86
|
+
"path": "contracts/Box.sol",
|
|
87
|
+
"label": "flag",
|
|
88
|
+
"astId": 11,
|
|
89
|
+
"type": "t_bool",
|
|
90
|
+
"src": "200:17:0"
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
"contract": "Box",
|
|
94
|
+
"path": "contracts/Box.sol",
|
|
95
|
+
"label": "map",
|
|
96
|
+
"astId": 15,
|
|
97
|
+
"type": "t_mapping<t_bool>",
|
|
98
|
+
"src": "223:26:0"
|
|
99
|
+
},
|
|
100
|
+
{
|
|
101
|
+
"contract": "Box",
|
|
102
|
+
"path": "contracts/Box.sol",
|
|
103
|
+
"label": "foo",
|
|
104
|
+
"astId": 17,
|
|
105
|
+
"type": "t_struct<Box.MyStruct>",
|
|
106
|
+
"src": "255:20:0"
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
"contract": "Box",
|
|
110
|
+
"path": "contracts/Box.sol",
|
|
111
|
+
"label": "myEnum",
|
|
112
|
+
"astId": 19,
|
|
113
|
+
"type": "t_enum<Box.MyEnum>",
|
|
114
|
+
"src": "281:21:0"
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
"contract": "Box",
|
|
118
|
+
"path": "contracts/Box.sol",
|
|
119
|
+
"label": "dynArray",
|
|
120
|
+
"astId": 22,
|
|
121
|
+
"type": "t_array:dyn<t_uint256>",
|
|
122
|
+
"src": "308:23:0"
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
"contract": "Box",
|
|
126
|
+
"path": "contracts/Box.sol",
|
|
127
|
+
"label": "staticArray",
|
|
128
|
+
"astId": 26,
|
|
129
|
+
"type": "t_array:10<t_uint256>",
|
|
130
|
+
"src": "337:20:0"
|
|
131
|
+
},
|
|
132
|
+
{
|
|
133
|
+
"contract": "Box",
|
|
134
|
+
"path": "contracts/Box.sol",
|
|
135
|
+
"label": "enumArray",
|
|
136
|
+
"astId": 29,
|
|
137
|
+
"type": "t_array:dyn<t_enum<Box.MyEnum>>",
|
|
138
|
+
"src": "363:26:0"
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
"contract": "Box",
|
|
142
|
+
"path": "contracts/Box.sol",
|
|
143
|
+
"label": "byteArray",
|
|
144
|
+
"astId": 31,
|
|
145
|
+
"type": "t_bytes8",
|
|
146
|
+
"src": "395:16:0"
|
|
147
|
+
}
|
|
148
|
+
],
|
|
149
|
+
"warnings": {
|
|
150
|
+
"hasConstructor": false,
|
|
151
|
+
"hasSelfDestruct": false,
|
|
152
|
+
"hasDelegateCall": false,
|
|
153
|
+
"hasInitialValuesInDeclarations": false,
|
|
154
|
+
"uninitializedBaseContracts": []
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
},
|
|
158
|
+
"solidityLibs": {},
|
|
159
|
+
"proxies": {
|
|
160
|
+
"my-project/Box": [
|
|
161
|
+
{
|
|
162
|
+
"address": "0xE4C10Db67595aF2Cb4166c8C274e0140f7E43059",
|
|
163
|
+
"version": "1.0.0",
|
|
164
|
+
"implementation": "0xb682dEEf4f8e298d86bFc3e21f50c675151FB974",
|
|
165
|
+
"admin": "0x1750499D05Ed1674d822430FB960d5F6731fDf64",
|
|
166
|
+
"kind": "Upgradeable"
|
|
167
|
+
}
|
|
168
|
+
]
|
|
169
|
+
},
|
|
170
|
+
"manifestVersion": "2.2",
|
|
171
|
+
"version": "1.0.0",
|
|
172
|
+
"proxyAdmin": {
|
|
173
|
+
"address": "0x1750499D05Ed1674d822430FB960d5F6731fDf64"
|
|
174
|
+
}
|
|
175
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
{
|
|
2
|
+
"manifestVersion": "2.2",
|
|
3
|
+
"contracts": {
|
|
4
|
+
"Box": "Box"
|
|
5
|
+
},
|
|
6
|
+
"dependencies": {},
|
|
7
|
+
"name": "my-project",
|
|
8
|
+
"version": "1.0.0",
|
|
9
|
+
"compiler": {
|
|
10
|
+
"compilerSettings": {
|
|
11
|
+
"optimizer": {
|
|
12
|
+
"enabled": false,
|
|
13
|
+
"runs": "200"
|
|
14
|
+
}
|
|
15
|
+
},
|
|
16
|
+
"typechain": {
|
|
17
|
+
"enabled": false
|
|
18
|
+
},
|
|
19
|
+
"manager": "openzeppelin",
|
|
20
|
+
"solcVersion": "0.6.12",
|
|
21
|
+
"artifactsDir": "build/contracts",
|
|
22
|
+
"contractsDir": "contracts"
|
|
23
|
+
},
|
|
24
|
+
"telemetryOptIn": false
|
|
25
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"0.8.20"
|
package/dist/standalone.test.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const ava_1 = __importDefault(require("ava"));
|
|
7
7
|
const hardhat_1 = require("hardhat");
|
|
8
|
+
const solidity_version_json_1 = __importDefault(require("./solidity-version.json"));
|
|
8
9
|
const standalone_1 = require("./standalone");
|
|
9
10
|
const test = ava_1.default;
|
|
10
11
|
test.before(async (t) => {
|
|
@@ -16,32 +17,32 @@ test.before(async (t) => {
|
|
|
16
17
|
t.context.solcOutput = buildInfo.output;
|
|
17
18
|
});
|
|
18
19
|
test('reports unsafe operation', t => {
|
|
19
|
-
const impl = new standalone_1.UpgradeableContract('StandaloneV1', t.context.solcInput, t.context.solcOutput);
|
|
20
|
+
const impl = new standalone_1.UpgradeableContract('StandaloneV1', t.context.solcInput, t.context.solcOutput, {}, solidity_version_json_1.default);
|
|
20
21
|
const report = impl.getErrorReport();
|
|
21
22
|
t.false(report.ok);
|
|
22
23
|
t.true(report.errors[0].kind === 'delegatecall');
|
|
23
24
|
});
|
|
24
25
|
test('reports unsafe operation - fully qualified name', t => {
|
|
25
|
-
const impl = new standalone_1.UpgradeableContract('contracts/test/Standalone.sol:StandaloneV1', t.context.solcInput, t.context.solcOutput);
|
|
26
|
+
const impl = new standalone_1.UpgradeableContract('contracts/test/Standalone.sol:StandaloneV1', t.context.solcInput, t.context.solcOutput, {}, solidity_version_json_1.default);
|
|
26
27
|
const report = impl.getErrorReport();
|
|
27
28
|
t.false(report.ok);
|
|
28
29
|
t.true(report.errors[0].kind === 'delegatecall');
|
|
29
30
|
});
|
|
30
31
|
test('reports storage upgrade errors', t => {
|
|
31
|
-
const v1 = new standalone_1.UpgradeableContract('StandaloneV1', t.context.solcInput, t.context.solcOutput);
|
|
32
|
-
const v2Good = new standalone_1.UpgradeableContract('StandaloneV2Good', t.context.solcInput, t.context.solcOutput);
|
|
32
|
+
const v1 = new standalone_1.UpgradeableContract('StandaloneV1', t.context.solcInput, t.context.solcOutput, {}, solidity_version_json_1.default);
|
|
33
|
+
const v2Good = new standalone_1.UpgradeableContract('StandaloneV2Good', t.context.solcInput, t.context.solcOutput, {}, solidity_version_json_1.default);
|
|
33
34
|
const goodReport = v1.getStorageUpgradeReport(v2Good);
|
|
34
35
|
t.true(goodReport.ok);
|
|
35
|
-
const v2Bad = new standalone_1.UpgradeableContract('StandaloneV2Bad', t.context.solcInput, t.context.solcOutput);
|
|
36
|
+
const v2Bad = new standalone_1.UpgradeableContract('StandaloneV2Bad', t.context.solcInput, t.context.solcOutput, {}, solidity_version_json_1.default);
|
|
36
37
|
const badReport = v1.getStorageUpgradeReport(v2Bad);
|
|
37
38
|
t.false(badReport.ok);
|
|
38
39
|
});
|
|
39
40
|
test('dont report renamed version update', t => {
|
|
40
|
-
const v1 = new standalone_1.UpgradeableContract('StandaloneRenameV1', t.context.solcInput, t.context.solcOutput);
|
|
41
|
-
const v2 = new standalone_1.UpgradeableContract('StandaloneRenameV2', t.context.solcInput, t.context.solcOutput);
|
|
41
|
+
const v1 = new standalone_1.UpgradeableContract('StandaloneRenameV1', t.context.solcInput, t.context.solcOutput, {}, solidity_version_json_1.default);
|
|
42
|
+
const v2 = new standalone_1.UpgradeableContract('StandaloneRenameV2', t.context.solcInput, t.context.solcOutput, {}, solidity_version_json_1.default);
|
|
42
43
|
const goodReport = v1.getStorageUpgradeReport(v2);
|
|
43
44
|
t.true(goodReport.ok);
|
|
44
|
-
const v3 = new standalone_1.UpgradeableContract('StandaloneRenameV3', t.context.solcInput, t.context.solcOutput);
|
|
45
|
+
const v3 = new standalone_1.UpgradeableContract('StandaloneRenameV3', t.context.solcInput, t.context.solcOutput, {}, solidity_version_json_1.default);
|
|
45
46
|
const goodReport2 = v2.getStorageUpgradeReport(v3);
|
|
46
47
|
t.true(goodReport2.ok);
|
|
47
48
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standalone.test.js","sourceRoot":"","sources":["../src/standalone.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAoC;AACpC,qCAAoC;
|
|
1
|
+
{"version":3,"file":"standalone.test.js","sourceRoot":"","sources":["../src/standalone.test.ts"],"names":[],"mappings":"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"}
|
package/dist/usage-error.d.ts
CHANGED
|
@@ -35,5 +35,8 @@ export declare class ValidateUpdateRequiresKindError extends UpgradesError {
|
|
|
35
35
|
export declare class PrepareUpgradeRequiresKindError extends UpgradesError {
|
|
36
36
|
constructor();
|
|
37
37
|
}
|
|
38
|
+
export declare class InitialOwnerUnsupportedKindError extends UpgradesError {
|
|
39
|
+
constructor(kind: string);
|
|
40
|
+
}
|
|
38
41
|
export declare function assertNotProxy(provider: EthereumProvider, address: string): Promise<void>;
|
|
39
42
|
//# sourceMappingURL=usage-error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-error.d.ts","sourceRoot":"","sources":["../src/usage-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6D,aAAa,EAAE,MAAM,GAAG,CAAC;AAE/G,qBAAa,2BAA4B,SAAQ,aAAa;;CAO7D;AAED,qBAAa,0BAA2B,SAAQ,aAAa;gBAC/C,IAAI,EAAE,MAAM;CAMzB;AAED,qBAAa,iCAAkC,SAAQ,aAAa;gBACtD,aAAa,EAAE,MAAM;CAGlC;AAED,qBAAa,iCAAkC,SAAQ,aAAa;gBACtD,WAAW,EAAE,MAAM;CAMhC;AAED,qBAAa,yBAA0B,SAAQ,aAAa;gBAC9C,YAAY,EAAE,MAAM;CAMjC;AAED;;GAEG;AACH,qBAAa,8BAA+B,SAAQ,aAAa;gBACnD,oBAAoB,EAAE,MAAM;CAMzC;AAED;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,aAAa;gBAChD,oBAAoB,EAAE,MAAM;CAMzC;AAED,qBAAa,qBAAsB,SAAQ,aAAa;gBAC1C,OAAO,EAAE,MAAM;CAM5B;AAED,qBAAa,+BAAgC,SAAQ,aAAa;;CAQjE;AAED,qBAAa,+BAAgC,SAAQ,aAAa;;CAQjE;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,iBAc/E"}
|
|
1
|
+
{"version":3,"file":"usage-error.d.ts","sourceRoot":"","sources":["../src/usage-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6D,aAAa,EAAE,MAAM,GAAG,CAAC;AAE/G,qBAAa,2BAA4B,SAAQ,aAAa;;CAO7D;AAED,qBAAa,0BAA2B,SAAQ,aAAa;gBAC/C,IAAI,EAAE,MAAM;CAMzB;AAED,qBAAa,iCAAkC,SAAQ,aAAa;gBACtD,aAAa,EAAE,MAAM;CAGlC;AAED,qBAAa,iCAAkC,SAAQ,aAAa;gBACtD,WAAW,EAAE,MAAM;CAMhC;AAED,qBAAa,yBAA0B,SAAQ,aAAa;gBAC9C,YAAY,EAAE,MAAM;CAMjC;AAED;;GAEG;AACH,qBAAa,8BAA+B,SAAQ,aAAa;gBACnD,oBAAoB,EAAE,MAAM;CAMzC;AAED;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,aAAa;gBAChD,oBAAoB,EAAE,MAAM;CAMzC;AAED,qBAAa,qBAAsB,SAAQ,aAAa;gBAC1C,OAAO,EAAE,MAAM;CAM5B;AAED,qBAAa,+BAAgC,SAAQ,aAAa;;CAQjE;AAED,qBAAa,+BAAgC,SAAQ,aAAa;;CAQjE;AAED,qBAAa,gCAAiC,SAAQ,aAAa;gBACrD,IAAI,EAAE,MAAM;CAMzB;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,iBAc/E"}
|
package/dist/usage-error.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.assertNotProxy = exports.PrepareUpgradeRequiresKindError = exports.ValidateUpdateRequiresKindError = exports.NoContractImportError = exports.ForceImportUnsupportedError = exports.PrepareUpgradeUnsupportedError = exports.LoadProxyUnsupportedError = exports.DeployBeaconProxyImplUnknownError = exports.DeployBeaconProxyUnsupportedError = exports.DeployBeaconProxyKindError = exports.BeaconProxyUnsupportedError = void 0;
|
|
3
|
+
exports.assertNotProxy = exports.InitialOwnerUnsupportedKindError = exports.PrepareUpgradeRequiresKindError = exports.ValidateUpdateRequiresKindError = exports.NoContractImportError = exports.ForceImportUnsupportedError = exports.PrepareUpgradeUnsupportedError = exports.LoadProxyUnsupportedError = exports.DeployBeaconProxyImplUnknownError = exports.DeployBeaconProxyUnsupportedError = exports.DeployBeaconProxyKindError = exports.BeaconProxyUnsupportedError = void 0;
|
|
4
4
|
const _1 = require(".");
|
|
5
5
|
class BeaconProxyUnsupportedError extends _1.UpgradesError {
|
|
6
6
|
constructor() {
|
|
@@ -68,6 +68,12 @@ class PrepareUpgradeRequiresKindError extends _1.UpgradesError {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
exports.PrepareUpgradeRequiresKindError = PrepareUpgradeRequiresKindError;
|
|
71
|
+
class InitialOwnerUnsupportedKindError extends _1.UpgradesError {
|
|
72
|
+
constructor(kind) {
|
|
73
|
+
super(`The \`initialOwner\` option is not supported for this kind of proxy ('${kind}')`, () => `Set the initial owner as part of your contract's initializer arguments instead.`);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
exports.InitialOwnerUnsupportedKindError = InitialOwnerUnsupportedKindError;
|
|
71
77
|
async function assertNotProxy(provider, address) {
|
|
72
78
|
if (await (0, _1.isTransparentOrUUPSProxy)(provider, address)) {
|
|
73
79
|
throw new _1.UpgradesError('Address is a transparent or UUPS proxy which cannot be upgraded using upgradeBeacon().', () => 'Use upgradeProxy() instead.');
|