@aztec/wallet-sdk 0.0.1-commit.a072138 → 0.0.1-commit.a89ec08
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.
- package/dest/base-wallet/base_wallet.d.ts +61 -34
- package/dest/base-wallet/base_wallet.d.ts.map +1 -1
- package/dest/base-wallet/base_wallet.js +201 -66
- package/dest/base-wallet/index.d.ts +3 -2
- package/dest/base-wallet/index.d.ts.map +1 -1
- package/dest/base-wallet/index.js +1 -0
- package/dest/base-wallet/utils.d.ts +50 -0
- package/dest/base-wallet/utils.d.ts.map +1 -0
- package/dest/base-wallet/utils.js +133 -0
- package/dest/crypto.d.ts +39 -1
- package/dest/crypto.d.ts.map +1 -1
- package/dest/crypto.js +88 -0
- package/dest/extension/provider/extension_wallet.d.ts +4 -6
- package/dest/extension/provider/extension_wallet.d.ts.map +1 -1
- package/dest/extension/provider/extension_wallet.js +9 -2
- package/dest/extension/provider/index.d.ts +2 -2
- package/dest/extension/provider/index.d.ts.map +1 -1
- package/dest/iframe/handlers/iframe_connection_handler.d.ts +118 -0
- package/dest/iframe/handlers/iframe_connection_handler.d.ts.map +1 -0
- package/dest/iframe/handlers/iframe_connection_handler.js +228 -0
- package/dest/iframe/handlers/index.d.ts +2 -0
- package/dest/iframe/handlers/index.d.ts.map +1 -0
- package/dest/iframe/handlers/index.js +1 -0
- package/dest/iframe/provider/iframe_discovery.d.ts +25 -0
- package/dest/iframe/provider/iframe_discovery.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_discovery.js +167 -0
- package/dest/iframe/provider/iframe_provider.d.ts +65 -0
- package/dest/iframe/provider/iframe_provider.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_provider.js +257 -0
- package/dest/iframe/provider/iframe_wallet.d.ts +68 -0
- package/dest/iframe/provider/iframe_wallet.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_wallet.js +200 -0
- package/dest/iframe/provider/index.d.ts +4 -0
- package/dest/iframe/provider/index.d.ts.map +1 -0
- package/dest/iframe/provider/index.js +3 -0
- package/dest/manager/types.d.ts +6 -5
- package/dest/manager/types.d.ts.map +1 -1
- package/dest/manager/wallet_manager.d.ts +1 -1
- package/dest/manager/wallet_manager.d.ts.map +1 -1
- package/dest/manager/wallet_manager.js +48 -18
- package/dest/types.d.ts +14 -2
- package/dest/types.d.ts.map +1 -1
- package/dest/types.js +4 -0
- package/package.json +19 -9
- package/src/base-wallet/base_wallet.ts +284 -118
- package/src/base-wallet/index.ts +7 -1
- package/src/base-wallet/utils.ts +240 -0
- package/src/crypto.ts +104 -0
- package/src/extension/provider/extension_wallet.ts +13 -10
- package/src/extension/provider/index.ts +1 -1
- package/src/iframe/handlers/iframe_connection_handler.ts +328 -0
- package/src/iframe/handlers/index.ts +7 -0
- package/src/iframe/provider/iframe_discovery.ts +185 -0
- package/src/iframe/provider/iframe_provider.ts +331 -0
- package/src/iframe/provider/iframe_wallet.ts +229 -0
- package/src/iframe/provider/index.ts +3 -0
- package/src/manager/types.ts +5 -4
- package/src/manager/wallet_manager.ts +55 -23
- package/src/types.ts +13 -0
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { Account } from '@aztec/aztec.js/account';
|
|
1
|
+
import type { Account, NoFrom } from '@aztec/aztec.js/account';
|
|
2
2
|
import type { CallIntent, IntentInnerHash } from '@aztec/aztec.js/authorization';
|
|
3
3
|
import { type InteractionWaitOptions, type SendReturn } from '@aztec/aztec.js/contracts';
|
|
4
4
|
import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
|
|
5
|
-
import type
|
|
5
|
+
import { type Aliased, type AppCapabilities, type BatchResults, type BatchedMethod, ContractInitializationStatus, type ExecuteUtilityOptions, type PrivateEvent, type PrivateEventFilter, type ProfileOptions, type SendOptions, type SimulateOptions, TxSimulationResultWithAppOffset, type Wallet, type WalletCapabilities } from '@aztec/aztec.js/wallet';
|
|
6
6
|
import { AccountFeePaymentMethodOptions } from '@aztec/entrypoints/account';
|
|
7
7
|
import type { ChainInfo } from '@aztec/entrypoints/interfaces';
|
|
8
8
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
@@ -10,11 +10,11 @@ import type { FieldsOf } from '@aztec/foundation/types';
|
|
|
10
10
|
import type { PXE } from '@aztec/pxe/server';
|
|
11
11
|
import { type ContractArtifact, type EventMetadataDefinition, type FunctionCall } from '@aztec/stdlib/abi';
|
|
12
12
|
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
13
|
-
import
|
|
13
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
14
14
|
import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
15
15
|
import { GasSettings } from '@aztec/stdlib/gas';
|
|
16
16
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
17
|
-
import type
|
|
17
|
+
import { type TxExecutionRequest, type TxProfileResult, type UtilityExecutionResult } from '@aztec/stdlib/tx';
|
|
18
18
|
import { ExecutionPayload } from '@aztec/stdlib/tx';
|
|
19
19
|
/**
|
|
20
20
|
* Options to configure fee payment for a transaction
|
|
@@ -26,10 +26,26 @@ export type FeeOptions = {
|
|
|
26
26
|
*/
|
|
27
27
|
walletFeePaymentMethod?: FeePaymentMethod;
|
|
28
28
|
/** Configuration options for the account to properly handle the selected fee payment method */
|
|
29
|
-
accountFeePaymentMethodOptions
|
|
29
|
+
accountFeePaymentMethodOptions?: AccountFeePaymentMethodOptions;
|
|
30
30
|
/** The gas settings to use for the transaction */
|
|
31
31
|
gasSettings: GasSettings;
|
|
32
32
|
};
|
|
33
|
+
/** Options for `simulateViaEntrypoint`. */
|
|
34
|
+
export type SimulateViaEntrypointOptions = Pick<SimulateOptions, 'from' | 'additionalScopes' | 'skipTxValidation' | 'skipFeeEnforcement'> & {
|
|
35
|
+
/** Fee options for the entrypoint */
|
|
36
|
+
feeOptions: FeeOptions;
|
|
37
|
+
};
|
|
38
|
+
/** Options for `completeFeeOptions`. */
|
|
39
|
+
export type CompleteFeeOptionsConfig = {
|
|
40
|
+
/** The address where the transaction is being sent from. */
|
|
41
|
+
from: AztecAddress | NoFrom;
|
|
42
|
+
/** The address paying for fees (if any fee payment method is embedded in the execution payload). */
|
|
43
|
+
feePayer?: AztecAddress;
|
|
44
|
+
/** User-provided partial gas settings. */
|
|
45
|
+
gasSettings?: Partial<FieldsOf<GasSettings>>;
|
|
46
|
+
/** If true, returns gas settings with high gas limits for estimation. If false, uses fallback limits. */
|
|
47
|
+
forEstimation?: boolean;
|
|
48
|
+
};
|
|
33
49
|
/**
|
|
34
50
|
* A base class for Wallet implementations
|
|
35
51
|
*/
|
|
@@ -39,7 +55,9 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
39
55
|
protected log: import("@aztec/foundation/log").Logger;
|
|
40
56
|
protected minFeePadding: number;
|
|
41
57
|
protected cancellableTransactions: boolean;
|
|
42
|
-
|
|
58
|
+
private nodeInfoPromise;
|
|
59
|
+
protected constructor(pxe: PXE, aztecNode: AztecNode, log?: import("@aztec/foundation/log").Logger);
|
|
60
|
+
protected scopesFrom(from: AztecAddress | NoFrom, additionalScopes?: AztecAddress[]): AztecAddress[];
|
|
43
61
|
protected abstract getAccountFromAddress(address: AztecAddress): Promise<Account>;
|
|
44
62
|
abstract getAccounts(): Promise<Aliased<AztecAddress>[]>;
|
|
45
63
|
/**
|
|
@@ -51,7 +69,7 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
51
69
|
*/
|
|
52
70
|
getAddressBook(): Promise<Aliased<AztecAddress>[]>;
|
|
53
71
|
getChainInfo(): Promise<ChainInfo>;
|
|
54
|
-
protected createTxExecutionRequestFromPayloadAndFee(executionPayload: ExecutionPayload, from: AztecAddress, feeOptions: FeeOptions): Promise<TxExecutionRequest>;
|
|
72
|
+
protected createTxExecutionRequestFromPayloadAndFee(executionPayload: ExecutionPayload, from: AztecAddress | NoFrom, feeOptions: FeeOptions): Promise<TxExecutionRequest>;
|
|
55
73
|
createAuthWit(from: AztecAddress, messageHashOrIntent: IntentInnerHash | CallIntent): Promise<AuthWitness>;
|
|
56
74
|
/**
|
|
57
75
|
* Request capabilities from the wallet.
|
|
@@ -70,41 +88,50 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
70
88
|
batch<const T extends readonly BatchedMethod[]>(methods: T): Promise<BatchResults<T>>;
|
|
71
89
|
/**
|
|
72
90
|
* Completes partial user-provided fee options with wallet defaults.
|
|
73
|
-
* @param
|
|
74
|
-
* @param feePayer - The address paying for fees (if any fee payment method is embedded in the execution payload)
|
|
75
|
-
* @param gasSettings - User-provided partial gas settings
|
|
76
|
-
* @returns - Complete fee options that can be used to create a transaction execution request
|
|
77
|
-
*/
|
|
78
|
-
protected completeFeeOptions(from: AztecAddress, feePayer?: AztecAddress, gasSettings?: Partial<FieldsOf<GasSettings>>): Promise<FeeOptions>;
|
|
79
|
-
/**
|
|
80
|
-
* Completes partial user-provided fee options with unreasonably high gas limits
|
|
81
|
-
* for gas estimation. Uses the same logic as completeFeeOptions but sets high limits
|
|
82
|
-
* to avoid running out of gas during estimation.
|
|
83
|
-
* @param from - The address where the transaction is being sent from
|
|
84
|
-
* @param feePayer - The address paying for fees (if any fee payment method is embedded in the execution payload)
|
|
85
|
-
* @param gasSettings - User-provided partial gas settings
|
|
91
|
+
* @param config - Fee completion config.
|
|
86
92
|
*/
|
|
87
|
-
protected
|
|
88
|
-
/**
|
|
89
|
-
* A wallet-provided fallback fee payment method that is used only if the transaction that is being constructed
|
|
90
|
-
* doesn't already include one
|
|
91
|
-
*/
|
|
92
|
-
walletFeePaymentMethod?: FeePaymentMethod | undefined;
|
|
93
|
-
/** Configuration options for the account to properly handle the selected fee payment method */
|
|
94
|
-
accountFeePaymentMethodOptions: AccountFeePaymentMethodOptions;
|
|
95
|
-
gasSettings: GasSettings;
|
|
96
|
-
}>;
|
|
93
|
+
protected completeFeeOptions(config: CompleteFeeOptionsConfig): Promise<FeeOptions>;
|
|
97
94
|
registerSender(address: AztecAddress, _alias?: string): Promise<AztecAddress>;
|
|
98
95
|
registerContract(instance: ContractInstanceWithAddress, artifact?: ContractArtifact, secretKey?: Fr): Promise<ContractInstanceWithAddress>;
|
|
99
|
-
|
|
96
|
+
/**
|
|
97
|
+
* Simulates calls through the standard PXE path (account entrypoint).
|
|
98
|
+
* @param executionPayload - The execution payload to simulate.
|
|
99
|
+
* @param opts - Simulation options.
|
|
100
|
+
*/
|
|
101
|
+
protected simulateViaEntrypoint(executionPayload: ExecutionPayload, opts: SimulateViaEntrypointOptions): Promise<TxSimulationResultWithAppOffset>;
|
|
102
|
+
/**
|
|
103
|
+
* Computes the index where the app's calls begin in the flattened array of calls (0 = entrypoint/root, 1..N = fee
|
|
104
|
+
* calls, N+1 = app).
|
|
105
|
+
* @param from - The sender address, or NO_FROM for the default entrypoint.
|
|
106
|
+
* @param feeOptions - Fee options containing the wallet fee payment method.
|
|
107
|
+
*/
|
|
108
|
+
protected computeAppCallOffset(from: AztecAddress | NoFrom, feeOptions: FeeOptions): Promise<number>;
|
|
109
|
+
/**
|
|
110
|
+
* Simulates a transaction, optimizing leading public static calls by running them directly
|
|
111
|
+
* on the node while sending the remaining calls through the standard PXE path.
|
|
112
|
+
* Return values from both paths are merged back in original call order.
|
|
113
|
+
* @param executionPayload - The execution payload to simulate.
|
|
114
|
+
* @param opts - Simulation options (from address, fee settings, etc.).
|
|
115
|
+
* @returns The merged simulation result.
|
|
116
|
+
*/
|
|
117
|
+
simulateTx(executionPayload: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset>;
|
|
100
118
|
profileTx(executionPayload: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult>;
|
|
101
119
|
sendTx<W extends InteractionWaitOptions = undefined>(executionPayload: ExecutionPayload, opts: SendOptions<W>): Promise<SendReturn<W>>;
|
|
120
|
+
/**
|
|
121
|
+
* Resolves a contract address to a human-readable name via PXE, if available.
|
|
122
|
+
* @param address - The contract address to resolve.
|
|
123
|
+
*/
|
|
124
|
+
protected getContractName(address: AztecAddress): Promise<string | undefined>;
|
|
102
125
|
protected contextualizeError(err: Error, ...context: string[]): Error;
|
|
103
|
-
|
|
126
|
+
executeUtility(call: FunctionCall, opts: ExecuteUtilityOptions): Promise<UtilityExecutionResult>;
|
|
104
127
|
getPrivateEvents<T>(eventDef: EventMetadataDefinition, eventFilter: PrivateEventFilter): Promise<PrivateEvent<T>[]>;
|
|
128
|
+
/**
|
|
129
|
+
* Returns metadata about a contract, including whether it has been initialized, published, and updated.
|
|
130
|
+
* @param address - The contract address to query.
|
|
131
|
+
*/
|
|
105
132
|
getContractMetadata(address: AztecAddress): Promise<{
|
|
106
133
|
instance: ContractInstanceWithAddress | undefined;
|
|
107
|
-
|
|
134
|
+
initializationStatus: ContractInitializationStatus;
|
|
108
135
|
isContractPublished: boolean;
|
|
109
136
|
isContractUpdated: boolean;
|
|
110
137
|
updatedContractClassId: Fr | undefined;
|
|
@@ -114,4 +141,4 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
114
141
|
isContractClassPubliclyRegistered: boolean;
|
|
115
142
|
}>;
|
|
116
143
|
}
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
144
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV93YWxsZXQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9iYXNlX3dhbGxldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFL0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLGVBQWUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2pGLE9BQU8sRUFDTCxLQUFLLHNCQUFzQixFQUUzQixLQUFLLFVBQVUsRUFFaEIsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRTVELE9BQU8sRUFDTCxLQUFLLE9BQU8sRUFDWixLQUFLLGVBQWUsRUFDcEIsS0FBSyxZQUFZLEVBQ2pCLEtBQUssYUFBYSxFQUNsQiw0QkFBNEIsRUFDNUIsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSyxZQUFZLEVBQ2pCLEtBQUssa0JBQWtCLEVBQ3ZCLEtBQUssY0FBYyxFQUNuQixLQUFLLFdBQVcsRUFDaEIsS0FBSyxlQUFlLEVBQ3BCLCtCQUErQixFQUMvQixLQUFLLE1BQU0sRUFDWCxLQUFLLGtCQUFrQixFQUN4QixNQUFNLHdCQUF3QixDQUFDO0FBQ2hDLE9BQU8sRUFBRSw4QkFBOEIsRUFBd0MsTUFBTSw0QkFBNEIsQ0FBQztBQUVsSCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMvRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFzQixNQUFNLG1CQUFtQixDQUFDO0FBQ2pFLE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUNyQixLQUFLLHVCQUF1QixFQUM1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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/base-wallet/base_wallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/base-wallet/base_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,21 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { NO_FROM } from '@aztec/aztec.js/account';
|
|
2
|
+
import { NO_WAIT, extractOffchainOutput } from '@aztec/aztec.js/contracts';
|
|
2
3
|
import { waitForTx } from '@aztec/aztec.js/node';
|
|
3
|
-
import {
|
|
4
|
+
import { ContractInitializationStatus, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
4
5
|
import { AccountFeePaymentMethodOptions } from '@aztec/entrypoints/account';
|
|
6
|
+
import { DefaultEntrypoint } from '@aztec/entrypoints/default';
|
|
5
7
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
8
|
import { createLogger } from '@aztec/foundation/log';
|
|
9
|
+
import { displayDebugLogs } from '@aztec/pxe/client/lazy';
|
|
7
10
|
import { decodeFromAbi } from '@aztec/stdlib/abi';
|
|
11
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
8
12
|
import { computePartialAddress, getContractClassFromArtifact } from '@aztec/stdlib/contract';
|
|
9
13
|
import { SimulationError } from '@aztec/stdlib/errors';
|
|
10
|
-
import { Gas, GasSettings } from '@aztec/stdlib/gas';
|
|
11
|
-
import {
|
|
14
|
+
import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
|
|
15
|
+
import { computeSiloedPrivateInitializationNullifier, computeSiloedPublicInitializationNullifier } from '@aztec/stdlib/hash';
|
|
12
16
|
import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
|
|
13
17
|
import { inspect } from 'util';
|
|
18
|
+
import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simulateViaNode } from './utils.js';
|
|
14
19
|
/**
|
|
15
20
|
* A base class for Wallet implementations
|
|
16
21
|
*/ export class BaseWallet {
|
|
@@ -19,14 +24,27 @@ import { inspect } from 'util';
|
|
|
19
24
|
log;
|
|
20
25
|
minFeePadding;
|
|
21
26
|
cancellableTransactions;
|
|
27
|
+
// A wallet is instantiated for a particular chain, so chain info never changes during its lifetime.
|
|
28
|
+
// We cache it here because getChainInfo is called frequently (every tx simulation, send, auth wit, etc.).
|
|
29
|
+
nodeInfoPromise;
|
|
22
30
|
// Protected because we want to force wallets to instantiate their own PXE.
|
|
23
|
-
constructor(pxe, aztecNode){
|
|
31
|
+
constructor(pxe, aztecNode, log = createLogger('wallet-sdk:base_wallet')){
|
|
24
32
|
this.pxe = pxe;
|
|
25
33
|
this.aztecNode = aztecNode;
|
|
26
|
-
this.log =
|
|
34
|
+
this.log = log;
|
|
27
35
|
this.minFeePadding = 0.5;
|
|
28
36
|
this.cancellableTransactions = false;
|
|
29
37
|
}
|
|
38
|
+
scopesFrom(from, additionalScopes = []) {
|
|
39
|
+
const allScopes = from === NO_FROM ? additionalScopes : [
|
|
40
|
+
from,
|
|
41
|
+
...additionalScopes
|
|
42
|
+
];
|
|
43
|
+
const scopeSet = new Set(allScopes.map((address)=>address.toString()));
|
|
44
|
+
return [
|
|
45
|
+
...scopeSet
|
|
46
|
+
].map(AztecAddress.fromString);
|
|
47
|
+
}
|
|
30
48
|
/**
|
|
31
49
|
* Returns the list of aliased contacts associated with the wallet.
|
|
32
50
|
* This base implementation directly returns PXE's senders, but note that in general contacts are a superset of senders.
|
|
@@ -41,7 +59,10 @@ import { inspect } from 'util';
|
|
|
41
59
|
}));
|
|
42
60
|
}
|
|
43
61
|
async getChainInfo() {
|
|
44
|
-
|
|
62
|
+
if (!this.nodeInfoPromise) {
|
|
63
|
+
this.nodeInfoPromise = this.aztecNode.getNodeInfo();
|
|
64
|
+
}
|
|
65
|
+
const { l1ChainId, rollupVersion } = await this.nodeInfoPromise;
|
|
45
66
|
return {
|
|
46
67
|
chainId: new Fr(l1ChainId),
|
|
47
68
|
version: new Fr(rollupVersion)
|
|
@@ -49,18 +70,24 @@ import { inspect } from 'util';
|
|
|
49
70
|
}
|
|
50
71
|
async createTxExecutionRequestFromPayloadAndFee(executionPayload, from, feeOptions) {
|
|
51
72
|
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
52
|
-
const executionOptions = {
|
|
53
|
-
txNonce: Fr.random(),
|
|
54
|
-
cancellable: this.cancellableTransactions,
|
|
55
|
-
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
|
|
56
|
-
};
|
|
57
73
|
const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
|
|
58
74
|
feeExecutionPayload,
|
|
59
75
|
executionPayload
|
|
60
76
|
]) : executionPayload;
|
|
61
|
-
const fromAccount = await this.getAccountFromAddress(from);
|
|
62
77
|
const chainInfo = await this.getChainInfo();
|
|
63
|
-
|
|
78
|
+
if (from === NO_FROM) {
|
|
79
|
+
const entrypoint = new DefaultEntrypoint();
|
|
80
|
+
return entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
|
|
81
|
+
} else {
|
|
82
|
+
const fromAccount = await this.getAccountFromAddress(from);
|
|
83
|
+
const executionOptions = {
|
|
84
|
+
txNonce: Fr.random(),
|
|
85
|
+
cancellable: this.cancellableTransactions,
|
|
86
|
+
// If from is an address, feeOptions include the way the account contract should handle the fee payment
|
|
87
|
+
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
|
|
88
|
+
};
|
|
89
|
+
return fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
|
|
90
|
+
}
|
|
64
91
|
}
|
|
65
92
|
async createAuthWit(from, messageHashOrIntent) {
|
|
66
93
|
const account = await this.getAccountFromAddress(from);
|
|
@@ -103,26 +130,33 @@ import { inspect } from 'util';
|
|
|
103
130
|
}
|
|
104
131
|
/**
|
|
105
132
|
* Completes partial user-provided fee options with wallet defaults.
|
|
106
|
-
* @param
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
* @returns - Complete fee options that can be used to create a transaction execution request
|
|
110
|
-
*/ async completeFeeOptions(from, feePayer, gasSettings) {
|
|
133
|
+
* @param config - Fee completion config.
|
|
134
|
+
*/ async completeFeeOptions(config) {
|
|
135
|
+
const { from, feePayer, gasSettings, forEstimation } = config;
|
|
111
136
|
const maxFeesPerGas = gasSettings?.maxFeesPerGas ?? (await this.aztecNode.getCurrentMinFees()).mul(1 + this.minFeePadding);
|
|
112
137
|
let accountFeePaymentMethodOptions;
|
|
113
|
-
//
|
|
114
|
-
//
|
|
115
|
-
if (
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
138
|
+
// If from is an address, we need to determine the appropriate fee payment method options for the
|
|
139
|
+
// account contract entrypoint to use
|
|
140
|
+
if (from !== NO_FROM) {
|
|
141
|
+
if (!feePayer) {
|
|
142
|
+
// The transaction does not include a fee payment method, so we set the flag
|
|
143
|
+
// for the account to use its fee juice balance
|
|
144
|
+
accountFeePaymentMethodOptions = AccountFeePaymentMethodOptions.PREEXISTING_FEE_JUICE;
|
|
145
|
+
} else {
|
|
146
|
+
// The transaction includes fee payment method, so we check if we are the fee payer for it
|
|
147
|
+
// (this can only happen if the embedded payment method is FeeJuiceWithClaim)
|
|
148
|
+
accountFeePaymentMethodOptions = from.equals(feePayer) ? AccountFeePaymentMethodOptions.FEE_JUICE_WITH_CLAIM : AccountFeePaymentMethodOptions.EXTERNAL;
|
|
149
|
+
}
|
|
121
150
|
}
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
151
|
+
const gasSettingsOverrides = {
|
|
152
|
+
gasLimits: gasSettings?.gasLimits ? Gas.from(gasSettings.gasLimits) : undefined,
|
|
153
|
+
teardownGasLimits: gasSettings?.teardownGasLimits ? Gas.from(gasSettings.teardownGasLimits) : undefined,
|
|
154
|
+
maxFeesPerGas,
|
|
155
|
+
maxPriorityFeesPerGas: gasSettings?.maxPriorityFeesPerGas ?? GasFees.empty()
|
|
156
|
+
};
|
|
157
|
+
// When estimating gas (simulation), use high limits so the simulation doesn't run out of gas.
|
|
158
|
+
// When sending for real, use protocol max limits that the network will actually accept.
|
|
159
|
+
const fullGasSettings = forEstimation ? GasSettings.forEstimation(gasSettingsOverrides) : GasSettings.fallback(gasSettingsOverrides);
|
|
126
160
|
this.log.debug(`Using L2 gas settings`, fullGasSettings);
|
|
127
161
|
return {
|
|
128
162
|
gasSettings: fullGasSettings,
|
|
@@ -130,24 +164,6 @@ import { inspect } from 'util';
|
|
|
130
164
|
accountFeePaymentMethodOptions
|
|
131
165
|
};
|
|
132
166
|
}
|
|
133
|
-
/**
|
|
134
|
-
* Completes partial user-provided fee options with unreasonably high gas limits
|
|
135
|
-
* for gas estimation. Uses the same logic as completeFeeOptions but sets high limits
|
|
136
|
-
* to avoid running out of gas during estimation.
|
|
137
|
-
* @param from - The address where the transaction is being sent from
|
|
138
|
-
* @param feePayer - The address paying for fees (if any fee payment method is embedded in the execution payload)
|
|
139
|
-
* @param gasSettings - User-provided partial gas settings
|
|
140
|
-
*/ async completeFeeOptionsForEstimation(from, feePayer, gasSettings) {
|
|
141
|
-
const defaultFeeOptions = await this.completeFeeOptions(from, feePayer, gasSettings);
|
|
142
|
-
const { gasSettings: { maxFeesPerGas, maxPriorityFeesPerGas } } = defaultFeeOptions;
|
|
143
|
-
// Use unrealistically high gas limits for estimation to avoid running out of gas.
|
|
144
|
-
// They will be tuned down after the simulation.
|
|
145
|
-
const gasSettingsForEstimation = new GasSettings(new Gas(GAS_ESTIMATION_DA_GAS_LIMIT, GAS_ESTIMATION_L2_GAS_LIMIT), new Gas(GAS_ESTIMATION_TEARDOWN_DA_GAS_LIMIT, GAS_ESTIMATION_TEARDOWN_L2_GAS_LIMIT), maxFeesPerGas, maxPriorityFeesPerGas);
|
|
146
|
-
return {
|
|
147
|
-
...defaultFeeOptions,
|
|
148
|
-
gasSettings: gasSettingsForEstimation
|
|
149
|
-
};
|
|
150
|
-
}
|
|
151
167
|
registerSender(address, _alias = '') {
|
|
152
168
|
return this.pxe.registerSender(address);
|
|
153
169
|
}
|
|
@@ -183,20 +199,96 @@ import { inspect } from 'util';
|
|
|
183
199
|
}
|
|
184
200
|
return instance;
|
|
185
201
|
}
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
202
|
+
/**
|
|
203
|
+
* Simulates calls through the standard PXE path (account entrypoint).
|
|
204
|
+
* @param executionPayload - The execution payload to simulate.
|
|
205
|
+
* @param opts - Simulation options.
|
|
206
|
+
*/ async simulateViaEntrypoint(executionPayload, opts) {
|
|
207
|
+
const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, opts.feeOptions);
|
|
208
|
+
const result = await this.pxe.simulateTx(txRequest, {
|
|
209
|
+
simulatePublic: true,
|
|
210
|
+
skipTxValidation: opts.skipTxValidation,
|
|
211
|
+
skipFeeEnforcement: opts.skipFeeEnforcement,
|
|
212
|
+
scopes: this.scopesFrom(opts.from, opts.additionalScopes)
|
|
213
|
+
});
|
|
214
|
+
const appCallOffset = await this.computeAppCallOffset(opts.from, opts.feeOptions);
|
|
215
|
+
return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
|
|
216
|
+
}
|
|
217
|
+
/**
|
|
218
|
+
* Computes the index where the app's calls begin in the flattened array of calls (0 = entrypoint/root, 1..N = fee
|
|
219
|
+
* calls, N+1 = app).
|
|
220
|
+
* @param from - The sender address, or NO_FROM for the default entrypoint.
|
|
221
|
+
* @param feeOptions - Fee options containing the wallet fee payment method.
|
|
222
|
+
*/ async computeAppCallOffset(from, feeOptions) {
|
|
223
|
+
if (from === NO_FROM) {
|
|
224
|
+
return 0;
|
|
225
|
+
}
|
|
226
|
+
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
227
|
+
return (feeExecutionPayload?.calls.length ?? 0) + 1; // +1 for entrypoint
|
|
228
|
+
}
|
|
229
|
+
/**
|
|
230
|
+
* Simulates a transaction, optimizing leading public static calls by running them directly
|
|
231
|
+
* on the node while sending the remaining calls through the standard PXE path.
|
|
232
|
+
* Return values from both paths are merged back in original call order.
|
|
233
|
+
* @param executionPayload - The execution payload to simulate.
|
|
234
|
+
* @param opts - Simulation options (from address, fee settings, etc.).
|
|
235
|
+
* @returns The merged simulation result.
|
|
236
|
+
*/ async simulateTx(executionPayload, opts) {
|
|
237
|
+
const feeOptions = await this.completeFeeOptions({
|
|
238
|
+
from: opts.from,
|
|
239
|
+
feePayer: executionPayload.feePayer,
|
|
240
|
+
gasSettings: opts.fee?.gasSettings,
|
|
241
|
+
forEstimation: true
|
|
242
|
+
});
|
|
243
|
+
const { optimizableCalls, remainingCalls } = extractOptimizablePublicStaticCalls(executionPayload);
|
|
244
|
+
const remainingPayload = {
|
|
245
|
+
...executionPayload,
|
|
246
|
+
calls: remainingCalls
|
|
247
|
+
};
|
|
248
|
+
const chainInfo = await this.getChainInfo();
|
|
249
|
+
let blockHeader;
|
|
250
|
+
// PXE might not be synced yet, so we pull the latest header from the node
|
|
251
|
+
// To keep things consistent, we'll always try with PXE first
|
|
252
|
+
try {
|
|
253
|
+
blockHeader = await this.pxe.getSyncedBlockHeader();
|
|
254
|
+
} catch {
|
|
255
|
+
blockHeader = await this.aztecNode.getBlockHeader();
|
|
256
|
+
}
|
|
257
|
+
const simulationOrigin = opts.from === NO_FROM ? AztecAddress.ZERO : opts.from;
|
|
258
|
+
const [optimizedResults, normalResult] = await Promise.all([
|
|
259
|
+
optimizableCalls.length > 0 ? simulateViaNode(this.aztecNode, optimizableCalls, simulationOrigin, chainInfo, feeOptions.gasSettings, blockHeader, opts.skipFeeEnforcement ?? true, this.getContractName.bind(this)) : Promise.resolve([]),
|
|
260
|
+
remainingCalls.length > 0 ? this.simulateViaEntrypoint(remainingPayload, {
|
|
261
|
+
from: opts.from,
|
|
262
|
+
feeOptions,
|
|
263
|
+
additionalScopes: opts.additionalScopes,
|
|
264
|
+
skipTxValidation: opts.skipTxValidation,
|
|
265
|
+
skipFeeEnforcement: opts.skipFeeEnforcement ?? true
|
|
266
|
+
}) : Promise.resolve(null)
|
|
267
|
+
]);
|
|
268
|
+
return buildMergedSimulationResult(optimizedResults, normalResult);
|
|
190
269
|
}
|
|
191
270
|
async profileTx(executionPayload, opts) {
|
|
192
|
-
const feeOptions = await this.completeFeeOptions(
|
|
271
|
+
const feeOptions = await this.completeFeeOptions({
|
|
272
|
+
from: opts.from,
|
|
273
|
+
feePayer: executionPayload.feePayer,
|
|
274
|
+
gasSettings: opts.fee?.gasSettings
|
|
275
|
+
});
|
|
193
276
|
const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, feeOptions);
|
|
194
|
-
return this.pxe.profileTx(txRequest,
|
|
277
|
+
return this.pxe.profileTx(txRequest, {
|
|
278
|
+
profileMode: opts.profileMode,
|
|
279
|
+
skipProofGeneration: opts.skipProofGeneration ?? true,
|
|
280
|
+
scopes: this.scopesFrom(opts.from, opts.additionalScopes)
|
|
281
|
+
});
|
|
195
282
|
}
|
|
196
283
|
async sendTx(executionPayload, opts) {
|
|
197
|
-
const feeOptions = await this.completeFeeOptions(
|
|
284
|
+
const feeOptions = await this.completeFeeOptions({
|
|
285
|
+
from: opts.from,
|
|
286
|
+
feePayer: executionPayload.feePayer,
|
|
287
|
+
gasSettings: opts.fee?.gasSettings
|
|
288
|
+
});
|
|
198
289
|
const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, feeOptions);
|
|
199
|
-
const provenTx = await this.pxe.proveTx(txRequest);
|
|
290
|
+
const provenTx = await this.pxe.proveTx(txRequest, this.scopesFrom(opts.from, opts.additionalScopes));
|
|
291
|
+
const offchainOutput = extractOffchainOutput(provenTx.getOffchainEffects(), provenTx.publicInputs.constants.anchorBlockHeader.globalVariables.timestamp);
|
|
200
292
|
const tx = await provenTx.toTx();
|
|
201
293
|
const txHash = tx.getTxHash();
|
|
202
294
|
if (await this.aztecNode.getTxEffect(txHash)) {
|
|
@@ -209,11 +301,33 @@ import { inspect } from 'util';
|
|
|
209
301
|
this.log.info(`Sent transaction ${txHash}`);
|
|
210
302
|
// If wait is NO_WAIT, return txHash immediately
|
|
211
303
|
if (opts.wait === NO_WAIT) {
|
|
212
|
-
return
|
|
304
|
+
return {
|
|
305
|
+
txHash,
|
|
306
|
+
...offchainOutput
|
|
307
|
+
};
|
|
213
308
|
}
|
|
214
309
|
// Otherwise, wait for the full receipt (default behavior on wait: undefined)
|
|
215
310
|
const waitOpts = typeof opts.wait === 'object' ? opts.wait : undefined;
|
|
216
|
-
|
|
311
|
+
const receipt = await waitForTx(this.aztecNode, txHash, waitOpts);
|
|
312
|
+
// Display debug logs from public execution if present (served in test mode only)
|
|
313
|
+
if (receipt.debugLogs?.length) {
|
|
314
|
+
await displayDebugLogs(receipt.debugLogs, this.getContractName.bind(this));
|
|
315
|
+
}
|
|
316
|
+
return {
|
|
317
|
+
receipt,
|
|
318
|
+
...offchainOutput
|
|
319
|
+
};
|
|
320
|
+
}
|
|
321
|
+
/**
|
|
322
|
+
* Resolves a contract address to a human-readable name via PXE, if available.
|
|
323
|
+
* @param address - The contract address to resolve.
|
|
324
|
+
*/ async getContractName(address) {
|
|
325
|
+
const instance = await this.pxe.getContractInstance(address);
|
|
326
|
+
if (!instance) {
|
|
327
|
+
return undefined;
|
|
328
|
+
}
|
|
329
|
+
const artifact = await this.pxe.getContractArtifact(instance.currentContractClassId);
|
|
330
|
+
return artifact?.name;
|
|
217
331
|
}
|
|
218
332
|
contextualizeError(err, ...context) {
|
|
219
333
|
let contextStr = '';
|
|
@@ -228,8 +342,11 @@ import { inspect } from 'util';
|
|
|
228
342
|
}
|
|
229
343
|
return err;
|
|
230
344
|
}
|
|
231
|
-
|
|
232
|
-
return this.pxe.
|
|
345
|
+
executeUtility(call, opts) {
|
|
346
|
+
return this.pxe.executeUtility(call, {
|
|
347
|
+
authwits: opts.authWitnesses,
|
|
348
|
+
scopes: opts.scopes
|
|
349
|
+
});
|
|
233
350
|
}
|
|
234
351
|
async getPrivateEvents(eventDef, eventFilter) {
|
|
235
352
|
const pxeEvents = await this.pxe.getPrivateEvents(eventDef.eventSelector, eventFilter);
|
|
@@ -247,15 +364,33 @@ import { inspect } from 'util';
|
|
|
247
364
|
});
|
|
248
365
|
return decodedEvents;
|
|
249
366
|
}
|
|
250
|
-
|
|
367
|
+
/**
|
|
368
|
+
* Returns metadata about a contract, including whether it has been initialized, published, and updated.
|
|
369
|
+
* @param address - The contract address to query.
|
|
370
|
+
*/ async getContractMetadata(address) {
|
|
251
371
|
const instance = await this.pxe.getContractInstance(address);
|
|
252
|
-
const
|
|
253
|
-
|
|
254
|
-
|
|
372
|
+
const publiclyRegisteredContractPromise = this.aztecNode.getContract(address);
|
|
373
|
+
let initializationStatus;
|
|
374
|
+
if (instance) {
|
|
375
|
+
// We have the instance, so we can compute the private initialization nullifier (which includes init_hash and is
|
|
376
|
+
// emitted by both private and public initializers) and get a definitive INITIALIZED/UNINITIALIZED answer.
|
|
377
|
+
const initNullifier = await computeSiloedPrivateInitializationNullifier(address, instance.initializationHash);
|
|
378
|
+
const witness = await this.aztecNode.getNullifierMembershipWitness('latest', initNullifier);
|
|
379
|
+
initializationStatus = witness ? ContractInitializationStatus.INITIALIZED : ContractInitializationStatus.UNINITIALIZED;
|
|
380
|
+
} else {
|
|
381
|
+
// Without the instance we lack the init_hash needed for the private nullifier. We fall back to checking the
|
|
382
|
+
// public initialization nullifier (computed from address alone). Not all contracts emit it (only those with
|
|
383
|
+
// public functions that require initialization checks), so its absence doesn't mean the contract is
|
|
384
|
+
// uninitialized.
|
|
385
|
+
const publicNullifier = await computeSiloedPublicInitializationNullifier(address);
|
|
386
|
+
const witness = await this.aztecNode.getNullifierMembershipWitness('latest', publicNullifier);
|
|
387
|
+
initializationStatus = witness ? ContractInitializationStatus.INITIALIZED : ContractInitializationStatus.UNKNOWN;
|
|
388
|
+
}
|
|
389
|
+
const publiclyRegisteredContract = await publiclyRegisteredContractPromise;
|
|
255
390
|
const isContractUpdated = publiclyRegisteredContract && !publiclyRegisteredContract.currentContractClassId.equals(publiclyRegisteredContract.originalContractClassId);
|
|
256
391
|
return {
|
|
257
392
|
instance: instance ?? undefined,
|
|
258
|
-
|
|
393
|
+
initializationStatus,
|
|
259
394
|
isContractPublished: !!publiclyRegisteredContract,
|
|
260
395
|
isContractUpdated: !!isContractUpdated,
|
|
261
396
|
updatedContractClassId: isContractUpdated ? publiclyRegisteredContract.currentContractClassId : undefined
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
export { BaseWallet, type FeeOptions } from './base_wallet.js';
|
|
2
|
-
|
|
1
|
+
export { BaseWallet, type CompleteFeeOptionsConfig, type FeeOptions, type SimulateViaEntrypointOptions, } from './base_wallet.js';
|
|
2
|
+
export { simulateViaNode, buildMergedSimulationResult, extractOptimizablePublicStaticCalls } from './utils.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssVUFBVSxFQUNmLEtBQUssNEJBQTRCLEdBQ2xDLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLGVBQWUsRUFBRSwyQkFBMkIsRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLFlBQVksQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base-wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base-wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,KAAK,wBAAwB,EAC7B,KAAK,UAAU,EACf,KAAK,4BAA4B,GAClC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC"}
|