Misc changes

Author: RogerPodacter

app/services/eth_block_importer.rb

@@ -150,8 +150,8 @@ def set_eth_block_starting_points
 
       l2_block = GethDriver.client.call("eth_getBlockByNumber", ["0x#{l2_candidate.to_s(16)}", false])
 
-      # Start from finalization block
-      retry_offset = 63
+      # Start from finalization block (use smaller offset for tests)
+      retry_offset = Rails.env.test? ? 0 : 63
       blocks_behind = latest_l2_block_number - l2_candidate
 
       if l1_hash == l1_attributes[:hash] && l1_attributes[:number] == l1_candidate && blocks_behind >= retry_offset

app/services/geth_driver.rb

@@ -219,7 +219,7 @@ def init_command
       "--authrpc.addr localhost",
       "--authrpc.vhosts=\"*\"",
       "--nodiscover",
-      "--cache 16000",
+      "--cache 32000",
       "--rpc.gascap 5000000000",
       "--rpc.batch-request-limit=10000",
       "--rpc.batch-response-max-size=100000000",
@@ -230,7 +230,6 @@ def init_command
       "--gcmode archive",
       "--history.state 0",
       "--history.transactions 0",
-      "--nocompaction",
       "--rollup.enabletxpooladmission=false",
       "--rollup.disabletxpoolgossip",
       "--override.canyon", "0",

config/environments/development.rb

@@ -12,10 +12,10 @@
   config.eager_load = true
 
   # Show full error reports.
-  config.consider_all_requests_local = true
+  config.consider_all_requests_local = false
 
   # Enable server timing
-  config.server_timing = true
+  config.server_timing = false
 
   # Enable file-based caching for persistent checkpoints
   config.action_controller.perform_caching = true

config/initializers/type_extensions.rb

@@ -0,0 +1,27 @@
+class Integer
+  def ether
+    (self.to_d * 1e18.to_d).to_i
+  end
+  
+  def gwei
+    (self.to_d * 1e9.to_d).to_i
+  end
+end
+
+class Float
+  def ether
+    (self.to_d * 1e18.to_d).to_i
+  end
+  
+  def gwei
+    (self.to_d * 1e9.to_d).to_i
+  end
+end
+
+class String
+  def pbcopy(strip: true)
+    to_copy = strip ? self.strip : self
+    Clipboard.copy(to_copy)
+    nil
+  end
+end

config/queue.yml

@@ -4,7 +4,7 @@ default: &default
       batch_size: 500
   workers:
     - queues: "*"
-      threads: 3
+      threads: <%= ENV.fetch("JOB_THREADS", 3).to_i %>
       processes: <%= ENV.fetch("JOB_CONCURRENCY", 2).to_i %>
       polling_interval: 0.1
 

lib/block_validator.rb

@@ -2,15 +2,6 @@ class BlockValidator
   attr_reader :errors, :stats
 
   def initialize
-    # Initialize thread pool for storage verification
-    storage_threads = ENV.fetch('STORAGE_VERIFICATION_THREADS', '2').to_i
-    @storage_executor = Concurrent::ThreadPoolExecutor.new(
-      min_threads: 1,
-      max_threads: storage_threads,
-      max_queue: storage_threads * 3,
-      fallback_policy: :caller_runs
-    )
-
     # Initialize validation state
     reset_validation_state
   end
@@ -330,16 +321,11 @@ def binary_equal?(val1, val2)
   def verify_storage_state(expected_data, l1_block_num, block_tag)
     ImportProfiler.start("storage_verification")
 
-    # Parallel verification using thread pool
-    creation_promises = Array(expected_data[:creations]).map do |creation|
-      Concurrent::Promise.execute(executor: @storage_executor) do
-        verify_ethscription_storage(creation, l1_block_num, block_tag)
-      end
+    # Sequentially verify each creation on the main thread
+    Array(expected_data[:creations]).each do |creation|
+      verify_ethscription_storage(creation, l1_block_num, block_tag)
     end
 
-    # Wait for all creation verifications to complete
-    creation_promises.each(&:value!)
-
     # Verify ownership after transfers
     verify_transfer_ownership(Array(expected_data[:transfers]), block_tag)
 

lib/ethscriptions_api_client.rb

@@ -56,6 +56,10 @@ def fetch_paginated(path, params)
     end
 
     def fetch_json(path, params = {})
+      # Add API key to query params if provided
+      api_key = ENV['ETHSCRIPTIONS_API_KEY']
+      params = params.merge(api_key: api_key) if api_key.present?
+
       uri = URI("#{BASE_URL}#{path}")
       uri.query = URI.encode_www_form(params) if params.any?