From 890fb3f195f160706c1b739f8b04aa93a754a891 Mon Sep 17 00:00:00 2001
From: yperbasis <andrey.ashikhmin@gmail.com>
Date: Fri, 5 Mar 2021 16:01:11 +0100
Subject: [PATCH] Per ACD meeting 107 EIP-2315 was removed from Berlin

---
 .circleci/config.yml                 |  4 ++--
 .gitmodules                          |  2 +-
 appveyor.yml                         |  2 +-
 core/silkworm/execution/evm_test.cpp | 36 ----------------------------
 evmone                               |  2 +-
 5 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 86e6a73abb..0fba490cf2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,7 +51,7 @@ commands:
       - run:
           name: "Ethereum consensus tests"
           working_directory: ~/build
-          command: cmd/consensus
+          command: cmd/consensus --skip-eip-2315
 
 jobs:
   linux-gcc-7:
@@ -99,7 +99,7 @@ jobs:
           name: "Ethereum consensus tests"
           working_directory: ~/build
           command: |
-            cmd/consensus
+            cmd/consensus --skip-eip-2315
             mv default.profraw consensus.profraw
       - run:
           name: "Coverage"
diff --git a/.gitmodules b/.gitmodules
index 1c9e54e0cb..acfb37b9bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "evmone"]
 	path = evmone
 	url = https://github.com/torquem-ch/evmone.git
-	branch = eip-2315
+	branch = eip-2929
 [submodule "secp256k1"]
 	path = secp256k1
 	url = https://github.com/bitcoin-core/secp256k1.git
diff --git a/appveyor.yml b/appveyor.yml
index d974eef1fc..77982a214d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,4 +40,4 @@ test_script:
   - cd Build
   - cmd\Release\core_test.exe
   - cmd\Release\db_test.exe
-  - cmd\Release\consensus.exe
+  - cmd\Release\consensus.exe --skip-eip-2315
diff --git a/core/silkworm/execution/evm_test.cpp b/core/silkworm/execution/evm_test.cpp
index 21fa97874a..016792bfa8 100644
--- a/core/silkworm/execution/evm_test.cpp
+++ b/core/silkworm/execution/evm_test.cpp
@@ -312,40 +312,4 @@ TEST_CASE("Contract overwrite") {
     CHECK(res.gas_left == 0);
 }
 
-TEST_CASE("EIP-2315") {
-    Block block{};
-    block.header.number = 13'000'000;
-
-    evmc::address address{0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c_address};
-
-    // 0    PUSH1  => 02
-    // 2    PUSH1  => 03
-    // 4    PUSH1  => 0b
-    // 6    JUMPSUB
-    // 7    PUSH1  => 07
-    // 9    SSTORE
-    // 10   STOP
-    // 11   BEGINSUB
-    // 12   MUL
-    // 13   RETURNSUB
-    Bytes code{*from_hex("60026003600b5e600755005c025d")};
-
-    MemoryBuffer db;
-    IntraBlockState state{db};
-    state.set_code(address, code);
-
-    EVM evm{block, state};
-
-    Transaction txn{};
-    txn.from = address;
-    txn.to = address;
-
-    uint64_t gas{1'000'000};
-    CallResult res{evm.execute(txn, gas)};
-    REQUIRE(res.status == EVMC_SUCCESS);
-
-    auto key7{to_bytes32(*from_hex("07"))};
-    CHECK(to_hex(zeroless_view(state.get_current_storage(address, key7))) == "06");
-}
-
 }  // namespace silkworm
diff --git a/evmone b/evmone
index e98b5e9549..e7b4e321b6 160000
--- a/evmone
+++ b/evmone
@@ -1 +1 @@
-Subproject commit e98b5e95498a60687574de0403c8d75d5aa22826
+Subproject commit e7b4e321b62c6ca92de598265e50de222ffeb514