@aztec/cli-wallet 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/cmds/simulate.js

@@ -1,26 +1,32 @@
-import { Contract } from '@aztec/aztec.js';
+import { Contract } from '@aztec/aztec.js/contracts';
 import { prepTx } from '@aztec/cli/utils';
 import { format } from 'util';
-function printProfileResult(result, log) {
-    log(format('\nSimulation result:'));
-    log(format('Return value:', JSON.stringify(result.returnValues, null, 2)));
-    log(format('\nGate count per circuit:'));
-    let acc = 0;
-    result.gateCounts.forEach((r)=>{
-        acc += r.gateCount;
-        log(format('  ', r.circuitName.padEnd(50), 'Gates:', r.gateCount.toLocaleString(), '\tAcc:', acc.toLocaleString()));
-    });
-    log(format('\nTotal gates:', acc.toLocaleString()));
-}
-export async function simulate(wallet, functionName, functionArgsIn, contractArtifactPath, contractAddress, profile, log) {
+import { printAuthorizations } from '../utils/authorizations.js';
+import { printProfileResult } from '../utils/profiling.js';
+export async function simulate(wallet, node, from, functionName, functionArgsIn, contractArtifactPath, contractAddress, feeOpts, authWitnesses, verbose, log) {
     const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     const contract = await Contract.at(contractAddress, contractArtifact, wallet);
     const call = contract.methods[functionName](...functionArgs);
-    if (profile) {
-        const result = await call.simulateWithProfile();
-        printProfileResult(result, log);
-    } else {
-        const result = await call.simulate();
-        log(format('\nSimulation result: ', result, '\n'));
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, from);
+    const simulationResult = await call.simulate({
+        fee: {
+            paymentMethod,
+            gasSettings
+        },
+        from,
+        authWitnesses,
+        includeMetadata: true
+    });
+    if (verbose) {
+        await printAuthorizations(simulationResult.offchainEffects, async (address)=>{
+            const metadata = await wallet.getContractMetadata(address);
+            if (!metadata.contractInstance) {
+                return undefined;
+            }
+            const classMetadata = await wallet.getContractClassMetadata(metadata.contractInstance.currentContractClassId, true);
+            return classMetadata.artifact;
+        }, log);
+        printProfileResult(simulationResult.stats, log);
     }
+    log(format('\nSimulation result: ', simulationResult.result, '\n'));
 }

package/dest/storage/wallet_db.d.ts

@@ -1,13 +1,10 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { GasSettings } from '@aztec/stdlib/gas';
 import type { TxHash } from '@aztec/stdlib/tx';
-import type { AccountType } from '../utils/accounts.js';
+import type { AccountType } from '../utils/wallet.js';
 export declare const Aliases: readonly ["accounts", "contracts", "artifacts", "secrets", "transactions", "authwits"];
 export type AliasType = (typeof Aliases)[number];
 export declare class WalletDB {
@@ -33,18 +30,9 @@ export declare class WalletDB {
     storeSender(address: AztecAddress, alias: string, log: LogFn): Promise<void>;
     storeContract(address: AztecAddress, artifactPath: string, log: LogFn, alias?: string): Promise<void>;
     storeAuthwitness(authWit: AuthWitness, log: LogFn, alias?: string): Promise<void>;
-    storeTx({ txHash, nonce, cancellable, gasSettings, }: {
+    storeTx({ txHash }: {
         txHash: TxHash;
-        nonce: Fr;
-        cancellable: boolean;
-        gasSettings: GasSettings;
     }, log: LogFn, alias?: string): Promise<void>;
-    retrieveTxData(txHash: TxHash): Promise<{
-        txHash: TxHash;
-        nonce: Fr;
-        cancellable: boolean;
-        gasSettings: GasSettings;
-    }>;
     tryRetrieveAlias(arg: string): string;
     retrieveAliasFromCache(arg: string): string;
     retrieveAlias(arg: string): Promise<string>;
@@ -53,12 +41,12 @@ export declare class WalletDB {
         value: string;
     }[]>;
     storeAccountMetadata(aliasOrAddress: AztecAddress | string, metadataKey: string, metadata: Buffer): Promise<void>;
-    retrieveAccountMetadata(aliasOrAddress: AztecAddress | string, metadataKey: string): Promise<Buffer>;
+    retrieveAccountMetadata(aliasOrAddress: AztecAddress | string, metadataKey: string): Promise<Buffer<ArrayBufferLike>>;
     retrieveAccount(address: AztecAddress | string): Promise<{
         address: string | AztecAddress;
         secretKey: Fr;
         salt: Fr;
-        type: "schnorr" | "ecdsasecp256r1ssh" | "ecdsasecp256k1";
+        type: "schnorr" | "ecdsasecp256r1" | "ecdsasecp256r1ssh" | "ecdsasecp256k1";
     }>;
     storeAlias(type: AliasType, key: string, value: Buffer, log: LogFn): Promise<void>;
 }

package/dest/storage/wallet_db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet_db.d.ts","sourceRoot":"","sources":["../../src/storage/wallet_db.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,eAAO,MAAM,OAAO,wFAAyF,CAAC;AAC9G,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,qBAAa,QAAQ;;IAMnB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAW;IAElC,OAAO,CAAC,UAAU,CAA6B;IAE/C,MAAM,CAAC,WAAW;IAQZ,IAAI,CAAC,KAAK,EAAE,iBAAiB;YASrB,iBAAiB;IAIzB,mBAAmB,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK;IAWtG,kBAAkB,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK;;;;;IActD,YAAY,CAChB,OAAO,EAAE,YAAY,EACrB,EACE,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,KAAK,EACL,SAAS,GACV,EAAE;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,SAAS,EAAE,EAAE,CAAC;QAAC,IAAI,EAAE,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,EAC3G,GAAG,EAAE,KAAK;IAkBN,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK;IAO5D,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;IAarF,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;IAUjE,OAAO,CACX,EACE,MAAM,EACN,KAAK,EACL,WAAW,EACX,WAAW,GACZ,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,EAAE,CAAC;QAAC,WAAW,EAAE,OAAO,CAAC;QAAC,WAAW,EAAE,WAAW,CAAA;KAAE,EAChF,GAAG,EAAE,KAAK,EACV,KAAK,CAAC,EAAE,MAAM;IAcV,cAAc,CAAC,MAAM,EAAE,MAAM;;;;;;IAanC,gBAAgB,CAAC,GAAG,EAAE,MAAM;IAQrB,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAcnC,aAAa,CAAC,GAAG,EAAE,MAAM;IAazB,WAAW,CAAC,IAAI,CAAC,EAAE,SAAS;;;;IAa5B,oBAAoB,CAAC,cAAc,EAAE,YAAY,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAKjG,uBAAuB,CAAC,cAAc,EAAE,YAAY,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM;IASlF,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;;;;;;IAW9C,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK;CAOzE"}
+{"version":3,"file":"wallet_db.d.ts","sourceRoot":"","sources":["../../src/storage/wallet_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,eAAO,MAAM,OAAO,wFAAyF,CAAC;AAC9G,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,qBAAa,QAAQ;;IAKnB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAW;IAElC,OAAO,CAAC,UAAU,CAA6B;IAE/C,MAAM,CAAC,WAAW;IAQZ,IAAI,CAAC,KAAK,EAAE,iBAAiB;YAQrB,iBAAiB;IAIzB,mBAAmB,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK;IAWtG,kBAAkB,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK;;;;;IActD,YAAY,CAChB,OAAO,EAAE,YAAY,EACrB,EACE,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,KAAK,EACL,SAAS,GACV,EAAE;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,SAAS,EAAE,EAAE,CAAC;QAAC,IAAI,EAAE,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,EAC3G,GAAG,EAAE,KAAK;IAkBN,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK;IAO5D,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;IAarF,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;IAUjE,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;IAUxE,gBAAgB,CAAC,GAAG,EAAE,MAAM;IAQrB,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAcnC,aAAa,CAAC,GAAG,EAAE,MAAM;IAazB,WAAW,CAAC,IAAI,CAAC,EAAE,SAAS;;;;IAa5B,oBAAoB,CAAC,cAAc,EAAE,YAAY,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAKjG,uBAAuB,CAAC,cAAc,EAAE,YAAY,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM;IASlF,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;;;;;;IAW9C,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK;CAOzE"}

package/dest/storage/wallet_db.js

@@ -1,5 +1,4 @@
 import { Fr } from '@aztec/foundation/fields';
-import { GasSettings } from '@aztec/stdlib/gas';
 import { extractECDSAPublicKeyFromBase64String } from '../utils/ecdsa.js';
 export const Aliases = [
     'accounts',
@@ -13,7 +12,6 @@ export class WalletDB {
     #accounts;
     #aliases;
     #bridgedFeeJuice;
-    #transactions;
     static instance;
     aliasCache = new Map();
     static getInstance() {
@@ -26,7 +24,6 @@ export class WalletDB {
         this.#accounts = store.openMap('accounts');
         this.#aliases = store.openMap('aliases');
         this.#bridgedFeeJuice = store.openMap('bridgedFeeJuice');
-        this.#transactions = store.openMap('transactions');
         await this.refreshAliasCache();
     }
     async refreshAliasCache() {
@@ -100,36 +97,18 @@ export class WalletDB {
         log(`Authorization witness stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
         await this.refreshAliasCache();
     }
-    async storeTx({ txHash, nonce, cancellable, gasSettings }, log, alias) {
+    async storeTx({ txHash }, log, alias) {
         if (alias) {
             await this.#aliases.set(`transactions:${alias}`, Buffer.from(txHash.toString()));
         }
-        await this.#transactions.set(`${txHash.toString()}:nonce`, nonce.toBuffer());
-        await this.#transactions.set(`${txHash.toString()}:cancellable`, Buffer.from(cancellable ? 'true' : 'false'));
-        await this.#transactions.set(`${txHash.toString()}:gasSettings`, gasSettings.toBuffer());
         await this.#aliases.set(`transactions:last`, Buffer.from(txHash.toString()));
         log(`Transaction hash stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
         await this.refreshAliasCache();
     }
-    async retrieveTxData(txHash) {
-        const nonceBuffer = await this.#transactions.getAsync(`${txHash.toString()}:nonce`);
-        if (!nonceBuffer) {
-            throw new Error(`Could not find ${txHash.toString()}:nonce. Transaction with hash "${txHash.toString()}" does not exist on this wallet.`);
-        }
-        const nonce = Fr.fromBuffer(nonceBuffer);
-        const cancellable = (await this.#transactions.getAsync(`${txHash.toString()}:cancellable`)).toString() === 'true';
-        const gasBuffer = await this.#transactions.getAsync(`${txHash.toString()}:gasSettings`);
-        return {
-            txHash,
-            nonce,
-            cancellable,
-            gasSettings: GasSettings.fromBuffer(gasBuffer)
-        };
-    }
     tryRetrieveAlias(arg) {
         try {
             return this.retrieveAliasFromCache(arg);
-        } catch (e) {
+        } catch  {
             return arg;
         }
     }

package/dest/utils/authorizations.d.ts

@@ -0,0 +1,6 @@
+import type { ContractArtifact } from '@aztec/aztec.js/abi';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { LogFn } from '@aztec/foundation/log';
+import type { OffchainEffect } from '@aztec/stdlib/tx';
+export declare function printAuthorizations(offchainEffects: OffchainEffect[], artifactRetriever: (address: AztecAddress) => Promise<ContractArtifact | undefined>, log: LogFn): Promise<void>;
+//# sourceMappingURL=authorizations.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"authorizations.d.ts","sourceRoot":"","sources":["../../src/utils/authorizations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,cAAc,EAAE,EACjC,iBAAiB,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,EACnF,GAAG,EAAE,KAAK,iBAsCX"}

package/dest/utils/authorizations.js

@@ -0,0 +1,28 @@
+import { CallAuthorizationRequest } from '@aztec/aztec.js/authorization';
+import { decodeFromAbi, getFunctionArtifact } from '@aztec/stdlib/abi';
+import { format } from 'util';
+export async function printAuthorizations(offchainEffects, artifactRetriever, log) {
+    log(format('\nAuthorizations requested by the tx:\n'));
+    const callAuthorizationSelector = await CallAuthorizationRequest.getSelector();
+    const callAuthorizationEffects = offchainEffects.filter((effect)=>effect.data[0].equals(callAuthorizationSelector.toField()));
+    for (const callAuthorizationEffect of callAuthorizationEffects){
+        const callAuthorizationRequest = await CallAuthorizationRequest.fromFields(callAuthorizationEffect.data);
+        const artifact = await artifactRetriever(callAuthorizationEffect.contractAddress);
+        if (!artifact) {
+            log(format(' -', `Call authorization. Inner hash: ${callAuthorizationRequest.innerHash.toString()}\n`));
+            log(format('  ', `Contract: unknown@${callAuthorizationEffect.contractAddress}`));
+            log(format(' ', `${callAuthorizationRequest.functionSelector.toString()}(\n${callAuthorizationRequest.args.map((arg)=>`    ${arg.toString()}`).join(',\n')}\n  )`));
+        } else {
+            const functionAbi = await getFunctionArtifact(artifact, callAuthorizationRequest.functionSelector);
+            const callData = decodeFromAbi(functionAbi.parameters.map((param)=>param.type), callAuthorizationRequest.args);
+            const parameters = functionAbi.parameters.map((param, i)=>({
+                    name: param.name,
+                    value: callData[i]
+                }));
+            log(format(' -', `Call authorization. Inner hash: ${callAuthorizationRequest.innerHash.toString()}`));
+            log(format('  ', `Contract: ${artifact.name}@${callAuthorizationEffect.contractAddress}`));
+            log(format('  ', /* eslint-disable-next-line @typescript-eslint/no-base-to-string */ `${functionAbi.name}(\n${parameters.map((p)=>`    ${p.name}: ${p.value}`).join(',\n')}\n  )`));
+        }
+        log(`\n`);
+    }
+}

package/dest/utils/cli_wallet_and_node_wrapper.d.ts

@@ -0,0 +1,12 @@
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import { CLIWallet } from './wallet.js';
+export declare const DEFAULT_TX_TIMEOUT_S = 180;
+export declare class CliWalletAndNodeWrapper {
+    private _wallet;
+    private _node;
+    constructor();
+    get wallet(): CLIWallet;
+    get node(): AztecNode;
+    setNodeAndWallet(node: AztecNode, wallet: CLIWallet): void;
+}
+//# sourceMappingURL=cli_wallet_and_node_wrapper.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cli_wallet_and_node_wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/cli_wallet_and_node_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,eAAO,MAAM,oBAAoB,MAAM,CAAC;AAMxC,qBAAa,uBAAuB;IAClC,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,KAAK,CAAwB;;IAIrC,IAAI,MAAM,cAKT;IAED,IAAI,IAAI,cAKP;IAED,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;CAIpD"}

package/dest/utils/cli_wallet_and_node_wrapper.js

@@ -0,0 +1,25 @@
+export const DEFAULT_TX_TIMEOUT_S = 180;
+/*
+ * Wrapper class for CLIWallet and AztecNode, avoids initialization issues due to closures when providing CLIWallet
+ * and AztecNode to injected commander.js commands
+ */ export class CliWalletAndNodeWrapper {
+    _wallet;
+    _node;
+    constructor(){}
+    get wallet() {
+        if (!this._wallet) {
+            throw new Error('Wallet not initialized while it should have been initialized in preSubcommand');
+        }
+        return this._wallet;
+    }
+    get node() {
+        if (!this._node) {
+            throw new Error('Node not initialized while it should have been initialized in preSubcommand');
+        }
+        return this._node;
+    }
+    setNodeAndWallet(node, wallet) {
+        this._node = node;
+        this._wallet = wallet;
+    }
+}

package/dest/utils/ecdsa.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 export declare function extractECDSAPublicKeyFromBase64String(base64PublicKey: string): Buffer;
 //# sourceMappingURL=ecdsa.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ecdsa.d.ts","sourceRoot":"","sources":["../../src/utils/ecdsa.ts"],"names":[],"mappings":";;AAAA,wBAAgB,qCAAqC,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAcrF"}
+{"version":3,"file":"ecdsa.d.ts","sourceRoot":"","sources":["../../src/utils/ecdsa.ts"],"names":[],"mappings":"AAAA,wBAAgB,qCAAqC,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAcrF"}

package/dest/utils/options/fees.d.ts

@@ -1,41 +1,34 @@
-import { type AccountWallet, type DeployAccountOptions, type FeePaymentMethod, type PXE, type SendMethodOptions } from '@aztec/aztec.js';
+import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { FeeOptions, Wallet } from '@aztec/aztec.js/wallet';
 import type { LogFn } from '@aztec/foundation/log';
+import type { FieldsOf } from '@aztec/foundation/types';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
 import { Option } from 'commander';
 import type { WalletDB } from '../../storage/wallet_db.js';
-export type CliFeeArgs = {
+export type RawCliFeeArgs = {
     estimateGasOnly: boolean;
     gasLimits?: string;
     payment?: string;
     maxFeesPerGas?: string;
     maxPriorityFeesPerGas?: string;
-    estimateGas?: boolean;
 };
-export interface IFeeOpts {
-    estimateOnly: boolean;
-    gasSettings: GasSettings;
-    toSendOpts(sender: AccountWallet): Promise<SendMethodOptions>;
-    toDeployAccountOpts(sender: AccountWallet): Promise<DeployAccountOptions>;
-}
-export declare function printGasEstimates(feeOpts: IFeeOpts, gasEstimates: Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>, log: LogFn): void;
-export declare class FeeOpts implements IFeeOpts {
+export type ParsedFeeOptions = {
+    paymentMethod?: FeePaymentMethod;
+    gasSettings?: Partial<FieldsOf<GasSettings>>;
+};
+export declare function getPaymentMethodOption(): Option;
+export declare function parsePaymentMethod(payment: string, log: LogFn, db?: WalletDB): (wallet: Wallet, from: AztecAddress, gasSettings: GasSettings) => Promise<FeePaymentMethod | undefined>;
+export declare function parseGasFees(gasFees: string): GasFees;
+export declare class CLIFeeArgs {
     estimateOnly: boolean;
-    gasSettings: GasSettings;
-    private paymentMethodFactory;
-    private getDeployWallet;
-    private estimateGas;
-    constructor(estimateOnly: boolean, gasSettings: GasSettings, paymentMethodFactory: (sender: AccountWallet) => Promise<FeePaymentMethod>, getDeployWallet: (sender: AccountWallet, paymentMethod: FeePaymentMethod) => Promise<AccountWallet | undefined>, estimateGas: boolean);
-    toSendOpts(sender: AccountWallet): Promise<SendMethodOptions>;
-    toDeployAccountOpts(sender: AccountWallet): Promise<DeployAccountOptions>;
-    static paymentMethodOption(): Option;
+    private paymentMethod;
+    private gasSettings;
+    constructor(estimateOnly: boolean, paymentMethod: (wallet: Wallet, feePayer: AztecAddress, gasSettings: GasSettings) => Promise<FeePaymentMethod | undefined>, gasSettings: Partial<FieldsOf<GasSettings>>);
+    toUserFeeOptions(node: AztecNode, wallet: Wallet, from: AztecAddress): Promise<ParsedFeeOptions>;
+    static parse(args: RawCliFeeArgs, log: LogFn, db?: WalletDB): CLIFeeArgs;
     static getOptions(): Option[];
-    static fromCli(args: CliFeeArgs, pxe: PXE, log: LogFn, db?: WalletDB): Promise<FeeOpts>;
 }
-export declare class FeeOptsWithFeePayer extends FeeOpts {
-    static paymentMethodOption(): Option;
-    static getOptions(): Option[];
-    static fromCli(args: CliFeeArgs, pxe: PXE, log: LogFn, db?: WalletDB): Promise<FeeOptsWithFeePayer>;
-}
-export declare function parsePaymentMethod(payment: string, allowCustomFeePayer: boolean, log: LogFn, db?: WalletDB): (sender: AccountWallet) => Promise<FeePaymentMethod>;
-export declare function parseGasFees(gasFees: string): GasFees;
+export declare function printGasEstimates(feeOpts: FeeOptions, gasEstimates: Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>, log: LogFn): void;
 //# sourceMappingURL=fees.d.ts.map

package/dest/utils/options/fees.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACR,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC3E;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX;AAuGD,qBAAa,OAAQ,YAAW,QAAQ;IAE7B,YAAY,EAAE,OAAO;IACrB,WAAW,EAAE,WAAW;IAC/B,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;gBAPZ,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,WAAW,EACvB,oBAAoB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,EAC1E,eAAe,EAAE,CACvB,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gBAAgB,KAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,EAC/B,WAAW,EAAE,OAAO;IAGxB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAU7D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa/E,MAAM,CAAC,mBAAmB;IAI1B,MAAM,CAAC,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CAsB3E;AAED,qBAAa,mBAAoB,SAAQ,OAAO;WAC9B,mBAAmB;WAInB,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CA2BpF;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,mBAAmB,EAAE,OAAO,EAC5B,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,GACZ,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAwEtD;AAsBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAerD"}
+{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;CAC9C,CAAC;AAyDF,wBAAgB,sBAAsB,WAGrC;AA0BD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,GACZ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CA+EzG;AAyBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAkBrD;AACD,qBAAa,UAAU;IAEZ,YAAY,EAAE,OAAO;IAC5B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,WAAW;gBANZ,YAAY,EAAE,OAAO,EACpB,aAAa,EAAE,CACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,EAClC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAG/C,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUtG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,UAAU;IAQxE,MAAM,CAAC,UAAU;CAGlB;AAID,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX"}