Merge remote-tracking branch 'origin/main' into elmato/add-overhead-s…

…torage-price
eosnetworkfoundation · Jul 11, 2024 · 48ad835 · 48ad835
2 parents 229be9d + e0b96d2
commit 48ad835
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/contract.yml b/.github/workflows/contract.yml
@@ -56,7 +56,7 @@ jobs:
           DWITH_TEST_ACTIONS: ${{ matrix.DWITH_TEST_ACTIONS }}
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: contract.test-actions-${{ matrix.DWITH_TEST_ACTIONS }}.tar.gz
           path: contract.tar.gz
@@ -80,7 +80,8 @@ jobs:
         run: .github/workflows/build-contract-test.sh
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        if: ${{ matrix.DWITH_TEST_ACTIONS == 'on' }}
+        uses: actions/upload-artifact@v4
         with:
           name: contract-test.tar.gz
           path: contract-test.tar.gz
@@ -92,8 +93,8 @@ jobs:
           DWITH_TEST_ACTIONS: ${{ matrix.DWITH_TEST_ACTIONS }}
 
       - name: Upload Test Metrics
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results.xml
+          name: test-results-test-actions-${{ matrix.DWITH_TEST_ACTIONS }}.xml
           path: test-results.xml
           if-no-files-found: error
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=33952)
+    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);
+16 −7		silkworm/core/chain/config.cpp
+83 −102		silkworm/core/chain/config.hpp
+1 −1		silkworm/core/chain/config_test.cpp