@aztec/cli 0.1.0-alpha20 → 0.1.0-alpha22

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.js CHANGED
@@ -1,62 +1,115 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
2
  import { Command } from 'commander';
3
+ import { mnemonicToAccount } from 'viem/accounts';
3
4
  import { createLogger } from '@aztec/foundation/log';
4
5
  import { createDebugLogger } from '@aztec/foundation/log';
5
- import { AztecAddress, Contract, ContractDeployer, Point, TxHash, createAccounts, createAztecRpcClient, pointToPublicKey, } from '@aztec/aztec.js';
6
- import { encodeArgs, parseStructString } from './cli_encoder.js';
7
- import { deployAztecContracts, getContractAbi, prepTx } from './utils.js';
6
+ import { AztecAddress, Contract, ContractDeployer, Fr, Point, TxHash, createAccounts, createAztecRpcClient, getAccountWallet, } from '@aztec/aztec.js';
8
7
  import { JsonStringify } from '@aztec/foundation/json-rpc';
8
+ import { randomBytes } from '@aztec/foundation/crypto';
9
9
  import { L2BlockL2Logs } from '@aztec/types';
10
+ import { encodeArgs, parseStructString } from './cli_encoder.js';
11
+ import { deployAztecContracts, getContractAbi, getTxSender, prepTx } from './utils.js';
12
+ const accountCreationSalt = Fr.ZERO;
10
13
  const debugLogger = createDebugLogger('aztec:cli');
11
14
  const log = createLogger();
12
15
  const program = new Command();
13
16
  program.name('azti').description('CLI for interacting with Aztec.').version('0.1.0');
17
+ const { ETHEREUM_HOST, AZTEC_RPC_HOST, PRIVATE_KEY, PUBLIC_KEY, API_KEY } = process.env;
14
18
  /**
15
- * A placeholder for the Aztec-cli.
19
+ * Main function for the Aztec CLI.
16
20
  */
17
21
  async function main() {
18
22
  program
19
23
  .command('deploy-l1-contracts')
20
- .argument('[rpcUrl]', 'Url of the ethereum host. Chain identifiers localhost and testnet can be used', 'http://localhost:8545')
21
- .option('-a, --api-key <string>', 'Api key for the ethereum host', undefined)
22
- .option('-p, --private-key <string>', 'The private key to use for deployment')
24
+ .description('Deploys all necessary Ethereum contracts for Aztec.')
25
+ .argument('[rpcUrl]', 'Url of the ethereum host. Chain identifiers localhost and testnet can be used', ETHEREUM_HOST || 'http://localhost:8545')
26
+ .option('-a, --api-key <string>', 'Api key for the ethereum host', API_KEY)
27
+ .option('-p, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY)
23
28
  .option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk')
24
29
  .action(async (rpcUrl, options) => {
25
- await deployAztecContracts(rpcUrl, options.apiKey ?? '', options.privateKey, options.mnemonic, debugLogger);
30
+ const { rollupAddress, registryAddress, inboxAddress, outboxAddress, contractDeploymentEmitterAddress } = await deployAztecContracts(rpcUrl, options.apiKey ?? '', options.privateKey, options.mnemonic, debugLogger);
31
+ log('\n');
32
+ log(`Rollup Address: ${rollupAddress.toString()}`);
33
+ log(`Registry Address: ${registryAddress.toString()}`);
34
+ log(`L1 -> L2 Inbox Address: ${inboxAddress.toString()}`);
35
+ log(`L2 -> L1 Outbox address: ${outboxAddress.toString()}`);
36
+ log(`Contract Deployment Emitter Address: ${contractDeploymentEmitterAddress.toString()}`);
37
+ log('\n');
38
+ });
39
+ program
40
+ .command('create-private-key')
41
+ .description('Generates a 32-byte private key.')
42
+ .option('-m, --mnemonic', 'A mnemonic string that can be used for the private key generation.')
43
+ .action(options => {
44
+ let privKey;
45
+ if (options.mnemonic) {
46
+ const acc = mnemonicToAccount(options.mnemonic);
47
+ privKey = Buffer.from(acc.getHdKey().privateKey).toString('hex');
48
+ }
49
+ else {
50
+ privKey = randomBytes(32).toString('hex');
51
+ }
52
+ log(`\n${privKey}\n`);
53
+ });
54
+ program
55
+ .command('create-account')
56
+ .description('Creates an aztec account that can be used for transactions.')
57
+ .option('-k, --private-key <string>', 'Private Key to use for the 1st account generation. Uses random by default.', PRIVATE_KEY)
58
+ .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
59
+ .action(async (options) => {
60
+ const client = createAztecRpcClient(options.rpcUrl);
61
+ const privateKey = options.privateKey && Buffer.from(options.privateKey.replace(/^0x/i, ''), 'hex');
62
+ const wallet = await createAccounts(client, privateKey, accountCreationSalt, 1);
63
+ const accounts = await wallet.getAccounts();
64
+ const pubKeys = await Promise.all(accounts.map(acc => wallet.getAccountPublicKey(acc)));
65
+ log(`\nCreated account(s).`);
66
+ accounts.map((acc, i) => log(`\nAddress: ${acc.toString()}\nPublic Key: ${pubKeys[i].toString()}\n`));
26
67
  });
27
68
  program
28
69
  .command('deploy')
70
+ .description('Deploys a compiled Noir contract to Aztec.')
29
71
  .argument('<contractAbi>', "A compiled Noir contract's ABI in JSON format", undefined)
30
- .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
31
- .option('-k, --public-key <string>')
32
- .option('-a, --constructor-args [args...]', 'Contract constructor arguments', [])
33
- .action(async (contractFile, options) => {
72
+ .argument('[constructorArgs...]', 'Contract constructor arguments', [])
73
+ .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
74
+ .option('-k, --public-key <string>', 'Public key of the deployer. If not provided, it will check the RPC for existing ones.', PUBLIC_KEY)
75
+ .action(async (contractFile, args, options) => {
34
76
  const contractAbi = getContractAbi(contractFile, log);
35
77
  const constructorAbi = contractAbi.functions.find(({ name }) => name === 'constructor');
36
- const publicKey = Point.fromString(options.publicKey);
37
78
  const client = createAztecRpcClient(options.rpcUrl);
79
+ let publicKey;
80
+ if (options.publicKey) {
81
+ publicKey = Point.fromString(options.publicKey);
82
+ }
83
+ else {
84
+ const accounts = await client.getAccounts();
85
+ if (!accounts) {
86
+ throw new Error('No public key provided or found in Aztec RPC.');
87
+ }
88
+ publicKey = await client.getAccountPublicKey(accounts[0]);
89
+ }
90
+ log(`Using Public Key: ${publicKey.toString()}`);
38
91
  const deployer = new ContractDeployer(contractAbi, client);
39
- const tx = deployer
40
- .deploy(...encodeArgs(options.constructorArgs, constructorAbi.parameters), pointToPublicKey(publicKey))
41
- .send();
92
+ const tx = deployer.deploy(...encodeArgs(args, constructorAbi.parameters), publicKey.toBigInts()).send();
42
93
  await tx.isMined();
43
94
  const receipt = await tx.getReceipt();
44
- log(`Contract deployed at ${receipt.contractAddress?.toString()}`);
95
+ log(`\nAztec Contract deployed at ${receipt.contractAddress?.toString()}\n`);
45
96
  });
46
97
  program
47
98
  .command('check-deploy')
99
+ .description('Checks if a contract is deployed to the specified Aztec address.')
48
100
  .argument('<contractAddress>', 'An Aztec address to check if contract has been deployed to.')
49
- .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
101
+ .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
50
102
  .action(async (_contractAddress, options) => {
51
103
  const client = createAztecRpcClient(options.rpcUrl);
52
104
  const address = AztecAddress.fromString(_contractAddress);
53
105
  const isDeployed = await client.isContractDeployed(address);
54
- log(isDeployed.toString());
106
+ log(`\n${isDeployed.toString()}\n`);
55
107
  });
56
108
  program
57
109
  .command('get-tx-receipt')
110
+ .description('Gets the receipt for the specified transaction hash.')
58
111
  .argument('<txHash>', 'A TX hash to get the receipt for.')
59
- .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
112
+ .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
60
113
  .action(async (_txHash, options) => {
61
114
  const client = createAztecRpcClient(options.rpcUrl);
62
115
  const txHash = TxHash.fromString(_txHash);
@@ -65,13 +118,14 @@ async function main() {
65
118
  log(`No receipt found for tx hash ${_txHash}`);
66
119
  }
67
120
  else {
68
- log(`TX Receipt: \n${JsonStringify(receipt, true)}`);
121
+ log(`\nTX Receipt: \n${JsonStringify(receipt, true)}\n`);
69
122
  }
70
123
  });
71
124
  program
72
125
  .command('get-contract-data')
126
+ .description('Gets information about the Aztec contract deployed at the specified address.')
73
127
  .argument('<contractAddress>', 'Aztec address of the contract.')
74
- .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
128
+ .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
75
129
  .option('-b, --include-bytecode', "Include the contract's public function bytecode, if any.")
76
130
  .action(async (_contractAddress, options) => {
77
131
  const client = createAztecRpcClient(options.rpcUrl);
@@ -90,17 +144,19 @@ async function main() {
90
144
  else {
91
145
  contractData = contractDataOrInfo;
92
146
  }
93
- log(`Contract Data: \nAddress: ${contractData.contractAddress.toString()}`);
147
+ log(`\nContract Data: \nAddress: ${contractData.contractAddress.toString()}`);
94
148
  log(`Portal: ${contractData.portalContractAddress.toString()}`);
95
149
  if ('bytecode' in contractDataOrInfo) {
96
150
  log(`Bytecode: ${contractDataOrInfo.bytecode}`);
97
151
  }
152
+ log('\n');
98
153
  });
99
154
  program
100
155
  .command('get-logs')
156
+ .description('Gets all the unencrypted logs from L2 blocks in the range specified.')
101
157
  .argument('<from>', 'Block num start for getting logs.')
102
158
  .argument('<take>', 'How many block logs to fetch.')
103
- .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
159
+ .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
104
160
  .action(async (_from, _take, options) => {
105
161
  let from;
106
162
  let take;
@@ -122,25 +178,9 @@ async function main() {
122
178
  L2BlockL2Logs.unrollLogs(logs).forEach(fnLog => log(`${fnLog.toString('ascii')}\n`));
123
179
  }
124
180
  });
125
- // NOTE: This implementation should change soon but keeping it here for quick account creation.
126
- program
127
- .command('create-account')
128
- .option('-k, --private-key', 'Private Key to use for the 1st account generation.')
129
- .option('-n, --num-addresses <number>', 'Number of addresses the account can control')
130
- .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
131
- .action(async (options) => {
132
- const client = createAztecRpcClient(options.rpcUrl);
133
- const privateKey = options.privateKey && Buffer.from(options.privateKeystr.replace(/^0x/i, ''), 'hex');
134
- const numAccounts = options.numAddresses ? parseInt(options.numAddresses) : 1;
135
- const wallet = await createAccounts(client, privateKey, numAccounts);
136
- const accounts = await wallet.getAccounts();
137
- const pubKeys = await Promise.all(accounts.map(acc => wallet.getAccountPublicKey(acc)));
138
- log(`Created account(s).`);
139
- accounts.map((acc, i) => log(`\nAddress: ${acc.toString()}\nPublic Key: ${pubKeys[i].toString()}\n`));
140
- });
141
181
  program
142
182
  .command('get-accounts')
143
- .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
183
+ .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
144
184
  .action(async (options) => {
145
185
  const client = createAztecRpcClient(options.rpcUrl);
146
186
  const accounts = await client.getAccounts();
@@ -149,13 +189,14 @@ async function main() {
149
189
  }
150
190
  else {
151
191
  log(`Accounts found: \n`);
152
- accounts.forEach(acc => log(`${acc}\n`));
192
+ accounts.forEach(async (acc) => log(`Address: ${acc}\nPublic Key: ${await client.getAccountPublicKey(acc)}\n`));
153
193
  }
154
194
  });
155
195
  program
156
196
  .command('get-account-public-key')
197
+ .description("Gets an account's public key, given its Aztec address.")
157
198
  .argument('<address>', 'The Aztec address to get the public key for')
158
- .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
199
+ .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
159
200
  .action(async (_address, options) => {
160
201
  const client = createAztecRpcClient(options.rpcUrl);
161
202
  const address = AztecAddress.fromString(_address);
@@ -169,43 +210,50 @@ async function main() {
169
210
  });
170
211
  program
171
212
  .command('call-fn')
213
+ .description('Calls a function on an Aztec contract.')
172
214
  .argument('<contractAbi>', "The compiled contract's ABI in JSON format", undefined)
173
215
  .argument('<contractAddress>', 'Address of the contract')
174
216
  .argument('<functionName>', 'Name of Function to view')
175
- .argument('[from]', 'The caller of the transaction', undefined)
176
217
  .argument('[functionArgs...]', 'Function arguments', [])
177
- .option('-u, --rpcUrl <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
178
- .action(async (contractFile, _contractAddress, functionName, _from, _functionArgs, options) => {
179
- const { contractAddress, functionArgs, from, contractAbi } = prepTx(contractFile, _contractAddress, functionName, _from, _functionArgs, log);
218
+ .option('-k, --private-key <string>', "The sender's private key.", PRIVATE_KEY)
219
+ .option('-u, --rpcUrl <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
220
+ .action(async (contractFile, _contractAddress, functionName, _functionArgs, options) => {
221
+ const { contractAddress, functionArgs, contractAbi } = prepTx(contractFile, _contractAddress, functionName, _functionArgs, log);
180
222
  const client = createAztecRpcClient(options.rpcUrl);
181
- const wallet = await createAccounts(client);
223
+ const wallet = await getAccountWallet(client, Buffer.from(options.privateKey, 'hex'), accountCreationSalt);
182
224
  const contract = new Contract(contractAddress, contractAbi, wallet);
183
- const tx = contract.methods[functionName](...functionArgs).send({ from });
225
+ const from = (await wallet.getAccounts()).find(addr => addr.equals(wallet.getAddress()));
226
+ const tx = contract.methods[functionName](...functionArgs).send({
227
+ from,
228
+ });
184
229
  await tx.isMined();
185
- log('TX has been mined');
230
+ log('\nTX has been mined');
186
231
  const receipt = await tx.getReceipt();
187
232
  log(`TX Hash: ${(await tx.getTxHash()).toString()}`);
188
233
  log(`Block Num: ${receipt.blockNumber}`);
189
234
  log(`Block Hash: ${receipt.blockHash?.toString('hex')}`);
190
- log(`TX Status: ${receipt.status}`);
235
+ log(`TX Status: ${receipt.status}\n`);
191
236
  });
192
237
  program
193
- .command('view-tx')
238
+ .command('view-fn')
239
+ .description('Simulates the execution of a view (read-only) function on a deployed contract, without modifying state.')
194
240
  .argument('<contractAbi>', "The compiled contract's ABI in JSON format", undefined)
195
241
  .argument('<contractAddress>', 'Address of the contract')
196
242
  .argument('<functionName>', 'Name of Function to view')
197
- .argument('[from]', 'The caller of the transaction', undefined)
198
243
  .argument('[functionArgs...]', 'Function arguments', [])
199
- .option('-u, --rpcUrl <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
200
- .action(async (contractFile, _contractAddress, functionName, _from, _functionArgs, options) => {
201
- const { contractAddress, functionArgs, from } = prepTx(contractFile, _contractAddress, functionName, _from, _functionArgs, log);
244
+ .option('-f, --from <string>', 'Public key of the TX viewer. If empty, will try to find account in RPC.')
245
+ .option('-u, --rpcUrl <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
246
+ .action(async (contractFile, _contractAddress, functionName, _functionArgs, options) => {
247
+ const { contractAddress, functionArgs } = prepTx(contractFile, _contractAddress, functionName, _functionArgs, log);
202
248
  const client = createAztecRpcClient(options.rpcUrl);
249
+ const from = await getTxSender(client, options.from);
203
250
  const result = await client.viewTx(functionName, functionArgs, contractAddress, from);
204
- log('View TX returned result: ', JsonStringify(result, true));
251
+ log('\nView TX result: ', JsonStringify(result, true), '\n');
205
252
  });
206
253
  // Helper for users to decode hex strings into structs if needed
207
254
  program
208
255
  .command('parse-parameter-struct')
256
+ .description("Helper for parsing an encoded string into a contract's parameter struct.")
209
257
  .argument('<encodedString>', 'The encoded hex string')
210
258
  .argument('<contractAbi>', "The compiled contract's ABI in JSON format")
211
259
  .argument('<parameterName>', 'The name of the struct parameter to decode into')
@@ -220,15 +268,16 @@ async function main() {
220
268
  return;
221
269
  }
222
270
  const data = parseStructString(encodedString, parameterAbitype.type);
223
- log(`Struct Data: \n${JsonStringify(data, true)}`);
271
+ log(`\nStruct Data: \n${JsonStringify(data, true)}\n`);
224
272
  });
225
273
  program
226
274
  .command('block-num')
227
- .option('-u, --rpcUrl <string>', 'URL of the Aztec RPC', 'http://localhost:8080')
275
+ .description('Gets the current Aztec L2 number.')
276
+ .option('-u, --rpcUrl <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
228
277
  .action(async (options) => {
229
278
  const client = createAztecRpcClient(options.rpcUrl);
230
279
  const num = await client.getBlockNum();
231
- log(num);
280
+ log(`${num}\n`);
232
281
  });
233
282
  await program.parseAsync(process.argv);
234
283
  }
@@ -236,4 +285,4 @@ main().catch(err => {
236
285
  log(`Error thrown: ${err}`);
237
286
  process.exit(1);
238
287
  });
239
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
288
+ //# 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
@@ -1,6 +1,6 @@
1
1
  import { DebugLogger, Logger } from '@aztec/foundation/log';
2
2
  import { ContractAbi } from '@aztec/foundation/abi';
3
- import { AztecAddress } from '@aztec/aztec.js';
3
+ import { AztecAddress, AztecRPC } from '@aztec/aztec.js';
4
4
  /**
5
5
  * Function to execute the 'deployRollupContracts' command.
6
6
  * @param rpcUrl - The RPC URL of the ethereum node.
@@ -8,27 +8,33 @@ import { AztecAddress } from '@aztec/aztec.js';
8
8
  * @param privateKey - The private key to be used in contract deployment.
9
9
  * @param mnemonic - The mnemonic to be used in contract deployment.
10
10
  */
11
- export declare function deployAztecContracts(rpcUrl: string, apiKey: string, privateKey: string, mnemonic: string, debugLogger: DebugLogger): Promise<void>;
11
+ export declare function deployAztecContracts(rpcUrl: string, apiKey: string, privateKey: string, mnemonic: string, debugLogger: DebugLogger): Promise<import("@aztec/ethereum").DeployL1Contracts>;
12
12
  /**
13
13
  * Reads a file and converts it to an Aztec Contract ABI.
14
14
  * @param fileDir - The directory of the compiled contract ABI.
15
15
  * @returns The parsed ContractABI.
16
16
  */
17
17
  export declare function getContractAbi(fileDir: string, log: Logger): ContractAbi;
18
+ /**
19
+ * Utility to select a TX sender either from user input
20
+ * or from the first account that is found in an Aztec RPC instance.
21
+ * @param client - The Aztec RPC instance that will be checked for an account.
22
+ * @param _from - The user input.
23
+ * @returns An Aztec address. Will throw if one can't be found in either options.
24
+ */
25
+ export declare function getTxSender(client: AztecRPC, _from?: string): Promise<AztecAddress>;
18
26
  /**
19
27
  * Performs necessary checks, conversions & operations to call a contract fn from the CLI.
20
28
  * @param contractFile - Directory of the compiled contract ABI.
21
29
  * @param _contractAddress - Aztec Address of the contract.
22
30
  * @param functionName - Name of the function to be called.
23
- * @param _from - The caller's address.
24
31
  * @param _functionArgs - Arguments to call the function with.
25
32
  * @param log - Logger instance that will output to the CLI
26
33
  * @returns Formatted contract address, function arguments and caller's aztec address.
27
34
  */
28
- export declare function prepTx(contractFile: string, _contractAddress: string, functionName: string, _from: string, _functionArgs: string[], log: Logger): {
35
+ export declare function prepTx(contractFile: string, _contractAddress: string, functionName: string, _functionArgs: string[], log: Logger): {
29
36
  contractAddress: AztecAddress;
30
37
  functionArgs: any[];
31
- from: AztecAddress | undefined;
32
38
  contractAbi: ContractAbi;
33
39
  };
34
40
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,iBAKzB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,eAU1D;AAED;;;;;;;;;GASG;AACH,wBAAgB,MAAM,CACpB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,EAAE,EACvB,GAAG,EAAE,MAAM;;;;;EAyBZ"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGzD;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,wDAKzB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,eAU1D;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,yBAgBjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CACpB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,GAAG,EAAE,MAAM;;;;EAiBZ"}
package/dest/utils.js CHANGED
@@ -13,7 +13,7 @@ import { encodeArgs } from './cli_encoder.js';
13
13
  export async function deployAztecContracts(rpcUrl, apiKey, privateKey, mnemonic, debugLogger) {
14
14
  const account = !privateKey ? mnemonicToAccount(mnemonic) : privateKeyToAccount(`0x${privateKey}`);
15
15
  const chain = createEthereumChain(rpcUrl, apiKey);
16
- await deployL1Contracts(chain.rpcUrl, account, chain.chainInfo, debugLogger);
16
+ return await deployL1Contracts(chain.rpcUrl, account, chain.chainInfo, debugLogger);
17
17
  }
18
18
  /**
19
19
  * Reads a file and converts it to an Aztec Contract ABI.
@@ -32,17 +32,42 @@ export function getContractAbi(fileDir, log) {
32
32
  }
33
33
  return contractAbi;
34
34
  }
35
+ /**
36
+ * Utility to select a TX sender either from user input
37
+ * or from the first account that is found in an Aztec RPC instance.
38
+ * @param client - The Aztec RPC instance that will be checked for an account.
39
+ * @param _from - The user input.
40
+ * @returns An Aztec address. Will throw if one can't be found in either options.
41
+ */
42
+ export async function getTxSender(client, _from) {
43
+ let from;
44
+ if (_from) {
45
+ try {
46
+ from = AztecAddress.fromString(_from);
47
+ }
48
+ catch {
49
+ throw new Error(`Invalid option 'from' passed: ${_from}`);
50
+ }
51
+ }
52
+ else {
53
+ const accounts = await client.getAccounts();
54
+ if (!accounts.length) {
55
+ throw new Error('No accounts found in Aztec RPC insance.');
56
+ }
57
+ from = accounts[0];
58
+ }
59
+ return from;
60
+ }
35
61
  /**
36
62
  * Performs necessary checks, conversions & operations to call a contract fn from the CLI.
37
63
  * @param contractFile - Directory of the compiled contract ABI.
38
64
  * @param _contractAddress - Aztec Address of the contract.
39
65
  * @param functionName - Name of the function to be called.
40
- * @param _from - The caller's address.
41
66
  * @param _functionArgs - Arguments to call the function with.
42
67
  * @param log - Logger instance that will output to the CLI
43
68
  * @returns Formatted contract address, function arguments and caller's aztec address.
44
69
  */
45
- export function prepTx(contractFile, _contractAddress, functionName, _from, _functionArgs, log) {
70
+ export function prepTx(contractFile, _contractAddress, functionName, _functionArgs, log) {
46
71
  let contractAddress;
47
72
  try {
48
73
  contractAddress = AztecAddress.fromString(_contractAddress);
@@ -56,15 +81,6 @@ export function prepTx(contractFile, _contractAddress, functionName, _from, _fun
56
81
  throw new Error(`Function ${functionName} not found on contract ABI.`);
57
82
  }
58
83
  const functionArgs = encodeArgs(_functionArgs, functionAbi.parameters);
59
- let from;
60
- if (_from) {
61
- try {
62
- from = AztecAddress.fromString(_from);
63
- }
64
- catch {
65
- throw new Error(`Unable to parse caller address ${_from}.`);
66
- }
67
- }
68
- return { contractAddress, functionArgs, from, contractAbi };
84
+ return { contractAddress, functionArgs, contractAbi };
69
85
  }
70
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUd6RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDL0MsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLE1BQWMsRUFDZCxNQUFjLEVBQ2QsVUFBa0IsRUFDbEIsUUFBZ0IsRUFDaEIsV0FBd0I7SUFFeEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLFFBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDcEcsTUFBTSxLQUFLLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2xELE1BQU0saUJBQWlCLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztBQUMvRSxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZSxFQUFFLEdBQVc7SUFDekQsTUFBTSxRQUFRLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDbEQsSUFBSSxXQUF3QixDQUFDO0lBQzdCLElBQUk7UUFDRixXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQWdCLENBQUM7S0FDbkQ7SUFBQyxPQUFPLEdBQUcsRUFBRTtRQUNaLEdBQUcsQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO1FBQzVDLE1BQU0sR0FBRyxDQUFDO0tBQ1g7SUFDRCxPQUFPLFdBQVcsQ0FBQztBQUNyQixDQUFDO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxVQUFVLE1BQU0sQ0FDcEIsWUFBb0IsRUFDcEIsZ0JBQXdCLEVBQ3hCLFlBQW9CLEVBQ3BCLEtBQWEsRUFDYixhQUF1QixFQUN2QixHQUFXO0lBRVgsSUFBSSxlQUFlLENBQUM7SUFDcEIsSUFBSTtRQUNGLGVBQWUsR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLENBQUM7S0FDN0Q7SUFBQyxNQUFNO1FBQ04sTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsZ0JBQWdCLEdBQUcsQ0FBQyxDQUFDO0tBQzFFO0lBQ0QsTUFBTSxXQUFXLEdBQUcsY0FBYyxDQUFDLFlBQVksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN0RCxNQUFNLFdBQVcsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDLElBQUksS0FBSyxZQUFZLENBQUMsQ0FBQztJQUNwRixJQUFJLENBQUMsV0FBVyxFQUFFO1FBQ2hCLE1BQU0sSUFBSSxLQUFLLENBQUMsWUFBWSxZQUFZLDZCQUE2QixDQUFDLENBQUM7S0FDeEU7SUFFRCxNQUFNLFlBQVksR0FBRyxVQUFVLENBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUN2RSxJQUFJLElBQUksQ0FBQztJQUNULElBQUksS0FBSyxFQUFFO1FBQ1QsSUFBSTtZQUNGLElBQUksR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3ZDO1FBQUMsTUFBTTtZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsa0NBQWtDLEtBQUssR0FBRyxDQUFDLENBQUM7U0FDN0Q7S0FDRjtJQUVELE9BQU8sRUFBRSxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsQ0FBQztBQUM5RCxDQUFDIn0=
86
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUd6RSxPQUFPLEVBQUUsWUFBWSxFQUFZLE1BQU0saUJBQWlCLENBQUM7QUFDekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLE1BQWMsRUFDZCxNQUFjLEVBQ2QsVUFBa0IsRUFDbEIsUUFBZ0IsRUFDaEIsV0FBd0I7SUFFeEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLFFBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDcEcsTUFBTSxLQUFLLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2xELE9BQU8sTUFBTSxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQ3RGLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGNBQWMsQ0FBQyxPQUFlLEVBQUUsR0FBVztJQUN6RCxNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNsRCxJQUFJLFdBQXdCLENBQUM7SUFDN0IsSUFBSTtRQUNGLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBZ0IsQ0FBQztLQUNuRDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ1osR0FBRyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7UUFDNUMsTUFBTSxHQUFHLENBQUM7S0FDWDtJQUNELE9BQU8sV0FBVyxDQUFDO0FBQ3JCLENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLFdBQVcsQ0FBQyxNQUFnQixFQUFFLEtBQWM7SUFDaEUsSUFBSSxJQUFrQixDQUFDO0lBQ3ZCLElBQUksS0FBSyxFQUFFO1FBQ1QsSUFBSTtZQUNGLElBQUksR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3ZDO1FBQUMsTUFBTTtZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDM0Q7S0FDRjtTQUFNO1FBQ0wsTUFBTSxRQUFRLEdBQUcsTUFBTSxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDNUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7WUFDcEIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1NBQzVEO1FBQ0QsSUFBSSxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNwQjtJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxVQUFVLE1BQU0sQ0FDcEIsWUFBb0IsRUFDcEIsZ0JBQXdCLEVBQ3hCLFlBQW9CLEVBQ3BCLGFBQXVCLEVBQ3ZCLEdBQVc7SUFFWCxJQUFJLGVBQWUsQ0FBQztJQUNwQixJQUFJO1FBQ0YsZUFBZSxHQUFHLFlBQVksQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztLQUM3RDtJQUFDLE1BQU07UUFDTixNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxnQkFBZ0IsR0FBRyxDQUFDLENBQUM7S0FDMUU7SUFDRCxNQUFNLFdBQVcsR0FBRyxjQUFjLENBQUMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3RELE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLFlBQVksQ0FBQyxDQUFDO0lBQ3BGLElBQUksQ0FBQyxXQUFXLEVBQUU7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxZQUFZLFlBQVksNkJBQTZCLENBQUMsQ0FBQztLQUN4RTtJQUVELE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXZFLE9BQU8sRUFBRSxlQUFlLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxDQUFDO0FBQ3hELENBQUMifQ==
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "0.1.0-alpha20",
3
+ "version": "0.1.0-alpha22",
4
4
  "main": "./dest/index.js",
5
5
  "type": "module",
6
6
  "dependencies": {
7
- "@aztec/aztec.js": "0.1.0-alpha20",
8
- "@aztec/ethereum": "0.1.0-alpha20",
9
- "@aztec/foundation": "0.1.0-alpha20",
7
+ "@aztec/aztec.js": "0.1.0-alpha22",
8
+ "@aztec/ethereum": "0.1.0-alpha22",
9
+ "@aztec/foundation": "0.1.0-alpha22",
10
10
  "commander": "^9.0.0",
11
11
  "tslib": "^2.4.0",
12
12
  "viem": "^1.2.5"