From 32186245a94f00d1f3acd21b3a6ade0481fa83ad Mon Sep 17 00:00:00 2001 From: Holger Drewes Date: Fri, 11 Nov 2022 11:32:08 +0100 Subject: [PATCH 1/3] Added EIP-1153 to CFI for Shanghai --- network-upgrades/mainnet-upgrades/shanghai.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/network-upgrades/mainnet-upgrades/shanghai.md b/network-upgrades/mainnet-upgrades/shanghai.md index 4f77f6eb97..023c3118ca 100644 --- a/network-upgrades/mainnet-upgrades/shanghai.md +++ b/network-upgrades/mainnet-upgrades/shanghai.md @@ -11,6 +11,7 @@ Specifies changes included in the Network Upgrade. ### EIPs Considered for Inclusion Specifies changes potentially included in the Network Upgrade, pending successful deployment on Client Integration Testnets. +* [EIP-1153: Transient storage opcodes](https://eips.ethereum.org/EIPS/eip-1153) * [EIP-3540: EVM Object Format (EOF) v1](https://eips.ethereum.org/EIPS/eip-3540) * [EIP-3670: EOF - Code Validation](https://eips.ethereum.org/EIPS/eip-3670) @@ -20,13 +21,13 @@ Specifies changes potentially included in the Network Upgrade, pending successfu Code merged into Participating Clients: -| EIP | [EIP-3540](https://eips.ethereum.org/EIPS/eip-3540) | [EIP-3651](https://eips.ethereum.org/EIPS/eip-3651) | [EIP-3670](https://eips.ethereum.org/EIPS/eip-3670) | [EIP-3855](https://eips.ethereum.org/EIPS/eip-3855) | [EIP-3860](https://eips.ethereum.org/EIPS/eip-3860) | [EIP-4895](https://eips.ethereum.org/EIPS/eip-4895) | -|------------------|------|------|------|------|------|------| -| **Geth** | [Not merged](https://github.com/ethereum/go-ethereum/pull/22958) | | [Not merged](https://github.com/ethereum/go-ethereum/pull/24090) | [Merged](https://github.com/ethereum/go-ethereum/pull/24039) | [Not merged](https://github.com/ethereum/go-ethereum/pull/23847) | | -| **Besu** | | | | | | [Not merged](https://github.com/hyperledger/besu/pull/4552)| -| **Nethermind** | [Not merged](https://github.com/NethermindEth/nethermind/pull/4608)| [Merged](https://github.com/NethermindEth/nethermind/pull/4594)|[Not merged](https://github.com/NethermindEth/nethermind/pull/4609)|[Merged](https://github.com/NethermindEth/nethermind/pull/4599) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4740) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4731) | -| **Erigon** | | | | [Merged](https://github.com/ledgerwatch/erigon/pull/5256) | | | -| **EthereumJS** | | | | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1616) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1619) | | +| EIP | [EIP-1153](https://eips.ethereum.org/EIPS/eip-1153) | [EIP-3540](https://eips.ethereum.org/EIPS/eip-3540) | [EIP-3651](https://eips.ethereum.org/EIPS/eip-3651) | [EIP-3670](https://eips.ethereum.org/EIPS/eip-3670) | [EIP-3855](https://eips.ethereum.org/EIPS/eip-3855) | [EIP-3860](https://eips.ethereum.org/EIPS/eip-3860) | [EIP-4895](https://eips.ethereum.org/EIPS/eip-4895) | +|------|------|------|------|------|------|------|------| +| **Geth** | | [Not merged](https://github.com/ethereum/go-ethereum/pull/22958) | | [Not merged](https://github.com/ethereum/go-ethereum/pull/24090) | [Merged](https://github.com/ethereum/go-ethereum/pull/24039) | [Not merged](https://github.com/ethereum/go-ethereum/pull/23847) | | +| **Besu** | | | | | | | [Not merged](https://github.com/hyperledger/besu/pull/4552)| +| **Nethermind** | | [Not merged](https://github.com/NethermindEth/nethermind/pull/4608)| [Merged](https://github.com/NethermindEth/nethermind/pull/4594)|[Not merged](https://github.com/NethermindEth/nethermind/pull/4609)|[Merged](https://github.com/NethermindEth/nethermind/pull/4599) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4740) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4731) | +| **Erigon** | | | | | [Merged](https://github.com/ledgerwatch/erigon/pull/5256) | | | +| **EthereumJS** | | | | | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1616) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1619) | | Tasks - [ ] Client Integration Testing From c5b69814760e13616f2cc25a2043efca653efdb7 Mon Sep 17 00:00:00 2001 From: Holger Drewes Date: Mon, 14 Nov 2022 13:53:39 +0100 Subject: [PATCH 2/3] Added Shanghai CFI EIP-1153 implementation status for Geth, Besu, Nethermind and EthereumJS --- network-upgrades/mainnet-upgrades/shanghai.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/network-upgrades/mainnet-upgrades/shanghai.md b/network-upgrades/mainnet-upgrades/shanghai.md index 023c3118ca..a7c4cabba9 100644 --- a/network-upgrades/mainnet-upgrades/shanghai.md +++ b/network-upgrades/mainnet-upgrades/shanghai.md @@ -23,11 +23,11 @@ Code merged into Participating Clients: | EIP | [EIP-1153](https://eips.ethereum.org/EIPS/eip-1153) | [EIP-3540](https://eips.ethereum.org/EIPS/eip-3540) | [EIP-3651](https://eips.ethereum.org/EIPS/eip-3651) | [EIP-3670](https://eips.ethereum.org/EIPS/eip-3670) | [EIP-3855](https://eips.ethereum.org/EIPS/eip-3855) | [EIP-3860](https://eips.ethereum.org/EIPS/eip-3860) | [EIP-4895](https://eips.ethereum.org/EIPS/eip-4895) | |------|------|------|------|------|------|------|------| -| **Geth** | | [Not merged](https://github.com/ethereum/go-ethereum/pull/22958) | | [Not merged](https://github.com/ethereum/go-ethereum/pull/24090) | [Merged](https://github.com/ethereum/go-ethereum/pull/24039) | [Not merged](https://github.com/ethereum/go-ethereum/pull/23847) | | -| **Besu** | | | | | | | [Not merged](https://github.com/hyperledger/besu/pull/4552)| -| **Nethermind** | | [Not merged](https://github.com/NethermindEth/nethermind/pull/4608)| [Merged](https://github.com/NethermindEth/nethermind/pull/4594)|[Not merged](https://github.com/NethermindEth/nethermind/pull/4609)|[Merged](https://github.com/NethermindEth/nethermind/pull/4599) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4740) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4731) | +| **Geth** | [Not merged](https://github.com/ethereum/go-ethereum/pull/26003) | [Not merged](https://github.com/ethereum/go-ethereum/pull/22958) | | [Not merged](https://github.com/ethereum/go-ethereum/pull/24090) | [Merged](https://github.com/ethereum/go-ethereum/pull/24039) | [Not merged](https://github.com/ethereum/go-ethereum/pull/23847) | | +| **Besu** | [Not merged](https://github.com/hyperledger/besu/pull/4118) | | | | | | [Not merged](https://github.com/hyperledger/besu/pull/4552)| +| **Nethermind** | [Merged](https://github.com/NethermindEth/nethermind/pull/4126V) | [Not merged](https://github.com/NethermindEth/nethermind/pull/4608)| [Merged](https://github.com/NethermindEth/nethermind/pull/4594)|[Not merged](https://github.com/NethermindEth/nethermind/pull/4609)|[Merged](https://github.com/NethermindEth/nethermind/pull/4599) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4740) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4731) | | **Erigon** | | | | | [Merged](https://github.com/ledgerwatch/erigon/pull/5256) | | | -| **EthereumJS** | | | | | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1616) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1619) | | +| **EthereumJS** | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1860) | | | | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1616) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1619) | | Tasks - [ ] Client Integration Testing From 3b47ab1c21a72dae525190329ec1df92d3e63500 Mon Sep 17 00:00:00 2001 From: Holger Drewes Date: Mon, 14 Nov 2022 13:57:29 +0100 Subject: [PATCH 3/3] Added missing Shanghai implementation status updates for EthereumJS --- network-upgrades/mainnet-upgrades/shanghai.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network-upgrades/mainnet-upgrades/shanghai.md b/network-upgrades/mainnet-upgrades/shanghai.md index a7c4cabba9..0521f5b0a5 100644 --- a/network-upgrades/mainnet-upgrades/shanghai.md +++ b/network-upgrades/mainnet-upgrades/shanghai.md @@ -27,7 +27,7 @@ Code merged into Participating Clients: | **Besu** | [Not merged](https://github.com/hyperledger/besu/pull/4118) | | | | | | [Not merged](https://github.com/hyperledger/besu/pull/4552)| | **Nethermind** | [Merged](https://github.com/NethermindEth/nethermind/pull/4126V) | [Not merged](https://github.com/NethermindEth/nethermind/pull/4608)| [Merged](https://github.com/NethermindEth/nethermind/pull/4594)|[Not merged](https://github.com/NethermindEth/nethermind/pull/4609)|[Merged](https://github.com/NethermindEth/nethermind/pull/4599) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4740) |[Not merged](https://github.com/NethermindEth/nethermind/pull/4731) | | **Erigon** | | | | | [Merged](https://github.com/ledgerwatch/erigon/pull/5256) | | | -| **EthereumJS** | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1860) | | | | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1616) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1619) | | +| **EthereumJS** | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1860) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1719) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1814) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1743) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1616) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1619) | [Merged](https://github.com/ethereumjs/ethereumjs-monorepo/pull/2353) | Tasks - [ ] Client Integration Testing