status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into pr3499

This commit is contained in:
Hsiao-Wei Wang 2023-09-18 18:07:39 +08:00
parent e8041749a2 a0a512d821
commit 264dfadfe0
No known key found for this signature in database
GPG Key ID: AE3D6B174F971DE4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
specs/deneb/beacon-chain.md
View File

@ -54,7 +54,7 @@
Deneb is a consensus-layer upgrade containing a number of features. Including: Deneb is a consensus-layer upgrade containing a number of features. Including:
* [EIP-4788](https://eips.ethereum.org/EIPS/eip-4788): Beacon block root in the EVM * [EIP-4788](https://eips.ethereum.org/EIPS/eip-4788): Beacon block root in the EVM
* [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Shard Blob Transactions scale data-availability of Ethereum in a simple, forwards-compatible manner * [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Shard Blob Transactions scale data-availability of Ethereum in a simple, forwards-compatible manner
* [EIP-7044](https://github.com/ethereum/EIPs/pull/7044): Perpetually Valid Signed Voluntary Exits * [EIP-7044](https://eips.ethereum.org/EIPS/eip-7044): Perpetually Valid Signed Voluntary Exits
* [EIP-7045](https://eips.ethereum.org/EIPS/eip-7045): Increase Max Attestation Inclusion Slot * [EIP-7045](https://eips.ethereum.org/EIPS/eip-7045): Increase Max Attestation Inclusion Slot
* [EIP-7514](https://eips.ethereum.org/EIPS/eip-7514): Add Max Epoch Churn Limit * [EIP-7514](https://eips.ethereum.org/EIPS/eip-7514): Add Max Epoch Churn Limit

4
specs/phase0/p2p-interface.md
View File

@ -158,11 +158,11 @@ This applies to transports that are natively incapable of multiplexing (e.g. TCP
and is omitted for capable transports (e.g. QUIC). and is omitted for capable transports (e.g. QUIC).
Two multiplexers are commonplace in libp2p implementations: Two multiplexers are commonplace in libp2p implementations:
[mplex](https://github.com/libp2p/specs/tree/master/mplex) and [yamux](https://github.com/hashicorp/yamux/blob/master/spec.md). [mplex](https://github.com/libp2p/specs/tree/master/mplex) and [yamux](https://github.com/libp2p/specs/blob/master/yamux/README.md).
Their protocol IDs are, respectively: `/mplex/6.7.0` and `/yamux/1.0.0`. Their protocol IDs are, respectively: `/mplex/6.7.0` and `/yamux/1.0.0`.
Clients MUST support [mplex](https://github.com/libp2p/specs/tree/master/mplex) Clients MUST support [mplex](https://github.com/libp2p/specs/tree/master/mplex)
and MAY support [yamux](https://github.com/hashicorp/yamux/blob/master/spec.md). and MAY support [yamux](https://github.com/libp2p/specs/blob/master/yamux/README.md).
If both are supported by the client, yamux MUST take precedence during negotiation. If both are supported by the client, yamux MUST take precedence during negotiation.
See the [Rationale](#design-decision-rationale) section below for tradeoffs. See the [Rationale](#design-decision-rationale) section below for tradeoffs.

2
tests/generators/bls/main.py
View File

@ -519,7 +519,7 @@ def create_provider(fork_name: SpecForkName,
preset_name='general', preset_name='general',
runner_name='bls', runner_name='bls',
handler_name=handler_name, handler_name=handler_name,
suite_name='small', suite_name='bls',
case_name=case_name, case_name=case_name,
case_fn=lambda: [('data', 'data', case_content)] case_fn=lambda: [('data', 'data', case_content)]
) )

2
tests/generators/kzg_4844/main.py
View File

@ -527,7 +527,7 @@ def create_provider(fork_name: SpecForkName,
preset_name='general', preset_name='general',
runner_name='kzg', runner_name='kzg',
handler_name=handler_name, handler_name=handler_name,
suite_name='small', suite_name='kzg-mainnet',
case_name=case_name, case_name=case_name,
case_fn=lambda: [('data', 'data', case_content)] case_fn=lambda: [('data', 'data', case_content)]
) )