@rocketh/proxy 0.19.7 → 0.19.9
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/dist/index.js +8 -6
- package/dist/index.js.map +1 -1
- package/package.json +5 -5
- package/src/index.ts +8 -8
package/dist/index.js
CHANGED
|
@@ -120,7 +120,7 @@ export function deployViaProxy(env) {
|
|
|
120
120
|
artifact,
|
|
121
121
|
account: address,
|
|
122
122
|
}, optionsForImplementation);
|
|
123
|
-
logger.info(`implementation at ${implementationDeployment.address}`, `${implementationName}`);
|
|
123
|
+
// logger.info(`implementation at ${implementationDeployment.address}`, `${implementationName}`);
|
|
124
124
|
const { address: implementationAddress, argsData: implementationArgsData, transaction, newlyDeployed: implementationNewlyDeployed, ...artifactFromImplementationDeployment } = implementationDeployment;
|
|
125
125
|
// TODO throw specific error if artifact not found
|
|
126
126
|
const artifactToUse = artifactFromImplementationDeployment;
|
|
@@ -128,7 +128,7 @@ export function deployViaProxy(env) {
|
|
|
128
128
|
{ name: implementationName, abi: artifactFromImplementationDeployment.abi },
|
|
129
129
|
{ name: proxyName, abi: proxyArtifact.abi },
|
|
130
130
|
], { checkForConflicts: checkABIConflict });
|
|
131
|
-
logger.info(`existingDeployment at ${existingDeployment?.address}`);
|
|
131
|
+
// logger.info(`existingDeployment at ${existingDeployment?.address}`);
|
|
132
132
|
const expectedOwner = options?.owner || address;
|
|
133
133
|
let proxyAdmin = expectedOwner;
|
|
134
134
|
let proxyAdminContract;
|
|
@@ -242,14 +242,14 @@ export function deployViaProxy(env) {
|
|
|
242
242
|
skipIfAlreadyDeployed: true,
|
|
243
243
|
deterministic: options?.deterministic,
|
|
244
244
|
});
|
|
245
|
-
logger.info(`proxy deployed at ${proxy.address}`);
|
|
245
|
+
// logger.info(`proxy deployed at ${proxy.address}`);
|
|
246
246
|
existingDeployment = await env.save(name, {
|
|
247
247
|
...proxy,
|
|
248
248
|
...artifactToUse,
|
|
249
249
|
abi: mergedABI,
|
|
250
250
|
linkedData: toJSONCompatibleLinkedData(options?.linkedData),
|
|
251
251
|
});
|
|
252
|
-
logger.info(`saving as ${name}`);
|
|
252
|
+
// logger.info(`saving as ${name}`);
|
|
253
253
|
}
|
|
254
254
|
else {
|
|
255
255
|
const proxyDeployment = env.getOrNull(proxyName);
|
|
@@ -266,7 +266,9 @@ export function deployViaProxy(env) {
|
|
|
266
266
|
});
|
|
267
267
|
const currentImplementationAddress = `0x${implementationSlotData.substr(-40)}`;
|
|
268
268
|
if (currentImplementationAddress.toLowerCase() !== implementationDeployment.address.toLowerCase()) {
|
|
269
|
-
logger.info(
|
|
269
|
+
// logger.info(
|
|
270
|
+
// `different implementation old: ${currentImplementationAddress} new: ${implementationDeployment.address}, upgrade...`,
|
|
271
|
+
// );
|
|
270
272
|
// let currentOwner: `0x${string}` | undefined;
|
|
271
273
|
// try {
|
|
272
274
|
// currentOwner = await env.read(proxyDeployment, {functionName: 'owner'});
|
|
@@ -363,7 +365,7 @@ export function deployViaProxy(env) {
|
|
|
363
365
|
abi: mergedABI,
|
|
364
366
|
linkedData: toJSONCompatibleLinkedData(options?.linkedData),
|
|
365
367
|
});
|
|
366
|
-
logger.info(`saving as ${name}`);
|
|
368
|
+
// logger.info(`saving as ${name}`);
|
|
367
369
|
}
|
|
368
370
|
}
|
|
369
371
|
return existingDeployment;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rocketh/proxy",
|
|
3
|
-
"version": "0.19.
|
|
3
|
+
"version": "0.19.9",
|
|
4
4
|
"description": "provide proxy-enabled deploy function for rocketh",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"rocketh",
|
|
@@ -51,9 +51,9 @@
|
|
|
51
51
|
"eip-1193": "^0.6.5",
|
|
52
52
|
"named-logs": "^0.4.1",
|
|
53
53
|
"viem": "^2.48.2",
|
|
54
|
-
"@rocketh/
|
|
55
|
-
"@rocketh/
|
|
56
|
-
"@rocketh/
|
|
54
|
+
"@rocketh/read-execute": "0.19.2",
|
|
55
|
+
"@rocketh/core": "0.19.2",
|
|
56
|
+
"@rocketh/deploy": "0.19.4"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
59
|
"as-soon": "^0.1.6",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"tsx": "^4.21.0",
|
|
62
62
|
"typescript": "^6.0.3",
|
|
63
63
|
"vitest": "^4.1.5",
|
|
64
|
-
"@rocketh/test-utils": "0.2.
|
|
64
|
+
"@rocketh/test-utils": "0.2.2"
|
|
65
65
|
},
|
|
66
66
|
"scripts": {
|
|
67
67
|
"build": "tsc --project tsconfig.json && tsx ../../scripts/ts-to-json --dir ./src/hardhat-deploy-v1-artifacts --output-dir ./artifacts",
|
package/src/index.ts
CHANGED
|
@@ -251,7 +251,7 @@ export function deployViaProxy(
|
|
|
251
251
|
optionsForImplementation,
|
|
252
252
|
);
|
|
253
253
|
|
|
254
|
-
logger.info(`implementation at ${implementationDeployment.address}`, `${implementationName}`);
|
|
254
|
+
// logger.info(`implementation at ${implementationDeployment.address}`, `${implementationName}`);
|
|
255
255
|
|
|
256
256
|
const {
|
|
257
257
|
address: implementationAddress,
|
|
@@ -271,7 +271,7 @@ export function deployViaProxy(
|
|
|
271
271
|
{checkForConflicts: checkABIConflict},
|
|
272
272
|
);
|
|
273
273
|
|
|
274
|
-
logger.info(`existingDeployment at ${existingDeployment?.address}`);
|
|
274
|
+
// logger.info(`existingDeployment at ${existingDeployment?.address}`);
|
|
275
275
|
|
|
276
276
|
const expectedOwner = options?.owner || address;
|
|
277
277
|
let proxyAdmin = expectedOwner;
|
|
@@ -409,7 +409,7 @@ export function deployViaProxy(
|
|
|
409
409
|
},
|
|
410
410
|
);
|
|
411
411
|
|
|
412
|
-
logger.info(`proxy deployed at ${proxy.address}`);
|
|
412
|
+
// logger.info(`proxy deployed at ${proxy.address}`);
|
|
413
413
|
|
|
414
414
|
existingDeployment = await env.save<TAbi>(name, {
|
|
415
415
|
...proxy,
|
|
@@ -418,7 +418,7 @@ export function deployViaProxy(
|
|
|
418
418
|
linkedData: toJSONCompatibleLinkedData(options?.linkedData),
|
|
419
419
|
});
|
|
420
420
|
|
|
421
|
-
logger.info(`saving as ${name}`);
|
|
421
|
+
// logger.info(`saving as ${name}`);
|
|
422
422
|
} else {
|
|
423
423
|
const proxyDeployment = env.getOrNull<typeof proxyArtifact.abi>(proxyName);
|
|
424
424
|
if (!proxyDeployment) {
|
|
@@ -436,9 +436,9 @@ export function deployViaProxy(
|
|
|
436
436
|
const currentImplementationAddress = `0x${implementationSlotData.substr(-40)}`;
|
|
437
437
|
|
|
438
438
|
if (currentImplementationAddress.toLowerCase() !== implementationDeployment.address.toLowerCase()) {
|
|
439
|
-
logger.info(
|
|
440
|
-
|
|
441
|
-
);
|
|
439
|
+
// logger.info(
|
|
440
|
+
// `different implementation old: ${currentImplementationAddress} new: ${implementationDeployment.address}, upgrade...`,
|
|
441
|
+
// );
|
|
442
442
|
|
|
443
443
|
// let currentOwner: `0x${string}` | undefined;
|
|
444
444
|
// try {
|
|
@@ -539,7 +539,7 @@ export function deployViaProxy(
|
|
|
539
539
|
abi: mergedABI as unknown as TAbi,
|
|
540
540
|
linkedData: toJSONCompatibleLinkedData(options?.linkedData),
|
|
541
541
|
});
|
|
542
|
-
logger.info(`saving as ${name}`);
|
|
542
|
+
// logger.info(`saving as ${name}`);
|
|
543
543
|
}
|
|
544
544
|
}
|
|
545
545
|
return existingDeployment;
|