@aztec/wallet-sdk 0.0.1-commit.c2eed6949 → 0.0.1-commit.c52d6e7

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 (76) hide show
  1. package/README.md +125 -0
  2. package/dest/base-wallet/base_wallet.d.ts +66 -36
  3. package/dest/base-wallet/base_wallet.d.ts.map +1 -1
  4. package/dest/base-wallet/base_wallet.js +206 -92
  5. package/dest/base-wallet/get_gas_limits.d.ts +36 -0
  6. package/dest/base-wallet/get_gas_limits.d.ts.map +1 -0
  7. package/dest/base-wallet/get_gas_limits.js +55 -0
  8. package/dest/base-wallet/index.d.ts +3 -2
  9. package/dest/base-wallet/index.d.ts.map +1 -1
  10. package/dest/base-wallet/index.js +1 -0
  11. package/dest/base-wallet/utils.d.ts +7 -4
  12. package/dest/base-wallet/utils.d.ts.map +1 -1
  13. package/dest/base-wallet/utils.js +11 -5
  14. package/dest/crypto.d.ts +39 -1
  15. package/dest/crypto.d.ts.map +1 -1
  16. package/dest/crypto.js +88 -0
  17. package/dest/extension/handlers/background_connection_handler.d.ts +12 -2
  18. package/dest/extension/handlers/background_connection_handler.d.ts.map +1 -1
  19. package/dest/extension/handlers/background_connection_handler.js +44 -8
  20. package/dest/extension/handlers/content_script_connection_handler.d.ts +2 -1
  21. package/dest/extension/handlers/content_script_connection_handler.d.ts.map +1 -1
  22. package/dest/extension/handlers/content_script_connection_handler.js +19 -0
  23. package/dest/extension/handlers/internal_message_types.d.ts +3 -1
  24. package/dest/extension/handlers/internal_message_types.d.ts.map +1 -1
  25. package/dest/extension/handlers/internal_message_types.js +3 -1
  26. package/dest/extension/provider/extension_wallet.d.ts +26 -6
  27. package/dest/extension/provider/extension_wallet.d.ts.map +1 -1
  28. package/dest/extension/provider/extension_wallet.js +80 -9
  29. package/dest/extension/provider/index.d.ts +2 -2
  30. package/dest/extension/provider/index.d.ts.map +1 -1
  31. package/dest/iframe/handlers/iframe_connection_handler.d.ts +122 -0
  32. package/dest/iframe/handlers/iframe_connection_handler.d.ts.map +1 -0
  33. package/dest/iframe/handlers/iframe_connection_handler.js +239 -0
  34. package/dest/iframe/handlers/index.d.ts +2 -0
  35. package/dest/iframe/handlers/index.d.ts.map +1 -0
  36. package/dest/iframe/handlers/index.js +1 -0
  37. package/dest/iframe/provider/iframe_discovery.d.ts +25 -0
  38. package/dest/iframe/provider/iframe_discovery.d.ts.map +1 -0
  39. package/dest/iframe/provider/iframe_discovery.js +167 -0
  40. package/dest/iframe/provider/iframe_provider.d.ts +65 -0
  41. package/dest/iframe/provider/iframe_provider.d.ts.map +1 -0
  42. package/dest/iframe/provider/iframe_provider.js +257 -0
  43. package/dest/iframe/provider/iframe_wallet.d.ts +85 -0
  44. package/dest/iframe/provider/iframe_wallet.d.ts.map +1 -0
  45. package/dest/iframe/provider/iframe_wallet.js +269 -0
  46. package/dest/iframe/provider/index.d.ts +4 -0
  47. package/dest/iframe/provider/index.d.ts.map +1 -0
  48. package/dest/iframe/provider/index.js +3 -0
  49. package/dest/manager/types.d.ts +3 -2
  50. package/dest/manager/types.d.ts.map +1 -1
  51. package/dest/manager/wallet_manager.d.ts +1 -1
  52. package/dest/manager/wallet_manager.d.ts.map +1 -1
  53. package/dest/manager/wallet_manager.js +46 -16
  54. package/dest/types.d.ts +64 -2
  55. package/dest/types.d.ts.map +1 -1
  56. package/dest/types.js +29 -0
  57. package/package.json +12 -8
  58. package/src/base-wallet/base_wallet.ts +236 -115
  59. package/src/base-wallet/get_gas_limits.ts +88 -0
  60. package/src/base-wallet/index.ts +7 -1
  61. package/src/base-wallet/utils.ts +15 -5
  62. package/src/crypto.ts +104 -0
  63. package/src/extension/handlers/background_connection_handler.ts +42 -9
  64. package/src/extension/handlers/content_script_connection_handler.ts +18 -0
  65. package/src/extension/handlers/internal_message_types.ts +2 -0
  66. package/src/extension/provider/extension_wallet.ts +94 -13
  67. package/src/extension/provider/index.ts +1 -1
  68. package/src/iframe/handlers/iframe_connection_handler.ts +341 -0
  69. package/src/iframe/handlers/index.ts +7 -0
  70. package/src/iframe/provider/iframe_discovery.ts +185 -0
  71. package/src/iframe/provider/iframe_provider.ts +331 -0
  72. package/src/iframe/provider/iframe_wallet.ts +323 -0
  73. package/src/iframe/provider/index.ts +3 -0
  74. package/src/manager/types.ts +2 -1
  75. package/src/manager/wallet_manager.ts +48 -14
  76. package/src/types.ts +72 -0
@@ -1,8 +1,7 @@
1
1
  import { NO_FROM } from '@aztec/aztec.js/account';
2
- import { NO_WAIT, extractOffchainOutput } from '@aztec/aztec.js/contracts';
2
+ import { DefaultWaitOpts, NO_WAIT, extractOffchainOutput } from '@aztec/aztec.js/contracts';
3
3
  import { waitForTx } from '@aztec/aztec.js/node';
4
- import { ContractInitializationStatus } from '@aztec/aztec.js/wallet';
5
- import { GAS_ESTIMATION_DA_GAS_LIMIT, GAS_ESTIMATION_L2_GAS_LIMIT, GAS_ESTIMATION_TEARDOWN_DA_GAS_LIMIT, GAS_ESTIMATION_TEARDOWN_L2_GAS_LIMIT } from '@aztec/constants';
4
+ import { ContractInitializationStatus, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
6
5
  import { AccountFeePaymentMethodOptions } from '@aztec/entrypoints/account';
7
6
  import { DefaultEntrypoint } from '@aztec/entrypoints/default';
8
7
  import { Fr } from '@aztec/foundation/curves/bn254';
@@ -10,12 +9,14 @@ import { createLogger } from '@aztec/foundation/log';
10
9
  import { displayDebugLogs } from '@aztec/pxe/client/lazy';
11
10
  import { decodeFromAbi } from '@aztec/stdlib/abi';
12
11
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
13
- import { computePartialAddress, getContractClassFromArtifact } from '@aztec/stdlib/contract';
12
+ import { computePartialAddress } from '@aztec/stdlib/contract';
14
13
  import { SimulationError } from '@aztec/stdlib/errors';
15
- import { Gas, GasSettings } from '@aztec/stdlib/gas';
14
+ import { Gas, GasFees, GasSettings, ManaUsageEstimate } from '@aztec/stdlib/gas';
16
15
  import { computeSiloedPrivateInitializationNullifier, computeSiloedPublicInitializationNullifier } from '@aztec/stdlib/hash';
16
+ import { deriveKeys, deriveKeysFromMasterSecretKeys } from '@aztec/stdlib/keys';
17
17
  import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
18
18
  import { inspect } from 'util';
19
+ import { assertGasLimitsWithinNetworkLimits } from './get_gas_limits.js';
19
20
  import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simulateViaNode } from './utils.js';
20
21
  /**
21
22
  * A base class for Wallet implementations
@@ -25,6 +26,12 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
25
26
  log;
26
27
  minFeePadding;
27
28
  cancellableTransactions;
29
+ // Poll interval (in seconds) injected into sendTx waits when the caller does not specify one. Left undefined on
30
+ // production wallets so the DefaultWaitOpts 1s cadence stands; test wallets talking to in-process nodes lower it.
31
+ defaultWaitInterval;
32
+ // A wallet is instantiated for a particular chain, so chain info never changes during its lifetime.
33
+ // We cache it here because getChainInfo is called frequently (every tx simulation, send, auth wit, etc.).
34
+ nodeInfoPromise;
28
35
  // Protected because we want to force wallets to instantiate their own PXE.
29
36
  constructor(pxe, aztecNode, log = createLogger('wallet-sdk:base_wallet')){
30
37
  this.pxe = pxe;
@@ -33,15 +40,32 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
33
40
  this.minFeePadding = 0.5;
34
41
  this.cancellableTransactions = false;
35
42
  }
36
- scopesFrom(from, additionalScopes = []) {
37
- const allScopes = from === NO_FROM ? additionalScopes : [
38
- from,
39
- ...additionalScopes
43
+ scopesFrom(from, additionalScopes, sendMessagesAs) {
44
+ // The sendMessagesAs account must be in scope so that its tagging secrets can be accessed.
45
+ const tagSenderScopes = sendMessagesAs ? [
46
+ sendMessagesAs
47
+ ] : [];
48
+ const baseScopes = from === NO_FROM ? [] : [
49
+ from
50
+ ];
51
+ const allScopes = [
52
+ ...baseScopes,
53
+ ...additionalScopes,
54
+ ...tagSenderScopes
40
55
  ];
41
56
  const scopeSet = new Set(allScopes.map((address)=>address.toString()));
42
57
  return [
43
58
  ...scopeSet
44
- ].map(AztecAddress.fromString);
59
+ ].map(AztecAddress.fromStringUnsafe);
60
+ }
61
+ /**
62
+ * Picks the sender address PXE should tag private messages with. Returns `undefined` when there is no signing
63
+ * account (`from === NO_FROM`) and no explicit override; in that case any private log emitted by the tx using
64
+ * the wallet-supplied default sender will fail the "Sender for tags is not set" assertion.
65
+ * @param from - Tx sender, or `NO_FROM`.
66
+ * @param sendMessagesAs - Explicit override.
67
+ */ senderForTagsFrom(from, sendMessagesAs) {
68
+ return sendMessagesAs ?? (from === NO_FROM ? undefined : from);
45
69
  }
46
70
  /**
47
71
  * Returns the list of aliased contacts associated with the wallet.
@@ -50,19 +74,44 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
50
74
  * - Contacts: more general concept akin to a phone's contact list.
51
75
  * @returns The aliased collection of AztecAddresses that form this wallet's address book
52
76
  */ async getAddressBook() {
53
- const senders = await this.pxe.getSenders();
54
- return senders.map((sender)=>({
55
- item: sender,
77
+ const sources = await this.pxe.getTaggingSecretSources({
78
+ kind: 'address-derived'
79
+ });
80
+ return sources.map((source)=>({
81
+ item: source.sender,
56
82
  alias: ''
57
83
  }));
58
84
  }
85
+ /**
86
+ * Fetches and caches the node info for the wallet's lifetime, since a wallet talks to a single network and
87
+ * node info never changes. A rejected fetch clears the cache so the next call retries instead of replaying
88
+ * the cached rejection forever — important because the gas-limit fill-in and validation (run on every send)
89
+ * depend on it.
90
+ */ getNodeInfo() {
91
+ if (!this.nodeInfoPromise) {
92
+ this.nodeInfoPromise = this.aztecNode.getNodeInfo().catch((err)=>{
93
+ this.nodeInfoPromise = undefined;
94
+ throw err;
95
+ });
96
+ }
97
+ return this.nodeInfoPromise;
98
+ }
59
99
  async getChainInfo() {
60
- const { l1ChainId, rollupVersion } = await this.aztecNode.getNodeInfo();
100
+ const { l1ChainId, rollupVersion } = await this.getNodeInfo();
61
101
  return {
62
102
  chainId: new Fr(l1ChainId),
63
103
  version: new Fr(rollupVersion)
64
104
  };
65
105
  }
106
+ /**
107
+ * Returns the maximum gas limits a single transaction may declare on this wallet's network (the
108
+ * node-advertised `txsLimits.gas`). Internal helper used to fill in default gas limits when sending a
109
+ * transaction without explicit limits, and to validate caller-provided limits before sending. Backed by
110
+ * the cached node info, since a wallet talks to a single network.
111
+ */ async getMaxTxGasLimits() {
112
+ const { txsLimits } = await this.getNodeInfo();
113
+ return new Gas(txsLimits.gas.daGas, txsLimits.gas.l2Gas);
114
+ }
66
115
  async createTxExecutionRequestFromPayloadAndFee(executionPayload, from, feeOptions) {
67
116
  const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
68
117
  const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
@@ -125,12 +174,10 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
125
174
  }
126
175
  /**
127
176
  * Completes partial user-provided fee options with wallet defaults.
128
- * @param from - The address where the transaction is being sent from
129
- * @param feePayer - The address paying for fees (if any fee payment method is embedded in the execution payload)
130
- * @param gasSettings - User-provided partial gas settings
131
- * @returns - Complete fee options that can be used to create a transaction execution request
132
- */ async completeFeeOptions(from, feePayer, gasSettings) {
133
- const maxFeesPerGas = gasSettings?.maxFeesPerGas ?? (await this.aztecNode.getCurrentMinFees()).mul(1 + this.minFeePadding);
177
+ * @param config - Fee completion config.
178
+ */ async completeFeeOptions(config) {
179
+ const { from, feePayer, gasSettings, forEstimation, congestionEstimate } = config;
180
+ const maxFeesPerGas = gasSettings?.maxFeesPerGas ?? (await this.getMinFees(congestionEstimate)).mul(1 + this.minFeePadding);
134
181
  let accountFeePaymentMethodOptions;
135
182
  // If from is an address, we need to determine the appropriate fee payment method options for the
136
183
  // account contract entrypoint to use
@@ -145,10 +192,32 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
145
192
  accountFeePaymentMethodOptions = from.equals(feePayer) ? AccountFeePaymentMethodOptions.FEE_JUICE_WITH_CLAIM : AccountFeePaymentMethodOptions.EXTERNAL;
146
193
  }
147
194
  }
148
- const fullGasSettings = GasSettings.default({
149
- ...gasSettings,
150
- maxFeesPerGas
151
- });
195
+ const gasSettingsOverrides = {
196
+ gasLimits: gasSettings?.gasLimits ? Gas.from(gasSettings.gasLimits) : undefined,
197
+ teardownGasLimits: gasSettings?.teardownGasLimits ? Gas.from(gasSettings.teardownGasLimits) : undefined,
198
+ maxFeesPerGas,
199
+ maxPriorityFeesPerGas: gasSettings?.maxPriorityFeesPerGas ?? GasFees.empty()
200
+ };
201
+ // When estimating gas (simulation), use high limits so the simulation doesn't run out of gas.
202
+ // When sending for real without explicit limits, declare the most a single tx may use on this network
203
+ // (the node's per-tx admission limit), so the proposer does not skip the tx for over-declaring gas.
204
+ let fullGasSettings;
205
+ if (forEstimation) {
206
+ // Estimation deliberately uses very high internal limits and skips tx validation, so we do not
207
+ // validate against the network admission limit here.
208
+ fullGasSettings = GasSettings.forEstimation(gasSettingsOverrides);
209
+ } else {
210
+ const maxTxGasLimits = await this.getMaxTxGasLimits();
211
+ // If the caller declared explicit gas limits, reject them up front when they exceed the network's
212
+ // per-tx admission limit (mirroring the node's GasLimitsValidator). Otherwise fill in the limit.
213
+ if (gasSettingsOverrides.gasLimits) {
214
+ assertGasLimitsWithinNetworkLimits(gasSettingsOverrides.gasLimits, maxTxGasLimits);
215
+ }
216
+ fullGasSettings = GasSettings.fallback({
217
+ ...gasSettingsOverrides,
218
+ gasLimits: gasSettingsOverrides.gasLimits ?? maxTxGasLimits
219
+ });
220
+ }
152
221
  this.log.debug(`Using L2 gas settings`, fullGasSettings);
153
222
  return {
154
223
  gasSettings: fullGasSettings,
@@ -157,57 +226,56 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
157
226
  };
158
227
  }
159
228
  /**
160
- * Completes partial user-provided fee options with unreasonably high gas limits
161
- * for gas estimation. Uses the same logic as completeFeeOptions but sets high limits
162
- * to avoid running out of gas during estimation.
163
- * @param from - The address where the transaction is being sent from
164
- * @param feePayer - The address paying for fees (if any fee payment method is embedded in the execution payload)
165
- * @param gasSettings - User-provided partial gas settings
166
- */ async completeFeeOptionsForEstimation(from, feePayer, gasSettings) {
167
- const defaultFeeOptions = await this.completeFeeOptions(from, feePayer, gasSettings);
168
- const { gasSettings: { maxFeesPerGas, maxPriorityFeesPerGas } } = defaultFeeOptions;
169
- // Use unrealistically high gas limits for estimation to avoid running out of gas.
170
- // They will be tuned down after the simulation.
171
- 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);
172
- return {
173
- ...defaultFeeOptions,
174
- gasSettings: gasSettingsForEstimation
175
- };
176
- }
177
- registerSender(address, _alias = '') {
178
- return this.pxe.registerSender(address);
179
- }
180
- async registerContract(instance, artifact, secretKey) {
181
- const existingInstance = await this.pxe.getContractInstance(instance.address);
182
- if (existingInstance) {
183
- // Instance already registered in the wallet
184
- if (artifact) {
185
- const thisContractClass = await getContractClassFromArtifact(artifact);
186
- if (!thisContractClass.id.equals(existingInstance.currentContractClassId)) {
187
- // wallet holds an outdated version of this contract
188
- await this.pxe.updateContract(instance.address, artifact);
189
- instance.currentContractClassId = thisContractClass.id;
190
- }
229
+ * Returns the worst-case min fee across predicted future slots.
230
+ * Falls back to getCurrentMinFees if the node doesn't support getPredictedMinFees.
231
+ * @param estimate - The mana usage estimate to use for fee prediction. Defaults to Limit for conservative estimation.
232
+ */ async getMinFees(estimate = ManaUsageEstimate.Limit) {
233
+ try {
234
+ const predicted = await this.aztecNode.getPredictedMinFees(estimate);
235
+ if (predicted.length === 0) {
236
+ return this.aztecNode.getCurrentMinFees();
191
237
  }
192
- // If no artifact provided, we just use the existing registration
193
- } else {
194
- // Instance not registered yet
195
- if (!artifact) {
196
- // Try to get the artifact from the wallet's contract class storage
197
- artifact = await this.pxe.getContractArtifact(instance.currentContractClassId);
198
- if (!artifact) {
199
- throw new Error(`Cannot register contract at ${instance.address.toString()}: artifact is required but not provided, and wallet does not have the artifact for contract class ${instance.currentContractClassId.toString()}`);
200
- }
238
+ return predicted.reduce((worst, fees)=>fees.feePerL2Gas > worst.feePerL2Gas ? fees : worst);
239
+ } catch (err) {
240
+ // Fallback for old nodes that don't support getPredictedMinFees.
241
+ // Only fall back on method-not-found errors (JSON-RPC code -32601); rethrow others.
242
+ if (err?.cause?.code === -32601 || err?.message?.includes('Method not found')) {
243
+ return this.aztecNode.getCurrentMinFees();
201
244
  }
202
- await this.pxe.registerContract({
203
- artifact,
204
- instance
205
- });
245
+ throw err;
206
246
  }
207
- if (secretKey) {
208
- await this.pxe.registerAccount(secretKey, await computePartialAddress(instance));
247
+ }
248
+ async registerSender(address, _alias = '') {
249
+ await this.pxe.registerTaggingSecretSource({
250
+ kind: 'address-derived',
251
+ sender: address
252
+ });
253
+ return address;
254
+ }
255
+ async registerContract(instance, artifact, secretKeyOrKeys) {
256
+ // Classes and instances are registered independently: register the artifact (if provided) then the instance.
257
+ // Neither call validates that the artifact matches the class the instance runs, a missing artifact only surfaces
258
+ // when the contract is later simulated.
259
+ if (artifact) {
260
+ await this.pxe.registerContractClass(artifact);
209
261
  }
210
- return instance;
262
+ const contractAddress = await this.pxe.registerContract(instance);
263
+ if (secretKeyOrKeys) {
264
+ // PXE never receives the account seed (from which the message-signing/fallback secret keys could be re-derived):
265
+ // the wallet derives the keys here. Of these, PXE only reads and stores the four privacy secret keys and the
266
+ // message-signing and fallback *public* keys — it never touches the message-signing or fallback secret keys.
267
+ //
268
+ // Since PXE recomputes the address from those keys, we assert it matches the instance's address: a mismatch means
269
+ // the provided keys don't correspond to this account.
270
+ const derivedKeys = secretKeyOrKeys instanceof Fr ? await deriveKeys(secretKeyOrKeys) : await deriveKeysFromMasterSecretKeys(secretKeyOrKeys);
271
+ const { address } = await this.pxe.registerAccount(derivedKeys, await computePartialAddress(instance));
272
+ if (!address.equals(contractAddress)) {
273
+ throw new Error(`Registered account address ${address.toString()} does not match contract instance address ${contractAddress.toString()}: the provided keys do not correspond to this account.`);
274
+ }
275
+ }
276
+ }
277
+ registerContractClass(artifact) {
278
+ return this.pxe.registerContractClass(artifact);
211
279
  }
212
280
  /**
213
281
  * Simulates calls through the standard PXE path (account entrypoint).
@@ -215,12 +283,28 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
215
283
  * @param opts - Simulation options.
216
284
  */ async simulateViaEntrypoint(executionPayload, opts) {
217
285
  const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, opts.feeOptions);
218
- return this.pxe.simulateTx(txRequest, {
286
+ const result = await this.pxe.simulateTx(txRequest, {
219
287
  simulatePublic: true,
220
288
  skipTxValidation: opts.skipTxValidation,
221
289
  skipFeeEnforcement: opts.skipFeeEnforcement,
222
- scopes: opts.scopes
290
+ scopes: this.scopesFrom(opts.from, opts.additionalScopes ?? [], opts.sendMessagesAs),
291
+ senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs),
292
+ overrides: opts.overrides
223
293
  });
294
+ const appCallOffset = await this.computeAppCallOffset(opts.from, opts.feeOptions);
295
+ return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
296
+ }
297
+ /**
298
+ * Computes the index where the app's calls begin in the flattened array of calls (0 = entrypoint/root, 1..N = fee
299
+ * calls, N+1 = app).
300
+ * @param from - The sender address, or NO_FROM for the default entrypoint.
301
+ * @param feeOptions - Fee options containing the wallet fee payment method.
302
+ */ async computeAppCallOffset(from, feeOptions) {
303
+ if (from === NO_FROM) {
304
+ return 0;
305
+ }
306
+ const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
307
+ return (feeExecutionPayload?.calls.length ?? 0) + 1; // +1 for entrypoint
224
308
  }
225
309
  /**
226
310
  * Simulates a transaction, optimizing leading public static calls by running them directly
@@ -230,7 +314,13 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
230
314
  * @param opts - Simulation options (from address, fee settings, etc.).
231
315
  * @returns The merged simulation result.
232
316
  */ async simulateTx(executionPayload, opts) {
233
- const feeOptions = opts.fee?.estimateGas ? await this.completeFeeOptionsForEstimation(opts.from, executionPayload.feePayer, opts.fee?.gasSettings) : await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
317
+ const feeOptions = await this.completeFeeOptions({
318
+ from: opts.from,
319
+ feePayer: executionPayload.feePayer,
320
+ gasSettings: opts.fee?.gasSettings,
321
+ forEstimation: true,
322
+ congestionEstimate: opts.fee?.congestionEstimate
323
+ });
234
324
  const { optimizableCalls, remainingCalls } = extractOptimizablePublicStaticCalls(executionPayload);
235
325
  const remainingPayload = {
236
326
  ...executionPayload,
@@ -243,40 +333,53 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
243
333
  try {
244
334
  blockHeader = await this.pxe.getSyncedBlockHeader();
245
335
  } catch {
246
- blockHeader = await this.aztecNode.getBlockHeader();
336
+ blockHeader = (await this.aztecNode.getBlockData('latest')).header;
247
337
  }
248
338
  const simulationOrigin = opts.from === NO_FROM ? AztecAddress.ZERO : opts.from;
249
339
  const [optimizedResults, normalResult] = await Promise.all([
250
- optimizableCalls.length > 0 ? simulateViaNode(this.aztecNode, optimizableCalls, simulationOrigin, chainInfo, feeOptions.gasSettings, blockHeader, opts.skipFeeEnforcement ?? true, this.getContractName.bind(this)) : Promise.resolve([]),
340
+ optimizableCalls.length > 0 ? simulateViaNode(this.aztecNode, optimizableCalls, simulationOrigin, chainInfo, feeOptions.gasSettings, blockHeader, opts.skipFeeEnforcement ?? true, this.getContractName.bind(this), opts.overrides) : Promise.resolve([]),
251
341
  remainingCalls.length > 0 ? this.simulateViaEntrypoint(remainingPayload, {
252
342
  from: opts.from,
253
343
  feeOptions,
254
- scopes: this.scopesFrom(opts.from, opts.additionalScopes),
344
+ additionalScopes: opts.additionalScopes,
255
345
  skipTxValidation: opts.skipTxValidation,
256
- skipFeeEnforcement: opts.skipFeeEnforcement ?? true
346
+ skipFeeEnforcement: opts.skipFeeEnforcement ?? true,
347
+ sendMessagesAs: opts.sendMessagesAs,
348
+ overrides: opts.overrides
257
349
  }) : Promise.resolve(null)
258
350
  ]);
259
351
  return buildMergedSimulationResult(optimizedResults, normalResult);
260
352
  }
261
353
  async profileTx(executionPayload, opts) {
262
- const feeOptions = await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
354
+ const feeOptions = await this.completeFeeOptions({
355
+ from: opts.from,
356
+ feePayer: executionPayload.feePayer,
357
+ gasSettings: opts.fee?.gasSettings,
358
+ congestionEstimate: opts.fee?.congestionEstimate
359
+ });
263
360
  const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, feeOptions);
264
361
  return this.pxe.profileTx(txRequest, {
265
362
  profileMode: opts.profileMode,
266
363
  skipProofGeneration: opts.skipProofGeneration ?? true,
267
- scopes: this.scopesFrom(opts.from, opts.additionalScopes)
364
+ scopes: this.scopesFrom(opts.from, opts.additionalScopes ?? [], opts.sendMessagesAs),
365
+ senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs)
268
366
  });
269
367
  }
270
368
  async sendTx(executionPayload, opts) {
271
- const feeOptions = await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
369
+ const feeOptions = await this.completeFeeOptions({
370
+ from: opts.from,
371
+ feePayer: executionPayload.feePayer,
372
+ gasSettings: opts.fee?.gasSettings,
373
+ congestionEstimate: opts.fee?.congestionEstimate
374
+ });
272
375
  const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, feeOptions);
273
- const provenTx = await this.pxe.proveTx(txRequest, this.scopesFrom(opts.from, opts.additionalScopes));
376
+ const provenTx = await this.pxe.proveTx(txRequest, {
377
+ scopes: this.scopesFrom(opts.from, opts.additionalScopes ?? [], opts.sendMessagesAs),
378
+ senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs)
379
+ });
274
380
  const offchainOutput = extractOffchainOutput(provenTx.getOffchainEffects(), provenTx.publicInputs.constants.anchorBlockHeader.globalVariables.timestamp);
275
381
  const tx = await provenTx.toTx();
276
382
  const txHash = tx.getTxHash();
277
- if (await this.aztecNode.getTxEffect(txHash)) {
278
- throw new Error(`A settled tx with equal hash ${txHash.toString()} exists.`);
279
- }
280
383
  this.log.debug(`Sending transaction ${txHash}`);
281
384
  await this.aztecNode.sendTx(tx).catch((err)=>{
282
385
  throw this.contextualizeError(err, inspect(tx));
@@ -290,10 +393,19 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
290
393
  };
291
394
  }
292
395
  // Otherwise, wait for the full receipt (default behavior on wait: undefined)
293
- const waitOpts = typeof opts.wait === 'object' ? opts.wait : undefined;
294
- const receipt = await waitForTx(this.aztecNode, txHash, waitOpts);
396
+ const callerWaitOpts = typeof opts.wait === 'object' ? opts.wait : undefined;
397
+ const waitOpts = this.defaultWaitInterval !== undefined && callerWaitOpts?.interval === undefined ? {
398
+ ...callerWaitOpts,
399
+ interval: this.defaultWaitInterval
400
+ } : callerWaitOpts;
401
+ // The tx was just sent, so an immediate first poll cannot find it mined; skip one poll interval up front.
402
+ const initialDelay = waitOpts?.initialDelay ?? waitOpts?.interval ?? DefaultWaitOpts.interval;
403
+ const receipt = await waitForTx(this.aztecNode, txHash, {
404
+ ...waitOpts,
405
+ initialDelay
406
+ });
295
407
  // Display debug logs from public execution if present (served in test mode only)
296
- if (receipt.debugLogs?.length) {
408
+ if (receipt.isMined() && receipt.debugLogs?.length) {
297
409
  await displayDebugLogs(receipt.debugLogs, this.getContractName.bind(this));
298
410
  }
299
411
  return {
@@ -309,7 +421,11 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
309
421
  if (!instance) {
310
422
  return undefined;
311
423
  }
312
- const artifact = await this.pxe.getContractArtifact(instance.currentContractClassId);
424
+ // Contract names are class-stable (an upgrade preserves the contract name), so the original class artifact is a
425
+ // sufficient source for the display name without resolving the current class against the node.
426
+ // TODO: if a contract were to be upgraded and its original artifact never registered, then this would fail and we'd
427
+ // want to fallback to the current class.
428
+ const artifact = await this.pxe.getContractArtifact(instance.originalContractClassId);
313
429
  return artifact?.name;
314
430
  }
315
431
  contextualizeError(err, ...context) {
@@ -335,9 +451,7 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
335
451
  const pxeEvents = await this.pxe.getPrivateEvents(eventDef.eventSelector, eventFilter);
336
452
  const decodedEvents = pxeEvents.map((pxeEvent)=>{
337
453
  return {
338
- event: decodeFromAbi([
339
- eventDef.abiType
340
- ], pxeEvent.packedEvent),
454
+ event: decodeFromAbi(eventDef.abiType, pxeEvent.packedEvent),
341
455
  metadata: {
342
456
  l2BlockNumber: pxeEvent.l2BlockNumber,
343
457
  l2BlockHash: pxeEvent.l2BlockHash,
@@ -0,0 +1,36 @@
1
+ import { Gas, type GasUsed } from '@aztec/stdlib/gas';
2
+ /**
3
+ * Returns suggested total and teardown gas limits for a simulated tx, clamped to the network's per-tx
4
+ * admission limits.
5
+ *
6
+ * The network only admits transactions that declare up to `maxTxGasLimits` per dimension (the
7
+ * node-advertised `txsLimits.gas`). Wallets pass the value read from their own node info, but since node info
8
+ * is remote input it is defensively clamped here to the per-tx protocol maxima so a value above them is never
9
+ * honored. If the simulated usage already exceeds the resulting admission limits the tx can never be included,
10
+ * so this throws a descriptive error instead of returning a limit the node would reject. Otherwise it pads the
11
+ * usage and clamps each dimension to the admission limit.
12
+ * @param gasUsed - The gas actually consumed during simulation.
13
+ * @param maxTxGasLimits - The maximum gas a single tx may declare on this network (the node-advertised `txsLimits.gas`).
14
+ * @param pad - Fraction to pad the suggested gas limits by (as a decimal, e.g. 0.1 for 10%). The effective
15
+ * padding shrinks to zero as usage approaches the network limit, since the network will not admit a higher
16
+ * declared limit regardless of the buffer.
17
+ */
18
+ export declare function getGasLimits(gasUsed: GasUsed, maxTxGasLimits: Gas, pad?: number): {
19
+ /**
20
+ * Gas limit for the tx, excluding teardown gas
21
+ */
22
+ gasLimits: Gas;
23
+ /**
24
+ * Gas limit for the teardown phase
25
+ */
26
+ teardownGasLimits: Gas;
27
+ };
28
+ /**
29
+ * Validates that caller-declared gas limits do not exceed the network's per-tx admission limits, throwing a
30
+ * descriptive error per dimension when they do. The node's inbound validation checks declared
31
+ * `gasSettings.gasLimits`, so we mirror that here to surface the rejection locally before the tx is sent.
32
+ * @param gasLimits - The gas limits the transaction will declare.
33
+ * @param maxTxGasLimits - The maximum gas a single tx may declare on this network (the node-advertised `txsLimits.gas`).
34
+ */
35
+ export declare function assertGasLimitsWithinNetworkLimits(gasLimits: Gas, maxTxGasLimits: Gas): void;
36
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2dhc19saW1pdHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9nZXRfZ2FzX2xpbWl0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsR0FBRyxFQUFFLEtBQUssT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFdEQ7Ozs7Ozs7Ozs7Ozs7OztHQWVHO0FBQ0gsd0JBQWdCLFlBQVksQ0FDMUIsT0FBTyxFQUFFLE9BQU8sRUFDaEIsY0FBYyxFQUFFLEdBQUcsRUFDbkIsR0FBRyxTQUFNLEdBQ1I7SUFDRDs7T0FFRztJQUNILFNBQVMsRUFBRSxHQUFHLENBQUM7SUFDZjs7T0FFRztJQUNILGlCQUFpQixFQUFFLEdBQUcsQ0FBQztDQUN4QixDQTZCQTtBQVFEOzs7Ozs7R0FNRztBQUNILHdCQUFnQixrQ0FBa0MsQ0FBQyxTQUFTLEVBQUUsR0FBRyxFQUFFLGNBQWMsRUFBRSxHQUFHLEdBQUcsSUFBSSxDQVc1RiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get_gas_limits.d.ts","sourceRoot":"","sources":["../../src/base-wallet/get_gas_limits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEtD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,GAAG,EACnB,GAAG,SAAM,GACR;IACD;;OAEG;IACH,SAAS,EAAE,GAAG,CAAC;IACf;;OAEG;IACH,iBAAiB,EAAE,GAAG,CAAC;CACxB,CA6BA;AAQD;;;;;;GAMG;AACH,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,GAAG,IAAI,CAW5F"}
@@ -0,0 +1,55 @@
1
+ import { MAX_PROCESSABLE_L2_GAS, MAX_TX_DA_GAS } from '@aztec/constants';
2
+ import { Gas } from '@aztec/stdlib/gas';
3
+ /**
4
+ * Returns suggested total and teardown gas limits for a simulated tx, clamped to the network's per-tx
5
+ * admission limits.
6
+ *
7
+ * The network only admits transactions that declare up to `maxTxGasLimits` per dimension (the
8
+ * node-advertised `txsLimits.gas`). Wallets pass the value read from their own node info, but since node info
9
+ * is remote input it is defensively clamped here to the per-tx protocol maxima so a value above them is never
10
+ * honored. If the simulated usage already exceeds the resulting admission limits the tx can never be included,
11
+ * so this throws a descriptive error instead of returning a limit the node would reject. Otherwise it pads the
12
+ * usage and clamps each dimension to the admission limit.
13
+ * @param gasUsed - The gas actually consumed during simulation.
14
+ * @param maxTxGasLimits - The maximum gas a single tx may declare on this network (the node-advertised `txsLimits.gas`).
15
+ * @param pad - Fraction to pad the suggested gas limits by (as a decimal, e.g. 0.1 for 10%). The effective
16
+ * padding shrinks to zero as usage approaches the network limit, since the network will not admit a higher
17
+ * declared limit regardless of the buffer.
18
+ */ export function getGasLimits(gasUsed, maxTxGasLimits, pad = 0.1) {
19
+ const { totalGas, teardownGas } = gasUsed;
20
+ // `maxTxGasLimits` is the node-advertised admission limit. Node info is remote input, so we defensively
21
+ // clamp to the per-tx protocol maxima so a value above them can never be honored.
22
+ const maxLimits = new Gas(Math.min(maxTxGasLimits.daGas, MAX_TX_DA_GAS), Math.min(maxTxGasLimits.l2Gas, MAX_PROCESSABLE_L2_GAS));
23
+ // The simulated usage must fit within the admission limits, otherwise the tx can never be included.
24
+ if (totalGas.daGas > maxLimits.daGas) {
25
+ throw new Error(`Transaction consumes ${totalGas.daGas} DA gas but the network only admits transactions declaring up to ${maxLimits.daGas} DA gas`);
26
+ }
27
+ if (totalGas.l2Gas > maxLimits.l2Gas) {
28
+ throw new Error(`Transaction consumes ${totalGas.l2Gas} L2 gas but the network only admits transactions declaring up to ${maxLimits.l2Gas} L2 gas`);
29
+ }
30
+ // Pad the limits by the buffer, then cap each dimension at the admission limit so the buffer cannot push a
31
+ // declared limit past what inbound validation accepts. Teardown is part of the total, so clamping it to the
32
+ // admission limit is safe.
33
+ return {
34
+ gasLimits: padGas(totalGas, pad, maxLimits),
35
+ teardownGasLimits: padGas(teardownGas, pad, maxLimits)
36
+ };
37
+ }
38
+ /** Pads each gas dimension, capping it at the network admission limit. */ function padGas(gas, pad, cap) {
39
+ const padded = gas.mul(1 + pad);
40
+ return new Gas(Math.min(padded.daGas, cap.daGas), Math.min(padded.l2Gas, cap.l2Gas));
41
+ }
42
+ /**
43
+ * Validates that caller-declared gas limits do not exceed the network's per-tx admission limits, throwing a
44
+ * descriptive error per dimension when they do. The node's inbound validation checks declared
45
+ * `gasSettings.gasLimits`, so we mirror that here to surface the rejection locally before the tx is sent.
46
+ * @param gasLimits - The gas limits the transaction will declare.
47
+ * @param maxTxGasLimits - The maximum gas a single tx may declare on this network (the node-advertised `txsLimits.gas`).
48
+ */ export function assertGasLimitsWithinNetworkLimits(gasLimits, maxTxGasLimits) {
49
+ if (gasLimits.daGas > maxTxGasLimits.daGas) {
50
+ throw new Error(`Declared DA gas limit (${gasLimits.daGas}) exceeds the maximum this network allows per tx (${maxTxGasLimits.daGas})`);
51
+ }
52
+ if (gasLimits.l2Gas > maxTxGasLimits.l2Gas) {
53
+ throw new Error(`Declared L2 gas limit (${gasLimits.l2Gas}) exceeds the maximum this network allows per tx (${maxTxGasLimits.l2Gas})`);
54
+ }
55
+ }
@@ -1,3 +1,4 @@
1
- export { BaseWallet, type FeeOptions, type SimulateViaEntrypointOptions } from './base_wallet.js';
1
+ export { BaseWallet, type CompleteFeeOptionsConfig, type FeeOptions, type SimulateViaEntrypointOptions, } from './base_wallet.js';
2
2
  export { simulateViaNode, buildMergedSimulationResult, extractOptimizablePublicStaticCalls } from './utils.js';
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssVUFBVSxFQUFFLEtBQUssNEJBQTRCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNsRyxPQUFPLEVBQUUsZUFBZSxFQUFFLDJCQUEyQixFQUFFLG1DQUFtQyxFQUFFLE1BQU0sWUFBWSxDQUFDIn0=
3
+ export { getGasLimits, assertGasLimitsWithinNetworkLimits } from './get_gas_limits.js';
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssVUFBVSxFQUNmLEtBQUssNEJBQTRCLEdBQ2xDLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLGVBQWUsRUFBRSwyQkFBMkIsRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUMvRyxPQUFPLEVBQUUsWUFBWSxFQUFFLGtDQUFrQyxFQUFFLE1BQU0scUJBQXFCLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base-wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AAClG,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC"}
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;AAC/G,OAAO,EAAE,YAAY,EAAE,kCAAkC,EAAE,MAAM,qBAAqB,CAAC"}
@@ -1,2 +1,3 @@
1
1
  export { BaseWallet } from './base_wallet.js';
2
2
  export { simulateViaNode, buildMergedSimulationResult, extractOptimizablePublicStaticCalls } from './utils.js';
3
+ export { getGasLimits, assertGasLimitsWithinNetworkLimits } from './get_gas_limits.js';
@@ -1,10 +1,11 @@
1
1
  import type { AztecNode } from '@aztec/aztec.js/node';
2
+ import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
2
3
  import type { ChainInfo } from '@aztec/entrypoints/interfaces';
3
4
  import type { ContractNameResolver } from '@aztec/pxe/client/lazy';
4
5
  import { type FunctionCall } from '@aztec/stdlib/abi';
5
6
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
6
7
  import type { GasSettings } from '@aztec/stdlib/gas';
7
- import { type BlockHeader, type ExecutionPayload, TxSimulationResult } from '@aztec/stdlib/tx';
8
+ import { type BlockHeader, type ExecutionPayload, type SimulationOverrides, TxSimulationResult } from '@aztec/stdlib/tx';
8
9
  /**
9
10
  * Splits an execution payload into a leading prefix of public static calls
10
11
  * (eligible for direct node simulation) and the remaining calls.
@@ -32,9 +33,11 @@ export declare function extractOptimizablePublicStaticCalls(payload: ExecutionPa
32
33
  * @param gasSettings - Gas settings for the transaction.
33
34
  * @param blockHeader - Block header to use as anchor.
34
35
  * @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
36
+ * @param getContractName - Resolver for contract names (used for debug log display).
37
+ * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
35
38
  * @returns Array of TxSimulationResult, one per batch.
36
39
  */
37
- export declare function simulateViaNode(node: AztecNode, publicStaticCalls: FunctionCall[], from: AztecAddress, chainInfo: ChainInfo, gasSettings: GasSettings, blockHeader: BlockHeader, skipFeeEnforcement: boolean | undefined, getContractName: ContractNameResolver): Promise<TxSimulationResult[]>;
40
+ export declare function simulateViaNode(node: AztecNode, publicStaticCalls: FunctionCall[], from: AztecAddress, chainInfo: ChainInfo, gasSettings: GasSettings, blockHeader: BlockHeader, skipFeeEnforcement: boolean | undefined, getContractName: ContractNameResolver, overrides?: SimulationOverrides): Promise<TxSimulationResult[]>;
38
41
  /**
39
42
  * Merges simulation results from the optimized (public static) and normal paths.
40
43
  * Since optimized calls are always a leading prefix, return values are simply
@@ -45,5 +48,5 @@ export declare function simulateViaNode(node: AztecNode, publicStaticCalls: Func
45
48
  * @param normalResult - Result from normal simulation (null if all calls were optimized).
46
49
  * @returns A single TxSimulationResult with return values in original call order.
47
50
  */
48
- export declare function buildMergedSimulationResult(optimizedResults: TxSimulationResult[], normalResult: TxSimulationResult | null): TxSimulationResult;
49
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV0RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUkvRCxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR25FLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBb0IsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVFyRCxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLEtBQUssZ0JBQWdCLEVBT3JCLGtCQUFrQixFQUNuQixNQUFNLGtCQUFrQixDQUFDO0FBRTFCOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQixtQ0FBbUMsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUc7SUFDOUUsdUVBQXVFO0lBQ3ZFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ2pDLDJCQUEyQjtJQUMzQixjQUFjLEVBQUUsWUFBWSxFQUFFLENBQUM7Q0FDaEMsQ0FPQTtBQXVHRDs7Ozs7Ozs7Ozs7O0dBWUc7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxJQUFJLEVBQUUsU0FBUyxFQUNmLGlCQUFpQixFQUFFLFlBQVksRUFBRSxFQUNqQyxJQUFJLEVBQUUsWUFBWSxFQUNsQixTQUFTLEVBQUUsU0FBUyxFQUNwQixXQUFXLEVBQUUsV0FBVyxFQUN4QixXQUFXLEVBQUUsV0FBVyxFQUN4QixrQkFBa0IscUJBQWdCLEVBQ2xDLGVBQWUsRUFBRSxvQkFBb0IsR0FDcEMsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0F3Qi9CO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsd0JBQWdCLDJCQUEyQixDQUN6QyxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxFQUN0QyxZQUFZLEVBQUUsa0JBQWtCLEdBQUcsSUFBSSxHQUN0QyxrQkFBa0IsQ0FvQnBCIn0=
51
+ export declare function buildMergedSimulationResult(optimizedResults: TxSimulationResult[], normalResult: TxSimulationResultWithAppOffset | null): TxSimulationResultWithAppOffset;
52
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUV6RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUkvRCxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR25FLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBb0IsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVFyRCxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLEtBQUssZ0JBQWdCLEVBS3JCLEtBQUssbUJBQW1CLEVBR3hCLGtCQUFrQixFQUNuQixNQUFNLGtCQUFrQixDQUFDO0FBRTFCOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQixtQ0FBbUMsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUc7SUFDOUUsdUVBQXVFO0lBQ3ZFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ2pDLDJCQUEyQjtJQUMzQixjQUFjLEVBQUUsWUFBWSxFQUFFLENBQUM7Q0FDaEMsQ0FPQTtBQTBHRDs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHdCQUFzQixlQUFlLENBQ25DLElBQUksRUFBRSxTQUFTLEVBQ2YsaUJBQWlCLEVBQUUsWUFBWSxFQUFFLEVBQ2pDLElBQUksRUFBRSxZQUFZLEVBQ2xCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLGtCQUFrQixxQkFBZ0IsRUFDbEMsZUFBZSxFQUFFLG9CQUFvQixFQUNyQyxTQUFTLENBQUMsRUFBRSxtQkFBbUIsR0FDOUIsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0F5Qi9CO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsd0JBQWdCLDJCQUEyQixDQUN6QyxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxFQUN0QyxZQUFZLEVBQUUsK0JBQStCLEdBQUcsSUFBSSxHQUNuRCwrQkFBK0IsQ0FxQmpDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base-wallet/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAI/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQrD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAOrB,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAC9E,uEAAuE;IACvE,gBAAgB,EAAE,YAAY,EAAE,CAAC;IACjC,2BAA2B;IAC3B,cAAc,EAAE,YAAY,EAAE,CAAC;CAChC,CAOA;AAuGD;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,EACf,iBAAiB,EAAE,YAAY,EAAE,EACjC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,kBAAkB,qBAAgB,EAClC,eAAe,EAAE,oBAAoB,GACpC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAwB/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,gBAAgB,EAAE,kBAAkB,EAAE,EACtC,YAAY,EAAE,kBAAkB,GAAG,IAAI,GACtC,kBAAkB,CAoBpB"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base-wallet/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAI/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQrD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAKrB,KAAK,mBAAmB,EAGxB,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAC9E,uEAAuE;IACvE,gBAAgB,EAAE,YAAY,EAAE,CAAC;IACjC,2BAA2B;IAC3B,cAAc,EAAE,YAAY,EAAE,CAAC;CAChC,CAOA;AA0GD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,EACf,iBAAiB,EAAE,YAAY,EAAE,EACjC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,kBAAkB,qBAAgB,EAClC,eAAe,EAAE,oBAAoB,EACrC,SAAS,CAAC,EAAE,mBAAmB,GAC9B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAyB/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,gBAAgB,EAAE,kBAAkB,EAAE,EACtC,YAAY,EAAE,+BAA+B,GAAG,IAAI,GACnD,+BAA+B,CAqBjC"}