Skip to content

Commit f1f52fe

Browse files
committed
Merge branch 'master' into deposit-tree-snapshots
2 parents 043d2f5 + 2110ce9 commit f1f52fe

File tree

58 files changed

+1372
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1372
-237
lines changed

Diff for: CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ the [releases page](https://github.com/Consensys/teku/releases).
1616
- Introduced [Validator Slashing Prevention feature](https://docs.teku.consensys.io/how-to/prevent-slashing/detect-slashing).
1717
- If the EL supports the `engine_getClientVersionV1` Engine API method, the default graffiti (when no graffiti has been configured by the validator) will include EL as well as CL version information. For more details, please see https://github.com/ethereum/execution-apis/pull/517.
1818
- `—p2p-private-key-file` command line option supports reading a binary private key file.
19+
- Updated libp2p seen cache configuration to reflect EIP-7045 spec changes. This reduces CPU and network bandwidth consumption.
20+
- Increased the attestation cache capacity to allow teku a bigger pool of attestations when block building.
1921

2022
### Bug Fixes

Diff for: data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BeaconStateElectra.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title" : "BeaconStateElectra",
33
"type" : "object",
4-
"required" : [ "genesis_time", "genesis_validators_root", "slot", "fork", "latest_block_header", "block_roots", "state_roots", "historical_roots", "eth1_data", "eth1_data_votes", "eth1_deposit_index", "validators", "balances", "randao_mixes", "slashings", "previous_epoch_participation", "current_epoch_participation", "justification_bits", "previous_justified_checkpoint", "current_justified_checkpoint", "finalized_checkpoint", "inactivity_scores", "current_sync_committee", "next_sync_committee", "latest_execution_payload_header", "next_withdrawal_index", "next_withdrawal_validator_index", "historical_summaries" ],
4+
"required" : [ "genesis_time", "genesis_validators_root", "slot", "fork", "latest_block_header", "block_roots", "state_roots", "historical_roots", "eth1_data", "eth1_data_votes", "eth1_deposit_index", "validators", "balances", "randao_mixes", "slashings", "previous_epoch_participation", "current_epoch_participation", "justification_bits", "previous_justified_checkpoint", "current_justified_checkpoint", "finalized_checkpoint", "inactivity_scores", "current_sync_committee", "next_sync_committee", "latest_execution_payload_header", "next_withdrawal_index", "next_withdrawal_validator_index", "historical_summaries", "deposit_receipts_start_index" ],
55
"properties" : {
66
"genesis_time" : {
77
"type" : "string",
@@ -170,6 +170,12 @@
170170
"items" : {
171171
"$ref" : "#/components/schemas/HistoricalSummary"
172172
}
173+
},
174+
"deposit_receipts_start_index" : {
175+
"type" : "string",
176+
"description" : "unsigned 64 bit integer",
177+
"example" : "1",
178+
"format" : "uint64"
173179
}
174180
}
175181
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"title" : "DepositReceipt",
3+
"type" : "object",
4+
"required" : [ "pubkey", "withdrawal_credentials", "amount", "signature", "index" ],
5+
"properties" : {
6+
"pubkey" : {
7+
"type" : "string",
8+
"pattern" : "^0x[a-fA-F0-9]{2,}$",
9+
"description" : "Bytes48 hexadecimal",
10+
"format" : "bytes"
11+
},
12+
"withdrawal_credentials" : {
13+
"type" : "string",
14+
"description" : "Bytes32 hexadecimal",
15+
"example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
16+
"format" : "byte"
17+
},
18+
"amount" : {
19+
"type" : "string",
20+
"description" : "unsigned 64 bit integer",
21+
"example" : "1",
22+
"format" : "uint64"
23+
},
24+
"signature" : {
25+
"type" : "string",
26+
"pattern" : "^0x[a-fA-F0-9]{2,}$",
27+
"description" : "SSZ hexadecimal",
28+
"format" : "bytes"
29+
},
30+
"index" : {
31+
"type" : "string",
32+
"description" : "unsigned 64 bit integer",
33+
"example" : "1",
34+
"format" : "uint64"
35+
}
36+
}
37+
}

Diff for: data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionPayloadElectra.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title" : "ExecutionPayloadElectra",
33
"type" : "object",
4-
"required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions", "withdrawals", "blob_gas_used", "excess_blob_gas" ],
4+
"required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions", "withdrawals", "blob_gas_used", "excess_blob_gas", "deposit_receipts" ],
55
"properties" : {
66
"parent_hash" : {
77
"type" : "string",
@@ -107,6 +107,12 @@
107107
"description" : "unsigned 64 bit integer",
108108
"example" : "1",
109109
"format" : "uint64"
110+
},
111+
"deposit_receipts" : {
112+
"type" : "array",
113+
"items" : {
114+
"$ref" : "#/components/schemas/DepositReceipt"
115+
}
110116
}
111117
}
112118
}

Diff for: data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionPayloadHeaderElectra.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title" : "ExecutionPayloadHeaderElectra",
33
"type" : "object",
4-
"required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions_root", "withdrawals_root", "blob_gas_used", "excess_blob_gas" ],
4+
"required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions_root", "withdrawals_root", "blob_gas_used", "excess_blob_gas", "deposit_receipts_root" ],
55
"properties" : {
66
"parent_hash" : {
77
"type" : "string",
@@ -104,6 +104,12 @@
104104
"description" : "unsigned 64 bit integer",
105105
"example" : "1",
106106
"format" : "uint64"
107+
},
108+
"deposit_receipts_root" : {
109+
"type" : "string",
110+
"description" : "Bytes32 hexadecimal",
111+
"example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
112+
"format" : "byte"
107113
}
108114
}
109115
}

0 commit comments

Comments
 (0)