@aztec/aztec 0.0.1-commit.b2a5d0dd1 → 0.0.1-commit.b3d3157a
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/bin/index.js +1 -1
- package/dest/cli/aztec_start_action.d.ts +1 -1
- package/dest/cli/aztec_start_action.d.ts.map +1 -1
- package/dest/cli/aztec_start_action.js +10 -6
- package/dest/cli/aztec_start_options.d.ts +1 -1
- package/dest/cli/aztec_start_options.d.ts.map +1 -1
- package/dest/cli/aztec_start_options.js +1 -14
- package/dest/cli/cmds/compile.d.ts +1 -1
- package/dest/cli/cmds/compile.d.ts.map +1 -1
- package/dest/cli/cmds/compile.js +12 -1
- package/dest/cli/cmds/profile.d.ts +1 -1
- package/dest/cli/cmds/profile.d.ts.map +1 -1
- package/dest/cli/cmds/profile.js +1 -1
- package/dest/cli/cmds/profile_gates.d.ts +2 -2
- package/dest/cli/cmds/profile_gates.d.ts.map +1 -1
- package/dest/cli/cmds/profile_gates.js +21 -3
- package/dest/cli/cmds/standby.d.ts +2 -4
- package/dest/cli/cmds/standby.d.ts.map +1 -1
- package/dest/cli/cmds/standby.js +1 -1
- package/dest/cli/cmds/start_bot.d.ts +1 -1
- package/dest/cli/cmds/start_bot.d.ts.map +1 -1
- package/dest/cli/cmds/start_bot.js +3 -3
- package/dest/cli/cmds/start_node.d.ts +1 -1
- package/dest/cli/cmds/start_node.d.ts.map +1 -1
- package/dest/cli/cmds/start_node.js +3 -5
- package/dest/cli/cmds/start_prover_agent.js +2 -2
- package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
- package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
- package/dest/cli/cmds/start_prover_broker.js +11 -8
- package/dest/cli/cmds/start_txe.d.ts +2 -2
- package/dest/cli/cmds/start_txe.d.ts.map +1 -1
- package/dest/cli/cmds/start_txe.js +6 -5
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +1 -1
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -1
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +2 -3
- package/dest/cli/util.js +7 -5
- package/dest/local-network/auth_registry.d.ts +5 -0
- package/dest/local-network/auth_registry.d.ts.map +1 -0
- package/dest/local-network/auth_registry.js +17 -0
- package/dest/local-network/banana_fpc.d.ts +3 -2
- package/dest/local-network/banana_fpc.d.ts.map +1 -1
- package/dest/local-network/banana_fpc.js +11 -7
- package/dest/local-network/local-network.d.ts +3 -25
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +33 -11
- package/dest/testing/anvil_test_watcher.d.ts +9 -1
- package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
- package/dest/testing/anvil_test_watcher.js +28 -0
- package/dest/testing/cheat_codes.d.ts +10 -5
- package/dest/testing/cheat_codes.d.ts.map +1 -1
- package/dest/testing/cheat_codes.js +40 -6
- package/dest/testing/epoch_test_settler.d.ts +1 -1
- package/dest/testing/epoch_test_settler.d.ts.map +1 -1
- package/dest/testing/epoch_test_settler.js +6 -4
- package/package.json +34 -33
- package/scripts/add_crate.sh +11 -60
- package/scripts/aztec.sh +2 -2
- package/scripts/init.sh +5 -5
- package/scripts/new.sh +2 -2
- package/scripts/setup_workspace.sh +3 -2
- package/scripts/templates/blank/contract/Nargo.toml +6 -0
- package/scripts/templates/blank/contract/src/main.nr +10 -0
- package/scripts/templates/blank/test/Nargo.toml +7 -0
- package/scripts/templates/blank/test/src/lib.nr +11 -0
- package/scripts/templates/counter/contract/Nargo.toml +7 -0
- package/scripts/templates/counter/contract/src/main.nr +48 -0
- package/scripts/templates/counter/test/Nargo.toml +7 -0
- package/scripts/templates/counter/test/src/lib.nr +32 -0
- package/src/bin/index.ts +1 -1
- package/src/cli/aztec_start_action.ts +11 -6
- package/src/cli/aztec_start_options.ts +2 -20
- package/src/cli/cmds/compile.ts +15 -1
- package/src/cli/cmds/profile.ts +2 -1
- package/src/cli/cmds/profile_gates.ts +20 -4
- package/src/cli/cmds/standby.ts +2 -2
- package/src/cli/cmds/start_bot.ts +3 -5
- package/src/cli/cmds/start_node.ts +3 -5
- package/src/cli/cmds/start_prover_agent.ts +2 -2
- package/src/cli/cmds/start_prover_broker.ts +10 -11
- package/src/cli/cmds/start_txe.ts +7 -5
- package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +2 -3
- package/src/cli/util.ts +7 -7
- package/src/local-network/auth_registry.ts +19 -0
- package/src/local-network/banana_fpc.ts +12 -8
- package/src/local-network/local-network.ts +34 -8
- package/src/testing/anvil_test_watcher.ts +32 -0
- package/src/testing/cheat_codes.ts +54 -7
- package/src/testing/epoch_test_settler.ts +3 -4
- package/dest/cli/cmds/start_archiver.d.ts +0 -9
- package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
- package/dest/cli/cmds/start_archiver.js +0 -50
- package/src/cli/cmds/start_archiver.ts +0 -56
|
@@ -43,19 +43,23 @@ async function getBananaFPCInstance(initialAccounts) {
|
|
|
43
43
|
export async function getBananaFPCAddress(initialAccounts) {
|
|
44
44
|
return (await getBananaFPCInstance(initialAccounts)).address;
|
|
45
45
|
}
|
|
46
|
-
export async function setupBananaFPC(initialAccounts, wallet, log) {
|
|
46
|
+
export async function setupBananaFPC(initialAccounts, wallet, log, waitOpts) {
|
|
47
47
|
const bananaCoinAddress = await getBananaCoinAddress(initialAccounts);
|
|
48
48
|
const admin = getBananaAdmin(initialAccounts);
|
|
49
49
|
const [{ contract: bananaCoin }, { contract: fpc }] = await Promise.all([
|
|
50
|
-
TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal
|
|
51
|
-
|
|
52
|
-
contractAddressSalt: BANANA_COIN_SALT,
|
|
50
|
+
TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal, {
|
|
51
|
+
salt: BANANA_COIN_SALT,
|
|
53
52
|
universalDeploy: true
|
|
54
|
-
})
|
|
55
|
-
FPCContract.deploy(wallet, bananaCoinAddress, admin).send({
|
|
53
|
+
}).send({
|
|
56
54
|
from: admin,
|
|
57
|
-
|
|
55
|
+
wait: waitOpts
|
|
56
|
+
}),
|
|
57
|
+
FPCContract.deploy(wallet, bananaCoinAddress, admin, {
|
|
58
|
+
salt: BANANA_FPC_SALT,
|
|
58
59
|
universalDeploy: true
|
|
60
|
+
}).send({
|
|
61
|
+
from: admin,
|
|
62
|
+
wait: waitOpts
|
|
59
63
|
})
|
|
60
64
|
]);
|
|
61
65
|
log(`BananaCoin: ${bananaCoin.address}`);
|
|
@@ -3,7 +3,7 @@ import { AztecNodeService } from '@aztec/aztec-node';
|
|
|
3
3
|
import { type AztecNodeConfig } from '@aztec/aztec-node/config';
|
|
4
4
|
import { Fr } from '@aztec/aztec.js/fields';
|
|
5
5
|
import { type BlobClientInterface } from '@aztec/blob-client/client';
|
|
6
|
-
import {
|
|
6
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
7
7
|
import type { LogFn } from '@aztec/foundation/log';
|
|
8
8
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
9
9
|
import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
|
|
@@ -18,29 +18,7 @@ import { type Hex } from 'viem';
|
|
|
18
18
|
export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, privateKey: Hex, opts?: {
|
|
19
19
|
genesisArchiveRoot?: Fr;
|
|
20
20
|
feeJuicePortalInitialBalance?: bigint;
|
|
21
|
-
}): Promise<
|
|
22
|
-
coinIssuerAddress: EthAddress;
|
|
23
|
-
feeJuiceAddress: EthAddress;
|
|
24
|
-
feeJuicePortalAddress: EthAddress;
|
|
25
|
-
governanceAddress: EthAddress;
|
|
26
|
-
governanceProposerAddress: EthAddress;
|
|
27
|
-
inboxAddress: EthAddress;
|
|
28
|
-
outboxAddress: EthAddress;
|
|
29
|
-
registryAddress: EthAddress;
|
|
30
|
-
rewardDistributorAddress: EthAddress;
|
|
31
|
-
rollupAddress: EthAddress;
|
|
32
|
-
stakingAssetAddress: EthAddress;
|
|
33
|
-
} & {
|
|
34
|
-
feeAssetHandlerAddress?: EthAddress | undefined;
|
|
35
|
-
stakingAssetHandlerAddress?: EthAddress | undefined;
|
|
36
|
-
zkPassportVerifierAddress?: EthAddress | undefined;
|
|
37
|
-
gseAddress?: EthAddress | undefined;
|
|
38
|
-
dateGatedRelayerAddress?: EthAddress | undefined;
|
|
39
|
-
} & {
|
|
40
|
-
rollupAddress: EthAddress;
|
|
41
|
-
} & Pick<import("@aztec/ethereum/l1-contract-addresses").L1ContractAddresses, "rollupAddress"> & {
|
|
42
|
-
rollupAddress: EthAddress;
|
|
43
|
-
}>;
|
|
21
|
+
}): Promise<L1ContractAddresses>;
|
|
44
22
|
/** Local network settings. */
|
|
45
23
|
export type LocalNetworkConfig = AztecNodeConfig & {
|
|
46
24
|
/** Mnemonic used to derive the L1 deployer private key.*/
|
|
@@ -69,4 +47,4 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
|
|
|
69
47
|
}, options?: {
|
|
70
48
|
genesis?: GenesisData;
|
|
71
49
|
}): Promise<AztecNodeService>;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQU92RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBSWpGLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFLekUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUV4RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFLakMsT0FBTyxFQUFFLEtBQUssR0FBRyxFQUEyRCxNQUFNLE1BQU0sQ0FBQztBQXVCekY7Ozs7R0FJRztBQUNILHdCQUFzQixtQkFBbUIsQ0FDdkMsZUFBZSxFQUFFLGVBQWUsRUFDaEMsVUFBVSxFQUFFLEdBQUcsRUFDZixJQUFJLEdBQUU7SUFDSixrQkFBa0IsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUN4Qiw0QkFBNEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQyxHQUNMLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQW1COUI7QUFFRCw4QkFBOEI7QUFDOUIsTUFBTSxNQUFNLGtCQUFrQixHQUFHLGVBQWUsR0FBRztJQUNqRCwwREFBMEQ7SUFDMUQsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQiw2REFBNkQ7SUFDN0QsWUFBWSxFQUFFLE9BQU8sQ0FBQztDQUN2QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxNQUFNLHlDQUFrQyxFQUFFLE9BQU8sRUFBRSxLQUFLOzs7R0EwS2hHO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxHQUFFLE9BQU8sQ0FBQyxlQUFlLENBQU0sRUFDckMsSUFBSSxHQUFFO0lBQ0osU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQzVCLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQ2pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUM1QixZQUFZLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztDQUM1QixFQUNOLE9BQU8sR0FBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLFdBQVcsQ0FBQTtDQUFPLDZCQWN4QyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AAOvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAIjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAKzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAuBzF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC,GACL,OAAO,CAAC,mBAAmB,CAAC,CAmB9B;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GA0KhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CAC5B,EACN,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,WAAW,CAAA;CAAO,6BAcxC"}
|
|
@@ -19,6 +19,7 @@ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
|
19
19
|
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
20
20
|
import { SequencerState } from '@aztec/sequencer-client';
|
|
21
21
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
22
|
+
import { TxStatus } from '@aztec/stdlib/tx';
|
|
22
23
|
import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
23
24
|
import { EmbeddedWallet } from '@aztec/wallets/embedded';
|
|
24
25
|
import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
|
|
@@ -31,9 +32,17 @@ import { DefaultMnemonic } from '../mnemonic.js';
|
|
|
31
32
|
import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
|
|
32
33
|
import { EpochTestSettler } from '../testing/epoch_test_settler.js';
|
|
33
34
|
import { getTokenAllowedSetupFunctions } from '../testing/token_allowed_setup.js';
|
|
35
|
+
import { publishStandardAuthRegistry } from './auth_registry.js';
|
|
34
36
|
import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
|
|
35
37
|
import { getSponsoredFPCAddress } from './sponsored_fpc.js';
|
|
36
38
|
const logger = createLogger('local-network');
|
|
39
|
+
// The embedded wallet defaults to waiting for PROPOSED, which returns as soon as a tx lands in a
|
|
40
|
+
// proposed L2 block. That is flaky for the serial sandbox setup below: a proposed block can be
|
|
41
|
+
// pruned before its checkpoint is published, dropping a tx we already moved on from ("Tx dropped by
|
|
42
|
+
// P2P node"). Wait for the checkpoint so each setup tx is durably included before the next is sent.
|
|
43
|
+
const setupWaitOpts = {
|
|
44
|
+
waitForStatus: TxStatus.CHECKPOINTED
|
|
45
|
+
};
|
|
37
46
|
const localAnvil = foundry;
|
|
38
47
|
/**
|
|
39
48
|
* Function to deploy our L1 contracts to the local network L1
|
|
@@ -52,9 +61,9 @@ const localAnvil = foundry;
|
|
|
52
61
|
slasherEnabled: false,
|
|
53
62
|
realVerifier: false
|
|
54
63
|
});
|
|
55
|
-
aztecNodeConfig
|
|
64
|
+
Object.assign(aztecNodeConfig, l1Contracts.l1ContractAddresses);
|
|
56
65
|
aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
|
|
57
|
-
return
|
|
66
|
+
return l1Contracts.l1ContractAddresses;
|
|
58
67
|
}
|
|
59
68
|
/**
|
|
60
69
|
* Create and start a new Aztec Node and PXE. Deploys L1 contracts.
|
|
@@ -168,6 +177,21 @@ const localAnvil = foundry;
|
|
|
168
177
|
SequencerState.SYNCHRONIZING
|
|
169
178
|
]);
|
|
170
179
|
watcher?.setIsSequencerBuilding(()=>!idleStates.has(sequencer.getState()));
|
|
180
|
+
// Under proposer pipelining the L1 publish for slot N happens during wall-clock slot N,
|
|
181
|
+
// but the proposer for slot N has already built the checkpoint during slot N-1 and is
|
|
182
|
+
// waiting for L1 to advance. We need to fast-forward L1 to wake that wait — and the wait
|
|
183
|
+
// we have to break first is `waitForValidParentCheckpointOnL1`, which blocks the
|
|
184
|
+
// checkpoint_proposal_job's background submission task until the archiver has synced past
|
|
185
|
+
// the build slot. That wait happens *before* `PUBLISHING_CHECKPOINT` is set, so a hook on
|
|
186
|
+
// that state transition would be circular (L1 has to advance before the state we'd use to
|
|
187
|
+
// advance L1 fires). The earliest pre-wait signal is `block-proposed`, which the sequencer
|
|
188
|
+
// emits once each block is built. In sandbox single-block-per-slot mode this is
|
|
189
|
+
// effectively "checkpoint built", and the watcher warp is harmless if a subsequent
|
|
190
|
+
// assembly/validation/parent-wait step aborts: L1 just sits one slot ahead, which the
|
|
191
|
+
// cascade absorbs.
|
|
192
|
+
if (watcher) {
|
|
193
|
+
sequencer.on('block-proposed', ({ slot })=>watcher.setProposedTargetSlot(Number(slot)));
|
|
194
|
+
}
|
|
171
195
|
}
|
|
172
196
|
let epochTestSettler;
|
|
173
197
|
if (!aztecNodeConfig.p2pEnabled) {
|
|
@@ -184,10 +208,12 @@ const localAnvil = foundry;
|
|
|
184
208
|
ephemeral: true
|
|
185
209
|
});
|
|
186
210
|
userLog('Setting up funded test accounts...');
|
|
187
|
-
const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
|
|
211
|
+
const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts, setupWaitOpts);
|
|
188
212
|
const accLogs = await createAccountLogs(accountManagers, wallet);
|
|
189
213
|
userLog(accLogs.join(''));
|
|
190
|
-
|
|
214
|
+
userLog('Publishing standard AuthRegistry contract...');
|
|
215
|
+
await publishStandardAuthRegistry(wallet, initialAccounts[0].address, setupWaitOpts);
|
|
216
|
+
await setupBananaFPC(initialAccounts, wallet, userLog, setupWaitOpts);
|
|
191
217
|
userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
|
|
192
218
|
// We no longer need the wallet once we've setup the accounts so we stop the underlying PXE job queue
|
|
193
219
|
await wallet.stop();
|
|
@@ -207,14 +233,10 @@ const localAnvil = foundry;
|
|
|
207
233
|
* @param config - Optional Aztec node settings.
|
|
208
234
|
*/ export async function createAztecNode(config = {}, deps = {}, options = {}) {
|
|
209
235
|
// TODO(#12272): will clean this up. This is criminal.
|
|
210
|
-
|
|
236
|
+
// Not sure why this was ever done. Will be fixed in A-989, A-991, A-990.
|
|
211
237
|
const aztecNodeConfig = {
|
|
212
|
-
...
|
|
213
|
-
...config
|
|
214
|
-
l1Contracts: {
|
|
215
|
-
...l1Contracts,
|
|
216
|
-
...config.l1Contracts
|
|
217
|
-
}
|
|
238
|
+
...getConfigEnvVars(),
|
|
239
|
+
...config
|
|
218
240
|
};
|
|
219
241
|
const node = await AztecNodeService.createAndSync(aztecNodeConfig, {
|
|
220
242
|
...deps,
|
|
@@ -28,6 +28,7 @@ export declare class AnvilTestWatcher {
|
|
|
28
28
|
private getPendingTxCount?;
|
|
29
29
|
private isSequencerBuilding?;
|
|
30
30
|
private unfilledSlotFirstSeen?;
|
|
31
|
+
private proposedTargetSlot?;
|
|
31
32
|
constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined, opts?: AnvilTestWatcherOpts);
|
|
32
33
|
setIsMarkingAsProven(isMarkingAsProven: boolean): void;
|
|
33
34
|
setisLocalNetwork(isLocalNetwork: boolean): void;
|
|
@@ -35,6 +36,13 @@ export declare class AnvilTestWatcher {
|
|
|
35
36
|
setGetPendingTxCount(fn: () => Promise<number>): void;
|
|
36
37
|
/** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */
|
|
37
38
|
setIsSequencerBuilding(fn: () => boolean): void;
|
|
39
|
+
/**
|
|
40
|
+
* Records the target slot for which the proposer has built a block destined for L1. Used by
|
|
41
|
+
* the local-network watcher to fast-forward L1 (and the injected date provider) ahead of the
|
|
42
|
+
* pipelined publisher's `sendRequestsAt` sleep so it ends promptly instead of waiting a full
|
|
43
|
+
* wall-clock slot. Only ratchets up — late warps for stale slots are no-ops.
|
|
44
|
+
*/
|
|
45
|
+
setProposedTargetSlot(slot: number): void;
|
|
38
46
|
start(): Promise<void>;
|
|
39
47
|
stop(): Promise<void>;
|
|
40
48
|
trigger(): Promise<void>;
|
|
@@ -43,4 +51,4 @@ export declare class AnvilTestWatcher {
|
|
|
43
51
|
warpTimeIfNeeded(): Promise<void>;
|
|
44
52
|
private warpToTimestamp;
|
|
45
53
|
}
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFLE1BQU0sTUFBTSxvQkFBb0IsR0FBRztJQUNqQyxjQUFjLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDekIsaUJBQWlCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDN0IsQ0FBQztBQUVGOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQThCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQWhDdkIsT0FBTyxDQUFDLGNBQWMsQ0FBQztJQUN2QixPQUFPLENBQUMsaUJBQWlCLENBQUM7SUFFMUIsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRy9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUF3QjtJQUdsRCxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBZ0I7SUFHNUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQXFDO0lBTW5FLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFTO0lBRXBDLFlBQ1UsVUFBVSxFQUFFLGFBQWEsRUFDakMsYUFBYSxFQUFFLFVBQVUsRUFDekIsUUFBUSxFQUFFLFVBQVUsRUFDWixZQUFZLENBQUMsOEJBQWtCLEVBQ3ZDLElBQUksR0FBRSxvQkFBeUIsRUFnQmhDO0lBRUQsb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxRQUc5QztJQUVELGlCQUFpQixDQUFDLGNBQWMsRUFBRSxPQUFPLFFBRXhDO0lBRUQseUdBQXlHO0lBQ3pHLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxNQUFNLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFFN0M7SUFFRCx1R0FBdUc7SUFDdkcsc0JBQXNCLENBQUMsRUFBRSxFQUFFLE1BQU0sT0FBTyxRQUV2QztJQUVEOzs7OztPQUtHO0lBQ0gscUJBQXFCLENBQUMsSUFBSSxFQUFFLE1BQU0sUUFJakM7SUFFSyxLQUFLLGtCQXlCVjtJQUVLLElBQUksa0JBSVQ7SUFFSyxPQUFPLGtCQUlaO0lBRUssWUFBWSxrQkFLakI7SUFFSyw0QkFBNEIsa0JBc0JqQztJQUVLLGdCQUFnQixrQkEwRXJCO1lBTWEsZUFBZTtDQWdCOUIifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAgB;IA8BzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAhCvB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,iBAAiB,CAAC;IAE1B,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAG/D,OAAO,CAAC,iBAAiB,CAAC,CAAwB;IAGlD,OAAO,CAAC,mBAAmB,CAAC,CAAgB;IAG5C,OAAO,CAAC,qBAAqB,CAAC,CAAqC;IAMnE,OAAO,CAAC,kBAAkB,CAAC,CAAS;IAEpC,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EACvC,IAAI,GAAE,oBAAyB,EAgBhC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAED,yGAAyG;IACzG,oBAAoB,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAE7C;IAED,uGAAuG;IACvG,sBAAsB,CAAC,EAAE,EAAE,MAAM,OAAO,QAEvC;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,IAAI,EAAE,MAAM,QAIjC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAsBjC;IAEK,gBAAgB,kBA0ErB;YAMa,eAAe;CAgB9B"}
|
|
@@ -28,6 +28,11 @@ import { getAddress, getContract } from 'viem';
|
|
|
28
28
|
isSequencerBuilding;
|
|
29
29
|
// Tracks when we first observed the current unfilled slot with pending txs (real wall time).
|
|
30
30
|
unfilledSlotFirstSeen;
|
|
31
|
+
// Latest target slot for which the proposer has built a block destined for L1 but which has
|
|
32
|
+
// not yet been committed. Set by the proposer-pipelining hook from `block-proposed` events so
|
|
33
|
+
// the watcher can advance L1 (and the injected date provider) to the target slot ahead of the
|
|
34
|
+
// publisher's `sendRequestsAt` sleep, instead of waiting a full wall-clock slot.
|
|
35
|
+
proposedTargetSlot;
|
|
31
36
|
constructor(cheatcodes, rollupAddress, l1Client, dateProvider, opts = {}){
|
|
32
37
|
this.cheatcodes = cheatcodes;
|
|
33
38
|
this.dateProvider = dateProvider;
|
|
@@ -57,6 +62,16 @@ import { getAddress, getContract } from 'viem';
|
|
|
57
62
|
/** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */ setIsSequencerBuilding(fn) {
|
|
58
63
|
this.isSequencerBuilding = fn;
|
|
59
64
|
}
|
|
65
|
+
/**
|
|
66
|
+
* Records the target slot for which the proposer has built a block destined for L1. Used by
|
|
67
|
+
* the local-network watcher to fast-forward L1 (and the injected date provider) ahead of the
|
|
68
|
+
* pipelined publisher's `sendRequestsAt` sleep so it ends promptly instead of waiting a full
|
|
69
|
+
* wall-clock slot. Only ratchets up — late warps for stale slots are no-ops.
|
|
70
|
+
*/ setProposedTargetSlot(slot) {
|
|
71
|
+
if (this.proposedTargetSlot === undefined || slot > this.proposedTargetSlot) {
|
|
72
|
+
this.proposedTargetSlot = slot;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
60
75
|
async start() {
|
|
61
76
|
if (this.filledRunningPromise) {
|
|
62
77
|
throw new Error('Watcher already watching for filled slot');
|
|
@@ -144,6 +159,19 @@ import { getAddress, getContract } from 'viem';
|
|
|
144
159
|
if (!this.isLocalNetwork) {
|
|
145
160
|
return;
|
|
146
161
|
}
|
|
162
|
+
// Pipelined-publish shortcut: if the proposer has built a block destined for a slot
|
|
163
|
+
// beyond the current L1 slot, fast-forward L1 to that slot's timestamp so the publisher's
|
|
164
|
+
// `sendRequestsAt(targetSlot)` sleep ends and the multicall mines inside the target slot.
|
|
165
|
+
// Without this, the publisher waits up to a full real-time slot for wall clock to catch up.
|
|
166
|
+
if (this.proposedTargetSlot !== undefined && this.proposedTargetSlot > currentSlot) {
|
|
167
|
+
const targetSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
|
|
168
|
+
BigInt(this.proposedTargetSlot)
|
|
169
|
+
]));
|
|
170
|
+
if (await this.warpToTimestamp(targetSlotTimestamp)) {
|
|
171
|
+
this.logger.info(`Warped L1 to target slot ${this.proposedTargetSlot} for pipelined publish`);
|
|
172
|
+
}
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
147
175
|
// If there are pending txs and the sequencer missed them, warp quickly (after a 2s real-time debounce) so the
|
|
148
176
|
// sequencer can retry in the next slot. Without this, we'd have to wait a full real-time slot duration (~36s) for
|
|
149
177
|
// the dateProvider to catch up to the next slot timestamp. We skip the warp if the sequencer is actively building
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
|
|
2
2
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
3
|
+
import type { AutomineSequencer } from '@aztec/sequencer-client';
|
|
3
4
|
import type { AztecNode, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
|
|
4
5
|
/**
|
|
5
6
|
* A class that provides utility functions for interacting with the chain.
|
|
@@ -12,13 +13,17 @@ export declare class CheatCodes {
|
|
|
12
13
|
eth: EthCheatCodes;
|
|
13
14
|
/** Cheat codes for the Aztec Rollup contract on L1. */
|
|
14
15
|
rollup: RollupCheatCodes;
|
|
16
|
+
/** When wired, redirects time-warps through the AutomineSequencer queue (test-only). */
|
|
17
|
+
private automine?;
|
|
15
18
|
private logger;
|
|
16
19
|
constructor(
|
|
17
20
|
/** Cheat codes for L1.*/
|
|
18
21
|
eth: EthCheatCodes,
|
|
19
22
|
/** Cheat codes for the Aztec Rollup contract on L1. */
|
|
20
|
-
rollup: RollupCheatCodes
|
|
21
|
-
|
|
23
|
+
rollup: RollupCheatCodes,
|
|
24
|
+
/** When wired, redirects time-warps through the AutomineSequencer queue (test-only). */
|
|
25
|
+
automine?: AutomineSequencer | undefined);
|
|
26
|
+
static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider, automine?: AutomineSequencer): Promise<CheatCodes>;
|
|
22
27
|
/**
|
|
23
28
|
* Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
|
|
24
29
|
* the target timestamp. If the target timestamp falls within the current L2 slot (which already has a block),
|
|
@@ -26,7 +31,7 @@ export declare class CheatCodes {
|
|
|
26
31
|
* @param node - The Aztec node used to force an empty block to be mined.
|
|
27
32
|
* @param targetTimestamp - The target timestamp to warp to (in seconds)
|
|
28
33
|
*/
|
|
29
|
-
warpL2TimeAtLeastTo(node: AztecNodeDebug, targetTimestamp: bigint | number): Promise<void>;
|
|
34
|
+
warpL2TimeAtLeastTo(node: AztecNode & AztecNodeDebug, targetTimestamp: bigint | number): Promise<void>;
|
|
30
35
|
/**
|
|
31
36
|
* Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
|
|
32
37
|
* least by the duration. If the duration is too short to cross an L2 slot boundary, the warp is automatically
|
|
@@ -34,6 +39,6 @@ export declare class CheatCodes {
|
|
|
34
39
|
* @param node - The Aztec node used to force an empty block to be mined.
|
|
35
40
|
* @param duration - The duration to advance time by (in seconds)
|
|
36
41
|
*/
|
|
37
|
-
warpL2TimeAtLeastBy(node: AztecNodeDebug, duration: bigint | number): Promise<void>;
|
|
42
|
+
warpL2TimeAtLeastBy(node: AztecNode & AztecNodeDebug, duration: bigint | number): Promise<void>;
|
|
38
43
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRjs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFJbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsUUFBUSxDQUFDO0lBUm5CLE9BQU8sQ0FBQyxNQUFNLENBQXVDO0lBRXJEO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHdGQUF3RjtJQUNoRixRQUFRLENBQUMsK0JBQW1CLEVBQ2xDO0lBRUosT0FBYSxNQUFNLENBQ2pCLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsSUFBSSxFQUFFLFNBQVMsRUFDZixZQUFZLEVBQUUsWUFBWSxFQUMxQixRQUFRLENBQUMsRUFBRSxpQkFBaUIsR0FDM0IsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQU9yQjtJQUVEOzs7Ozs7T0FNRztJQUNHLG1CQUFtQixDQUFDLElBQUksRUFBRSxTQUFTLEdBQUcsY0FBYyxFQUFFLGVBQWUsRUFBRSxNQUFNLEdBQUcsTUFBTSxpQkE0RDNGO0lBRUQ7Ozs7OztPQU1HO0lBQ0csbUJBQW1CLENBQUMsSUFBSSxFQUFFLFNBQVMsR0FBRyxjQUFjLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQWVwRjtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF;;;;;GAKG;AACH,qBAAa,UAAU;IAInB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF;;;;;GAKG;AACH,qBAAa,UAAU;IAInB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IAC/B,wFAAwF;IACxF,OAAO,CAAC,QAAQ,CAAC;IARnB,OAAO,CAAC,MAAM,CAAuC;IAErD;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IAC/B,wFAAwF;IAChF,QAAQ,CAAC,+BAAmB,EAClC;IAEJ,OAAa,MAAM,CACjB,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,YAAY,EAC1B,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,UAAU,CAAC,CAOrB;IAED;;;;;;OAMG;IACG,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBA4D3F;IAED;;;;;;OAMG;IACG,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAepF;CACF"}
|
|
@@ -9,16 +9,18 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
9
9
|
*/ export class CheatCodes {
|
|
10
10
|
eth;
|
|
11
11
|
rollup;
|
|
12
|
+
automine;
|
|
12
13
|
logger;
|
|
13
|
-
constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
|
|
14
|
+
constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup, /** When wired, redirects time-warps through the AutomineSequencer queue (test-only). */ automine){
|
|
14
15
|
this.eth = eth;
|
|
15
16
|
this.rollup = rollup;
|
|
17
|
+
this.automine = automine;
|
|
16
18
|
this.logger = createLogger('aztecjs:cheat_codes');
|
|
17
19
|
}
|
|
18
|
-
static async create(rpcUrls, node, dateProvider) {
|
|
20
|
+
static async create(rpcUrls, node, dateProvider, automine) {
|
|
19
21
|
const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
|
|
20
22
|
const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await node.getNodeInfo().then((n)=>n.l1ContractAddresses));
|
|
21
|
-
return new CheatCodes(ethCheatCodes, rollupCheatCodes);
|
|
23
|
+
return new CheatCodes(ethCheatCodes, rollupCheatCodes, automine);
|
|
22
24
|
}
|
|
23
25
|
/**
|
|
24
26
|
* Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
|
|
@@ -32,20 +34,45 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
32
34
|
if (targetBigInt <= currentTimestamp) {
|
|
33
35
|
throw new Error(`warpL2TimeAtLeastTo: target timestamp ${targetBigInt} is not in the future (current L1 timestamp is ${currentTimestamp}).`);
|
|
34
36
|
}
|
|
37
|
+
// AutomineSequencer owns time control through its serial queue — delegate to keep warps atomic
|
|
38
|
+
// with respect to any in-flight build, and avoid the mineBlock-loop hack below.
|
|
39
|
+
// `warpTo` internally builds an empty L2 checkpoint, which auto-mines exactly one L1 block at
|
|
40
|
+
// the target slot boundary, so no separate `node.mineBlock()` is needed here.
|
|
41
|
+
if (this.automine) {
|
|
42
|
+
await this.automine.warpTo(Number(targetBigInt));
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
35
45
|
const currentSlot = await this.rollup.getSlot();
|
|
36
46
|
const targetSlot = await this.rollup.getSlotAt(targetBigInt);
|
|
37
47
|
let effectiveTimestamp = targetBigInt;
|
|
48
|
+
let effectiveTargetSlot = targetSlot;
|
|
38
49
|
if (targetSlot <= currentSlot) {
|
|
39
50
|
// Target lands in the same (or earlier) slot — auto-adjust to the next slot's start.
|
|
40
51
|
const nextSlot = SlotNumber(currentSlot + 1);
|
|
41
52
|
const nextSlotTimestamp = await this.rollup.getTimestampForSlot(nextSlot);
|
|
42
53
|
this.logger.warn(`warpL2TimeAtLeastTo: target timestamp ${targetBigInt} falls in current slot ${currentSlot}. ` + `Auto-adjusting to start of slot ${nextSlot} at timestamp ${nextSlotTimestamp}.`);
|
|
43
54
|
effectiveTimestamp = nextSlotTimestamp;
|
|
55
|
+
effectiveTargetSlot = nextSlot;
|
|
44
56
|
}
|
|
45
57
|
await this.eth.warp(effectiveTimestamp, {
|
|
46
58
|
resetBlockInterval: true
|
|
47
59
|
});
|
|
48
|
-
|
|
60
|
+
// The sequencer's polling loop may have a `work()` cycle in flight that captured pre-warp slot/timestamp values
|
|
61
|
+
// just before our warp landed. That cycle would mine an L2 block at the stale slot — the L1 sync prunes such a
|
|
62
|
+
// block from the canonical chain, but it lingers in local world state and the PXE will use it as the anchor for
|
|
63
|
+
// subsequent txs, leading to `expiration_timestamp` values that are already in the past relative to L1. Mine
|
|
64
|
+
// until we observe an L2 block at (or past) the post-warp slot, ensuring the next tx anchors to a fresh block.
|
|
65
|
+
const maxAttempts = 5;
|
|
66
|
+
for(let attempt = 1; attempt <= maxAttempts; attempt++){
|
|
67
|
+
await node.mineBlock();
|
|
68
|
+
const blockData = await node.getBlockData('latest');
|
|
69
|
+
const blockSlot = blockData?.header.globalVariables.slotNumber;
|
|
70
|
+
if (blockSlot !== undefined && BigInt(blockSlot) >= BigInt(effectiveTargetSlot)) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
this.logger.warn(`warpL2TimeAtLeastTo: mined L2 block at slot ${blockSlot}, expected at least ${effectiveTargetSlot}. ` + `Retrying mineBlock (attempt ${attempt}/${maxAttempts}).`);
|
|
74
|
+
}
|
|
75
|
+
throw new Error(`warpL2TimeAtLeastTo: failed to mine an L2 block at or past slot ${effectiveTargetSlot} after ${maxAttempts} attempts.`);
|
|
49
76
|
}
|
|
50
77
|
/**
|
|
51
78
|
* Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
|
|
@@ -57,8 +84,15 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
57
84
|
if (BigInt(duration) <= 0n) {
|
|
58
85
|
throw new Error(`warpL2TimeAtLeastBy: duration must be positive, got ${duration} seconds.`);
|
|
59
86
|
}
|
|
60
|
-
|
|
61
|
-
|
|
87
|
+
// Advance relative to whichever clock leads. A live sequencer mines L2 blocks at slot boundaries that can run
|
|
88
|
+
// ahead of anvil's L1 timestamp, so basing the target on L1 alone would advance the L2 timestamp by less than
|
|
89
|
+
// `duration`. Anchoring to the latest L2 block timestamp when it leads guarantees the post-warp L2 block is at
|
|
90
|
+
// least `duration` ahead of the current one.
|
|
91
|
+
const currentL1Timestamp = BigInt(await this.eth.lastBlockTimestamp());
|
|
92
|
+
const latestBlockData = await node.getBlockData('latest');
|
|
93
|
+
const latestL2Timestamp = latestBlockData ? BigInt(latestBlockData.header.globalVariables.timestamp) : 0n;
|
|
94
|
+
const baseTimestamp = latestL2Timestamp > currentL1Timestamp ? latestL2Timestamp : currentL1Timestamp;
|
|
95
|
+
const targetTimestamp = baseTimestamp + BigInt(duration);
|
|
62
96
|
await this.warpL2TimeAtLeastTo(node, targetTimestamp);
|
|
63
97
|
}
|
|
64
98
|
}
|
|
@@ -16,4 +16,4 @@ export declare class EpochTestSettler {
|
|
|
16
16
|
stop(): Promise<void>;
|
|
17
17
|
handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean>;
|
|
18
18
|
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQW1DbEU7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGrE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGrE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAmClE;CACF"}
|
|
@@ -27,8 +27,10 @@ export class EpochTestSettler {
|
|
|
27
27
|
await this.epochMonitor?.stop();
|
|
28
28
|
}
|
|
29
29
|
async handleEpochReadyToProve(epoch) {
|
|
30
|
-
const
|
|
31
|
-
|
|
30
|
+
const blocks = await this.l2BlockSource.getBlocks({
|
|
31
|
+
epoch,
|
|
32
|
+
onlyCheckpointed: true
|
|
33
|
+
});
|
|
32
34
|
this.log.info(`Settling epoch ${epoch} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`, {
|
|
33
35
|
blocks: blocks.map((b)=>b.toBlockInfo())
|
|
34
36
|
});
|
|
@@ -46,11 +48,11 @@ export class EpochTestSettler {
|
|
|
46
48
|
}
|
|
47
49
|
const outHash = computeEpochOutHash(messagesInEpoch);
|
|
48
50
|
if (!outHash.isZero()) {
|
|
49
|
-
await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
|
|
51
|
+
await this.rollupCheatCodes.insertOutbox(epoch, messagesInEpoch.length, outHash.toBigInt());
|
|
50
52
|
} else {
|
|
51
53
|
this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
|
|
52
54
|
}
|
|
53
|
-
const lastCheckpoint =
|
|
55
|
+
const lastCheckpoint = blocks.at(-1)?.checkpointNumber;
|
|
54
56
|
if (lastCheckpoint !== undefined) {
|
|
55
57
|
await this.rollupCheatCodes.markAsProven(lastCheckpoint);
|
|
56
58
|
} else {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.b3d3157a",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -28,38 +28,39 @@
|
|
|
28
28
|
"../package.common.json"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aztec/accounts": "0.0.1-commit.
|
|
32
|
-
"@aztec/archiver": "0.0.1-commit.
|
|
33
|
-
"@aztec/aztec-node": "0.0.1-commit.
|
|
34
|
-
"@aztec/aztec.js": "0.0.1-commit.
|
|
35
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
36
|
-
"@aztec/bb.js": "0.0.1-commit.
|
|
37
|
-
"@aztec/blob-client": "0.0.1-commit.
|
|
38
|
-
"@aztec/bot": "0.0.1-commit.
|
|
39
|
-
"@aztec/builder": "0.0.1-commit.
|
|
40
|
-
"@aztec/cli": "0.0.1-commit.
|
|
41
|
-
"@aztec/constants": "0.0.1-commit.
|
|
42
|
-
"@aztec/entrypoints": "0.0.1-commit.
|
|
43
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
44
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
45
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
46
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
47
|
-
"@aztec/node-lib": "0.0.1-commit.
|
|
48
|
-
"@aztec/noir-contracts.js": "0.0.1-commit.
|
|
49
|
-
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.
|
|
50
|
-
"@aztec/p2p": "0.0.1-commit.
|
|
51
|
-
"@aztec/p2p-bootstrap": "0.0.1-commit.
|
|
52
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
53
|
-
"@aztec/prover-client": "0.0.1-commit.
|
|
54
|
-
"@aztec/prover-node": "0.0.1-commit.
|
|
55
|
-
"@aztec/pxe": "0.0.1-commit.
|
|
56
|
-
"@aztec/sequencer-client": "0.0.1-commit.
|
|
57
|
-
"@aztec/
|
|
58
|
-
"@aztec/
|
|
59
|
-
"@aztec/
|
|
60
|
-
"@aztec/
|
|
61
|
-
"@aztec/
|
|
62
|
-
"@aztec/
|
|
31
|
+
"@aztec/accounts": "0.0.1-commit.b3d3157a",
|
|
32
|
+
"@aztec/archiver": "0.0.1-commit.b3d3157a",
|
|
33
|
+
"@aztec/aztec-node": "0.0.1-commit.b3d3157a",
|
|
34
|
+
"@aztec/aztec.js": "0.0.1-commit.b3d3157a",
|
|
35
|
+
"@aztec/bb-prover": "0.0.1-commit.b3d3157a",
|
|
36
|
+
"@aztec/bb.js": "0.0.1-commit.b3d3157a",
|
|
37
|
+
"@aztec/blob-client": "0.0.1-commit.b3d3157a",
|
|
38
|
+
"@aztec/bot": "0.0.1-commit.b3d3157a",
|
|
39
|
+
"@aztec/builder": "0.0.1-commit.b3d3157a",
|
|
40
|
+
"@aztec/cli": "0.0.1-commit.b3d3157a",
|
|
41
|
+
"@aztec/constants": "0.0.1-commit.b3d3157a",
|
|
42
|
+
"@aztec/entrypoints": "0.0.1-commit.b3d3157a",
|
|
43
|
+
"@aztec/ethereum": "0.0.1-commit.b3d3157a",
|
|
44
|
+
"@aztec/foundation": "0.0.1-commit.b3d3157a",
|
|
45
|
+
"@aztec/kv-store": "0.0.1-commit.b3d3157a",
|
|
46
|
+
"@aztec/l1-artifacts": "0.0.1-commit.b3d3157a",
|
|
47
|
+
"@aztec/node-lib": "0.0.1-commit.b3d3157a",
|
|
48
|
+
"@aztec/noir-contracts.js": "0.0.1-commit.b3d3157a",
|
|
49
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.b3d3157a",
|
|
50
|
+
"@aztec/p2p": "0.0.1-commit.b3d3157a",
|
|
51
|
+
"@aztec/p2p-bootstrap": "0.0.1-commit.b3d3157a",
|
|
52
|
+
"@aztec/protocol-contracts": "0.0.1-commit.b3d3157a",
|
|
53
|
+
"@aztec/prover-client": "0.0.1-commit.b3d3157a",
|
|
54
|
+
"@aztec/prover-node": "0.0.1-commit.b3d3157a",
|
|
55
|
+
"@aztec/pxe": "0.0.1-commit.b3d3157a",
|
|
56
|
+
"@aztec/sequencer-client": "0.0.1-commit.b3d3157a",
|
|
57
|
+
"@aztec/standard-contracts": "0.0.1-commit.b3d3157a",
|
|
58
|
+
"@aztec/stdlib": "0.0.1-commit.b3d3157a",
|
|
59
|
+
"@aztec/telemetry-client": "0.0.1-commit.b3d3157a",
|
|
60
|
+
"@aztec/txe": "0.0.1-commit.b3d3157a",
|
|
61
|
+
"@aztec/validator-ha-signer": "0.0.1-commit.b3d3157a",
|
|
62
|
+
"@aztec/wallets": "0.0.1-commit.b3d3157a",
|
|
63
|
+
"@aztec/world-state": "0.0.1-commit.b3d3157a",
|
|
63
64
|
"@iarna/toml": "^2.2.5",
|
|
64
65
|
"@types/chalk": "^2.2.0",
|
|
65
66
|
"abitype": "^0.8.11",
|