@aztec/aztec 4.0.0-nightly.20250907 → 4.0.0-nightly.20260107
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/README.md +1 -1
- package/dest/bin/index.d.ts +1 -1
- package/dest/bin/index.js +11 -10
- 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 +9 -25
- 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 +22 -39
- package/dest/cli/cli.d.ts +1 -1
- package/dest/cli/cli.d.ts.map +1 -1
- package/dest/cli/cli.js +46 -1
- package/dest/cli/cmds/start_archiver.d.ts +1 -1
- package/dest/cli/cmds/start_archiver.d.ts.map +1 -1
- package/dest/cli/cmds/start_archiver.js +9 -9
- package/dest/cli/cmds/start_bot.d.ts +4 -7
- package/dest/cli/cmds/start_bot.d.ts.map +1 -1
- package/dest/cli/cmds/start_bot.js +25 -14
- 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 +13 -21
- package/dest/cli/cmds/start_p2p_bootstrap.d.ts +1 -1
- package/dest/cli/cmds/start_p2p_bootstrap.js +1 -1
- package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
- package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
- package/dest/cli/cmds/start_prover_agent.js +11 -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 +8 -3
- package/dest/cli/cmds/start_prover_node.d.ts +1 -1
- package/dest/cli/cmds/start_prover_node.d.ts.map +1 -1
- package/dest/cli/cmds/start_prover_node.js +16 -7
- package/dest/cli/cmds/start_txe.d.ts +1 -1
- package/dest/cli/index.d.ts +1 -1
- package/dest/cli/preload_crs.d.ts +1 -1
- package/dest/cli/release_version.d.ts +1 -1
- package/dest/cli/util.d.ts +12 -10
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +7 -7
- package/dest/cli/versioning.d.ts +1 -1
- package/dest/cli/versioning.js +3 -3
- package/dest/examples/token.d.ts +1 -1
- package/dest/examples/token.js +18 -16
- package/dest/examples/util.d.ts +3 -3
- package/dest/examples/util.d.ts.map +1 -1
- package/dest/examples/util.js +1 -1
- package/dest/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -1
- package/dest/local-network/banana_fpc.d.ts +10 -0
- package/dest/local-network/banana_fpc.d.ts.map +1 -0
- package/dest/{sandbox → local-network}/banana_fpc.js +15 -19
- package/dest/local-network/index.d.ts +4 -0
- package/dest/local-network/index.d.ts.map +1 -0
- package/dest/local-network/index.js +3 -0
- package/dest/local-network/local-network.d.ts +72 -0
- package/dest/local-network/local-network.d.ts.map +1 -0
- package/dest/{sandbox/sandbox.js → local-network/local-network.js} +43 -57
- package/dest/local-network/sponsored_fpc.d.ts +5 -0
- package/dest/local-network/sponsored_fpc.d.ts.map +1 -0
- package/dest/{sandbox → local-network}/sponsored_fpc.js +7 -8
- package/dest/mnemonic.d.ts +1 -1
- package/dest/splash.d.ts +1 -1
- package/dest/testing/anvil_test_watcher.d.ts +4 -4
- package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
- package/dest/testing/anvil_test_watcher.js +19 -18
- package/dest/testing/cheat_codes.d.ts +7 -10
- package/dest/testing/cheat_codes.d.ts.map +1 -1
- package/dest/testing/cheat_codes.js +9 -10
- package/dest/testing/index.d.ts +1 -2
- package/dest/testing/index.d.ts.map +1 -1
- package/dest/testing/index.js +0 -1
- package/package.json +39 -37
- package/src/bin/index.ts +12 -10
- package/src/cli/aztec_start_action.ts +9 -22
- package/src/cli/aztec_start_options.ts +23 -40
- package/src/cli/cli.ts +46 -1
- package/src/cli/cmds/start_archiver.ts +9 -9
- package/src/cli/cmds/start_bot.ts +36 -13
- package/src/cli/cmds/start_node.ts +16 -17
- package/src/cli/cmds/start_p2p_bootstrap.ts +1 -1
- package/src/cli/cmds/start_prover_agent.ts +7 -2
- package/src/cli/cmds/start_prover_broker.ts +17 -3
- package/src/cli/cmds/start_prover_node.ts +13 -8
- package/src/cli/util.ts +12 -10
- package/src/cli/versioning.ts +3 -3
- package/src/examples/token.ts +20 -17
- package/src/examples/util.ts +2 -2
- package/src/index.ts +5 -5
- package/src/{sandbox → local-network}/banana_fpc.ts +16 -21
- package/src/local-network/index.ts +7 -0
- package/src/{sandbox/sandbox.ts → local-network/local-network.ts} +68 -99
- package/src/local-network/sponsored_fpc.ts +26 -0
- package/src/testing/anvil_test_watcher.ts +18 -19
- package/src/testing/cheat_codes.ts +13 -13
- package/src/testing/index.ts +0 -1
- package/dest/cli/chain_l2_config.d.ts +0 -31
- package/dest/cli/chain_l2_config.d.ts.map +0 -1
- package/dest/cli/chain_l2_config.js +0 -261
- package/dest/cli/cmds/start_blob_sink.d.ts +0 -3
- package/dest/cli/cmds/start_blob_sink.d.ts.map +0 -1
- package/dest/cli/cmds/start_blob_sink.js +0 -33
- package/dest/cli/cmds/start_pxe.d.ts +0 -16
- package/dest/cli/cmds/start_pxe.d.ts.map +0 -1
- package/dest/cli/cmds/start_pxe.js +0 -31
- package/dest/cli/get_l1_config.d.ts +0 -7
- package/dest/cli/get_l1_config.d.ts.map +0 -1
- package/dest/cli/get_l1_config.js +0 -13
- package/dest/sandbox/banana_fpc.d.ts +0 -11
- package/dest/sandbox/banana_fpc.d.ts.map +0 -1
- package/dest/sandbox/index.d.ts +0 -4
- package/dest/sandbox/index.d.ts.map +0 -1
- package/dest/sandbox/index.js +0 -3
- package/dest/sandbox/sandbox.d.ts +0 -83
- package/dest/sandbox/sandbox.d.ts.map +0 -1
- package/dest/sandbox/sponsored_fpc.d.ts +0 -4
- package/dest/sandbox/sponsored_fpc.d.ts.map +0 -1
- package/dest/testing/aztec_cheat_codes.d.ts +0 -59
- package/dest/testing/aztec_cheat_codes.d.ts.map +0 -1
- package/dest/testing/aztec_cheat_codes.js +0 -62
- package/src/cli/chain_l2_config.ts +0 -341
- package/src/cli/cmds/start_blob_sink.ts +0 -57
- package/src/cli/cmds/start_pxe.ts +0 -49
- package/src/cli/get_l1_config.ts +0 -19
- package/src/sandbox/index.ts +0 -4
- package/src/sandbox/sponsored_fpc.ts +0 -27
- package/src/testing/aztec_cheat_codes.ts +0 -77
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
#!/usr/bin/env -S node --no-warnings
|
|
2
|
+
import { AztecNodeService } from '@aztec/aztec-node';
|
|
3
|
+
import { type AztecNodeConfig } from '@aztec/aztec-node/config';
|
|
4
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
5
|
+
import { type BlobClientInterface } from '@aztec/blob-client/client';
|
|
6
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
8
|
+
import { DateProvider } from '@aztec/foundation/timer';
|
|
9
|
+
import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
|
|
10
|
+
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
11
|
+
import { type Hex } from 'viem';
|
|
12
|
+
/**
|
|
13
|
+
* Function to deploy our L1 contracts to the local network L1
|
|
14
|
+
* @param aztecNodeConfig - The Aztec Node Config
|
|
15
|
+
* @param hdAccount - Account for publishing L1 contracts
|
|
16
|
+
*/
|
|
17
|
+
export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, privateKey: Hex, opts?: {
|
|
18
|
+
assumeProvenThroughBlockNumber?: number;
|
|
19
|
+
genesisArchiveRoot?: Fr;
|
|
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
|
+
slashFactoryAddress?: EthAddress | undefined;
|
|
35
|
+
feeAssetHandlerAddress?: EthAddress | undefined;
|
|
36
|
+
stakingAssetHandlerAddress?: EthAddress | undefined;
|
|
37
|
+
zkPassportVerifierAddress?: EthAddress | undefined;
|
|
38
|
+
gseAddress?: EthAddress | undefined;
|
|
39
|
+
dateGatedRelayerAddress?: EthAddress | undefined;
|
|
40
|
+
} & {
|
|
41
|
+
rollupAddress: EthAddress;
|
|
42
|
+
} & {
|
|
43
|
+
rollupAddress: EthAddress;
|
|
44
|
+
}>;
|
|
45
|
+
/** Local network settings. */
|
|
46
|
+
export type LocalNetworkConfig = AztecNodeConfig & {
|
|
47
|
+
/** Mnemonic used to derive the L1 deployer private key.*/
|
|
48
|
+
l1Mnemonic: string;
|
|
49
|
+
/** Whether to deploy test accounts on local network start.*/
|
|
50
|
+
testAccounts: boolean;
|
|
51
|
+
};
|
|
52
|
+
/**
|
|
53
|
+
* Create and start a new Aztec Node and PXE. Deploys L1 contracts.
|
|
54
|
+
* Does not start any HTTP services nor populate any initial accounts.
|
|
55
|
+
* @param config - Optional local network settings.
|
|
56
|
+
*/
|
|
57
|
+
export declare function createLocalNetwork(config: Partial<LocalNetworkConfig> | undefined, userLog: LogFn): Promise<{
|
|
58
|
+
node: AztecNodeService;
|
|
59
|
+
stop: () => Promise<void>;
|
|
60
|
+
}>;
|
|
61
|
+
/**
|
|
62
|
+
* Create and start a new Aztec RPC HTTP Server
|
|
63
|
+
* @param config - Optional Aztec node settings.
|
|
64
|
+
*/
|
|
65
|
+
export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?: {
|
|
66
|
+
telemetry?: TelemetryClient;
|
|
67
|
+
blobClient?: BlobClientInterface;
|
|
68
|
+
dateProvider?: DateProvider;
|
|
69
|
+
}, options?: {
|
|
70
|
+
prefilledPublicData?: PublicDataTreeLeaf[];
|
|
71
|
+
}): Promise<AztecNodeService>;
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUd6RSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlELE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUlqQyxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBY3pGOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFVBQVUsRUFBRSxHQUFHLEVBQ2YsSUFBSSxHQUFFO0lBQ0osOEJBQThCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDeEMsa0JBQWtCLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDeEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBK0doRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUFFLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQUMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFBO0NBQU8sRUFDekcsT0FBTyxHQUFFO0lBQUUsbUJBQW1CLENBQUMsRUFBRSxrQkFBa0IsRUFBRSxDQUFBO0NBQU8sNkJBVzdEIn0=
|
|
@@ -0,0 +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;AASvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAczF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAoBP;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;;;GA+GhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACzG,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}
|
|
@@ -1,21 +1,24 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
2
|
+
import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
3
|
+
import { AztecNodeService } from '@aztec/aztec-node';
|
|
4
|
+
import { getConfigEnvVars } from '@aztec/aztec-node/config';
|
|
5
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
6
|
+
import { createLogger } from '@aztec/aztec.js/log';
|
|
7
|
+
import { createBlobClient } from '@aztec/blob-client/client';
|
|
8
8
|
import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
|
|
9
|
-
import {
|
|
9
|
+
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
10
|
+
import { waitForPublicClient } from '@aztec/ethereum/client';
|
|
11
|
+
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
12
|
+
import { NULL_KEY } from '@aztec/ethereum/constants';
|
|
13
|
+
import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
|
|
10
14
|
import { EthCheatCodes } from '@aztec/ethereum/test';
|
|
11
15
|
import { SecretValue } from '@aztec/foundation/config';
|
|
12
|
-
import {
|
|
13
|
-
import { createLogger } from '@aztec/foundation/log';
|
|
16
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
14
17
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
15
18
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
16
|
-
import {
|
|
17
|
-
import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
|
|
19
|
+
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
18
20
|
import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
21
|
+
import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
|
|
19
22
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
20
23
|
import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
|
|
21
24
|
import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
|
|
@@ -25,30 +28,25 @@ import { DefaultMnemonic } from '../mnemonic.js';
|
|
|
25
28
|
import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
|
|
26
29
|
import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
|
|
27
30
|
import { getSponsoredFPCAddress } from './sponsored_fpc.js';
|
|
28
|
-
const logger = createLogger('
|
|
31
|
+
const logger = createLogger('local-network');
|
|
29
32
|
const localAnvil = foundry;
|
|
30
33
|
/**
|
|
31
|
-
* Function to deploy our L1 contracts to the
|
|
34
|
+
* Function to deploy our L1 contracts to the local network L1
|
|
32
35
|
* @param aztecNodeConfig - The Aztec Node Config
|
|
33
36
|
* @param hdAccount - Account for publishing L1 contracts
|
|
34
|
-
*/ export async function deployContractsToL1(aztecNodeConfig,
|
|
35
|
-
const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain(aztecNodeConfig.l1RpcUrls, aztecNodeConfig.l1ChainId) : {
|
|
36
|
-
chainInfo: localAnvil
|
|
37
|
-
};
|
|
37
|
+
*/ export async function deployContractsToL1(aztecNodeConfig, privateKey, opts = {}) {
|
|
38
38
|
await waitForPublicClient(aztecNodeConfig);
|
|
39
|
-
const l1Contracts = await
|
|
39
|
+
const l1Contracts = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], privateKey, foundry.id, {
|
|
40
40
|
...getL1ContractsConfigEnvVars(),
|
|
41
41
|
...aztecNodeConfig,
|
|
42
42
|
vkTreeRoot: getVKTreeRoot(),
|
|
43
|
-
|
|
43
|
+
protocolContractsHash,
|
|
44
44
|
genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
|
|
45
|
-
salt: opts.salt,
|
|
46
45
|
feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
|
|
47
46
|
aztecTargetCommitteeSize: 0,
|
|
48
47
|
slasherFlavor: 'none',
|
|
49
48
|
realVerifier: false
|
|
50
49
|
});
|
|
51
|
-
await deployMulticall3(l1Contracts.l1Client, logger);
|
|
52
50
|
aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
|
|
53
51
|
aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
|
|
54
52
|
return aztecNodeConfig.l1Contracts;
|
|
@@ -56,15 +54,15 @@ const localAnvil = foundry;
|
|
|
56
54
|
/**
|
|
57
55
|
* Create and start a new Aztec Node and PXE. Deploys L1 contracts.
|
|
58
56
|
* Does not start any HTTP services nor populate any initial accounts.
|
|
59
|
-
* @param config - Optional
|
|
60
|
-
*/ export async function
|
|
61
|
-
//
|
|
57
|
+
* @param config - Optional local network settings.
|
|
58
|
+
*/ export async function createLocalNetwork(config = {}, userLog) {
|
|
59
|
+
// local network is meant for test envs. We should only need one l1RpcUrl
|
|
62
60
|
const l1RpcUrl = config.l1RpcUrls?.[0];
|
|
63
61
|
if (!l1RpcUrl) {
|
|
64
62
|
throw new Error('An L1 RPC URL is required');
|
|
65
63
|
}
|
|
66
64
|
if ((config.l1RpcUrls?.length || 0) > 1) {
|
|
67
|
-
logger.warn(`Multiple L1 RPC URLs provided.
|
|
65
|
+
logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
|
|
68
66
|
}
|
|
69
67
|
const aztecNodeConfig = {
|
|
70
68
|
...getConfigEnvVars(),
|
|
@@ -90,7 +88,7 @@ const localAnvil = foundry;
|
|
|
90
88
|
userLog(`Not setting up test accounts as we are connecting to a network`);
|
|
91
89
|
} else {
|
|
92
90
|
userLog(`Setting up test accounts`);
|
|
93
|
-
return await
|
|
91
|
+
return await getInitialTestAccountsData();
|
|
94
92
|
}
|
|
95
93
|
}
|
|
96
94
|
return [];
|
|
@@ -106,10 +104,9 @@ const localAnvil = foundry;
|
|
|
106
104
|
let watcher = undefined;
|
|
107
105
|
const dateProvider = new TestDateProvider();
|
|
108
106
|
if (!aztecNodeConfig.p2pEnabled) {
|
|
109
|
-
const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig,
|
|
107
|
+
const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
|
|
110
108
|
assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
|
|
111
109
|
genesisArchiveRoot,
|
|
112
|
-
salt: config.deployAztecContractsSalt ? parseInt(config.deployAztecContractsSalt) : undefined,
|
|
113
110
|
feeJuicePortalInitialBalance: fundingNeeded
|
|
114
111
|
});
|
|
115
112
|
const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
|
|
@@ -125,36 +122,37 @@ const localAnvil = foundry;
|
|
|
125
122
|
});
|
|
126
123
|
watcher = new AnvilTestWatcher(new EthCheatCodes([
|
|
127
124
|
l1RpcUrl
|
|
128
|
-
]), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
|
|
129
|
-
watcher.
|
|
125
|
+
], dateProvider), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
|
|
126
|
+
watcher.setisLocalNetwork(true);
|
|
130
127
|
await watcher.start();
|
|
131
128
|
}
|
|
132
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
133
|
-
// Create a local blob
|
|
134
|
-
const
|
|
129
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
130
|
+
// Create a local blob client client inside the local network, no http connectivity
|
|
131
|
+
const blobClient = createBlobClient();
|
|
135
132
|
const node = await createAztecNode(aztecNodeConfig, {
|
|
136
133
|
telemetry,
|
|
137
|
-
|
|
134
|
+
blobClient,
|
|
138
135
|
dateProvider
|
|
139
136
|
}, {
|
|
140
137
|
prefilledPublicData
|
|
141
138
|
});
|
|
142
|
-
const pxeServiceConfig = {
|
|
143
|
-
proverEnabled: aztecNodeConfig.realProofs
|
|
144
|
-
};
|
|
145
|
-
const pxe = await createAztecPXE(node, pxeServiceConfig);
|
|
146
139
|
if (initialAccounts.length) {
|
|
140
|
+
const PXEConfig = {
|
|
141
|
+
proverEnabled: aztecNodeConfig.realProofs
|
|
142
|
+
};
|
|
143
|
+
const wallet = await TestWallet.create(node, PXEConfig);
|
|
147
144
|
userLog('Setting up funded test accounts...');
|
|
148
|
-
const
|
|
149
|
-
const accountsWithSecrets =
|
|
150
|
-
account,
|
|
145
|
+
const accountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccounts);
|
|
146
|
+
const accountsWithSecrets = accountManagers.map((manager, i)=>({
|
|
147
|
+
account: manager,
|
|
151
148
|
secretKey: initialAccounts[i].secret
|
|
152
149
|
}));
|
|
153
|
-
const accLogs = await createAccountLogs(accountsWithSecrets,
|
|
150
|
+
const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
|
|
154
151
|
userLog(accLogs.join(''));
|
|
155
|
-
|
|
156
|
-
await
|
|
157
|
-
|
|
152
|
+
await setupBananaFPC(initialAccounts, wallet, userLog);
|
|
153
|
+
userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
|
|
154
|
+
// We no longer need the wallet once we've setup the accounts so we stop the underlying PXE job queue
|
|
155
|
+
await wallet.stop();
|
|
158
156
|
}
|
|
159
157
|
const stop = async ()=>{
|
|
160
158
|
await node.stop();
|
|
@@ -162,7 +160,6 @@ const localAnvil = foundry;
|
|
|
162
160
|
};
|
|
163
161
|
return {
|
|
164
162
|
node,
|
|
165
|
-
pxe,
|
|
166
163
|
stop
|
|
167
164
|
};
|
|
168
165
|
}
|
|
@@ -183,14 +180,3 @@ const localAnvil = foundry;
|
|
|
183
180
|
const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
|
|
184
181
|
return node;
|
|
185
182
|
}
|
|
186
|
-
/**
|
|
187
|
-
* Create and start a new Aztec PXE HTTP Server
|
|
188
|
-
* @param config - Optional PXE settings.
|
|
189
|
-
*/ export async function createAztecPXE(node, config = {}) {
|
|
190
|
-
const pxeServiceConfig = {
|
|
191
|
-
...getPXEServiceConfig(),
|
|
192
|
-
...config
|
|
193
|
-
};
|
|
194
|
-
const pxe = await createPXEService(node, pxeServiceConfig);
|
|
195
|
-
return pxe;
|
|
196
|
-
}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
3
|
+
export declare function getSponsoredFPCAddress(): Promise<AztecAddress>;
|
|
4
|
+
export declare function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3BvbnNvcmVkX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvc3BvbnNvcmVkX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQU05RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVVyRCx3QkFBc0Isc0JBQXNCLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUVwRTtBQUVELHdCQUFzQixpREFBaUQsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FLN0cifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sponsored_fpc.d.ts","sourceRoot":"","sources":["../../src/local-network/sponsored_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAM9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAUrD,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,YAAY,CAAC,CAEpE;AAED,wBAAsB,iDAAiD,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAK7G"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
|
|
2
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
2
3
|
import { SPONSORED_FPC_SALT } from '@aztec/constants';
|
|
3
4
|
import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
|
|
4
5
|
async function getSponsoredFPCInstance() {
|
|
@@ -9,11 +10,9 @@ async function getSponsoredFPCInstance() {
|
|
|
9
10
|
export async function getSponsoredFPCAddress() {
|
|
10
11
|
return (await getSponsoredFPCInstance()).address;
|
|
11
12
|
}
|
|
12
|
-
export async function
|
|
13
|
-
const fpc = await
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
return fpc;
|
|
13
|
+
export async function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet) {
|
|
14
|
+
const fpc = await getSponsoredFPCInstance();
|
|
15
|
+
// The following is no-op if the contract is already registered
|
|
16
|
+
await wallet.registerContract(fpc, SponsoredFPCContract.artifact);
|
|
17
|
+
return fpc.address;
|
|
19
18
|
}
|
package/dest/mnemonic.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const DefaultMnemonic = "test test test test test test test test test test test junk";
|
|
2
|
-
//# sourceMappingURL=
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW5lbW9uaWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9tbmVtb25pYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFPLE1BQU0sZUFBZSxnRUFBZ0UsQ0FBQyJ9
|
package/dest/splash.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export declare const splash: string;
|
|
2
2
|
export declare const github = "https://github.com/AztecProtocol";
|
|
3
|
-
//# sourceMappingURL=
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3BsYXNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc3BsYXNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQU8sTUFBTSxNQUFNLEVBQUUsTUFPa0IsQ0FBQztBQUV4QyxlQUFPLE1BQU0sTUFBTSxxQ0FBcUMsQ0FBQyJ9
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ViemClient } from '@aztec/ethereum';
|
|
2
1
|
import { EthCheatCodes } from '@aztec/ethereum/test';
|
|
2
|
+
import type { ViemClient } from '@aztec/ethereum/types';
|
|
3
3
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { TestDateProvider } from '@aztec/foundation/timer';
|
|
5
5
|
/**
|
|
@@ -12,7 +12,7 @@ import type { TestDateProvider } from '@aztec/foundation/timer';
|
|
|
12
12
|
export declare class AnvilTestWatcher {
|
|
13
13
|
private cheatcodes;
|
|
14
14
|
private dateProvider?;
|
|
15
|
-
private
|
|
15
|
+
private isLocalNetwork;
|
|
16
16
|
private rollup;
|
|
17
17
|
private rollupCheatCodes;
|
|
18
18
|
private l2SlotDuration;
|
|
@@ -23,7 +23,7 @@ export declare class AnvilTestWatcher {
|
|
|
23
23
|
private isMarkingAsProven;
|
|
24
24
|
constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined);
|
|
25
25
|
setIsMarkingAsProven(isMarkingAsProven: boolean): void;
|
|
26
|
-
|
|
26
|
+
setisLocalNetwork(isLocalNetwork: boolean): void;
|
|
27
27
|
start(): Promise<void>;
|
|
28
28
|
stop(): Promise<void>;
|
|
29
29
|
trigger(): Promise<void>;
|
|
@@ -31,4 +31,4 @@ export declare class AnvilTestWatcher {
|
|
|
31
31
|
syncDateProviderToL1IfBehind(): Promise<void>;
|
|
32
32
|
warpTimeIfNeeded(): Promise<void>;
|
|
33
33
|
}
|
|
34
|
-
//# sourceMappingURL=
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQWdCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQWxCdkIsT0FBTyxDQUFDLGNBQWMsQ0FBa0I7SUFFeEMsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRS9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUTtJQUVqQyxZQUNVLFVBQVUsRUFBRSxhQUFhLEVBQ2pDLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLFFBQVEsRUFBRSxVQUFVLEVBQ1osWUFBWSxDQUFDLDhCQUFrQixFQWF4QztJQUVELG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sUUFHOUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsT0FBTyxRQUV4QztJQUVLLEtBQUssa0JBeUJWO0lBRUssSUFBSSxrQkFJVDtJQUVLLE9BQU8sa0JBSVo7SUFFSyxZQUFZLGtCQUtqQjtJQUVLLDRCQUE0QixrQkFlakM7SUFFSyxnQkFBZ0Isa0JBd0NyQjtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
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;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAgBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAlBvB,OAAO,CAAC,cAAc,CAAkB;IAExC,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;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;IAEjC,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EAaxC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAejC;IAEK,gBAAgB,kBAwCrB;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RollupCheatCodes } from '@aztec/ethereum/test';
|
|
2
|
+
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
3
4
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
4
5
|
import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
|
|
@@ -12,7 +13,7 @@ import { getAddress, getContract } from 'viem';
|
|
|
12
13
|
*/ export class AnvilTestWatcher {
|
|
13
14
|
cheatcodes;
|
|
14
15
|
dateProvider;
|
|
15
|
-
|
|
16
|
+
isLocalNetwork;
|
|
16
17
|
rollup;
|
|
17
18
|
rollupCheatCodes;
|
|
18
19
|
l2SlotDuration;
|
|
@@ -24,7 +25,7 @@ import { getAddress, getContract } from 'viem';
|
|
|
24
25
|
constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
|
|
25
26
|
this.cheatcodes = cheatcodes;
|
|
26
27
|
this.dateProvider = dateProvider;
|
|
27
|
-
this.
|
|
28
|
+
this.isLocalNetwork = false;
|
|
28
29
|
this.logger = createLogger(`aztecjs:utils:watcher`);
|
|
29
30
|
this.isMarkingAsProven = true;
|
|
30
31
|
this.rollup = getContract({
|
|
@@ -38,10 +39,11 @@ import { getAddress, getContract } from 'viem';
|
|
|
38
39
|
this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
|
|
39
40
|
}
|
|
40
41
|
setIsMarkingAsProven(isMarkingAsProven) {
|
|
42
|
+
this.logger.warn(`Watcher is now ${isMarkingAsProven ? 'marking' : 'not marking'} blocks as proven`);
|
|
41
43
|
this.isMarkingAsProven = isMarkingAsProven;
|
|
42
44
|
}
|
|
43
|
-
|
|
44
|
-
this.
|
|
45
|
+
setisLocalNetwork(isLocalNetwork) {
|
|
46
|
+
this.isLocalNetwork = isLocalNetwork;
|
|
45
47
|
}
|
|
46
48
|
async start() {
|
|
47
49
|
if (this.filledRunningPromise) {
|
|
@@ -51,7 +53,7 @@ import { getAddress, getContract } from 'viem';
|
|
|
51
53
|
this.l2SlotDuration = config.slotDuration;
|
|
52
54
|
// If auto mining is not supported (e.g., we are on a real network), then we
|
|
53
55
|
// will simple do nothing. But if on an anvil or the like, this make sure that
|
|
54
|
-
// the
|
|
56
|
+
// the local network and tests don't break because time is frozen and we never get to
|
|
55
57
|
// the next slot.
|
|
56
58
|
const isAutoMining = await this.cheatcodes.isAutoMining();
|
|
57
59
|
if (isAutoMining) {
|
|
@@ -83,7 +85,7 @@ import { getAddress, getContract } from 'viem';
|
|
|
83
85
|
await this.rollupCheatCodes.markAsProven();
|
|
84
86
|
}
|
|
85
87
|
async syncDateProviderToL1IfBehind() {
|
|
86
|
-
// this doesn't apply to the
|
|
88
|
+
// this doesn't apply to the local network, because we don't have a date provider in the local network
|
|
87
89
|
if (!this.dateProvider) {
|
|
88
90
|
return;
|
|
89
91
|
}
|
|
@@ -99,20 +101,20 @@ import { getAddress, getContract } from 'viem';
|
|
|
99
101
|
}
|
|
100
102
|
async warpTimeIfNeeded() {
|
|
101
103
|
try {
|
|
102
|
-
const currentSlot = await this.rollup.read.getCurrentSlot();
|
|
103
|
-
const
|
|
104
|
-
const
|
|
105
|
-
|
|
104
|
+
const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
|
|
105
|
+
const pendingCheckpointNumber = await this.rollup.read.getPendingCheckpointNumber();
|
|
106
|
+
const checkpointLog = await this.rollup.read.getCheckpoint([
|
|
107
|
+
pendingCheckpointNumber
|
|
106
108
|
]);
|
|
109
|
+
const nextSlot = SlotNumber(currentSlot + 1);
|
|
107
110
|
const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
|
|
108
|
-
|
|
111
|
+
BigInt(nextSlot)
|
|
109
112
|
]));
|
|
110
|
-
if (currentSlot ===
|
|
113
|
+
if (BigInt(currentSlot) === checkpointLog.slotNumber) {
|
|
111
114
|
// We should jump to the next slot
|
|
112
115
|
try {
|
|
113
116
|
await this.cheatcodes.warp(nextSlotTimestamp, {
|
|
114
|
-
resetBlockInterval: true
|
|
115
|
-
updateDateProvider: this.dateProvider
|
|
117
|
+
resetBlockInterval: true
|
|
116
118
|
});
|
|
117
119
|
} catch (e) {
|
|
118
120
|
this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
|
|
@@ -120,16 +122,15 @@ import { getAddress, getContract } from 'viem';
|
|
|
120
122
|
this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
|
|
121
123
|
return;
|
|
122
124
|
}
|
|
123
|
-
// If we are not in
|
|
124
|
-
if (!this.
|
|
125
|
+
// If we are not in local network, we don't need to warp time
|
|
126
|
+
if (!this.isLocalNetwork) {
|
|
125
127
|
return;
|
|
126
128
|
}
|
|
127
129
|
const currentTimestamp = this.dateProvider?.now() ?? Date.now();
|
|
128
130
|
if (currentTimestamp > nextSlotTimestamp * 1000) {
|
|
129
131
|
try {
|
|
130
132
|
await this.cheatcodes.warp(nextSlotTimestamp, {
|
|
131
|
-
resetBlockInterval: true
|
|
132
|
-
updateDateProvider: this.dateProvider
|
|
133
|
+
resetBlockInterval: true
|
|
133
134
|
});
|
|
134
135
|
} catch (e) {
|
|
135
136
|
this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
|
|
@@ -1,25 +1,22 @@
|
|
|
1
1
|
import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
|
|
2
|
+
import type { DateProvider } from '@aztec/foundation/timer';
|
|
2
3
|
import type { SequencerClient } from '@aztec/sequencer-client';
|
|
3
|
-
import type { AztecNode
|
|
4
|
-
import { AztecCheatCodes } from './aztec_cheat_codes.js';
|
|
4
|
+
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
5
5
|
/**
|
|
6
6
|
* A class that provides utility functions for interacting with the chain.
|
|
7
|
+
* @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
|
|
8
|
+
* they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
|
|
9
|
+
* codes, please consider whether it makes sense to just introduce new utils in your tests instead.
|
|
7
10
|
*/
|
|
8
11
|
export declare class CheatCodes {
|
|
9
|
-
/** Cheat codes for L1.*/
|
|
10
12
|
eth: EthCheatCodes;
|
|
11
|
-
/** Cheat codes for Aztec L2. */
|
|
12
|
-
aztec: AztecCheatCodes;
|
|
13
|
-
/** Cheat codes for the Aztec Rollup contract on L1. */
|
|
14
13
|
rollup: RollupCheatCodes;
|
|
15
14
|
constructor(
|
|
16
15
|
/** Cheat codes for L1.*/
|
|
17
16
|
eth: EthCheatCodes,
|
|
18
|
-
/** Cheat codes for Aztec L2. */
|
|
19
|
-
aztec: AztecCheatCodes,
|
|
20
17
|
/** Cheat codes for the Aztec Rollup contract on L1. */
|
|
21
18
|
rollup: RollupCheatCodes);
|
|
22
|
-
static create(rpcUrls: string[],
|
|
19
|
+
static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): Promise<CheatCodes>;
|
|
23
20
|
/**
|
|
24
21
|
* Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
|
|
25
22
|
* the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
|
|
@@ -41,4 +38,4 @@ export declare class CheatCodes {
|
|
|
41
38
|
*/
|
|
42
39
|
warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
|
|
43
40
|
}
|
|
44
|
-
//# sourceMappingURL=
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFHWixHQUFHLEVBQUUsYUFBYTtJQUVsQixNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"
|
|
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,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,UAAU;IAGZ,GAAG,EAAE,aAAa;IAElB,MAAM,EAAE,gBAAgB;IAJjC;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvG;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBAuB5G;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAIrG;CACF"}
|
|
@@ -1,22 +1,21 @@
|
|
|
1
|
-
import { retryUntil } from '@aztec/aztec.js';
|
|
2
1
|
import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
|
|
3
|
-
import {
|
|
2
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
4
3
|
/**
|
|
5
4
|
* A class that provides utility functions for interacting with the chain.
|
|
5
|
+
* @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
|
|
6
|
+
* they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
|
|
7
|
+
* codes, please consider whether it makes sense to just introduce new utils in your tests instead.
|
|
6
8
|
*/ export class CheatCodes {
|
|
7
9
|
eth;
|
|
8
|
-
aztec;
|
|
9
10
|
rollup;
|
|
10
|
-
constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for
|
|
11
|
+
constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
|
|
11
12
|
this.eth = eth;
|
|
12
|
-
this.aztec = aztec;
|
|
13
13
|
this.rollup = rollup;
|
|
14
14
|
}
|
|
15
|
-
static async create(rpcUrls,
|
|
16
|
-
const ethCheatCodes = new EthCheatCodes(rpcUrls);
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
return new CheatCodes(ethCheatCodes, aztecCheatCodes, rollupCheatCodes);
|
|
15
|
+
static async create(rpcUrls, node, dateProvider) {
|
|
16
|
+
const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
|
|
17
|
+
const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await node.getNodeInfo().then((n)=>n.l1ContractAddresses));
|
|
18
|
+
return new CheatCodes(ethCheatCodes, rollupCheatCodes);
|
|
20
19
|
}
|
|
21
20
|
/**
|
|
22
21
|
* Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
|
package/dest/testing/index.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export { AnvilTestWatcher } from './anvil_test_watcher.js';
|
|
2
2
|
export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
|
|
3
|
-
export { AztecCheatCodes } from './aztec_cheat_codes.js';
|
|
4
3
|
export { CheatCodes } from './cheat_codes.js';
|
|
5
|
-
//# sourceMappingURL=
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC"}
|
package/dest/testing/index.js
CHANGED