@aztec/cli 0.16.1 → 0.16.2
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/dest/index.d.ts.map +1 -1
- package/dest/index.js +25 -7
- package/dest/utils.js +5 -5
- package/package.json +8 -8
- package/src/index.ts +22 -6
- package/src/utils.ts +4 -4
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAsC5C;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAsC5C;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAqrBxE"}
|
package/dest/index.js
CHANGED
|
@@ -29,6 +29,7 @@ export function getProgram(log, debugLogger) {
|
|
|
29
29
|
const program = new Command();
|
|
30
30
|
const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../package.json');
|
|
31
31
|
const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
|
|
32
|
+
const logJson = (obj) => log(JSON.stringify(obj, null, 2));
|
|
32
33
|
program.name('aztec-cli').description('CLI for interacting with Aztec.').version(cliVersion);
|
|
33
34
|
const pxeOption = new Option('-u, --rpc-url <string>', 'URL of the PXE')
|
|
34
35
|
.env('PXE_URL')
|
|
@@ -142,10 +143,11 @@ export function getProgram(log, debugLogger) {
|
|
|
142
143
|
.option('-k, --public-key <string>', 'Optional encryption public key for this address. Set this value only if this contract is expected to receive private notes, which will be encrypted using this public key.', parsePublicKey)
|
|
143
144
|
.option('-p, --portal-address <hex string>', 'Optional L1 portal address to link the contract to.', parseEthereumAddress)
|
|
144
145
|
.option('-s, --salt <hex string>', 'Optional deployment salt as a hex string for generating the deployment address.', parseSaltFromHexString)
|
|
146
|
+
.option('--json', 'Emit output as json')
|
|
145
147
|
// `options.wait` is default true. Passing `--no-wait` will set it to false.
|
|
146
148
|
// https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
|
|
147
149
|
.option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction')
|
|
148
|
-
.action(async (artifactPath, { rpcUrl, publicKey, args: rawArgs, portalAddress, salt, wait }) => {
|
|
150
|
+
.action(async (artifactPath, { json, rpcUrl, publicKey, args: rawArgs, portalAddress, salt, wait }) => {
|
|
149
151
|
const contractArtifact = await getContractArtifact(artifactPath, log);
|
|
150
152
|
const constructorArtifact = contractArtifact.functions.find(({ name }) => name === 'constructor');
|
|
151
153
|
const client = await createCompatibleClient(rpcUrl, debugLogger);
|
|
@@ -169,13 +171,29 @@ export function getProgram(log, debugLogger) {
|
|
|
169
171
|
debugLogger(`Deploy tx sent with hash ${txHash}`);
|
|
170
172
|
if (wait) {
|
|
171
173
|
const deployed = await tx.wait();
|
|
172
|
-
|
|
173
|
-
|
|
174
|
+
const { address, partialAddress } = deployed.contract.completeAddress;
|
|
175
|
+
if (json) {
|
|
176
|
+
logJson({ address: address.toString(), partialAddress: partialAddress.toString() });
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
log(`\nContract deployed at ${address.toString()}\n`);
|
|
180
|
+
log(`Contract partial address ${partialAddress.toString()}\n`);
|
|
181
|
+
}
|
|
174
182
|
}
|
|
175
183
|
else {
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
184
|
+
const { address, partialAddress } = deploy.completeAddress ?? {};
|
|
185
|
+
if (json) {
|
|
186
|
+
logJson({
|
|
187
|
+
address: address?.toString() ?? 'N/A',
|
|
188
|
+
partialAddress: partialAddress?.toString() ?? 'N/A',
|
|
189
|
+
txHash: txHash.toString(),
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
log(`\nContract Address: ${deploy.completeAddress?.address.toString() ?? 'N/A'}`);
|
|
194
|
+
log(`Contract Partial Address: ${deploy.completeAddress?.partialAddress.toString() ?? 'N/A'}`);
|
|
195
|
+
log(`Deployment transaction hash: ${txHash}\n`);
|
|
196
|
+
}
|
|
179
197
|
}
|
|
180
198
|
});
|
|
181
199
|
program
|
|
@@ -557,4 +575,4 @@ export function getProgram(log, debugLogger) {
|
|
|
557
575
|
generateNoirInterface(program, 'generate-noir-interface', log);
|
|
558
576
|
return program;
|
|
559
577
|
}
|
|
560
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
578
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dest/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ import { createEthereumChain, deployL1Contracts } from '@aztec/ethereum';
|
|
|
3
3
|
import { ContractDeploymentEmitterAbi, ContractDeploymentEmitterBytecode, InboxAbi, InboxBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RollupAbi, RollupBytecode, } from '@aztec/l1-artifacts';
|
|
4
4
|
import { LogId } from '@aztec/types';
|
|
5
5
|
import { CommanderError, InvalidArgumentError } from 'commander';
|
|
6
|
-
import
|
|
6
|
+
import { readFile, rename, writeFile } from 'fs/promises';
|
|
7
7
|
import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
|
|
8
8
|
import { encodeArgs } from './encoding.js';
|
|
9
9
|
/**
|
|
@@ -74,7 +74,7 @@ export async function getContractArtifact(fileDir, log) {
|
|
|
74
74
|
return artifacts[fileDir];
|
|
75
75
|
}
|
|
76
76
|
try {
|
|
77
|
-
contents =
|
|
77
|
+
contents = await readFile(fileDir, 'utf8');
|
|
78
78
|
}
|
|
79
79
|
catch {
|
|
80
80
|
throw Error(`Contract ${fileDir} not found`);
|
|
@@ -363,11 +363,11 @@ export function parseFields(fields) {
|
|
|
363
363
|
export async function atomicUpdateFile(filePath, contents) {
|
|
364
364
|
const tmpFilepath = filePath + '.tmp';
|
|
365
365
|
try {
|
|
366
|
-
await
|
|
366
|
+
await writeFile(tmpFilepath, contents, {
|
|
367
367
|
// let's crash if the tmp file already exists
|
|
368
368
|
flag: 'wx',
|
|
369
369
|
});
|
|
370
|
-
await
|
|
370
|
+
await rename(tmpFilepath, filePath);
|
|
371
371
|
}
|
|
372
372
|
catch (e) {
|
|
373
373
|
if (e instanceof Error && 'code' in e && e.code === 'EEXIST') {
|
|
@@ -380,4 +380,4 @@ export async function atomicUpdateFile(filePath, contents) {
|
|
|
380
380
|
}
|
|
381
381
|
}
|
|
382
382
|
}
|
|
383
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
383
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dest/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -34,13 +34,13 @@
|
|
|
34
34
|
"rootDir": "./src"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@aztec/aztec.js": "0.16.
|
|
38
|
-
"@aztec/ethereum": "0.16.
|
|
39
|
-
"@aztec/foundation": "0.16.
|
|
40
|
-
"@aztec/l1-artifacts": "0.16.
|
|
41
|
-
"@aztec/noir-compiler": "0.16.
|
|
42
|
-
"@aztec/noir-contracts": "0.16.
|
|
43
|
-
"@aztec/types": "0.16.
|
|
37
|
+
"@aztec/aztec.js": "0.16.2",
|
|
38
|
+
"@aztec/ethereum": "0.16.2",
|
|
39
|
+
"@aztec/foundation": "0.16.2",
|
|
40
|
+
"@aztec/l1-artifacts": "0.16.2",
|
|
41
|
+
"@aztec/noir-compiler": "0.16.2",
|
|
42
|
+
"@aztec/noir-contracts": "0.16.2",
|
|
43
|
+
"@aztec/types": "0.16.2",
|
|
44
44
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
45
45
|
"@ltd/j-toml": "^1.38.0",
|
|
46
46
|
"commander": "^9.0.0",
|
package/src/index.ts
CHANGED
|
@@ -73,6 +73,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
|
|
|
73
73
|
|
|
74
74
|
const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../package.json');
|
|
75
75
|
const cliVersion: string = JSON.parse(readFileSync(packageJsonPath).toString()).version;
|
|
76
|
+
const logJson = (obj: object) => log(JSON.stringify(obj, null, 2));
|
|
76
77
|
|
|
77
78
|
program.name('aztec-cli').description('CLI for interacting with Aztec.').version(cliVersion);
|
|
78
79
|
|
|
@@ -242,10 +243,11 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
|
|
|
242
243
|
'Optional deployment salt as a hex string for generating the deployment address.',
|
|
243
244
|
parseSaltFromHexString,
|
|
244
245
|
)
|
|
246
|
+
.option('--json', 'Emit output as json')
|
|
245
247
|
// `options.wait` is default true. Passing `--no-wait` will set it to false.
|
|
246
248
|
// https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
|
|
247
249
|
.option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction')
|
|
248
|
-
.action(async (artifactPath, { rpcUrl, publicKey, args: rawArgs, portalAddress, salt, wait }) => {
|
|
250
|
+
.action(async (artifactPath, { json, rpcUrl, publicKey, args: rawArgs, portalAddress, salt, wait }) => {
|
|
249
251
|
const contractArtifact = await getContractArtifact(artifactPath, log);
|
|
250
252
|
const constructorArtifact = contractArtifact.functions.find(({ name }) => name === 'constructor');
|
|
251
253
|
|
|
@@ -277,12 +279,26 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
|
|
|
277
279
|
debugLogger(`Deploy tx sent with hash ${txHash}`);
|
|
278
280
|
if (wait) {
|
|
279
281
|
const deployed = await tx.wait();
|
|
280
|
-
|
|
281
|
-
|
|
282
|
+
const { address, partialAddress } = deployed.contract.completeAddress;
|
|
283
|
+
if (json) {
|
|
284
|
+
logJson({ address: address.toString(), partialAddress: partialAddress.toString() });
|
|
285
|
+
} else {
|
|
286
|
+
log(`\nContract deployed at ${address.toString()}\n`);
|
|
287
|
+
log(`Contract partial address ${partialAddress.toString()}\n`);
|
|
288
|
+
}
|
|
282
289
|
} else {
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
290
|
+
const { address, partialAddress } = deploy.completeAddress ?? {};
|
|
291
|
+
if (json) {
|
|
292
|
+
logJson({
|
|
293
|
+
address: address?.toString() ?? 'N/A',
|
|
294
|
+
partialAddress: partialAddress?.toString() ?? 'N/A',
|
|
295
|
+
txHash: txHash.toString(),
|
|
296
|
+
});
|
|
297
|
+
} else {
|
|
298
|
+
log(`\nContract Address: ${deploy.completeAddress?.address.toString() ?? 'N/A'}`);
|
|
299
|
+
log(`Contract Partial Address: ${deploy.completeAddress?.partialAddress.toString() ?? 'N/A'}`);
|
|
300
|
+
log(`Deployment transaction hash: ${txHash}\n`);
|
|
301
|
+
}
|
|
286
302
|
}
|
|
287
303
|
});
|
|
288
304
|
|
package/src/utils.ts
CHANGED
|
@@ -17,7 +17,7 @@ import {
|
|
|
17
17
|
import { LogId } from '@aztec/types';
|
|
18
18
|
|
|
19
19
|
import { CommanderError, InvalidArgumentError } from 'commander';
|
|
20
|
-
import
|
|
20
|
+
import { readFile, rename, writeFile } from 'fs/promises';
|
|
21
21
|
import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
|
|
22
22
|
|
|
23
23
|
import { encodeArgs } from './encoding.js';
|
|
@@ -107,7 +107,7 @@ export async function getContractArtifact(fileDir: string, log: LogFn) {
|
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
try {
|
|
110
|
-
contents =
|
|
110
|
+
contents = await readFile(fileDir, 'utf8');
|
|
111
111
|
} catch {
|
|
112
112
|
throw Error(`Contract ${fileDir} not found`);
|
|
113
113
|
}
|
|
@@ -412,11 +412,11 @@ export function parseFields(fields: string[]): Fr[] {
|
|
|
412
412
|
export async function atomicUpdateFile(filePath: string, contents: string) {
|
|
413
413
|
const tmpFilepath = filePath + '.tmp';
|
|
414
414
|
try {
|
|
415
|
-
await
|
|
415
|
+
await writeFile(tmpFilepath, contents, {
|
|
416
416
|
// let's crash if the tmp file already exists
|
|
417
417
|
flag: 'wx',
|
|
418
418
|
});
|
|
419
|
-
await
|
|
419
|
+
await rename(tmpFilepath, filePath);
|
|
420
420
|
} catch (e) {
|
|
421
421
|
if (e instanceof Error && 'code' in e && e.code === 'EEXIST') {
|
|
422
422
|
const commanderError = new CommanderError(
|