Improve import validation

Author: RogerPodacter

app/services/eth_block_importer.rb

@@ -20,9 +20,7 @@ def initialize
 
     # Validation configuration
     @validation_enabled = ENV.fetch('VALIDATE_IMPORT').casecmp?('true')
-    @validation_strict = ENV.fetch('VALIDATE_STRICT').casecmp?('true')
-    @validator = BlockValidator.new if @validation_enabled
-    @validation_stats = {passed: 0, failed: 0, skipped: 0}
+    @validation_stats = {passed: 0, failed: 0}
 
     # Create a shared thread pool for validation
     if @validation_enabled
@@ -36,7 +34,7 @@ def initialize
       logger.info "Created validation thread pool with #{@validation_threads} threads"
     end
 
-    logger.info "EthBlockImporter initialized - Validation: #{@validation_enabled ? 'ENABLED' : 'disabled'}, Strict: #{@validation_strict ? 'YES' : 'no'}"
+    logger.info "EthBlockImporter initialized - Validation: #{@validation_enabled ? 'ENABLED' : 'disabled'}"
 
     MemeryExtensions.clear_all_caches!
 
@@ -443,22 +441,49 @@ def validate_imported_blocks(l1_block_numbers, l2_blocks)
 
       Concurrent::Promise.execute(executor: @validation_executor) do
         if l2_hashes.empty?
-          { block: l1_block_num, status: :skipped, message: "No L2 blocks found" }
+          {
+            block: l1_block_num,
+            status: :failed,
+            message: "No L2 blocks found for L1 block #{l1_block_num}",
+            errors: ["No L2 blocks found for L1 block #{l1_block_num}"]
+          }
         else
           begin
-            result = @validator.validate_l1_block(l1_block_num, l2_hashes)
-            {
-              block: l1_block_num,
-              status: result.success ? :passed : :failed,
-              result: result,
-              errors: result.errors
-            }
+            validator = BlockValidator.new
+            result = validator.validate_l1_block(l1_block_num, l2_hashes)
+
+            if result.stats[:api_unavailable]
+              {
+                block: l1_block_num,
+                status: :failed,
+                result: result,
+                errors: result.errors.presence || ["API unavailable for block #{l1_block_num}"],
+                message: "API unavailable for block #{l1_block_num}"
+              }
+            elsif result.stats[:incomplete_actual]
+              {
+                block: l1_block_num,
+                status: :failed,
+                result: result,
+                errors: result.errors.presence || ["Incomplete L2 receipts for block #{l1_block_num}"],
+                message: "Incomplete L2 receipts for block #{l1_block_num}"
+              }
+            else
+              payload = {
+                block: l1_block_num,
+                status: result.success ? :passed : :failed,
+                result: result,
+                errors: result.errors
+              }
+              payload
+            end
           rescue => e
             {
               block: l1_block_num,
               status: :error,
               message: e.message,
-              backtrace: e.backtrace.first(5)
+              backtrace: e.backtrace.first(5),
+              errors: [e.message]
             }
           end
         end
@@ -475,23 +500,16 @@ def validate_imported_blocks(l1_block_numbers, l2_blocks)
         validation[:result].log_summary(logger)
         @validation_stats[:passed] += 1
       when :failed
-        validation[:result].log_summary(logger)
+        validation[:result]&.log_summary(logger)
         @validation_stats[:failed] += 1
-        if @validation_strict
-          binding.irb
-          raise "Validation failed for L1 block #{validation[:block]}: #{validation[:errors].join('; ')}"
-        end
-      when :skipped
-        logger.warn "Validation: #{validation[:message]} for L1 block #{validation[:block]}"
-        @validation_stats[:skipped] += 1
+        binding.irb if ENV['DEBUG'] == '1'
+        raise "Validation failed for L1 block #{validation[:block]}: #{Array(validation[:errors]).join('; ')}"
       when :error
         logger.error "Validation error for block #{validation[:block]}: #{validation[:message]}"
         logger.error validation[:backtrace].join("\n") if ENV['DEBUG'] && validation[:backtrace]
         @validation_stats[:failed] += 1
-        if @validation_strict
-          binding.irb
-          raise "Validation failed for L1 block #{validation[:block]}: #{validation[:errors].join('; ')}"
-        end
+        binding.irb if ENV['DEBUG'] == '1'
+        raise "Validation failed for L1 block #{validation[:block]}: #{Array(validation[:errors]).join('; ')}"
       end
     end
 
@@ -510,7 +528,6 @@ def log_validation_summary
     logger.info "Validation Summary: #{@validation_stats[:passed]}/#{total} passed (#{pass_rate}%)"
     logger.info "  Passed: #{@validation_stats[:passed]}"
     logger.info "  Failed: #{@validation_stats[:failed]}"
-    logger.info "  Skipped: #{@validation_stats[:skipped]}"
     logger.info "=" * 60
   end
 
@@ -523,7 +540,7 @@ def validation_summary
     pass_rate = total > 0 ? (@validation_stats[:passed].to_f / total * 100).round(2) : 0
 
     "Validation: #{@validation_stats[:passed]}/#{total} passed (#{pass_rate}%), " \
-    "#{@validation_stats[:failed]} failed, #{@validation_stats[:skipped]} skipped"
+    "#{@validation_stats[:failed]} failed"
   end
 
   def shutdown

config/derive_ethscriptions_blocks.rb

@@ -14,7 +14,6 @@
   'L1_GENESIS_BLOCK' => { description: 'L1 Genesis Block number', required: true },
   'BLOCK_IMPORT_BATCH_SIZE' => { description: 'Block import batch size', default: '2' },
   'VALIDATE_IMPORT' => { description: 'Enable validation (true/false)', default: 'false' },
-  'VALIDATE_STRICT' => { description: 'Halt on validation failure (true/false)', default: 'false' },
   'IMPORT_INTERVAL' => { description: 'Seconds between import attempts', default: '6' }
 }
 
@@ -84,7 +83,6 @@
 puts "  Geth RPC: #{ENV['NON_AUTH_GETH_RPC_URL']}"
 puts "  Batch Size: #{ENV['BLOCK_IMPORT_BATCH_SIZE']}"
 puts "  Validation: #{ENV['VALIDATE_IMPORT'] == 'true' ? 'ENABLED' : 'disabled'}"
-puts "  Strict Mode: #{ENV['VALIDATE_STRICT'] == 'true' ? 'ENABLED' : 'disabled'}"
 puts "  Import Interval: #{ENV['IMPORT_INTERVAL']}s"
 puts "="*80
 
@@ -174,17 +172,11 @@ module Clockwork
 
         puts "[#{Time.now}] ❌ Error: #{e.message}"
 
-        # For validation failures in strict mode, exit
-        if ENV['VALIDATE_STRICT'] == 'true' && e.message.include?('Validation failed')
-          puts "[#{Time.now}] Exiting due to validation failure in strict mode"
-          exit 1
-        end
-
         # For other errors, wait and retry
         puts "[#{Time.now}] Retrying in #{import_interval}s..."
       end
 
       sleep import_interval
     end
   end
-end
+end