Merge remote-tracking branch 'origin/release/1.0' into elmato/merge-k…

…ayan_dynamic_chainid-to-main
eosnetworkfoundation · Jul 10, 2024 · 1030e69 · 1030e69
2 parents 88e0e4f + d427345
commit 1030e69
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/silkworm b/silkworm
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -92,5 +92,5 @@ target_compile_options(evm_runtime PUBLIC --no-missing-ricardian-clause)
 if (WITH_LARGE_STACK)
     target_link_options(evm_runtime PUBLIC --stack-size=50000000)
 else()
-    target_link_options(evm_runtime PUBLIC --stack-size=34720)
+    target_link_options(evm_runtime PUBLIC --stack-size=37328)
 endif()
diff --git a/src/actions.cpp b/src/actions.cpp
@@ -339,7 +339,7 @@ void evm_contract::exec(const exec_input& input, const std::optional<exec_callba
     assert_unfrozen();
 
     std::optional<std::pair<const std::string, const ChainConfig*>> found_chain_config = lookup_known_chain(_config->get_chainid());
-    check( found_chain_config.has_value(), "failed to find expected chain config" );
+    check( found_chain_config.has_value(), "unknown chainid" );
 
     eosevm::block_mapping bm(_config->get_genesis_time().sec_since_epoch());
 
@@ -465,7 +465,7 @@ void evm_contract::process_tx(const runtime_config& rc, eosio::name miner, const
     }
 
     std::optional<std::pair<const std::string, const ChainConfig*>> found_chain_config = lookup_known_chain(_config->get_chainid());
-    check( found_chain_config.has_value(), "failed to find expected chain config" );
+    check( found_chain_config.has_value(), "unknown chainid" );
 
     eosevm::block_mapping bm(_config->get_genesis_time().sec_since_epoch());
 

diff --git a/tests/init_tests.cpp b/tests/init_tests.cpp
@@ -64,7 +64,7 @@ BOOST_FIXTURE_TEST_CASE(check_init, basic_evm_tester) try {
                            eosio_assert_message_exception,
                            [](const eosio_assert_message_exception& e) {return testing::expect_assert_message(e, "assertion failure with message: contract not initialized");});
 
-   BOOST_REQUIRE_EXCEPTION(init(42),
+   BOOST_REQUIRE_EXCEPTION(init(0),
                            eosio_assert_message_exception,
                            [](const eosio_assert_message_exception& e) {return testing::expect_assert_message(e, "assertion failure with message: unknown chainid");});
    init(15555);