@aztec/aztec.js 0.47.1 → 0.49.2
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/api/fee.d.ts +2 -2
- package/dest/api/fee.d.ts.map +1 -1
- package/dest/api/fee.js +3 -3
- package/dest/contract/base_contract_interaction.d.ts +1 -1
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.d.ts +2 -0
- package/dest/contract/contract_function_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.js +2 -2
- package/dest/contract/sent_tx.d.ts +6 -0
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +12 -1
- package/dest/entrypoint/payload.js +3 -3
- package/dest/fee/{native_fee_payment_method.d.ts → fee_juice_payment_method.d.ts} +3 -3
- package/dest/fee/fee_juice_payment_method.d.ts.map +1 -0
- package/dest/fee/fee_juice_payment_method.js +19 -0
- package/dest/fee/{native_fee_payment_method_with_claim.d.ts → fee_juice_payment_method_with_claim.d.ts} +5 -5
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map +1 -0
- package/dest/fee/fee_juice_payment_method_with_claim.js +32 -0
- package/dest/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +3 -3
- package/dest/rpc_clients/index.d.ts +1 -0
- package/dest/rpc_clients/index.d.ts.map +1 -1
- package/dest/rpc_clients/index.js +2 -1
- package/dest/rpc_clients/node/index.d.ts +11 -0
- package/dest/rpc_clients/node/index.d.ts.map +1 -0
- package/dest/rpc_clients/node/index.js +62 -0
- package/dest/rpc_clients/pxe_client.d.ts.map +1 -1
- package/dest/rpc_clients/pxe_client.js +5 -2
- package/dest/utils/authwit.js +4 -4
- package/dest/utils/cheat_codes.d.ts +15 -6
- package/dest/utils/cheat_codes.d.ts.map +1 -1
- package/dest/utils/cheat_codes.js +34 -18
- package/dest/wallet/account_wallet.js +2 -2
- package/dest/wallet/base_wallet.d.ts +7 -6
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +10 -10
- package/package.json +8 -7
- package/src/api/fee.ts +2 -2
- package/src/contract/contract_function_interaction.ts +3 -1
- package/src/contract/sent_tx.ts +21 -0
- package/src/entrypoint/payload.ts +2 -2
- package/src/fee/{native_fee_payment_method.ts → fee_juice_payment_method.ts} +4 -4
- package/src/fee/{native_fee_payment_method_with_claim.ts → fee_juice_payment_method_with_claim.ts} +6 -6
- package/src/index.ts +2 -1
- package/src/rpc_clients/index.ts +1 -0
- package/src/rpc_clients/node/index.ts +69 -0
- package/src/rpc_clients/pxe_client.ts +4 -0
- package/src/utils/authwit.ts +3 -3
- package/src/utils/cheat_codes.ts +35 -17
- package/src/wallet/account_wallet.ts +1 -1
- package/src/wallet/base_wallet.ts +17 -11
- package/dest/fee/native_fee_payment_method.d.ts.map +0 -1
- package/dest/fee/native_fee_payment_method.js +0 -19
- package/dest/fee/native_fee_payment_method_with_claim.d.ts.map +0 -1
- package/dest/fee/native_fee_payment_method_with_claim.js +0 -32
|
@@ -66,11 +66,21 @@ export declare class EthCheatCodes {
|
|
|
66
66
|
* @returns The current chainId
|
|
67
67
|
*/
|
|
68
68
|
mine(numberOfBlocks?: number): Promise<void>;
|
|
69
|
+
/**
|
|
70
|
+
* Set the interval between blocks (block time)
|
|
71
|
+
* @param interval - The interval to use between blocks
|
|
72
|
+
*/
|
|
73
|
+
setBlockInterval(interval: number): Promise<void>;
|
|
69
74
|
/**
|
|
70
75
|
* Set the next block timestamp
|
|
71
76
|
* @param timestamp - The timestamp to set the next block to
|
|
72
77
|
*/
|
|
73
78
|
setNextBlockTimestamp(timestamp: number): Promise<void>;
|
|
79
|
+
/**
|
|
80
|
+
* Set the next block timestamp and mines the block
|
|
81
|
+
* @param timestamp - The timestamp to set the next block to
|
|
82
|
+
*/
|
|
83
|
+
warp(timestamp: number): Promise<void>;
|
|
74
84
|
/**
|
|
75
85
|
* Dumps the current chain state to a file.
|
|
76
86
|
* @param fileName - The file name to dump state into
|
|
@@ -156,22 +166,21 @@ export declare class AztecCheatCodes {
|
|
|
156
166
|
logger?: import("@aztec/foundation/log").Logger);
|
|
157
167
|
/**
|
|
158
168
|
* Computes the slot value for a given map and key.
|
|
159
|
-
* @param
|
|
169
|
+
* @param mapSlot - The slot of the map (specified in Aztec.nr contract)
|
|
160
170
|
* @param key - The key to lookup in the map
|
|
161
171
|
* @returns The storage slot of the value in the map
|
|
162
172
|
*/
|
|
163
|
-
computeSlotInMap(
|
|
173
|
+
computeSlotInMap(mapSlot: Fr | bigint, key: Fr | bigint | AztecAddress): Fr;
|
|
164
174
|
/**
|
|
165
175
|
* Get the current blocknumber
|
|
166
176
|
* @returns The current block number
|
|
167
177
|
*/
|
|
168
178
|
blockNumber(): Promise<number>;
|
|
169
179
|
/**
|
|
170
|
-
*
|
|
171
|
-
*
|
|
172
|
-
* @param to - The timestamp to set the next block to (must be greater than current time)
|
|
180
|
+
* Get the current timestamp
|
|
181
|
+
* @returns The current timestamp
|
|
173
182
|
*/
|
|
174
|
-
|
|
183
|
+
timestamp(): Promise<number>;
|
|
175
184
|
/**
|
|
176
185
|
* Loads the value stored at the given slot in the public storage of the given contract.
|
|
177
186
|
* @param who - The address of the contract
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/utils/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/utils/cheat_codes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Fr } from '@aztec/circuits.js';
|
|
2
|
+
import { deriveStorageSlotInMap } from '@aztec/circuits.js/hash';
|
|
2
3
|
import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
|
|
3
|
-
import { keccak256
|
|
4
|
+
import { keccak256 } from '@aztec/foundation/crypto';
|
|
4
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
5
6
|
import fs from 'fs';
|
|
6
7
|
/**
|
|
@@ -86,6 +87,17 @@ export class EthCheatCodes {
|
|
|
86
87
|
}
|
|
87
88
|
this.logger.info(`Mined ${numberOfBlocks} blocks`);
|
|
88
89
|
}
|
|
90
|
+
/**
|
|
91
|
+
* Set the interval between blocks (block time)
|
|
92
|
+
* @param interval - The interval to use between blocks
|
|
93
|
+
*/
|
|
94
|
+
async setBlockInterval(interval) {
|
|
95
|
+
const res = await this.rpcCall('anvil_setBlockTimestampInterval', [interval]);
|
|
96
|
+
if (res.error) {
|
|
97
|
+
throw new Error(`Error setting block interval: ${res.error.message}`);
|
|
98
|
+
}
|
|
99
|
+
this.logger.info(`Set block interval to ${interval}`);
|
|
100
|
+
}
|
|
89
101
|
/**
|
|
90
102
|
* Set the next block timestamp
|
|
91
103
|
* @param timestamp - The timestamp to set the next block to
|
|
@@ -97,6 +109,18 @@ export class EthCheatCodes {
|
|
|
97
109
|
}
|
|
98
110
|
this.logger.info(`Set next block timestamp to ${timestamp}`);
|
|
99
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* Set the next block timestamp and mines the block
|
|
114
|
+
* @param timestamp - The timestamp to set the next block to
|
|
115
|
+
*/
|
|
116
|
+
async warp(timestamp) {
|
|
117
|
+
const res = await this.rpcCall('evm_setNextBlockTimestamp', [timestamp]);
|
|
118
|
+
if (res.error) {
|
|
119
|
+
throw new Error(`Error warping: ${res.error.message}`);
|
|
120
|
+
}
|
|
121
|
+
await this.mine();
|
|
122
|
+
this.logger.info(`Warped to ${timestamp}`);
|
|
123
|
+
}
|
|
100
124
|
/**
|
|
101
125
|
* Dumps the current chain state to a file.
|
|
102
126
|
* @param fileName - The file name to dump state into
|
|
@@ -224,14 +248,12 @@ export class AztecCheatCodes {
|
|
|
224
248
|
}
|
|
225
249
|
/**
|
|
226
250
|
* Computes the slot value for a given map and key.
|
|
227
|
-
* @param
|
|
251
|
+
* @param mapSlot - The slot of the map (specified in Aztec.nr contract)
|
|
228
252
|
* @param key - The key to lookup in the map
|
|
229
253
|
* @returns The storage slot of the value in the map
|
|
230
254
|
*/
|
|
231
|
-
computeSlotInMap(
|
|
232
|
-
|
|
233
|
-
// aztec3-packages/aztec-nr/aztec/src/state_vars/map.nr
|
|
234
|
-
return pedersenHash([new Fr(baseSlot), new Fr(key)]);
|
|
255
|
+
computeSlotInMap(mapSlot, key) {
|
|
256
|
+
return deriveStorageSlotInMap(mapSlot, new Fr(key));
|
|
235
257
|
}
|
|
236
258
|
/**
|
|
237
259
|
* Get the current blocknumber
|
|
@@ -241,18 +263,12 @@ export class AztecCheatCodes {
|
|
|
241
263
|
return await this.pxe.getBlockNumber();
|
|
242
264
|
}
|
|
243
265
|
/**
|
|
244
|
-
*
|
|
245
|
-
*
|
|
246
|
-
* @param to - The timestamp to set the next block to (must be greater than current time)
|
|
266
|
+
* Get the current timestamp
|
|
267
|
+
* @returns The current timestamp
|
|
247
268
|
*/
|
|
248
|
-
async
|
|
249
|
-
const
|
|
250
|
-
|
|
251
|
-
// also store this time on the rollup contract (slot 2 tracks `lastBlockTs`).
|
|
252
|
-
// This is because when the sequencer executes public functions, it uses the timestamp stored in the rollup contract.
|
|
253
|
-
await this.eth.store(rollupContract, 7n, BigInt(to));
|
|
254
|
-
// also store this on slot of the rollup contract (`lastWarpedBlockTs`) which tracks the last time warp was used.
|
|
255
|
-
await this.eth.store(rollupContract, 8n, BigInt(to));
|
|
269
|
+
async timestamp() {
|
|
270
|
+
const res = await this.pxe.getBlock(await this.blockNumber());
|
|
271
|
+
return res?.header.globalVariables.timestamp.toNumber() ?? 0;
|
|
256
272
|
}
|
|
257
273
|
/**
|
|
258
274
|
* Loads the value stored at the given slot in the public storage of the given contract.
|
|
@@ -280,4 +296,4 @@ export class AztecCheatCodes {
|
|
|
280
296
|
return extendedNotes.map(extendedNote => extendedNote.note);
|
|
281
297
|
}
|
|
282
298
|
}
|
|
283
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
299
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cheat_codes.js","sourceRoot":"","sources":["../../src/utils/cheat_codes.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ import { BaseWallet } from './base_wallet.js';
|
|
|
9
9
|
*/
|
|
10
10
|
export class AccountWallet extends BaseWallet {
|
|
11
11
|
constructor(pxe, account) {
|
|
12
|
-
super(pxe);
|
|
12
|
+
super(pxe, [account.getAddress()]);
|
|
13
13
|
this.account = account;
|
|
14
14
|
}
|
|
15
15
|
createTxExecutionRequest(exec) {
|
|
@@ -237,4 +237,4 @@ export class AccountWallet extends BaseWallet {
|
|
|
237
237
|
};
|
|
238
238
|
}
|
|
239
239
|
}
|
|
240
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
240
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account_wallet.js","sourceRoot":"","sources":["../../src/wallet/account_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { type AuthWitness, type EventMetadata, type EventType, type ExtendedNote, type GetUnencryptedLogsResponse, type IncomingNotesFilter, type L2Block, type LogFilter, type OutgoingNotesFilter, type PXE, type PXEInfo, type SimulatedTx, type SyncStatus, type Tx, type TxEffect, type TxExecutionRequest, type TxHash, type TxReceipt } from '@aztec/circuit-types';
|
|
2
|
+
import { type AuthWitness, type EventMetadata, type EventType, type ExtendedNote, type GetUnencryptedLogsResponse, type IncomingNotesFilter, type L2Block, type LogFilter, type OutgoingNotesFilter, type PXE, type PXEInfo, type SimulatedTx, type SyncStatus, type Tx, type TxEffect, type TxExecutionRequest, type TxHash, type TxReceipt, type UniqueNote } from '@aztec/circuit-types';
|
|
3
3
|
import { type NoteProcessorStats } from '@aztec/circuit-types/stats';
|
|
4
4
|
import { type AztecAddress, type CompleteAddress, type Fq, type Fr, type PartialAddress, type Point } from '@aztec/circuits.js';
|
|
5
5
|
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
@@ -13,13 +13,15 @@ import { type IntentAction, type IntentInnerHash } from '../utils/authwit.js';
|
|
|
13
13
|
*/
|
|
14
14
|
export declare abstract class BaseWallet implements Wallet {
|
|
15
15
|
protected readonly pxe: PXE;
|
|
16
|
-
|
|
16
|
+
private scopes?;
|
|
17
|
+
constructor(pxe: PXE, scopes?: AztecAddress[] | undefined);
|
|
17
18
|
abstract getCompleteAddress(): CompleteAddress;
|
|
18
19
|
abstract getChainId(): Fr;
|
|
19
20
|
abstract getVersion(): Fr;
|
|
20
21
|
abstract createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest>;
|
|
21
22
|
abstract createAuthWit(intent: Fr | Buffer | IntentInnerHash | IntentAction): Promise<AuthWitness>;
|
|
22
23
|
abstract rotateNullifierKeys(newNskM: Fq): Promise<void>;
|
|
24
|
+
setScopes(scopes: AztecAddress[]): void;
|
|
23
25
|
getAddress(): AztecAddress;
|
|
24
26
|
getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
|
|
25
27
|
getContractClass(id: Fr): Promise<ContractClassWithId | undefined>;
|
|
@@ -39,13 +41,12 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
39
41
|
registerContractClass(artifact: ContractArtifact): Promise<void>;
|
|
40
42
|
getContracts(): Promise<AztecAddress[]>;
|
|
41
43
|
proveTx(txRequest: TxExecutionRequest, simulatePublic: boolean): Promise<Tx>;
|
|
42
|
-
simulateTx(txRequest: TxExecutionRequest, simulatePublic: boolean, msgSender?: AztecAddress): Promise<SimulatedTx>;
|
|
44
|
+
simulateTx(txRequest: TxExecutionRequest, simulatePublic: boolean, msgSender?: AztecAddress, skipTxValidation?: boolean): Promise<SimulatedTx>;
|
|
43
45
|
sendTx(tx: Tx): Promise<TxHash>;
|
|
44
46
|
getTxEffect(txHash: TxHash): Promise<TxEffect | undefined>;
|
|
45
47
|
getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
|
|
46
|
-
getIncomingNotes(filter: IncomingNotesFilter): Promise<
|
|
47
|
-
getOutgoingNotes(filter: OutgoingNotesFilter): Promise<
|
|
48
|
-
getNoteNonces(note: ExtendedNote): Promise<Fr[]>;
|
|
48
|
+
getIncomingNotes(filter: IncomingNotesFilter): Promise<UniqueNote[]>;
|
|
49
|
+
getOutgoingNotes(filter: OutgoingNotesFilter): Promise<UniqueNote[]>;
|
|
49
50
|
getPublicStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any>;
|
|
50
51
|
addNote(note: ExtendedNote): Promise<void>;
|
|
51
52
|
addNullifiedNote(note: ExtendedNote): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,mBAAmB,EACxB,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,EAAE,EACP,KAAK,QAAQ,EACb,KAAK,kBAAkB,EACvB,KAAK,MAAM,EACX,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,12 @@
|
|
|
2
2
|
* A base class for Wallet implementations
|
|
3
3
|
*/
|
|
4
4
|
export class BaseWallet {
|
|
5
|
-
constructor(pxe) {
|
|
5
|
+
constructor(pxe, scopes) {
|
|
6
6
|
this.pxe = pxe;
|
|
7
|
+
this.scopes = scopes;
|
|
8
|
+
}
|
|
9
|
+
setScopes(scopes) {
|
|
10
|
+
this.scopes = scopes;
|
|
7
11
|
}
|
|
8
12
|
getAddress() {
|
|
9
13
|
return this.getCompleteAddress().address;
|
|
@@ -51,10 +55,10 @@ export class BaseWallet {
|
|
|
51
55
|
return this.pxe.getContracts();
|
|
52
56
|
}
|
|
53
57
|
proveTx(txRequest, simulatePublic) {
|
|
54
|
-
return this.pxe.proveTx(txRequest, simulatePublic);
|
|
58
|
+
return this.pxe.proveTx(txRequest, simulatePublic, this.scopes);
|
|
55
59
|
}
|
|
56
|
-
simulateTx(txRequest, simulatePublic, msgSender) {
|
|
57
|
-
return this.pxe.simulateTx(txRequest, simulatePublic, msgSender);
|
|
60
|
+
simulateTx(txRequest, simulatePublic, msgSender, skipTxValidation) {
|
|
61
|
+
return this.pxe.simulateTx(txRequest, simulatePublic, msgSender, skipTxValidation, this.scopes);
|
|
58
62
|
}
|
|
59
63
|
sendTx(tx) {
|
|
60
64
|
return this.pxe.sendTx(tx);
|
|
@@ -71,15 +75,11 @@ export class BaseWallet {
|
|
|
71
75
|
getOutgoingNotes(filter) {
|
|
72
76
|
return this.pxe.getOutgoingNotes(filter);
|
|
73
77
|
}
|
|
74
|
-
// TODO(#4956): Un-expose this
|
|
75
|
-
getNoteNonces(note) {
|
|
76
|
-
return this.pxe.getNoteNonces(note);
|
|
77
|
-
}
|
|
78
78
|
getPublicStorageAt(contract, storageSlot) {
|
|
79
79
|
return this.pxe.getPublicStorageAt(contract, storageSlot);
|
|
80
80
|
}
|
|
81
81
|
addNote(note) {
|
|
82
|
-
return this.pxe.addNote(note);
|
|
82
|
+
return this.pxe.addNote(note, this.getAddress());
|
|
83
83
|
}
|
|
84
84
|
addNullifiedNote(note) {
|
|
85
85
|
return this.pxe.addNullifiedNote(note);
|
|
@@ -139,4 +139,4 @@ export class BaseWallet {
|
|
|
139
139
|
return this.pxe.getEvents(type, eventMetadata, from, limit, vpks);
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV93YWxsZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2Jhc2Vfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXNDQTs7R0FFRztBQUNILE1BQU0sT0FBZ0IsVUFBVTtJQUM5QixZQUErQixHQUFRLEVBQVUsTUFBdUI7UUFBekMsUUFBRyxHQUFILEdBQUcsQ0FBSztRQUFVLFdBQU0sR0FBTixNQUFNLENBQWlCO0lBQUcsQ0FBQztJQWM1RSxTQUFTLENBQUMsTUFBc0I7UUFDOUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLE9BQU8sQ0FBQztJQUMzQyxDQUFDO0lBQ0QsbUJBQW1CLENBQUMsT0FBcUI7UUFDdkMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQy9DLENBQUM7SUFDRCxnQkFBZ0IsQ0FBQyxFQUFNO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBQ0QsbUJBQW1CLENBQUMsRUFBTTtRQUN4QixPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsbUJBQW1CLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUNELFVBQVUsQ0FBQyxPQUFhO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUNELGVBQWUsQ0FBQyxTQUFhLEVBQUUsY0FBOEI7UUFDM0QsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUNELFVBQVUsQ0FBQyxPQUFxQixFQUFFLFNBQWE7UUFDN0MsT0FBTyxJQUFJLENB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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec.js",
|
|
3
3
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.49.2",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": "./dest/index.js",
|
|
@@ -73,12 +73,13 @@
|
|
|
73
73
|
]
|
|
74
74
|
},
|
|
75
75
|
"dependencies": {
|
|
76
|
-
"@aztec/circuit-types": "0.
|
|
77
|
-
"@aztec/circuits.js": "0.
|
|
78
|
-
"@aztec/ethereum": "0.
|
|
79
|
-
"@aztec/foundation": "0.
|
|
80
|
-
"@aztec/protocol-contracts": "0.
|
|
81
|
-
"@aztec/types": "0.
|
|
76
|
+
"@aztec/circuit-types": "0.49.2",
|
|
77
|
+
"@aztec/circuits.js": "0.49.2",
|
|
78
|
+
"@aztec/ethereum": "0.49.2",
|
|
79
|
+
"@aztec/foundation": "0.49.2",
|
|
80
|
+
"@aztec/protocol-contracts": "0.49.2",
|
|
81
|
+
"@aztec/types": "0.49.2",
|
|
82
|
+
"axios": "^1.7.2",
|
|
82
83
|
"tslib": "^2.4.0"
|
|
83
84
|
},
|
|
84
85
|
"devDependencies": {
|
package/src/api/fee.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export type { FeePaymentMethod } from '../fee/fee_payment_method.js';
|
|
2
|
-
export {
|
|
2
|
+
export { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
|
|
3
3
|
export { PrivateFeePaymentMethod } from '../fee/private_fee_payment_method.js';
|
|
4
4
|
export { PublicFeePaymentMethod } from '../fee/public_fee_payment_method.js';
|
|
5
|
-
export {
|
|
5
|
+
export { FeeJuicePaymentMethodWithClaim } from '../fee/fee_juice_payment_method_with_claim.js';
|
|
6
6
|
export { NoFeePaymentMethod } from '../fee/no_fee_payment_method.js';
|
|
@@ -23,6 +23,8 @@ export type SimulateMethodOptions = {
|
|
|
23
23
|
from?: AztecAddress;
|
|
24
24
|
/** Gas settings for the simulation. */
|
|
25
25
|
gasSettings?: GasSettings;
|
|
26
|
+
/** Simulate without checking for the validity of the resulting transaction, e.g. whether it emits any existing nullifiers. */
|
|
27
|
+
skipTxValidation?: boolean;
|
|
26
28
|
};
|
|
27
29
|
|
|
28
30
|
/**
|
|
@@ -93,7 +95,7 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
|
|
|
93
95
|
}
|
|
94
96
|
|
|
95
97
|
const txRequest = await this.create();
|
|
96
|
-
const simulatedTx = await this.wallet.simulateTx(txRequest, true, options?.from);
|
|
98
|
+
const simulatedTx = await this.wallet.simulateTx(txRequest, true, options?.from, options?.skipTxValidation);
|
|
97
99
|
|
|
98
100
|
// As account entrypoints are private, for private functions we retrieve the return values from the first nested call
|
|
99
101
|
// since we're interested in the first set of values AFTER the account entrypoint
|
package/src/contract/sent_tx.ts
CHANGED
|
@@ -13,8 +13,12 @@ import { type FieldsOf } from '@aztec/foundation/types';
|
|
|
13
13
|
export type WaitOpts = {
|
|
14
14
|
/** The maximum time (in seconds) to wait for the transaction to be mined. Defaults to 60. */
|
|
15
15
|
timeout?: number;
|
|
16
|
+
/** The maximum time (in seconds) to wait for the transaction to be proven. Defaults to 600. */
|
|
17
|
+
provenTimeout?: number;
|
|
16
18
|
/** The time interval (in seconds) between retries to fetch the transaction receipt. Defaults to 1. */
|
|
17
19
|
interval?: number;
|
|
20
|
+
/** Whether to wait for the tx to be proven. */
|
|
21
|
+
proven?: boolean;
|
|
18
22
|
/**
|
|
19
23
|
* Whether to wait for the PXE Service to sync all notes up to the block in which this tx was mined.
|
|
20
24
|
* If false, then any queries that depend on state set by this transaction may return stale data. Defaults to true.
|
|
@@ -28,6 +32,7 @@ export type WaitOpts = {
|
|
|
28
32
|
|
|
29
33
|
export const DefaultWaitOpts: WaitOpts = {
|
|
30
34
|
timeout: 60,
|
|
35
|
+
provenTimeout: 600,
|
|
31
36
|
interval: 1,
|
|
32
37
|
waitForNotesSync: true,
|
|
33
38
|
debug: false,
|
|
@@ -45,6 +50,7 @@ export class SentTx {
|
|
|
45
50
|
* The function internally awaits for the 'txHashPromise' to resolve, and then returns the resolved transaction hash.
|
|
46
51
|
*
|
|
47
52
|
* @returns A promise that resolves to the transaction hash of the SentTx instance.
|
|
53
|
+
* TODO(#7717): Don't throw here.
|
|
48
54
|
*/
|
|
49
55
|
public getTxHash(): Promise<TxHash> {
|
|
50
56
|
return this.txHashPromise;
|
|
@@ -77,6 +83,9 @@ export class SentTx {
|
|
|
77
83
|
`Transaction ${await this.getTxHash()} was ${receipt.status}. Reason: ${receipt.error ?? 'unknown'}`,
|
|
78
84
|
);
|
|
79
85
|
}
|
|
86
|
+
if (opts?.proven && receipt.blockNumber !== undefined) {
|
|
87
|
+
await this.waitForProven(receipt.blockNumber, opts);
|
|
88
|
+
}
|
|
80
89
|
if (opts?.debug) {
|
|
81
90
|
const txHash = await this.getTxHash();
|
|
82
91
|
const tx = (await this.pxe.getTxEffect(txHash))!;
|
|
@@ -143,4 +152,16 @@ export class SentTx {
|
|
|
143
152
|
opts?.interval ?? DefaultWaitOpts.interval,
|
|
144
153
|
);
|
|
145
154
|
}
|
|
155
|
+
|
|
156
|
+
protected async waitForProven(minedBlock: number, opts?: WaitOpts) {
|
|
157
|
+
return await retryUntil(
|
|
158
|
+
async () => {
|
|
159
|
+
const provenBlock = await this.pxe.getProvenBlockNumber();
|
|
160
|
+
return provenBlock >= minedBlock ? provenBlock : undefined;
|
|
161
|
+
},
|
|
162
|
+
'isProven',
|
|
163
|
+
opts?.provenTimeout ?? DefaultWaitOpts.provenTimeout,
|
|
164
|
+
opts?.interval ?? DefaultWaitOpts.interval,
|
|
165
|
+
);
|
|
166
|
+
}
|
|
146
167
|
}
|
|
@@ -2,7 +2,7 @@ import { FunctionCall, PackedValues } from '@aztec/circuit-types';
|
|
|
2
2
|
import { type AztecAddress, Fr, type GasSettings, GeneratorIndex } from '@aztec/circuits.js';
|
|
3
3
|
import { FunctionType } from '@aztec/foundation/abi';
|
|
4
4
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
|
-
import {
|
|
5
|
+
import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
|
|
6
6
|
import { type Tuple } from '@aztec/foundation/serialize';
|
|
7
7
|
|
|
8
8
|
import { type FeePaymentMethod } from '../fee/fee_payment_method.js';
|
|
@@ -100,7 +100,7 @@ export abstract class EntrypointPayload {
|
|
|
100
100
|
* @returns The hash of the payload
|
|
101
101
|
*/
|
|
102
102
|
hash() {
|
|
103
|
-
return
|
|
103
|
+
return poseidon2HashWithSeparator(this.toFields(), this.#generatorIndex);
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
/** Serializes the function calls to an array of fields. */
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { type FunctionCall } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
|
|
4
4
|
|
|
5
5
|
import { type FeePaymentMethod } from './fee_payment_method.js';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
|
-
* Pay fee directly in the
|
|
8
|
+
* Pay fee directly in the Fee Juice.
|
|
9
9
|
*/
|
|
10
|
-
export class
|
|
10
|
+
export class FeeJuicePaymentMethod implements FeePaymentMethod {
|
|
11
11
|
constructor(protected sender: AztecAddress) {}
|
|
12
12
|
|
|
13
13
|
getAsset() {
|
|
14
|
-
return
|
|
14
|
+
return FeeJuiceAddress;
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
getFunctionCalls(): Promise<FunctionCall[]> {
|
package/src/fee/{native_fee_payment_method_with_claim.ts → fee_juice_payment_method_with_claim.ts}
RENAMED
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
import { type FunctionCall } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
|
|
3
3
|
import { FunctionType } from '@aztec/foundation/abi';
|
|
4
|
-
import {
|
|
4
|
+
import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
* Pay fee directly with
|
|
9
|
+
* Pay fee directly with Fee Juice claimed on the same tx.
|
|
10
10
|
*/
|
|
11
|
-
export class
|
|
11
|
+
export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
12
12
|
constructor(sender: AztecAddress, private claimAmount: bigint | Fr, private claimSecret: Fr) {
|
|
13
13
|
super(sender);
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
|
-
* Creates a function call to pay the fee in
|
|
17
|
+
* Creates a function call to pay the fee in Fee Juice.
|
|
18
18
|
* @returns A function call
|
|
19
19
|
*/
|
|
20
20
|
override getFunctionCalls(): Promise<FunctionCall[]> {
|
|
21
21
|
return Promise.resolve([
|
|
22
22
|
{
|
|
23
|
-
to:
|
|
23
|
+
to: FeeJuiceAddress,
|
|
24
24
|
name: 'claim',
|
|
25
25
|
selector: FunctionSelector.fromSignature('claim((Field),Field,Field)'),
|
|
26
26
|
isStatic: false,
|
package/src/index.ts
CHANGED
|
@@ -55,7 +55,7 @@ export {
|
|
|
55
55
|
} from './utils/index.js';
|
|
56
56
|
export { NoteSelector } from '@aztec/foundation/abi';
|
|
57
57
|
|
|
58
|
-
export { createPXEClient } from './rpc_clients/index.js';
|
|
58
|
+
export { createPXEClient, createCompatibleClient } from './rpc_clients/index.js';
|
|
59
59
|
|
|
60
60
|
export { AuthWitnessProvider } from './account/index.js';
|
|
61
61
|
|
|
@@ -102,6 +102,7 @@ export {
|
|
|
102
102
|
EncryptedLogOutgoingBody,
|
|
103
103
|
EventType,
|
|
104
104
|
ExtendedNote,
|
|
105
|
+
UniqueNote,
|
|
105
106
|
FunctionCall,
|
|
106
107
|
L1Actor,
|
|
107
108
|
L1ToL2Message,
|
package/src/rpc_clients/index.ts
CHANGED