@aztec/cli 0.1.0-alpha22 → 0.1.0-alpha24

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 +12 -11
  3. package/dest/utils.d.ts +2 -2
  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 +17 -11
  8. package/src/utils.ts +6 -4
  9. package/tsconfig.json +3 -0
package/dest/index.js CHANGED
@@ -1,12 +1,13 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
- import { Command } from 'commander';
3
- import { mnemonicToAccount } from 'viem/accounts';
2
+ import { AztecAddress, Contract, ContractDeployer, Fr, Point, createAccounts, createAztecRpcClient, getAccountWallet, } from '@aztec/aztec.js';
3
+ import { randomBytes } from '@aztec/foundation/crypto';
4
+ import { JsonStringify } from '@aztec/foundation/json-rpc';
4
5
  import { createLogger } from '@aztec/foundation/log';
5
6
  import { createDebugLogger } from '@aztec/foundation/log';
6
- import { AztecAddress, Contract, ContractDeployer, Fr, Point, TxHash, createAccounts, createAztecRpcClient, getAccountWallet, } from '@aztec/aztec.js';
7
- import { JsonStringify } from '@aztec/foundation/json-rpc';
8
- import { randomBytes } from '@aztec/foundation/crypto';
9
- import { L2BlockL2Logs } from '@aztec/types';
7
+ import { SchnorrAccountContractAbi } from '@aztec/noir-contracts/examples';
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;
@@ -59,7 +60,7 @@ 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, SchnorrAccountContractAbi, privateKey, accountCreationSalt, 1);
63
64
  const accounts = await wallet.getAccounts();
64
65
  const pubKeys = await Promise.all(accounts.map(acc => wallet.getAccountPublicKey(acc)));
65
66
  log(`\nCreated account(s).`);
@@ -220,11 +221,11 @@ 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, SchnorrAccountContractAbi, Buffer.from(options.privateKey, 'hex'), accountCreationSalt);
224
225
  const contract = new Contract(contractAddress, contractAbi, wallet);
225
- const from = (await wallet.getAccounts()).find(addr => addr.equals(wallet.getAddress()));
226
+ const origin = (await wallet.getAccounts()).find(addr => addr.equals(wallet.getAddress()));
226
227
  const tx = contract.methods[functionName](...functionArgs).send({
227
- from,
228
+ origin,
228
229
  });
229
230
  await tx.isMined();
230
231
  log('\nTX has been mined');
@@ -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, Logger } 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.
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,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAO5D;;;;;;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
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBWSxNQUFNLGlCQUFpQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSXpFLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFdkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLE1BQWMsRUFDZCxNQUFjLEVBQ2QsVUFBa0IsRUFDbEIsUUFBZ0IsRUFDaEIsV0FBd0I7SUFFeEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLFFBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDcEcsTUFBTSxLQUFLLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2xELE9BQU8sTUFBTSxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQ3RGLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGNBQWMsQ0FBQyxPQUFlLEVBQUUsR0FBVztJQUN6RCxNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNsRCxJQUFJLFdBQXdCLENBQUM7SUFDN0IsSUFBSTtRQUNGLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBZ0IsQ0FBQztLQUNuRDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ1osR0FBRyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7UUFDNUMsTUFBTSxHQUFHLENBQUM7S0FDWDtJQUNELE9BQU8sV0FBVyxDQUFDO0FBQ3JCLENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLFdBQVcsQ0FBQyxNQUFnQixFQUFFLEtBQWM7SUFDaEUsSUFBSSxJQUFrQixDQUFDO0lBQ3ZCLElBQUksS0FBSyxFQUFFO1FBQ1QsSUFBSTtZQUNGLElBQUksR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3ZDO1FBQUMsTUFBTTtZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDM0Q7S0FDRjtTQUFNO1FBQ0wsTUFBTSxRQUFRLEdBQUcsTUFBTSxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDNUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7WUFDcEIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1NBQzVEO1FBQ0QsSUFBSSxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNwQjtJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxVQUFVLE1BQU0sQ0FDcEIsWUFBb0IsRUFDcEIsZ0JBQXdCLEVBQ3hCLFlBQW9CLEVBQ3BCLGFBQXVCLEVBQ3ZCLEdBQVc7SUFFWCxJQUFJLGVBQWUsQ0FBQztJQUNwQixJQUFJO1FBQ0YsZUFBZSxHQUFHLFlBQVksQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztLQUM3RDtJQUFDLE1BQU07UUFDTixNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxnQkFBZ0IsR0FBRyxDQUFDLENBQUM7S0FDMUU7SUFDRCxNQUFNLFdBQVcsR0FBRyxjQUFjLENBQUMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3RELE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLFlBQVksQ0FBQyxDQUFDO0lBQ3BGLElBQUksQ0FBQyxXQUFXLEVBQUU7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxZQUFZLFlBQVksNkJBQTZCLENBQUMsQ0FBQztLQUN4RTtJQUVELE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXZFLE9BQU8sRUFBRSxlQUFlLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxDQUFDO0FBQ3hELENBQUMifQ==
package/package.json CHANGED
@@ -1,12 +1,13 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "0.1.0-alpha22",
3
+ "version": "0.1.0-alpha24",
4
4
  "main": "./dest/index.js",
5
5
  "type": "module",
6
6
  "dependencies": {
7
- "@aztec/aztec.js": "0.1.0-alpha22",
8
- "@aztec/ethereum": "0.1.0-alpha22",
9
- "@aztec/foundation": "0.1.0-alpha22",
7
+ "@aztec/aztec.js": "0.1.0-alpha24",
8
+ "@aztec/ethereum": "0.1.0-alpha24",
9
+ "@aztec/foundation": "0.1.0-alpha24",
10
+ "@aztec/noir-contracts": "0.1.0-alpha24",
10
11
  "commander": "^9.0.0",
11
12
  "tslib": "^2.4.0",
12
13
  "viem": "^1.2.5"
package/src/index.ts CHANGED
@@ -1,23 +1,24 @@
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,
9
5
  ContractDeployer,
10
6
  Fr,
11
7
  Point,
12
- TxHash,
13
8
  createAccounts,
14
9
  createAztecRpcClient,
15
10
  getAccountWallet,
16
11
  } from '@aztec/aztec.js';
17
- import { JsonStringify } from '@aztec/foundation/json-rpc';
18
12
  import { StructType } from '@aztec/foundation/abi';
19
13
  import { randomBytes } from '@aztec/foundation/crypto';
20
- import { ContractData, L2BlockL2Logs } from '@aztec/types';
14
+ import { JsonStringify } from '@aztec/foundation/json-rpc';
15
+ import { createLogger } from '@aztec/foundation/log';
16
+ import { createDebugLogger } from '@aztec/foundation/log';
17
+ import { SchnorrAccountContractAbi } from '@aztec/noir-contracts/examples';
18
+ import { ContractData, L2BlockL2Logs, TxHash } from '@aztec/types';
19
+
20
+ import { Command } from 'commander';
21
+ import { mnemonicToAccount } from 'viem/accounts';
21
22
 
22
23
  import { encodeArgs, parseStructString } from './cli_encoder.js';
23
24
  import { deployAztecContracts, getContractAbi, getTxSender, prepTx } from './utils.js';
@@ -91,7 +92,7 @@ async function main() {
91
92
  .action(async options => {
92
93
  const client = createAztecRpcClient(options.rpcUrl);
93
94
  const privateKey = options.privateKey && Buffer.from(options.privateKey.replace(/^0x/i, ''), 'hex');
94
- const wallet = await createAccounts(client, privateKey, accountCreationSalt, 1);
95
+ const wallet = await createAccounts(client, SchnorrAccountContractAbi, privateKey, accountCreationSalt, 1);
95
96
  const accounts = await wallet.getAccounts();
96
97
  const pubKeys = await Promise.all(accounts.map(acc => wallet.getAccountPublicKey(acc)));
97
98
  log(`\nCreated account(s).`);
@@ -271,11 +272,16 @@ async function main() {
271
272
  );
272
273
 
273
274
  const client = createAztecRpcClient(options.rpcUrl);
274
- const wallet = await getAccountWallet(client, Buffer.from(options.privateKey, 'hex'), accountCreationSalt);
275
+ const wallet = await getAccountWallet(
276
+ client,
277
+ SchnorrAccountContractAbi,
278
+ Buffer.from(options.privateKey, 'hex'),
279
+ accountCreationSalt,
280
+ );
275
281
  const contract = new Contract(contractAddress, contractAbi, wallet);
276
- const from = (await wallet.getAccounts()).find(addr => addr.equals(wallet.getAddress()));
282
+ const origin = (await wallet.getAccounts()).find(addr => addr.equals(wallet.getAddress()));
277
283
  const tx = contract.methods[functionName](...functionArgs).send({
278
- from,
284
+ origin,
279
285
  });
280
286
  await tx.isMined();
281
287
  log('\nTX has been mined');
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, Logger } 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
  /**
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"],