@aztec/cli-wallet 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

package/dest/cmds/cancel_tx.js

@@ -1,43 +0,0 @@
-import { SentTx, TxStatus } from '@aztec/aztec.js';
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { GasFees, GasSettings } from '@aztec/stdlib/gas';
-import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
-export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings, txNonce, cancellable }, paymentMethod, increasedFees, maxFeesPerGas, log) {
-    const receipt = await wallet.getTxReceipt(txHash);
-    if (receipt.status !== TxStatus.PENDING || !cancellable) {
-        log(`Transaction is in status ${receipt.status} and cannot be cancelled`);
-        return;
-    }
-    const maxPriorityFeesPerGas = new GasFees(prevTxGasSettings.maxPriorityFeesPerGas.feePerDaGas + increasedFees.feePerDaGas, prevTxGasSettings.maxPriorityFeesPerGas.feePerL2Gas + increasedFees.feePerL2Gas);
-    const fee = {
-        paymentMethod,
-        gasSettings: GasSettings.from({
-            ...prevTxGasSettings,
-            maxPriorityFeesPerGas,
-            maxFeesPerGas: maxFeesPerGas ?? prevTxGasSettings.maxFeesPerGas
-        })
-    };
-    const txRequest = await wallet.createTxExecutionRequest(ExecutionPayload.empty(), fee, {
-        txNonce,
-        cancellable: true
-    });
-    const txSimulationResult = await wallet.simulateTx(txRequest, true);
-    const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
-    const sentTx = new SentTx(wallet, async ()=>{
-        const tx = await txProvingResult.toTx();
-        return wallet.sendTx(tx);
-    });
-    try {
-        await sentTx.wait({
-            timeout: DEFAULT_TX_TIMEOUT_S
-        });
-        log('Transaction has been cancelled');
-        const cancelReceipt = await sentTx.getReceipt();
-        log(` Tx fee: ${cancelReceipt.transactionFee}`);
-        log(` Status: ${cancelReceipt.status}`);
-        log(` Block number: ${cancelReceipt.blockNumber}`);
-        log(` Block hash: ${cancelReceipt.blockHash?.toString()}`);
-    } catch (err) {
-        log(`Could not cancel transaction\n ${err.message}`);
-    }
-}

package/dest/utils/accounts.d.ts

@@ -1,9 +0,0 @@
-import type { AccountManager } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
-import type { WalletDB } from '../storage/wallet_db.js';
-export declare const AccountTypes: readonly ["schnorr", "ecdsasecp256r1", "ecdsasecp256r1ssh", "ecdsasecp256k1"];
-export type AccountType = (typeof AccountTypes)[number];
-export declare function createOrRetrieveAccount(pxe: PXE, address?: AztecAddress, db?: WalletDB, secretKey?: Fr, type?: AccountType, salt?: Fr, publicKey?: string): Promise<AccountManager>;
-//# sourceMappingURL=accounts.d.ts.map

package/dest/utils/accounts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/utils/accounts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,eAAO,MAAM,YAAY,+EAAgF,CAAC;AAC1G,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,YAAY,EACtB,EAAE,CAAC,EAAE,QAAQ,EACb,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,GAAE,WAAuB,EAC7B,IAAI,CAAC,EAAE,EAAE,EACT,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC,CAuDzB"}

package/dest/utils/accounts.js

@@ -1,61 +0,0 @@
-import { getIdentities } from '@aztec/accounts/utils';
-import { Fr } from '@aztec/foundation/fields';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
-export const AccountTypes = [
-    'schnorr',
-    'ecdsasecp256r1',
-    'ecdsasecp256r1ssh',
-    'ecdsasecp256k1'
-];
-export async function createOrRetrieveAccount(pxe, address, db, secretKey, type = 'schnorr', salt, publicKey) {
-    let account;
-    salt ??= Fr.ZERO;
-    if (db && address) {
-        ({ type, secretKey, salt } = await db.retrieveAccount(address));
-    }
-    if (!salt) {
-        throw new Error('Cannot retrieve/create wallet without salt');
-    }
-    if (!secretKey) {
-        throw new Error('Cannot retrieve/create wallet without secret key');
-    }
-    switch(type){
-        case 'schnorr':
-            {
-                const { getSchnorrAccount } = await import('@aztec/accounts/schnorr');
-                account = getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
-                break;
-            }
-        case 'ecdsasecp256r1':
-            {
-                const { getEcdsaRAccount } = await import('@aztec/accounts/ecdsa');
-                account = getEcdsaRAccount(pxe, secretKey, deriveSigningKey(secretKey).toBuffer(), salt);
-                break;
-            }
-        case 'ecdsasecp256r1ssh':
-            {
-                let publicSigningKey;
-                if (db && address) {
-                    publicSigningKey = await db.retrieveAccountMetadata(address, 'publicSigningKey');
-                } else if (publicKey) {
-                    const identities = await getIdentities();
-                    const foundIdentity = identities.find((identity)=>identity.type === 'ecdsa-sha2-nistp256' && identity.publicKey === publicKey);
-                    if (!foundIdentity) {
-                        throw new Error(`Identity for public key ${publicKey} not found in the SSH agent`);
-                    }
-                    publicSigningKey = extractECDSAPublicKeyFromBase64String(foundIdentity.publicKey);
-                } else {
-                    throw new Error('Public key must be provided for ECDSA SSH account');
-                }
-                const { getEcdsaRSSHAccount } = await import('@aztec/accounts/ecdsa');
-                account = getEcdsaRSSHAccount(pxe, secretKey, publicSigningKey, salt);
-                break;
-            }
-        default:
-            {
-                throw new Error(`Unsupported account type: ${type}`);
-            }
-    }
-    return account;
-}

package/dest/utils/pxe_wrapper.d.ts

@@ -1,12 +0,0 @@
-import { type PXEServiceConfig } from '@aztec/pxe/server';
-import { type AztecNode, type PXE } from '@aztec/stdlib/interfaces/client';
-export declare const DEFAULT_TX_TIMEOUT_S = 180;
-export declare class PXEWrapper {
-    private static pxeConfig;
-    private static pxe;
-    private static node;
-    getPXE(): Promise<PXE>;
-    getNode(): AztecNode | undefined;
-    prepare(nodeUrl: string, dataDir: string, overridePXEServiceConfig?: Partial<PXEServiceConfig>): void;
-}
-//# sourceMappingURL=pxe_wrapper.d.ts.map

package/dest/utils/pxe_wrapper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pxe_wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/pxe_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,GAAG,EAAyB,MAAM,iCAAiC,CAAC;AAElG,eAAO,MAAM,oBAAoB,MAAM,CAAC;AAMxC,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,SAAS,CAA+B;IACvD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAwB;IAErC,MAAM;IAOZ,OAAO,IAAI,SAAS,GAAG,SAAS;IAIhC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;CAM/F"}

package/dest/utils/pxe_wrapper.js

@@ -1,26 +0,0 @@
-import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
-import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
-export const DEFAULT_TX_TIMEOUT_S = 180;
-/*
- * Wrapper class for PXE service, avoids initialization issues due to
- * closures when providing PXE service to injected commander.js commands
- */ export class PXEWrapper {
-    static pxeConfig;
-    static pxe;
-    static node;
-    async getPXE() {
-        if (!PXEWrapper.pxe) {
-            PXEWrapper.pxe = await createPXEService(PXEWrapper.node, PXEWrapper.pxeConfig);
-        }
-        return PXEWrapper.pxe;
-    }
-    getNode() {
-        return PXEWrapper.node;
-    }
-    prepare(nodeUrl, dataDir, overridePXEServiceConfig) {
-        PXEWrapper.node = createAztecNodeClient(nodeUrl);
-        const pxeConfig = Object.assign(getPXEServiceConfig(), overridePXEServiceConfig);
-        pxeConfig.dataDirectory = dataDir;
-        PXEWrapper.pxeConfig = pxeConfig;
-    }
-}

package/src/cmds/cancel_tx.ts

@@ -1,66 +0,0 @@
-import { type AccountWalletWithSecretKey, type FeePaymentMethod, SentTx, type TxHash, TxStatus } from '@aztec/aztec.js';
-import type { FeeOptions } from '@aztec/entrypoints/interfaces';
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { Fr } from '@aztec/foundation/fields';
-import type { LogFn } from '@aztec/foundation/log';
-import { GasFees, GasSettings } from '@aztec/stdlib/gas';
-
-import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
-
-export async function cancelTx(
-  wallet: AccountWalletWithSecretKey,
-  {
-    txHash,
-    gasSettings: prevTxGasSettings,
-    txNonce,
-    cancellable,
-  }: { txHash: TxHash; gasSettings: GasSettings; txNonce: Fr; cancellable: boolean },
-  paymentMethod: FeePaymentMethod,
-  increasedFees: GasFees,
-  maxFeesPerGas: GasFees | undefined,
-  log: LogFn,
-) {
-  const receipt = await wallet.getTxReceipt(txHash);
-  if (receipt.status !== TxStatus.PENDING || !cancellable) {
-    log(`Transaction is in status ${receipt.status} and cannot be cancelled`);
-    return;
-  }
-
-  const maxPriorityFeesPerGas = new GasFees(
-    prevTxGasSettings.maxPriorityFeesPerGas.feePerDaGas + increasedFees.feePerDaGas,
-    prevTxGasSettings.maxPriorityFeesPerGas.feePerL2Gas + increasedFees.feePerL2Gas,
-  );
-
-  const fee: FeeOptions = {
-    paymentMethod,
-    gasSettings: GasSettings.from({
-      ...prevTxGasSettings,
-      maxPriorityFeesPerGas,
-      maxFeesPerGas: maxFeesPerGas ?? prevTxGasSettings.maxFeesPerGas,
-    }),
-  };
-
-  const txRequest = await wallet.createTxExecutionRequest(ExecutionPayload.empty(), fee, {
-    txNonce,
-    cancellable: true,
-  });
-  const txSimulationResult = await wallet.simulateTx(txRequest, true);
-  const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
-  const sentTx = new SentTx(wallet, async () => {
-    const tx = await txProvingResult.toTx();
-    return wallet.sendTx(tx);
-  });
-  try {
-    await sentTx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
-
-    log('Transaction has been cancelled');
-
-    const cancelReceipt = await sentTx.getReceipt();
-    log(` Tx fee: ${cancelReceipt.transactionFee}`);
-    log(` Status: ${cancelReceipt.status}`);
-    log(` Block number: ${cancelReceipt.blockNumber}`);
-    log(` Block hash: ${cancelReceipt.blockHash?.toString()}`);
-  } catch (err: any) {
-    log(`Could not cancel transaction\n ${err.message}`);
-  }
-}

package/src/utils/accounts.ts

@@ -1,77 +0,0 @@
-import { getIdentities } from '@aztec/accounts/utils';
-import type { AccountManager } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-
-import type { WalletDB } from '../storage/wallet_db.js';
-import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
-
-export const AccountTypes = ['schnorr', 'ecdsasecp256r1', 'ecdsasecp256r1ssh', 'ecdsasecp256k1'] as const;
-export type AccountType = (typeof AccountTypes)[number];
-
-export async function createOrRetrieveAccount(
-  pxe: PXE,
-  address?: AztecAddress,
-  db?: WalletDB,
-  secretKey?: Fr,
-  type: AccountType = 'schnorr',
-  salt?: Fr,
-  publicKey?: string,
-): Promise<AccountManager> {
-  let account;
-
-  salt ??= Fr.ZERO;
-
-  if (db && address) {
-    ({ type, secretKey, salt } = await db.retrieveAccount(address));
-  }
-
-  if (!salt) {
-    throw new Error('Cannot retrieve/create wallet without salt');
-  }
-
-  if (!secretKey) {
-    throw new Error('Cannot retrieve/create wallet without secret key');
-  }
-
-  switch (type) {
-    case 'schnorr': {
-      const { getSchnorrAccount } = await import('@aztec/accounts/schnorr');
-      account = getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
-      break;
-    }
-    case 'ecdsasecp256r1': {
-      const { getEcdsaRAccount } = await import('@aztec/accounts/ecdsa');
-      account = getEcdsaRAccount(pxe, secretKey, deriveSigningKey(secretKey).toBuffer(), salt);
-      break;
-    }
-    case 'ecdsasecp256r1ssh': {
-      let publicSigningKey;
-      if (db && address) {
-        publicSigningKey = await db.retrieveAccountMetadata(address, 'publicSigningKey');
-      } else if (publicKey) {
-        const identities = await getIdentities();
-        const foundIdentity = identities.find(
-          identity => identity.type === 'ecdsa-sha2-nistp256' && identity.publicKey === publicKey,
-        );
-        if (!foundIdentity) {
-          throw new Error(`Identity for public key ${publicKey} not found in the SSH agent`);
-        }
-        publicSigningKey = extractECDSAPublicKeyFromBase64String(foundIdentity.publicKey);
-      } else {
-        throw new Error('Public key must be provided for ECDSA SSH account');
-      }
-
-      const { getEcdsaRSSHAccount } = await import('@aztec/accounts/ecdsa');
-      account = getEcdsaRSSHAccount(pxe, secretKey, publicSigningKey, salt);
-      break;
-    }
-    default: {
-      throw new Error(`Unsupported account type: ${type}`);
-    }
-  }
-
-  return account;
-}

package/src/utils/pxe_wrapper.ts

@@ -1,32 +0,0 @@
-import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
-import { type AztecNode, type PXE, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
-
-export const DEFAULT_TX_TIMEOUT_S = 180;
-
-/*
- * Wrapper class for PXE service, avoids initialization issues due to
- * closures when providing PXE service to injected commander.js commands
- */
-export class PXEWrapper {
-  private static pxeConfig: PXEServiceConfig | undefined;
-  private static pxe: PXE | undefined;
-  private static node: AztecNode | undefined;
-
-  async getPXE() {
-    if (!PXEWrapper.pxe) {
-      PXEWrapper.pxe = await createPXEService(PXEWrapper.node!, PXEWrapper.pxeConfig!);
-    }
-    return PXEWrapper.pxe;
-  }
-
-  getNode(): AztecNode | undefined {
-    return PXEWrapper.node;
-  }
-
-  prepare(nodeUrl: string, dataDir: string, overridePXEServiceConfig?: Partial<PXEServiceConfig>) {
-    PXEWrapper.node = createAztecNodeClient(nodeUrl);
-    const pxeConfig = Object.assign(getPXEServiceConfig(), overridePXEServiceConfig);
-    pxeConfig.dataDirectory = dataDir;
-    PXEWrapper.pxeConfig = pxeConfig;
-  }
-}