@aztec/cli 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.77.0-testnet-ignition.21

package/src/utils/commands.ts

@@ -4,9 +4,9 @@ import { EthAddress } from '@aztec/aztec.js/eth_address';
 import { Fr } from '@aztec/aztec.js/fields';
 import { LogId } from '@aztec/aztec.js/log_id';
 import { TxHash } from '@aztec/aztec.js/tx_hash';
-import { type PXE } from '@aztec/circuit-types';
-import { PublicKeys } from '@aztec/circuits.js/types';
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import { PublicKeys } from '@aztec/stdlib/keys';
 
 import { type Command, CommanderError, InvalidArgumentError, Option } from 'commander';
 import { lookup } from 'dns/promises';
@@ -22,7 +22,7 @@ export const getLocalhost = () =>
     .catch(() => 'localhost');
 
 export const LOCALHOST = await getLocalhost();
-export const { ETHEREUM_HOST = `http://${LOCALHOST}:8545`, PRIVATE_KEY, API_KEY, CLI_VERSION } = process.env;
+export const { ETHEREUM_HOSTS = `http://${LOCALHOST}:8545`, PRIVATE_KEY, API_KEY, CLI_VERSION } = process.env;
 
 export function addOptions(program: Command, options: Option[]) {
   options.forEach(option => program.addOption(option));

package/src/utils/encoding.ts

@@ -1,5 +1,5 @@
-import { type ABIParameter, type AbiType, type StructType, isU128Struct } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
+import type { ABIParameter, AbiType, StructType } from '@aztec/stdlib/abi';
 
 /**
  * Parses a hex string into an ABI struct type.
@@ -85,19 +85,13 @@ function encodeArg(arg: string, abiType: AbiType, name: string): any {
       throw Error(`Array passed for arg ${name}. Expected a struct.`);
     }
     const res: any = {};
-    if (isU128Struct(abiType)) {
-      // When dealing with U128 we don't expect to receive limbs from the user but instead just a normal number.
-      // Also encoder.ts expects a normal number so we just return it as such.
-      return obj;
-    } else {
-      for (const field of abiType.fields) {
-        // Remove field name from list as it's present
-        const arg = obj[field.name];
-        if (!arg) {
-          throw Error(`Expected field ${field.name} not found in struct ${name}.`);
-        }
-        res[field.name] = encodeArg(obj[field.name], field.type, field.name);
+    for (const field of abiType.fields) {
+      // Remove field name from list as it's present
+      const arg = obj[field.name];
+      if (!arg) {
+        throw Error(`Expected field ${field.name} not found in struct ${name}.`);
       }
+      res[field.name] = encodeArg(obj[field.name], field.type, field.name);
     }
     return res;
   }

package/src/utils/inspect.ts

@@ -1,9 +1,10 @@
-import { type ContractArtifact } from '@aztec/aztec.js';
-import { type ExtendedNote, NoteStatus, type PXE, type TxHash } from '@aztec/circuit-types';
-import { type AztecAddress, type Fr } from '@aztec/circuits.js';
-import { siloNullifier } from '@aztec/circuits.js/hash';
-import { type LogFn } from '@aztec/foundation/log';
+import type { AztecAddress, ContractArtifact, Fr } from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { siloNullifier } from '@aztec/stdlib/hash';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import { type ExtendedNote, NoteStatus } from '@aztec/stdlib/note';
+import type { TxHash } from '@aztec/stdlib/tx';
 
 export async function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, opts: { showTxs?: boolean } = {}) {
   const block = await pxe.getBlock(blockNumber);
@@ -184,7 +185,7 @@ async function getKnownArtifacts(pxe: PXE): Promise<ArtifactMap> {
   const knownContracts = (
     await Promise.all(knownContractAddresses.map(contractAddress => pxe.getContractMetadata(contractAddress)))
   ).map(contractMetadata => contractMetadata.contractInstance);
-  const classIds = [...new Set(knownContracts.map(contract => contract?.contractClassId))];
+  const classIds = [...new Set(knownContracts.map(contract => contract?.currentContractClassId))];
   const knownArtifacts = (
     await Promise.all(classIds.map(classId => (classId ? pxe.getContractClassMetadata(classId) : undefined)))
   ).map(contractClassMetadata =>
@@ -196,7 +197,7 @@ async function getKnownArtifacts(pxe: PXE): Promise<ArtifactMap> {
   for (const instance of knownContracts) {
     if (instance) {
       const artifact = knownArtifacts.find(a =>
-        a?.classId?.equals(instance.contractClassId),
+        a?.classId?.equals(instance.currentContractClassId),
       ) as ContractArtifactWithClassId;
       if (artifact) {
         map[instance.address.toString()] = artifact;

package/dest/cmds/infrastructure/setup_protocol_contract.js

@@ -1,31 +0,0 @@
-import { SignerlessWallet, createPXEClient, makeFetch } from '@aztec/aztec.js';
-import { DefaultMultiCallEntrypoint } from '@aztec/aztec.js/entrypoint';
-import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { setupCanonicalL2FeeJuice } from '../misc/setup_contracts.js';
-export async function setupProtocolContracts(rpcUrl, l1ChainId, json, skipProofWait, log) {
-    const waitOpts = {
-        timeout: 180,
-        interval: 1,
-        proven: !skipProofWait,
-        provenTimeout: 600
-    };
-    log('setupProtocolContracts: Wait options' + jsonStringify(waitOpts));
-    log('setupProtocolContracts: Creating PXE client...');
-    const pxe = createPXEClient(rpcUrl, makeFetch([
-        1,
-        1,
-        1,
-        1,
-        1
-    ], false));
-    const wallet = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(l1ChainId, 1));
-    log('setupProtocolContracts: Getting fee juice portal address...');
-    // Deploy Fee Juice
-    const feeJuicePortalAddress = (await wallet.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
-    log('setupProtocolContracts: Setting up fee juice portal...');
-    await setupCanonicalL2FeeJuice(wallet, feeJuicePortalAddress, waitOpts, log);
-    if (json) {
-        log(JSON.stringify(ProtocolContractAddress, null, 2));
-    }
-}

package/src/cmds/infrastructure/setup_protocol_contract.ts

@@ -1,36 +0,0 @@
-import { SignerlessWallet, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
-import { DefaultMultiCallEntrypoint } from '@aztec/aztec.js/entrypoint';
-import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { type LogFn } from '@aztec/foundation/log';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-
-import { setupCanonicalL2FeeJuice } from '../misc/setup_contracts.js';
-
-export async function setupProtocolContracts(
-  rpcUrl: string,
-  l1ChainId: number,
-  json: boolean,
-  skipProofWait: boolean,
-  log: LogFn,
-) {
-  const waitOpts: WaitOpts = {
-    timeout: 180,
-    interval: 1,
-    proven: !skipProofWait,
-    provenTimeout: 600,
-  };
-  log('setupProtocolContracts: Wait options' + jsonStringify(waitOpts));
-  log('setupProtocolContracts: Creating PXE client...');
-  const pxe = createPXEClient(rpcUrl, makeFetch([1, 1, 1, 1, 1], false));
-  const wallet = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(l1ChainId, 1));
-
-  log('setupProtocolContracts: Getting fee juice portal address...');
-  // Deploy Fee Juice
-  const feeJuicePortalAddress = (await wallet.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
-  log('setupProtocolContracts: Setting up fee juice portal...');
-  await setupCanonicalL2FeeJuice(wallet, feeJuicePortalAddress, waitOpts, log);
-
-  if (json) {
-    log(JSON.stringify(ProtocolContractAddress, null, 2));
-  }
-}