gate-evm-tools 1.0.22 → 1.0.24

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.
Files changed (132) hide show
  1. package/README.md +111 -5
  2. package/bin/manifest-bootstrap.js +109 -3
  3. package/dist/commands/prepare.d.ts +8 -0
  4. package/dist/commands/prepare.d.ts.map +1 -0
  5. package/dist/commands/prepare.js +78 -0
  6. package/dist/commands/prepare.js.map +1 -0
  7. package/dist/commands/sync.d.ts.map +1 -1
  8. package/dist/commands/sync.js +11 -28
  9. package/dist/commands/sync.js.map +1 -1
  10. package/dist/core/preparation/artifacts.d.ts +21 -0
  11. package/dist/core/preparation/artifacts.d.ts.map +1 -0
  12. package/dist/core/preparation/artifacts.js +80 -0
  13. package/dist/core/preparation/artifacts.js.map +1 -0
  14. package/dist/core/preparation/evm.d.ts +39 -0
  15. package/dist/core/preparation/evm.d.ts.map +1 -0
  16. package/dist/core/preparation/evm.js +290 -0
  17. package/dist/core/preparation/evm.js.map +1 -0
  18. package/dist/core/preparation/index.d.ts +9 -0
  19. package/dist/core/preparation/index.d.ts.map +1 -0
  20. package/dist/core/preparation/index.js +15 -0
  21. package/dist/core/preparation/index.js.map +1 -0
  22. package/dist/core/preparation/manifest.d.ts +43 -0
  23. package/dist/core/preparation/manifest.d.ts.map +1 -0
  24. package/dist/core/preparation/manifest.js +169 -0
  25. package/dist/core/preparation/manifest.js.map +1 -0
  26. package/dist/core/preparation/normalize.d.ts +7 -0
  27. package/dist/core/preparation/normalize.d.ts.map +1 -0
  28. package/dist/core/preparation/normalize.js +496 -0
  29. package/dist/core/preparation/normalize.js.map +1 -0
  30. package/dist/core/preparation/types.d.ts +111 -0
  31. package/dist/core/preparation/types.d.ts.map +1 -0
  32. package/dist/core/preparation/types.js +2 -0
  33. package/dist/core/preparation/types.js.map +1 -0
  34. package/dist/core/preparation/zkManifestSync.d.ts +49 -0
  35. package/dist/core/preparation/zkManifestSync.d.ts.map +1 -0
  36. package/dist/core/preparation/zkManifestSync.js +159 -0
  37. package/dist/core/preparation/zkManifestSync.js.map +1 -0
  38. package/dist/core/preparation/zkUpgradeValidation.d.ts +37 -0
  39. package/dist/core/preparation/zkUpgradeValidation.d.ts.map +1 -0
  40. package/dist/core/preparation/zkUpgradeValidation.js +91 -0
  41. package/dist/core/preparation/zkUpgradeValidation.js.map +1 -0
  42. package/dist/core/preparation/zksync.d.ts +28 -0
  43. package/dist/core/preparation/zksync.d.ts.map +1 -0
  44. package/dist/core/preparation/zksync.js +248 -0
  45. package/dist/core/preparation/zksync.js.map +1 -0
  46. package/dist/custody/credential.d.ts +16 -0
  47. package/dist/custody/credential.d.ts.map +1 -0
  48. package/dist/custody/credential.js +68 -0
  49. package/dist/custody/credential.js.map +1 -0
  50. package/dist/custody/hardhat-runtime.d.ts +16 -0
  51. package/dist/custody/hardhat-runtime.d.ts.map +1 -0
  52. package/dist/custody/hardhat-runtime.js +101 -0
  53. package/dist/custody/hardhat-runtime.js.map +1 -0
  54. package/dist/custody/hardhat.d.ts +3 -0
  55. package/dist/custody/hardhat.d.ts.map +1 -0
  56. package/dist/custody/hardhat.js +8 -0
  57. package/dist/custody/hardhat.js.map +1 -0
  58. package/dist/custody/index.d.ts +6 -0
  59. package/dist/custody/index.d.ts.map +1 -0
  60. package/dist/custody/index.js +6 -0
  61. package/dist/custody/index.js.map +1 -0
  62. package/dist/custody/service.d.ts +16 -0
  63. package/dist/custody/service.d.ts.map +1 -0
  64. package/dist/custody/service.js +100 -0
  65. package/dist/custody/service.js.map +1 -0
  66. package/dist/custody/signer.d.ts +13 -0
  67. package/dist/custody/signer.d.ts.map +1 -0
  68. package/dist/custody/signer.js +258 -0
  69. package/dist/custody/signer.js.map +1 -0
  70. package/dist/custody/version.d.ts +4 -0
  71. package/dist/custody/version.d.ts.map +1 -0
  72. package/dist/custody/version.js +13 -0
  73. package/dist/custody/version.js.map +1 -0
  74. package/dist/index.d.ts.map +1 -1
  75. package/dist/index.js +20 -0
  76. package/dist/index.js.map +1 -1
  77. package/dist/sync/index.d.ts +31 -0
  78. package/dist/sync/index.d.ts.map +1 -0
  79. package/dist/sync/index.js +57 -0
  80. package/dist/sync/index.js.map +1 -0
  81. package/dist/types.d.ts +9 -1
  82. package/dist/types.d.ts.map +1 -1
  83. package/dist/workflow/index.d.ts +5 -0
  84. package/dist/workflow/index.d.ts.map +1 -0
  85. package/dist/workflow/index.js +3 -0
  86. package/dist/workflow/index.js.map +1 -0
  87. package/dist-cjs/core/preparation/artifacts.js +89 -0
  88. package/dist-cjs/core/preparation/artifacts.js.map +1 -0
  89. package/dist-cjs/core/preparation/evm.js +297 -0
  90. package/dist-cjs/core/preparation/evm.js.map +1 -0
  91. package/dist-cjs/core/preparation/index.js +19 -0
  92. package/dist-cjs/core/preparation/index.js.map +1 -0
  93. package/dist-cjs/core/preparation/manifest.js +180 -0
  94. package/dist-cjs/core/preparation/manifest.js.map +1 -0
  95. package/dist-cjs/core/preparation/normalize.js +507 -0
  96. package/dist-cjs/core/preparation/normalize.js.map +1 -0
  97. package/dist-cjs/core/preparation/types.js +3 -0
  98. package/dist-cjs/core/preparation/types.js.map +1 -0
  99. package/dist-cjs/core/preparation/zkManifestSync.js +166 -0
  100. package/dist-cjs/core/preparation/zkManifestSync.js.map +1 -0
  101. package/dist-cjs/core/preparation/zkUpgradeValidation.js +101 -0
  102. package/dist-cjs/core/preparation/zkUpgradeValidation.js.map +1 -0
  103. package/dist-cjs/core/preparation/zksync.js +252 -0
  104. package/dist-cjs/core/preparation/zksync.js.map +1 -0
  105. package/dist-cjs/core/syncUpgradeJson.js +315 -0
  106. package/dist-cjs/core/syncUpgradeJson.js.map +1 -0
  107. package/dist-cjs/custody/credential.js +74 -0
  108. package/dist-cjs/custody/credential.js.map +1 -0
  109. package/dist-cjs/custody/hardhat-runtime.js +104 -0
  110. package/dist-cjs/custody/hardhat-runtime.js.map +1 -0
  111. package/dist-cjs/custody/hardhat.js +15 -0
  112. package/dist-cjs/custody/hardhat.js.map +1 -0
  113. package/dist-cjs/custody/index.js +18 -0
  114. package/dist-cjs/custody/index.js.map +1 -0
  115. package/dist-cjs/custody/service.js +105 -0
  116. package/dist-cjs/custody/service.js.map +1 -0
  117. package/dist-cjs/custody/signer.js +261 -0
  118. package/dist-cjs/custody/signer.js.map +1 -0
  119. package/dist-cjs/custody/version.js +16 -0
  120. package/dist-cjs/custody/version.js.map +1 -0
  121. package/dist-cjs/package.json +3 -0
  122. package/dist-cjs/sync/index.js +60 -0
  123. package/dist-cjs/sync/index.js.map +1 -0
  124. package/dist-cjs/types.js +3 -0
  125. package/dist-cjs/types.js.map +1 -0
  126. package/dist-cjs/utils/manifestTransaction.js +302 -0
  127. package/dist-cjs/utils/manifestTransaction.js.map +1 -0
  128. package/dist-cjs/utils/openzeppelin.js +57 -0
  129. package/dist-cjs/utils/openzeppelin.js.map +1 -0
  130. package/dist-cjs/workflow/index.js +12 -0
  131. package/dist-cjs/workflow/index.js.map +1 -0
  132. package/package.json +73 -5
@@ -0,0 +1,258 @@
1
+ import { parseWalletCredential } from './credential.js';
2
+ import { CustodyServiceClient, requireResponseString, } from './service.js';
3
+ import { detectEthersMajor } from './version.js';
4
+ export function createSigner(options) {
5
+ const credential = parseWalletCredential(options.credential);
6
+ const major = detectEthersMajor(options.ethers);
7
+ if (credential.kind === 'private-key') {
8
+ const Wallet = requireRuntimeConstructor(options.ethers, 'Wallet');
9
+ return new Wallet(credential.privateKey, options.provider ?? null);
10
+ }
11
+ if (options.provider === undefined || options.provider === null) {
12
+ throw new Error('托管钱包凭证必须同时提供 ethers Provider');
13
+ }
14
+ const address = normalizeAddress(options.ethers, major, credential.address);
15
+ const clientOptions = {
16
+ credential: options.credential.trim(),
17
+ address,
18
+ baseUrl: options.baseUrl,
19
+ fetchImpl: options.fetchImpl,
20
+ };
21
+ const client = new CustodyServiceClient(clientOptions);
22
+ return major === 6
23
+ ? createEthersV6Signer(options.ethers, address, options.provider, client)
24
+ : createEthersV5Signer(options.ethers, address, options.provider, client);
25
+ }
26
+ function createEthersV6Signer(ethersRuntime, address, provider, client) {
27
+ const AbstractSigner = requireRuntimeConstructor(ethersRuntime, 'AbstractSigner');
28
+ const Transaction = requireRuntimeConstructor(ethersRuntime, 'Transaction');
29
+ return new (class CustodyEthersV6Signer extends AbstractSigner {
30
+ address = address;
31
+ constructor(connectedProvider) {
32
+ super(connectedProvider);
33
+ }
34
+ async getAddress() {
35
+ return this.address;
36
+ }
37
+ connect(connectedProvider) {
38
+ return new CustodyEthersV6Signer(connectedProvider);
39
+ }
40
+ async signTransaction(transactionRequest) {
41
+ assertTransactionFrom(ethersRuntime, 6, transactionRequest.from, this.address);
42
+ const transactionInput = transactionRequest instanceof Transaction
43
+ ? transactionRequest
44
+ : { ...transactionRequest };
45
+ if (!(transactionRequest instanceof Transaction)) {
46
+ delete transactionInput.from;
47
+ }
48
+ let unsignedTransaction;
49
+ try {
50
+ unsignedTransaction = Transaction.from(transactionInput);
51
+ }
52
+ catch {
53
+ throw new Error('交易必须是字段完整且地址已解析的未签名交易');
54
+ }
55
+ if (unsignedTransaction.signature) {
56
+ throw new Error('交易必须是未签名交易');
57
+ }
58
+ const result = await client.signTransaction({
59
+ transaction: unsignedTransaction.toJSON(),
60
+ chainId: unsignedTransaction.chainId.toString(),
61
+ });
62
+ const serialized = requireResponseString(result, 'signedTransaction');
63
+ let signedTransaction;
64
+ try {
65
+ signedTransaction = Transaction.from(serialized);
66
+ }
67
+ catch {
68
+ throw new Error('托管服务返回了无效的已签名交易');
69
+ }
70
+ if (!signedTransaction.signature || !signedTransaction.from) {
71
+ throw new Error('托管服务返回的交易缺少有效签名');
72
+ }
73
+ if (signedTransaction.unsignedHash !== unsignedTransaction.unsignedHash) {
74
+ throw new Error('托管服务返回的交易与原始交易不一致');
75
+ }
76
+ assertRecoveredAddress(ethersRuntime, 6, signedTransaction.from, this.address);
77
+ return signedTransaction.serialized;
78
+ }
79
+ async signMessage(message) {
80
+ const result = await client.signMessage(typeof message === 'string'
81
+ ? { message }
82
+ : { messageHex: ethersRuntime.hexlify(message) });
83
+ const signature = normalizeV6Signature(ethersRuntime, result);
84
+ assertRecoveredAddress(ethersRuntime, 6, ethersRuntime.verifyMessage(message, signature), this.address);
85
+ return signature;
86
+ }
87
+ async signTypedData(domain, types, value) {
88
+ const result = await client.signTypedData({ domain, types, value });
89
+ const signature = normalizeV6Signature(ethersRuntime, result);
90
+ assertRecoveredAddress(ethersRuntime, 6, ethersRuntime.verifyTypedData(domain, types, value, signature), this.address);
91
+ return signature;
92
+ }
93
+ })(provider);
94
+ }
95
+ function createEthersV5Signer(ethersRuntime, address, provider, client) {
96
+ const Signer = requireRuntimeConstructor(ethersRuntime, 'Signer');
97
+ const utils = requireRuntimeObject(ethersRuntime, 'utils');
98
+ return new (class CustodyEthersV5Signer extends Signer {
99
+ address = address;
100
+ constructor(connectedProvider) {
101
+ super();
102
+ Object.defineProperty(this, 'provider', {
103
+ value: connectedProvider,
104
+ enumerable: true,
105
+ configurable: false,
106
+ writable: false,
107
+ });
108
+ }
109
+ async getAddress() {
110
+ return this.address;
111
+ }
112
+ connect(connectedProvider) {
113
+ return new CustodyEthersV5Signer(connectedProvider);
114
+ }
115
+ async signTransaction(transactionRequest) {
116
+ const resolvedRequest = await utils.resolveProperties(transactionRequest);
117
+ assertTransactionFrom(ethersRuntime, 5, resolvedRequest.from, this.address);
118
+ const unsignedTransaction = selectV5TransactionFields(resolvedRequest);
119
+ let unsignedSerialized;
120
+ try {
121
+ unsignedSerialized = utils.serializeTransaction(unsignedTransaction);
122
+ }
123
+ catch {
124
+ throw new Error('交易必须是字段完整且地址已解析的未签名交易');
125
+ }
126
+ const result = await client.signTransaction({
127
+ transaction: serializeV5TransactionForService(unsignedTransaction),
128
+ chainId: String(unsignedTransaction.chainId),
129
+ });
130
+ const serialized = requireResponseString(result, 'signedTransaction');
131
+ let signedTransaction;
132
+ try {
133
+ signedTransaction = utils.parseTransaction(serialized);
134
+ }
135
+ catch {
136
+ throw new Error('托管服务返回了无效的已签名交易');
137
+ }
138
+ if (!signedTransaction.from || !signedTransaction.r || !signedTransaction.s) {
139
+ throw new Error('托管服务返回的交易缺少有效签名');
140
+ }
141
+ const returnedUnsigned = utils.serializeTransaction(selectV5TransactionFields(signedTransaction));
142
+ if (returnedUnsigned.toLowerCase() !== unsignedSerialized.toLowerCase()) {
143
+ throw new Error('托管服务返回的交易与原始交易不一致');
144
+ }
145
+ assertRecoveredAddress(ethersRuntime, 5, signedTransaction.from, this.address);
146
+ return serialized;
147
+ }
148
+ async signMessage(message) {
149
+ const result = await client.signMessage(typeof message === 'string'
150
+ ? { message }
151
+ : { messageHex: utils.hexlify(message) });
152
+ const signature = normalizeV5Signature(utils, result);
153
+ assertRecoveredAddress(ethersRuntime, 5, utils.verifyMessage(message, signature), this.address);
154
+ return signature;
155
+ }
156
+ async _signTypedData(domain, types, value) {
157
+ const result = await client.signTypedData({ domain, types, value });
158
+ const signature = normalizeV5Signature(utils, result);
159
+ assertRecoveredAddress(ethersRuntime, 5, utils.verifyTypedData(domain, types, value, signature), this.address);
160
+ return signature;
161
+ }
162
+ })(provider);
163
+ }
164
+ function selectV5TransactionFields(transaction) {
165
+ const result = {};
166
+ for (const field of [
167
+ 'type',
168
+ 'chainId',
169
+ 'nonce',
170
+ 'to',
171
+ 'value',
172
+ 'gasLimit',
173
+ 'gasPrice',
174
+ 'data',
175
+ 'accessList',
176
+ 'maxFeePerGas',
177
+ 'maxPriorityFeePerGas',
178
+ ]) {
179
+ if (transaction[field] !== undefined && transaction[field] !== null) {
180
+ result[field] = transaction[field];
181
+ }
182
+ }
183
+ return result;
184
+ }
185
+ function serializeV5TransactionForService(transaction) {
186
+ const result = {};
187
+ for (const [field, value] of Object.entries(transaction)) {
188
+ if (value !== null &&
189
+ typeof value === 'object' &&
190
+ typeof value.toString === 'function' &&
191
+ ['chainId', 'nonce', 'value', 'gasLimit', 'gasPrice', 'maxFeePerGas', 'maxPriorityFeePerGas'].includes(field)) {
192
+ result[field] = value.toString();
193
+ }
194
+ else {
195
+ result[field] = value;
196
+ }
197
+ }
198
+ return result;
199
+ }
200
+ function normalizeV6Signature(ethersRuntime, payload) {
201
+ const value = requireResponseString(payload, 'signature');
202
+ try {
203
+ return ethersRuntime.Signature.from(value).serialized;
204
+ }
205
+ catch {
206
+ throw new Error('托管服务返回了无效签名');
207
+ }
208
+ }
209
+ function normalizeV5Signature(utils, payload) {
210
+ const value = requireResponseString(payload, 'signature');
211
+ try {
212
+ return utils.joinSignature(utils.splitSignature(value));
213
+ }
214
+ catch {
215
+ throw new Error('托管服务返回了无效签名');
216
+ }
217
+ }
218
+ function assertTransactionFrom(ethersRuntime, major, from, expectedAddress) {
219
+ if (from === undefined || from === null) {
220
+ return;
221
+ }
222
+ if (typeof from !== 'string') {
223
+ throw new Error('交易 from 必须是已解析的钱包地址');
224
+ }
225
+ assertRecoveredAddress(ethersRuntime, major, from, expectedAddress);
226
+ }
227
+ function assertRecoveredAddress(ethersRuntime, major, actual, expected) {
228
+ let normalizedActual;
229
+ try {
230
+ normalizedActual = normalizeAddress(ethersRuntime, major, actual);
231
+ }
232
+ catch {
233
+ throw new Error('托管服务返回的签名地址无效');
234
+ }
235
+ if (normalizedActual !== expected) {
236
+ throw new Error('托管服务返回的签名地址与配置钱包地址不一致');
237
+ }
238
+ }
239
+ function normalizeAddress(ethersRuntime, major, address) {
240
+ return major === 6
241
+ ? ethersRuntime.getAddress(address)
242
+ : requireRuntimeObject(ethersRuntime, 'utils').getAddress(address);
243
+ }
244
+ function requireRuntimeConstructor(ethersRuntime, field) {
245
+ const value = ethersRuntime[field];
246
+ if (typeof value !== 'function') {
247
+ throw new Error(`当前 ethers runtime 缺少 ${field}`);
248
+ }
249
+ return value;
250
+ }
251
+ function requireRuntimeObject(ethersRuntime, field) {
252
+ const value = ethersRuntime[field];
253
+ if (typeof value !== 'object' || value === null) {
254
+ throw new Error(`当前 ethers runtime 缺少 ${field}`);
255
+ }
256
+ return value;
257
+ }
258
+ //# sourceMappingURL=signer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/custody/signer.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ export declare function detectEthersMajor(ethersRuntime: {
2
+ version?: unknown;
3
+ }): 5 | 6;
4
+ //# sourceMappingURL=version.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/custody/version.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,aAAa,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,CAAC,GAAG,CAAC,CAa7E"}
@@ -0,0 +1,13 @@
1
+ export function detectEthersMajor(ethersRuntime) {
2
+ const { version } = ethersRuntime;
3
+ if (typeof version !== 'string') {
4
+ throw new Error('无法识别当前 ethers 版本');
5
+ }
6
+ const match = /^(?:ethers\/)?(\d+)(?:\.|$)/.exec(version.trim());
7
+ const major = match === null ? Number.NaN : Number.parseInt(match[1], 10);
8
+ if (major === 5 || major === 6) {
9
+ return major;
10
+ }
11
+ throw new Error(`不支持的 ethers 版本:${version}`);
12
+ }
13
+ //# sourceMappingURL=version.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/custody/version.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,aAAoC;IACpE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAClC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,KAAK,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1E,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAC;AAC/C,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA0HA,wBAAsB,GAAG,kBAOxB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA8IA,wBAAsB,GAAG,kBAOxB"}
package/dist/index.js CHANGED
@@ -5,6 +5,7 @@ import { syncUpgrade } from './commands/sync.js';
5
5
  import { validateUpgrade } from './commands/validate.js';
6
6
  import { fixConfig } from './commands/fix.js';
7
7
  import { parseCalldataCommand } from './commands/parse.js';
8
+ import { prepareCommand } from './commands/prepare.js';
8
9
  import { readFileSync } from 'fs';
9
10
  import { fileURLToPath } from 'url';
10
11
  import { dirname, join } from 'path';
@@ -41,8 +42,11 @@ program
41
42
  .requiredOption('--proxy <address>', '代理合约地址')
42
43
  .requiredOption('--contract <name>', '合约名称')
43
44
  .option('-n, --network <name>', '网络名称')
45
+ .option('--scheme <scheme>', '部署方案:evm 或 zksync-eravm(默认: evm)')
46
+ .option('--target <name>', '部署策略与 manifest 目标(zkSync 必填)')
44
47
  .option('--constructor-args <args>', '合约构造函数参数(JSON数组格式,例如: \'["arg1", 100]\')')
45
48
  .option('--skip-tx-hash', '跳过通过 Upgraded 事件补充 txHash')
49
+ .option('--transaction-hash <hash>', '已确认部署或升级的交易哈希')
46
50
  .action(async (options) => {
47
51
  try {
48
52
  await syncUpgrade(options);
@@ -74,6 +78,22 @@ program
74
78
  process.exit(1);
75
79
  }
76
80
  });
81
+ // prepare 命令(只生成规范化计划,不签名、不广播、不写 manifest)
82
+ program
83
+ .command('prepare')
84
+ .description('编译并生成 EVM/zkSync CREATE2 或 UUPS 的规范化部署计划')
85
+ .requiredOption('-n, --network <name>', 'Hardhat 网络名称')
86
+ .requiredOption('--request <path>', '准备请求 JSON 文件')
87
+ .requiredOption('-o, --output <path>', '规范化计划输出 JSON 文件')
88
+ .action(async (options) => {
89
+ try {
90
+ await prepareCommand(options);
91
+ }
92
+ catch (error) {
93
+ console.error(chalk.red('\n❌ 执行失败:'), error.message);
94
+ process.exit(1);
95
+ }
96
+ });
77
97
  // fix 命令
78
98
  program
79
99
  .command('fix')
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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"}
@@ -0,0 +1,31 @@
1
+ import type { SyncOptions } from '../types.js';
2
+ import { syncNetworkFile } from '../core/syncUpgradeJson.js';
3
+ import { syncZkManifest } from '../core/preparation/zkManifestSync.js';
4
+ interface SyncDependencies {
5
+ syncEvm: typeof syncNetworkFile;
6
+ syncZk: typeof syncZkManifest;
7
+ }
8
+ export declare function syncWithHre(options: SyncOptions, hre: any, root?: string, dependencies?: SyncDependencies): Promise<{
9
+ manifestTransaction: import("../utils/manifestTransaction.js").ManifestTransactionReport;
10
+ syncReport: string;
11
+ proxyAddress: string;
12
+ implementationAddress: string;
13
+ layoutHash: string;
14
+ networkFile: string;
15
+ success: boolean;
16
+ } | {
17
+ manifestTransaction: import("../utils/manifestTransaction.js").ManifestTransactionReport;
18
+ syncReport: string;
19
+ scheme: "zksync-eravm";
20
+ network: string;
21
+ target: string;
22
+ chainId: string;
23
+ proxy: string;
24
+ implementation: string;
25
+ artifact: import("../workflow/index.js").GateToolArtifactIdentity;
26
+ layoutHash: string;
27
+ manifestDigest: string;
28
+ manifestFile: string;
29
+ }>;
30
+ export {};
31
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,eAAe,CAAC;IAChC,MAAM,EAAE,OAAO,cAAc,CAAC;CAC/B;AAgBD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,WAAW,EACpB,GAAG,EAAE,GAAG,EACR,IAAI,SAAgB,EACpB,YAAY,GAAE,gBAGb;;;;;;;;;;;;;;;;;;;;;GAiCF"}
@@ -0,0 +1,57 @@
1
+ import { syncNetworkFile } from '../core/syncUpgradeJson.js';
2
+ import { syncZkManifest } from '../core/preparation/zkManifestSync.js';
3
+ const parseConstructorArgs = (raw) => {
4
+ if (raw === undefined)
5
+ return [];
6
+ if (Array.isArray(raw))
7
+ return raw;
8
+ let parsed;
9
+ try {
10
+ parsed = JSON.parse(raw);
11
+ }
12
+ catch (error) {
13
+ const message = error instanceof Error ? error.message : String(error);
14
+ throw new Error(`构造函数参数格式错误: ${message}`);
15
+ }
16
+ if (!Array.isArray(parsed))
17
+ throw new Error('构造函数参数必须是一个数组');
18
+ return parsed;
19
+ };
20
+ export async function syncWithHre(options, hre, root = process.cwd(), dependencies = {
21
+ syncEvm: syncNetworkFile,
22
+ syncZk: syncZkManifest,
23
+ }) {
24
+ if (options.network && options.network !== hre.network.name) {
25
+ throw new Error(`sync network ${options.network} does not match Hardhat network ${hre.network.name}`);
26
+ }
27
+ const scheme = options.scheme ?? 'evm';
28
+ const constructorArgs = parseConstructorArgs(options.constructorArgs);
29
+ if (scheme === 'zksync-eravm') {
30
+ if (!options.network)
31
+ throw new Error('zkSync sync network is required');
32
+ if (!options.target)
33
+ throw new Error('zkSync sync target is required');
34
+ return dependencies.syncZk({
35
+ root,
36
+ scheme,
37
+ network: options.network,
38
+ target: options.target,
39
+ proxy: options.proxy,
40
+ contract: options.contract,
41
+ constructorArgs,
42
+ transactionHash: options.transactionHash,
43
+ hre,
44
+ });
45
+ }
46
+ if (scheme !== 'evm')
47
+ throw new Error('sync scheme must be evm or zksync-eravm');
48
+ return dependencies.syncEvm({
49
+ proxyAddress: options.proxy,
50
+ contractName: options.contract,
51
+ networkName: options.network,
52
+ constructorArgs,
53
+ skipTxHash: options.skipTxHash,
54
+ hre,
55
+ });
56
+ }
57
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAOvE,MAAM,oBAAoB,GAAG,CAAC,GAAmC,EAAa,EAAE;IAC9E,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACjC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IACnC,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,eAAe,OAAO,EAAE,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7D,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAoB,EACpB,GAAQ,EACR,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,EACpB,eAAiC;IAC/B,OAAO,EAAE,eAAe;IACxB,MAAM,EAAE,cAAc;CACvB;IAED,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CACb,gBAAgB,OAAO,CAAC,OAAO,mCAAmC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CACrF,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;IACvC,MAAM,eAAe,GAAG,oBAAoB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACtE,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACvE,OAAO,YAAY,CAAC,MAAM,CAAC;YACzB,IAAI;YACJ,MAAM;YACN,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,eAAe;YACf,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IACD,IAAI,MAAM,KAAK,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACjF,OAAO,YAAY,CAAC,OAAO,CAAC;QAC1B,YAAY,EAAE,OAAO,CAAC,KAAK;QAC3B,YAAY,EAAE,OAAO,CAAC,QAAQ;QAC9B,WAAW,EAAE,OAAO,CAAC,OAAO;QAC5B,eAAe;QACf,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,GAAG;KACJ,CAAC,CAAC;AACL,CAAC"}
package/dist/types.d.ts CHANGED
@@ -34,8 +34,11 @@ export interface SyncOptions {
34
34
  proxy: string;
35
35
  contract: string;
36
36
  network?: string;
37
- constructorArgs?: string;
37
+ scheme?: 'evm' | 'zksync-eravm';
38
+ target?: string;
39
+ constructorArgs?: string | unknown[];
38
40
  skipTxHash?: boolean;
41
+ transactionHash?: string;
39
42
  }
40
43
  export interface ValidateOptions {
41
44
  proxy: string;
@@ -48,4 +51,9 @@ export interface ValidateOptions {
48
51
  factorySalt?: string;
49
52
  unsafeAllowArgs?: string;
50
53
  }
54
+ export interface PrepareOptions {
55
+ network: string;
56
+ request: string;
57
+ output: string;
58
+ }
51
59
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,qBAAqB,EAAE,MAAM,CAAC;IAC9B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,aAAa;IAC5B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,qBAAqB,EAAE,MAAM,CAAC;IAC9B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,aAAa;IAC5B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,KAAK,GAAG,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;IACrC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB"}
@@ -0,0 +1,5 @@
1
+ export type { GateToolAddressPolicy, GateToolArtifactFormat, GateToolArtifactIdentity, GateToolArtifactValidation, GateToolCallV1, GateToolCreate2DeployRequestV1, GateToolDeploymentPlan, GateToolPreparationKind, GateToolPreparationPlanV1, GateToolPreparationRequestV1, GateToolScheme, GateToolTransactionPlan, GateToolTransactionPurpose, GateToolUupsInitialValidation, GateToolUupsPlaceholderDeployRequestV1, GateToolUupsUpgradeRequestV1, GateToolUupsUpgradeValidation, GateToolValidation, } from '../core/preparation/types.js';
2
+ export { canonicalPreparationJson, hashPreparationRequest, normalizePreparationPlan, normalizePreparationRequest, writePreparationPlanAtomic, } from '../core/preparation/normalize.js';
3
+ export { prepareWorkflow } from '../core/preparation/index.js';
4
+ export type { GateToolPreparationHre } from '../core/preparation/index.js';
5
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/workflow/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,0BAA0B,EAC1B,cAAc,EACd,8BAA8B,EAC9B,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EACzB,4BAA4B,EAC5B,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC1B,6BAA6B,EAC7B,sCAAsC,EACtC,4BAA4B,EAC5B,6BAA6B,EAC7B,kBAAkB,GACnB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,EACxB,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,YAAY,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC"}
@@ -0,0 +1,3 @@
1
+ export { canonicalPreparationJson, hashPreparationRequest, normalizePreparationPlan, normalizePreparationRequest, writePreparationPlanAtomic, } from '../core/preparation/normalize.js';
2
+ export { prepareWorkflow } from '../core/preparation/index.js';
3
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/workflow/index.ts"],"names":[],"mappings":"AAqBA,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,EACxB,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC"}
@@ -0,0 +1,89 @@
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
+ exports.artifactIdentity = exports.collectZkFactoryDeps = exports.assertArtifactScheme = void 0;
7
+ const node_crypto_1 = __importDefault(require("node:crypto"));
8
+ const ethers_1 = require("ethers");
9
+ const normalize_js_1 = require("./normalize.js");
10
+ const jsonSafe = (value) => JSON.parse(JSON.stringify(value));
11
+ const assertArtifactScheme = (artifact, scheme) => {
12
+ const expected = scheme === 'evm'
13
+ ? 'hh-sol-artifact-1'
14
+ : 'hh-zksolc-artifact-1';
15
+ if (artifact._format !== expected) {
16
+ throw new Error(`${scheme} requires artifact format ${expected}`);
17
+ }
18
+ if (!artifact.sourceName || !artifact.contractName || !artifact.bytecode || artifact.bytecode === '0x') {
19
+ throw new Error('artifact is missing source, contract, or bytecode');
20
+ }
21
+ if (!(0, ethers_1.isHexString)(artifact.bytecode))
22
+ throw new Error('artifact bytecode must be hex bytes');
23
+ if (scheme === 'zksync-eravm'
24
+ && (!artifact.factoryDeps
25
+ || typeof artifact.factoryDeps !== 'object'
26
+ || Array.isArray(artifact.factoryDeps))) {
27
+ throw new Error('hh-zksolc artifact factoryDeps must be an object');
28
+ }
29
+ };
30
+ exports.assertArtifactScheme = assertArtifactScheme;
31
+ const artifactName = (artifact) => (`${artifact.sourceName}:${artifact.contractName}`);
32
+ const collectZkFactoryDeps = async (artifacts, rootArtifact) => {
33
+ (0, exports.assertArtifactScheme)(rootArtifact, 'zksync-eravm');
34
+ const visitedArtifacts = new Set([artifactName(rootArtifact)]);
35
+ const bytecodeHashes = new Set();
36
+ const result = [];
37
+ const addBytecode = (bytecode) => {
38
+ if (!(0, ethers_1.isHexString)(bytecode) || bytecode === '0x') {
39
+ throw new Error('zkSync factory dependency bytecode must be non-empty hex bytes');
40
+ }
41
+ const digest = (0, ethers_1.keccak256)(bytecode);
42
+ if (bytecodeHashes.has(digest))
43
+ return;
44
+ bytecodeHashes.add(digest);
45
+ result.push(bytecode.toLowerCase());
46
+ };
47
+ const visitDependencies = async (artifact) => {
48
+ (0, exports.assertArtifactScheme)(artifact, 'zksync-eravm');
49
+ const dependencies = artifact.factoryDeps;
50
+ for (const dependencyName of Object.values(dependencies)) {
51
+ if (typeof dependencyName !== 'string' || dependencyName.trim() === '') {
52
+ throw new Error('zkSync factory dependency must name an artifact');
53
+ }
54
+ const normalizedName = dependencyName.trim();
55
+ if (visitedArtifacts.has(normalizedName))
56
+ continue;
57
+ visitedArtifacts.add(normalizedName);
58
+ const dependency = await artifacts.readArtifact(normalizedName);
59
+ (0, exports.assertArtifactScheme)(dependency, 'zksync-eravm');
60
+ addBytecode(dependency.bytecode);
61
+ await visitDependencies(dependency);
62
+ }
63
+ };
64
+ addBytecode(rootArtifact.bytecode);
65
+ await visitDependencies(rootArtifact);
66
+ return result;
67
+ };
68
+ exports.collectZkFactoryDeps = collectZkFactoryDeps;
69
+ const artifactIdentity = (artifact, scheme) => {
70
+ (0, exports.assertArtifactScheme)(artifact, scheme);
71
+ const digest = node_crypto_1.default.createHash('sha256').update((0, normalize_js_1.canonicalPreparationJson)(jsonSafe({
72
+ _format: artifact._format,
73
+ sourceName: artifact.sourceName,
74
+ contractName: artifact.contractName,
75
+ abi: artifact.abi,
76
+ bytecode: artifact.bytecode,
77
+ deployedBytecode: artifact.deployedBytecode ?? '0x',
78
+ linkReferences: artifact.linkReferences ?? {},
79
+ deployedLinkReferences: artifact.deployedLinkReferences ?? {},
80
+ factoryDeps: artifact.factoryDeps ?? [],
81
+ }))).digest('hex');
82
+ return {
83
+ sourceName: artifact.sourceName,
84
+ contractName: artifact.contractName,
85
+ digest,
86
+ };
87
+ };
88
+ exports.artifactIdentity = artifactIdentity;
89
+ //# sourceMappingURL=artifacts.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../src/core/preparation/artifacts.ts"],"names":[],"mappings":"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"}