Merge remote-tracking branch 'origin/elmato/fix-consensus-parameters-…

…decode' into elmato/merge-fix-serialization-consensus-params-to-master
eosnetworkfoundation · Jun 18, 2024 · 562542f · 562542f
2 parents f17691f + 97b2a41
commit 562542f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/eosevm/consensus_parameters.cpp b/eosevm/consensus_parameters.cpp
@@ -62,12 +62,12 @@ std::optional<ConsensusParameters> ConsensusParameters::decode(silkworm::ByteVie
     // Parse according to version. For now, only 0.
     switch (version) {
         case 0: {
-            constexpr size_t size_before_fee_param = sizeof(uint64_t);
-            SILKWORM_ASSERT(encoded.length() > size_before_fee_param);
-            config.gas_fee_parameters = GasFeeParameters::decode(silkworm::ByteView{&encoded[size_before_fee_param], encoded.length() - size_before_fee_param});
+            config.gas_fee_parameters = GasFeeParameters::decode(silkworm::ByteView{&encoded[sizeof(uint64_t)], encoded.length() - sizeof(uint64_t)});
             break;
-            }
-        default: SILKWORM_ASSERT(version <= 0);
+        }
+        default: {
+            SILKWORM_ASSERT(false);
+        }
     }
 
     return config;

diff --git a/silkworm/node/db/access_layer_test.cpp b/silkworm/node/db/access_layer_test.cpp
@@ -949,6 +949,11 @@ TEST_CASE("ConsensusParameters") {
     }
     };
 
+    auto tmp = value1.encode();
+
+    ByteView bv{tmp};
+    REQUIRE_NOTHROW(eosevm::ConsensusParameters::decode(bv));
+
     constexpr eosevm::ConsensusParameters value2{
     .gas_fee_parameters = eosevm::GasFeeParameters{
         .gas_txnewaccount = 2,