@aztec/cli 0.0.1-commit.d3ec352c → 0.0.1-commit.f295ac2

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.
Files changed (105) hide show
  1. package/dest/cmds/aztec_node/get_current_min_fee.d.ts +3 -0
  2. package/dest/cmds/aztec_node/get_current_min_fee.d.ts.map +1 -0
  3. package/dest/cmds/aztec_node/{get_current_base_fee.js → get_current_min_fee.js} +2 -2
  4. package/dest/cmds/aztec_node/index.js +3 -3
  5. package/dest/cmds/contracts/inspect_contract.js +1 -1
  6. package/dest/cmds/infrastructure/sequencers.d.ts +1 -1
  7. package/dest/cmds/infrastructure/sequencers.d.ts.map +1 -1
  8. package/dest/cmds/infrastructure/sequencers.js +11 -4
  9. package/dest/cmds/l1/bridge_erc20.d.ts +1 -1
  10. package/dest/cmds/l1/bridge_erc20.d.ts.map +1 -1
  11. package/dest/cmds/l1/bridge_erc20.js +2 -1
  12. package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +4 -0
  13. package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -0
  14. package/dest/cmds/l1/{deploy_l1_contracts.js → deploy_l1_contracts_cmd.js} +39 -4
  15. package/dest/cmds/l1/deploy_new_rollup.d.ts +4 -4
  16. package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
  17. package/dest/cmds/l1/deploy_new_rollup.js +3 -3
  18. package/dest/cmds/l1/get_l1_addresses.d.ts +1 -1
  19. package/dest/cmds/l1/get_l1_addresses.d.ts.map +1 -1
  20. package/dest/cmds/l1/get_l1_addresses.js +5 -2
  21. package/dest/cmds/l1/get_l1_balance.js +4 -2
  22. package/dest/cmds/l1/governance_utils.d.ts +1 -1
  23. package/dest/cmds/l1/governance_utils.d.ts.map +1 -1
  24. package/dest/cmds/l1/governance_utils.js +3 -1
  25. package/dest/cmds/l1/index.d.ts +1 -2
  26. package/dest/cmds/l1/index.d.ts.map +1 -1
  27. package/dest/cmds/l1/index.js +10 -8
  28. package/dest/cmds/l1/prover_stats.d.ts +1 -1
  29. package/dest/cmds/l1/prover_stats.d.ts.map +1 -1
  30. package/dest/cmds/l1/prover_stats.js +4 -2
  31. package/dest/cmds/l1/trigger_seed_snapshot.d.ts +1 -1
  32. package/dest/cmds/l1/trigger_seed_snapshot.d.ts.map +1 -1
  33. package/dest/cmds/l1/trigger_seed_snapshot.js +2 -1
  34. package/dest/cmds/l1/update_l1_validators.d.ts +3 -3
  35. package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
  36. package/dest/cmds/l1/update_l1_validators.js +52 -13
  37. package/dest/cmds/misc/generate_secret_and_hash.js +1 -1
  38. package/dest/cmds/misc/index.d.ts +1 -1
  39. package/dest/cmds/misc/index.d.ts.map +1 -1
  40. package/dest/cmds/misc/index.js +1 -1
  41. package/dest/cmds/validator_keys/generate_bls_keypair.js +1 -1
  42. package/dest/cmds/validator_keys/new.d.ts +1 -1
  43. package/dest/cmds/validator_keys/new.d.ts.map +1 -1
  44. package/dest/cmds/validator_keys/new.js +5 -2
  45. package/dest/cmds/validator_keys/shared.d.ts +1 -1
  46. package/dest/cmds/validator_keys/shared.d.ts.map +1 -1
  47. package/dest/cmds/validator_keys/shared.js +2 -1
  48. package/dest/cmds/validator_keys/staker.d.ts +2 -2
  49. package/dest/cmds/validator_keys/staker.d.ts.map +1 -1
  50. package/dest/cmds/validator_keys/staker.js +7 -4
  51. package/dest/cmds/validator_keys/utils.d.ts +1 -1
  52. package/dest/cmds/validator_keys/utils.d.ts.map +1 -1
  53. package/dest/cmds/validator_keys/utils.js +1 -1
  54. package/dest/config/chain_l2_config.d.ts +12 -38
  55. package/dest/config/chain_l2_config.d.ts.map +1 -1
  56. package/dest/config/chain_l2_config.js +33 -493
  57. package/dest/config/generated/networks.d.ts +202 -0
  58. package/dest/config/generated/networks.d.ts.map +1 -0
  59. package/dest/config/generated/networks.js +203 -0
  60. package/dest/config/get_l1_config.d.ts +3 -2
  61. package/dest/config/get_l1_config.d.ts.map +1 -1
  62. package/dest/config/get_l1_config.js +3 -1
  63. package/dest/config/network_config.d.ts +2 -2
  64. package/dest/config/network_config.d.ts.map +1 -1
  65. package/dest/config/network_config.js +7 -1
  66. package/dest/utils/aztec.d.ts +7 -13
  67. package/dest/utils/aztec.d.ts.map +1 -1
  68. package/dest/utils/aztec.js +19 -40
  69. package/dest/utils/commands.d.ts +7 -6
  70. package/dest/utils/commands.d.ts.map +1 -1
  71. package/dest/utils/commands.js +6 -5
  72. package/dest/utils/encoding.js +1 -1
  73. package/package.json +39 -31
  74. package/src/cmds/aztec_node/{get_current_base_fee.ts → get_current_min_fee.ts} +2 -2
  75. package/src/cmds/aztec_node/index.ts +3 -3
  76. package/src/cmds/contracts/inspect_contract.ts +1 -1
  77. package/src/cmds/infrastructure/sequencers.ts +7 -4
  78. package/src/cmds/l1/bridge_erc20.ts +2 -1
  79. package/src/cmds/l1/{deploy_l1_contracts.ts → deploy_l1_contracts_cmd.ts} +39 -22
  80. package/src/cmds/l1/deploy_new_rollup.ts +4 -9
  81. package/src/cmds/l1/get_l1_addresses.ts +4 -2
  82. package/src/cmds/l1/get_l1_balance.ts +2 -2
  83. package/src/cmds/l1/governance_utils.ts +3 -8
  84. package/src/cmds/l1/index.ts +7 -17
  85. package/src/cmds/l1/prover_stats.ts +6 -2
  86. package/src/cmds/l1/trigger_seed_snapshot.ts +2 -1
  87. package/src/cmds/l1/update_l1_validators.ts +46 -25
  88. package/src/cmds/misc/generate_secret_and_hash.ts +1 -1
  89. package/src/cmds/misc/index.ts +1 -1
  90. package/src/cmds/validator_keys/generate_bls_keypair.ts +1 -1
  91. package/src/cmds/validator_keys/new.ts +3 -2
  92. package/src/cmds/validator_keys/shared.ts +2 -1
  93. package/src/cmds/validator_keys/staker.ts +5 -4
  94. package/src/cmds/validator_keys/utils.ts +2 -1
  95. package/src/config/chain_l2_config.ts +33 -644
  96. package/src/config/generated/networks.ts +207 -0
  97. package/src/config/get_l1_config.ts +4 -1
  98. package/src/config/network_config.ts +8 -1
  99. package/src/utils/aztec.ts +24 -83
  100. package/src/utils/commands.ts +6 -5
  101. package/src/utils/encoding.ts +1 -1
  102. package/dest/cmds/aztec_node/get_current_base_fee.d.ts +0 -3
  103. package/dest/cmds/aztec_node/get_current_base_fee.d.ts.map +0 -1
  104. package/dest/cmds/l1/deploy_l1_contracts.d.ts +0 -4
  105. package/dest/cmds/l1/deploy_l1_contracts.d.ts.map +0 -1
@@ -0,0 +1,207 @@
1
+ // Auto-generated from spartan/environments/network-defaults.yml
2
+ // Do not edit manually - run yarn generate to regenerate
3
+
4
+ export const devnetConfig = {
5
+ ETHEREUM_SLOT_DURATION: 12,
6
+ AZTEC_SLOT_DURATION: 36,
7
+ AZTEC_TARGET_COMMITTEE_SIZE: 48,
8
+ AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
9
+ AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
10
+ AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000,
11
+ AZTEC_EXIT_DELAY_SECONDS: 172800,
12
+ AZTEC_INBOX_LAG: 1,
13
+ AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
14
+ AZTEC_MANA_TARGET: 100000000,
15
+ AZTEC_PROVING_COST_PER_MANA: 100,
16
+ AZTEC_SLASHER_FLAVOR: 'tally',
17
+ AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
18
+ AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
19
+ AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
20
+ AZTEC_SLASHING_VETOER: '0x0000000000000000000000000000000000000000',
21
+ AZTEC_SLASHING_DISABLE_DURATION: 432000,
22
+ AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
23
+ AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
24
+ AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
25
+ AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
26
+ SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
27
+ SLASH_MAX_PENALTY_PERCENTAGE: 2,
28
+ SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
29
+ SLASH_MAX_PAYLOAD_SIZE: 50,
30
+ SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
31
+ P2P_ENABLED: true,
32
+ BOOTSTRAP_NODES: '',
33
+ SEQ_MIN_TX_PER_BLOCK: 0,
34
+ SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
35
+ DATA_STORE_MAP_SIZE_KB: 134217728,
36
+ ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
37
+ NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
38
+ NULLIFIER_TREE_MAP_SIZE_KB: 1073741824,
39
+ PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
40
+ PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
41
+ SENTINEL_ENABLED: true,
42
+ AZTEC_EPOCH_DURATION: 8,
43
+ AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 1,
44
+ AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
45
+ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1,
46
+ L1_CHAIN_ID: 11155111,
47
+ TEST_ACCOUNTS: true,
48
+ SPONSORED_FPC: true,
49
+ TRANSACTIONS_DISABLED: false,
50
+ SEQ_MAX_TX_PER_BLOCK: 32,
51
+ PROVER_REAL_PROOFS: false,
52
+ PXE_PROVER_ENABLED: false,
53
+ SYNC_SNAPSHOTS_URLS: '',
54
+ SKIP_ARCHIVER_INITIAL_SYNC: false,
55
+ BLOB_ALLOW_EMPTY_SOURCES: false,
56
+ P2P_MAX_PENDING_TX_COUNT: 1000,
57
+ P2P_TX_POOL_DELETE_TXS_AFTER_REORG: false,
58
+ AUTO_UPDATE: 'none',
59
+ AUTO_UPDATE_URL: '',
60
+ PUBLIC_OTEL_OPT_OUT: true,
61
+ PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
62
+ PUBLIC_OTEL_COLLECT_FROM: '',
63
+ SLASH_PRUNE_PENALTY: 10000000000000000000,
64
+ SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
65
+ SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
66
+ SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
67
+ SLASH_INACTIVITY_PENALTY: 10000000000000000000,
68
+ SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
69
+ SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
70
+ SLASH_UNKNOWN_PENALTY: 10000000000000000000,
71
+ SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
72
+ SLASH_GRACE_PERIOD_L2_SLOTS: 0,
73
+ } as const;
74
+
75
+ export const testnetConfig = {
76
+ ETHEREUM_SLOT_DURATION: 12,
77
+ AZTEC_EPOCH_DURATION: 32,
78
+ AZTEC_TARGET_COMMITTEE_SIZE: 48,
79
+ AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
80
+ AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
81
+ AZTEC_EXIT_DELAY_SECONDS: 172800,
82
+ AZTEC_INBOX_LAG: 1,
83
+ AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
84
+ AZTEC_PROVING_COST_PER_MANA: 100,
85
+ AZTEC_SLASHER_FLAVOR: 'tally',
86
+ AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
87
+ AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
88
+ AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
89
+ AZTEC_SLASHING_DISABLE_DURATION: 432000,
90
+ AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
91
+ AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
92
+ AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
93
+ SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
94
+ SLASH_MAX_PENALTY_PERCENTAGE: 2,
95
+ SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
96
+ SLASH_MAX_PAYLOAD_SIZE: 50,
97
+ SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
98
+ P2P_ENABLED: true,
99
+ BOOTSTRAP_NODES: '',
100
+ SEQ_MIN_TX_PER_BLOCK: 0,
101
+ SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
102
+ DATA_STORE_MAP_SIZE_KB: 134217728,
103
+ ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
104
+ NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
105
+ NULLIFIER_TREE_MAP_SIZE_KB: 1073741824,
106
+ PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
107
+ PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
108
+ SENTINEL_ENABLED: true,
109
+ AZTEC_SLOT_DURATION: 72,
110
+ AZTEC_ACTIVATION_THRESHOLD: 2E+23,
111
+ AZTEC_EJECTION_THRESHOLD: 1E+23,
112
+ AZTEC_LOCAL_EJECTION_THRESHOLD: 1.99E+23,
113
+ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 2,
114
+ AZTEC_SLASHING_VETOER: '0xdfe19Da6a717b7088621d8bBB66be59F2d78e924',
115
+ AZTEC_SLASHING_QUORUM: 33,
116
+ AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
117
+ AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
118
+ AZTEC_MANA_TARGET: 150000000,
119
+ L1_CHAIN_ID: 11155111,
120
+ TEST_ACCOUNTS: false,
121
+ SPONSORED_FPC: true,
122
+ TRANSACTIONS_DISABLED: false,
123
+ SEQ_MAX_TX_PER_BLOCK: 8,
124
+ PROVER_REAL_PROOFS: true,
125
+ P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
126
+ SLASH_PRUNE_PENALTY: 10000000000000000000,
127
+ SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
128
+ SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
129
+ SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
130
+ SLASH_INACTIVITY_PENALTY: 10000000000000000000,
131
+ SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
132
+ SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
133
+ SLASH_UNKNOWN_PENALTY: 10000000000000000000,
134
+ SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
135
+ SLASH_GRACE_PERIOD_L2_SLOTS: 64,
136
+ } as const;
137
+
138
+ export const mainnetConfig = {
139
+ ETHEREUM_SLOT_DURATION: 12,
140
+ AZTEC_EPOCH_DURATION: 32,
141
+ AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
142
+ AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
143
+ AZTEC_INBOX_LAG: 1,
144
+ AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
145
+ AZTEC_SLASHER_FLAVOR: 'tally',
146
+ AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
147
+ AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
148
+ SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
149
+ SLASH_MAX_PENALTY_PERCENTAGE: 2,
150
+ SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
151
+ SLASH_MAX_PAYLOAD_SIZE: 50,
152
+ SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
153
+ P2P_ENABLED: true,
154
+ BOOTSTRAP_NODES: '',
155
+ SEQ_MIN_TX_PER_BLOCK: 0,
156
+ SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
157
+ DATA_STORE_MAP_SIZE_KB: 134217728,
158
+ ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
159
+ NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
160
+ NULLIFIER_TREE_MAP_SIZE_KB: 1073741824,
161
+ PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
162
+ PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
163
+ SENTINEL_ENABLED: true,
164
+ AZTEC_SLOT_DURATION: 72,
165
+ AZTEC_TARGET_COMMITTEE_SIZE: 24,
166
+ AZTEC_ACTIVATION_THRESHOLD: 2E+23,
167
+ AZTEC_EJECTION_THRESHOLD: 1E+23,
168
+ AZTEC_LOCAL_EJECTION_THRESHOLD: 1.96E+23,
169
+ AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
170
+ AZTEC_SLASH_AMOUNT_MEDIUM: 2E+21,
171
+ AZTEC_SLASH_AMOUNT_LARGE: 2E+21,
172
+ AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 34,
173
+ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 28,
174
+ AZTEC_SLASHING_VETOER: '0xBbB4aF368d02827945748b28CD4b2D42e4A37480',
175
+ AZTEC_SLASHING_QUORUM: 65,
176
+ AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
177
+ AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
178
+ AZTEC_MANA_TARGET: 0,
179
+ AZTEC_PROVING_COST_PER_MANA: 0,
180
+ AZTEC_EXIT_DELAY_SECONDS: 345600,
181
+ AZTEC_SLASHING_DISABLE_DURATION: 259200,
182
+ L1_CHAIN_ID: 1,
183
+ TEST_ACCOUNTS: false,
184
+ SPONSORED_FPC: false,
185
+ TRANSACTIONS_DISABLED: true,
186
+ SEQ_MAX_TX_PER_BLOCK: 0,
187
+ PROVER_REAL_PROOFS: true,
188
+ SYNC_SNAPSHOTS_URLS: 'https://aztec-labs-snapshots.com/mainnet/',
189
+ BLOB_ALLOW_EMPTY_SOURCES: true,
190
+ P2P_MAX_PENDING_TX_COUNT: 0,
191
+ P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
192
+ AUTO_UPDATE: 'notify',
193
+ AUTO_UPDATE_URL: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
194
+ PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
195
+ PUBLIC_OTEL_COLLECT_FROM: 'sequencer',
196
+ SLASH_PRUNE_PENALTY: 0,
197
+ SLASH_DATA_WITHHOLDING_PENALTY: 0,
198
+ SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
199
+ SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
200
+ SLASH_INACTIVITY_PENALTY: 2E+21,
201
+ SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
202
+ SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2E+21,
203
+ SLASH_UNKNOWN_PENALTY: 2E+21,
204
+ SLASH_INVALID_BLOCK_PENALTY: 2E+21,
205
+ SLASH_GRACE_PERIOD_L2_SLOTS: 1200,
206
+ } as const;
207
+
@@ -1,4 +1,7 @@
1
- import { type L1ContractAddresses, RegistryContract, getL1ContractsConfig, getPublicClient } from '@aztec/ethereum';
1
+ import { getPublicClient } from '@aztec/ethereum/client';
2
+ import { RegistryContract } from '@aztec/ethereum/contracts';
3
+ import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
4
+ import { getL1ContractsConfig } from '@aztec/ethereum/queries';
2
5
  import { EthAddress } from '@aztec/foundation/eth-address';
3
6
 
4
7
  export async function getL1Config(
@@ -111,7 +111,7 @@ async function fetchNetworkConfigFromUrl(
111
111
  /**
112
112
  * Enriches environment variables with remote network configuration.
113
113
  * This function is called before node config initialization to set env vars
114
- * from the remote config, following the same pattern as enrichEnvironmentWithChainConfig().
114
+ * from the remote config.
115
115
  *
116
116
  * @param networkName - The network name to fetch remote config for
117
117
  * @throws Error if network config fetch fails (network errors, parse errors, etc.)
@@ -137,4 +137,11 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
137
137
  if (networkConfig.feeAssetHandlerAddress) {
138
138
  enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', networkConfig.feeAssetHandlerAddress.toString());
139
139
  }
140
+
141
+ if (networkConfig.blobFileStoreUrls?.length) {
142
+ enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
143
+ }
144
+ if (networkConfig.blockDurationMs !== undefined) {
145
+ enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
146
+ }
140
147
  }
@@ -6,23 +6,23 @@ import {
6
6
  loadContractArtifact,
7
7
  } from '@aztec/aztec.js/abi';
8
8
  import { EthAddress } from '@aztec/aztec.js/addresses';
9
- import {
10
- type DeployL1ContractsReturnType,
11
- type L1ContractsConfig,
12
- type Operator,
13
- RollupContract,
14
- } from '@aztec/ethereum';
9
+ import type { L1ContractsConfig } from '@aztec/ethereum/config';
10
+ import { RollupContract } from '@aztec/ethereum/contracts';
11
+ import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
15
12
  import { SecretValue } from '@aztec/foundation/config';
16
- import { Fr } from '@aztec/foundation/fields';
17
- import type { LogFn, Logger } from '@aztec/foundation/log';
13
+ import { Fr } from '@aztec/foundation/curves/bn254';
14
+ import { type LogFn, createLogger } from '@aztec/foundation/log';
18
15
  import type { NoirPackageConfig } from '@aztec/foundation/noir';
19
16
  import { protocolContractsHash } from '@aztec/protocol-contracts';
20
17
 
21
18
  import TOML from '@iarna/toml';
22
19
  import { readFile } from 'fs/promises';
20
+ import type { HDAccount, Hex, PrivateKeyAccount } from 'viem';
23
21
 
24
22
  import { encodeArgs } from './encoding.js';
25
23
 
24
+ const logger = createLogger('cli:utils:aztec');
25
+
26
26
  /**
27
27
  * Helper to get an ABI function or throw error if it doesn't exist.
28
28
  * @param artifact - Contract's build artifact in JSON format.
@@ -37,89 +37,32 @@ export function getFunctionAbi(artifact: ContractArtifact, fnName: string): Func
37
37
  return fn;
38
38
  }
39
39
 
40
- /**
41
- * Function to execute the 'deployRollupContracts' command.
42
- * @param rpcUrls - The RPC URL of the ethereum node.
43
- * @param chainId - The chain ID of the L1 host.
44
- * @param privateKey - The private key to be used in contract deployment.
45
- * @param mnemonic - The mnemonic to be used in contract deployment.
46
- */
47
- export async function deployAztecContracts(
48
- rpcUrls: string[],
49
- chainId: number,
50
- privateKey: string | undefined,
51
- mnemonic: string,
52
- mnemonicIndex: number,
53
- salt: number | undefined,
54
- initialValidators: Operator[],
55
- genesisArchiveRoot: Fr,
56
- feeJuicePortalInitialBalance: bigint,
57
- acceleratedTestDeployments: boolean,
58
- config: L1ContractsConfig,
59
- existingToken: EthAddress | undefined,
60
- realVerifier: boolean,
61
- createVerificationJson: string | false,
62
- debugLogger: Logger,
63
- ): Promise<DeployL1ContractsReturnType> {
64
- const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
65
- const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
66
-
67
- const account = !privateKey
68
- ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
69
- : privateKeyToAccount(addLeadingHex(privateKey));
70
- const chain = createEthereumChain(rpcUrls, chainId);
71
-
72
- const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
73
-
74
- const result = await deployL1Contracts(
75
- chain.rpcUrls,
76
- account,
77
- chain.chainInfo,
78
- debugLogger,
79
- {
80
- vkTreeRoot: getVKTreeRoot(),
81
- protocolContractsHash,
82
- genesisArchiveRoot,
83
- salt,
84
- initialValidators,
85
- acceleratedTestDeployments,
86
- feeJuicePortalInitialBalance,
87
- realVerifier,
88
- existingTokenAddress: existingToken,
89
- ...config,
90
- },
91
- config,
92
- createVerificationJson,
93
- );
94
-
95
- return result;
96
- }
97
-
98
40
  export async function deployNewRollupContracts(
99
41
  registryAddress: EthAddress,
100
42
  rpcUrls: string[],
101
- chainId: number,
102
43
  privateKey: string | undefined,
44
+ chainId: number,
103
45
  mnemonic: string,
104
46
  mnemonicIndex: number,
105
- salt: number | undefined,
106
47
  initialValidators: Operator[],
107
48
  genesisArchiveRoot: Fr,
108
49
  feeJuicePortalInitialBalance: bigint,
109
50
  config: L1ContractsConfig,
110
51
  realVerifier: boolean,
111
- createVerificationJson: string | false,
112
- logger: Logger,
113
52
  ): Promise<{ rollup: RollupContract; slashFactoryAddress: EthAddress }> {
114
- const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
53
+ const { deployRollupForUpgrade } = await import('@aztec/ethereum/deploy-aztec-l1-contracts');
115
54
  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
116
55
  const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
117
56
 
118
- const account = !privateKey
119
- ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
120
- : privateKeyToAccount(addLeadingHex(privateKey));
121
- const chain = createEthereumChain(rpcUrls, chainId);
122
- const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
57
+ let account: HDAccount | PrivateKeyAccount;
58
+ if (privateKey) {
59
+ account = privateKeyToAccount(addLeadingHex(privateKey));
60
+ } else {
61
+ account = mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex });
62
+ const privateKeyBuf = account.getHdKey().privateKey;
63
+ const privateKeyHex = Buffer.from(privateKeyBuf!).toString('hex');
64
+ privateKey = `0x${privateKeyHex}`;
65
+ }
123
66
 
124
67
  if (!initialValidators || initialValidators.length === 0) {
125
68
  // initialize the new rollup with Amin's validator address.
@@ -138,9 +81,11 @@ export async function deployNewRollupContracts(
138
81
  }
139
82
 
140
83
  const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(
141
- client,
84
+ privateKey as Hex,
85
+ rpcUrls[0],
86
+ chainId,
87
+ registryAddress,
142
88
  {
143
- salt,
144
89
  vkTreeRoot: getVKTreeRoot(),
145
90
  protocolContractsHash,
146
91
  genesisArchiveRoot,
@@ -149,13 +94,9 @@ export async function deployNewRollupContracts(
149
94
  realVerifier,
150
95
  ...config,
151
96
  },
152
- registryAddress,
153
- logger,
154
- config,
155
- createVerificationJson,
156
97
  );
157
98
 
158
- return { rollup, slashFactoryAddress };
99
+ return { rollup, slashFactoryAddress: EthAddress.fromString(slashFactoryAddress!) };
159
100
  }
160
101
 
161
102
  /**
@@ -1,11 +1,12 @@
1
- import { FunctionSelector } from '@aztec/aztec.js/abi';
2
- import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
3
- import { Fr } from '@aztec/aztec.js/fields';
4
- import { LogId } from '@aztec/aztec.js/log';
5
- import { TxHash } from '@aztec/aztec.js/tx';
1
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
+ import { EthAddress } from '@aztec/foundation/eth-address';
6
3
  import type { LogFn } from '@aztec/foundation/log';
7
4
  import type { PXE } from '@aztec/pxe/server';
5
+ import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
6
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
8
7
  import { PublicKeys } from '@aztec/stdlib/keys';
8
+ import { LogId } from '@aztec/stdlib/logs/log-id';
9
+ import { TxHash } from '@aztec/stdlib/tx/tx-hash';
9
10
 
10
11
  import { type Command, CommanderError, InvalidArgumentError, Option } from 'commander';
11
12
  import { lookup } from 'dns/promises';
@@ -1,4 +1,4 @@
1
- import { Fr } from '@aztec/foundation/fields';
1
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import type { ABIParameter, AbiType, StructType } from '@aztec/stdlib/abi';
3
3
 
4
4
  /**
@@ -1,3 +0,0 @@
1
- import type { LogFn, Logger } from '@aztec/foundation/log';
2
- export declare function getCurrentBaseFee(nodeUrl: string, debugLogger: Logger, log: LogFn): Promise<void>;
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2N1cnJlbnRfYmFzZV9mZWUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2F6dGVjX25vZGUvZ2V0X2N1cnJlbnRfYmFzZV9mZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTNELHdCQUFzQixpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssaUJBSXZGIn0=
@@ -1 +0,0 @@
1
- {"version":3,"file":"get_current_base_fee.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/get_current_base_fee.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAIvF"}
@@ -1,4 +0,0 @@
1
- import type { EthAddress } from '@aztec/aztec.js/addresses';
2
- import type { LogFn, Logger } from '@aztec/foundation/log';
3
- export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, acceleratedTestDeployments: boolean, json: boolean, createVerificationJson: string | false, initialValidators: EthAddress[], realVerifier: boolean, existingToken: EthAddress | undefined, log: LogFn, debugLogger: Logger): Promise<void>;
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2wxX2NvbnRyYWN0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NtZHMvbDEvZGVwbG95X2wxX2NvbnRyYWN0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUk1RCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFNM0Qsd0JBQXNCLGlCQUFpQixDQUNyQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQ2pCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQzlCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGFBQWEsRUFBRSxNQUFNLEVBQ3JCLElBQUksRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUN4QixZQUFZLEVBQUUsT0FBTyxFQUNyQixZQUFZLEVBQUUsT0FBTyxFQUNyQiwwQkFBMEIsRUFBRSxPQUFPLEVBQ25DLElBQUksRUFBRSxPQUFPLEVBQ2Isc0JBQXNCLEVBQUUsTUFBTSxHQUFHLEtBQUssRUFDdEMsaUJBQWlCLEVBQUUsVUFBVSxFQUFFLEVBQy9CLFlBQVksRUFBRSxPQUFPLEVBQ3JCLGFBQWEsRUFBRSxVQUFVLEdBQUcsU0FBUyxFQUNyQyxHQUFHLEVBQUUsS0FBSyxFQUNWLFdBQVcsRUFBRSxNQUFNLGlCQThEcEIifQ==
@@ -1 +0,0 @@
1
- {"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA8DpB"}