@aztec/cli 0.1.0-alpha37 → 0.1.0-alpha39
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/.tsbuildinfo +1 -1
- package/README.md +8 -8
- package/dest/bin/index.d.ts +3 -0
- package/dest/bin/index.d.ts.map +1 -0
- package/dest/bin/index.js +17 -0
- package/dest/{cli_encoder.d.ts → encoding.d.ts} +1 -1
- package/dest/encoding.d.ts.map +1 -0
- package/dest/encoding.js +87 -0
- package/dest/index.d.ts +9 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +134 -100
- package/dest/utils.d.ts +1 -1
- package/dest/utils.js +4 -4
- package/package.json +8 -7
- package/src/bin/index.ts +20 -0
- package/src/index.ts +150 -122
- package/src/utils.ts +4 -4
- package/tsconfig.json +3 -0
- package/dest/cli_encoder.d.ts.map +0 -1
- package/dest/cli_encoder.js +0 -87
- /package/src/{cli_encoder.ts → encoding.ts} +0 -0
package/dest/index.js
CHANGED
|
@@ -1,29 +1,34 @@
|
|
|
1
|
-
|
|
2
|
-
import { AztecAddress, Contract, ContractDeployer, Fr, Point, createAccounts, createAztecRpcClient, generatePublicKey, getAccountWallet, isContractDeployed, } from '@aztec/aztec.js';
|
|
1
|
+
import { AztecAddress, Contract, ContractDeployer, Fr, Point, createAztecRpcClient, generatePublicKey, getAccountWallets, getSchnorrAccount, isContractDeployed, } from '@aztec/aztec.js';
|
|
3
2
|
import { JsonStringify } from '@aztec/foundation/json-rpc';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { L2BlockL2Logs, PrivateKey, TxHash } from '@aztec/types';
|
|
3
|
+
import { compileContract } from '@aztec/noir-compiler/cli';
|
|
4
|
+
import { SchnorrAccountContractAbi } from '@aztec/noir-contracts/artifacts';
|
|
5
|
+
import { CompleteAddress, L2BlockL2Logs, PrivateKey, TxHash } from '@aztec/types';
|
|
7
6
|
import { Command } from 'commander';
|
|
7
|
+
import { readFileSync } from 'fs';
|
|
8
|
+
import { dirname, resolve } from 'path';
|
|
9
|
+
import { fileURLToPath } from 'url';
|
|
8
10
|
import { mnemonicToAccount } from 'viem/accounts';
|
|
9
|
-
import { encodeArgs, parseStructString } from './
|
|
11
|
+
import { encodeArgs, parseStructString } from './encoding.js';
|
|
10
12
|
import { deployAztecContracts, getAbiFunction, getContractAbi, getExampleContractArtifacts, getTxSender, prepTx, } from './utils.js';
|
|
11
13
|
const accountCreationSalt = Fr.ZERO;
|
|
12
|
-
const debugLogger = createDebugLogger('aztec:cli');
|
|
13
|
-
const log = createConsoleLogger();
|
|
14
14
|
const stripLeadingHex = (hex) => {
|
|
15
15
|
if (hex.length > 2 && hex.startsWith('0x')) {
|
|
16
16
|
return hex.substring(2);
|
|
17
17
|
}
|
|
18
18
|
return hex;
|
|
19
19
|
};
|
|
20
|
-
const
|
|
21
|
-
program.name('aztec-cli').description('CLI for interacting with Aztec.').version('0.1.0');
|
|
22
|
-
const { ETHEREUM_HOST, AZTEC_RPC_HOST, PRIVATE_KEY, PUBLIC_KEY, API_KEY } = process.env;
|
|
20
|
+
const { ETHEREUM_HOST, AZTEC_RPC_HOST, PRIVATE_KEY, API_KEY } = process.env;
|
|
23
21
|
/**
|
|
24
|
-
*
|
|
22
|
+
* Returns commander program that defines the CLI.
|
|
23
|
+
* @param log - Console logger.
|
|
24
|
+
* @param debugLogger - Debug logger.
|
|
25
|
+
* @returns The CLI.
|
|
25
26
|
*/
|
|
26
|
-
|
|
27
|
+
export function getProgram(log, debugLogger) {
|
|
28
|
+
const program = new Command();
|
|
29
|
+
const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../package.json');
|
|
30
|
+
const version = JSON.parse(readFileSync(packageJsonPath).toString()).version;
|
|
31
|
+
program.name('aztec-cli').description('CLI for interacting with Aztec.').version(version);
|
|
27
32
|
program
|
|
28
33
|
.command('deploy-l1-contracts')
|
|
29
34
|
.description('Deploys all necessary Ethereum contracts for Aztec.')
|
|
@@ -44,7 +49,7 @@ async function main() {
|
|
|
44
49
|
program
|
|
45
50
|
.command('generate-private-key')
|
|
46
51
|
.description('Generates a 32-byte private key.')
|
|
47
|
-
.option('-m, --mnemonic', '
|
|
52
|
+
.option('-m, --mnemonic', 'An optional mnemonic string used for the private key generation. If not provided, random private key will be generated.')
|
|
48
53
|
.action(async (options) => {
|
|
49
54
|
let privKey;
|
|
50
55
|
let publicKey;
|
|
@@ -56,72 +61,78 @@ async function main() {
|
|
|
56
61
|
}
|
|
57
62
|
else {
|
|
58
63
|
const key = PrivateKey.random();
|
|
59
|
-
privKey =
|
|
64
|
+
privKey = key.toString();
|
|
60
65
|
publicKey = await generatePublicKey(key);
|
|
61
66
|
}
|
|
62
67
|
log(`\nPrivate Key: ${privKey}\nPublic Key: ${publicKey.toString()}\n`);
|
|
63
68
|
});
|
|
64
69
|
program
|
|
65
70
|
.command('create-account')
|
|
66
|
-
.description('Creates an aztec account that can be used for transactions.')
|
|
67
|
-
.
|
|
71
|
+
.description('Creates an aztec account that can be used for sending transactions. Registers the account on the RPC server and deploys an account contract. Uses a Schnorr single-key account which uses the same key for encryption and authentication (not secure for production usage).')
|
|
72
|
+
.summary('Creates an aztec account that can be used for sending transactions.')
|
|
73
|
+
.option('-k, --private-key <string>', 'Private key for note encryption and transaction signing. Uses random by default.', PRIVATE_KEY)
|
|
68
74
|
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
69
75
|
.action(async (options) => {
|
|
70
76
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
71
|
-
const privateKey = options.privateKey
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
77
|
+
const privateKey = options.privateKey
|
|
78
|
+
? new PrivateKey(Buffer.from(stripLeadingHex(options.privateKey), 'hex'))
|
|
79
|
+
: PrivateKey.random();
|
|
80
|
+
const account = getSchnorrAccount(client, privateKey, privateKey, accountCreationSalt);
|
|
81
|
+
const wallet = await account.waitDeploy();
|
|
82
|
+
const { address, publicKey, partialAddress } = wallet.getCompleteAddress();
|
|
83
|
+
log(`\nCreated new account:\n`);
|
|
84
|
+
log(`Address: ${address.toString()}`);
|
|
85
|
+
log(`Public key: ${publicKey.toString()}`);
|
|
86
|
+
if (!options.privateKey)
|
|
87
|
+
log(`Private key: ${privateKey.toString()}`);
|
|
88
|
+
log(`Partial address: ${partialAddress.toString()}`);
|
|
77
89
|
});
|
|
78
90
|
program
|
|
79
91
|
.command('deploy')
|
|
80
92
|
.description('Deploys a compiled Noir contract to Aztec.')
|
|
81
|
-
.
|
|
93
|
+
.requiredOption('-c, --contract-abi <file>', "A compiled Noir contract's ABI in JSON format or name of a contract ABI exported by @aztec/noir-contracts")
|
|
82
94
|
.option('-a, --args <constructorArgs...>', 'Contract constructor arguments', [])
|
|
83
95
|
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
84
|
-
.option('-k, --public-key <string>', '
|
|
96
|
+
.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.')
|
|
97
|
+
.option('-s, --salt <string>', 'Optional deployment salt as a hex string for generating the deployment address.')
|
|
85
98
|
.action(async (options) => {
|
|
86
99
|
const contractAbi = await getContractAbi(options.contractAbi, log);
|
|
87
100
|
const constructorAbi = contractAbi.functions.find(({ name }) => name === 'constructor');
|
|
88
101
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
}
|
|
93
|
-
else {
|
|
94
|
-
const accounts = await client.getAccounts();
|
|
95
|
-
if (!accounts) {
|
|
96
|
-
throw new Error('No public key provided or found in Aztec RPC.');
|
|
97
|
-
}
|
|
98
|
-
publicKey = (await client.getPublicKeyAndPartialAddress(accounts[0]))[0];
|
|
99
|
-
}
|
|
100
|
-
log(`Using Public Key: ${publicKey.toString()}`);
|
|
101
|
-
const deployer = new ContractDeployer(contractAbi, client);
|
|
102
|
+
const publicKey = options.publicKey ? Point.fromString(options.publicKey) : undefined;
|
|
103
|
+
const salt = options.salt ? Fr.fromBuffer(Buffer.from(stripLeadingHex(options.salt), 'hex')) : undefined;
|
|
104
|
+
const deployer = new ContractDeployer(contractAbi, client, publicKey);
|
|
102
105
|
const constructor = getAbiFunction(contractAbi, 'constructor');
|
|
106
|
+
if (!constructor)
|
|
107
|
+
throw new Error(`Constructor not found in contract ABI`);
|
|
103
108
|
if (constructor.parameters.length !== options.args.length) {
|
|
104
|
-
throw Error(`Invalid number of args passed
|
|
109
|
+
throw new Error(`Invalid number of args passed (expected ${constructor.parameters.length} but got ${options.args.length})`);
|
|
105
110
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
111
|
+
debugLogger(`Input arguments: ${options.args.map((x) => `"${x}"`).join(', ')}`);
|
|
112
|
+
const args = encodeArgs(options.args, constructorAbi.parameters);
|
|
113
|
+
debugLogger(`Encoded arguments: ${args.join(', ')}`);
|
|
114
|
+
const tx = deployer.deploy(...args).send({ contractAddressSalt: salt });
|
|
115
|
+
debugLogger(`Deploy tx sent with hash ${await tx.getTxHash()}`);
|
|
116
|
+
const deployed = await tx.wait();
|
|
117
|
+
log(`\nContract deployed at ${deployed.contractAddress.toString()}\n`);
|
|
110
118
|
});
|
|
111
119
|
program
|
|
112
120
|
.command('check-deploy')
|
|
113
121
|
.description('Checks if a contract is deployed to the specified Aztec address.')
|
|
114
|
-
.
|
|
122
|
+
.requiredOption('-ca, --contract-address <address>', 'An Aztec address to check if contract has been deployed to.')
|
|
115
123
|
.option('-u, --rpc-url <url>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
116
124
|
.action(async (options) => {
|
|
117
125
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
118
126
|
const address = AztecAddress.fromString(options.contractAddress);
|
|
119
127
|
const isDeployed = await isContractDeployed(client, address);
|
|
120
|
-
|
|
128
|
+
if (isDeployed)
|
|
129
|
+
log(`\nContract found at ${address.toString()}\n`);
|
|
130
|
+
else
|
|
131
|
+
log(`\nNo contract found at ${address.toString()}\n`);
|
|
121
132
|
});
|
|
122
133
|
program
|
|
123
134
|
.command('get-tx-receipt')
|
|
124
|
-
.argument('<txHash>', 'A
|
|
135
|
+
.argument('<txHash>', 'A transaction hash to get the receipt for.')
|
|
125
136
|
.description('Gets the receipt for the specified transaction hash.')
|
|
126
137
|
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
127
138
|
.action(async (_txHash, options) => {
|
|
@@ -129,10 +140,10 @@ async function main() {
|
|
|
129
140
|
const txHash = TxHash.fromString(_txHash);
|
|
130
141
|
const receipt = await client.getTxReceipt(txHash);
|
|
131
142
|
if (!receipt) {
|
|
132
|
-
log(`No receipt found for
|
|
143
|
+
log(`No receipt found for transaction hash ${_txHash}`);
|
|
133
144
|
}
|
|
134
145
|
else {
|
|
135
|
-
log(`\
|
|
146
|
+
log(`\nTransaction receipt: \n${JsonStringify(receipt, true)}\n`);
|
|
136
147
|
}
|
|
137
148
|
});
|
|
138
149
|
program
|
|
@@ -140,7 +151,7 @@ async function main() {
|
|
|
140
151
|
.description('Gets information about the Aztec contract deployed at the specified address.')
|
|
141
152
|
.argument('<contractAddress>', 'Aztec address of the contract.')
|
|
142
153
|
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
143
|
-
.option('-b, --include-bytecode', "Include the contract's public function bytecode, if any.")
|
|
154
|
+
.option('-b, --include-bytecode <boolean>', "Include the contract's public function bytecode, if any.", false)
|
|
144
155
|
.action(async (contractAddress, options) => {
|
|
145
156
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
146
157
|
const address = AztecAddress.fromString(contractAddress);
|
|
@@ -159,7 +170,7 @@ async function main() {
|
|
|
159
170
|
contractData = contractDataWithOrWithoutBytecode;
|
|
160
171
|
}
|
|
161
172
|
log(`\nContract Data: \nAddress: ${contractData.contractAddress.toString()}`);
|
|
162
|
-
log(`Portal:
|
|
173
|
+
log(`Portal: ${contractData.portalContractAddress.toString()}`);
|
|
163
174
|
if ('bytecode' in contractDataWithOrWithoutBytecode) {
|
|
164
175
|
log(`Bytecode: ${contractDataWithOrWithoutBytecode.bytecode}`);
|
|
165
176
|
}
|
|
@@ -168,24 +179,17 @@ async function main() {
|
|
|
168
179
|
program
|
|
169
180
|
.command('get-logs')
|
|
170
181
|
.description('Gets all the unencrypted logs from L2 blocks in the range specified.')
|
|
171
|
-
.
|
|
172
|
-
.
|
|
182
|
+
.option('-f, --from <blockNum>', 'Initial block number for getting logs (defaults to 1).')
|
|
183
|
+
.option('-l, --limit <blockCount>', 'How many blocks to fetch (defaults to 100).')
|
|
173
184
|
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
174
|
-
.action(async (
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
from = parseInt(_from);
|
|
179
|
-
limit = parseInt(_take);
|
|
180
|
-
}
|
|
181
|
-
catch {
|
|
182
|
-
log(`Invalid integer value(s) passed: ${_from}, ${_take}`);
|
|
183
|
-
return;
|
|
184
|
-
}
|
|
185
|
+
.action(async (options) => {
|
|
186
|
+
const { from, limit } = options;
|
|
187
|
+
const fromBlock = from ? parseInt(from) : 1;
|
|
188
|
+
const limitCount = limit ? parseInt(limit) : 100;
|
|
185
189
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
186
|
-
const logs = await client.getUnencryptedLogs(
|
|
190
|
+
const logs = await client.getUnencryptedLogs(fromBlock, limitCount);
|
|
187
191
|
if (!logs.length) {
|
|
188
|
-
log(`No logs found in blocks ${
|
|
192
|
+
log(`No logs found in blocks ${fromBlock} to ${fromBlock + limitCount}`);
|
|
189
193
|
}
|
|
190
194
|
else {
|
|
191
195
|
log('Logs found: \n');
|
|
@@ -193,18 +197,18 @@ async function main() {
|
|
|
193
197
|
}
|
|
194
198
|
});
|
|
195
199
|
program
|
|
196
|
-
.command('register-
|
|
197
|
-
.description(
|
|
198
|
-
.
|
|
199
|
-
.
|
|
200
|
-
.
|
|
200
|
+
.command('register-recipient')
|
|
201
|
+
.description('Register a recipient in the Aztec RPC.')
|
|
202
|
+
.requiredOption('-a, --address <aztecAddress>', "The account's Aztec address.")
|
|
203
|
+
.requiredOption('-p, --public-key <publicKey>', 'The account public key.')
|
|
204
|
+
.requiredOption('-pa, --partial-address <partialAddress', 'The partially computed address of the account contract.')
|
|
201
205
|
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
202
206
|
.action(async (options) => {
|
|
203
207
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
204
208
|
const address = AztecAddress.fromString(options.address);
|
|
205
209
|
const publicKey = Point.fromString(options.publicKey);
|
|
206
210
|
const partialAddress = Fr.fromString(options.partialAddress);
|
|
207
|
-
await client.
|
|
211
|
+
await client.registerRecipient(await CompleteAddress.create(address, publicKey, partialAddress));
|
|
208
212
|
log(`\nRegistered details for Address: ${options.address}\n`);
|
|
209
213
|
});
|
|
210
214
|
program
|
|
@@ -219,26 +223,58 @@ async function main() {
|
|
|
219
223
|
}
|
|
220
224
|
else {
|
|
221
225
|
log(`Accounts found: \n`);
|
|
222
|
-
for (const
|
|
223
|
-
|
|
224
|
-
log(`Address: ${address}\nPublic Key: ${pk.toString()}\nPartial Address: ${partialAddress.toString()}\n`);
|
|
226
|
+
for (const account of accounts) {
|
|
227
|
+
log(account.toReadableString());
|
|
225
228
|
}
|
|
226
229
|
}
|
|
227
230
|
});
|
|
228
231
|
program
|
|
229
|
-
.command('get-account
|
|
230
|
-
.description(
|
|
231
|
-
.argument('<address>', 'The Aztec address to get
|
|
232
|
+
.command('get-account')
|
|
233
|
+
.description('Gets an account given its Aztec address.')
|
|
234
|
+
.argument('<address>', 'The Aztec address to get account for')
|
|
232
235
|
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
233
236
|
.action(async (_address, options) => {
|
|
234
237
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
235
238
|
const address = AztecAddress.fromString(_address);
|
|
236
|
-
const
|
|
237
|
-
if (!
|
|
239
|
+
const account = await client.getAccount(address);
|
|
240
|
+
if (!account) {
|
|
238
241
|
log(`Unknown account ${_address}`);
|
|
239
242
|
}
|
|
240
243
|
else {
|
|
241
|
-
log(
|
|
244
|
+
log(account.toReadableString());
|
|
245
|
+
}
|
|
246
|
+
});
|
|
247
|
+
program
|
|
248
|
+
.command('get-recipients')
|
|
249
|
+
.description('Gets all the recipients stored in the Aztec RPC.')
|
|
250
|
+
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
251
|
+
.action(async (options) => {
|
|
252
|
+
const client = createAztecRpcClient(options.rpcUrl);
|
|
253
|
+
const recipients = await client.getRecipients();
|
|
254
|
+
if (!recipients.length) {
|
|
255
|
+
log('No recipients found.');
|
|
256
|
+
}
|
|
257
|
+
else {
|
|
258
|
+
log(`Recipients found: \n`);
|
|
259
|
+
for (const recipient of recipients) {
|
|
260
|
+
log(recipient.toReadableString());
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
});
|
|
264
|
+
program
|
|
265
|
+
.command('get-recipient')
|
|
266
|
+
.description('Gets a recipient given its Aztec address.')
|
|
267
|
+
.argument('<address>', 'The Aztec address to get recipient for')
|
|
268
|
+
.option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
269
|
+
.action(async (_address, options) => {
|
|
270
|
+
const client = createAztecRpcClient(options.rpcUrl);
|
|
271
|
+
const address = AztecAddress.fromString(_address);
|
|
272
|
+
const recipient = await client.getRecipient(address);
|
|
273
|
+
if (!recipient) {
|
|
274
|
+
log(`Unknown recipient ${_address}`);
|
|
275
|
+
}
|
|
276
|
+
else {
|
|
277
|
+
log(recipient.toReadableString());
|
|
242
278
|
}
|
|
243
279
|
});
|
|
244
280
|
program
|
|
@@ -246,8 +282,8 @@ async function main() {
|
|
|
246
282
|
.description('Calls a function on an Aztec contract.')
|
|
247
283
|
.argument('<functionName>', 'Name of Function to view')
|
|
248
284
|
.option('-a, --args [functionArgs...]', 'Function arguments', [])
|
|
249
|
-
.
|
|
250
|
-
.
|
|
285
|
+
.requiredOption('-c, --contract-abi <fileLocation>', "A compiled Noir contract's ABI in JSON format or name of a contract ABI exported by @aztec/noir-contracts")
|
|
286
|
+
.requiredOption('-ca, --contract-address <address>', 'Aztec address of the contract.')
|
|
251
287
|
.option('-k, --private-key <string>', "The sender's private key.", PRIVATE_KEY)
|
|
252
288
|
.option('-u, --rpcUrl <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
253
289
|
.action(async (functionName, options) => {
|
|
@@ -256,25 +292,26 @@ async function main() {
|
|
|
256
292
|
if (fnAbi.parameters.length !== options.args.length) {
|
|
257
293
|
throw Error(`Invalid number of args passed. Expected ${fnAbi.parameters.length}; Received: ${options.args.length}`);
|
|
258
294
|
}
|
|
295
|
+
const privateKey = new PrivateKey(Buffer.from(stripLeadingHex(options.privateKey), 'hex'));
|
|
259
296
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
260
|
-
const wallet = await
|
|
261
|
-
const contract = await Contract.
|
|
297
|
+
const wallet = await getAccountWallets(client, SchnorrAccountContractAbi, [privateKey], [privateKey], [accountCreationSalt]);
|
|
298
|
+
const contract = await Contract.at(contractAddress, contractAbi, wallet);
|
|
262
299
|
const tx = contract.methods[functionName](...functionArgs).send();
|
|
263
300
|
await tx.isMined();
|
|
264
|
-
log('\
|
|
301
|
+
log('\nTransaction has been mined');
|
|
265
302
|
const receipt = await tx.getReceipt();
|
|
266
|
-
log(`
|
|
267
|
-
log(`
|
|
268
|
-
log(`Block
|
|
269
|
-
log(`
|
|
303
|
+
log(`Transaction hash: ${(await tx.getTxHash()).toString()}`);
|
|
304
|
+
log(`Status: ${receipt.status}\n`);
|
|
305
|
+
log(`Block number: ${receipt.blockNumber}`);
|
|
306
|
+
log(`Block hash: ${receipt.blockHash?.toString('hex')}`);
|
|
270
307
|
});
|
|
271
308
|
program
|
|
272
309
|
.command('call')
|
|
273
310
|
.description('Simulates the execution of a view (read-only) function on a deployed contract, without modifying state.')
|
|
274
311
|
.argument('<functionName>', 'Name of Function to view')
|
|
275
312
|
.option('-a, --args [functionArgs...]', 'Function arguments', [])
|
|
276
|
-
.
|
|
277
|
-
.
|
|
313
|
+
.requiredOption('-c, --contract-abi <fileLocation>', "A compiled Noir contract's ABI in JSON format or name of a contract ABI exported by @aztec/noir-contracts")
|
|
314
|
+
.requiredOption('-ca, --contract-address <address>', 'Aztec address of the contract.')
|
|
278
315
|
.option('-f, --from <string>', 'Public key of the TX viewer. If empty, will try to find account in RPC.')
|
|
279
316
|
.option('-u, --rpcUrl <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
|
|
280
317
|
.action(async (functionName, options) => {
|
|
@@ -286,15 +323,15 @@ async function main() {
|
|
|
286
323
|
const client = createAztecRpcClient(options.rpcUrl);
|
|
287
324
|
const from = await getTxSender(client, options.from);
|
|
288
325
|
const result = await client.viewTx(functionName, functionArgs, contractAddress, from);
|
|
289
|
-
log('\nView
|
|
326
|
+
log('\nView result: ', JsonStringify(result, true), '\n');
|
|
290
327
|
});
|
|
291
328
|
// Helper for users to decode hex strings into structs if needed
|
|
292
329
|
program
|
|
293
330
|
.command('parse-parameter-struct')
|
|
294
331
|
.description("Helper for parsing an encoded string into a contract's parameter struct.")
|
|
295
332
|
.argument('<encodedString>', 'The encoded hex string')
|
|
296
|
-
.
|
|
297
|
-
.
|
|
333
|
+
.requiredOption('-c, --contract-abi <fileLocation>', "A compiled Noir contract's ABI in JSON format or name of a contract ABI exported by @aztec/noir-contracts")
|
|
334
|
+
.requiredOption('-p, --parameter <parameterName>', 'The name of the struct parameter to decode into')
|
|
298
335
|
.action(async (encodedString, options) => {
|
|
299
336
|
const contractAbi = await getContractAbi(options.contractAbi, log);
|
|
300
337
|
const parameterAbitype = contractAbi.functions
|
|
@@ -325,10 +362,7 @@ async function main() {
|
|
|
325
362
|
const names = Object.keys(abisList);
|
|
326
363
|
names.forEach(name => log(name));
|
|
327
364
|
});
|
|
328
|
-
|
|
365
|
+
compileContract(program, 'compile', log);
|
|
366
|
+
return program;
|
|
329
367
|
}
|
|
330
|
-
main().catch(err => {
|
|
331
|
-
log(`Error thrown: ${err}`);
|
|
332
|
-
process.exit(1);
|
|
333
|
-
});
|
|
334
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
368
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dest/utils.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { AztecAddress, AztecRPC } from '@aztec/aztec.js';
|
|
|
2
2
|
import { ContractAbi } from '@aztec/foundation/abi';
|
|
3
3
|
import { DebugLogger, LogFn } from '@aztec/foundation/log';
|
|
4
4
|
/**
|
|
5
|
-
* Helper type to dynamically import
|
|
5
|
+
* Helper type to dynamically import contracts.
|
|
6
6
|
*/
|
|
7
7
|
interface ArtifactsType {
|
|
8
8
|
[key: string]: ContractAbi;
|
package/dest/utils.js
CHANGED
|
@@ -2,7 +2,7 @@ import { AztecAddress } from '@aztec/aztec.js';
|
|
|
2
2
|
import { createEthereumChain, deployL1Contracts } from '@aztec/ethereum';
|
|
3
3
|
import fs from 'fs';
|
|
4
4
|
import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
|
|
5
|
-
import { encodeArgs } from './
|
|
5
|
+
import { encodeArgs } from './encoding.js';
|
|
6
6
|
/**
|
|
7
7
|
* Helper to get an ABI function or throw error if it doesn't exist.
|
|
8
8
|
* @param abi - Contract's ABI in JSON format.
|
|
@@ -85,9 +85,9 @@ export async function getTxSender(client, _from) {
|
|
|
85
85
|
else {
|
|
86
86
|
const accounts = await client.getAccounts();
|
|
87
87
|
if (!accounts.length) {
|
|
88
|
-
throw new Error('No accounts found in Aztec RPC
|
|
88
|
+
throw new Error('No accounts found in Aztec RPC instance.');
|
|
89
89
|
}
|
|
90
|
-
from = accounts[0];
|
|
90
|
+
from = accounts[0].address;
|
|
91
91
|
}
|
|
92
92
|
return from;
|
|
93
93
|
}
|
|
@@ -113,4 +113,4 @@ export async function prepTx(contractFile, _contractAddress, functionName, _func
|
|
|
113
113
|
const functionArgs = encodeArgs(_functionArgs, functionAbi.parameters);
|
|
114
114
|
return { contractAddress, functionArgs, contractAbi };
|
|
115
115
|
}
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBWSxNQUFNLGlCQUFpQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSXpFLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFdkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQVMzQzs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxjQUFjLENBQUMsR0FBZ0IsRUFBRSxNQUFjO0lBQzdELE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLE1BQU0sQ0FBQyxDQUFDO0lBQzdELElBQUksQ0FBQyxFQUFFLEVBQUU7UUFDUCxNQUFNLEtBQUssQ0FBQyxZQUFZLE1BQU0sNkJBQTZCLENBQUMsQ0FBQztLQUM5RDtJQUNELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLE1BQWMsRUFDZCxNQUFjLEVBQ2QsVUFBa0IsRUFDbEIsUUFBZ0IsRUFDaEIsV0FBd0I7SUFFeEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLFFBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDcEcsTUFBTSxLQUFLLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2xELE9BQU8sTUFBTSxp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
|
package/package.json
CHANGED
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.1.0-
|
|
3
|
+
"version": "0.1.0-alpha39",
|
|
4
4
|
"main": "./dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@aztec/aztec.js": "0.1.0-
|
|
8
|
-
"@aztec/ethereum": "0.1.0-
|
|
9
|
-
"@aztec/foundation": "0.1.0-
|
|
10
|
-
"@aztec/noir-
|
|
11
|
-
"@aztec/
|
|
7
|
+
"@aztec/aztec.js": "0.1.0-alpha39",
|
|
8
|
+
"@aztec/ethereum": "0.1.0-alpha39",
|
|
9
|
+
"@aztec/foundation": "0.1.0-alpha39",
|
|
10
|
+
"@aztec/noir-compiler": "0.1.0-alpha39",
|
|
11
|
+
"@aztec/noir-contracts": "0.1.0-alpha39",
|
|
12
|
+
"@aztec/types": "0.1.0-alpha39",
|
|
12
13
|
"commander": "^9.0.0",
|
|
13
14
|
"tslib": "^2.4.0",
|
|
14
15
|
"viem": "^1.2.5"
|
|
15
16
|
},
|
|
16
17
|
"bin": {
|
|
17
|
-
"aztec-cli": "./dest/index.js"
|
|
18
|
+
"aztec-cli": "./dest/bin/index.js"
|
|
18
19
|
}
|
|
19
20
|
}
|
package/src/bin/index.ts
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
#!/usr/bin/env -S node --no-warnings
|
|
2
|
+
import { createDebugLogger } from '@aztec/aztec.js';
|
|
3
|
+
import { createConsoleLogger } from '@aztec/foundation/log';
|
|
4
|
+
|
|
5
|
+
import { getProgram } from '../index.js';
|
|
6
|
+
|
|
7
|
+
const debugLogger = createDebugLogger('aztec:cli');
|
|
8
|
+
const log = createConsoleLogger();
|
|
9
|
+
|
|
10
|
+
/** CLI main entrypoint */
|
|
11
|
+
async function main() {
|
|
12
|
+
const program = getProgram(log, debugLogger);
|
|
13
|
+
await program.parseAsync(process.argv);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
main().catch(err => {
|
|
17
|
+
log(`Error in command execution`);
|
|
18
|
+
log(err);
|
|
19
|
+
process.exit(1);
|
|
20
|
+
});
|