@aztec/cli 0.0.1-commit.2f68f620 → 0.0.1-commit.321f6a9

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 (35) hide show
  1. package/dest/cmds/infrastructure/setup_l2_contract.js +5 -5
  2. package/dest/cmds/validator_keys/index.d.ts +1 -1
  3. package/dest/cmds/validator_keys/index.d.ts.map +1 -1
  4. package/dest/cmds/validator_keys/index.js +6 -6
  5. package/dest/cmds/validator_keys/new.d.ts +2 -1
  6. package/dest/cmds/validator_keys/new.d.ts.map +1 -1
  7. package/dest/cmds/validator_keys/new.js +21 -5
  8. package/dest/cmds/validator_keys/set_funding_account.d.ts +14 -0
  9. package/dest/cmds/validator_keys/set_funding_account.d.ts.map +1 -0
  10. package/dest/cmds/validator_keys/set_funding_account.js +37 -0
  11. package/dest/cmds/validator_keys/shared.d.ts +15 -2
  12. package/dest/cmds/validator_keys/shared.d.ts.map +1 -1
  13. package/dest/cmds/validator_keys/shared.js +34 -0
  14. package/dest/cmds/validator_keys/utils.d.ts +12 -2
  15. package/dest/cmds/validator_keys/utils.d.ts.map +1 -1
  16. package/dest/cmds/validator_keys/utils.js +34 -0
  17. package/dest/config/chain_l2_config.d.ts +7 -2
  18. package/dest/config/chain_l2_config.d.ts.map +1 -1
  19. package/dest/config/chain_l2_config.js +14 -1
  20. package/dest/config/generated/networks.d.ts +32 -14
  21. package/dest/config/generated/networks.d.ts.map +1 -1
  22. package/dest/config/generated/networks.js +31 -13
  23. package/dest/utils/commands.d.ts +7 -6
  24. package/dest/utils/commands.d.ts.map +1 -1
  25. package/dest/utils/commands.js +10 -9
  26. package/package.json +30 -30
  27. package/src/cmds/infrastructure/setup_l2_contract.ts +5 -5
  28. package/src/cmds/validator_keys/index.ts +30 -4
  29. package/src/cmds/validator_keys/new.ts +22 -1
  30. package/src/cmds/validator_keys/set_funding_account.ts +55 -0
  31. package/src/cmds/validator_keys/shared.ts +37 -1
  32. package/src/cmds/validator_keys/utils.ts +44 -1
  33. package/src/config/chain_l2_config.ts +14 -1
  34. package/src/config/generated/networks.ts +31 -13
  35. package/src/utils/commands.ts +14 -13
@@ -1,12 +1,10 @@
1
1
  export declare const devnetConfig: {
2
2
  readonly ETHEREUM_SLOT_DURATION: 12;
3
- readonly AZTEC_SLOT_DURATION: 72;
4
- readonly AZTEC_TARGET_COMMITTEE_SIZE: 48;
5
3
  readonly AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000;
6
4
  readonly AZTEC_EJECTION_THRESHOLD: 50000000000000000000;
7
5
  readonly AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000;
8
6
  readonly AZTEC_EXIT_DELAY_SECONDS: 172800;
9
- readonly AZTEC_INBOX_LAG: 1;
7
+ readonly AZTEC_INBOX_LAG: 2;
10
8
  readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
11
9
  readonly AZTEC_MANA_TARGET: 100000000;
12
10
  readonly AZTEC_PROVING_COST_PER_MANA: 100;
@@ -21,6 +19,11 @@ export declare const devnetConfig: {
21
19
  readonly AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000;
22
20
  readonly AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000;
23
21
  readonly AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300;
22
+ readonly AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0;
23
+ readonly AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0;
24
+ readonly AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48;
25
+ readonly AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2;
26
+ readonly AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48;
24
27
  readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
25
28
  readonly SLASH_MAX_PAYLOAD_SIZE: 80;
26
29
  readonly SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4;
@@ -30,7 +33,7 @@ export declare const devnetConfig: {
30
33
  readonly SEQ_MIN_TX_PER_BLOCK: 1;
31
34
  readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
32
35
  readonly SEQ_BLOCK_DURATION_MS: 6000;
33
- readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
36
+ readonly CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12;
34
37
  readonly DATA_STORE_MAP_SIZE_KB: 134217728;
35
38
  readonly ARCHIVER_STORE_MAP_SIZE_KB: 1073741824;
36
39
  readonly NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824;
@@ -38,10 +41,16 @@ export declare const devnetConfig: {
38
41
  readonly PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824;
39
42
  readonly PUBLIC_OTEL_INCLUDE_METRICS: "aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_";
40
43
  readonly SENTINEL_ENABLED: true;
44
+ readonly OFFENSE_COLLECTION_ENABLED: true;
45
+ readonly AZTEC_SLOT_DURATION: 36;
41
46
  readonly AZTEC_EPOCH_DURATION: 8;
42
47
  readonly AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 1;
43
48
  readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1;
49
+ readonly AZTEC_TARGET_COMMITTEE_SIZE: 1;
50
+ readonly MAX_BLOCKS_PER_CHECKPOINT: 4;
44
51
  readonly AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1;
52
+ readonly AZTEC_SLASHING_QUORUM: 17;
53
+ readonly AZTEC_GOVERNANCE_PROPOSER_QUORUM: 151;
45
54
  readonly L1_CHAIN_ID: 11155111;
46
55
  readonly TEST_ACCOUNTS: true;
47
56
  readonly SPONSORED_FPC: true;
@@ -70,7 +79,7 @@ export declare const devnetConfig: {
70
79
  readonly SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000;
71
80
  readonly SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0;
72
81
  readonly SLASH_GRACE_PERIOD_L2_SLOTS: 0;
73
- readonly ENABLE_VERSION_CHECK: true;
82
+ readonly ENABLE_AUTO_SHUTDOWN: false;
74
83
  };
75
84
  export declare const testnetConfig: {
76
85
  readonly ETHEREUM_SLOT_DURATION: 12;
@@ -79,7 +88,7 @@ export declare const testnetConfig: {
79
88
  readonly AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2;
80
89
  readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2;
81
90
  readonly AZTEC_EXIT_DELAY_SECONDS: 172800;
82
- readonly AZTEC_INBOX_LAG: 1;
91
+ readonly AZTEC_INBOX_LAG: 2;
83
92
  readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
84
93
  readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
85
94
  readonly AZTEC_SLASHER_ENABLED: true;
@@ -87,6 +96,11 @@ export declare const testnetConfig: {
87
96
  readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
88
97
  readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
89
98
  readonly AZTEC_SLASHING_DISABLE_DURATION: 432000;
99
+ readonly AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0;
100
+ readonly AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0;
101
+ readonly AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48;
102
+ readonly AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2;
103
+ readonly AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48;
90
104
  readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
91
105
  readonly SLASH_MAX_PAYLOAD_SIZE: 80;
92
106
  readonly SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4;
@@ -96,7 +110,8 @@ export declare const testnetConfig: {
96
110
  readonly SEQ_MIN_TX_PER_BLOCK: 1;
97
111
  readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
98
112
  readonly SEQ_BLOCK_DURATION_MS: 6000;
99
- readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
113
+ readonly MAX_BLOCKS_PER_CHECKPOINT: 10;
114
+ readonly CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12;
100
115
  readonly DATA_STORE_MAP_SIZE_KB: 134217728;
101
116
  readonly ARCHIVER_STORE_MAP_SIZE_KB: 1073741824;
102
117
  readonly NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824;
@@ -104,6 +119,7 @@ export declare const testnetConfig: {
104
119
  readonly PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824;
105
120
  readonly PUBLIC_OTEL_INCLUDE_METRICS: "aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_";
106
121
  readonly SENTINEL_ENABLED: true;
122
+ readonly OFFENSE_COLLECTION_ENABLED: true;
107
123
  readonly AZTEC_SLOT_DURATION: 72;
108
124
  readonly AZTEC_ACTIVATION_THRESHOLD: 2e+23;
109
125
  readonly AZTEC_EJECTION_THRESHOLD: 1e+23;
@@ -139,7 +155,7 @@ export declare const testnetConfig: {
139
155
  readonly SLASH_INVALID_BLOCK_PENALTY: 1e+23;
140
156
  readonly SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 1e+23;
141
157
  readonly SLASH_GRACE_PERIOD_L2_SLOTS: 64;
142
- readonly ENABLE_VERSION_CHECK: true;
158
+ readonly ENABLE_AUTO_SHUTDOWN: false;
143
159
  };
144
160
  export declare const mainnetConfig: {
145
161
  readonly ETHEREUM_SLOT_DURATION: 12;
@@ -147,7 +163,7 @@ export declare const mainnetConfig: {
147
163
  readonly AZTEC_TARGET_COMMITTEE_SIZE: 48;
148
164
  readonly AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2;
149
165
  readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2;
150
- readonly AZTEC_INBOX_LAG: 1;
166
+ readonly AZTEC_INBOX_LAG: 2;
151
167
  readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
152
168
  readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
153
169
  readonly AZTEC_SLASHER_ENABLED: true;
@@ -162,7 +178,8 @@ export declare const mainnetConfig: {
162
178
  readonly SEQ_MIN_TX_PER_BLOCK: 1;
163
179
  readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
164
180
  readonly SEQ_BLOCK_DURATION_MS: 6000;
165
- readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
181
+ readonly MAX_BLOCKS_PER_CHECKPOINT: 10;
182
+ readonly CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12;
166
183
  readonly DATA_STORE_MAP_SIZE_KB: 134217728;
167
184
  readonly ARCHIVER_STORE_MAP_SIZE_KB: 1073741824;
168
185
  readonly NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824;
@@ -170,6 +187,7 @@ export declare const mainnetConfig: {
170
187
  readonly PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824;
171
188
  readonly PUBLIC_OTEL_INCLUDE_METRICS: "aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_";
172
189
  readonly SENTINEL_ENABLED: true;
190
+ readonly OFFENSE_COLLECTION_ENABLED: true;
173
191
  readonly AZTEC_SLOT_DURATION: 72;
174
192
  readonly AZTEC_ACTIVATION_THRESHOLD: 2e+23;
175
193
  readonly AZTEC_EJECTION_THRESHOLD: 1e+23;
@@ -203,9 +221,9 @@ export declare const mainnetConfig: {
203
221
  readonly P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true;
204
222
  readonly PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: "";
205
223
  readonly PUBLIC_OTEL_COLLECT_FROM: "";
206
- readonly ENABLE_VERSION_CHECK: false;
224
+ readonly ENABLE_AUTO_SHUTDOWN: false;
207
225
  readonly SLASH_DATA_WITHHOLDING_PENALTY: 0;
208
- readonly SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8;
226
+ readonly SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.7;
209
227
  readonly SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2;
210
228
  readonly SLASH_INACTIVITY_PENALTY: 2e+21;
211
229
  readonly SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2e+21;
@@ -216,6 +234,6 @@ export declare const mainnetConfig: {
216
234
  readonly SLASH_UNKNOWN_PENALTY: 2e+21;
217
235
  readonly SLASH_INVALID_BLOCK_PENALTY: 2e+21;
218
236
  readonly SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2e+21;
219
- readonly SLASH_GRACE_PERIOD_L2_SLOTS: 1200;
237
+ readonly SLASH_GRACE_PERIOD_L2_SLOTS: 8400;
220
238
  };
221
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBeUVmLENBQUM7QUFFWCxlQUFPLE1BQU0sYUFBYTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FvRWhCLENBQUM7QUFFWCxlQUFPLE1BQU0sYUFBYTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQTRFaEIsQ0FBQyJ9
239
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBa0ZmLENBQUM7QUFFWCxlQUFPLE1BQU0sYUFBYTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBMkVoQixDQUFDO0FBRVgsZUFBTyxNQUFNLGFBQWE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQThFaEIsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyEf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoEhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4EhB,CAAC"}
1
+ {"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkFf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2EhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8EhB,CAAC"}
@@ -2,13 +2,11 @@
2
2
  // Do not edit manually - run yarn generate to regenerate
3
3
  export const devnetConfig = {
4
4
  ETHEREUM_SLOT_DURATION: 12,
5
- AZTEC_SLOT_DURATION: 72,
6
- AZTEC_TARGET_COMMITTEE_SIZE: 48,
7
5
  AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
8
6
  AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
9
7
  AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000,
10
8
  AZTEC_EXIT_DELAY_SECONDS: 172800,
11
- AZTEC_INBOX_LAG: 1,
9
+ AZTEC_INBOX_LAG: 2,
12
10
  AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
13
11
  AZTEC_MANA_TARGET: 100000000,
14
12
  AZTEC_PROVING_COST_PER_MANA: 100,
@@ -23,6 +21,11 @@ export const devnetConfig = {
23
21
  AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
24
22
  AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
25
23
  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
24
+ AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0,
25
+ AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0,
26
+ AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48,
27
+ AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2,
28
+ AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48,
26
29
  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
27
30
  SLASH_MAX_PAYLOAD_SIZE: 80,
28
31
  SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
@@ -32,7 +35,7 @@ export const devnetConfig = {
32
35
  SEQ_MIN_TX_PER_BLOCK: 1,
33
36
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
34
37
  SEQ_BLOCK_DURATION_MS: 6000,
35
- SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
38
+ CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
36
39
  DATA_STORE_MAP_SIZE_KB: 134217728,
37
40
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
38
41
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -40,10 +43,16 @@ export const devnetConfig = {
40
43
  PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
41
44
  PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
42
45
  SENTINEL_ENABLED: true,
46
+ OFFENSE_COLLECTION_ENABLED: true,
47
+ AZTEC_SLOT_DURATION: 36,
43
48
  AZTEC_EPOCH_DURATION: 8,
44
49
  AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 1,
45
50
  AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
51
+ AZTEC_TARGET_COMMITTEE_SIZE: 1,
52
+ MAX_BLOCKS_PER_CHECKPOINT: 4,
46
53
  AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1,
54
+ AZTEC_SLASHING_QUORUM: 17,
55
+ AZTEC_GOVERNANCE_PROPOSER_QUORUM: 151,
47
56
  L1_CHAIN_ID: 11155111,
48
57
  TEST_ACCOUNTS: true,
49
58
  SPONSORED_FPC: true,
@@ -72,7 +81,7 @@ export const devnetConfig = {
72
81
  SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
73
82
  SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
74
83
  SLASH_GRACE_PERIOD_L2_SLOTS: 0,
75
- ENABLE_VERSION_CHECK: true
84
+ ENABLE_AUTO_SHUTDOWN: false
76
85
  };
77
86
  export const testnetConfig = {
78
87
  ETHEREUM_SLOT_DURATION: 12,
@@ -81,7 +90,7 @@ export const testnetConfig = {
81
90
  AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
82
91
  AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
83
92
  AZTEC_EXIT_DELAY_SECONDS: 172800,
84
- AZTEC_INBOX_LAG: 1,
93
+ AZTEC_INBOX_LAG: 2,
85
94
  AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
86
95
  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
87
96
  AZTEC_SLASHER_ENABLED: true,
@@ -89,6 +98,11 @@ export const testnetConfig = {
89
98
  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
90
99
  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
91
100
  AZTEC_SLASHING_DISABLE_DURATION: 432000,
101
+ AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0,
102
+ AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0,
103
+ AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48,
104
+ AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2,
105
+ AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48,
92
106
  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
93
107
  SLASH_MAX_PAYLOAD_SIZE: 80,
94
108
  SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
@@ -98,7 +112,8 @@ export const testnetConfig = {
98
112
  SEQ_MIN_TX_PER_BLOCK: 1,
99
113
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
100
114
  SEQ_BLOCK_DURATION_MS: 6000,
101
- SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
115
+ MAX_BLOCKS_PER_CHECKPOINT: 10,
116
+ CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
102
117
  DATA_STORE_MAP_SIZE_KB: 134217728,
103
118
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
104
119
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -106,6 +121,7 @@ export const testnetConfig = {
106
121
  PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
107
122
  PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
108
123
  SENTINEL_ENABLED: true,
124
+ OFFENSE_COLLECTION_ENABLED: true,
109
125
  AZTEC_SLOT_DURATION: 72,
110
126
  AZTEC_ACTIVATION_THRESHOLD: 2E+23,
111
127
  AZTEC_EJECTION_THRESHOLD: 1E+23,
@@ -141,7 +157,7 @@ export const testnetConfig = {
141
157
  SLASH_INVALID_BLOCK_PENALTY: 1E+23,
142
158
  SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 1E+23,
143
159
  SLASH_GRACE_PERIOD_L2_SLOTS: 64,
144
- ENABLE_VERSION_CHECK: true
160
+ ENABLE_AUTO_SHUTDOWN: false
145
161
  };
146
162
  export const mainnetConfig = {
147
163
  ETHEREUM_SLOT_DURATION: 12,
@@ -149,7 +165,7 @@ export const mainnetConfig = {
149
165
  AZTEC_TARGET_COMMITTEE_SIZE: 48,
150
166
  AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
151
167
  AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
152
- AZTEC_INBOX_LAG: 1,
168
+ AZTEC_INBOX_LAG: 2,
153
169
  AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
154
170
  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
155
171
  AZTEC_SLASHER_ENABLED: true,
@@ -164,7 +180,8 @@ export const mainnetConfig = {
164
180
  SEQ_MIN_TX_PER_BLOCK: 1,
165
181
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
166
182
  SEQ_BLOCK_DURATION_MS: 6000,
167
- SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
183
+ MAX_BLOCKS_PER_CHECKPOINT: 10,
184
+ CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
168
185
  DATA_STORE_MAP_SIZE_KB: 134217728,
169
186
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
170
187
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -172,6 +189,7 @@ export const mainnetConfig = {
172
189
  PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
173
190
  PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
174
191
  SENTINEL_ENABLED: true,
192
+ OFFENSE_COLLECTION_ENABLED: true,
175
193
  AZTEC_SLOT_DURATION: 72,
176
194
  AZTEC_ACTIVATION_THRESHOLD: 2E+23,
177
195
  AZTEC_EJECTION_THRESHOLD: 1E+23,
@@ -205,9 +223,9 @@ export const mainnetConfig = {
205
223
  P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
206
224
  PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
207
225
  PUBLIC_OTEL_COLLECT_FROM: '',
208
- ENABLE_VERSION_CHECK: false,
226
+ ENABLE_AUTO_SHUTDOWN: false,
209
227
  SLASH_DATA_WITHHOLDING_PENALTY: 0,
210
- SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
228
+ SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.7,
211
229
  SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
212
230
  SLASH_INACTIVITY_PENALTY: 2E+21,
213
231
  SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
@@ -218,5 +236,5 @@ export const mainnetConfig = {
218
236
  SLASH_UNKNOWN_PENALTY: 2E+21,
219
237
  SLASH_INVALID_BLOCK_PENALTY: 2E+21,
220
238
  SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2E+21,
221
- SLASH_GRACE_PERIOD_L2_SLOTS: 1200
239
+ SLASH_GRACE_PERIOD_L2_SLOTS: 8400
222
240
  };
@@ -1,4 +1,5 @@
1
1
  import { Fr } from '@aztec/foundation/curves/bn254';
2
+ import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
2
3
  import { EthAddress } from '@aztec/foundation/eth-address';
3
4
  import type { LogFn } from '@aztec/foundation/log';
4
5
  import type { PXE } from '@aztec/pxe/server';
@@ -20,7 +21,7 @@ export declare function addOptions(program: Command, options: Option[]): Command
20
21
  export declare const makeNodeOption: (mandatory: boolean) => Option;
21
22
  export declare const nodeOption: Option;
22
23
  export declare const l1ChainIdOption: Option;
23
- export declare const createSecretKeyOption: (description: string, mandatory: boolean, argsParser?: ((value: string, previous: Fr) => Fr) | undefined) => Option;
24
+ export declare const createSigningKeyOption: (description: string, mandatory: boolean, argsParser?: ((value: string, previous: import("@aztec/foundation/curves/bn254").Fq) => import("@aztec/foundation/curves/bn254").Fq) | undefined) => Option;
24
25
  export declare const logJson: (log: LogFn) => (obj: object) => void;
25
26
  /**
26
27
  * Updates a file in place atomically.
@@ -132,12 +133,12 @@ export declare function parsePublicKey(publicKey: string): PublicKeys | undefine
132
133
  */
133
134
  export declare function parsePartialAddress(address: string): Fr;
134
135
  /**
135
- * Parses a secret key from a string.
136
- * @param privateKey - A string
137
- * @returns A secret key
136
+ * Parses an account signing key from a string.
137
+ * @param signingKey - A string
138
+ * @returns A signing key
138
139
  * @throws InvalidArgumentError if the input string is not valid.
139
140
  */
140
- export declare function parseSecretKey(secretKey: string): Fr;
141
+ export declare function parseSigningKey(signingKey: string): GrumpkinScalar;
141
142
  /**
142
143
  * Parses a field from a string.
143
144
  * @param field - A string representing the field.
@@ -157,4 +158,4 @@ export declare function parseFields(fields: string[]): Fr[];
157
158
  * @returns A JSON string
158
159
  */
159
160
  export declare function prettyPrintJSON(data: Record<string, any>): string;
160
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tYW5kcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbEQsT0FBTyxFQUFFLEtBQUssT0FBTyxFQUF3QyxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFJdkYsT0FBTyxFQUFFLFNBQVMsRUFBRSxDQUFDO0FBRXJCOzs7R0FHRztBQUNILGVBQU8sTUFBTSxZQUFZLHVCQUdJLENBQUM7QUFFOUIsZUFBTyxNQUFNLFNBQVMsUUFBdUIsQ0FBQztBQUM5QyxlQUFPLE1BQVEsY0FBYyxVQUErQixXQUFXLHNCQUFFLFFBQVEsc0JBQUUsT0FBTyxzQkFBRSxXQUFXLG9CQUFnQixDQUFDO0FBRXhILHdCQUFnQixVQUFVLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBRzdEO0FBRUQsZUFBTyxNQUFNLGNBQWMsZ0NBSVEsQ0FBQztBQUVwQyxlQUFPLE1BQU0sVUFBVSxRQUF1QixDQUFDO0FB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
161
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tYW5kcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN2RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxTQUFTLEVBQUUsR0FBRyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRWxELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBd0MsTUFBTSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBSXZGLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQztBQUVyQjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sWUFBWSx1QkFHSSxDQUFDO0FBRTlCLGVBQU8sTUFBTSxTQUFTLFFBQXVCLENBQUM7QUFDOUMsZUFBTyxNQUFRLGNBQWMsVUFBK0IsV0FBVyxzQkFBRSxRQUFRLHNCQUFFLE9BQU8sc0JBQUUsV0FBVyxvQkFBZ0IsQ0FBQztBQUV4SCx3QkFBZ0IsVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUc3RDtBQUVELGVBQU8sTUFBTSxjQUFjLGdD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
@@ -1 +1 @@
1
- {"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { Fr } from '@aztec/foundation/curves/bn254';
2
+ import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
2
3
  import { EthAddress } from '@aztec/foundation/eth-address';
3
4
  import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
4
5
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -28,7 +29,7 @@ export const l1ChainIdOption = new Option('-c, --l1-chain-id <number>', 'Chain I
28
29
  }
29
30
  return parsedValue;
30
31
  });
31
- export const createSecretKeyOption = (description, mandatory, argsParser)=>new Option('-sk, --secret-key <string>', description).env('SECRET_KEY').argParser(argsParser ?? parseSecretKey).makeOptionMandatory(mandatory);
32
+ export const createSigningKeyOption = (description, mandatory, argsParser)=>new Option('-sk, --signing-key <string>', description).env('SIGNING_KEY').argParser(argsParser ?? parseSigningKey).makeOptionMandatory(mandatory);
32
33
  export const logJson = (log)=>(obj)=>log(JSON.stringify(obj, null, 2));
33
34
  /**
34
35
  * Updates a file in place atomically.
@@ -62,7 +63,7 @@ export const logJson = (log)=>(obj)=>log(JSON.stringify(obj, null, 2));
62
63
  let from;
63
64
  if (_from) {
64
65
  try {
65
- from = AztecAddress.fromString(_from);
66
+ from = AztecAddress.fromStringUnsafe(_from);
66
67
  } catch {
67
68
  throw new InvalidArgumentError(`Invalid option 'from' passed: ${_from}`);
68
69
  }
@@ -138,7 +139,7 @@ export function parseBigint(bigint) {
138
139
  * @throws InvalidArgumentError if the input string is not valid.
139
140
  */ export function parseAztecAddress(address) {
140
141
  try {
141
- return AztecAddress.fromString(address);
142
+ return AztecAddress.fromStringUnsafe(address);
142
143
  } catch {
143
144
  throw new InvalidArgumentError(`Invalid Aztec address: ${address}`);
144
145
  }
@@ -275,15 +276,15 @@ export function parseBigint(bigint) {
275
276
  }
276
277
  }
277
278
  /**
278
- * Parses a secret key from a string.
279
- * @param privateKey - A string
280
- * @returns A secret key
279
+ * Parses an account signing key from a string.
280
+ * @param signingKey - A string
281
+ * @returns A signing key
281
282
  * @throws InvalidArgumentError if the input string is not valid.
282
- */ export function parseSecretKey(secretKey) {
283
+ */ export function parseSigningKey(signingKey) {
283
284
  try {
284
- return Fr.fromHexString(secretKey);
285
+ return GrumpkinScalar.fromHexString(signingKey);
285
286
  } catch {
286
- throw new InvalidArgumentError(`Invalid encryption secret key: ${secretKey}`);
287
+ throw new InvalidArgumentError(`Invalid signing key: ${signingKey}`);
287
288
  }
288
289
  }
289
290
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "0.0.1-commit.2f68f620",
3
+ "version": "0.0.1-commit.321f6a9",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./contracts": "./dest/cmds/contracts/index.js",
@@ -77,23 +77,23 @@
77
77
  ]
78
78
  },
79
79
  "dependencies": {
80
- "@aztec/accounts": "0.0.1-commit.2f68f620",
81
- "@aztec/archiver": "0.0.1-commit.2f68f620",
82
- "@aztec/aztec.js": "0.0.1-commit.2f68f620",
83
- "@aztec/constants": "0.0.1-commit.2f68f620",
84
- "@aztec/entrypoints": "0.0.1-commit.2f68f620",
85
- "@aztec/ethereum": "0.0.1-commit.2f68f620",
86
- "@aztec/foundation": "0.0.1-commit.2f68f620",
87
- "@aztec/l1-artifacts": "0.0.1-commit.2f68f620",
88
- "@aztec/node-keystore": "0.0.1-commit.2f68f620",
89
- "@aztec/node-lib": "0.0.1-commit.2f68f620",
90
- "@aztec/p2p": "0.0.1-commit.2f68f620",
91
- "@aztec/protocol-contracts": "0.0.1-commit.2f68f620",
92
- "@aztec/sequencer-client": "0.0.1-commit.2f68f620",
93
- "@aztec/slasher": "0.0.1-commit.2f68f620",
94
- "@aztec/stdlib": "0.0.1-commit.2f68f620",
95
- "@aztec/wallets": "0.0.1-commit.2f68f620",
96
- "@aztec/world-state": "0.0.1-commit.2f68f620",
80
+ "@aztec/accounts": "0.0.1-commit.321f6a9",
81
+ "@aztec/archiver": "0.0.1-commit.321f6a9",
82
+ "@aztec/aztec.js": "0.0.1-commit.321f6a9",
83
+ "@aztec/constants": "0.0.1-commit.321f6a9",
84
+ "@aztec/entrypoints": "0.0.1-commit.321f6a9",
85
+ "@aztec/ethereum": "0.0.1-commit.321f6a9",
86
+ "@aztec/foundation": "0.0.1-commit.321f6a9",
87
+ "@aztec/l1-artifacts": "0.0.1-commit.321f6a9",
88
+ "@aztec/node-keystore": "0.0.1-commit.321f6a9",
89
+ "@aztec/node-lib": "0.0.1-commit.321f6a9",
90
+ "@aztec/p2p": "0.0.1-commit.321f6a9",
91
+ "@aztec/protocol-contracts": "0.0.1-commit.321f6a9",
92
+ "@aztec/sequencer-client": "0.0.1-commit.321f6a9",
93
+ "@aztec/slasher": "0.0.1-commit.321f6a9",
94
+ "@aztec/stdlib": "0.0.1-commit.321f6a9",
95
+ "@aztec/wallets": "0.0.1-commit.321f6a9",
96
+ "@aztec/world-state": "0.0.1-commit.321f6a9",
97
97
  "@ethersproject/wallet": "^5.8.0",
98
98
  "@iarna/toml": "^2.2.5",
99
99
  "@libp2p/peer-id-factory": "^3.0.4",
@@ -107,9 +107,9 @@
107
107
  "viem": "npm:@aztec/viem@2.38.2"
108
108
  },
109
109
  "devDependencies": {
110
- "@aztec/aztec-node": "0.0.1-commit.2f68f620",
111
- "@aztec/kv-store": "0.0.1-commit.2f68f620",
112
- "@aztec/telemetry-client": "0.0.1-commit.2f68f620",
110
+ "@aztec/aztec-node": "0.0.1-commit.321f6a9",
111
+ "@aztec/kv-store": "0.0.1-commit.321f6a9",
112
+ "@aztec/telemetry-client": "0.0.1-commit.321f6a9",
113
113
  "@jest/globals": "^30.0.0",
114
114
  "@types/jest": "^30.0.0",
115
115
  "@types/lodash.chunk": "^4.2.9",
@@ -126,15 +126,15 @@
126
126
  "typescript": "^5.3.3"
127
127
  },
128
128
  "peerDependencies": {
129
- "@aztec/accounts": "0.0.1-commit.2f68f620",
130
- "@aztec/bb-prover": "0.0.1-commit.2f68f620",
131
- "@aztec/ethereum": "0.0.1-commit.2f68f620",
132
- "@aztec/l1-artifacts": "0.0.1-commit.2f68f620",
133
- "@aztec/noir-contracts.js": "0.0.1-commit.2f68f620",
134
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.2f68f620",
135
- "@aztec/noir-test-contracts.js": "0.0.1-commit.2f68f620",
136
- "@aztec/protocol-contracts": "0.0.1-commit.2f68f620",
137
- "@aztec/stdlib": "0.0.1-commit.2f68f620"
129
+ "@aztec/accounts": "0.0.1-commit.321f6a9",
130
+ "@aztec/bb-prover": "0.0.1-commit.321f6a9",
131
+ "@aztec/ethereum": "0.0.1-commit.321f6a9",
132
+ "@aztec/l1-artifacts": "0.0.1-commit.321f6a9",
133
+ "@aztec/noir-contracts.js": "0.0.1-commit.321f6a9",
134
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.321f6a9",
135
+ "@aztec/noir-test-contracts.js": "0.0.1-commit.321f6a9",
136
+ "@aztec/protocol-contracts": "0.0.1-commit.321f6a9",
137
+ "@aztec/stdlib": "0.0.1-commit.321f6a9"
138
138
  },
139
139
  "files": [
140
140
  "dest",
@@ -8,7 +8,7 @@ import { jsonStringify } from '@aztec/foundation/json-rpc';
8
8
  import type { LogFn } from '@aztec/foundation/log';
9
9
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
10
10
  import { EmbeddedWallet } from '@aztec/wallets/embedded';
11
- import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
11
+ import { createFundedInitializerlessAccounts } from '@aztec/wallets/testing';
12
12
 
13
13
  export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn) {
14
14
  const waitOpts: WaitOpts = {
@@ -23,16 +23,16 @@ export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, j
23
23
  const node = createAztecNodeClient(nodeUrl);
24
24
  const wallet = await EmbeddedWallet.create(node);
25
25
 
26
- let deployedAccountManagers: AccountManager[] = [];
26
+ let accountManagers: AccountManager[] = [];
27
27
  if (testAccounts) {
28
- log('setupL2Contracts: Deploying test accounts...');
28
+ log('setupL2Contracts: Creating test accounts...');
29
29
  const initialAccountsData = await getInitialTestAccountsData();
30
- deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
30
+ accountManagers = await createFundedInitializerlessAccounts(wallet, initialAccountsData);
31
31
  }
32
32
 
33
33
  if (json) {
34
34
  const toPrint: Record<string, AztecAddress> = { ...ProtocolContractAddress };
35
- deployedAccountManagers.forEach((a, i) => {
35
+ accountManagers.forEach((a, i) => {
36
36
  toPrint[`testAccount${i}`] = a.address;
37
37
  });
38
38
  log(JSON.stringify(toPrint, null, 2));
@@ -33,8 +33,10 @@ export function injectCommands(program: Command, log: LogFn) {
33
33
  'Coinbase ETH address to use when proposing. Defaults to attester address.',
34
34
  parseEthereumAddress,
35
35
  )
36
- // TODO: add funding account back in when implemented
37
- // .option('--funding-account <privateKey|address>', 'ETH private key (or address for remote signer setup) to fund publishers')
36
+ .option(
37
+ '--funding-account <privateKey|address>',
38
+ 'ETH funding account used to top up publisher EOAs. Provide a private key, or an address together with --remote-signer.',
39
+ )
38
40
  .option('--remote-signer <url>', 'Default remote signer URL for accounts in this file')
39
41
  .option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', value => parseHex(value, 32))
40
42
  .option('--bls-path <path>', `EIP-2334 path (default ${defaultBlsPath})`)
@@ -99,8 +101,6 @@ export function injectCommands(program: Command, log: LogFn) {
99
101
  'Coinbase ETH address to use when proposing. Defaults to attester address.',
100
102
  parseEthereumAddress,
101
103
  )
102
- // TODO: add funding account back in when implemented
103
- // .option('--funding-account <privateKey|address>', 'ETH private key (or address for remote signer setup) to fund publishers')
104
104
  .option('--remote-signer <url>', 'Default remote signer URL for accounts in this file')
105
105
  .option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', value => parseHex(value, 32))
106
106
  .option('--bls-path <path>', `EIP-2334 path (default ${defaultBlsPath})`)
@@ -117,6 +117,32 @@ export function injectCommands(program: Command, log: LogFn) {
117
117
  await addValidatorKeys(existing, options, log);
118
118
  });
119
119
 
120
+ group
121
+ .command('set-funding-account')
122
+ .summary('Set the funding account of an existing keystore')
123
+ .description(
124
+ 'Sets the keystore-level ETH funding account used to top up publisher EOAs, replacing any existing one',
125
+ )
126
+ .argument('<existing>', 'Path to existing keystore JSON')
127
+ .argument(
128
+ '<privateKey|address>',
129
+ 'Funding account: a private key, or an address (needs --remote-signer unless the keystore already defines one)',
130
+ )
131
+ .option(
132
+ '--remote-signer <url>',
133
+ 'Remote signer URL for the funding account (required with an address unless the keystore already defines one)',
134
+ )
135
+ .option(
136
+ '--password <str>',
137
+ 'Password for writing the funding key as an encrypted ETH JSON V3 file. Empty string allowed',
138
+ )
139
+ .option('--encrypted-keystore-dir <dir>', 'Output directory for the encrypted funding key file')
140
+ .option('--json', 'Echo resulting JSON to stdout')
141
+ .action(async (existing: string, fundingAccount: string, options) => {
142
+ const { setFundingAccount } = await import('./set_funding_account.js');
143
+ await setFundingAccount(existing, fundingAccount, options, log);
144
+ });
145
+
120
146
  group
121
147
  .command('staker')
122
148
  .summary('Generate staking JSON from keystore')