Upgrade intx to 0.10.0 (#622)

ethereum · Apr 25, 2023 · c5abb3f · c5abb3f
1 parent 2b7194e
commit c5abb3f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake
@@ -11,7 +11,7 @@ hunter_cmake_args(
 
 hunter_config(
     intx
-    VERSION 0.9.1
-    URL https://github.com/chfast/intx/archive/v0.9.1.tar.gz
-    SHA1 d9907860327b52ca5cba4048d1a0e8274c883584
+    VERSION 0.10.0
+    URL https://github.com/chfast/intx/archive/v0.10.0.tar.gz
+    SHA1 3a6ebe0b1a36527b6ef291ee93a8e508371e5b77
 )
diff --git a/lib/evmone/baseline.cpp b/lib/evmone/baseline.cpp
@@ -271,7 +271,7 @@ int64_t dispatch(const CostTable& cost_table, ExecutionState& state, int64_t gas
             return gas;
         }
     }
-    INTX_UNREACHABLE();
+    intx::unreachable();
 }
 
 #if EVMONE_CGOTO_SUPPORTED

diff --git a/lib/evmone/execution_state.hpp b/lib/evmone/execution_state.hpp
@@ -92,12 +92,10 @@ class Memory
     void grow(size_t new_size) noexcept
     {
         // Restriction for future changes. EVM always has memory size as multiple of 32 bytes.
-        assert(new_size % 32 == 0);
+        INTX_REQUIRE(new_size % 32 == 0);
 
         // Allow only growing memory. Include hint for optimizing compiler.
-        assert(new_size > m_size);
-        if (new_size <= m_size)
-            INTX_UNREACHABLE();  // TODO: NOLINT(misc-static-assert)
+        INTX_REQUIRE(new_size > m_size);
 
         if (new_size > m_capacity)
         {