@aztec/stdlib 0.0.1-commit.3e3d0c9cd → 0.0.1-commit.3f5453c7b
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/abi/abi.d.ts +138 -1
- package/dest/abi/abi.d.ts.map +1 -1
- package/dest/abi/abi.js +10 -2
- package/dest/abi/buffer.d.ts +14 -4
- package/dest/abi/buffer.d.ts.map +1 -1
- package/dest/abi/buffer.js +25 -4
- package/dest/abi/decoder.d.ts +5 -44
- package/dest/abi/decoder.d.ts.map +1 -1
- package/dest/abi/decoder.js +12 -67
- package/dest/abi/function_selector.js +1 -1
- package/dest/abi/function_signature_decoder.d.ts +43 -0
- package/dest/abi/function_signature_decoder.d.ts.map +1 -0
- package/dest/abi/function_signature_decoder.js +66 -0
- package/dest/abi/index.d.ts +2 -1
- package/dest/abi/index.d.ts.map +1 -1
- package/dest/abi/index.js +1 -0
- package/dest/abi/selector.d.ts +2 -2
- package/dest/abi/selector.d.ts.map +1 -1
- package/dest/abi/selector.js +1 -1
- package/dest/avm/revert_code.d.ts +8 -18
- package/dest/avm/revert_code.d.ts.map +1 -1
- package/dest/avm/revert_code.js +15 -30
- package/dest/block/l2_block_source.d.ts +84 -5
- package/dest/block/l2_block_source.d.ts.map +1 -1
- package/dest/block/l2_block_source.js +1 -0
- package/dest/block/l2_block_stream/l2_tips_store_base.d.ts +1 -1
- package/dest/block/l2_block_stream/l2_tips_store_base.d.ts.map +1 -1
- package/dest/block/l2_block_stream/l2_tips_store_base.js +17 -4
- package/dest/block/test/l2_tips_store_test_suite.d.ts +1 -1
- package/dest/block/test/l2_tips_store_test_suite.d.ts.map +1 -1
- package/dest/block/test/l2_tips_store_test_suite.js +3 -2
- package/dest/checkpoint/checkpoint.d.ts +7 -1
- package/dest/checkpoint/checkpoint.d.ts.map +1 -1
- package/dest/checkpoint/checkpoint.js +9 -1
- package/dest/checkpoint/checkpoint_data.d.ts +71 -5
- package/dest/checkpoint/checkpoint_data.d.ts.map +1 -1
- package/dest/checkpoint/checkpoint_data.js +10 -0
- package/dest/checkpoint/validate.js +2 -2
- package/dest/config/index.d.ts +2 -1
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +1 -0
- package/dest/config/pipelining-config.d.ts +19 -0
- package/dest/config/pipelining-config.d.ts.map +1 -0
- package/dest/config/pipelining-config.js +18 -0
- package/dest/config/sequencer-config.d.ts +2 -2
- package/dest/config/sequencer-config.d.ts.map +1 -1
- package/dest/config/sequencer-config.js +7 -0
- package/dest/contract/contract_address.d.ts +3 -3
- package/dest/contract/contract_address.js +3 -3
- package/dest/contract/contract_class_id.d.ts +2 -2
- package/dest/contract/contract_class_id.js +2 -2
- package/dest/contract/index.d.ts +1 -3
- package/dest/contract/index.d.ts.map +1 -1
- package/dest/contract/index.js +0 -2
- package/dest/contract/interfaces/contract_class.d.ts +3 -156
- package/dest/contract/interfaces/contract_class.d.ts.map +1 -1
- package/dest/contract/interfaces/contract_class.js +1 -28
- package/dest/epoch-helpers/index.d.ts +7 -1
- package/dest/epoch-helpers/index.d.ts.map +1 -1
- package/dest/epoch-helpers/index.js +12 -0
- package/dest/file-store/factory.d.ts +4 -3
- package/dest/file-store/factory.d.ts.map +1 -1
- package/dest/file-store/factory.js +2 -2
- package/dest/file-store/http.d.ts +9 -2
- package/dest/file-store/http.d.ts.map +1 -1
- package/dest/file-store/http.js +20 -9
- package/dest/file-store/index.d.ts +2 -1
- package/dest/file-store/index.d.ts.map +1 -1
- package/dest/gas/fee_math.d.ts +49 -0
- package/dest/gas/fee_math.d.ts.map +1 -0
- package/dest/gas/fee_math.js +80 -0
- package/dest/gas/gas_fees.d.ts +1 -1
- package/dest/gas/gas_fees.d.ts.map +1 -1
- package/dest/gas/gas_fees.js +10 -1
- package/dest/gas/gas_settings.d.ts +40 -3
- package/dest/gas/gas_settings.d.ts.map +1 -1
- package/dest/gas/gas_settings.js +50 -6
- package/dest/gas/index.d.ts +2 -1
- package/dest/gas/index.d.ts.map +1 -1
- package/dest/gas/index.js +1 -0
- package/dest/hash/hash.d.ts +19 -1
- package/dest/hash/hash.d.ts.map +1 -1
- package/dest/hash/hash.js +29 -0
- package/dest/interfaces/archiver.d.ts +1 -1
- package/dest/interfaces/archiver.d.ts.map +1 -1
- package/dest/interfaces/archiver.js +3 -1
- package/dest/interfaces/aztec-node-admin.d.ts +4 -17
- package/dest/interfaces/aztec-node-admin.d.ts.map +1 -1
- package/dest/interfaces/aztec-node-admin.js +3 -3
- package/dest/interfaces/aztec-node-debug.d.ts +21 -0
- package/dest/interfaces/aztec-node-debug.d.ts.map +1 -0
- package/dest/interfaces/aztec-node-debug.js +18 -0
- package/dest/interfaces/aztec-node.d.ts +10 -1
- package/dest/interfaces/aztec-node.d.ts.map +1 -1
- package/dest/interfaces/aztec-node.js +2 -0
- package/dest/interfaces/block-builder.d.ts +26 -7
- package/dest/interfaces/block-builder.d.ts.map +1 -1
- package/dest/interfaces/block-builder.js +1 -4
- package/dest/interfaces/client.d.ts +2 -1
- package/dest/interfaces/client.d.ts.map +1 -1
- package/dest/interfaces/client.js +1 -0
- package/dest/interfaces/configs.d.ts +2 -7
- package/dest/interfaces/configs.d.ts.map +1 -1
- package/dest/interfaces/configs.js +0 -1
- package/dest/interfaces/proving-job.d.ts +200 -200
- package/dest/interfaces/slasher.d.ts +1 -10
- package/dest/interfaces/slasher.d.ts.map +1 -1
- package/dest/interfaces/slasher.js +0 -2
- package/dest/interfaces/validator.d.ts +4 -15
- package/dest/interfaces/validator.d.ts.map +1 -1
- package/dest/interfaces/validator.js +0 -1
- package/dest/l1-contracts/index.d.ts +2 -2
- package/dest/l1-contracts/index.d.ts.map +1 -1
- package/dest/l1-contracts/index.js +1 -1
- package/dest/logs/extended_directional_app_tagging_secret.d.ts +4 -4
- package/dest/logs/extended_directional_app_tagging_secret.d.ts.map +1 -1
- package/dest/logs/extended_directional_app_tagging_secret.js +12 -5
- package/dest/logs/message_context.d.ts +4 -7
- package/dest/logs/message_context.d.ts.map +1 -1
- package/dest/logs/message_context.js +23 -9
- package/dest/logs/pending_tagged_log.d.ts +2 -3
- package/dest/logs/pending_tagged_log.d.ts.map +1 -1
- package/dest/logs/pending_tagged_log.js +2 -2
- package/dest/logs/shared_secret_derivation.d.ts +11 -10
- package/dest/logs/shared_secret_derivation.d.ts.map +1 -1
- package/dest/logs/shared_secret_derivation.js +15 -9
- package/dest/logs/siloed_tag.d.ts +4 -1
- package/dest/logs/siloed_tag.d.ts.map +1 -1
- package/dest/logs/siloed_tag.js +7 -3
- package/dest/logs/tx_scoped_l2_log.d.ts +3 -1
- package/dest/logs/tx_scoped_l2_log.d.ts.map +1 -1
- package/dest/logs/tx_scoped_l2_log.js +7 -0
- package/dest/messaging/l1_to_l2_message.d.ts +3 -2
- package/dest/messaging/l1_to_l2_message.d.ts.map +1 -1
- package/dest/messaging/l1_to_l2_message.js +11 -13
- package/dest/noir/index.d.ts +3 -3
- package/dest/noir/index.d.ts.map +1 -1
- package/dest/note/note_dao.d.ts +1 -1
- package/dest/note/note_dao.d.ts.map +1 -1
- package/dest/note/note_dao.js +1 -4
- package/dest/p2p/checkpoint_proposal.d.ts +2 -2
- package/dest/p2p/checkpoint_proposal.d.ts.map +1 -1
- package/dest/p2p/checkpoint_proposal.js +3 -13
- package/dest/proofs/chonk_proof.d.ts +46 -2
- package/dest/proofs/chonk_proof.d.ts.map +1 -1
- package/dest/proofs/chonk_proof.js +85 -10
- package/dest/slashing/index.d.ts +2 -3
- package/dest/slashing/index.d.ts.map +1 -1
- package/dest/slashing/index.js +1 -2
- package/dest/slashing/serialization.d.ts +2 -6
- package/dest/slashing/serialization.d.ts.map +1 -1
- package/dest/slashing/serialization.js +0 -60
- package/dest/slashing/types.d.ts +4 -90
- package/dest/slashing/types.d.ts.map +1 -1
- package/dest/slashing/types.js +0 -14
- package/dest/slashing/{tally.d.ts → votes.d.ts} +1 -1
- package/dest/slashing/{tally.d.ts.map → votes.d.ts.map} +1 -1
- package/dest/slashing/{tally.js → votes.js} +1 -1
- package/dest/tests/factories.d.ts +2 -4
- package/dest/tests/factories.d.ts.map +1 -1
- package/dest/tests/factories.js +11 -28
- package/dest/tests/mocks.d.ts +1 -1
- package/dest/tests/mocks.d.ts.map +1 -1
- package/dest/tests/mocks.js +13 -18
- package/dest/timetable/index.d.ts +51 -1
- package/dest/timetable/index.d.ts.map +1 -1
- package/dest/timetable/index.js +204 -14
- package/dest/tx/capsule.d.ts +6 -2
- package/dest/tx/capsule.d.ts.map +1 -1
- package/dest/tx/capsule.js +9 -3
- package/dest/tx/fee_provider.d.ts +10 -0
- package/dest/tx/fee_provider.d.ts.map +1 -0
- package/dest/tx/fee_provider.js +1 -0
- package/dest/tx/global_variable_builder.d.ts +3 -4
- package/dest/tx/global_variable_builder.d.ts.map +1 -1
- package/dest/tx/index.d.ts +2 -1
- package/dest/tx/index.d.ts.map +1 -1
- package/dest/tx/index.js +1 -0
- package/dest/tx/simulated_tx.d.ts +112 -4
- package/dest/tx/simulated_tx.d.ts.map +1 -1
- package/dest/tx/simulated_tx.js +3 -3
- package/dest/tx/tx_receipt.d.ts +8 -4
- package/dest/tx/tx_receipt.d.ts.map +1 -1
- package/dest/tx/tx_receipt.js +8 -15
- package/dest/tx/validator/error_texts.d.ts +5 -1
- package/dest/tx/validator/error_texts.d.ts.map +1 -1
- package/dest/tx/validator/error_texts.js +6 -0
- package/dest/world-state/genesis_data.d.ts +11 -0
- package/dest/world-state/genesis_data.d.ts.map +1 -0
- package/dest/world-state/genesis_data.js +4 -0
- package/dest/world-state/index.d.ts +2 -1
- package/dest/world-state/index.d.ts.map +1 -1
- package/dest/world-state/index.js +1 -0
- package/package.json +8 -8
- package/src/abi/abi.ts +25 -2
- package/src/abi/buffer.ts +25 -4
- package/src/abi/decoder.ts +23 -78
- package/src/abi/function_selector.ts +1 -1
- package/src/abi/function_signature_decoder.ts +77 -0
- package/src/abi/index.ts +1 -0
- package/src/abi/selector.ts +1 -1
- package/src/avm/revert_code.ts +25 -39
- package/src/block/l2_block_source.ts +14 -4
- package/src/block/l2_block_stream/l2_tips_store_base.ts +24 -12
- package/src/block/test/l2_tips_store_test_suite.ts +8 -1
- package/src/checkpoint/checkpoint.ts +11 -1
- package/src/checkpoint/checkpoint_data.ts +40 -4
- package/src/checkpoint/validate.ts +2 -2
- package/src/config/index.ts +1 -0
- package/src/config/pipelining-config.ts +31 -0
- package/src/config/sequencer-config.ts +11 -1
- package/src/contract/contract_address.ts +3 -3
- package/src/contract/contract_class_id.ts +2 -2
- package/src/contract/index.ts +0 -2
- package/src/contract/interfaces/contract_class.ts +2 -82
- package/src/epoch-helpers/index.ts +24 -0
- package/src/file-store/factory.ts +13 -4
- package/src/file-store/http.ts +29 -10
- package/src/file-store/index.ts +1 -0
- package/src/gas/README.md +31 -0
- package/src/gas/fee_math.ts +120 -0
- package/src/gas/gas_fees.ts +12 -4
- package/src/gas/gas_settings.ts +65 -12
- package/src/gas/index.ts +1 -0
- package/src/hash/hash.ts +34 -0
- package/src/interfaces/archiver.ts +3 -1
- package/src/interfaces/aztec-node-admin.ts +5 -7
- package/src/interfaces/aztec-node-debug.ts +40 -0
- package/src/interfaces/aztec-node.ts +15 -0
- package/src/interfaces/block-builder.ts +27 -9
- package/src/interfaces/client.ts +1 -0
- package/src/interfaces/configs.ts +1 -6
- package/src/interfaces/slasher.ts +0 -6
- package/src/interfaces/validator.ts +2 -9
- package/src/l1-contracts/index.ts +1 -1
- package/src/logs/extended_directional_app_tagging_secret.ts +19 -8
- package/src/logs/message_context.ts +17 -7
- package/src/logs/pending_tagged_log.ts +1 -3
- package/src/logs/shared_secret_derivation.ts +21 -10
- package/src/logs/siloed_tag.ts +7 -2
- package/src/logs/tx_scoped_l2_log.ts +16 -0
- package/src/messaging/l1_to_l2_message.ts +12 -9
- package/src/noir/index.ts +2 -2
- package/src/note/note_dao.ts +1 -4
- package/src/p2p/checkpoint_proposal.ts +8 -21
- package/src/proofs/chonk_proof.ts +91 -5
- package/src/slashing/index.ts +1 -2
- package/src/slashing/serialization.ts +1 -81
- package/src/slashing/types.ts +3 -35
- package/src/slashing/{tally.ts → votes.ts} +1 -1
- package/src/tests/factories.ts +5 -34
- package/src/tests/mocks.ts +14 -12
- package/src/timetable/index.ts +293 -13
- package/src/tx/capsule.ts +10 -2
- package/src/tx/fee_provider.ts +10 -0
- package/src/tx/global_variable_builder.ts +2 -3
- package/src/tx/index.ts +1 -0
- package/src/tx/simulated_tx.ts +6 -2
- package/src/tx/tx_receipt.ts +11 -14
- package/src/tx/validator/error_texts.ts +8 -0
- package/src/world-state/genesis_data.ts +15 -0
- package/src/world-state/index.ts +1 -0
- package/dest/contract/private_function_membership_proof.d.ts +0 -32
- package/dest/contract/private_function_membership_proof.d.ts.map +0 -1
- package/dest/contract/private_function_membership_proof.js +0 -124
- package/dest/contract/utility_function_membership_proof.d.ts +0 -27
- package/dest/contract/utility_function_membership_proof.d.ts.map +0 -1
- package/dest/contract/utility_function_membership_proof.js +0 -87
- package/dest/l1-contracts/slash_factory.d.ts +0 -45
- package/dest/l1-contracts/slash_factory.d.ts.map +0 -1
- package/dest/l1-contracts/slash_factory.js +0 -158
- package/dest/slashing/empire.d.ts +0 -31
- package/dest/slashing/empire.d.ts.map +0 -1
- package/dest/slashing/empire.js +0 -87
- package/src/contract/private_function_membership_proof.ts +0 -167
- package/src/contract/utility_function_membership_proof.ts +0 -118
- package/src/l1-contracts/slash_factory.ts +0 -180
- package/src/slashing/empire.ts +0 -104
package/src/abi/decoder.ts
CHANGED
|
@@ -1,8 +1,17 @@
|
|
|
1
1
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
3
|
|
|
3
4
|
import { AztecAddress } from '../aztec-address/index.js';
|
|
4
|
-
import type {
|
|
5
|
-
import {
|
|
5
|
+
import type { AbiType } from './abi.js';
|
|
6
|
+
import { FunctionSelector } from './function_selector.js';
|
|
7
|
+
import {
|
|
8
|
+
isAztecAddressStruct,
|
|
9
|
+
isEthAddressStruct,
|
|
10
|
+
isFunctionSelectorStruct,
|
|
11
|
+
isOptionStruct,
|
|
12
|
+
isWrappedFieldStruct,
|
|
13
|
+
parseSignedInt,
|
|
14
|
+
} from './utils.js';
|
|
6
15
|
|
|
7
16
|
/**
|
|
8
17
|
* The type of our decoded ABI.
|
|
@@ -12,6 +21,9 @@ export type AbiDecoded =
|
|
|
12
21
|
| boolean
|
|
13
22
|
| string
|
|
14
23
|
| AztecAddress
|
|
24
|
+
| EthAddress
|
|
25
|
+
| FunctionSelector
|
|
26
|
+
| Fr
|
|
15
27
|
| AbiDecoded[]
|
|
16
28
|
| { [key: string]: AbiDecoded }
|
|
17
29
|
| undefined;
|
|
@@ -58,6 +70,15 @@ class AbiDecoder {
|
|
|
58
70
|
if (isAztecAddressStruct(abiType)) {
|
|
59
71
|
return new AztecAddress(this.getNextField().toBuffer());
|
|
60
72
|
}
|
|
73
|
+
if (isEthAddressStruct(abiType)) {
|
|
74
|
+
return EthAddress.fromField(this.getNextField());
|
|
75
|
+
}
|
|
76
|
+
if (isFunctionSelectorStruct(abiType)) {
|
|
77
|
+
return FunctionSelector.fromField(this.getNextField());
|
|
78
|
+
}
|
|
79
|
+
if (isWrappedFieldStruct(abiType)) {
|
|
80
|
+
return this.getNextField();
|
|
81
|
+
}
|
|
61
82
|
if (isOptionStruct(abiType)) {
|
|
62
83
|
const isSome = this.decodeNext(abiType.fields[0].type);
|
|
63
84
|
const value = this.decodeNext(abiType.fields[1].type);
|
|
@@ -123,79 +144,3 @@ class AbiDecoder {
|
|
|
123
144
|
export function decodeFromAbi(typ: AbiType[], buffer: Fr[]) {
|
|
124
145
|
return new AbiDecoder(typ, buffer.slice()).decode();
|
|
125
146
|
}
|
|
126
|
-
|
|
127
|
-
/**
|
|
128
|
-
* Decodes the signature of a function from the name and parameters.
|
|
129
|
-
*/
|
|
130
|
-
export class FunctionSignatureDecoder {
|
|
131
|
-
private separator: string;
|
|
132
|
-
constructor(
|
|
133
|
-
private name: string,
|
|
134
|
-
private parameters: ABIParameter[],
|
|
135
|
-
private includeNames = false,
|
|
136
|
-
) {
|
|
137
|
-
this.separator = includeNames ? ', ' : ',';
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
/**
|
|
141
|
-
* Decodes a single function parameter type for the function signature.
|
|
142
|
-
* @param param - The parameter type to decode.
|
|
143
|
-
* @returns A string representing the parameter type.
|
|
144
|
-
*/
|
|
145
|
-
private getParameterType(param: AbiType): string {
|
|
146
|
-
switch (param.kind) {
|
|
147
|
-
case 'field':
|
|
148
|
-
return 'Field';
|
|
149
|
-
case 'integer':
|
|
150
|
-
return param.sign === 'signed' ? `i${param.width}` : `u${param.width}`;
|
|
151
|
-
case 'boolean':
|
|
152
|
-
return 'bool';
|
|
153
|
-
case 'array':
|
|
154
|
-
return `[${this.getParameterType(param.type)};${param.length}]`;
|
|
155
|
-
case 'string':
|
|
156
|
-
return `str<${param.length}>`;
|
|
157
|
-
case 'struct':
|
|
158
|
-
return `(${param.fields.map(field => `${this.decodeParameter(field)}`).join(this.separator)})`;
|
|
159
|
-
default:
|
|
160
|
-
throw new Error(`Unsupported type: ${param.kind}`);
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
/**
|
|
165
|
-
* Decodes a single function parameter for the function signature.
|
|
166
|
-
* @param param - The parameter to decode.
|
|
167
|
-
* @returns A string representing the parameter type and optionally its name.
|
|
168
|
-
*/
|
|
169
|
-
private decodeParameter(param: ABIVariable): string {
|
|
170
|
-
const type = this.getParameterType(param.type);
|
|
171
|
-
return this.includeNames ? `${param.name}: ${type}` : type;
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
/**
|
|
175
|
-
* Decodes all the parameters and build the function signature
|
|
176
|
-
* @returns The function signature.
|
|
177
|
-
*/
|
|
178
|
-
public decode(): string {
|
|
179
|
-
return `${this.name}(${this.parameters.map(param => this.decodeParameter(param)).join(this.separator)})`;
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
/**
|
|
184
|
-
* Decodes a function signature from the name and parameters.
|
|
185
|
-
* @param name - The name of the function.
|
|
186
|
-
* @param parameters - The parameters of the function.
|
|
187
|
-
* @returns - The function signature.
|
|
188
|
-
*/
|
|
189
|
-
export function decodeFunctionSignature(name: string, parameters: ABIParameter[]) {
|
|
190
|
-
return new FunctionSignatureDecoder(name, parameters).decode();
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
/**
|
|
194
|
-
* Decodes a function signature from the name and parameters including parameter names.
|
|
195
|
-
* @param name - The name of the function.
|
|
196
|
-
* @param parameters - The parameters of the function.
|
|
197
|
-
* @returns - The user-friendly function signature.
|
|
198
|
-
*/
|
|
199
|
-
export function decodeFunctionSignatureWithParameterNames(name: string, parameters: ABIParameter[]) {
|
|
200
|
-
return new FunctionSignatureDecoder(name, parameters, true).decode();
|
|
201
|
-
}
|
|
@@ -6,7 +6,7 @@ import { type ZodFor, hexSchemaFor } from '@aztec/foundation/schemas';
|
|
|
6
6
|
import { BufferReader, FieldReader, TypeRegistry } from '@aztec/foundation/serialize';
|
|
7
7
|
|
|
8
8
|
import type { ABIParameter } from './abi.js';
|
|
9
|
-
import { decodeFunctionSignature } from './
|
|
9
|
+
import { decodeFunctionSignature } from './function_signature_decoder.js';
|
|
10
10
|
import { Selector } from './selector.js';
|
|
11
11
|
|
|
12
12
|
/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import type { ABIParameter, ABIVariable, AbiType } from './abi.js';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Decodes the signature of a function from the name and parameters.
|
|
5
|
+
*/
|
|
6
|
+
export class FunctionSignatureDecoder {
|
|
7
|
+
private separator: string;
|
|
8
|
+
constructor(
|
|
9
|
+
private name: string,
|
|
10
|
+
private parameters: ABIParameter[],
|
|
11
|
+
private includeNames = false,
|
|
12
|
+
) {
|
|
13
|
+
this.separator = includeNames ? ', ' : ',';
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Decodes a single function parameter type for the function signature.
|
|
18
|
+
* @param param - The parameter type to decode.
|
|
19
|
+
* @returns A string representing the parameter type.
|
|
20
|
+
*/
|
|
21
|
+
private getParameterType(param: AbiType): string {
|
|
22
|
+
switch (param.kind) {
|
|
23
|
+
case 'field':
|
|
24
|
+
return 'Field';
|
|
25
|
+
case 'integer':
|
|
26
|
+
return param.sign === 'signed' ? `i${param.width}` : `u${param.width}`;
|
|
27
|
+
case 'boolean':
|
|
28
|
+
return 'bool';
|
|
29
|
+
case 'array':
|
|
30
|
+
return `[${this.getParameterType(param.type)};${param.length}]`;
|
|
31
|
+
case 'string':
|
|
32
|
+
return `str<${param.length}>`;
|
|
33
|
+
case 'struct':
|
|
34
|
+
return `(${param.fields.map(field => `${this.decodeParameter(field)}`).join(this.separator)})`;
|
|
35
|
+
default:
|
|
36
|
+
throw new Error(`Unsupported type: ${param.kind}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Decodes a single function parameter for the function signature.
|
|
42
|
+
* @param param - The parameter to decode.
|
|
43
|
+
* @returns A string representing the parameter type and optionally its name.
|
|
44
|
+
*/
|
|
45
|
+
private decodeParameter(param: ABIVariable): string {
|
|
46
|
+
const type = this.getParameterType(param.type);
|
|
47
|
+
return this.includeNames ? `${param.name}: ${type}` : type;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Decodes all the parameters and build the function signature
|
|
52
|
+
* @returns The function signature.
|
|
53
|
+
*/
|
|
54
|
+
public decode(): string {
|
|
55
|
+
return `${this.name}(${this.parameters.map(param => this.decodeParameter(param)).join(this.separator)})`;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Decodes a function signature from the name and parameters.
|
|
61
|
+
* @param name - The name of the function.
|
|
62
|
+
* @param parameters - The parameters of the function.
|
|
63
|
+
* @returns - The function signature.
|
|
64
|
+
*/
|
|
65
|
+
export function decodeFunctionSignature(name: string, parameters: ABIParameter[]) {
|
|
66
|
+
return new FunctionSignatureDecoder(name, parameters).decode();
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* Decodes a function signature from the name and parameters including parameter names.
|
|
71
|
+
* @param name - The name of the function.
|
|
72
|
+
* @param parameters - The parameters of the function.
|
|
73
|
+
* @returns - The user-friendly function signature.
|
|
74
|
+
*/
|
|
75
|
+
export function decodeFunctionSignatureWithParameterNames(name: string, parameters: ABIParameter[]) {
|
|
76
|
+
return new FunctionSignatureDecoder(name, parameters, true).decode();
|
|
77
|
+
}
|
package/src/abi/index.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './abi.js';
|
|
2
2
|
export * from './buffer.js';
|
|
3
3
|
export * from './decoder.js';
|
|
4
|
+
export * from './function_signature_decoder.js';
|
|
4
5
|
export * from './encoder.js';
|
|
5
6
|
export * from './authorization_selector.js';
|
|
6
7
|
export * from './event_metadata_definition.js';
|
package/src/abi/selector.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { bufferToHex } from '@aztec/foundation/string';
|
|
|
4
4
|
|
|
5
5
|
import { inspect } from 'util';
|
|
6
6
|
|
|
7
|
-
/** A selector is the
|
|
7
|
+
/** A selector is the low 4 bytes of the poseidon2 hash of a signature. */
|
|
8
8
|
export abstract class Selector {
|
|
9
9
|
/** The size of the selector in bytes. */
|
|
10
10
|
public static SIZE = 4;
|
package/src/avm/revert_code.ts
CHANGED
|
@@ -5,35 +5,17 @@ import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
|
|
|
5
5
|
import { inspect } from 'util';
|
|
6
6
|
import { z } from 'zod';
|
|
7
7
|
|
|
8
|
-
/**
|
|
9
|
-
* Tracks which revertible phases of a transaction's public execution reverted.
|
|
10
|
-
*
|
|
11
|
-
* A transaction executes in three sequential phases:
|
|
12
|
-
* 1. SETUP – non-revertible; if this fails the entire transaction is rejected.
|
|
13
|
-
* 2. APP_LOGIC – revertible; its state changes are rolled back on failure.
|
|
14
|
-
* 3. TEARDOWN – revertible; always runs (even after app-logic revert) so the fee-payment contract can clean up.
|
|
15
|
-
*
|
|
16
|
-
* Only APP_LOGIC and TEARDOWN can produce a revert code. SETUP failures throw instead and discard the transaction
|
|
17
|
-
* entirely.
|
|
18
|
-
*/
|
|
8
|
+
/** Whether a transaction's public execution reverted. */
|
|
19
9
|
export enum RevertCodeEnum {
|
|
20
10
|
/** All phases completed successfully; no state was rolled back. */
|
|
21
11
|
OK = 0,
|
|
22
|
-
/**
|
|
23
|
-
|
|
24
|
-
/** TEARDOWN reverted; its state changes were discarded. APP_LOGIC succeeded. */
|
|
25
|
-
TEARDOWN_REVERTED = 2,
|
|
26
|
-
/** Both APP_LOGIC and TEARDOWN reverted; only SETUP effects are kept. */
|
|
27
|
-
BOTH_REVERTED = 3,
|
|
12
|
+
/** One or more revertible phases reverted; their state changes were discarded. */
|
|
13
|
+
REVERTED = 1,
|
|
28
14
|
}
|
|
29
15
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
(value as RevertCodeEnum) === RevertCodeEnum.APP_LOGIC_REVERTED ||
|
|
34
|
-
(value as RevertCodeEnum) === RevertCodeEnum.TEARDOWN_REVERTED ||
|
|
35
|
-
(value as RevertCodeEnum) === RevertCodeEnum.BOTH_REVERTED
|
|
36
|
-
);
|
|
16
|
+
/** Returns a valid RevertCodeEnum, coercing any value >= 1 to REVERTED. */
|
|
17
|
+
function toRevertCodeEnum(value: number): RevertCodeEnum {
|
|
18
|
+
return value >= 1 ? RevertCodeEnum.REVERTED : RevertCodeEnum.OK;
|
|
37
19
|
}
|
|
38
20
|
|
|
39
21
|
/**
|
|
@@ -45,9 +27,13 @@ export class RevertCode {
|
|
|
45
27
|
this.code = e.valueOf();
|
|
46
28
|
}
|
|
47
29
|
static readonly OK: RevertCode = new RevertCode(RevertCodeEnum.OK);
|
|
48
|
-
static readonly
|
|
49
|
-
|
|
50
|
-
static readonly
|
|
30
|
+
static readonly REVERTED: RevertCode = new RevertCode(RevertCodeEnum.REVERTED);
|
|
31
|
+
/** @deprecated Use REVERTED instead. */
|
|
32
|
+
static readonly APP_LOGIC_REVERTED: RevertCode = RevertCode.REVERTED;
|
|
33
|
+
/** @deprecated Use REVERTED instead. */
|
|
34
|
+
static readonly TEARDOWN_REVERTED: RevertCode = RevertCode.REVERTED;
|
|
35
|
+
/** @deprecated Use REVERTED instead. */
|
|
36
|
+
static readonly BOTH_REVERTED: RevertCode = RevertCode.REVERTED;
|
|
51
37
|
|
|
52
38
|
public getCode(): RevertCodeEnum {
|
|
53
39
|
return this.code;
|
|
@@ -65,12 +51,8 @@ export class RevertCode {
|
|
|
65
51
|
switch (this.code as RevertCodeEnum) {
|
|
66
52
|
case RevertCodeEnum.OK:
|
|
67
53
|
return 'OK';
|
|
68
|
-
case RevertCodeEnum.
|
|
69
|
-
return '
|
|
70
|
-
case RevertCodeEnum.TEARDOWN_REVERTED:
|
|
71
|
-
return 'Teardown reverted';
|
|
72
|
-
case RevertCodeEnum.BOTH_REVERTED:
|
|
73
|
-
return 'Both reverted';
|
|
54
|
+
case RevertCodeEnum.REVERTED:
|
|
55
|
+
return 'Reverted';
|
|
74
56
|
default:
|
|
75
57
|
return `Unknown RevertCode: ${this.code}`;
|
|
76
58
|
}
|
|
@@ -81,7 +63,11 @@ export class RevertCode {
|
|
|
81
63
|
}
|
|
82
64
|
|
|
83
65
|
static get schema(): ZodFor<RevertCode> {
|
|
84
|
-
return z
|
|
66
|
+
return z
|
|
67
|
+
.number()
|
|
68
|
+
.int()
|
|
69
|
+
.min(0)
|
|
70
|
+
.transform(value => new RevertCode(toRevertCodeEnum(value)));
|
|
85
71
|
}
|
|
86
72
|
|
|
87
73
|
/**
|
|
@@ -96,10 +82,10 @@ export class RevertCode {
|
|
|
96
82
|
return obj;
|
|
97
83
|
}
|
|
98
84
|
const code = typeof obj === 'number' ? obj : (obj.code ?? obj);
|
|
99
|
-
if (
|
|
85
|
+
if (typeof code !== 'number' || code < 0) {
|
|
100
86
|
throw new Error(`Invalid RevertCode: ${code}`);
|
|
101
87
|
}
|
|
102
|
-
return new RevertCode(code);
|
|
88
|
+
return new RevertCode(toRevertCodeEnum(code));
|
|
103
89
|
}
|
|
104
90
|
|
|
105
91
|
/**
|
|
@@ -131,10 +117,10 @@ export class RevertCode {
|
|
|
131
117
|
}
|
|
132
118
|
|
|
133
119
|
public static fromNumber(code: number): RevertCode {
|
|
134
|
-
if (
|
|
120
|
+
if (code < 0) {
|
|
135
121
|
throw new Error(`Invalid RevertCode: ${code}`);
|
|
136
122
|
}
|
|
137
|
-
return new RevertCode(code);
|
|
123
|
+
return new RevertCode(toRevertCodeEnum(code));
|
|
138
124
|
}
|
|
139
125
|
|
|
140
126
|
public static fromField(field: Fr): RevertCode {
|
|
@@ -152,7 +138,7 @@ export class RevertCode {
|
|
|
152
138
|
return RevertCode.fromNumber(code);
|
|
153
139
|
}
|
|
154
140
|
|
|
155
|
-
private static readonly NUM_OPTIONS =
|
|
141
|
+
private static readonly NUM_OPTIONS = 2;
|
|
156
142
|
static random(): RevertCode {
|
|
157
143
|
return new RevertCode(Math.floor(Math.random() * RevertCode.NUM_OPTIONS));
|
|
158
144
|
}
|
|
@@ -13,7 +13,7 @@ import type { TypedEventEmitter } from '@aztec/foundation/types';
|
|
|
13
13
|
import { z } from 'zod';
|
|
14
14
|
|
|
15
15
|
import type { Checkpoint } from '../checkpoint/checkpoint.js';
|
|
16
|
-
import type { CheckpointData } from '../checkpoint/checkpoint_data.js';
|
|
16
|
+
import type { CheckpointData, CommonCheckpointData, ProposedCheckpointData } from '../checkpoint/checkpoint_data.js';
|
|
17
17
|
import type { PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
|
|
18
18
|
import type { L1RollupConstants } from '../epoch-helpers/index.js';
|
|
19
19
|
import { CheckpointHeader } from '../rollup/checkpoint_header.js';
|
|
@@ -175,8 +175,10 @@ export interface L2BlockSource {
|
|
|
175
175
|
getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
|
|
176
176
|
|
|
177
177
|
/**
|
|
178
|
-
* Returns the last L2 slot number
|
|
179
|
-
*
|
|
178
|
+
* Returns the last L2 slot number for which we have all L1 data needed to build the next checkpoint.
|
|
179
|
+
* Determined by the max of two signals: L1 block sync progress and latest synced checkpoint slot.
|
|
180
|
+
* The checkpoint signal handles missed L1 blocks, since a published checkpoint seals the message tree
|
|
181
|
+
* for the next checkpoint via the inbox LAG mechanism.
|
|
180
182
|
*/
|
|
181
183
|
getSyncedL2SlotNumber(): Promise<SlotNumber | undefined>;
|
|
182
184
|
|
|
@@ -227,6 +229,12 @@ export interface L2BlockSource {
|
|
|
227
229
|
*/
|
|
228
230
|
getPendingChainValidationStatus(): Promise<ValidateCheckpointResult>;
|
|
229
231
|
|
|
232
|
+
/** Returns the checkpoint at the proposed chain tip. */
|
|
233
|
+
getProposedCheckpoint(): Promise<CommonCheckpointData | undefined>;
|
|
234
|
+
|
|
235
|
+
/** Returns proposed checkpoint, if set, undefined if not*/
|
|
236
|
+
getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined>;
|
|
237
|
+
|
|
230
238
|
/** Force a sync. */
|
|
231
239
|
syncImmediate(): Promise<void>;
|
|
232
240
|
|
|
@@ -310,12 +318,13 @@ export interface L2BlockSourceEventEmitter extends L2BlockSource {
|
|
|
310
318
|
* - proven: Proven block on L1.
|
|
311
319
|
* - finalized: Proven block on a finalized L1 block (not implemented, set to proven for now).
|
|
312
320
|
*/
|
|
313
|
-
export type L2BlockTag = 'proposed' | 'checkpointed' | 'proven' | 'finalized';
|
|
321
|
+
export type L2BlockTag = 'proposed' | 'proposedCheckpoint' | 'checkpointed' | 'proven' | 'finalized';
|
|
314
322
|
|
|
315
323
|
/** Tips of the L2 chain. */
|
|
316
324
|
export type L2Tips = {
|
|
317
325
|
proposed: L2BlockId;
|
|
318
326
|
checkpointed: L2TipId;
|
|
327
|
+
proposedCheckpoint: L2TipId;
|
|
319
328
|
proven: L2TipId;
|
|
320
329
|
finalized: L2TipId;
|
|
321
330
|
};
|
|
@@ -360,6 +369,7 @@ const L2TipIdSchema = z.object({
|
|
|
360
369
|
export const L2TipsSchema = z.object({
|
|
361
370
|
proposed: L2BlockIdSchema,
|
|
362
371
|
checkpointed: L2TipIdSchema,
|
|
372
|
+
proposedCheckpoint: L2TipIdSchema,
|
|
363
373
|
proven: L2TipIdSchema,
|
|
364
374
|
finalized: L2TipIdSchema,
|
|
365
375
|
});
|
|
@@ -66,24 +66,29 @@ export abstract class L2TipsStoreBase implements L2BlockStreamEventHandler, L2Bl
|
|
|
66
66
|
|
|
67
67
|
public getL2Tips(): Promise<L2Tips> {
|
|
68
68
|
return this.runInTransaction(async () => {
|
|
69
|
-
const [proposedBlockId, finalizedBlockId, provenBlockId, checkpointedBlockId] =
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
69
|
+
const [proposedBlockId, finalizedBlockId, provenBlockId, checkpointedBlockId, proposedCheckpointBlockId] =
|
|
70
|
+
await Promise.all([
|
|
71
|
+
this.getBlockId('proposed'),
|
|
72
|
+
this.getBlockId('finalized'),
|
|
73
|
+
this.getBlockId('proven'),
|
|
74
|
+
this.getBlockId('checkpointed'),
|
|
75
|
+
this.getBlockId('proposedCheckpoint'),
|
|
76
|
+
]);
|
|
77
|
+
|
|
78
|
+
const [finalizedCheckpointId, provenCheckpointId, checkpointedCheckpointId, proposedCheckpointId] =
|
|
79
|
+
await Promise.all([
|
|
80
|
+
this.getCheckpointId('finalized'),
|
|
81
|
+
this.getCheckpointId('proven'),
|
|
82
|
+
this.getCheckpointId('checkpointed'),
|
|
83
|
+
this.getCheckpointId('proposedCheckpoint'),
|
|
84
|
+
]);
|
|
81
85
|
|
|
82
86
|
return {
|
|
83
87
|
proposed: proposedBlockId,
|
|
84
88
|
finalized: { block: finalizedBlockId, checkpoint: finalizedCheckpointId },
|
|
85
89
|
proven: { block: provenBlockId, checkpoint: provenCheckpointId },
|
|
86
90
|
checkpointed: { block: checkpointedBlockId, checkpoint: checkpointedCheckpointId },
|
|
91
|
+
proposedCheckpoint: { block: proposedCheckpointBlockId, checkpoint: proposedCheckpointId },
|
|
87
92
|
};
|
|
88
93
|
});
|
|
89
94
|
}
|
|
@@ -164,6 +169,12 @@ export abstract class L2TipsStoreBase implements L2BlockStreamEventHandler, L2Bl
|
|
|
164
169
|
await this.runInTransaction(async () => {
|
|
165
170
|
await this.saveTag('checkpointed', event.block);
|
|
166
171
|
await this.saveCheckpoint(event.checkpoint);
|
|
172
|
+
// proposedCheckpoint is always >= checkpointed. If checkpointed has caught up
|
|
173
|
+
// or surpassed it, advance proposedCheckpoint to match.
|
|
174
|
+
const proposedCheckpointBlock = await this.getBlockId('proposedCheckpoint');
|
|
175
|
+
if (event.block.number > proposedCheckpointBlock.number) {
|
|
176
|
+
await this.saveTag('proposedCheckpoint', event.block);
|
|
177
|
+
}
|
|
167
178
|
});
|
|
168
179
|
}
|
|
169
180
|
|
|
@@ -174,6 +185,7 @@ export abstract class L2TipsStoreBase implements L2BlockStreamEventHandler, L2Bl
|
|
|
174
185
|
await this.runInTransaction(async () => {
|
|
175
186
|
await this.saveTag('proposed', event.block);
|
|
176
187
|
await this.saveTag('checkpointed', event.block);
|
|
188
|
+
await this.saveTag('proposedCheckpoint', event.block);
|
|
177
189
|
const storeProven = await this.getBlockId('proven');
|
|
178
190
|
if (storeProven.number > event.block.number) {
|
|
179
191
|
await this.saveTag('proven', event.block);
|
|
@@ -67,11 +67,18 @@ export function testL2TipsStore(makeTipsStore: () => Promise<L2TipsStore>) {
|
|
|
67
67
|
checkpoint: makeCheckpointIdForBlock(blockNumber),
|
|
68
68
|
});
|
|
69
69
|
|
|
70
|
-
const makeTips = (
|
|
70
|
+
const makeTips = (
|
|
71
|
+
proposed: number,
|
|
72
|
+
proven: number,
|
|
73
|
+
finalized: number,
|
|
74
|
+
checkpointed: number = 0,
|
|
75
|
+
proposedCheckpoint: number = 0,
|
|
76
|
+
) => ({
|
|
71
77
|
proposed: makeTip(proposed),
|
|
72
78
|
proven: makeTipId(proven),
|
|
73
79
|
finalized: makeTipId(finalized),
|
|
74
80
|
checkpointed: makeTipId(checkpointed),
|
|
81
|
+
proposedCheckpoint: makeTipId(proposedCheckpoint),
|
|
75
82
|
});
|
|
76
83
|
|
|
77
84
|
const makeCheckpoint = async (checkpointNumber: number, blocks: L2Block[]): Promise<PublishedCheckpoint> => {
|
|
@@ -100,7 +100,16 @@ export class Checkpoint {
|
|
|
100
100
|
* checkpoints up to and including this one in the epoch.
|
|
101
101
|
*/
|
|
102
102
|
public getCheckpointOutHash(): Fr {
|
|
103
|
-
|
|
103
|
+
return Checkpoint.getCheckpointOutHash(this.blocks);
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/**
|
|
107
|
+
* Returns the out hash computed from all l2-to-l1 messages in this checkpoint.
|
|
108
|
+
* Note: This value is different from the out hash in the header, which is the **accumulated** out hash over all
|
|
109
|
+
* checkpoints up to and including this one in the epoch.
|
|
110
|
+
*/
|
|
111
|
+
static getCheckpointOutHash(blocks: L2Block[]): Fr {
|
|
112
|
+
const msgs = blocks.map(block => block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs));
|
|
104
113
|
return computeCheckpointOutHash(msgs);
|
|
105
114
|
}
|
|
106
115
|
|
|
@@ -165,6 +174,7 @@ export class Checkpoint {
|
|
|
165
174
|
let lastArchive = previousArchive;
|
|
166
175
|
for (let i = 0; i < numBlocks; i++) {
|
|
167
176
|
const block = await L2Block.random(BlockNumber(startBlockNumber + i), {
|
|
177
|
+
checkpointNumber,
|
|
168
178
|
indexWithinCheckpoint: IndexWithinCheckpoint(i),
|
|
169
179
|
...options,
|
|
170
180
|
...(lastArchive ? { lastArchive } : {}),
|
|
@@ -14,18 +14,54 @@ import { CheckpointHeader } from '../rollup/checkpoint_header.js';
|
|
|
14
14
|
import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
|
|
15
15
|
import { L1PublishedData } from './published_checkpoint.js';
|
|
16
16
|
|
|
17
|
-
/**
|
|
18
|
-
export type
|
|
17
|
+
/** Base type for checkpoint data */
|
|
18
|
+
export type CommonCheckpointData = {
|
|
19
19
|
checkpointNumber: CheckpointNumber;
|
|
20
20
|
header: CheckpointHeader;
|
|
21
|
-
archive: AppendOnlyTreeSnapshot;
|
|
22
|
-
checkpointOutHash: Fr;
|
|
23
21
|
startBlock: BlockNumber;
|
|
24
22
|
blockCount: number;
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
/** Data stored with checkpoint data after publishing on l1 */
|
|
26
|
+
export type L1EnrichedCheckpointData = {
|
|
25
27
|
attestations: CommitteeAttestation[];
|
|
26
28
|
l1: L1PublishedData;
|
|
27
29
|
};
|
|
28
30
|
|
|
31
|
+
/** Data stored alongside checkpoint data in storage */
|
|
32
|
+
export type StorageEnrichedCheckpointData = {
|
|
33
|
+
archive: AppendOnlyTreeSnapshot;
|
|
34
|
+
checkpointOutHash: Fr;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
/** Data stored only with proposed checkpoint data */
|
|
38
|
+
export type ProposedOnlyCheckpointData = {
|
|
39
|
+
totalManaUsed: bigint;
|
|
40
|
+
feeAssetPriceModifier: bigint;
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
/** Lightweight checkpoint metadata without full block data. */
|
|
44
|
+
export type CheckpointData = CommonCheckpointData & StorageEnrichedCheckpointData & L1EnrichedCheckpointData;
|
|
45
|
+
|
|
46
|
+
/** Input for setting a proposed checkpoint. The archive and checkpointOutHash are computed
|
|
47
|
+
* internally by the block store from the stored blocks. */
|
|
48
|
+
export type ProposedCheckpointInput = CommonCheckpointData & ProposedOnlyCheckpointData;
|
|
49
|
+
|
|
50
|
+
/** Full data for a proposed checkpoint (proposed but not yet L1-confirmed).
|
|
51
|
+
* Includes fee-relevant fields used during pipelining to compute the fee header override. */
|
|
52
|
+
export type ProposedCheckpointData = ProposedCheckpointInput & StorageEnrichedCheckpointData;
|
|
53
|
+
|
|
54
|
+
export const ProposedCheckpointDataSchema = z.object({
|
|
55
|
+
checkpointNumber: CheckpointNumberSchema,
|
|
56
|
+
header: CheckpointHeader.schema,
|
|
57
|
+
archive: AppendOnlyTreeSnapshot.schema,
|
|
58
|
+
checkpointOutHash: schemas.Fr,
|
|
59
|
+
startBlock: BlockNumberSchema,
|
|
60
|
+
blockCount: z.number(),
|
|
61
|
+
totalManaUsed: schemas.BigInt,
|
|
62
|
+
feeAssetPriceModifier: schemas.BigInt,
|
|
63
|
+
});
|
|
64
|
+
|
|
29
65
|
export const CheckpointDataSchema = z
|
|
30
66
|
.object({
|
|
31
67
|
checkpointNumber: CheckpointNumberSchema,
|
|
@@ -36,7 +36,7 @@ export function validateCheckpoint(
|
|
|
36
36
|
): void {
|
|
37
37
|
validateCheckpointStructure(checkpoint);
|
|
38
38
|
validateCheckpointLimits(checkpoint, opts);
|
|
39
|
-
|
|
39
|
+
validateCheckpointBlocksLimits(checkpoint, opts);
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
/**
|
|
@@ -125,7 +125,7 @@ export function validateCheckpointStructure(checkpoint: Checkpoint): void {
|
|
|
125
125
|
}
|
|
126
126
|
|
|
127
127
|
/** Validates checkpoint blocks gas limits */
|
|
128
|
-
function
|
|
128
|
+
function validateCheckpointBlocksLimits(
|
|
129
129
|
checkpoint: Checkpoint,
|
|
130
130
|
opts: {
|
|
131
131
|
maxL2BlockGas?: number;
|
package/src/config/index.ts
CHANGED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
|
|
2
|
+
|
|
3
|
+
import { z } from 'zod';
|
|
4
|
+
|
|
5
|
+
import { zodFor } from '../schemas/index.js';
|
|
6
|
+
|
|
7
|
+
export type PipelineConfig = {
|
|
8
|
+
/** Whether to enable build-ahead proposer pipelining. */
|
|
9
|
+
enableProposerPipelining: boolean;
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Pipelining config mappings for fields that need to be shared across packages.
|
|
14
|
+
*/
|
|
15
|
+
export const pipelineConfigMappings: ConfigMappingsType<PipelineConfig> = {
|
|
16
|
+
enableProposerPipelining: {
|
|
17
|
+
env: 'SEQ_ENABLE_PROPOSER_PIPELINING',
|
|
18
|
+
description: 'Whether to enable build-ahead proposer pipelining.',
|
|
19
|
+
...booleanConfigHelper(false),
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
export const PipelineConfigSchema = zodFor<PipelineConfig>()(
|
|
24
|
+
z.object({
|
|
25
|
+
enableProposerPipelining: z.boolean(),
|
|
26
|
+
}),
|
|
27
|
+
);
|
|
28
|
+
|
|
29
|
+
export function getPipelineConfigEnvVars(): PipelineConfig {
|
|
30
|
+
return getConfigFromMappings(pipelineConfigMappings);
|
|
31
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ConfigMappingsType } from '@aztec/foundation/config';
|
|
2
2
|
|
|
3
3
|
import type { SequencerConfig } from '../interfaces/configs.js';
|
|
4
|
+
import { DEFAULT_P2P_PROPAGATION_TIME } from '../timetable/index.js';
|
|
4
5
|
|
|
5
6
|
/** Default maximum number of transactions per block. */
|
|
6
7
|
export const DEFAULT_MAX_TXS_PER_BLOCK = 32;
|
|
@@ -12,7 +13,10 @@ export const DEFAULT_MAX_TXS_PER_BLOCK = 32;
|
|
|
12
13
|
* to avoid duplication.
|
|
13
14
|
*/
|
|
14
15
|
export const sharedSequencerConfigMappings: ConfigMappingsType<
|
|
15
|
-
Pick<
|
|
16
|
+
Pick<
|
|
17
|
+
SequencerConfig,
|
|
18
|
+
'blockDurationMs' | 'expectedBlockProposalsPerSlot' | 'maxTxsPerBlock' | 'attestationPropagationTime'
|
|
19
|
+
>
|
|
16
20
|
> = {
|
|
17
21
|
blockDurationMs: {
|
|
18
22
|
env: 'SEQ_BLOCK_DURATION_MS',
|
|
@@ -34,4 +38,10 @@ export const sharedSequencerConfigMappings: ConfigMappingsType<
|
|
|
34
38
|
description: 'The maximum number of txs to include in a block.',
|
|
35
39
|
parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
|
|
36
40
|
},
|
|
41
|
+
attestationPropagationTime: {
|
|
42
|
+
env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
|
|
43
|
+
description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way).',
|
|
44
|
+
parseEnv: (val: string) => (val ? parseFloat(val) : undefined),
|
|
45
|
+
defaultValue: DEFAULT_P2P_PROPAGATION_TIME,
|
|
46
|
+
},
|
|
37
47
|
};
|