@aztec/aztec 0.82.2-alpha-testnet.1 → 0.82.2-alpha-testnet.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/cli/chain_l2_config.d.ts +2 -0
- package/dest/cli/chain_l2_config.d.ts.map +1 -1
- package/dest/cli/chain_l2_config.js +8 -2
- package/dest/cli/cmds/start_node.d.ts.map +1 -1
- package/dest/cli/cmds/start_node.js +7 -2
- package/dest/cli/cmds/start_prover_node.d.ts.map +1 -1
- package/dest/cli/cmds/start_prover_node.js +7 -2
- package/package.json +30 -30
- package/src/cli/chain_l2_config.ts +10 -2
- package/src/cli/cmds/start_node.ts +6 -4
- package/src/cli/cmds/start_prover_node.ts +5 -2
|
@@ -6,9 +6,11 @@ export type L2ChainConfig = {
|
|
|
6
6
|
aztecEpochDuration: number;
|
|
7
7
|
aztecProofSubmissionWindow: number;
|
|
8
8
|
testAccounts: boolean;
|
|
9
|
+
sponsoredFPC: boolean;
|
|
9
10
|
p2pEnabled: boolean;
|
|
10
11
|
p2pBootstrapNodes: string[];
|
|
11
12
|
registryAddress: string;
|
|
13
|
+
slashFactoryAddress: string;
|
|
12
14
|
seqMinTxsPerBlock: number;
|
|
13
15
|
seqMaxTxsPerBlock: number;
|
|
14
16
|
realProofs: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhE,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,
|
|
1
|
+
{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhE,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAe1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aAevC,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAWpG;AAUD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAqB/E"}
|
|
@@ -6,9 +6,11 @@ export const testnetIgnitionL2ChainConfig = {
|
|
|
6
6
|
aztecEpochDuration: 32,
|
|
7
7
|
aztecProofSubmissionWindow: 64,
|
|
8
8
|
testAccounts: true,
|
|
9
|
+
sponsoredFPC: false,
|
|
9
10
|
p2pEnabled: true,
|
|
10
11
|
p2pBootstrapNodes: [],
|
|
11
12
|
registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
|
|
13
|
+
slashFactoryAddress: '',
|
|
12
14
|
seqMinTxsPerBlock: 0,
|
|
13
15
|
seqMaxTxsPerBlock: 0,
|
|
14
16
|
realProofs: true
|
|
@@ -19,10 +21,12 @@ export const alphaTestnetL2ChainConfig = {
|
|
|
19
21
|
aztecSlotDuration: 36,
|
|
20
22
|
aztecEpochDuration: 32,
|
|
21
23
|
aztecProofSubmissionWindow: 64,
|
|
22
|
-
testAccounts:
|
|
24
|
+
testAccounts: true,
|
|
25
|
+
sponsoredFPC: true,
|
|
23
26
|
p2pEnabled: true,
|
|
24
27
|
p2pBootstrapNodes: [],
|
|
25
|
-
registryAddress: '',
|
|
28
|
+
registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
|
|
29
|
+
slashFactoryAddress: '0xf667f50fd68b30c38b12d29fee537fa5ea158eb8',
|
|
26
30
|
seqMinTxsPerBlock: 0,
|
|
27
31
|
seqMaxTxsPerBlock: 4,
|
|
28
32
|
realProofs: true
|
|
@@ -70,9 +74,11 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
|
|
|
70
74
|
enrichVar('AZTEC_PROOF_SUBMISSION_WINDOW', config.aztecProofSubmissionWindow.toString());
|
|
71
75
|
enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
|
|
72
76
|
enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
|
|
77
|
+
enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
|
|
73
78
|
enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
|
|
74
79
|
enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
|
|
75
80
|
enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
|
|
81
|
+
enrichVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
|
|
76
82
|
enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
|
|
77
83
|
enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
|
|
78
84
|
enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', networkName, 'data'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAGpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CA4ItC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getInitialTestAccounts } from '@aztec/accounts/testing';
|
|
2
2
|
import { aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
|
|
3
|
+
import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
|
|
3
4
|
import { NULL_KEY } from '@aztec/ethereum';
|
|
4
5
|
import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
|
|
5
6
|
import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
|
|
@@ -26,8 +27,12 @@ export async function startNode(options, signalHandlers, services, adminServices
|
|
|
26
27
|
process.exit(1);
|
|
27
28
|
}
|
|
28
29
|
await preloadCrsDataForVerifying(nodeConfig, userLog);
|
|
29
|
-
const
|
|
30
|
-
const
|
|
30
|
+
const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccounts()).map((a)=>a.address) : [];
|
|
31
|
+
const sponsoredFPCAccounts = nodeConfig.sponsoredFPC ? [
|
|
32
|
+
await getSponsoredFPCAddress()
|
|
33
|
+
] : [];
|
|
34
|
+
const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
|
|
35
|
+
const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
|
|
31
36
|
// Deploy contracts if needed
|
|
32
37
|
if (nodeSpecificOptions.deployAztecContracts || nodeSpecificOptions.deployAztecContractsSalt) {
|
|
33
38
|
let account;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAa5B,wBAAsB,eAAe,CACnC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAAC,CA+FvC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getInitialTestAccounts } from '@aztec/accounts/testing';
|
|
2
|
+
import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
|
|
2
3
|
import { NULL_KEY } from '@aztec/ethereum';
|
|
3
4
|
import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
|
|
4
5
|
import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
|
|
@@ -78,8 +79,12 @@ export async function startProverNode(options, signalHandlers, services, userLog
|
|
|
78
79
|
userLog(`Running prover node without local prover agent. Connect one or more prover agents to this node or pass --proverAgent.proverAgentCount`);
|
|
79
80
|
}
|
|
80
81
|
await preloadCrsDataForVerifying(proverConfig, userLog);
|
|
81
|
-
const
|
|
82
|
-
const
|
|
82
|
+
const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccounts()).map((a)=>a.address) : [];
|
|
83
|
+
const sponsoredFPCAccounts = proverConfig.sponsoredFPC ? [
|
|
84
|
+
await getSponsoredFPCAddress()
|
|
85
|
+
] : [];
|
|
86
|
+
const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
|
|
87
|
+
const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
|
|
83
88
|
const proverNode = await createProverNode(proverConfig, {
|
|
84
89
|
telemetry,
|
|
85
90
|
broker
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec",
|
|
3
|
-
"version": "0.82.2-alpha-testnet.
|
|
3
|
+
"version": "0.82.2-alpha-testnet.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js"
|
|
@@ -29,35 +29,35 @@
|
|
|
29
29
|
"../package.common.json"
|
|
30
30
|
],
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@aztec/accounts": "0.82.2-alpha-testnet.
|
|
33
|
-
"@aztec/archiver": "0.82.2-alpha-testnet.
|
|
34
|
-
"@aztec/aztec-faucet": "0.82.2-alpha-testnet.
|
|
35
|
-
"@aztec/aztec-node": "0.82.2-alpha-testnet.
|
|
36
|
-
"@aztec/aztec.js": "0.82.2-alpha-testnet.
|
|
37
|
-
"@aztec/bb-prover": "0.82.2-alpha-testnet.
|
|
38
|
-
"@aztec/bb.js": "0.82.2-alpha-testnet.
|
|
39
|
-
"@aztec/blob-sink": "0.82.2-alpha-testnet.
|
|
40
|
-
"@aztec/bot": "0.82.2-alpha-testnet.
|
|
41
|
-
"@aztec/builder": "0.82.2-alpha-testnet.
|
|
42
|
-
"@aztec/cli": "0.82.2-alpha-testnet.
|
|
43
|
-
"@aztec/cli-wallet": "0.82.2-alpha-testnet.
|
|
44
|
-
"@aztec/constants": "0.82.2-alpha-testnet.
|
|
45
|
-
"@aztec/entrypoints": "0.82.2-alpha-testnet.
|
|
46
|
-
"@aztec/ethereum": "0.82.2-alpha-testnet.
|
|
47
|
-
"@aztec/foundation": "0.82.2-alpha-testnet.
|
|
48
|
-
"@aztec/kv-store": "0.82.2-alpha-testnet.
|
|
49
|
-
"@aztec/noir-contracts.js": "0.82.2-alpha-testnet.
|
|
50
|
-
"@aztec/noir-protocol-circuits-types": "0.82.2-alpha-testnet.
|
|
51
|
-
"@aztec/p2p": "0.82.2-alpha-testnet.
|
|
52
|
-
"@aztec/p2p-bootstrap": "0.82.2-alpha-testnet.
|
|
53
|
-
"@aztec/protocol-contracts": "0.82.2-alpha-testnet.
|
|
54
|
-
"@aztec/prover-client": "0.82.2-alpha-testnet.
|
|
55
|
-
"@aztec/prover-node": "0.82.2-alpha-testnet.
|
|
56
|
-
"@aztec/pxe": "0.82.2-alpha-testnet.
|
|
57
|
-
"@aztec/stdlib": "0.82.2-alpha-testnet.
|
|
58
|
-
"@aztec/telemetry-client": "0.82.2-alpha-testnet.
|
|
59
|
-
"@aztec/txe": "0.82.2-alpha-testnet.
|
|
60
|
-
"@aztec/world-state": "0.82.2-alpha-testnet.
|
|
32
|
+
"@aztec/accounts": "0.82.2-alpha-testnet.2",
|
|
33
|
+
"@aztec/archiver": "0.82.2-alpha-testnet.2",
|
|
34
|
+
"@aztec/aztec-faucet": "0.82.2-alpha-testnet.2",
|
|
35
|
+
"@aztec/aztec-node": "0.82.2-alpha-testnet.2",
|
|
36
|
+
"@aztec/aztec.js": "0.82.2-alpha-testnet.2",
|
|
37
|
+
"@aztec/bb-prover": "0.82.2-alpha-testnet.2",
|
|
38
|
+
"@aztec/bb.js": "0.82.2-alpha-testnet.2",
|
|
39
|
+
"@aztec/blob-sink": "0.82.2-alpha-testnet.2",
|
|
40
|
+
"@aztec/bot": "0.82.2-alpha-testnet.2",
|
|
41
|
+
"@aztec/builder": "0.82.2-alpha-testnet.2",
|
|
42
|
+
"@aztec/cli": "0.82.2-alpha-testnet.2",
|
|
43
|
+
"@aztec/cli-wallet": "0.82.2-alpha-testnet.2",
|
|
44
|
+
"@aztec/constants": "0.82.2-alpha-testnet.2",
|
|
45
|
+
"@aztec/entrypoints": "0.82.2-alpha-testnet.2",
|
|
46
|
+
"@aztec/ethereum": "0.82.2-alpha-testnet.2",
|
|
47
|
+
"@aztec/foundation": "0.82.2-alpha-testnet.2",
|
|
48
|
+
"@aztec/kv-store": "0.82.2-alpha-testnet.2",
|
|
49
|
+
"@aztec/noir-contracts.js": "0.82.2-alpha-testnet.2",
|
|
50
|
+
"@aztec/noir-protocol-circuits-types": "0.82.2-alpha-testnet.2",
|
|
51
|
+
"@aztec/p2p": "0.82.2-alpha-testnet.2",
|
|
52
|
+
"@aztec/p2p-bootstrap": "0.82.2-alpha-testnet.2",
|
|
53
|
+
"@aztec/protocol-contracts": "0.82.2-alpha-testnet.2",
|
|
54
|
+
"@aztec/prover-client": "0.82.2-alpha-testnet.2",
|
|
55
|
+
"@aztec/prover-node": "0.82.2-alpha-testnet.2",
|
|
56
|
+
"@aztec/pxe": "0.82.2-alpha-testnet.2",
|
|
57
|
+
"@aztec/stdlib": "0.82.2-alpha-testnet.2",
|
|
58
|
+
"@aztec/telemetry-client": "0.82.2-alpha-testnet.2",
|
|
59
|
+
"@aztec/txe": "0.82.2-alpha-testnet.2",
|
|
60
|
+
"@aztec/world-state": "0.82.2-alpha-testnet.2",
|
|
61
61
|
"@types/chalk": "^2.2.0",
|
|
62
62
|
"abitype": "^0.8.11",
|
|
63
63
|
"chalk": "^5.3.0",
|
|
@@ -11,9 +11,11 @@ export type L2ChainConfig = {
|
|
|
11
11
|
aztecEpochDuration: number;
|
|
12
12
|
aztecProofSubmissionWindow: number;
|
|
13
13
|
testAccounts: boolean;
|
|
14
|
+
sponsoredFPC: boolean;
|
|
14
15
|
p2pEnabled: boolean;
|
|
15
16
|
p2pBootstrapNodes: string[];
|
|
16
17
|
registryAddress: string;
|
|
18
|
+
slashFactoryAddress: string;
|
|
17
19
|
seqMinTxsPerBlock: number;
|
|
18
20
|
seqMaxTxsPerBlock: number;
|
|
19
21
|
realProofs: boolean;
|
|
@@ -26,9 +28,11 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
|
|
|
26
28
|
aztecEpochDuration: 32,
|
|
27
29
|
aztecProofSubmissionWindow: 64,
|
|
28
30
|
testAccounts: true,
|
|
31
|
+
sponsoredFPC: false,
|
|
29
32
|
p2pEnabled: true,
|
|
30
33
|
p2pBootstrapNodes: [],
|
|
31
34
|
registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
|
|
35
|
+
slashFactoryAddress: '',
|
|
32
36
|
seqMinTxsPerBlock: 0,
|
|
33
37
|
seqMaxTxsPerBlock: 0,
|
|
34
38
|
realProofs: true,
|
|
@@ -40,10 +44,12 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
|
|
|
40
44
|
aztecSlotDuration: 36,
|
|
41
45
|
aztecEpochDuration: 32,
|
|
42
46
|
aztecProofSubmissionWindow: 64,
|
|
43
|
-
testAccounts:
|
|
47
|
+
testAccounts: true,
|
|
48
|
+
sponsoredFPC: true,
|
|
44
49
|
p2pEnabled: true,
|
|
45
50
|
p2pBootstrapNodes: [],
|
|
46
|
-
registryAddress: '',
|
|
51
|
+
registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
|
|
52
|
+
slashFactoryAddress: '0xf667f50fd68b30c38b12d29fee537fa5ea158eb8',
|
|
47
53
|
seqMinTxsPerBlock: 0,
|
|
48
54
|
seqMaxTxsPerBlock: 4,
|
|
49
55
|
realProofs: true,
|
|
@@ -94,9 +100,11 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
|
|
|
94
100
|
enrichVar('AZTEC_PROOF_SUBMISSION_WINDOW', config.aztecProofSubmissionWindow.toString());
|
|
95
101
|
enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
|
|
96
102
|
enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
|
|
103
|
+
enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
|
|
97
104
|
enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
|
|
98
105
|
enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
|
|
99
106
|
enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
|
|
107
|
+
enrichVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
|
|
100
108
|
enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
|
|
101
109
|
enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
|
|
102
110
|
enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', networkName, 'data'));
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getInitialTestAccounts } from '@aztec/accounts/testing';
|
|
2
2
|
import { type AztecNodeConfig, aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
|
|
3
|
+
import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
|
|
3
4
|
import { NULL_KEY } from '@aztec/ethereum';
|
|
4
5
|
import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
|
|
5
6
|
import type { LogFn } from '@aztec/foundation/log';
|
|
@@ -47,10 +48,11 @@ export async function startNode(
|
|
|
47
48
|
|
|
48
49
|
await preloadCrsDataForVerifying(nodeConfig, userLog);
|
|
49
50
|
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccounts()).map(a => a.address) : [];
|
|
52
|
+
const sponsoredFPCAccounts = nodeConfig.sponsoredFPC ? [await getSponsoredFPCAddress()] : [];
|
|
53
|
+
const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
|
|
54
|
+
|
|
55
|
+
const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
|
|
54
56
|
|
|
55
57
|
// Deploy contracts if needed
|
|
56
58
|
if (nodeSpecificOptions.deployAztecContracts || nodeSpecificOptions.deployAztecContractsSalt) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getInitialTestAccounts } from '@aztec/accounts/testing';
|
|
2
|
+
import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
|
|
2
3
|
import { NULL_KEY } from '@aztec/ethereum';
|
|
3
4
|
import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
|
|
4
5
|
import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
|
|
@@ -101,8 +102,10 @@ export async function startProverNode(
|
|
|
101
102
|
|
|
102
103
|
await preloadCrsDataForVerifying(proverConfig, userLog);
|
|
103
104
|
|
|
104
|
-
const
|
|
105
|
-
const
|
|
105
|
+
const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccounts()).map(a => a.address) : [];
|
|
106
|
+
const sponsoredFPCAccounts = proverConfig.sponsoredFPC ? [await getSponsoredFPCAddress()] : [];
|
|
107
|
+
const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
|
|
108
|
+
const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
|
|
106
109
|
|
|
107
110
|
const proverNode = await createProverNode(proverConfig, { telemetry, broker }, { prefilledPublicData });
|
|
108
111
|
services.proverNode = [proverNode, ProverNodeApiSchema];
|