core: merge BaseRuleSet with IRuleSet (#1941)

erigontech · Mar 27, 2024 · 21f4e1e · 21f4e1e
1 parent cca7354
commit 21f4e1e
Show file tree

Hide file tree

Showing 16 changed files with 316 additions and 379 deletions.
diff --git a/silkworm/core/chain/config.hpp b/silkworm/core/chain/config.hpp
@@ -48,7 +48,7 @@ namespace protocol {
         bool operator==(const CliqueConfig&) const = default;
     };
 
-    //! \see IRuleSet
+    //! \see RuleSet
     using PreMergeRuleSetConfig = std::variant<NoPreMergeConfig, EthashConfig, CliqueConfig, bor::Config>;
 
 }  // namespace protocol

diff --git a/silkworm/core/execution/processor.cpp b/silkworm/core/execution/processor.cpp
@@ -24,7 +24,7 @@
 
 namespace silkworm {
 
-ExecutionProcessor::ExecutionProcessor(const Block& block, protocol::IRuleSet& rule_set, State& state,
+ExecutionProcessor::ExecutionProcessor(const Block& block, protocol::RuleSet& rule_set, State& state,
                                        const ChainConfig& config)
     : state_{state}, rule_set_{rule_set}, evm_{block, state_, config} {
     evm_.beneficiary = rule_set.get_beneficiary(block.header);

diff --git a/silkworm/core/execution/processor.hpp b/silkworm/core/execution/processor.hpp
@@ -33,7 +33,7 @@ class ExecutionProcessor {
     ExecutionProcessor(const ExecutionProcessor&) = delete;
     ExecutionProcessor& operator=(const ExecutionProcessor&) = delete;
 
-    ExecutionProcessor(const Block& block, protocol::IRuleSet& rule_set, State& state, const ChainConfig& config);
+    ExecutionProcessor(const Block& block, protocol::RuleSet& rule_set, State& state, const ChainConfig& config);
 
     /**
      * Execute a transaction, but do not write to the DB yet.
@@ -69,7 +69,7 @@ class ExecutionProcessor {
 
     uint64_t cumulative_gas_used_{0};
     IntraBlockState state_;
-    protocol::IRuleSet& rule_set_;
+    protocol::RuleSet& rule_set_;
     EVM evm_;
 };
 

diff --git a/silkworm/core/protocol/base_rule_set.cpp b/silkworm/core/protocol/base_rule_set.cpp
diff --git a/silkworm/core/protocol/base_rule_set.hpp b/silkworm/core/protocol/base_rule_set.hpp
diff --git a/silkworm/core/protocol/bor_rule_set.cpp b/silkworm/core/protocol/bor_rule_set.cpp
@@ -37,7 +37,7 @@ ValidationResult BorRuleSet::validate_block_header(const BlockHeader& header, co
         return ValidationResult::kInvalidMixDigest;
     }
 
-    ValidationResult res{BaseRuleSet::validate_block_header(header, state, with_future_timestamp_check)};
+    ValidationResult res{RuleSet::validate_block_header(header, state, with_future_timestamp_check)};
     if (res != ValidationResult::kOk) {
         return res;
     }
@@ -175,7 +175,7 @@ void BorRuleSet::add_fee_transfer_log(IntraBlockState& state, const intx::uint25
 }
 
 const bor::Config& BorRuleSet::config() const {
-    return std::get<bor::Config>(chain_config_.rule_set_config);
+    return std::get<bor::Config>(chain_config_->rule_set_config);
 }
 
 }  // namespace silkworm::protocol