t8n: Include empty requests[Hash] in JSON output

ethereum · Oct 29, 2024 · 5a3e47f · 5a3e47f
1 parent 884db23
commit 5a3e47f
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 8 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -8,3 +8,4 @@ find_package(intx CONFIG REQUIRED)
 add_subdirectory(evmmax)
 add_subdirectory(evmone)
 add_subdirectory(evmone_precompiles)
+add_subdirectory(crypto)
diff --git a/lib/crypto/CMakeLists.txt b/lib/crypto/CMakeLists.txt
@@ -0,0 +1,13 @@
+# evmone: Fast Ethereum Virtual Machine implementation
+# Copyright 2024 The evmone Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(crypto STATIC)
+add_library(evmone::crypto ALIAS crypto)
+target_compile_features(crypto PRIVATE cxx_std_20)
+target_link_libraries(crypto PUBLIC evmc::evmc_cpp)
+target_sources(
+    crypto PRIVATE
+    sha256.hpp
+    sha256.cpp
+)
diff --git a/lib/evmone_precompiles/sha256.cpp → lib/crypto/sha256.cpp b/lib/evmone_precompiles/sha256.cpp → lib/crypto/sha256.cpp
diff --git a/lib/evmone_precompiles/sha256.hpp → lib/crypto/sha256.hpp b/lib/evmone_precompiles/sha256.hpp → lib/crypto/sha256.hpp
diff --git a/lib/evmone_precompiles/CMakeLists.txt b/lib/evmone_precompiles/CMakeLists.txt
@@ -20,8 +20,6 @@ target_sources(
     ripemd160.cpp
     secp256k1.hpp
     secp256k1.cpp
-    sha256.hpp
-    sha256.cpp
     kzg.hpp
     kzg.cpp
 )
diff --git a/lib/evmone_precompiles/kzg.hpp b/lib/evmone_precompiles/kzg.hpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#include "sha256.hpp"
+#include "../crypto/sha256.hpp"
 #include <intx/intx.hpp>
 
 namespace evmone::crypto

diff --git a/test/state/CMakeLists.txt b/test/state/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 add_library(evmone-state STATIC)
 add_library(evmone::state ALIAS evmone-state)
-target_link_libraries(evmone-state PUBLIC evmc::evmc_cpp PRIVATE evmone evmone::precompiles ethash::keccak)
+target_link_libraries(evmone-state PUBLIC evmc::evmc_cpp PRIVATE evmone evmone::precompiles ethash::keccak evmone::crypto)
 target_include_directories(evmone-state PRIVATE ${evmone_private_include_dir})
 target_sources(
     evmone-state PRIVATE

diff --git a/test/state/precompiles.cpp b/test/state/precompiles.cpp
@@ -5,13 +5,13 @@
 #include "precompiles.hpp"
 #include "precompiles_internal.hpp"
 #include "precompiles_stubs.hpp"
+#include <crypto/sha256.hpp>
 #include <evmone_precompiles/blake2b.hpp>
 #include <evmone_precompiles/bls.hpp>
 #include <evmone_precompiles/bn254.hpp>
 #include <evmone_precompiles/kzg.hpp>
 #include <evmone_precompiles/ripemd160.hpp>
 #include <evmone_precompiles/secp256k1.hpp>
-#include <evmone_precompiles/sha256.hpp>
 #include <intx/intx.hpp>
 #include <array>
 #include <bit>

diff --git a/test/t8n/t8n.cpp b/test/t8n/t8n.cpp
@@ -2,6 +2,7 @@
 // Copyright 2023 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
+#include "../lib/crypto/sha256.hpp"
 #include "../state/errors.hpp"
 #include "../state/ethash_difficulty.hpp"
 #include "../state/mpt_hash.hpp"
@@ -241,7 +242,38 @@ int main(int argc, const char* argv[])
         if (rev >= EVMC_PRAGUE)
         {
             // EIP-7685: General purpose execution layer requests
-            j_result["requestsRoot"] = hex0x(state::EMPTY_MPT_HASH);
+            j_result["requests"] = json::json::array();
+            // TODO: actual requests should be used in the following lines, for now all empty.
+            uint8_t withdrawals[1] = {0x00};
+            uint8_t deposits[1] = {0x01};
+            uint8_t consolidations[1] = {0x02};
+            j_result["requests"][0] = hex0x(evmc::bytes{});
+            j_result["requests"][1] = hex0x(evmc::bytes{});
+            j_result["requests"][2] = hex0x(evmc::bytes{});
+
+            uint8_t withdrawals_hash[crypto::SHA256_HASH_SIZE];
+            uint8_t deposits_hash[crypto::SHA256_HASH_SIZE];
+            uint8_t consolidations_hash[crypto::SHA256_HASH_SIZE];
+
+            crypto::sha256(reinterpret_cast<std::byte*>(withdrawals_hash),
+                reinterpret_cast<std::byte*>(withdrawals), 1);
+            crypto::sha256(reinterpret_cast<std::byte*>(deposits_hash),
+                reinterpret_cast<std::byte*>(deposits), 1);
+            crypto::sha256(reinterpret_cast<std::byte*>(consolidations_hash),
+                reinterpret_cast<std::byte*>(consolidations), 1);
+
+            uint8_t buffer[3 * crypto::SHA256_HASH_SIZE];
+            {
+                auto it = std::begin(buffer);
+                it = std::copy_n(withdrawals_hash, 32, it);
+                it = std::copy_n(deposits_hash, 32, it);
+                std::copy_n(consolidations_hash, 32, it);
+            }
+            uint8_t requests_hash[crypto::SHA256_HASH_SIZE];
+            crypto::sha256(reinterpret_cast<std::byte*>(requests_hash),
+                reinterpret_cast<const std::byte*>(buffer), 3 * crypto::SHA256_HASH_SIZE);
+
+            j_result["requestsHash"] = hex0x(requests_hash);
         }
 
         std::ofstream{output_dir / output_result_file} << std::setw(2) << j_result;

diff --git a/test/unittests/precompiles_kzg_test.cpp b/test/unittests/precompiles_kzg_test.cpp
@@ -2,9 +2,9 @@
 // Copyright 2024 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
+#include <crypto/sha256.hpp>
 #include <evmc/evmc.hpp>
 #include <evmone_precompiles/kzg.hpp>
-#include <evmone_precompiles/sha256.hpp>
 #include <gtest/gtest.h>
 #include <intx/intx.hpp>
 #include <span>

diff --git a/test/unittests/precompiles_sha256_test.cpp b/test/unittests/precompiles_sha256_test.cpp
@@ -2,8 +2,8 @@
 // Copyright 2024 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
+#include <crypto/sha256.hpp>
 #include <evmc/hex.hpp>
-#include <evmone_precompiles/sha256.hpp>
 #include <gtest/gtest.h>
 
 using evmone::crypto::sha256;