@aztec/aztec 3.0.0-devnet.5 → 3.0.0-devnet.6-patch.1
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 +4 -2
- package/dest/cli/aztec_start_action.d.ts +1 -1
- package/dest/cli/aztec_start_action.js +9 -9
- 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 +12 -8
- 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.js +1 -1
- package/dest/cli/cmds/start_blob_sink.d.ts +1 -1
- package/dest/cli/cmds/start_blob_sink.js +1 -1
- package/dest/cli/cmds/start_bot.d.ts +1 -1
- package/dest/cli/cmds/start_bot.js +1 -1
- package/dest/cli/cmds/start_node.d.ts +1 -1
- package/dest/cli/cmds/start_node.js +4 -4
- 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.js +1 -1
- package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
- package/dest/cli/cmds/start_prover_broker.js +2 -2
- package/dest/cli/cmds/start_prover_node.d.ts +1 -1
- package/dest/cli/cmds/start_prover_node.js +3 -3
- 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 +6 -6
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +3 -3
- package/dest/cli/versioning.d.ts +1 -1
- package/dest/examples/token.d.ts +1 -1
- package/dest/examples/token.js +1 -1
- package/dest/examples/util.d.ts +2 -2
- package/dest/examples/util.d.ts.map +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 +1 -1
- package/dest/local-network/index.d.ts +4 -0
- package/dest/local-network/index.d.ts.map +1 -0
- package/dest/{sandbox → local-network}/index.js +1 -1
- package/dest/{sandbox/sandbox.d.ts → local-network/local-network.d.ts} +15 -15
- package/dest/local-network/local-network.d.ts.map +1 -0
- package/dest/{sandbox/sandbox.js → local-network/local-network.js} +16 -11
- package/dest/local-network/sponsored_fpc.d.ts +5 -0
- package/dest/local-network/sponsored_fpc.d.ts.map +1 -0
- 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 +16 -14
- package/dest/testing/cheat_codes.d.ts +1 -3
- package/dest/testing/cheat_codes.d.ts.map +1 -1
- package/dest/testing/index.d.ts +1 -1
- package/package.json +37 -36
- package/src/bin/index.ts +4 -2
- package/src/cli/aztec_start_action.ts +9 -9
- package/src/cli/aztec_start_options.ts +12 -7
- package/src/cli/cli.ts +46 -1
- package/src/cli/cmds/start_archiver.ts +1 -1
- package/src/cli/cmds/start_blob_sink.ts +1 -1
- package/src/cli/cmds/start_bot.ts +1 -1
- package/src/cli/cmds/start_node.ts +4 -4
- package/src/cli/cmds/start_p2p_bootstrap.ts +1 -1
- package/src/cli/cmds/start_prover_agent.ts +1 -1
- package/src/cli/cmds/start_prover_broker.ts +2 -2
- package/src/cli/cmds/start_prover_node.ts +3 -3
- package/src/cli/util.ts +4 -4
- package/src/examples/token.ts +1 -1
- package/src/examples/util.ts +1 -1
- package/src/index.ts +2 -2
- package/src/{sandbox → local-network}/banana_fpc.ts +1 -1
- package/src/{sandbox → local-network}/index.ts +1 -1
- package/src/{sandbox/sandbox.ts → local-network/local-network.ts} +21 -23
- package/src/{sandbox → local-network}/sponsored_fpc.ts +3 -2
- package/src/testing/anvil_test_watcher.ts +16 -14
- package/src/testing/cheat_codes.ts +3 -2
- package/dest/sandbox/banana_fpc.d.ts +0 -10
- 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/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/{sandbox → local-network}/sponsored_fpc.js +0 -0
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type InitialAccountData } from '@aztec/accounts/testing';
|
|
2
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
3
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
4
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
|
+
export declare function getBananaCoinAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
|
|
6
|
+
export declare function getBananaFPCAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
|
|
7
|
+
export declare function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn): Promise<void>;
|
|
8
|
+
export declare function registerDeployedBananaCoinInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
|
|
9
|
+
export declare function registerDeployedBananaFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuYW5hX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvYmFuYW5hX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBOEIsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF3QjNELHdCQUFzQixvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUseUJBRS9FO0FBV0Qsd0JBQXNCLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSx5QkFFOUU7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssaUJBY3JHO0FBRUQsd0JBQXNCLCtDQUErQyxDQUFDLE1BQU0sRUFBRSxNQUFNLHlCQU1uRjtBQUVELHdCQUFzQiw4Q0FBOEMsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFNbEYifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/local-network/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAwB3D,wBAAsB,oBAAoB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE/E;AAWD,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE9E;AAED,wBAAsB,cAAc,CAAC,eAAe,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAcrG;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
2
|
-
import { Fr } from '@aztec/foundation/
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import { FPCContract } from '@aztec/noir-contracts.js/FPC';
|
|
4
4
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
5
5
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export * from './local-network.js';
|
|
2
|
+
export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, } from './banana_fpc.js';
|
|
3
|
+
export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2NhbC1uZXR3b3JrL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFFbkMsT0FBTyxFQUNMLCtDQUErQyxFQUMvQyw4Q0FBOEMsR0FDL0MsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQUUsaURBQWlELEVBQUUsTUFBTSxvQkFBb0IsQ0FBQyJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/local-network/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EACL,+CAA+C,EAC/C,8CAA8C,GAC/C,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iDAAiD,EAAE,MAAM,oBAAoB,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './local-network.js';
|
|
2
2
|
export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress } from './banana_fpc.js';
|
|
3
3
|
export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
|
|
3
3
|
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
4
4
|
import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
|
|
5
|
-
import { Fr } from '@aztec/foundation/
|
|
5
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
6
|
import { type LogFn } from '@aztec/foundation/log';
|
|
7
7
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
8
8
|
import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
|
|
9
9
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
10
10
|
import { type HDAccount, type PrivateKeyAccount } from 'viem';
|
|
11
11
|
/**
|
|
12
|
-
* Function to deploy our L1 contracts to the
|
|
12
|
+
* Function to deploy our L1 contracts to the local network L1
|
|
13
13
|
* @param aztecNodeConfig - The Aztec Node Config
|
|
14
14
|
* @param hdAccount - Account for publishing L1 contracts
|
|
15
15
|
*/
|
|
@@ -19,16 +19,16 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hd
|
|
|
19
19
|
genesisArchiveRoot?: Fr;
|
|
20
20
|
feeJuicePortalInitialBalance?: bigint;
|
|
21
21
|
}): Promise<{
|
|
22
|
-
|
|
23
|
-
registryAddress: EthAddress;
|
|
24
|
-
inboxAddress: EthAddress;
|
|
25
|
-
outboxAddress: EthAddress;
|
|
22
|
+
coinIssuerAddress: EthAddress;
|
|
26
23
|
feeJuiceAddress: EthAddress;
|
|
27
24
|
feeJuicePortalAddress: EthAddress;
|
|
28
|
-
coinIssuerAddress: EthAddress;
|
|
29
|
-
rewardDistributorAddress: EthAddress;
|
|
30
|
-
governanceProposerAddress: EthAddress;
|
|
31
25
|
governanceAddress: EthAddress;
|
|
26
|
+
governanceProposerAddress: EthAddress;
|
|
27
|
+
inboxAddress: EthAddress;
|
|
28
|
+
outboxAddress: EthAddress;
|
|
29
|
+
registryAddress: EthAddress;
|
|
30
|
+
rewardDistributorAddress: EthAddress;
|
|
31
|
+
rollupAddress: EthAddress;
|
|
32
32
|
stakingAssetAddress: EthAddress;
|
|
33
33
|
} & {
|
|
34
34
|
slashFactoryAddress?: EthAddress | undefined;
|
|
@@ -42,21 +42,21 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hd
|
|
|
42
42
|
} & {
|
|
43
43
|
rollupAddress: EthAddress;
|
|
44
44
|
}>;
|
|
45
|
-
/**
|
|
46
|
-
export type
|
|
45
|
+
/** Local network settings. */
|
|
46
|
+
export type LocalNetworkConfig = AztecNodeConfig & {
|
|
47
47
|
/** Mnemonic used to derive the L1 deployer private key.*/
|
|
48
48
|
l1Mnemonic: string;
|
|
49
49
|
/** Salt used to deploy L1 contracts.*/
|
|
50
50
|
deployAztecContractsSalt: string;
|
|
51
|
-
/** Whether to deploy test accounts on
|
|
51
|
+
/** Whether to deploy test accounts on local network start.*/
|
|
52
52
|
testAccounts: boolean;
|
|
53
53
|
};
|
|
54
54
|
/**
|
|
55
55
|
* Create and start a new Aztec Node and PXE. Deploys L1 contracts.
|
|
56
56
|
* Does not start any HTTP services nor populate any initial accounts.
|
|
57
|
-
* @param config - Optional
|
|
57
|
+
* @param config - Optional local network settings.
|
|
58
58
|
*/
|
|
59
|
-
export declare function
|
|
59
|
+
export declare function createLocalNetwork(config: Partial<LocalNetworkConfig> | undefined, userLog: LogFn): Promise<{
|
|
60
60
|
node: AztecNodeService;
|
|
61
61
|
stop: () => Promise<void>;
|
|
62
62
|
}>;
|
|
@@ -71,4 +71,4 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
|
|
|
71
71
|
}, options?: {
|
|
72
72
|
prefilledPublicData?: PublicDataTreeLeaf[];
|
|
73
73
|
}): Promise<AztecNodeService>;
|
|
74
|
-
//# sourceMappingURL=
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLGdCQUFnQixFQUFvQixNQUFNLG1CQUFtQixDQUFDO0FBQzdGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBd0IsTUFBTSx5QkFBeUIsQ0FBQztBQVU3RixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFHekUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFJakMsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFFLEtBQUssaUJBQWlCLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBY3ZIOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFNBQVMsRUFBRSxTQUFTLEdBQUcsaUJBQWlCLEVBQ3hDLG9CQUFvQix5Q0FBUyxFQUM3QixJQUFJLEdBQUU7SUFDSiw4QkFBOEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4QyxJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZCxrQkFBa0IsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUN4Qiw0QkFBNEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FrQ1A7QUFFRCw4QkFBOEI7QUFDOUIsTUFBTSxNQUFNLGtCQUFrQixHQUFHLGVBQWUsR0FBRztJQUNqRCwwREFBMEQ7SUFDMUQsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQix1Q0FBdUM7SUFDdkMsd0JBQXdCLEVBQUUsTUFBTSxDQUFDO0lBQ2pDLDZEQUE2RDtJQUM3RCxZQUFZLEVBQUUsT0FBTyxDQUFDO0NBQ3ZCLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUFDLE1BQU0seUNBQWtDLEVBQUUsT0FBTyxFQUFFLEtBQUs7OztHQWdIaEc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxNQUFNLEdBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBTSxFQUNyQyxJQUFJLEdBQUU7SUFBRSxTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7SUFBQyxjQUFjLENBQUMsRUFBRSx1QkFBdUIsQ0FBQztJQUFDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQTtDQUFPLEVBQ2pILE9BQU8sR0FBRTtJQUFFLG1CQUFtQixDQUFDLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQTtDQUFPLDZCQVc3RCJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAU7F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,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,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAcvH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAgHhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}
|
|
@@ -4,10 +4,15 @@ import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
|
|
|
4
4
|
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
5
5
|
import { createBlobSinkClient } from '@aztec/blob-sink/client';
|
|
6
6
|
import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
|
|
7
|
-
import {
|
|
7
|
+
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
8
|
+
import { waitForPublicClient } from '@aztec/ethereum/client';
|
|
9
|
+
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
10
|
+
import { NULL_KEY } from '@aztec/ethereum/constants';
|
|
11
|
+
import { deployMulticall3 } from '@aztec/ethereum/contracts';
|
|
12
|
+
import { deployL1Contracts } from '@aztec/ethereum/deploy-l1-contracts';
|
|
8
13
|
import { EthCheatCodes } from '@aztec/ethereum/test';
|
|
9
14
|
import { SecretValue } from '@aztec/foundation/config';
|
|
10
|
-
import { Fr } from '@aztec/foundation/
|
|
15
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
11
16
|
import { createLogger } from '@aztec/foundation/log';
|
|
12
17
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
13
18
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
@@ -23,10 +28,10 @@ import { DefaultMnemonic } from '../mnemonic.js';
|
|
|
23
28
|
import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
|
|
24
29
|
import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
|
|
25
30
|
import { getSponsoredFPCAddress } from './sponsored_fpc.js';
|
|
26
|
-
const logger = createLogger('
|
|
31
|
+
const logger = createLogger('local-network');
|
|
27
32
|
const localAnvil = foundry;
|
|
28
33
|
/**
|
|
29
|
-
* Function to deploy our L1 contracts to the
|
|
34
|
+
* Function to deploy our L1 contracts to the local network L1
|
|
30
35
|
* @param aztecNodeConfig - The Aztec Node Config
|
|
31
36
|
* @param hdAccount - Account for publishing L1 contracts
|
|
32
37
|
*/ export async function deployContractsToL1(aztecNodeConfig, hdAccount, contractDeployLogger = logger, opts = {}) {
|
|
@@ -54,15 +59,15 @@ const localAnvil = foundry;
|
|
|
54
59
|
/**
|
|
55
60
|
* Create and start a new Aztec Node and PXE. Deploys L1 contracts.
|
|
56
61
|
* Does not start any HTTP services nor populate any initial accounts.
|
|
57
|
-
* @param config - Optional
|
|
58
|
-
*/ export async function
|
|
59
|
-
//
|
|
62
|
+
* @param config - Optional local network settings.
|
|
63
|
+
*/ export async function createLocalNetwork(config = {}, userLog) {
|
|
64
|
+
// local network is meant for test envs. We should only need one l1RpcUrl
|
|
60
65
|
const l1RpcUrl = config.l1RpcUrls?.[0];
|
|
61
66
|
if (!l1RpcUrl) {
|
|
62
67
|
throw new Error('An L1 RPC URL is required');
|
|
63
68
|
}
|
|
64
69
|
if ((config.l1RpcUrls?.length || 0) > 1) {
|
|
65
|
-
logger.warn(`Multiple L1 RPC URLs provided.
|
|
70
|
+
logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
|
|
66
71
|
}
|
|
67
72
|
const aztecNodeConfig = {
|
|
68
73
|
...getConfigEnvVars(),
|
|
@@ -124,11 +129,11 @@ const localAnvil = foundry;
|
|
|
124
129
|
watcher = new AnvilTestWatcher(new EthCheatCodes([
|
|
125
130
|
l1RpcUrl
|
|
126
131
|
], dateProvider), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
|
|
127
|
-
watcher.
|
|
132
|
+
watcher.setisLocalNetwork(true);
|
|
128
133
|
await watcher.start();
|
|
129
134
|
}
|
|
130
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
131
|
-
// Create a local blob sink client inside the
|
|
135
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
136
|
+
// Create a local blob sink client inside the local network, no http connectivity
|
|
132
137
|
const blobSinkClient = createBlobSinkClient();
|
|
133
138
|
const node = await createAztecNode(aztecNodeConfig, {
|
|
134
139
|
telemetry,
|
|
@@ -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"}
|
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({
|
|
@@ -41,8 +42,8 @@ import { getAddress, getContract } from 'viem';
|
|
|
41
42
|
this.logger.warn(`Watcher is now ${isMarkingAsProven ? 'marking' : 'not marking'} blocks as proven`);
|
|
42
43
|
this.isMarkingAsProven = isMarkingAsProven;
|
|
43
44
|
}
|
|
44
|
-
|
|
45
|
-
this.
|
|
45
|
+
setisLocalNetwork(isLocalNetwork) {
|
|
46
|
+
this.isLocalNetwork = isLocalNetwork;
|
|
46
47
|
}
|
|
47
48
|
async start() {
|
|
48
49
|
if (this.filledRunningPromise) {
|
|
@@ -52,7 +53,7 @@ import { getAddress, getContract } from 'viem';
|
|
|
52
53
|
this.l2SlotDuration = config.slotDuration;
|
|
53
54
|
// If auto mining is not supported (e.g., we are on a real network), then we
|
|
54
55
|
// will simple do nothing. But if on an anvil or the like, this make sure that
|
|
55
|
-
// the
|
|
56
|
+
// the local network and tests don't break because time is frozen and we never get to
|
|
56
57
|
// the next slot.
|
|
57
58
|
const isAutoMining = await this.cheatcodes.isAutoMining();
|
|
58
59
|
if (isAutoMining) {
|
|
@@ -84,7 +85,7 @@ import { getAddress, getContract } from 'viem';
|
|
|
84
85
|
await this.rollupCheatCodes.markAsProven();
|
|
85
86
|
}
|
|
86
87
|
async syncDateProviderToL1IfBehind() {
|
|
87
|
-
// 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
|
|
88
89
|
if (!this.dateProvider) {
|
|
89
90
|
return;
|
|
90
91
|
}
|
|
@@ -100,15 +101,16 @@ import { getAddress, getContract } from 'viem';
|
|
|
100
101
|
}
|
|
101
102
|
async warpTimeIfNeeded() {
|
|
102
103
|
try {
|
|
103
|
-
const currentSlot = await this.rollup.read.getCurrentSlot();
|
|
104
|
-
const
|
|
105
|
-
const
|
|
106
|
-
|
|
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
|
|
107
108
|
]);
|
|
109
|
+
const nextSlot = SlotNumber(currentSlot + 1);
|
|
108
110
|
const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
|
|
109
|
-
|
|
111
|
+
BigInt(nextSlot)
|
|
110
112
|
]));
|
|
111
|
-
if (currentSlot ===
|
|
113
|
+
if (BigInt(currentSlot) === checkpointLog.slotNumber) {
|
|
112
114
|
// We should jump to the next slot
|
|
113
115
|
try {
|
|
114
116
|
await this.cheatcodes.warp(nextSlotTimestamp, {
|
|
@@ -120,8 +122,8 @@ 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();
|
|
@@ -9,9 +9,7 @@ import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
|
9
9
|
* codes, please consider whether it makes sense to just introduce new utils in your tests instead.
|
|
10
10
|
*/
|
|
11
11
|
export declare class CheatCodes {
|
|
12
|
-
/** Cheat codes for L1.*/
|
|
13
12
|
eth: EthCheatCodes;
|
|
14
|
-
/** Cheat codes for the Aztec Rollup contract on L1. */
|
|
15
13
|
rollup: RollupCheatCodes;
|
|
16
14
|
constructor(
|
|
17
15
|
/** Cheat codes for L1.*/
|
|
@@ -40,4 +38,4 @@ export declare class CheatCodes {
|
|
|
40
38
|
*/
|
|
41
39
|
warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
|
|
42
40
|
}
|
|
43
|
-
//# 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":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
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"}
|
package/dest/testing/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { AnvilTestWatcher } from './anvil_test_watcher.js';
|
|
2
2
|
export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
|
|
3
3
|
export { CheatCodes } from './cheat_codes.js';
|
|
4
|
-
//# sourceMappingURL=
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec",
|
|
3
|
-
"version": "3.0.0-devnet.
|
|
3
|
+
"version": "3.0.0-devnet.6-patch.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -15,12 +15,12 @@
|
|
|
15
15
|
"tsconfig": "./tsconfig.json"
|
|
16
16
|
},
|
|
17
17
|
"scripts": {
|
|
18
|
-
"build": "yarn clean && tsc
|
|
18
|
+
"build": "yarn clean && ../scripts/tsc.sh",
|
|
19
19
|
"start": "node --no-warnings ./dest/bin",
|
|
20
20
|
"start:debug": "node --inspect=0.0.0.0:9221 --no-warnings ./dest/bin",
|
|
21
|
-
"start:
|
|
21
|
+
"start:local-network": "ETHEREUM_HOSTS=http://0.0.0.0:8545/ && yarn start start --local-network",
|
|
22
22
|
"clean": "rm -rf ./dest .tsbuildinfo",
|
|
23
|
-
"build:dev": "tsc
|
|
23
|
+
"build:dev": "../scripts/tsc.sh --watch",
|
|
24
24
|
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
|
|
25
25
|
"run:example:token": "LOG_LEVEL='verbose' node ./dest/examples/token.js"
|
|
26
26
|
},
|
|
@@ -28,44 +28,44 @@
|
|
|
28
28
|
"../package.common.json"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aztec/accounts": "3.0.0-devnet.
|
|
32
|
-
"@aztec/archiver": "3.0.0-devnet.
|
|
33
|
-
"@aztec/aztec-faucet": "3.0.0-devnet.
|
|
34
|
-
"@aztec/aztec-node": "3.0.0-devnet.
|
|
35
|
-
"@aztec/aztec.js": "3.0.0-devnet.
|
|
36
|
-
"@aztec/bb-prover": "3.0.0-devnet.
|
|
37
|
-
"@aztec/bb.js": "3.0.0-devnet.
|
|
38
|
-
"@aztec/blob-sink": "3.0.0-devnet.
|
|
39
|
-
"@aztec/bot": "3.0.0-devnet.
|
|
40
|
-
"@aztec/builder": "3.0.0-devnet.
|
|
41
|
-
"@aztec/cli": "3.0.0-devnet.
|
|
42
|
-
"@aztec/constants": "3.0.0-devnet.
|
|
43
|
-
"@aztec/entrypoints": "3.0.0-devnet.
|
|
44
|
-
"@aztec/ethereum": "3.0.0-devnet.
|
|
45
|
-
"@aztec/foundation": "3.0.0-devnet.
|
|
46
|
-
"@aztec/kv-store": "3.0.0-devnet.
|
|
47
|
-
"@aztec/l1-artifacts": "3.0.0-devnet.
|
|
48
|
-
"@aztec/node-lib": "3.0.0-devnet.
|
|
49
|
-
"@aztec/noir-contracts.js": "3.0.0-devnet.
|
|
50
|
-
"@aztec/noir-protocol-circuits-types": "3.0.0-devnet.
|
|
51
|
-
"@aztec/p2p": "3.0.0-devnet.
|
|
52
|
-
"@aztec/p2p-bootstrap": "3.0.0-devnet.
|
|
53
|
-
"@aztec/protocol-contracts": "3.0.0-devnet.
|
|
54
|
-
"@aztec/prover-client": "3.0.0-devnet.
|
|
55
|
-
"@aztec/prover-node": "3.0.0-devnet.
|
|
56
|
-
"@aztec/pxe": "3.0.0-devnet.
|
|
57
|
-
"@aztec/stdlib": "3.0.0-devnet.
|
|
58
|
-
"@aztec/telemetry-client": "3.0.0-devnet.
|
|
59
|
-
"@aztec/test-wallet": "3.0.0-devnet.
|
|
60
|
-
"@aztec/txe": "3.0.0-devnet.
|
|
61
|
-
"@aztec/world-state": "3.0.0-devnet.
|
|
31
|
+
"@aztec/accounts": "3.0.0-devnet.6-patch.1",
|
|
32
|
+
"@aztec/archiver": "3.0.0-devnet.6-patch.1",
|
|
33
|
+
"@aztec/aztec-faucet": "3.0.0-devnet.6-patch.1",
|
|
34
|
+
"@aztec/aztec-node": "3.0.0-devnet.6-patch.1",
|
|
35
|
+
"@aztec/aztec.js": "3.0.0-devnet.6-patch.1",
|
|
36
|
+
"@aztec/bb-prover": "3.0.0-devnet.6-patch.1",
|
|
37
|
+
"@aztec/bb.js": "3.0.0-devnet.6-patch.1",
|
|
38
|
+
"@aztec/blob-sink": "3.0.0-devnet.6-patch.1",
|
|
39
|
+
"@aztec/bot": "3.0.0-devnet.6-patch.1",
|
|
40
|
+
"@aztec/builder": "3.0.0-devnet.6-patch.1",
|
|
41
|
+
"@aztec/cli": "3.0.0-devnet.6-patch.1",
|
|
42
|
+
"@aztec/constants": "3.0.0-devnet.6-patch.1",
|
|
43
|
+
"@aztec/entrypoints": "3.0.0-devnet.6-patch.1",
|
|
44
|
+
"@aztec/ethereum": "3.0.0-devnet.6-patch.1",
|
|
45
|
+
"@aztec/foundation": "3.0.0-devnet.6-patch.1",
|
|
46
|
+
"@aztec/kv-store": "3.0.0-devnet.6-patch.1",
|
|
47
|
+
"@aztec/l1-artifacts": "3.0.0-devnet.6-patch.1",
|
|
48
|
+
"@aztec/node-lib": "3.0.0-devnet.6-patch.1",
|
|
49
|
+
"@aztec/noir-contracts.js": "3.0.0-devnet.6-patch.1",
|
|
50
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-devnet.6-patch.1",
|
|
51
|
+
"@aztec/p2p": "3.0.0-devnet.6-patch.1",
|
|
52
|
+
"@aztec/p2p-bootstrap": "3.0.0-devnet.6-patch.1",
|
|
53
|
+
"@aztec/protocol-contracts": "3.0.0-devnet.6-patch.1",
|
|
54
|
+
"@aztec/prover-client": "3.0.0-devnet.6-patch.1",
|
|
55
|
+
"@aztec/prover-node": "3.0.0-devnet.6-patch.1",
|
|
56
|
+
"@aztec/pxe": "3.0.0-devnet.6-patch.1",
|
|
57
|
+
"@aztec/stdlib": "3.0.0-devnet.6-patch.1",
|
|
58
|
+
"@aztec/telemetry-client": "3.0.0-devnet.6-patch.1",
|
|
59
|
+
"@aztec/test-wallet": "3.0.0-devnet.6-patch.1",
|
|
60
|
+
"@aztec/txe": "3.0.0-devnet.6-patch.1",
|
|
61
|
+
"@aztec/world-state": "3.0.0-devnet.6-patch.1",
|
|
62
62
|
"@types/chalk": "^2.2.0",
|
|
63
63
|
"abitype": "^0.8.11",
|
|
64
64
|
"chalk": "^5.3.0",
|
|
65
65
|
"commander": "^12.1.0",
|
|
66
66
|
"koa": "^2.16.1",
|
|
67
67
|
"koa-router": "^13.1.1",
|
|
68
|
-
"viem": "npm:@
|
|
68
|
+
"viem": "npm:@aztec/viem@2.38.2"
|
|
69
69
|
},
|
|
70
70
|
"files": [
|
|
71
71
|
"dest",
|
|
@@ -77,6 +77,7 @@
|
|
|
77
77
|
"@jest/globals": "^30.0.0",
|
|
78
78
|
"@types/jest": "^30.0.0",
|
|
79
79
|
"@types/koa": "^2.15.0",
|
|
80
|
+
"@typescript/native-preview": "7.0.0-dev.20251126.1",
|
|
80
81
|
"jest": "^30.0.0",
|
|
81
82
|
"ts-node": "^10.9.1",
|
|
82
83
|
"typescript": "^5.3.3"
|
package/src/bin/index.ts
CHANGED
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
//
|
|
3
3
|
import { injectCommands as injectBuilderCommands } from '@aztec/builder';
|
|
4
4
|
import { injectCommands as injectAztecNodeCommands } from '@aztec/cli/aztec_node';
|
|
5
|
-
import {
|
|
5
|
+
import { enrichEnvironmentWithChainName, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
|
|
6
6
|
import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
|
|
7
7
|
import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
|
|
8
8
|
import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
|
|
9
9
|
import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
|
|
10
|
+
import { injectCommands as injectValidatorKeysCommands } from '@aztec/cli/validator_keys';
|
|
10
11
|
import { getActiveNetworkName } from '@aztec/foundation/config';
|
|
11
12
|
import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
|
|
12
13
|
|
|
@@ -39,7 +40,7 @@ async function main() {
|
|
|
39
40
|
|
|
40
41
|
const networkName = getActiveNetworkName(networkValue);
|
|
41
42
|
await enrichEnvironmentWithNetworkConfig(networkName);
|
|
42
|
-
|
|
43
|
+
enrichEnvironmentWithChainName(networkName);
|
|
43
44
|
|
|
44
45
|
const cliVersion = getCliVersion();
|
|
45
46
|
let program = new Command('aztec');
|
|
@@ -51,6 +52,7 @@ async function main() {
|
|
|
51
52
|
program = injectL1Commands(program, userLog, debugLogger);
|
|
52
53
|
program = injectAztecNodeCommands(program, userLog, debugLogger);
|
|
53
54
|
program = injectMiscCommands(program, userLog);
|
|
55
|
+
program = injectValidatorKeysCommands(program, userLog);
|
|
54
56
|
|
|
55
57
|
await program.parseAsync(process.argv);
|
|
56
58
|
}
|
|
@@ -9,7 +9,7 @@ import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
|
|
|
9
9
|
import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
|
|
10
10
|
import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
|
|
11
11
|
|
|
12
|
-
import {
|
|
12
|
+
import { createLocalNetwork } from '../local-network/index.js';
|
|
13
13
|
import { github, splash } from '../splash.js';
|
|
14
14
|
import { getCliVersion } from './release_version.js';
|
|
15
15
|
import { extractNamespacedOptions, installSignalHandlers } from './util.js';
|
|
@@ -22,19 +22,19 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
22
22
|
const adminServices: NamespacedApiHandlers = {};
|
|
23
23
|
let config: ChainConfig | undefined = undefined;
|
|
24
24
|
|
|
25
|
-
if (options.
|
|
25
|
+
if (options.localNetwork) {
|
|
26
26
|
const cliVersion = getCliVersion();
|
|
27
|
-
const
|
|
28
|
-
|
|
27
|
+
const localNetwork = extractNamespacedOptions(options, 'local-network');
|
|
28
|
+
localNetwork.testAccounts = true;
|
|
29
29
|
userLog(`${splash}\n${github}\n\n`);
|
|
30
|
-
userLog(`Setting up Aztec
|
|
30
|
+
userLog(`Setting up Aztec local network ${cliVersion}, please stand by...`);
|
|
31
31
|
|
|
32
|
-
const { node, stop } = await
|
|
32
|
+
const { node, stop } = await createLocalNetwork(
|
|
33
33
|
{
|
|
34
|
-
l1Mnemonic:
|
|
34
|
+
l1Mnemonic: localNetwork.l1Mnemonic,
|
|
35
35
|
l1RpcUrls: options.l1RpcUrls,
|
|
36
|
-
deployAztecContractsSalt:
|
|
37
|
-
testAccounts:
|
|
36
|
+
deployAztecContractsSalt: localNetwork.deployAztecContractsSalt,
|
|
37
|
+
testAccounts: localNetwork.testAccounts,
|
|
38
38
|
realProofs: false,
|
|
39
39
|
},
|
|
40
40
|
userLog,
|
|
@@ -2,7 +2,9 @@ import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/con
|
|
|
2
2
|
import { sequencerClientConfigMappings } from '@aztec/aztec-node/config';
|
|
3
3
|
import { blobSinkConfigMappings } from '@aztec/blob-sink/server';
|
|
4
4
|
import { botConfigMappings } from '@aztec/bot/config';
|
|
5
|
-
import {
|
|
5
|
+
import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
|
|
6
|
+
import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
|
|
7
|
+
import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
|
|
6
8
|
import { getKeys } from '@aztec/foundation/collection';
|
|
7
9
|
import {
|
|
8
10
|
type ConfigMapping,
|
|
@@ -82,6 +84,7 @@ export const universalOptions = [
|
|
|
82
84
|
'l1ConsensusHostApiKeys',
|
|
83
85
|
'l1ConsensusHostApiKeyHeaders',
|
|
84
86
|
'p2pEnabled',
|
|
87
|
+
'fishermanMode',
|
|
85
88
|
...getKeys(chainConfigMappings),
|
|
86
89
|
...getKeys(l1ContractsConfigMappings),
|
|
87
90
|
...getKeys(l1ContractAddressesMapping),
|
|
@@ -107,24 +110,26 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
107
110
|
|
|
108
111
|
configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
|
|
109
112
|
configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
|
|
113
|
+
|
|
114
|
+
configToFlag('--fisherman-mode', sharedNodeConfigMappings.fishermanMode),
|
|
110
115
|
],
|
|
111
|
-
|
|
116
|
+
LOCAL_NETWORK: [
|
|
112
117
|
{
|
|
113
|
-
flag: '--
|
|
114
|
-
description: 'Starts Aztec
|
|
118
|
+
flag: '--local-network',
|
|
119
|
+
description: 'Starts Aztec Local Network',
|
|
115
120
|
defaultValue: undefined,
|
|
116
121
|
env: undefined,
|
|
117
122
|
},
|
|
118
123
|
{
|
|
119
|
-
flag: '--
|
|
124
|
+
flag: '--local-network.l1Mnemonic <value>',
|
|
120
125
|
description: 'Mnemonic for L1 accounts. Will be used ',
|
|
121
126
|
defaultValue: DefaultMnemonic,
|
|
122
127
|
env: 'MNEMONIC',
|
|
123
128
|
},
|
|
124
129
|
{
|
|
125
|
-
flag: '--
|
|
130
|
+
flag: '--local-network.deployAztecContractsSalt <value>',
|
|
126
131
|
description:
|
|
127
|
-
'Numeric salt for deploying L1 Aztec contracts before starting the
|
|
132
|
+
'Numeric salt for deploying L1 Aztec contracts before starting the local network. Needs mnemonic or private key to be set.',
|
|
128
133
|
env: 'DEPLOY_AZTEC_CONTRACTS_SALT',
|
|
129
134
|
defaultValue: undefined,
|
|
130
135
|
parseVal: (val: string) => (val ? parseInt(val) : undefined),
|