@aztec/cli 0.0.1-commit.343b43af6 → 0.0.1-commit.350e0a4d
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/cmds/aztec_node/block_number.js +1 -1
- package/dest/cmds/aztec_node/get_logs.d.ts +30 -4
- package/dest/cmds/aztec_node/get_logs.d.ts.map +1 -1
- package/dest/cmds/aztec_node/get_logs.js +39 -29
- package/dest/cmds/aztec_node/get_node_info.d.ts +1 -1
- package/dest/cmds/aztec_node/get_node_info.d.ts.map +1 -1
- package/dest/cmds/aztec_node/get_node_info.js +0 -2
- package/dest/cmds/aztec_node/index.d.ts +1 -1
- package/dest/cmds/aztec_node/index.d.ts.map +1 -1
- package/dest/cmds/aztec_node/index.js +13 -3
- package/dest/cmds/infrastructure/setup_l2_contract.d.ts +1 -1
- package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map +1 -1
- package/dest/cmds/infrastructure/setup_l2_contract.js +10 -6
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.js +0 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts +1 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +2 -4
- package/dest/cmds/l1/update_l1_validators.d.ts +1 -1
- package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
- package/dest/cmds/l1/update_l1_validators.js +0 -1
- package/dest/cmds/validator_keys/eth_json_v3_worker.d.ts +2 -0
- package/dest/cmds/validator_keys/eth_json_v3_worker.d.ts.map +1 -0
- package/dest/cmds/validator_keys/eth_json_v3_worker.js +27 -0
- package/dest/cmds/validator_keys/index.d.ts +1 -1
- package/dest/cmds/validator_keys/index.d.ts.map +1 -1
- package/dest/cmds/validator_keys/index.js +2 -1
- package/dest/cmds/validator_keys/new.d.ts +6 -1
- package/dest/cmds/validator_keys/new.d.ts.map +1 -1
- package/dest/cmds/validator_keys/new.js +78 -8
- package/dest/cmds/validator_keys/shared.d.ts +1 -1
- package/dest/cmds/validator_keys/shared.d.ts.map +1 -1
- package/dest/cmds/validator_keys/shared.js +66 -23
- package/dest/config/chain_l2_config.d.ts +7 -2
- package/dest/config/chain_l2_config.d.ts.map +1 -1
- package/dest/config/chain_l2_config.js +14 -1
- package/dest/config/generated/networks.d.ts +60 -43
- package/dest/config/generated/networks.d.ts.map +1 -1
- package/dest/config/generated/networks.js +59 -42
- package/dest/config/network_config.d.ts +1 -1
- package/dest/config/network_config.d.ts.map +1 -1
- package/dest/config/network_config.js +3 -0
- package/dest/utils/aztec.d.ts +1 -2
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +2 -3
- package/dest/utils/commands.d.ts +14 -6
- package/dest/utils/commands.d.ts.map +1 -1
- package/dest/utils/commands.js +21 -11
- package/dest/utils/inspect.d.ts +1 -1
- package/dest/utils/inspect.d.ts.map +1 -1
- package/dest/utils/inspect.js +11 -11
- package/package.json +30 -30
- package/src/cmds/aztec_node/block_number.ts +1 -1
- package/src/cmds/aztec_node/get_logs.ts +70 -38
- package/src/cmds/aztec_node/get_node_info.ts +0 -2
- package/src/cmds/aztec_node/index.ts +13 -8
- package/src/cmds/infrastructure/setup_l2_contract.ts +9 -5
- package/src/cmds/l1/deploy_l1_contracts_cmd.ts +0 -1
- package/src/cmds/l1/deploy_new_rollup.ts +1 -3
- package/src/cmds/l1/update_l1_validators.ts +0 -1
- package/src/cmds/validator_keys/eth_json_v3_worker.ts +30 -0
- package/src/cmds/validator_keys/index.ts +18 -4
- package/src/cmds/validator_keys/new.ts +107 -8
- package/src/cmds/validator_keys/shared.ts +86 -34
- package/src/config/chain_l2_config.ts +14 -1
- package/src/config/generated/networks.ts +59 -42
- package/src/config/network_config.ts +3 -0
- package/src/utils/aztec.ts +12 -18
- package/src/utils/commands.ts +24 -11
- package/src/utils/inspect.ts +7 -8
|
@@ -3,18 +3,16 @@
|
|
|
3
3
|
|
|
4
4
|
export const devnetConfig = {
|
|
5
5
|
ETHEREUM_SLOT_DURATION: 12,
|
|
6
|
-
AZTEC_SLOT_DURATION: 72,
|
|
7
|
-
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
8
6
|
AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
|
|
9
7
|
AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
|
|
10
8
|
AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000,
|
|
11
9
|
AZTEC_EXIT_DELAY_SECONDS: 172800,
|
|
12
|
-
AZTEC_INBOX_LAG:
|
|
10
|
+
AZTEC_INBOX_LAG: 2,
|
|
13
11
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
14
12
|
AZTEC_MANA_TARGET: 100000000,
|
|
15
13
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
16
14
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
17
|
-
|
|
15
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
18
16
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
19
17
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
20
18
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
@@ -24,17 +22,21 @@ export const devnetConfig = {
|
|
|
24
22
|
AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
|
|
25
23
|
AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
|
|
26
24
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0,
|
|
26
|
+
AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0,
|
|
27
|
+
AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48,
|
|
28
|
+
AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2,
|
|
29
|
+
AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48,
|
|
29
30
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
30
31
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
31
32
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
33
|
+
SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
|
|
32
34
|
P2P_ENABLED: true,
|
|
33
35
|
BOOTSTRAP_NODES: '',
|
|
34
36
|
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
35
37
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
36
38
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
37
|
-
|
|
39
|
+
CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
|
|
38
40
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
39
41
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
40
42
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -42,10 +44,16 @@ export const devnetConfig = {
|
|
|
42
44
|
PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
|
|
43
45
|
PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
|
|
44
46
|
SENTINEL_ENABLED: true,
|
|
47
|
+
OFFENSE_COLLECTION_ENABLED: true,
|
|
48
|
+
AZTEC_SLOT_DURATION: 36,
|
|
45
49
|
AZTEC_EPOCH_DURATION: 8,
|
|
46
50
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 1,
|
|
47
51
|
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
|
|
52
|
+
AZTEC_TARGET_COMMITTEE_SIZE: 1,
|
|
53
|
+
MAX_BLOCKS_PER_CHECKPOINT: 4,
|
|
48
54
|
AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1,
|
|
55
|
+
AZTEC_SLASHING_QUORUM: 17,
|
|
56
|
+
AZTEC_GOVERNANCE_PROPOSER_QUORUM: 151,
|
|
49
57
|
L1_CHAIN_ID: 11155111,
|
|
50
58
|
TEST_ACCOUNTS: true,
|
|
51
59
|
SPONSORED_FPC: true,
|
|
@@ -61,7 +69,6 @@ export const devnetConfig = {
|
|
|
61
69
|
PUBLIC_OTEL_OPT_OUT: true,
|
|
62
70
|
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
63
71
|
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
64
|
-
SLASH_PRUNE_PENALTY: 10000000000000000000,
|
|
65
72
|
SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
|
|
66
73
|
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
|
|
67
74
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
|
|
@@ -69,11 +76,13 @@ export const devnetConfig = {
|
|
|
69
76
|
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
|
|
70
77
|
SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
|
|
71
78
|
SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
|
|
72
|
-
|
|
79
|
+
SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
|
|
80
|
+
SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 10000000000000000000,
|
|
73
81
|
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
74
82
|
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
83
|
+
SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
|
|
75
84
|
SLASH_GRACE_PERIOD_L2_SLOTS: 0,
|
|
76
|
-
|
|
85
|
+
ENABLE_AUTO_SHUTDOWN: false,
|
|
77
86
|
} as const;
|
|
78
87
|
|
|
79
88
|
export const testnetConfig = {
|
|
@@ -83,25 +92,30 @@ export const testnetConfig = {
|
|
|
83
92
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
84
93
|
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
85
94
|
AZTEC_EXIT_DELAY_SECONDS: 172800,
|
|
86
|
-
AZTEC_INBOX_LAG:
|
|
95
|
+
AZTEC_INBOX_LAG: 2,
|
|
87
96
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
88
97
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
89
|
-
|
|
98
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
90
99
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
91
100
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
92
101
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
93
102
|
AZTEC_SLASHING_DISABLE_DURATION: 432000,
|
|
94
|
-
|
|
95
|
-
|
|
103
|
+
AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0,
|
|
104
|
+
AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0,
|
|
105
|
+
AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48,
|
|
106
|
+
AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2,
|
|
107
|
+
AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48,
|
|
96
108
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
97
109
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
98
110
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
111
|
+
SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
|
|
99
112
|
P2P_ENABLED: true,
|
|
100
113
|
BOOTSTRAP_NODES: '',
|
|
101
114
|
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
102
115
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
103
116
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
104
|
-
|
|
117
|
+
MAX_BLOCKS_PER_CHECKPOINT: 10,
|
|
118
|
+
CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
|
|
105
119
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
106
120
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
107
121
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -109,6 +123,7 @@ export const testnetConfig = {
|
|
|
109
123
|
PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
|
|
110
124
|
PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
|
|
111
125
|
SENTINEL_ENABLED: true,
|
|
126
|
+
OFFENSE_COLLECTION_ENABLED: true,
|
|
112
127
|
AZTEC_SLOT_DURATION: 72,
|
|
113
128
|
AZTEC_ACTIVATION_THRESHOLD: 2E+23,
|
|
114
129
|
AZTEC_EJECTION_THRESHOLD: 1E+23,
|
|
@@ -119,10 +134,10 @@ export const testnetConfig = {
|
|
|
119
134
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
|
|
120
135
|
AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
|
|
121
136
|
AZTEC_MANA_TARGET: 75000000,
|
|
122
|
-
AZTEC_PROVING_COST_PER_MANA:
|
|
137
|
+
AZTEC_PROVING_COST_PER_MANA: 12500000,
|
|
123
138
|
AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
|
|
124
|
-
AZTEC_SLASH_AMOUNT_MEDIUM:
|
|
125
|
-
AZTEC_SLASH_AMOUNT_LARGE:
|
|
139
|
+
AZTEC_SLASH_AMOUNT_MEDIUM: 2.5E+23,
|
|
140
|
+
AZTEC_SLASH_AMOUNT_LARGE: 2.5E+23,
|
|
126
141
|
L1_CHAIN_ID: 11155111,
|
|
127
142
|
TEST_ACCOUNTS: false,
|
|
128
143
|
SPONSORED_FPC: false,
|
|
@@ -131,19 +146,20 @@ export const testnetConfig = {
|
|
|
131
146
|
PROVER_REAL_PROOFS: true,
|
|
132
147
|
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
133
148
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
134
|
-
|
|
135
|
-
SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
|
|
149
|
+
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
136
150
|
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
|
|
137
151
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
|
|
138
|
-
SLASH_INACTIVITY_PENALTY:
|
|
139
|
-
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY:
|
|
140
|
-
SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
141
|
-
SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
152
|
+
SLASH_INACTIVITY_PENALTY: 1E+23,
|
|
153
|
+
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 1E+23,
|
|
154
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 2.5E+23,
|
|
155
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 2.5E+23,
|
|
156
|
+
SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
|
|
157
|
+
SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
|
|
158
|
+
SLASH_UNKNOWN_PENALTY: 1E+23,
|
|
159
|
+
SLASH_INVALID_BLOCK_PENALTY: 1E+23,
|
|
160
|
+
SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 1E+23,
|
|
145
161
|
SLASH_GRACE_PERIOD_L2_SLOTS: 64,
|
|
146
|
-
|
|
162
|
+
ENABLE_AUTO_SHUTDOWN: false,
|
|
147
163
|
} as const;
|
|
148
164
|
|
|
149
165
|
export const mainnetConfig = {
|
|
@@ -152,23 +168,23 @@ export const mainnetConfig = {
|
|
|
152
168
|
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
153
169
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
154
170
|
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
155
|
-
AZTEC_INBOX_LAG:
|
|
171
|
+
AZTEC_INBOX_LAG: 2,
|
|
156
172
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
157
173
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
158
|
-
|
|
174
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
159
175
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
160
176
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
161
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
162
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
163
177
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
164
178
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
165
179
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
180
|
+
SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
|
|
166
181
|
P2P_ENABLED: true,
|
|
167
182
|
BOOTSTRAP_NODES: '',
|
|
168
183
|
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
169
184
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
170
185
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
171
|
-
|
|
186
|
+
MAX_BLOCKS_PER_CHECKPOINT: 10,
|
|
187
|
+
CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
|
|
172
188
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
173
189
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
174
190
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -176,13 +192,14 @@ export const mainnetConfig = {
|
|
|
176
192
|
PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
|
|
177
193
|
PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
|
|
178
194
|
SENTINEL_ENABLED: true,
|
|
195
|
+
OFFENSE_COLLECTION_ENABLED: true,
|
|
179
196
|
AZTEC_SLOT_DURATION: 72,
|
|
180
197
|
AZTEC_ACTIVATION_THRESHOLD: 2E+23,
|
|
181
198
|
AZTEC_EJECTION_THRESHOLD: 1E+23,
|
|
182
199
|
AZTEC_LOCAL_EJECTION_THRESHOLD: 1.9E+23,
|
|
183
200
|
AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
|
|
184
|
-
AZTEC_SLASH_AMOUNT_MEDIUM:
|
|
185
|
-
AZTEC_SLASH_AMOUNT_LARGE:
|
|
201
|
+
AZTEC_SLASH_AMOUNT_MEDIUM: 5E+21,
|
|
202
|
+
AZTEC_SLASH_AMOUNT_LARGE: 5E+21,
|
|
186
203
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 34,
|
|
187
204
|
AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 28,
|
|
188
205
|
AZTEC_SLASHING_VETOER: '0xBbB4aF368d02827945748b28CD4b2D42e4A37480',
|
|
@@ -190,7 +207,7 @@ export const mainnetConfig = {
|
|
|
190
207
|
AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
|
|
191
208
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
|
|
192
209
|
AZTEC_MANA_TARGET: 75000000,
|
|
193
|
-
AZTEC_PROVING_COST_PER_MANA:
|
|
210
|
+
AZTEC_PROVING_COST_PER_MANA: 12500000,
|
|
194
211
|
AZTEC_EXIT_DELAY_SECONDS: 345600,
|
|
195
212
|
AZTEC_SLASHING_DISABLE_DURATION: 259200,
|
|
196
213
|
AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
|
|
@@ -204,24 +221,24 @@ export const mainnetConfig = {
|
|
|
204
221
|
TRANSACTIONS_DISABLED: false,
|
|
205
222
|
SEQ_MAX_TX_PER_CHECKPOINT: 72,
|
|
206
223
|
PROVER_REAL_PROOFS: true,
|
|
207
|
-
SYNC_SNAPSHOTS_URLS: 'https://aztec-labs-snapshots.com/mainnet/',
|
|
208
224
|
BLOB_ALLOW_EMPTY_SOURCES: true,
|
|
209
225
|
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
210
226
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
211
227
|
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
212
228
|
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
213
|
-
|
|
214
|
-
SLASH_PRUNE_PENALTY: 0,
|
|
229
|
+
ENABLE_AUTO_SHUTDOWN: false,
|
|
215
230
|
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
216
231
|
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
|
|
217
232
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
|
|
218
233
|
SLASH_INACTIVITY_PENALTY: 2E+21,
|
|
219
234
|
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
|
|
220
|
-
SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
221
|
-
SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
222
|
-
|
|
235
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 5E+21,
|
|
236
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 5E+21,
|
|
237
|
+
SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
|
|
238
|
+
SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
|
|
223
239
|
SLASH_UNKNOWN_PENALTY: 2E+21,
|
|
224
240
|
SLASH_INVALID_BLOCK_PENALTY: 2E+21,
|
|
241
|
+
SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2E+21,
|
|
225
242
|
SLASH_GRACE_PERIOD_L2_SLOTS: 1200,
|
|
226
243
|
} as const;
|
|
227
244
|
|
|
@@ -139,6 +139,9 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
|
|
|
139
139
|
if (networkConfig.blobFileStoreUrls?.length) {
|
|
140
140
|
enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
|
|
141
141
|
}
|
|
142
|
+
if (networkConfig.txCollectionFileStoreUrls?.length) {
|
|
143
|
+
enrichVar('TX_COLLECTION_FILE_STORE_URLS', networkConfig.txCollectionFileStoreUrls.join(','));
|
|
144
|
+
}
|
|
142
145
|
if (networkConfig.blockDurationMs !== undefined) {
|
|
143
146
|
enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
|
|
144
147
|
}
|
package/src/utils/aztec.ts
CHANGED
|
@@ -49,7 +49,7 @@ export async function deployNewRollupContracts(
|
|
|
49
49
|
feeJuicePortalInitialBalance: bigint,
|
|
50
50
|
config: L1ContractsConfig,
|
|
51
51
|
realVerifier: boolean,
|
|
52
|
-
): Promise<{ rollup: RollupContract
|
|
52
|
+
): Promise<{ rollup: RollupContract }> {
|
|
53
53
|
const { deployRollupForUpgrade } = await import('@aztec/ethereum/deploy-aztec-l1-contracts');
|
|
54
54
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
55
55
|
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
@@ -80,23 +80,17 @@ export async function deployNewRollupContracts(
|
|
|
80
80
|
logger.info('Initializing new rollup with old attesters', { initialValidators });
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
const { rollup
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
realVerifier,
|
|
95
|
-
...config,
|
|
96
|
-
},
|
|
97
|
-
);
|
|
98
|
-
|
|
99
|
-
return { rollup, slashFactoryAddress: EthAddress.fromString(slashFactoryAddress!) };
|
|
83
|
+
const { rollup } = await deployRollupForUpgrade(privateKey as Hex, rpcUrls[0], chainId, registryAddress, {
|
|
84
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
85
|
+
protocolContractsHash,
|
|
86
|
+
genesisArchiveRoot,
|
|
87
|
+
initialValidators,
|
|
88
|
+
feeJuicePortalInitialBalance,
|
|
89
|
+
realVerifier,
|
|
90
|
+
...config,
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
return { rollup };
|
|
100
94
|
}
|
|
101
95
|
|
|
102
96
|
/**
|
package/src/utils/commands.ts
CHANGED
|
@@ -5,13 +5,15 @@ import type { PXE } from '@aztec/pxe/server';
|
|
|
5
5
|
import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
|
|
6
6
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
7
7
|
import { PublicKeys } from '@aztec/stdlib/keys';
|
|
8
|
-
import {
|
|
8
|
+
import { LogCursor, Tag } from '@aztec/stdlib/logs';
|
|
9
9
|
import { TxHash } from '@aztec/stdlib/tx/tx-hash';
|
|
10
10
|
|
|
11
11
|
import { type Command, CommanderError, InvalidArgumentError, Option } from 'commander';
|
|
12
12
|
import { lookup } from 'dns/promises';
|
|
13
13
|
import { rename, writeFile } from 'fs/promises';
|
|
14
14
|
|
|
15
|
+
export { LogCursor };
|
|
16
|
+
|
|
15
17
|
/**
|
|
16
18
|
* If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
|
|
17
19
|
* localhost as being host.docker.internal.
|
|
@@ -99,7 +101,7 @@ export async function getTxSender(pxe: PXE, _from?: string) {
|
|
|
99
101
|
let from: AztecAddress;
|
|
100
102
|
if (_from) {
|
|
101
103
|
try {
|
|
102
|
-
from = AztecAddress.
|
|
104
|
+
from = AztecAddress.fromStringUnsafe(_from);
|
|
103
105
|
} catch {
|
|
104
106
|
throw new InvalidArgumentError(`Invalid option 'from' passed: ${_from}`);
|
|
105
107
|
}
|
|
@@ -193,7 +195,7 @@ export function parseFieldFromHexString(str: string): Fr {
|
|
|
193
195
|
*/
|
|
194
196
|
export function parseAztecAddress(address: string): AztecAddress {
|
|
195
197
|
try {
|
|
196
|
-
return AztecAddress.
|
|
198
|
+
return AztecAddress.fromStringUnsafe(address);
|
|
197
199
|
} catch {
|
|
198
200
|
throw new InvalidArgumentError(`Invalid Aztec address: ${address}`);
|
|
199
201
|
}
|
|
@@ -227,16 +229,27 @@ export function parseOptionalAztecAddress(address: string): AztecAddress | undef
|
|
|
227
229
|
}
|
|
228
230
|
|
|
229
231
|
/**
|
|
230
|
-
* Parses an optional
|
|
231
|
-
*
|
|
232
|
-
* @
|
|
233
|
-
* @
|
|
232
|
+
* Parses an optional `<blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx>` triple into a {@link LogCursor},
|
|
233
|
+
* used as the `--after-log` argument of `get-logs` to resume pagination strictly after a previously-seen log.
|
|
234
|
+
* Thin wrapper over {@link LogCursor.parseOptional} that surfaces parse errors as commander's
|
|
235
|
+
* {@link InvalidArgumentError}.
|
|
234
236
|
*/
|
|
235
|
-
export function
|
|
236
|
-
|
|
237
|
-
return
|
|
237
|
+
export function parseOptionalLogCursor(value: string): LogCursor | undefined {
|
|
238
|
+
try {
|
|
239
|
+
return LogCursor.parseOptional(value);
|
|
240
|
+
} catch (err) {
|
|
241
|
+
throw new InvalidArgumentError(err instanceof Error ? err.message : String(err));
|
|
238
242
|
}
|
|
239
|
-
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
/**
|
|
246
|
+
* Parses a log tag from a string. Tags are field-element values; we delegate to the {@link parseField} parser.
|
|
247
|
+
*
|
|
248
|
+
* @param tag - A hex string, integer, or boolean string representing the tag.
|
|
249
|
+
* @returns A {@link Tag} wrapping the parsed field.
|
|
250
|
+
*/
|
|
251
|
+
export function parseTag(tag: string): Tag {
|
|
252
|
+
return new Tag(parseField(tag));
|
|
240
253
|
}
|
|
241
254
|
|
|
242
255
|
/**
|
package/src/utils/inspect.ts
CHANGED
|
@@ -9,14 +9,13 @@ export async function inspectBlock(
|
|
|
9
9
|
log: LogFn,
|
|
10
10
|
opts: { showTxs?: boolean } = {},
|
|
11
11
|
) {
|
|
12
|
-
const block = await aztecNode.getBlock(blockNumber);
|
|
12
|
+
const block = await aztecNode.getBlock(blockNumber, { includeTransactions: opts.showTxs });
|
|
13
13
|
if (!block) {
|
|
14
14
|
log(`No block found for block number ${blockNumber}`);
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
log(`Block ${blockNumber} (${blockHash.toString()})`);
|
|
18
|
+
log(`Block ${blockNumber} (${block.hash.toString()})`);
|
|
20
19
|
log(` Total fees: ${block.header.totalFees.toBigInt()}`);
|
|
21
20
|
log(` Total mana used: ${block.header.totalManaUsed.toBigInt()}`);
|
|
22
21
|
log(
|
|
@@ -25,12 +24,12 @@ export async function inspectBlock(
|
|
|
25
24
|
log(` Coinbase: ${block.header.globalVariables.coinbase}`);
|
|
26
25
|
log(` Fee recipient: ${block.header.globalVariables.feeRecipient}`);
|
|
27
26
|
log(` Timestamp: ${new Date(Number(block.header.globalVariables.timestamp) * 500)}`);
|
|
28
|
-
if (opts.showTxs) {
|
|
27
|
+
if (opts.showTxs && block.body) {
|
|
29
28
|
log(``);
|
|
30
29
|
for (const txHash of block.body.txEffects.map(tx => tx.txHash)) {
|
|
31
30
|
await inspectTx(aztecNode, txHash, log, { includeBlockInfo: false });
|
|
32
31
|
}
|
|
33
|
-
} else {
|
|
32
|
+
} else if (block.body) {
|
|
34
33
|
log(` Transactions: ${block.body.txEffects.length}`);
|
|
35
34
|
}
|
|
36
35
|
}
|
|
@@ -41,7 +40,7 @@ export async function inspectTx(
|
|
|
41
40
|
log: LogFn,
|
|
42
41
|
opts: { includeBlockInfo?: boolean } = {},
|
|
43
42
|
) {
|
|
44
|
-
const
|
|
43
|
+
const receipt = await aztecNode.getTxReceipt(txHash, { includeTxEffect: true });
|
|
45
44
|
// Base tx data
|
|
46
45
|
log(`Tx ${txHash.toString()}`);
|
|
47
46
|
log(` Status: ${receipt.status}`);
|
|
@@ -52,11 +51,11 @@ export async function inspectTx(
|
|
|
52
51
|
log(` Error: ${receipt.error}`);
|
|
53
52
|
}
|
|
54
53
|
|
|
55
|
-
if (!
|
|
54
|
+
if (!receipt.isMined() || !receipt.txEffect) {
|
|
56
55
|
return;
|
|
57
56
|
}
|
|
58
57
|
|
|
59
|
-
const effects =
|
|
58
|
+
const effects = receipt.txEffect;
|
|
60
59
|
|
|
61
60
|
if (opts.includeBlockInfo) {
|
|
62
61
|
log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
|