@aztec/cli 0.1.0-alpha23 → 0.1.0-alpha25

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 (9) hide show
  1. package/.tsbuildinfo +1 -1
  2. package/dest/index.js +14 -13
  3. package/dest/utils.d.ts +4 -4
  4. package/dest/utils.d.ts.map +1 -1
  5. package/dest/utils.js +4 -4
  6. package/package.json +5 -4
  7. package/src/index.ts +25 -12
  8. package/src/utils.ts +8 -6
  9. package/tsconfig.json +3 -0
package/dest/index.js CHANGED
@@ -1,17 +1,18 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
- import { Command } from 'commander';
3
- import { mnemonicToAccount } from 'viem/accounts';
4
- import { createLogger } from '@aztec/foundation/log';
5
- import { createDebugLogger } from '@aztec/foundation/log';
6
2
  import { AztecAddress, Contract, ContractDeployer, Fr, Point, createAccounts, createAztecRpcClient, getAccountWallet, } from '@aztec/aztec.js';
7
3
  import { randomBytes } from '@aztec/foundation/crypto';
8
4
  import { JsonStringify } from '@aztec/foundation/json-rpc';
9
- import { TxHash, L2BlockL2Logs } from '@aztec/types';
5
+ import { createConsoleLogger } from '@aztec/foundation/log';
6
+ import { createDebugLogger } from '@aztec/foundation/log';
7
+ import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/artifacts';
8
+ import { L2BlockL2Logs, TxHash } from '@aztec/types';
9
+ import { Command } from 'commander';
10
+ import { mnemonicToAccount } from 'viem/accounts';
10
11
  import { encodeArgs, parseStructString } from './cli_encoder.js';
11
12
  import { deployAztecContracts, getContractAbi, getTxSender, prepTx } from './utils.js';
12
13
  const accountCreationSalt = Fr.ZERO;
13
14
  const debugLogger = createDebugLogger('aztec:cli');
14
- const log = createLogger();
15
+ const log = createConsoleLogger();
15
16
  const program = new Command();
16
17
  program.name('azti').description('CLI for interacting with Aztec.').version('0.1.0');
17
18
  const { ETHEREUM_HOST, AZTEC_RPC_HOST, PRIVATE_KEY, PUBLIC_KEY, API_KEY } = process.env;
@@ -59,9 +60,9 @@ async function main() {
59
60
  .action(async (options) => {
60
61
  const client = createAztecRpcClient(options.rpcUrl);
61
62
  const privateKey = options.privateKey && Buffer.from(options.privateKey.replace(/^0x/i, ''), 'hex');
62
- const wallet = await createAccounts(client, privateKey, accountCreationSalt, 1);
63
+ const wallet = await createAccounts(client, SchnorrSingleKeyAccountContractAbi, privateKey, accountCreationSalt, 1);
63
64
  const accounts = await wallet.getAccounts();
64
- const pubKeys = await Promise.all(accounts.map(acc => wallet.getAccountPublicKey(acc)));
65
+ const pubKeys = await Promise.all(accounts.map(acc => wallet.getPublicKey(acc)));
65
66
  log(`\nCreated account(s).`);
66
67
  accounts.map((acc, i) => log(`\nAddress: ${acc.toString()}\nPublic Key: ${pubKeys[i].toString()}\n`));
67
68
  });
@@ -85,7 +86,7 @@ async function main() {
85
86
  if (!accounts) {
86
87
  throw new Error('No public key provided or found in Aztec RPC.');
87
88
  }
88
- publicKey = await client.getAccountPublicKey(accounts[0]);
89
+ publicKey = await client.getPublicKey(accounts[0]);
89
90
  }
90
91
  log(`Using Public Key: ${publicKey.toString()}`);
91
92
  const deployer = new ContractDeployer(contractAbi, client);
@@ -189,7 +190,7 @@ async function main() {
189
190
  }
190
191
  else {
191
192
  log(`Accounts found: \n`);
192
- accounts.forEach(async (acc) => log(`Address: ${acc}\nPublic Key: ${await client.getAccountPublicKey(acc)}\n`));
193
+ accounts.forEach(async (acc) => log(`Address: ${acc}\nPublic Key: ${await client.getPublicKey(acc)}\n`));
193
194
  }
194
195
  });
195
196
  program
@@ -200,7 +201,7 @@ async function main() {
200
201
  .action(async (_address, options) => {
201
202
  const client = createAztecRpcClient(options.rpcUrl);
202
203
  const address = AztecAddress.fromString(_address);
203
- const pk = await client.getAccountPublicKey(address);
204
+ const pk = await client.getPublicKey(address);
204
205
  if (!pk) {
205
206
  log(`Unkown account ${_address}`);
206
207
  }
@@ -220,7 +221,7 @@ async function main() {
220
221
  .action(async (contractFile, _contractAddress, functionName, _functionArgs, options) => {
221
222
  const { contractAddress, functionArgs, contractAbi } = prepTx(contractFile, _contractAddress, functionName, _functionArgs, log);
222
223
  const client = createAztecRpcClient(options.rpcUrl);
223
- const wallet = await getAccountWallet(client, Buffer.from(options.privateKey, 'hex'), accountCreationSalt);
224
+ const wallet = await getAccountWallet(client, SchnorrSingleKeyAccountContractAbi, Buffer.from(options.privateKey, 'hex'), accountCreationSalt);
224
225
  const contract = new Contract(contractAddress, contractAbi, wallet);
225
226
  const origin = (await wallet.getAccounts()).find(addr => addr.equals(wallet.getAddress()));
226
227
  const tx = contract.methods[functionName](...functionArgs).send({
@@ -285,4 +286,4 @@ main().catch(err => {
285
286
  log(`Error thrown: ${err}`);
286
287
  process.exit(1);
287
288
  });
288
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
289
+ //# 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
- import { DebugLogger, Logger } from '@aztec/foundation/log';
2
- import { ContractAbi } from '@aztec/foundation/abi';
3
1
  import { AztecAddress, AztecRPC } from '@aztec/aztec.js';
2
+ import { ContractAbi } from '@aztec/foundation/abi';
3
+ import { DebugLogger, LogFn } from '@aztec/foundation/log';
4
4
  /**
5
5
  * Function to execute the 'deployRollupContracts' command.
6
6
  * @param rpcUrl - The RPC URL of the ethereum node.
@@ -14,7 +14,7 @@ export declare function deployAztecContracts(rpcUrl: string, apiKey: string, pri
14
14
  * @param fileDir - The directory of the compiled contract ABI.
15
15
  * @returns The parsed ContractABI.
16
16
  */
17
- export declare function getContractAbi(fileDir: string, log: Logger): ContractAbi;
17
+ export declare function getContractAbi(fileDir: string, log: LogFn): ContractAbi;
18
18
  /**
19
19
  * Utility to select a TX sender either from user input
20
20
  * or from the first account that is found in an Aztec RPC instance.
@@ -32,7 +32,7 @@ export declare function getTxSender(client: AztecRPC, _from?: string): Promise<A
32
32
  * @param log - Logger instance that will output to the CLI
33
33
  * @returns Formatted contract address, function arguments and caller's aztec address.
34
34
  */
35
- export declare function prepTx(contractFile: string, _contractAddress: string, functionName: string, _functionArgs: string[], log: Logger): {
35
+ export declare function prepTx(contractFile: string, _contractAddress: string, functionName: string, _functionArgs: string[], log: LogFn): {
36
36
  contractAddress: AztecAddress;
37
37
  functionArgs: any[];
38
38
  contractAbi: ContractAbi;
package/dest/utils.d.ts.map CHANGED
@@ -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,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"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D;;;;;;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,KAAK,eAUzD;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,KAAK;;;;EAiBX"}
package/dest/utils.js CHANGED
@@ -1,7 +1,7 @@
1
- import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
2
- import fs from 'fs';
3
- import { createEthereumChain, deployL1Contracts } from '@aztec/ethereum';
4
1
  import { AztecAddress } from '@aztec/aztec.js';
2
+ import { createEthereumChain, deployL1Contracts } from '@aztec/ethereum';
3
+ import fs from 'fs';
4
+ import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
5
5
  import { encodeArgs } from './cli_encoder.js';
6
6
  /**
7
7
  * Function to execute the 'deployRollupContracts' command.
@@ -83,4 +83,4 @@ export function prepTx(contractFile, _contractAddress, functionName, _functionAr
83
83
  const functionArgs = encodeArgs(_functionArgs, functionAbi.parameters);
84
84
  return { contractAddress, functionArgs, contractAbi };
85
85
  }
86
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUd6RSxPQUFPLEVBQUUsWUFBWSxFQUFZLE1BQU0saUJBQWlCLENBQUM7QUFDekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLE1BQWMsRUFDZCxNQUFjLEVBQ2QsVUFBa0IsRUFDbEIsUUFBZ0IsRUFDaEIsV0FBd0I7SUFFeEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLFFBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDcEcsTUFBTSxLQUFLLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2xELE9BQU8sTUFBTSxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQ3RGLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGNBQWMsQ0FBQyxPQUFlLEVBQUUsR0FBVztJQUN6RCxNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNsRCxJQUFJLFdBQXdCLENBQUM7SUFDN0IsSUFBSTtRQUNGLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBZ0IsQ0FBQztLQUNuRDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ1osR0FBRyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7UUFDNUMsTUFBTSxHQUFHLENBQUM7S0FDWDtJQUNELE9BQU8sV0FBVyxDQUFDO0FBQ3JCLENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLFdBQVcsQ0FBQyxNQUFnQixFQUFFLEtBQWM7SUFDaEUsSUFBSSxJQUFrQixDQUFDO0lBQ3ZCLElBQUksS0FBSyxFQUFFO1FBQ1QsSUFBSTtZQUNGLElBQUksR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3ZDO1FBQUMsTUFBTTtZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDM0Q7S0FDRjtTQUFNO1FBQ0wsTUFBTSxRQUFRLEdBQUcsTUFBTSxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDNUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7WUFDcEIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1NBQzVEO1FBQ0QsSUFBSSxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNwQjtJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxVQUFVLE1BQU0sQ0FDcEIsWUFBb0IsRUFDcEIsZ0JBQXdCLEVBQ3hCLFlBQW9CLEVBQ3BCLGFBQXVCLEVBQ3ZCLEdBQVc7SUFFWCxJQUFJLGVBQWUsQ0FBQztJQUNwQixJQUFJO1FBQ0YsZUFBZSxHQUFHLFlBQVksQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztLQUM3RDtJQUFDLE1BQU07UUFDTixNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxnQkFBZ0IsR0FBRyxDQUFDLENBQUM7S0FDMUU7SUFDRCxNQUFNLFdBQVcsR0FBRyxjQUFjLENBQUMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3RELE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLFlBQVksQ0FBQyxDQUFDO0lBQ3BGLElBQUksQ0FBQyxXQUFXLEVBQUU7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxZQUFZLFlBQVksNkJBQTZCLENBQUMsQ0FBQztLQUN4RTtJQUVELE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXZFLE9BQU8sRUFBRSxlQUFlLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxDQUFDO0FBQ3hELENBQUMifQ==
86
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBWSxNQUFNLGlCQUFpQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSXpFLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFdkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLE1BQWMsRUFDZCxNQUFjLEVBQ2QsVUFBa0IsRUFDbEIsUUFBZ0IsRUFDaEIsV0FBd0I7SUFFeEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLFFBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDcEcsTUFBTSxLQUFLLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2xELE9BQU8sTUFBTSxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQ3RGLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGNBQWMsQ0FBQyxPQUFlLEVBQUUsR0FBVTtJQUN4RCxNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNsRCxJQUFJLFdBQXdCLENBQUM7SUFDN0IsSUFBSTtRQUNGLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBZ0IsQ0FBQztLQUNuRDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ1osR0FBRyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7UUFDNUMsTUFBTSxHQUFHLENBQUM7S0FDWDtJQUNELE9BQU8sV0FBVyxDQUFDO0FBQ3JCLENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLFdBQVcsQ0FBQyxNQUFnQixFQUFFLEtBQWM7SUFDaEUsSUFBSSxJQUFrQixDQUFDO0lBQ3ZCLElBQUksS0FBSyxFQUFFO1FBQ1QsSUFBSTtZQUNGLElBQUksR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3ZDO1FBQUMsTUFBTTtZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDM0Q7S0FDRjtTQUFNO1FBQ0wsTUFBTSxRQUFRLEdBQUcsTUFBTSxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDNUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7WUFDcEIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1NBQzVEO1FBQ0QsSUFBSSxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNwQjtJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxVQUFVLE1BQU0sQ0FDcEIsWUFBb0IsRUFDcEIsZ0JBQXdCLEVBQ3hCLFlBQW9CLEVBQ3BCLGFBQXVCLEVBQ3ZCLEdBQVU7SUFFVixJQUFJLGVBQWUsQ0FBQztJQUNwQixJQUFJO1FBQ0YsZUFBZSxHQUFHLFlBQVksQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztLQUM3RDtJQUFDLE1BQU07UUFDTixNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxnQkFBZ0IsR0FBRyxDQUFDLENBQUM7S0FDMUU7SUFDRCxNQUFNLFdBQVcsR0FBRyxjQUFjLENBQUMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3RELE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLFlBQVksQ0FBQyxDQUFDO0lBQ3BGLElBQUksQ0FBQyxXQUFXLEVBQUU7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxZQUFZLFlBQVksNkJBQTZCLENBQUMsQ0FBQztLQUN4RTtJQUVELE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXZFLE9BQU8sRUFBRSxlQUFlLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxDQUFDO0FBQ3hELENBQUMifQ==
package/package.json CHANGED
@@ -1,12 +1,13 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "0.1.0-alpha23",
3
+ "version": "0.1.0-alpha25",
4
4
  "main": "./dest/index.js",
5
5
  "type": "module",
6
6
  "dependencies": {
7
- "@aztec/aztec.js": "0.1.0-alpha23",
8
- "@aztec/ethereum": "0.1.0-alpha23",
9
- "@aztec/foundation": "0.1.0-alpha23",
7
+ "@aztec/aztec.js": "0.1.0-alpha25",
8
+ "@aztec/ethereum": "0.1.0-alpha25",
9
+ "@aztec/foundation": "0.1.0-alpha25",
10
+ "@aztec/noir-contracts": "0.1.0-alpha25",
10
11
  "commander": "^9.0.0",
11
12
  "tslib": "^2.4.0",
12
13
  "viem": "^1.2.5"
package/src/index.ts CHANGED
@@ -1,8 +1,4 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
- import { Command } from 'commander';
3
- import { mnemonicToAccount } from 'viem/accounts';
4
- import { createLogger } from '@aztec/foundation/log';
5
- import { createDebugLogger } from '@aztec/foundation/log';
6
2
  import {
7
3
  AztecAddress,
8
4
  Contract,
@@ -16,7 +12,13 @@ import {
16
12
  import { StructType } from '@aztec/foundation/abi';
17
13
  import { randomBytes } from '@aztec/foundation/crypto';
18
14
  import { JsonStringify } from '@aztec/foundation/json-rpc';
19
- import { ContractData, TxHash, L2BlockL2Logs } from '@aztec/types';
15
+ import { createConsoleLogger } from '@aztec/foundation/log';
16
+ import { createDebugLogger } from '@aztec/foundation/log';
17
+ import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/artifacts';
18
+ import { ContractData, L2BlockL2Logs, TxHash } from '@aztec/types';
19
+
20
+ import { Command } from 'commander';
21
+ import { mnemonicToAccount } from 'viem/accounts';
20
22
 
21
23
  import { encodeArgs, parseStructString } from './cli_encoder.js';
22
24
  import { deployAztecContracts, getContractAbi, getTxSender, prepTx } from './utils.js';
@@ -24,7 +26,7 @@ import { deployAztecContracts, getContractAbi, getTxSender, prepTx } from './uti
24
26
  const accountCreationSalt = Fr.ZERO;
25
27
 
26
28
  const debugLogger = createDebugLogger('aztec:cli');
27
- const log = createLogger();
29
+ const log = createConsoleLogger();
28
30
 
29
31
  const program = new Command();
30
32
 
@@ -90,9 +92,15 @@ async function main() {
90
92
  .action(async options => {
91
93
  const client = createAztecRpcClient(options.rpcUrl);
92
94
  const privateKey = options.privateKey && Buffer.from(options.privateKey.replace(/^0x/i, ''), 'hex');
93
- const wallet = await createAccounts(client, privateKey, accountCreationSalt, 1);
95
+ const wallet = await createAccounts(
96
+ client,
97
+ SchnorrSingleKeyAccountContractAbi,
98
+ privateKey,
99
+ accountCreationSalt,
100
+ 1,
101
+ );
94
102
  const accounts = await wallet.getAccounts();
95
- const pubKeys = await Promise.all(accounts.map(acc => wallet.getAccountPublicKey(acc)));
103
+ const pubKeys = await Promise.all(accounts.map(acc => wallet.getPublicKey(acc)));
96
104
  log(`\nCreated account(s).`);
97
105
  accounts.map((acc, i) => log(`\nAddress: ${acc.toString()}\nPublic Key: ${pubKeys[i].toString()}\n`));
98
106
  });
@@ -121,7 +129,7 @@ async function main() {
121
129
  if (!accounts) {
122
130
  throw new Error('No public key provided or found in Aztec RPC.');
123
131
  }
124
- publicKey = await client.getAccountPublicKey(accounts[0]);
132
+ publicKey = await client.getPublicKey(accounts[0]);
125
133
  }
126
134
 
127
135
  log(`Using Public Key: ${publicKey.toString()}`);
@@ -230,7 +238,7 @@ async function main() {
230
238
  log('No accounts found.');
231
239
  } else {
232
240
  log(`Accounts found: \n`);
233
- accounts.forEach(async acc => log(`Address: ${acc}\nPublic Key: ${await client.getAccountPublicKey(acc)}\n`));
241
+ accounts.forEach(async acc => log(`Address: ${acc}\nPublic Key: ${await client.getPublicKey(acc)}\n`));
234
242
  }
235
243
  });
236
244
 
@@ -242,7 +250,7 @@ async function main() {
242
250
  .action(async (_address, options) => {
243
251
  const client = createAztecRpcClient(options.rpcUrl);
244
252
  const address = AztecAddress.fromString(_address);
245
- const pk = await client.getAccountPublicKey(address);
253
+ const pk = await client.getPublicKey(address);
246
254
  if (!pk) {
247
255
  log(`Unkown account ${_address}`);
248
256
  } else {
@@ -270,7 +278,12 @@ async function main() {
270
278
  );
271
279
 
272
280
  const client = createAztecRpcClient(options.rpcUrl);
273
- const wallet = await getAccountWallet(client, Buffer.from(options.privateKey, 'hex'), accountCreationSalt);
281
+ const wallet = await getAccountWallet(
282
+ client,
283
+ SchnorrSingleKeyAccountContractAbi,
284
+ Buffer.from(options.privateKey, 'hex'),
285
+ accountCreationSalt,
286
+ );
274
287
  const contract = new Contract(contractAddress, contractAbi, wallet);
275
288
  const origin = (await wallet.getAccounts()).find(addr => addr.equals(wallet.getAddress()));
276
289
  const tx = contract.methods[functionName](...functionArgs).send({
package/src/utils.ts CHANGED
@@ -1,9 +1,11 @@
1
- import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
2
- import fs from 'fs';
1
+ import { AztecAddress, AztecRPC } from '@aztec/aztec.js';
3
2
  import { createEthereumChain, deployL1Contracts } from '@aztec/ethereum';
4
- import { DebugLogger, Logger } from '@aztec/foundation/log';
5
3
  import { ContractAbi } from '@aztec/foundation/abi';
6
- import { AztecAddress, AztecRPC } from '@aztec/aztec.js';
4
+ import { DebugLogger, LogFn } from '@aztec/foundation/log';
5
+
6
+ import fs from 'fs';
7
+ import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
8
+
7
9
  import { encodeArgs } from './cli_encoder.js';
8
10
 
9
11
  /**
@@ -30,7 +32,7 @@ export async function deployAztecContracts(
30
32
  * @param fileDir - The directory of the compiled contract ABI.
31
33
  * @returns The parsed ContractABI.
32
34
  */
33
- export function getContractAbi(fileDir: string, log: Logger) {
35
+ export function getContractAbi(fileDir: string, log: LogFn) {
34
36
  const contents = fs.readFileSync(fileDir, 'utf8');
35
37
  let contractAbi: ContractAbi;
36
38
  try {
@@ -81,7 +83,7 @@ export function prepTx(
81
83
  _contractAddress: string,
82
84
  functionName: string,
83
85
  _functionArgs: string[],
84
- log: Logger,
86
+ log: LogFn,
85
87
  ) {
86
88
  let contractAddress;
87
89
  try {
package/tsconfig.json CHANGED
@@ -14,6 +14,9 @@
14
14
  },
15
15
  {
16
16
  "path": "../foundation"
17
+ },
18
+ {
19
+ "path": "../noir-contracts"
17
20
  }
18
21
  ],
19
22
  "include": ["src"],