@rocketh/proxy 0.11.25 → 0.11.26-testing.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/dist/index.d.ts +2 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +249 -260
- package/dist/index.js.map +1 -1
- package/package.json +6 -7
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { Abi } from 'abitype';
|
|
2
|
-
import type { Artifact, DeploymentConstruction, Deployment } from 'rocketh';
|
|
3
|
-
import '@rocketh/deploy';
|
|
4
|
-
import '@rocketh/read-execute';
|
|
2
|
+
import type { Artifact, DeploymentConstruction, Deployment, Environment } from 'rocketh';
|
|
5
3
|
import type { EIP1193Account } from 'eip-1193';
|
|
6
4
|
import { Chain } from 'viem';
|
|
7
5
|
import { DeployOptions } from '@rocketh/deploy';
|
|
@@ -26,9 +24,5 @@ export type ProxyEnhancedDeploymentConstructionWithoutFunction<TAbi extends Abi,
|
|
|
26
24
|
artifact: Artifact<TAbi>;
|
|
27
25
|
};
|
|
28
26
|
export type DeployViaProxyFunction = <TAbi extends Abi, TChain extends Chain = Chain>(name: string, params: ProxyEnhancedDeploymentConstruction<TAbi, TChain>, options?: ProxyDeployOptions) => Promise<Deployment<TAbi>>;
|
|
29
|
-
declare
|
|
30
|
-
interface Environment {
|
|
31
|
-
deployViaProxy: DeployViaProxyFunction;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
27
|
+
export declare function deployViaProxy<TAbi extends Abi, TChain extends Chain = Chain>(env: Environment, name: string, params: ProxyEnhancedDeploymentConstruction<TAbi, TChain>, options?: ProxyDeployOptions): Promise<Deployment<TAbi>>;
|
|
34
28
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAc,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,EAAC,QAAQ,EAAE,sBAAsB,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAc,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,EAAC,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,SAAS,CAAC;AACvF,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,KAAK,EAAkC,MAAM,MAAM,CAAC;AAE5D,OAAO,EAAS,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAYtD,MAAM,MAAM,uBAAuB,GAChC,aAAa,GACb,wBAAwB,GACxB,MAAM,GACN,yCAAyC,GACzC,sCAAsC,CAAC;AAE1C,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,EAAE,uBAAuB,GAAG,gBAAgB,CAAC,GAAG;IAClG,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EACX,uBAAuB,GACvB,CAAC;QAAC,IAAI,EAAE,uBAAuB,CAAA;KAAC,GAAG;QACnC,IAAI,EAAE,yCAAyC,GAAG,sCAAsC,CAAC;QACzF,cAAc,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC,CAAC;CAYN,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAAC,IAAI,SAAS,GAAG,EAAE,MAAM,SAAS,KAAK,IAAI,CAC5E,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,KAChD,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;AAG/B,MAAM,MAAM,mCAAmC,CAAC,IAAI,SAAS,GAAG,EAAE,MAAM,SAAS,KAAK,GAAG,KAAK,IAAI,IAAI,CACrG,sBAAsB,CAAC,IAAI,CAAC,EAC5B,UAAU,CACV,GAAG;IACH,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,kDAAkD,CAAC,IAAI,SAAS,GAAG,EAAE,MAAM,SAAS,KAAK,GAAG,KAAK,IAAI,IAAI,CACpH,sBAAsB,CAAC,IAAI,CAAC,EAC5B,UAAU,CACV,GAAG;IACH,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,IAAI,SAAS,GAAG,EAAE,MAAM,SAAS,KAAK,GAAG,KAAK,EACnF,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,mCAAmC,CAAC,IAAI,EAAE,MAAM,CAAC,EACzD,OAAO,CAAC,EAAE,kBAAkB,KACxB,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;AAE/B,wBAAsB,cAAc,CAAC,IAAI,SAAS,GAAG,EAAE,MAAM,SAAS,KAAK,GAAG,KAAK,EAClF,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,mCAAmC,CAAC,IAAI,EAAE,MAAM,CAAC,EACzD,OAAO,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CA6U3B"}
|
package/dist/index.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import '@rocketh/deploy';
|
|
2
|
-
import '@rocketh/read-execute';
|
|
3
|
-
import { extendEnvironment } from 'rocketh';
|
|
4
1
|
import { encodeFunctionData, zeroAddress } from 'viem';
|
|
5
2
|
import { logs } from 'named-logs';
|
|
3
|
+
import { deploy } from '@rocketh/deploy';
|
|
6
4
|
import { checkUpgradeIndex, replaceTemplateArgs } from './utils.js';
|
|
7
5
|
import ERC1967Proxy from './hardhat-deploy-v1-artifacts/ERC1967Proxy.js';
|
|
8
6
|
import ERC173Proxy from './hardhat-deploy-v1-artifacts/EIP173Proxy.js';
|
|
@@ -10,294 +8,285 @@ import ERC173ProxyWithReceive from './hardhat-deploy-v1-artifacts/EIP173ProxyWit
|
|
|
10
8
|
import TransparentUpgradeableProxy from './hardhat-deploy-v1-artifacts/TransparentUpgradeableProxy.js';
|
|
11
9
|
import OptimizedTransparentUpgradeableProxy from './hardhat-deploy-v1-artifacts/OptimizedTransparentUpgradeableProxy.js';
|
|
12
10
|
import DefaultProxyAdmin from './hardhat-deploy-v1-artifacts/ProxyAdmin.js';
|
|
11
|
+
import { execute, read } from '@rocketh/read-execute';
|
|
13
12
|
const logger = logs('@rocketh/proxy');
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (
|
|
20
|
-
|
|
21
|
-
throw new Error(`cannot deploy ${name} with proxyDisabled, already deployed`);
|
|
22
|
-
}
|
|
23
|
-
else {
|
|
24
|
-
if (typeof params.artifact === 'function') {
|
|
25
|
-
return params.artifact(name, params);
|
|
26
|
-
}
|
|
27
|
-
else {
|
|
28
|
-
// TODO any ?
|
|
29
|
-
return env.deploy(name, params, options);
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
const deployResult = checkUpgradeIndex(existingDeployment, options?.upgradeIndex);
|
|
34
|
-
if (deployResult) {
|
|
35
|
-
return deployResult;
|
|
36
|
-
}
|
|
37
|
-
const { account, artifact, args, ...viemArgs } = params;
|
|
38
|
-
let address;
|
|
39
|
-
if (!account) {
|
|
40
|
-
throw new Error(`no account specified`);
|
|
41
|
-
}
|
|
42
|
-
if (account.startsWith('0x')) {
|
|
43
|
-
address = account;
|
|
13
|
+
export async function deployViaProxy(env, name, params, options) {
|
|
14
|
+
const proxyName = `${name}_Proxy`;
|
|
15
|
+
const implementationName = `${name}_Implementation`;
|
|
16
|
+
let existingDeployment = env.getOrNull(name);
|
|
17
|
+
if (options?.proxyDisabled) {
|
|
18
|
+
if (existingDeployment) {
|
|
19
|
+
throw new Error(`cannot deploy ${name} with proxyDisabled, already deployed`);
|
|
44
20
|
}
|
|
45
21
|
else {
|
|
46
|
-
if (
|
|
47
|
-
|
|
48
|
-
if (!address) {
|
|
49
|
-
throw new Error(`no address for ${account}`);
|
|
50
|
-
}
|
|
22
|
+
if (typeof params.artifact === 'function') {
|
|
23
|
+
return params.artifact(name, params);
|
|
51
24
|
}
|
|
52
25
|
else {
|
|
53
|
-
|
|
26
|
+
// TODO any ?
|
|
27
|
+
return deploy(env, name, params, options);
|
|
54
28
|
}
|
|
55
29
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
case 'SharedAdminOpenZeppelinTransparentProxy':
|
|
75
|
-
proxyArtifact = TransparentUpgradeableProxy;
|
|
76
|
-
proxyArgsTemplate = ['{implementation}', '{admin}', '{data}'];
|
|
77
|
-
viaAdminContract = {
|
|
78
|
-
artifactName: 'DefaultProxyAdmin',
|
|
79
|
-
proxyAdminName: (typeof options.proxyContract === 'object' && options.proxyContract.proxyAdminName) ||
|
|
80
|
-
'DefaultProxyAdmin',
|
|
81
|
-
};
|
|
82
|
-
break;
|
|
83
|
-
case 'SharedAdminOptimizedTransparentProxy':
|
|
84
|
-
proxyArtifact = OptimizedTransparentUpgradeableProxy;
|
|
85
|
-
proxyArgsTemplate = ['{implementation}', '{admin}', '{data}'];
|
|
86
|
-
viaAdminContract = {
|
|
87
|
-
artifactName: 'DefaultProxyAdmin',
|
|
88
|
-
proxyAdminName: (typeof options.proxyContract === 'object' && options.proxyContract.proxyAdminName) ||
|
|
89
|
-
'DefaultProxyAdmin',
|
|
90
|
-
};
|
|
91
|
-
break;
|
|
92
|
-
default:
|
|
93
|
-
throw new Error(`unknown proxy contract ${options.proxyContract}`);
|
|
30
|
+
}
|
|
31
|
+
const deployResult = checkUpgradeIndex(existingDeployment, options?.upgradeIndex);
|
|
32
|
+
if (deployResult) {
|
|
33
|
+
return deployResult;
|
|
34
|
+
}
|
|
35
|
+
const { account, artifact, args, ...viemArgs } = params;
|
|
36
|
+
let address;
|
|
37
|
+
if (!account) {
|
|
38
|
+
throw new Error(`no account specified`);
|
|
39
|
+
}
|
|
40
|
+
if (account.startsWith('0x')) {
|
|
41
|
+
address = account;
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
if (env.namedAccounts) {
|
|
45
|
+
address = env.namedAccounts[account];
|
|
46
|
+
if (!address) {
|
|
47
|
+
throw new Error(`no address for ${account}`);
|
|
94
48
|
}
|
|
95
49
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
: await env.deploy(implementationName, {
|
|
99
|
-
...viemArgs,
|
|
100
|
-
args,
|
|
101
|
-
artifact,
|
|
102
|
-
account: address,
|
|
103
|
-
}, { alwaysOverride: true, deterministic: true, libraries: options?.libraries });
|
|
104
|
-
logger.info(`implementation at ${implementationDeployment.address}`, `${implementationName}`);
|
|
105
|
-
const { address: implementationAddress, argsData: implementationArgsData, transaction, newlyDeployed: implementationNewlyDeployed, ...artifactFromImplementationDeployment } = implementationDeployment;
|
|
106
|
-
// TODO throw specific error if artifact not found
|
|
107
|
-
const artifactToUse = artifactFromImplementationDeployment;
|
|
108
|
-
logger.info(`existingDeployment at ${existingDeployment?.address}`);
|
|
109
|
-
const expectedOwner = options?.owner || address;
|
|
110
|
-
let proxyAdmin = expectedOwner;
|
|
111
|
-
let proxyAdminContract;
|
|
112
|
-
if (viaAdminContract?.artifactName === 'DefaultProxyAdmin') {
|
|
113
|
-
const proxyAdminOwner = expectedOwner;
|
|
114
|
-
const proxyAdminName = viaAdminContract.proxyAdminName;
|
|
115
|
-
let proxyAdminDeployed = env.getOrNull(proxyAdminName);
|
|
116
|
-
if (!proxyAdminDeployed) {
|
|
117
|
-
const proxyAdminDeployment = await env.deploy(proxyAdminName, {
|
|
118
|
-
...params,
|
|
119
|
-
artifact: DefaultProxyAdmin,
|
|
120
|
-
args: [proxyAdminOwner],
|
|
121
|
-
}, {
|
|
122
|
-
deterministic: options?.deterministic,
|
|
123
|
-
});
|
|
124
|
-
proxyAdminDeployed = proxyAdminDeployment;
|
|
125
|
-
}
|
|
126
|
-
const currentProxyAdminOwner = await env.read(proxyAdminDeployed, { functionName: 'owner' });
|
|
127
|
-
if (currentProxyAdminOwner.toLowerCase() !== expectedOwner.toLowerCase()) {
|
|
128
|
-
throw new Error(`To change owner/admin, you need to call transferOwnership on ${proxyAdminName}`);
|
|
129
|
-
}
|
|
130
|
-
if (currentProxyAdminOwner === zeroAddress) {
|
|
131
|
-
throw new Error(`The Proxy Admin (${proxyAdminName}) belongs to no-one. The Proxy cannot be upgraded anymore`);
|
|
132
|
-
}
|
|
133
|
-
proxyAdmin = proxyAdminDeployed.address;
|
|
134
|
-
proxyAdminContract = {
|
|
135
|
-
deployment: proxyAdminDeployed,
|
|
136
|
-
owner: currentProxyAdminOwner.toLowerCase(),
|
|
137
|
-
};
|
|
50
|
+
else {
|
|
51
|
+
throw new Error(`no accounts setup, cannot get address for ${account}`);
|
|
138
52
|
}
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
53
|
+
}
|
|
54
|
+
let viaAdminContract;
|
|
55
|
+
let proxyArgsTemplate = ['{implementation}', '{admin}', '{data}'];
|
|
56
|
+
let proxyArtifact = ERC173Proxy;
|
|
57
|
+
if (options?.proxyContract) {
|
|
58
|
+
const proxyContractDefinition = typeof options.proxyContract === 'string' ? options.proxyContract : options.proxyContract.type;
|
|
59
|
+
switch (proxyContractDefinition) {
|
|
60
|
+
case 'ERC173Proxy':
|
|
61
|
+
proxyArtifact = ERC173Proxy;
|
|
62
|
+
proxyArgsTemplate = ['{implementation}', '{admin}', '{data}'];
|
|
63
|
+
break;
|
|
64
|
+
case 'ERC173ProxyWithReceive':
|
|
65
|
+
proxyArtifact = ERC173ProxyWithReceive;
|
|
66
|
+
proxyArgsTemplate = ['{implementation}', '{admin}', '{data}'];
|
|
67
|
+
break;
|
|
68
|
+
case 'UUPS':
|
|
69
|
+
proxyArtifact = ERC1967Proxy;
|
|
70
|
+
proxyArgsTemplate = ['{implementation}', '{data}'];
|
|
71
|
+
break;
|
|
72
|
+
case 'SharedAdminOpenZeppelinTransparentProxy':
|
|
73
|
+
proxyArtifact = TransparentUpgradeableProxy;
|
|
74
|
+
proxyArgsTemplate = ['{implementation}', '{admin}', '{data}'];
|
|
75
|
+
viaAdminContract = {
|
|
76
|
+
artifactName: 'DefaultProxyAdmin',
|
|
77
|
+
proxyAdminName: (typeof options.proxyContract === 'object' && options.proxyContract.proxyAdminName) || 'DefaultProxyAdmin',
|
|
78
|
+
};
|
|
79
|
+
break;
|
|
80
|
+
case 'SharedAdminOptimizedTransparentProxy':
|
|
81
|
+
proxyArtifact = OptimizedTransparentUpgradeableProxy;
|
|
82
|
+
proxyArgsTemplate = ['{implementation}', '{admin}', '{data}'];
|
|
83
|
+
viaAdminContract = {
|
|
84
|
+
artifactName: 'DefaultProxyAdmin',
|
|
85
|
+
proxyAdminName: (typeof options.proxyContract === 'object' && options.proxyContract.proxyAdminName) || 'DefaultProxyAdmin',
|
|
86
|
+
};
|
|
87
|
+
break;
|
|
88
|
+
default:
|
|
89
|
+
throw new Error(`unknown proxy contract ${options.proxyContract}`);
|
|
154
90
|
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
91
|
+
}
|
|
92
|
+
const implementationDeployment = typeof params.artifact === 'function'
|
|
93
|
+
? await params.artifact(implementationName, { ...params })
|
|
94
|
+
: await deploy(env, implementationName, {
|
|
95
|
+
...viemArgs,
|
|
96
|
+
args,
|
|
97
|
+
artifact,
|
|
98
|
+
account: address,
|
|
99
|
+
}, { alwaysOverride: true, deterministic: true, libraries: options?.libraries });
|
|
100
|
+
logger.info(`implementation at ${implementationDeployment.address}`, `${implementationName}`);
|
|
101
|
+
const { address: implementationAddress, argsData: implementationArgsData, transaction, newlyDeployed: implementationNewlyDeployed, ...artifactFromImplementationDeployment } = implementationDeployment;
|
|
102
|
+
// TODO throw specific error if artifact not found
|
|
103
|
+
const artifactToUse = artifactFromImplementationDeployment;
|
|
104
|
+
logger.info(`existingDeployment at ${existingDeployment?.address}`);
|
|
105
|
+
const expectedOwner = options?.owner || address;
|
|
106
|
+
let proxyAdmin = expectedOwner;
|
|
107
|
+
let proxyAdminContract;
|
|
108
|
+
if (viaAdminContract?.artifactName === 'DefaultProxyAdmin') {
|
|
109
|
+
const proxyAdminOwner = expectedOwner;
|
|
110
|
+
const proxyAdminName = viaAdminContract.proxyAdminName;
|
|
111
|
+
let proxyAdminDeployed = env.getOrNull(proxyAdminName);
|
|
112
|
+
if (!proxyAdminDeployed) {
|
|
113
|
+
const proxyAdminDeployment = await deploy(env, proxyAdminName, {
|
|
166
114
|
...params,
|
|
167
|
-
artifact:
|
|
168
|
-
args:
|
|
169
|
-
implementationAddress: implementationDeployment.address,
|
|
170
|
-
proxyAdmin: proxyAdmin,
|
|
171
|
-
data: postUpgradeCalldata ? postUpgradeCalldata : '0x',
|
|
172
|
-
}),
|
|
115
|
+
artifact: DefaultProxyAdmin,
|
|
116
|
+
args: [proxyAdminOwner],
|
|
173
117
|
}, {
|
|
174
|
-
skipIfAlreadyDeployed: true,
|
|
175
118
|
deterministic: options?.deterministic,
|
|
176
119
|
});
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
120
|
+
proxyAdminDeployed = proxyAdminDeployment;
|
|
121
|
+
}
|
|
122
|
+
const currentProxyAdminOwner = await read(env, proxyAdminDeployed, { functionName: 'owner' });
|
|
123
|
+
if (currentProxyAdminOwner.toLowerCase() !== expectedOwner.toLowerCase()) {
|
|
124
|
+
throw new Error(`To change owner/admin, you need to call transferOwnership on ${proxyAdminName}`);
|
|
125
|
+
}
|
|
126
|
+
if (currentProxyAdminOwner === zeroAddress) {
|
|
127
|
+
throw new Error(`The Proxy Admin (${proxyAdminName}) belongs to no-one. The Proxy cannot be upgraded anymore`);
|
|
128
|
+
}
|
|
129
|
+
proxyAdmin = proxyAdminDeployed.address;
|
|
130
|
+
proxyAdminContract = {
|
|
131
|
+
deployment: proxyAdminDeployed,
|
|
132
|
+
owner: currentProxyAdminOwner.toLowerCase(),
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
let postUpgradeCalldata;
|
|
136
|
+
if (options?.execute) {
|
|
137
|
+
const method = artifactToUse.abi.find((v) => v.type === 'function' && v.name === options.execute);
|
|
138
|
+
if (method) {
|
|
139
|
+
postUpgradeCalldata = encodeFunctionData({
|
|
140
|
+
...viemArgs,
|
|
141
|
+
args: args,
|
|
142
|
+
account: address,
|
|
143
|
+
abi: [method],
|
|
144
|
+
functionName: method.name,
|
|
182
145
|
});
|
|
183
|
-
logger.info(`saving as ${name}`);
|
|
184
146
|
}
|
|
185
147
|
else {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
148
|
+
throw new Error(`Method ${options.execute} not found in artifact ${artifactToUse.abi}`);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
// let preUpgradeCalldata: `0x${string}` | undefined;
|
|
152
|
+
// if (options?.preExecute) {
|
|
153
|
+
// const method: AbiFunction | undefined = artifactToUse.abi.find(
|
|
154
|
+
// (v) => v.type === 'function' && v.name === options.preExecute
|
|
155
|
+
// ) as AbiFunction;
|
|
156
|
+
// if (method) {
|
|
157
|
+
// preUpgradeCalldata = encodeFunctionData({...viemArgs, account, abi: [method], functionName: method.name});
|
|
158
|
+
// }
|
|
159
|
+
// }
|
|
160
|
+
if (!existingDeployment) {
|
|
161
|
+
const { newlyDeployed, ...proxy } = await deploy(env, proxyName, {
|
|
162
|
+
...params,
|
|
163
|
+
artifact: proxyArtifact,
|
|
164
|
+
args: replaceTemplateArgs(proxyArgsTemplate, {
|
|
165
|
+
implementationAddress: implementationDeployment.address,
|
|
166
|
+
proxyAdmin: proxyAdmin,
|
|
167
|
+
data: postUpgradeCalldata ? postUpgradeCalldata : '0x',
|
|
168
|
+
}),
|
|
169
|
+
}, {
|
|
170
|
+
skipIfAlreadyDeployed: true,
|
|
171
|
+
deterministic: options?.deterministic,
|
|
172
|
+
});
|
|
173
|
+
logger.info(`proxy deployed at ${proxy.address}`);
|
|
174
|
+
existingDeployment = await env.save(name, {
|
|
175
|
+
...proxy,
|
|
176
|
+
...artifactToUse,
|
|
177
|
+
linkedData: options?.linkedData,
|
|
178
|
+
});
|
|
179
|
+
logger.info(`saving as ${name}`);
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
const proxyDeployment = env.getOrNull(proxyName);
|
|
183
|
+
if (!proxyDeployment) {
|
|
184
|
+
throw new Error(`deployment for "${name}" exits but there is no proxy`);
|
|
185
|
+
}
|
|
186
|
+
const implementationSlotData = await env.network.provider.request({
|
|
187
|
+
method: 'eth_getStorageAt',
|
|
188
|
+
params: [proxyDeployment.address, '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc', 'latest'],
|
|
189
|
+
});
|
|
190
|
+
const currentImplementationAddress = `0x${implementationSlotData.substr(-40)}`;
|
|
191
|
+
if (currentImplementationAddress.toLowerCase() !== implementationDeployment.address.toLowerCase()) {
|
|
192
|
+
logger.info(`different implementation old: ${currentImplementationAddress} new: ${implementationDeployment.address}, upgrade...`);
|
|
193
|
+
// let currentOwner: `0x${string}` | undefined;
|
|
194
|
+
// try {
|
|
195
|
+
// currentOwner = await env.read(proxyDeployment, {functionName: 'owner'});
|
|
196
|
+
// console.log({currentOwner});
|
|
197
|
+
// } catch {
|
|
198
|
+
// currentOwner = undefined;
|
|
199
|
+
// }
|
|
200
|
+
// if (!currentOwner) {
|
|
201
|
+
const ownerSlotData = await env.network.provider.request({
|
|
191
202
|
method: 'eth_getStorageAt',
|
|
192
203
|
params: [
|
|
193
204
|
proxyDeployment.address,
|
|
194
|
-
'
|
|
205
|
+
'0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103',
|
|
195
206
|
'latest',
|
|
196
207
|
],
|
|
197
208
|
});
|
|
198
|
-
|
|
199
|
-
if (
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
209
|
+
let currentOwner = `0x${ownerSlotData.substr(-40)}`;
|
|
210
|
+
if (currentOwner === zeroAddress) {
|
|
211
|
+
try {
|
|
212
|
+
const owner = await read(env, existingDeployment, { functionName: 'owner' });
|
|
213
|
+
currentOwner = owner.toLowerCase();
|
|
214
|
+
}
|
|
215
|
+
catch (err) {
|
|
216
|
+
throw new Error(`could not get owner of UUPS Proxy, tried ERC-1967 and ERC-173`, { cause: err });
|
|
217
|
+
}
|
|
218
|
+
// } else {
|
|
219
|
+
// throw new Error(
|
|
220
|
+
// `as per ERC-1967, proxy owner is zero address. We only support ERC-1967 proxies for now, unless you used proxyContract:"UUPS"`
|
|
221
|
+
// );
|
|
207
222
|
// }
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
223
|
+
}
|
|
224
|
+
// if (preUpgradeCalldata) {
|
|
225
|
+
// if (postUpgradeCalldata) {
|
|
226
|
+
// await env.execute(proxyDeployment, {
|
|
227
|
+
// account: address,
|
|
228
|
+
// functionName: 'callAndUpgradeToAndCall',
|
|
229
|
+
// args: [implementation.address, preUpgradeCalldata, postUpgradeCalldata],
|
|
230
|
+
// value: 0n, // TODO
|
|
231
|
+
// });
|
|
232
|
+
// } else {
|
|
233
|
+
// await env.execute(proxyDeployment, {
|
|
234
|
+
// account: address,
|
|
235
|
+
// functionName: 'callAndUpgradeToAndCall',
|
|
236
|
+
// args: [implementation.address, preUpgradeCalldata, '0x'],
|
|
237
|
+
// value: 0n, // TODO
|
|
238
|
+
// });
|
|
239
|
+
// }
|
|
240
|
+
// } else
|
|
241
|
+
const deploymentToUseForUpgrade = options?.proxyContract === 'UUPS' ? existingDeployment : proxyDeployment;
|
|
242
|
+
let useUpgradeToAndCall = !!postUpgradeCalldata;
|
|
243
|
+
if (!useUpgradeToAndCall) {
|
|
244
|
+
if (!deploymentToUseForUpgrade.abi.find((v) => v.type === 'function' && v.name === 'upgradeTo')) {
|
|
245
|
+
useUpgradeToAndCall = true;
|
|
231
246
|
}
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
// await env.execute(proxyDeployment, {
|
|
242
|
-
// account: address,
|
|
243
|
-
// functionName: 'callAndUpgradeToAndCall',
|
|
244
|
-
// args: [implementation.address, preUpgradeCalldata, '0x'],
|
|
245
|
-
// value: 0n, // TODO
|
|
246
|
-
// });
|
|
247
|
-
// }
|
|
248
|
-
// } else
|
|
249
|
-
const deploymentToUseForUpgrade = options?.proxyContract === 'UUPS' ? existingDeployment : proxyDeployment;
|
|
250
|
-
let useUpgradeToAndCall = !!postUpgradeCalldata;
|
|
251
|
-
if (!useUpgradeToAndCall) {
|
|
252
|
-
if (!deploymentToUseForUpgrade.abi.find((v) => v.type === 'function' && v.name === 'upgradeTo')) {
|
|
253
|
-
useUpgradeToAndCall = true;
|
|
254
|
-
}
|
|
247
|
+
}
|
|
248
|
+
if (proxyAdminContract) {
|
|
249
|
+
if (useUpgradeToAndCall) {
|
|
250
|
+
await execute(env, proxyAdminContract.deployment, {
|
|
251
|
+
account: proxyAdminContract.owner,
|
|
252
|
+
functionName: 'upgradeAndCall',
|
|
253
|
+
args: [proxyDeployment.address, implementationDeployment.address, postUpgradeCalldata || '0x'],
|
|
254
|
+
value: 0n, // TODO
|
|
255
|
+
});
|
|
255
256
|
}
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
}
|
|
257
|
+
else {
|
|
258
|
+
await execute(env, proxyAdminContract.deployment, {
|
|
259
|
+
account: proxyAdminContract.owner,
|
|
260
|
+
functionName: 'upgrade',
|
|
261
|
+
args: [proxyDeployment.address, implementationDeployment.address],
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
else {
|
|
266
|
+
if (useUpgradeToAndCall) {
|
|
267
|
+
await execute(env, deploymentToUseForUpgrade, {
|
|
268
|
+
account: currentOwner,
|
|
269
|
+
functionName: 'upgradeToAndCall',
|
|
270
|
+
args: [implementationDeployment.address, postUpgradeCalldata || '0x'],
|
|
271
|
+
value: 0n, // TODO
|
|
272
|
+
});
|
|
272
273
|
}
|
|
273
274
|
else {
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
value: 0n, // TODO
|
|
280
|
-
});
|
|
281
|
-
}
|
|
282
|
-
else {
|
|
283
|
-
await env.execute(deploymentToUseForUpgrade, {
|
|
284
|
-
account: currentOwner,
|
|
285
|
-
functionName: 'upgradeTo',
|
|
286
|
-
args: [implementationDeployment.address],
|
|
287
|
-
});
|
|
288
|
-
}
|
|
275
|
+
await execute(env, deploymentToUseForUpgrade, {
|
|
276
|
+
account: currentOwner,
|
|
277
|
+
functionName: 'upgradeTo',
|
|
278
|
+
args: [implementationDeployment.address],
|
|
279
|
+
});
|
|
289
280
|
}
|
|
290
281
|
}
|
|
291
|
-
existingDeployment = await env.save(name, {
|
|
292
|
-
...proxyDeployment,
|
|
293
|
-
...artifactToUse,
|
|
294
|
-
linkedData: options?.linkedData,
|
|
295
|
-
});
|
|
296
|
-
logger.info(`saving as ${name}`);
|
|
297
282
|
}
|
|
298
|
-
|
|
283
|
+
existingDeployment = await env.save(name, {
|
|
284
|
+
...proxyDeployment,
|
|
285
|
+
...artifactToUse,
|
|
286
|
+
linkedData: options?.linkedData,
|
|
287
|
+
});
|
|
288
|
+
logger.info(`saving as ${name}`);
|
|
299
289
|
}
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
});
|
|
290
|
+
return existingDeployment;
|
|
291
|
+
}
|
|
303
292
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAQ,kBAAkB,EAAE,WAAW,EAAC,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAC;AAChC,OAAO,EAAC,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAClE,OAAO,YAAY,MAAM,+CAA+C,CAAC;AACzE,OAAO,WAAW,MAAM,8CAA8C,CAAC;AACvE,OAAO,sBAAsB,MAAM,yDAAyD,CAAC;AAC7F,OAAO,2BAA2B,MAAM,8DAA8D,CAAC;AACvG,OAAO,oCAAoC,MAAM,uEAAuE,CAAC;AACzH,OAAO,iBAAiB,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAC,OAAO,EAAE,IAAI,EAAC,MAAM,uBAAuB,CAAC;AAEpD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;AA2DtC,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,GAAgB,EAChB,IAAY,EACZ,MAAyD,EACzD,OAA4B;IAE5B,MAAM,SAAS,GAAG,GAAG,IAAI,QAAQ,CAAC;IAClC,MAAM,kBAAkB,GAAG,GAAG,IAAI,iBAAiB,CAAC;IAEpD,IAAI,kBAAkB,GAAG,GAAG,CAAC,SAAS,CAAO,IAAI,CAAC,CAAC;IAEnD,IAAI,OAAO,EAAE,aAAa,EAAE,CAAC;QAC5B,IAAI,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,uCAAuC,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACP,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC3C,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACP,aAAa;gBACb,OAAO,MAAM,CAAO,GAAG,EAAE,IAAI,EAAE,MAAa,EAAE,OAAO,CAAC,CAAC;YACxD,CAAC;QACF,CAAC;IACF,CAAC;IACD,MAAM,YAAY,GAAG,iBAAiB,CAAC,kBAAkB,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IAClF,IAAI,YAAY,EAAE,CAAC;QAClB,OAAO,YAAY,CAAC;IACrB,CAAC;IAED,MAAM,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAC,GAAG,MAAM,CAAC;IACtD,IAAI,OAAsB,CAAC;IAE3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,GAAG,OAAwB,CAAC;IACpC,CAAC;SAAM,CAAC;QACP,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;YACvB,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAC;YAC9C,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;QACzE,CAAC;IACF,CAAC;IAED,IAAI,gBAAyF,CAAC;IAE9F,IAAI,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAClE,IAAI,aAAa,GAAa,WAAW,CAAC;IAC1C,IAAI,OAAO,EAAE,aAAa,EAAE,CAAC;QAC5B,MAAM,uBAAuB,GAC5B,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;QAEhG,QAAQ,uBAAuB,EAAE,CAAC;YACjC,KAAK,aAAa;gBACjB,aAAa,GAAG,WAAW,CAAC;gBAC5B,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC9D,MAAM;YACP,KAAK,wBAAwB;gBAC5B,aAAa,GAAG,sBAAsB,CAAC;gBACvC,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC9D,MAAM;YACP,KAAK,MAAM;gBACV,aAAa,GAAG,YAAY,CAAC;gBAC7B,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;gBACnD,MAAM;YACP,KAAK,yCAAyC;gBAC7C,aAAa,GAAG,2BAA2B,CAAC;gBAC5C,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC9D,gBAAgB,GAAG;oBAClB,YAAY,EAAE,mBAAmB;oBACjC,cAAc,EACb,CAAC,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,mBAAmB;iBAC3G,CAAC;gBACF,MAAM;YACP,KAAK,sCAAsC;gBAC1C,aAAa,GAAG,oCAAoC,CAAC;gBACrD,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC9D,gBAAgB,GAAG;oBAClB,YAAY,EAAE,mBAAmB;oBACjC,cAAc,EACb,CAAC,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,mBAAmB;iBAC3G,CAAC;gBACF,MAAM;YACP;gBACC,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QACrE,CAAC;IACF,CAAC;IAED,MAAM,wBAAwB,GAC7B,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU;QACpC,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EAAC,GAAG,MAAM,EAAC,CAAC;QACxD,CAAC,CAAC,MAAM,MAAM,CACZ,GAAG,EACH,kBAAkB,EAClB;YACC,GAAG,QAAQ;YACX,IAAI;YACJ,QAAQ;YACR,OAAO,EAAE,OAAO;SACgB,EACjC,EAAC,cAAc,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAC,CACzE,CAAC;IAEN,MAAM,CAAC,IAAI,CAAC,qBAAqB,wBAAwB,CAAC,OAAO,EAAE,EAAE,GAAG,kBAAkB,EAAE,CAAC,CAAC;IAE9F,MAAM,EACL,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,sBAAsB,EAChC,WAAW,EACX,aAAa,EAAE,2BAA2B,EAC1C,GAAG,oCAAoC,EACvC,GAAG,wBAAwB,CAAC;IAE7B,kDAAkD;IAClD,MAAM,aAAa,GAAG,oCAAoC,CAAC;IAE3D,MAAM,CAAC,IAAI,CAAC,yBAAyB,kBAAkB,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpE,MAAM,aAAa,GAAG,OAAO,EAAE,KAAK,IAAI,OAAO,CAAC;IAChD,IAAI,UAAU,GAAG,aAAa,CAAC;IAE/B,IAAI,kBAKQ,CAAC;IACb,IAAI,gBAAgB,EAAE,YAAY,KAAK,mBAAmB,EAAE,CAAC;QAC5D,MAAM,eAAe,GAAG,aAAa,CAAC;QACtC,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;QACvD,IAAI,kBAAkB,GAAoD,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAExG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzB,MAAM,oBAAoB,GAAG,MAAM,MAAM,CACxC,GAAG,EACH,cAAc,EACd;gBACC,GAAG,MAAM;gBACT,QAAQ,EAAE,iBAAiB;gBAC3B,IAAI,EAAE,CAAC,eAAe,CAAC;aACvB,EACD;gBACC,aAAa,EAAE,OAAO,EAAE,aAAa;aACrC,CACD,CAAC;YACF,kBAAkB,GAAG,oBAAoB,CAAC;QAC3C,CAAC;QAED,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAC,YAAY,EAAE,OAAO,EAAC,CAAC,CAAC;QAE5F,IAAI,sBAAsB,CAAC,WAAW,EAAE,KAAK,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;YAC1E,MAAM,IAAI,KAAK,CAAC,gEAAgE,cAAc,EAAE,CAAC,CAAC;QACnG,CAAC;QACD,IAAI,sBAAsB,KAAK,WAAW,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,oBAAoB,cAAc,2DAA2D,CAAC,CAAC;QAChH,CAAC;QACD,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC;QAExC,kBAAkB,GAAG;YACpB,UAAU,EAAE,kBAAkB;YAC9B,KAAK,EAAE,sBAAsB,CAAC,WAAW,EAAmB;SAC5D,CAAC;IACH,CAAC;IAED,IAAI,mBAA8C,CAAC;IACnD,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;QACtB,MAAM,MAAM,GAA4B,aAAa,CAAC,GAAG,CAAC,IAAI,CAC7D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,CAC3C,CAAC;QACjB,IAAI,MAAM,EAAE,CAAC;YACZ,mBAAmB,GAAG,kBAAkB,CAAC;gBACxC,GAAG,QAAQ;gBACX,IAAI,EAAE,IAAiB;gBACvB,OAAO,EAAE,OAAO;gBAChB,GAAG,EAAE,CAAC,MAAM,CAAC;gBACb,YAAY,EAAE,MAAM,CAAC,IAAI;aACzB,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,CAAC,OAAO,0BAA0B,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QACzF,CAAC;IACF,CAAC;IACD,qDAAqD;IACrD,6BAA6B;IAC7B,mEAAmE;IACnE,kEAAkE;IAClE,qBAAqB;IACrB,iBAAiB;IACjB,+GAA+G;IAC/G,KAAK;IACL,IAAI;IAEJ,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACzB,MAAM,EAAC,aAAa,EAAE,GAAG,KAAK,EAAC,GAAG,MAAM,MAAM,CAC7C,GAAG,EACH,SAAS,EACT;YACC,GAAG,MAAM;YACT,QAAQ,EAAE,aAAa;YACvB,IAAI,EAAE,mBAAmB,CAAC,iBAAiB,EAAE;gBAC5C,qBAAqB,EAAE,wBAAwB,CAAC,OAAO;gBACvD,UAAU,EAAE,UAAU;gBACtB,IAAI,EAAE,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI;aACtD,CAAC;SACF,EACD;YACC,qBAAqB,EAAE,IAAI;YAC3B,aAAa,EAAE,OAAO,EAAE,aAAa;SACrC,CACD,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,qBAAqB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAElD,kBAAkB,GAAG,MAAM,GAAG,CAAC,IAAI,CAAO,IAAI,EAAE;YAC/C,GAAG,KAAK;YACR,GAAG,aAAa;YAChB,UAAU,EAAE,OAAO,EAAE,UAAU;SAC/B,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACP,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAA2B,SAAS,CAAC,CAAC;QAC3E,IAAI,CAAC,eAAe,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,+BAA+B,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,sBAAsB,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YACjE,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,oEAAoE,EAAE,QAAQ,CAAC;SACjH,CAAC,CAAC;QACH,MAAM,4BAA4B,GAAG,KAAK,sBAAsB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;QAE/E,IAAI,4BAA4B,CAAC,WAAW,EAAE,KAAK,wBAAwB,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;YACnG,MAAM,CAAC,IAAI,CACV,iCAAiC,4BAA4B,SAAS,wBAAwB,CAAC,OAAO,cAAc,CACpH,CAAC;YAEF,+CAA+C;YAC/C,QAAQ;YACR,4EAA4E;YAC5E,gCAAgC;YAChC,YAAY;YACZ,6BAA6B;YAC7B,IAAI;YACJ,uBAAuB;YACvB,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACxD,MAAM,EAAE,kBAAkB;gBAC1B,MAAM,EAAE;oBACP,eAAe,CAAC,OAAO;oBACvB,oEAAoE;oBACpE,QAAQ;iBACR;aACD,CAAC,CAAC;YACH,IAAI,YAAY,GAAG,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;YAEpD,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;gBAClC,IAAI,CAAC;oBACJ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,kBAAyB,EAAE,EAAC,YAAY,EAAE,OAAO,EAAC,CAAC,CAAC;oBAClF,YAAY,GAAI,KAAgB,CAAC,WAAW,EAAmB,CAAC;gBACjE,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,MAAM,IAAI,KAAK,CAAC,+DAA+D,EAAE,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC;gBAChG,CAAC;gBACD,WAAW;gBACX,oBAAoB;gBACpB,mIAAmI;gBACnI,MAAM;gBACN,IAAI;YACL,CAAC;YAED,4BAA4B;YAC5B,8BAA8B;YAC9B,yCAAyC;YACzC,uBAAuB;YACvB,8CAA8C;YAC9C,8EAA8E;YAC9E,wBAAwB;YACxB,QAAQ;YACR,YAAY;YACZ,yCAAyC;YACzC,uBAAuB;YACvB,8CAA8C;YAC9C,+DAA+D;YAC/D,wBAAwB;YACxB,QAAQ;YACR,KAAK;YACL,SAAS;YAET,MAAM,yBAAyB,GAAG,OAAO,EAAE,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,eAAe,CAAC;YAE3G,IAAI,mBAAmB,GAAG,CAAC,CAAC,mBAAmB,CAAC;YAChD,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC1B,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;oBACjG,mBAAmB,GAAG,IAAI,CAAC;gBAC5B,CAAC;YACF,CAAC;YAED,IAAI,kBAAkB,EAAE,CAAC;gBACxB,IAAI,mBAAmB,EAAE,CAAC;oBACzB,MAAM,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE;wBACjD,OAAO,EAAE,kBAAkB,CAAC,KAAK;wBACjC,YAAY,EAAE,gBAAgB;wBAC9B,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,EAAE,mBAAmB,IAAI,IAAI,CAAC;wBAC9F,KAAK,EAAE,EAAE,EAAE,OAAO;qBAClB,CAAC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACP,MAAM,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE;wBACjD,OAAO,EAAE,kBAAkB,CAAC,KAAK;wBACjC,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC;qBACjE,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,IAAI,mBAAmB,EAAE,CAAC;oBACzB,MAAM,OAAO,CAAC,GAAG,EAAE,yBAAyB,EAAE;wBAC7C,OAAO,EAAE,YAAY;wBACrB,YAAY,EAAE,kBAAkB;wBAChC,IAAI,EAAE,CAAC,wBAAwB,CAAC,OAAO,EAAE,mBAAmB,IAAI,IAAI,CAAC;wBACrE,KAAK,EAAE,EAAE,EAAE,OAAO;qBAClB,CAAC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACP,MAAM,OAAO,CAAC,GAAG,EAAE,yBAAyB,EAAE;wBAC7C,OAAO,EAAE,YAAY;wBACrB,YAAY,EAAE,WAAW;wBACzB,IAAI,EAAE,CAAC,wBAAwB,CAAC,OAAO,CAAC;qBACxC,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;QACF,CAAC;QACD,kBAAkB,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;YACzC,GAAG,eAAe;YAClB,GAAG,aAAa;YAChB,UAAU,EAAE,OAAO,EAAE,UAAU;SAC/B,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC3B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rocketh/proxy",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.26-testing.0",
|
|
4
4
|
"description": "provide proxy-enabled deploy function for rocketh",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -25,14 +25,13 @@
|
|
|
25
25
|
"eip-1193": "^0.6.2",
|
|
26
26
|
"rimraf": "^6.0.1",
|
|
27
27
|
"typescript": "^5.8.2",
|
|
28
|
-
"@rocketh/deploy": "0.11.
|
|
29
|
-
"@rocketh/read-execute": "0.11.
|
|
30
|
-
"rocketh": "0.11.
|
|
28
|
+
"@rocketh/deploy": "0.11.22-testing.0",
|
|
29
|
+
"@rocketh/read-execute": "0.11.23-testing.0",
|
|
30
|
+
"rocketh": "0.11.22-testing.0"
|
|
31
31
|
},
|
|
32
32
|
"peerDependencies": {
|
|
33
|
-
"@rocketh/
|
|
34
|
-
"@rocketh/
|
|
35
|
-
"rocketh": "0.11.21"
|
|
33
|
+
"@rocketh/deploy": "0.11.22-testing.0",
|
|
34
|
+
"@rocketh/read-execute": "0.11.23-testing.0"
|
|
36
35
|
},
|
|
37
36
|
"dependencies": {
|
|
38
37
|
"named-logs": "^0.3.2",
|