@aztec/aztec.js 0.82.3 → 0.83.0
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/account_manager/account_manager.js +2 -2
- package/dest/ethereum/portal_manager.d.ts +1 -1
- package/dest/ethereum/portal_manager.d.ts.map +1 -1
- package/dest/ethereum/portal_manager.js +3 -2
- package/dest/fee/utils.js +2 -2
- package/dest/index.d.ts +1 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -2
- package/dest/test/anvil_test_watcher.d.ts +1 -0
- package/dest/test/anvil_test_watcher.d.ts.map +1 -1
- package/dest/test/anvil_test_watcher.js +8 -3
- package/dest/wallet/base_wallet.d.ts +2 -2
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +3 -3
- package/dest/wallet/signerless_wallet.js +2 -2
- package/package.json +8 -8
- package/src/account_manager/account_manager.ts +2 -2
- package/src/ethereum/portal_manager.ts +5 -3
- package/src/fee/utils.ts +2 -2
- package/src/index.ts +1 -2
- package/src/test/anvil_test_watcher.ts +9 -3
- package/src/wallet/base_wallet.ts +4 -3
- package/src/wallet/signerless_wallet.ts +2 -2
|
@@ -122,11 +122,11 @@ import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
|
|
|
122
122
|
const thisWallet = await this.getWallet();
|
|
123
123
|
return new DeployMethod(this.getPublicKeys(), deployWallet, artifact, (address)=>Contract.at(address, artifact, thisWallet), constructorArgs, constructorName);
|
|
124
124
|
}
|
|
125
|
-
const { l1ChainId: chainId,
|
|
125
|
+
const { l1ChainId: chainId, rollupVersion } = await this.pxe.getNodeInfo();
|
|
126
126
|
// We use a signerless wallet with the multi call entrypoint in order to make multiple calls in one go.
|
|
127
127
|
// If we used getWallet, the deployment would get routed via the account contract entrypoint
|
|
128
128
|
// and it can't be used unless the contract is initialized.
|
|
129
|
-
const wallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId,
|
|
129
|
+
const wallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
|
|
130
130
|
return new DeployMethod(this.getPublicKeys(), wallet, artifact, (address)=>Contract.at(address, artifact, wallet), constructorArgs, constructorName);
|
|
131
131
|
}
|
|
132
132
|
/**
|
|
@@ -140,6 +140,6 @@ export declare class L1TokenPortalManager extends L1ToL2TokenPortalManager {
|
|
|
140
140
|
* @param l2Bridge - Address of the L2 bridge.
|
|
141
141
|
* @param callerOnL1 - Caller address on L1.
|
|
142
142
|
*/
|
|
143
|
-
getL2ToL1MessageLeaf(amount: bigint, recipient: EthAddress, l2Bridge: AztecAddress, callerOnL1?: EthAddress): Fr
|
|
143
|
+
getL2ToL1MessageLeaf(amount: bigint, recipient: EthAddress, l2Bridge: AztecAddress, callerOnL1?: EthAddress): Promise<Fr>;
|
|
144
144
|
}
|
|
145
145
|
//# sourceMappingURL=portal_manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../src/ethereum/portal_manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../src/ethereum/portal_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -304,7 +304,8 @@ import { getContract, toFunctionSelector } from 'viem';
|
|
|
304
304
|
* @param recipient - Recipient on L1.
|
|
305
305
|
* @param l2Bridge - Address of the L2 bridge.
|
|
306
306
|
* @param callerOnL1 - Caller address on L1.
|
|
307
|
-
*/ getL2ToL1MessageLeaf(amount, recipient, l2Bridge, callerOnL1 = EthAddress.ZERO) {
|
|
307
|
+
*/ async getL2ToL1MessageLeaf(amount, recipient, l2Bridge, callerOnL1 = EthAddress.ZERO) {
|
|
308
|
+
const version = await this.outbox.read.VERSION();
|
|
308
309
|
const content = sha256ToField([
|
|
309
310
|
Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
|
|
310
311
|
recipient.toBuffer32(),
|
|
@@ -313,7 +314,7 @@ import { getContract, toFunctionSelector } from 'viem';
|
|
|
313
314
|
]);
|
|
314
315
|
const leaf = sha256ToField([
|
|
315
316
|
l2Bridge.toBuffer(),
|
|
316
|
-
new Fr(
|
|
317
|
+
new Fr(version).toBuffer(),
|
|
317
318
|
EthAddress.fromString(this.portal.address).toBuffer32() ?? Buffer.alloc(32, 0),
|
|
318
319
|
new Fr(this.publicClient.chain.id).toBuffer(),
|
|
319
320
|
content.toBuffer()
|
package/dest/fee/utils.js
CHANGED
|
@@ -23,8 +23,8 @@ import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
|
|
|
23
23
|
gasSettings,
|
|
24
24
|
paymentMethod
|
|
25
25
|
};
|
|
26
|
-
const { l1ChainId: chainId,
|
|
27
|
-
const entrypoint = new DefaultEntrypoint(chainId,
|
|
26
|
+
const { l1ChainId: chainId, rollupVersion } = await wallet.getNodeInfo();
|
|
27
|
+
const entrypoint = new DefaultEntrypoint(chainId, rollupVersion);
|
|
28
28
|
const signerlessTxExecutionRequest = await entrypoint.createTxExecutionRequest(request, fee, {});
|
|
29
29
|
const simulationResult = await wallet.simulateTx(signerlessTxExecutionRequest, false, undefined, undefined, true);
|
|
30
30
|
const rawReturnValues = simulationResult.getPrivateReturnValues().values;
|
package/dest/index.d.ts
CHANGED
|
@@ -30,8 +30,7 @@ export { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
|
30
30
|
export { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
31
31
|
export { Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, Capsule, HashedValues, GlobalVariables, } from '@aztec/stdlib/tx';
|
|
32
32
|
export { Body, L2Block } from '@aztec/stdlib/block';
|
|
33
|
-
export { LogId, type LogFilter
|
|
34
|
-
export { L1EventPayload, EventMetadata } from '@aztec/stdlib/event';
|
|
33
|
+
export { LogId, type LogFilter } from '@aztec/stdlib/logs';
|
|
35
34
|
export { L1ToL2Message, L2Actor, L1Actor } from '@aztec/stdlib/messaging';
|
|
36
35
|
export { UniqueNote, ExtendedNote, Comparator, Note } from '@aztec/stdlib/note';
|
|
37
36
|
export { type PXE, EventType } from '@aztec/stdlib/interfaces/client';
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,KAAK,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,4BAA4B,EAC5B,UAAU,EACV,oCAAoC,EACpC,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACL,EAAE,EACF,kBAAkB,EAClB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,KAAK,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,4BAA4B,EAC5B,UAAU,EACV,oCAAoC,EACpC,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACL,EAAE,EACF,kBAAkB,EAClB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,KAAK,GAAG,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAKpE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -29,8 +29,7 @@ export { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
|
29
29
|
export { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
30
30
|
export { Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, Capsule, HashedValues, GlobalVariables } from '@aztec/stdlib/tx';
|
|
31
31
|
export { Body, L2Block } from '@aztec/stdlib/block';
|
|
32
|
-
export { LogId
|
|
33
|
-
export { L1EventPayload, EventMetadata } from '@aztec/stdlib/event';
|
|
32
|
+
export { LogId } from '@aztec/stdlib/logs';
|
|
34
33
|
export { L1ToL2Message, L2Actor, L1Actor } from '@aztec/stdlib/messaging';
|
|
35
34
|
export { UniqueNote, ExtendedNote, Comparator, Note } from '@aztec/stdlib/note';
|
|
36
35
|
export { EventType } from '@aztec/stdlib/interfaces/client';
|
|
@@ -25,6 +25,7 @@ export declare class AnvilTestWatcher {
|
|
|
25
25
|
setIsSandbox(isSandbox: boolean): void;
|
|
26
26
|
start(): Promise<void>;
|
|
27
27
|
stop(): Promise<void>;
|
|
28
|
+
trigger(): Promise<void>;
|
|
28
29
|
markAsProven(): Promise<void>;
|
|
29
30
|
mineIfOutdated(): Promise<void>;
|
|
30
31
|
warpTimeIfNeeded(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/test/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAOhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAezB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAjBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAA4D;IAC1E,OAAO,CAAC,gBAAgB,CAAmB;IAE3C,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAC/C,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,gBAAgB,EACtB,YAAY,CAAC,8BAAkB;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IAwBL,IAAI;IAMJ,YAAY;IAOZ,cAAc;IAoBd,gBAAgB;CAwCvB"}
|
|
1
|
+
{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/test/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAOhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAezB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAjBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAA4D;IAC1E,OAAO,CAAC,gBAAgB,CAAmB;IAE3C,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAC/C,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,gBAAgB,EACtB,YAAY,CAAC,8BAAkB;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IAwBL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,cAAc;IAoBd,gBAAgB;CAwCvB"}
|
|
@@ -52,11 +52,11 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
|
|
|
52
52
|
// the next slot.
|
|
53
53
|
const isAutoMining = await this.cheatcodes.isAutoMining();
|
|
54
54
|
if (isAutoMining) {
|
|
55
|
-
this.filledRunningPromise = new RunningPromise(()=>this.warpTimeIfNeeded(), this.logger,
|
|
55
|
+
this.filledRunningPromise = new RunningPromise(()=>this.warpTimeIfNeeded(), this.logger, 200);
|
|
56
56
|
this.filledRunningPromise.start();
|
|
57
|
-
this.mineIfOutdatedPromise = new RunningPromise(()=>this.mineIfOutdated(), this.logger,
|
|
57
|
+
this.mineIfOutdatedPromise = new RunningPromise(()=>this.mineIfOutdated(), this.logger, 200);
|
|
58
58
|
this.mineIfOutdatedPromise.start();
|
|
59
|
-
this.markingAsProvenRunningPromise = new RunningPromise(()=>this.markAsProven(), this.logger,
|
|
59
|
+
this.markingAsProvenRunningPromise = new RunningPromise(()=>this.markAsProven(), this.logger, 200);
|
|
60
60
|
this.markingAsProvenRunningPromise.start();
|
|
61
61
|
this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
|
|
62
62
|
} else {
|
|
@@ -68,6 +68,11 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
|
|
|
68
68
|
await this.mineIfOutdatedPromise?.stop();
|
|
69
69
|
await this.markingAsProvenRunningPromise?.stop();
|
|
70
70
|
}
|
|
71
|
+
async trigger() {
|
|
72
|
+
await this.filledRunningPromise?.trigger();
|
|
73
|
+
await this.mineIfOutdatedPromise?.trigger();
|
|
74
|
+
await this.markingAsProvenRunningPromise?.trigger();
|
|
75
|
+
}
|
|
71
76
|
async markAsProven() {
|
|
72
77
|
if (!this.isMarkingAsProven) {
|
|
73
78
|
return;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
3
|
import type { FeeOptions, TxExecutionOptions } from '@aztec/entrypoints/interfaces';
|
|
4
4
|
import type { ExecutionPayload } from '@aztec/entrypoints/payload';
|
|
5
|
-
import type { Fr
|
|
5
|
+
import type { Fr } from '@aztec/foundation/fields';
|
|
6
6
|
import type { AbiDecoded, ContractArtifact } from '@aztec/stdlib/abi';
|
|
7
7
|
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
8
8
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
@@ -44,7 +44,7 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
44
44
|
getContractClassMetadata(id: Fr, includeArtifact?: boolean): Promise<ContractClassMetadata>;
|
|
45
45
|
getContractMetadata(address: AztecAddress): Promise<ContractMetadata>;
|
|
46
46
|
getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
|
|
47
|
-
getPrivateEvents<T>(event: EventMetadataDefinition, from: number, limit: number,
|
|
47
|
+
getPrivateEvents<T>(contractAddress: AztecAddress, event: EventMetadataDefinition, from: number, limit: number, recipients?: AztecAddress[]): Promise<T[]>;
|
|
48
48
|
getPublicEvents<T>(event: EventMetadataDefinition, from: number, limit: number): Promise<T[]>;
|
|
49
49
|
}
|
|
50
50
|
//# sourceMappingURL=base_wallet.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,10 +59,10 @@
|
|
|
59
59
|
getTxReceipt(txHash) {
|
|
60
60
|
return this.pxe.getTxReceipt(txHash);
|
|
61
61
|
}
|
|
62
|
-
getPrivateEvents(event, from, limit,
|
|
63
|
-
this.getCompleteAddress().
|
|
62
|
+
getPrivateEvents(contractAddress, event, from, limit, recipients = [
|
|
63
|
+
this.getCompleteAddress().address
|
|
64
64
|
]) {
|
|
65
|
-
return this.pxe.getPrivateEvents(event, from, limit,
|
|
65
|
+
return this.pxe.getPrivateEvents(contractAddress, event, from, limit, recipients);
|
|
66
66
|
}
|
|
67
67
|
getPublicEvents(event, from, limit) {
|
|
68
68
|
return this.pxe.getPublicEvents(event, from, limit);
|
|
@@ -10,8 +10,8 @@ import { BaseWallet } from './base_wallet.js';
|
|
|
10
10
|
async createTxExecutionRequest(execution, fee, options) {
|
|
11
11
|
let entrypoint = this.entrypoint;
|
|
12
12
|
if (!entrypoint) {
|
|
13
|
-
const { l1ChainId: chainId,
|
|
14
|
-
entrypoint = new DefaultEntrypoint(chainId,
|
|
13
|
+
const { l1ChainId: chainId, rollupVersion } = await this.pxe.getNodeInfo();
|
|
14
|
+
entrypoint = new DefaultEntrypoint(chainId, rollupVersion);
|
|
15
15
|
}
|
|
16
16
|
return entrypoint.createTxExecutionRequest(execution, fee, options);
|
|
17
17
|
}
|
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.83.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": "./dest/index.js",
|
|
@@ -80,13 +80,13 @@
|
|
|
80
80
|
]
|
|
81
81
|
},
|
|
82
82
|
"dependencies": {
|
|
83
|
-
"@aztec/constants": "0.
|
|
84
|
-
"@aztec/entrypoints": "0.
|
|
85
|
-
"@aztec/ethereum": "0.
|
|
86
|
-
"@aztec/foundation": "0.
|
|
87
|
-
"@aztec/l1-artifacts": "0.
|
|
88
|
-
"@aztec/protocol-contracts": "0.
|
|
89
|
-
"@aztec/stdlib": "0.
|
|
83
|
+
"@aztec/constants": "0.83.0",
|
|
84
|
+
"@aztec/entrypoints": "0.83.0",
|
|
85
|
+
"@aztec/ethereum": "0.83.0",
|
|
86
|
+
"@aztec/foundation": "0.83.0",
|
|
87
|
+
"@aztec/l1-artifacts": "0.83.0",
|
|
88
|
+
"@aztec/protocol-contracts": "0.83.0",
|
|
89
|
+
"@aztec/stdlib": "0.83.0",
|
|
90
90
|
"axios": "^1.7.2",
|
|
91
91
|
"tslib": "^2.4.0",
|
|
92
92
|
"viem": "2.23.7"
|
|
@@ -173,11 +173,11 @@ export class AccountManager {
|
|
|
173
173
|
);
|
|
174
174
|
}
|
|
175
175
|
|
|
176
|
-
const { l1ChainId: chainId,
|
|
176
|
+
const { l1ChainId: chainId, rollupVersion } = await this.pxe.getNodeInfo();
|
|
177
177
|
// We use a signerless wallet with the multi call entrypoint in order to make multiple calls in one go.
|
|
178
178
|
// If we used getWallet, the deployment would get routed via the account contract entrypoint
|
|
179
179
|
// and it can't be used unless the contract is initialized.
|
|
180
|
-
const wallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId,
|
|
180
|
+
const wallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
|
|
181
181
|
|
|
182
182
|
return new DeployMethod(
|
|
183
183
|
this.getPublicKeys(),
|
|
@@ -437,12 +437,14 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
|
|
|
437
437
|
* @param l2Bridge - Address of the L2 bridge.
|
|
438
438
|
* @param callerOnL1 - Caller address on L1.
|
|
439
439
|
*/
|
|
440
|
-
public getL2ToL1MessageLeaf(
|
|
440
|
+
public async getL2ToL1MessageLeaf(
|
|
441
441
|
amount: bigint,
|
|
442
442
|
recipient: EthAddress,
|
|
443
443
|
l2Bridge: AztecAddress,
|
|
444
444
|
callerOnL1: EthAddress = EthAddress.ZERO,
|
|
445
|
-
): Fr {
|
|
445
|
+
): Promise<Fr> {
|
|
446
|
+
const version = await this.outbox.read.VERSION();
|
|
447
|
+
|
|
446
448
|
const content = sha256ToField([
|
|
447
449
|
Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
|
|
448
450
|
recipient.toBuffer32(),
|
|
@@ -451,7 +453,7 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
|
|
|
451
453
|
]);
|
|
452
454
|
const leaf = sha256ToField([
|
|
453
455
|
l2Bridge.toBuffer(),
|
|
454
|
-
new Fr(
|
|
456
|
+
new Fr(version).toBuffer(), // aztec version
|
|
455
457
|
EthAddress.fromString(this.portal.address).toBuffer32() ?? Buffer.alloc(32, 0),
|
|
456
458
|
new Fr(this.publicClient.chain.id).toBuffer(), // chain id
|
|
457
459
|
content.toBuffer(),
|
package/src/fee/utils.ts
CHANGED
|
@@ -29,8 +29,8 @@ export async function simulateWithoutSignature(
|
|
|
29
29
|
const gasSettings = GasSettings.default({ maxFeesPerGas });
|
|
30
30
|
const fee = { gasSettings, paymentMethod };
|
|
31
31
|
|
|
32
|
-
const { l1ChainId: chainId,
|
|
33
|
-
const entrypoint = new DefaultEntrypoint(chainId,
|
|
32
|
+
const { l1ChainId: chainId, rollupVersion } = await wallet.getNodeInfo();
|
|
33
|
+
const entrypoint = new DefaultEntrypoint(chainId, rollupVersion);
|
|
34
34
|
const signerlessTxExecutionRequest = await entrypoint.createTxExecutionRequest(request, fee, {});
|
|
35
35
|
|
|
36
36
|
const simulationResult = await wallet.simulateTx(signerlessTxExecutionRequest, false, undefined, undefined, true);
|
package/src/index.ts
CHANGED
|
@@ -48,8 +48,7 @@ export {
|
|
|
48
48
|
GlobalVariables,
|
|
49
49
|
} from '@aztec/stdlib/tx';
|
|
50
50
|
export { Body, L2Block } from '@aztec/stdlib/block';
|
|
51
|
-
export { LogId, type LogFilter
|
|
52
|
-
export { L1EventPayload, EventMetadata } from '@aztec/stdlib/event';
|
|
51
|
+
export { LogId, type LogFilter } from '@aztec/stdlib/logs';
|
|
53
52
|
export { L1ToL2Message, L2Actor, L1Actor } from '@aztec/stdlib/messaging';
|
|
54
53
|
export { UniqueNote, ExtendedNote, Comparator, Note } from '@aztec/stdlib/note';
|
|
55
54
|
export { type PXE, EventType } from '@aztec/stdlib/interfaces/client';
|
|
@@ -70,11 +70,11 @@ export class AnvilTestWatcher {
|
|
|
70
70
|
const isAutoMining = await this.cheatcodes.isAutoMining();
|
|
71
71
|
|
|
72
72
|
if (isAutoMining) {
|
|
73
|
-
this.filledRunningPromise = new RunningPromise(() => this.warpTimeIfNeeded(), this.logger,
|
|
73
|
+
this.filledRunningPromise = new RunningPromise(() => this.warpTimeIfNeeded(), this.logger, 200);
|
|
74
74
|
this.filledRunningPromise.start();
|
|
75
|
-
this.mineIfOutdatedPromise = new RunningPromise(() => this.mineIfOutdated(), this.logger,
|
|
75
|
+
this.mineIfOutdatedPromise = new RunningPromise(() => this.mineIfOutdated(), this.logger, 200);
|
|
76
76
|
this.mineIfOutdatedPromise.start();
|
|
77
|
-
this.markingAsProvenRunningPromise = new RunningPromise(() => this.markAsProven(), this.logger,
|
|
77
|
+
this.markingAsProvenRunningPromise = new RunningPromise(() => this.markAsProven(), this.logger, 200);
|
|
78
78
|
this.markingAsProvenRunningPromise.start();
|
|
79
79
|
this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
|
|
80
80
|
} else {
|
|
@@ -88,6 +88,12 @@ export class AnvilTestWatcher {
|
|
|
88
88
|
await this.markingAsProvenRunningPromise?.stop();
|
|
89
89
|
}
|
|
90
90
|
|
|
91
|
+
async trigger() {
|
|
92
|
+
await this.filledRunningPromise?.trigger();
|
|
93
|
+
await this.mineIfOutdatedPromise?.trigger();
|
|
94
|
+
await this.markingAsProvenRunningPromise?.trigger();
|
|
95
|
+
}
|
|
96
|
+
|
|
91
97
|
async markAsProven() {
|
|
92
98
|
if (!this.isMarkingAsProven) {
|
|
93
99
|
return;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { FeeOptions, TxExecutionOptions } from '@aztec/entrypoints/interfaces';
|
|
2
2
|
import type { ExecutionPayload } from '@aztec/entrypoints/payload';
|
|
3
|
-
import type { Fr
|
|
3
|
+
import type { Fr } from '@aztec/foundation/fields';
|
|
4
4
|
import type { AbiDecoded, ContractArtifact } from '@aztec/stdlib/abi';
|
|
5
5
|
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
6
6
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
@@ -124,12 +124,13 @@ export abstract class BaseWallet implements Wallet {
|
|
|
124
124
|
}
|
|
125
125
|
|
|
126
126
|
getPrivateEvents<T>(
|
|
127
|
+
contractAddress: AztecAddress,
|
|
127
128
|
event: EventMetadataDefinition,
|
|
128
129
|
from: number,
|
|
129
130
|
limit: number,
|
|
130
|
-
|
|
131
|
+
recipients: AztecAddress[] = [this.getCompleteAddress().address],
|
|
131
132
|
): Promise<T[]> {
|
|
132
|
-
return this.pxe.getPrivateEvents(event, from, limit,
|
|
133
|
+
return this.pxe.getPrivateEvents(contractAddress, event, from, limit, recipients);
|
|
133
134
|
}
|
|
134
135
|
getPublicEvents<T>(event: EventMetadataDefinition, from: number, limit: number): Promise<T[]> {
|
|
135
136
|
return this.pxe.getPublicEvents(event, from, limit);
|
|
@@ -24,8 +24,8 @@ export class SignerlessWallet extends BaseWallet {
|
|
|
24
24
|
): Promise<TxExecutionRequest> {
|
|
25
25
|
let entrypoint = this.entrypoint;
|
|
26
26
|
if (!entrypoint) {
|
|
27
|
-
const { l1ChainId: chainId,
|
|
28
|
-
entrypoint = new DefaultEntrypoint(chainId,
|
|
27
|
+
const { l1ChainId: chainId, rollupVersion } = await this.pxe.getNodeInfo();
|
|
28
|
+
entrypoint = new DefaultEntrypoint(chainId, rollupVersion);
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
return entrypoint.createTxExecutionRequest(execution, fee, options);
|