@aztec/cli 0.0.1-commit.3469e52 → 0.0.1-commit.381b1a9
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/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 +4 -3
- package/dest/cmds/l1/assume_proven_through.d.ts +3 -2
- package/dest/cmds/l1/assume_proven_through.d.ts.map +1 -1
- package/dest/cmds/l1/assume_proven_through.js +3 -5
- package/dest/cmds/l1/compute_genesis_values.d.ts +4 -0
- package/dest/cmds/l1/compute_genesis_values.d.ts.map +1 -0
- package/dest/cmds/l1/compute_genesis_values.js +17 -0
- package/dest/cmds/l1/index.d.ts +1 -1
- package/dest/cmds/l1/index.d.ts.map +1 -1
- package/dest/cmds/l1/index.js +7 -2
- package/dest/cmds/l1/update_l1_validators.js +5 -5
- package/dest/config/cached_fetch.d.ts +19 -10
- package/dest/config/cached_fetch.d.ts.map +1 -1
- package/dest/config/cached_fetch.js +110 -32
- package/dest/config/generated/networks.d.ts +60 -41
- package/dest/config/generated/networks.d.ts.map +1 -1
- package/dest/config/generated/networks.js +60 -41
- 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 +6 -2
- package/dest/utils/inspect.d.ts +1 -1
- package/dest/utils/inspect.d.ts.map +1 -1
- package/dest/utils/inspect.js +4 -1
- package/package.json +30 -30
- package/src/cmds/infrastructure/setup_l2_contract.ts +5 -4
- package/src/cmds/l1/assume_proven_through.ts +4 -7
- package/src/cmds/l1/compute_genesis_values.ts +29 -0
- package/src/cmds/l1/index.ts +23 -4
- package/src/cmds/l1/update_l1_validators.ts +5 -5
- package/src/config/cached_fetch.ts +119 -31
- package/src/config/generated/networks.ts +59 -40
- package/src/config/network_config.ts +6 -2
- package/src/utils/inspect.ts +4 -1
|
@@ -2,7 +2,7 @@
|
|
|
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:
|
|
5
|
+
AZTEC_SLOT_DURATION: 72,
|
|
6
6
|
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
7
7
|
AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
|
|
8
8
|
AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
|
|
@@ -12,6 +12,7 @@ export const devnetConfig = {
|
|
|
12
12
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
13
13
|
AZTEC_MANA_TARGET: 100000000,
|
|
14
14
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
15
|
+
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
15
16
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
16
17
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
17
18
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
@@ -29,8 +30,10 @@ export const devnetConfig = {
|
|
|
29
30
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
30
31
|
P2P_ENABLED: true,
|
|
31
32
|
BOOTSTRAP_NODES: '',
|
|
32
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
33
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
33
34
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
35
|
+
SEQ_BLOCK_DURATION_MS: 6000,
|
|
36
|
+
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
34
37
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
35
38
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
36
39
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -46,7 +49,7 @@ export const devnetConfig = {
|
|
|
46
49
|
TEST_ACCOUNTS: true,
|
|
47
50
|
SPONSORED_FPC: true,
|
|
48
51
|
TRANSACTIONS_DISABLED: false,
|
|
49
|
-
SEQ_MAX_TX_PER_BLOCK:
|
|
52
|
+
SEQ_MAX_TX_PER_BLOCK: 18,
|
|
50
53
|
PROVER_REAL_PROOFS: false,
|
|
51
54
|
PXE_PROVER_ENABLED: false,
|
|
52
55
|
SYNC_SNAPSHOTS_URLS: '',
|
|
@@ -54,8 +57,6 @@ export const devnetConfig = {
|
|
|
54
57
|
BLOB_ALLOW_EMPTY_SOURCES: false,
|
|
55
58
|
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
56
59
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: false,
|
|
57
|
-
AUTO_UPDATE: 'none',
|
|
58
|
-
AUTO_UPDATE_URL: '',
|
|
59
60
|
PUBLIC_OTEL_OPT_OUT: true,
|
|
60
61
|
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
61
62
|
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
@@ -65,29 +66,29 @@ export const devnetConfig = {
|
|
|
65
66
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
|
|
66
67
|
SLASH_INACTIVITY_PENALTY: 10000000000000000000,
|
|
67
68
|
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
|
|
69
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
|
|
70
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
|
|
68
71
|
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
|
|
69
72
|
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
70
73
|
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
71
|
-
SLASH_GRACE_PERIOD_L2_SLOTS: 0
|
|
74
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 0,
|
|
75
|
+
ENABLE_VERSION_CHECK: true
|
|
72
76
|
};
|
|
73
77
|
export const testnetConfig = {
|
|
74
78
|
ETHEREUM_SLOT_DURATION: 12,
|
|
75
79
|
AZTEC_EPOCH_DURATION: 32,
|
|
76
80
|
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
77
81
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
78
|
-
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:
|
|
82
|
+
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
|
|
79
83
|
AZTEC_EXIT_DELAY_SECONDS: 172800,
|
|
80
84
|
AZTEC_INBOX_LAG: 1,
|
|
81
85
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
82
|
-
|
|
86
|
+
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
83
87
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
84
88
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
85
89
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
86
90
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
87
91
|
AZTEC_SLASHING_DISABLE_DURATION: 432000,
|
|
88
|
-
AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
|
|
89
|
-
AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
|
|
90
|
-
AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
|
|
91
92
|
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
92
93
|
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
93
94
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
@@ -95,8 +96,10 @@ export const testnetConfig = {
|
|
|
95
96
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
96
97
|
P2P_ENABLED: true,
|
|
97
98
|
BOOTSTRAP_NODES: '',
|
|
98
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
99
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
99
100
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
101
|
+
SEQ_BLOCK_DURATION_MS: 6000,
|
|
102
|
+
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
100
103
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
101
104
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
102
105
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -113,32 +116,42 @@ export const testnetConfig = {
|
|
|
113
116
|
AZTEC_SLASHING_QUORUM: 33,
|
|
114
117
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
|
|
115
118
|
AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
|
|
116
|
-
AZTEC_MANA_TARGET:
|
|
119
|
+
AZTEC_MANA_TARGET: 75000000,
|
|
120
|
+
AZTEC_PROVING_COST_PER_MANA: 25000000,
|
|
121
|
+
AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
|
|
122
|
+
AZTEC_SLASH_AMOUNT_MEDIUM: 1E+23,
|
|
123
|
+
AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
|
|
117
124
|
L1_CHAIN_ID: 11155111,
|
|
118
125
|
TEST_ACCOUNTS: false,
|
|
119
|
-
SPONSORED_FPC:
|
|
126
|
+
SPONSORED_FPC: false,
|
|
120
127
|
TRANSACTIONS_DISABLED: false,
|
|
121
|
-
|
|
128
|
+
SEQ_MAX_TX_PER_CHECKPOINT: 72,
|
|
122
129
|
PROVER_REAL_PROOFS: true,
|
|
130
|
+
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
123
131
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
124
|
-
SLASH_PRUNE_PENALTY:
|
|
125
|
-
SLASH_DATA_WITHHOLDING_PENALTY:
|
|
126
|
-
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.
|
|
127
|
-
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD:
|
|
128
|
-
SLASH_INACTIVITY_PENALTY:
|
|
129
|
-
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY:
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
132
|
+
SLASH_PRUNE_PENALTY: 0,
|
|
133
|
+
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
134
|
+
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.7,
|
|
135
|
+
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
|
|
136
|
+
SLASH_INACTIVITY_PENALTY: 1E+23,
|
|
137
|
+
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 1E+23,
|
|
138
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 0,
|
|
139
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 0,
|
|
140
|
+
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 1E+23,
|
|
141
|
+
SLASH_UNKNOWN_PENALTY: 1E+23,
|
|
142
|
+
SLASH_INVALID_BLOCK_PENALTY: 1E+23,
|
|
143
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 3600,
|
|
144
|
+
ENABLE_VERSION_CHECK: true
|
|
134
145
|
};
|
|
135
146
|
export const mainnetConfig = {
|
|
136
147
|
ETHEREUM_SLOT_DURATION: 12,
|
|
137
148
|
AZTEC_EPOCH_DURATION: 32,
|
|
149
|
+
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
138
150
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
139
|
-
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:
|
|
151
|
+
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
|
|
140
152
|
AZTEC_INBOX_LAG: 1,
|
|
141
153
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
154
|
+
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
142
155
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
143
156
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
144
157
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
@@ -149,8 +162,10 @@ export const mainnetConfig = {
|
|
|
149
162
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
150
163
|
P2P_ENABLED: true,
|
|
151
164
|
BOOTSTRAP_NODES: '',
|
|
152
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
165
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
153
166
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
167
|
+
SEQ_BLOCK_DURATION_MS: 6000,
|
|
168
|
+
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
154
169
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
155
170
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
156
171
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -159,10 +174,9 @@ export const mainnetConfig = {
|
|
|
159
174
|
PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
|
|
160
175
|
SENTINEL_ENABLED: true,
|
|
161
176
|
AZTEC_SLOT_DURATION: 72,
|
|
162
|
-
AZTEC_TARGET_COMMITTEE_SIZE: 24,
|
|
163
177
|
AZTEC_ACTIVATION_THRESHOLD: 2E+23,
|
|
164
178
|
AZTEC_EJECTION_THRESHOLD: 1E+23,
|
|
165
|
-
AZTEC_LOCAL_EJECTION_THRESHOLD: 1.
|
|
179
|
+
AZTEC_LOCAL_EJECTION_THRESHOLD: 1.9E+23,
|
|
166
180
|
AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
|
|
167
181
|
AZTEC_SLASH_AMOUNT_MEDIUM: 2E+21,
|
|
168
182
|
AZTEC_SLASH_AMOUNT_LARGE: 2E+21,
|
|
@@ -172,32 +186,37 @@ export const mainnetConfig = {
|
|
|
172
186
|
AZTEC_SLASHING_QUORUM: 65,
|
|
173
187
|
AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
|
|
174
188
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
|
|
175
|
-
AZTEC_MANA_TARGET:
|
|
176
|
-
AZTEC_PROVING_COST_PER_MANA:
|
|
189
|
+
AZTEC_MANA_TARGET: 75000000,
|
|
190
|
+
AZTEC_PROVING_COST_PER_MANA: 25000000,
|
|
177
191
|
AZTEC_EXIT_DELAY_SECONDS: 345600,
|
|
178
192
|
AZTEC_SLASHING_DISABLE_DURATION: 259200,
|
|
193
|
+
AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
|
|
194
|
+
AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 500,
|
|
195
|
+
AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 1,
|
|
196
|
+
AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 400,
|
|
197
|
+
AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 4,
|
|
179
198
|
L1_CHAIN_ID: 1,
|
|
180
199
|
TEST_ACCOUNTS: false,
|
|
181
200
|
SPONSORED_FPC: false,
|
|
182
|
-
TRANSACTIONS_DISABLED:
|
|
183
|
-
|
|
201
|
+
TRANSACTIONS_DISABLED: false,
|
|
202
|
+
SEQ_MAX_TX_PER_CHECKPOINT: 72,
|
|
184
203
|
PROVER_REAL_PROOFS: true,
|
|
185
|
-
SYNC_SNAPSHOTS_URLS: 'https://aztec-labs-snapshots.com/mainnet/',
|
|
186
204
|
BLOB_ALLOW_EMPTY_SOURCES: true,
|
|
187
|
-
P2P_MAX_PENDING_TX_COUNT:
|
|
205
|
+
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
188
206
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
PUBLIC_OTEL_COLLECT_FROM: 'sequencer',
|
|
207
|
+
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
208
|
+
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
209
|
+
ENABLE_VERSION_CHECK: false,
|
|
193
210
|
SLASH_PRUNE_PENALTY: 0,
|
|
194
211
|
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
195
|
-
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.
|
|
212
|
+
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.7,
|
|
196
213
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
|
|
197
214
|
SLASH_INACTIVITY_PENALTY: 2E+21,
|
|
198
215
|
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
|
|
216
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 0,
|
|
217
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 0,
|
|
199
218
|
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2E+21,
|
|
200
219
|
SLASH_UNKNOWN_PENALTY: 2E+21,
|
|
201
220
|
SLASH_INVALID_BLOCK_PENALTY: 2E+21,
|
|
202
|
-
SLASH_GRACE_PERIOD_L2_SLOTS:
|
|
221
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 8400
|
|
203
222
|
};
|
|
@@ -19,4 +19,4 @@ export declare function getNetworkConfig(networkName: NetworkNames, cacheDir?: s
|
|
|
19
19
|
* Does not throw if the network simply doesn't exist in the config - just returns without enriching
|
|
20
20
|
*/
|
|
21
21
|
export declare function enrichEnvironmentWithNetworkConfig(networkName: NetworkNames): Promise<void>;
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvbmV0d29ya19jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEwQixLQUFLLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBWXpHOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxXQUFXLEVBQUUsWUFBWSxFQUN6QixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBOEJwQztBQXNERDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsWUFBWSxpQkFpQ2pGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYzG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAsDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBAiCjF"}
|
|
@@ -5,7 +5,6 @@ import { cachedFetch } from './cached_fetch.js';
|
|
|
5
5
|
import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
|
|
6
6
|
const DEFAULT_CONFIG_URL = 'https://raw.githubusercontent.com/AztecProtocol/networks/refs/heads/main/network_config.json';
|
|
7
7
|
const FALLBACK_CONFIG_URL = 'https://metadata.aztec.network/network_config.json';
|
|
8
|
-
const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
|
|
9
8
|
/**
|
|
10
9
|
* Fetches remote network configuration from GitHub with caching support.
|
|
11
10
|
* Uses the reusable cachedFetch utility. Falls back to metadata.aztec.network if the default URL fails.
|
|
@@ -64,7 +63,6 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
|
|
|
64
63
|
let rawConfig;
|
|
65
64
|
if (url.protocol === 'http:' || url.protocol === 'https:') {
|
|
66
65
|
rawConfig = await cachedFetch(url.href, {
|
|
67
|
-
cacheDurationMs: NETWORK_CONFIG_CACHE_DURATION_MS,
|
|
68
66
|
cacheFile: cacheDir ? join(cacheDir, networkName, 'network_config.json') : undefined
|
|
69
67
|
});
|
|
70
68
|
} else if (url.protocol === 'file:') {
|
|
@@ -109,7 +107,13 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
|
|
|
109
107
|
if (networkConfig.blobFileStoreUrls?.length) {
|
|
110
108
|
enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
|
|
111
109
|
}
|
|
110
|
+
if (networkConfig.txCollectionFileStoreUrls?.length) {
|
|
111
|
+
enrichVar('TX_COLLECTION_FILE_STORE_URLS', networkConfig.txCollectionFileStoreUrls.join(','));
|
|
112
|
+
}
|
|
112
113
|
if (networkConfig.blockDurationMs !== undefined) {
|
|
113
114
|
enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
|
|
114
115
|
}
|
|
116
|
+
if (networkConfig.txPublicSetupAllowListExtend) {
|
|
117
|
+
enrichVar('TX_PUBLIC_SETUP_ALLOWLIST', networkConfig.txPublicSetupAllowListExtend);
|
|
118
|
+
}
|
|
115
119
|
}
|
package/dest/utils/inspect.d.ts
CHANGED
|
@@ -8,4 +8,4 @@ export declare function inspectBlock(aztecNode: AztecNode, blockNumber: BlockNum
|
|
|
8
8
|
export declare function inspectTx(aztecNode: AztecNode, txHash: TxHash, log: LogFn, opts?: {
|
|
9
9
|
includeBlockInfo?: boolean;
|
|
10
10
|
}): Promise<void>;
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zcGVjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2luc3BlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHdCQUFzQixZQUFZLENBQ2hDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLEdBQUcsRUFBRSxLQUFLLEVBQ1YsSUFBSSxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQU8saUJBMEJqQztBQUVELHdCQUFzQixTQUFTLENBQzdCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsR0FBRyxFQUFFLEtBQUssRUFDVixJQUFJLEdBQUU7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFPLGlCQXNFMUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0BjC;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,
|
|
1
|
+
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0BjC;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,iBAsE1C"}
|
package/dest/utils/inspect.js
CHANGED
|
@@ -30,7 +30,10 @@ export async function inspectTx(aztecNode, txHash, log, opts = {}) {
|
|
|
30
30
|
]);
|
|
31
31
|
// Base tx data
|
|
32
32
|
log(`Tx ${txHash.toString()}`);
|
|
33
|
-
log(` Status: ${receipt.status}
|
|
33
|
+
log(` Status: ${receipt.status}`);
|
|
34
|
+
if (receipt.executionResult) {
|
|
35
|
+
log(` Execution result: ${receipt.executionResult}`);
|
|
36
|
+
}
|
|
34
37
|
if (receipt.error) {
|
|
35
38
|
log(` Error: ${receipt.error}`);
|
|
36
39
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.381b1a9",
|
|
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.
|
|
81
|
-
"@aztec/archiver": "0.0.1-commit.
|
|
82
|
-
"@aztec/aztec.js": "0.0.1-commit.
|
|
83
|
-
"@aztec/constants": "0.0.1-commit.
|
|
84
|
-
"@aztec/entrypoints": "0.0.1-commit.
|
|
85
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
86
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
87
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
88
|
-
"@aztec/node-keystore": "0.0.1-commit.
|
|
89
|
-
"@aztec/node-lib": "0.0.1-commit.
|
|
90
|
-
"@aztec/p2p": "0.0.1-commit.
|
|
91
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
92
|
-
"@aztec/sequencer-client": "0.0.1-commit.
|
|
93
|
-
"@aztec/slasher": "0.0.1-commit.
|
|
94
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
95
|
-
"@aztec/
|
|
96
|
-
"@aztec/world-state": "0.0.1-commit.
|
|
80
|
+
"@aztec/accounts": "0.0.1-commit.381b1a9",
|
|
81
|
+
"@aztec/archiver": "0.0.1-commit.381b1a9",
|
|
82
|
+
"@aztec/aztec.js": "0.0.1-commit.381b1a9",
|
|
83
|
+
"@aztec/constants": "0.0.1-commit.381b1a9",
|
|
84
|
+
"@aztec/entrypoints": "0.0.1-commit.381b1a9",
|
|
85
|
+
"@aztec/ethereum": "0.0.1-commit.381b1a9",
|
|
86
|
+
"@aztec/foundation": "0.0.1-commit.381b1a9",
|
|
87
|
+
"@aztec/l1-artifacts": "0.0.1-commit.381b1a9",
|
|
88
|
+
"@aztec/node-keystore": "0.0.1-commit.381b1a9",
|
|
89
|
+
"@aztec/node-lib": "0.0.1-commit.381b1a9",
|
|
90
|
+
"@aztec/p2p": "0.0.1-commit.381b1a9",
|
|
91
|
+
"@aztec/protocol-contracts": "0.0.1-commit.381b1a9",
|
|
92
|
+
"@aztec/sequencer-client": "0.0.1-commit.381b1a9",
|
|
93
|
+
"@aztec/slasher": "0.0.1-commit.381b1a9",
|
|
94
|
+
"@aztec/stdlib": "0.0.1-commit.381b1a9",
|
|
95
|
+
"@aztec/wallets": "0.0.1-commit.381b1a9",
|
|
96
|
+
"@aztec/world-state": "0.0.1-commit.381b1a9",
|
|
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.
|
|
111
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
112
|
-
"@aztec/telemetry-client": "0.0.1-commit.
|
|
110
|
+
"@aztec/aztec-node": "0.0.1-commit.381b1a9",
|
|
111
|
+
"@aztec/kv-store": "0.0.1-commit.381b1a9",
|
|
112
|
+
"@aztec/telemetry-client": "0.0.1-commit.381b1a9",
|
|
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.
|
|
130
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
131
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
132
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
133
|
-
"@aztec/noir-contracts.js": "0.0.1-commit.
|
|
134
|
-
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.
|
|
135
|
-
"@aztec/noir-test-contracts.js": "0.0.1-commit.
|
|
136
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
137
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
129
|
+
"@aztec/accounts": "0.0.1-commit.381b1a9",
|
|
130
|
+
"@aztec/bb-prover": "0.0.1-commit.381b1a9",
|
|
131
|
+
"@aztec/ethereum": "0.0.1-commit.381b1a9",
|
|
132
|
+
"@aztec/l1-artifacts": "0.0.1-commit.381b1a9",
|
|
133
|
+
"@aztec/noir-contracts.js": "0.0.1-commit.381b1a9",
|
|
134
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.381b1a9",
|
|
135
|
+
"@aztec/noir-test-contracts.js": "0.0.1-commit.381b1a9",
|
|
136
|
+
"@aztec/protocol-contracts": "0.0.1-commit.381b1a9",
|
|
137
|
+
"@aztec/stdlib": "0.0.1-commit.381b1a9"
|
|
138
138
|
},
|
|
139
139
|
"files": [
|
|
140
140
|
"dest",
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
2
|
-
import
|
|
2
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
3
3
|
import type { WaitOpts } from '@aztec/aztec.js/contracts';
|
|
4
4
|
import { createAztecNodeClient } from '@aztec/aztec.js/node';
|
|
5
5
|
import { AccountManager } from '@aztec/aztec.js/wallet';
|
|
6
6
|
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
7
7
|
import type { LogFn } from '@aztec/foundation/log';
|
|
8
8
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
9
|
-
import {
|
|
9
|
+
import { EmbeddedWallet } from '@aztec/wallets/embedded';
|
|
10
|
+
import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
|
|
10
11
|
|
|
11
12
|
export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn) {
|
|
12
13
|
const waitOpts: WaitOpts = {
|
|
@@ -16,13 +17,13 @@ export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, j
|
|
|
16
17
|
log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
|
|
17
18
|
log('setupL2Contracts: Creating PXE client...');
|
|
18
19
|
const node = createAztecNodeClient(nodeUrl);
|
|
19
|
-
const wallet = await
|
|
20
|
+
const wallet = await EmbeddedWallet.create(node);
|
|
20
21
|
|
|
21
22
|
let deployedAccountManagers: AccountManager[] = [];
|
|
22
23
|
if (testAccounts) {
|
|
23
24
|
log('setupL2Contracts: Deploying test accounts...');
|
|
24
25
|
const initialAccountsData = await getInitialTestAccountsData();
|
|
25
|
-
deployedAccountManagers = await deployFundedSchnorrAccounts(wallet,
|
|
26
|
+
deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
if (json) {
|
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
import { createAztecNodeClient } from '@aztec/aztec.js/node';
|
|
2
2
|
import { RollupCheatCodes } from '@aztec/ethereum/test';
|
|
3
|
-
import {
|
|
3
|
+
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
4
4
|
import type { LogFn } from '@aztec/foundation/log';
|
|
5
5
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
6
6
|
|
|
7
7
|
export async function assumeProvenThrough(
|
|
8
|
-
|
|
8
|
+
checkpointOrLatest: CheckpointNumber | undefined,
|
|
9
9
|
l1RpcUrls: string[],
|
|
10
10
|
nodeUrl: string,
|
|
11
11
|
log: LogFn,
|
|
12
12
|
) {
|
|
13
13
|
const aztecNode = createAztecNodeClient(nodeUrl);
|
|
14
14
|
const rollupAddress = await aztecNode.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
|
|
15
|
-
const blockNumber: BlockNumber = blockNumberOrLatest
|
|
16
|
-
? BlockNumber(blockNumberOrLatest)
|
|
17
|
-
: await aztecNode.getBlockNumber();
|
|
18
15
|
|
|
19
16
|
const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, { rollupAddress }, new DateProvider());
|
|
20
17
|
|
|
21
|
-
await rollupCheatCodes.markAsProven(
|
|
22
|
-
log(`Assumed proven through
|
|
18
|
+
await rollupCheatCodes.markAsProven(checkpointOrLatest);
|
|
19
|
+
log(`Assumed proven through checkpoint ${checkpointOrLatest ?? 'latest'}`);
|
|
23
20
|
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
2
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
3
|
+
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
4
|
+
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
5
|
+
|
|
6
|
+
import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
|
|
7
|
+
|
|
8
|
+
/** Computes and prints genesis values needed for L1 contract deployment. */
|
|
9
|
+
export async function computeGenesisValuesCmd(testAccounts: boolean, sponsoredFPC: boolean, log: LogFn) {
|
|
10
|
+
const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
|
|
11
|
+
const sponsoredFPCAddresses = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
12
|
+
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddresses);
|
|
13
|
+
const { genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);
|
|
14
|
+
|
|
15
|
+
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
16
|
+
const vkTreeRoot = getVKTreeRoot();
|
|
17
|
+
|
|
18
|
+
log(
|
|
19
|
+
JSON.stringify(
|
|
20
|
+
{
|
|
21
|
+
vkTreeRoot: vkTreeRoot.toString(),
|
|
22
|
+
protocolContractsHash: protocolContractsHash.toString(),
|
|
23
|
+
genesisArchiveRoot: genesisArchiveRoot.toString(),
|
|
24
|
+
},
|
|
25
|
+
null,
|
|
26
|
+
2,
|
|
27
|
+
),
|
|
28
|
+
);
|
|
29
|
+
}
|
package/src/cmds/l1/index.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
1
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
3
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
3
4
|
|
|
@@ -105,6 +106,24 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
|
|
|
105
106
|
);
|
|
106
107
|
});
|
|
107
108
|
|
|
109
|
+
program
|
|
110
|
+
.command('compute-genesis-values')
|
|
111
|
+
.description('Computes genesis values (VK tree root, protocol contracts hash, genesis archive root).')
|
|
112
|
+
.addOption(
|
|
113
|
+
new Option('--test-accounts <boolean>', 'Include initial test accounts in genesis state')
|
|
114
|
+
.env('TEST_ACCOUNTS')
|
|
115
|
+
.argParser(arg => arg === 'true'),
|
|
116
|
+
)
|
|
117
|
+
.addOption(
|
|
118
|
+
new Option('--sponsored-fpc <boolean>', 'Include sponsored FPC contract in genesis state')
|
|
119
|
+
.env('SPONSORED_FPC')
|
|
120
|
+
.argParser(arg => arg === 'true'),
|
|
121
|
+
)
|
|
122
|
+
.action(async options => {
|
|
123
|
+
const { computeGenesisValuesCmd } = await import('./compute_genesis_values.js');
|
|
124
|
+
await computeGenesisValuesCmd(options.testAccounts, options.sponsoredFpc, log);
|
|
125
|
+
});
|
|
126
|
+
|
|
108
127
|
program
|
|
109
128
|
.command('deposit-governance-tokens')
|
|
110
129
|
.description('Deposits governance tokens to the governance contract.')
|
|
@@ -497,14 +516,14 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
|
|
|
497
516
|
program
|
|
498
517
|
.command('set-proven-through', { hidden: true })
|
|
499
518
|
.description(
|
|
500
|
-
'Instructs the L1 rollup contract to assume all blocks until the given
|
|
519
|
+
'Instructs the L1 rollup contract to assume all blocks until the given checkpoint are automatically proven.',
|
|
501
520
|
)
|
|
502
|
-
.argument('[
|
|
521
|
+
.argument('[checkpoint]', 'The target checkpoint, defaults to the latest pending checkpoint.', parseBigint)
|
|
503
522
|
.addOption(l1RpcUrlsOption)
|
|
504
523
|
.addOption(nodeOption)
|
|
505
|
-
.action(async (
|
|
524
|
+
.action(async (checkpoint, options) => {
|
|
506
525
|
const { assumeProvenThrough } = await import('./assume_proven_through.js');
|
|
507
|
-
await assumeProvenThrough(
|
|
526
|
+
await assumeProvenThrough(CheckpointNumber.fromBigInt(checkpoint), options.l1RpcUrls, options.nodeUrl, log);
|
|
508
527
|
});
|
|
509
528
|
|
|
510
529
|
program
|
|
@@ -2,7 +2,7 @@ import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
|
|
|
2
2
|
import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
|
|
3
3
|
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
4
4
|
import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
|
|
5
|
-
import {
|
|
5
|
+
import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
|
|
6
6
|
import { EthCheatCodes } from '@aztec/ethereum/test';
|
|
7
7
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
8
8
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
@@ -88,7 +88,7 @@ export async function addL1Validator({
|
|
|
88
88
|
const gse = new GSEContract(l1Client, gseAddress);
|
|
89
89
|
const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
|
|
90
90
|
|
|
91
|
-
const l1TxUtils =
|
|
91
|
+
const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
|
|
92
92
|
const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
|
|
93
93
|
|
|
94
94
|
// Step 1: Claim STK tokens from the faucet
|
|
@@ -194,7 +194,7 @@ export async function addL1ValidatorViaRollup({
|
|
|
194
194
|
|
|
195
195
|
const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
|
|
196
196
|
|
|
197
|
-
const l1TxUtils =
|
|
197
|
+
const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
|
|
198
198
|
|
|
199
199
|
const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
|
|
200
200
|
to: rollupAddress.toString(),
|
|
@@ -241,7 +241,7 @@ export async function removeL1Validator({
|
|
|
241
241
|
const account = getAccount(privateKey, mnemonic);
|
|
242
242
|
const chain = createEthereumChain(rpcUrls, chainId);
|
|
243
243
|
const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
|
|
244
|
-
const l1TxUtils =
|
|
244
|
+
const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
|
|
245
245
|
|
|
246
246
|
dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
|
|
247
247
|
const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
|
|
@@ -268,7 +268,7 @@ export async function pruneRollup({
|
|
|
268
268
|
const account = getAccount(privateKey, mnemonic);
|
|
269
269
|
const chain = createEthereumChain(rpcUrls, chainId);
|
|
270
270
|
const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
|
|
271
|
-
const l1TxUtils =
|
|
271
|
+
const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
|
|
272
272
|
|
|
273
273
|
dualLog(`Trying prune`);
|
|
274
274
|
const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
|