Cleanup

Author: RogerPodacter

lib/l1_rpc_prefetcher.rb

@@ -2,6 +2,7 @@
 require 'retriable'
 
 class L1RpcPrefetcher
+  include Memery
   def initialize(ethereum_client:,
                  ahead: ENV.fetch('L1_PREFETCH_FORWARD', Rails.env.test? ? 5 : 200).to_i,
                  threads: ENV.fetch('L1_PREFETCH_THREADS', 2).to_i)
@@ -17,19 +18,20 @@ def initialize(ethereum_client:,
   end
 
   def ensure_prefetched(from_block)
-    to_block = from_block + @ahead
+    # Check current chain tip first
+    latest = get_latest_block_number
+
+    # Don't prefetch beyond chain tip
+    to_block = [from_block + @ahead, latest].min
+
     # Only create promises for blocks we don't have yet
     blocks_to_fetch = (from_block..to_block).reject { |n| @promises.key?(n) }
 
     return if blocks_to_fetch.empty?
 
-    # Only enqueue a reasonable number at once to avoid overwhelming the promise system
-    max_to_enqueue = [@threads * 10, 50].min
-
-    to_enqueue = blocks_to_fetch.first(max_to_enqueue)
-    Rails.logger.debug "Enqueueing #{to_enqueue.size} of #{blocks_to_fetch.size} blocks: #{to_enqueue.first}..#{to_enqueue.last}"
+    Rails.logger.debug "Enqueueing #{blocks_to_fetch.size} blocks: #{blocks_to_fetch.first}..#{blocks_to_fetch.last}"
 
-    to_enqueue.each { |block_number| enqueue_single(block_number) }
+    blocks_to_fetch.each { |block_number| enqueue_single(block_number) }
   end
 
   def fetch(block_number)
@@ -104,6 +106,11 @@ def shutdown
 
   private
 
+  def get_latest_block_number
+    @eth.get_block_number
+  end
+  memoize :get_latest_block_number, ttl: 12.seconds
+
   def enqueue_single(block_number)
     @promises.compute_if_absent(block_number) do
       Rails.logger.debug "Creating promise for block #{block_number}"

spec/support/ethscriptions_test_helper.rb

@@ -515,12 +515,6 @@ def import_l1_block_with_geth(l1_transactions)
     )
     ethscription_transactions.each { |tx| tx.ethscriptions_block = template_ethscriptions_block }
 
-    mock_ethereum_client = instance_double(EthRpcClient,
-      get_block_number: block_number,
-      get_block: block_data,
-      get_transaction_receipts: receipts_data
-    )
-
     # Mock the prefetcher to return our mock data in the correct format
     eth_block = EthBlock.from_rpc_result(block_data)
     ethscriptions_block = EthscriptionsBlock.from_eth_block(eth_block)
@@ -541,7 +535,6 @@ def import_l1_block_with_geth(l1_transactions)
     old_client = importer.ethereum_client
     old_prefetcher = importer.prefetcher
 
-    importer.ethereum_client = mock_ethereum_client
     importer.instance_variable_set(:@prefetcher, mock_prefetcher)
 
     l2_blocks, eth_blocks = importer.import_next_block