Fix bug with esip1 transfers, add tests and indices

Author: RogerPodacter

app/models/eth_transaction.rb

@@ -3,7 +3,7 @@ class EthTransaction < ApplicationRecord
   belongs_to :eth_block, foreign_key: :block_number, primary_key: :block_number, optional: true,
     inverse_of: :eth_block
   has_one :ethscription, foreign_key: :transaction_hash, primary_key: :transaction_hash,
-    inverse_of: :eth_transaction, inverse_of: :eth_transaction
+    inverse_of: :eth_transaction
   has_many :ethscription_transfers, foreign_key: :transaction_hash,
     primary_key: :transaction_hash, inverse_of: :eth_transaction
   has_many :ethscription_ownership_versions, foreign_key: :transaction_hash,
@@ -157,14 +157,15 @@ def create_ethscription_transfers_from_events!
 
       if event_type == Esip1EventSig
         begin
-          event_to = Eth::Abi.decode(['address'], topics.third).first
+          event_to = Eth::Abi.decode(['address'], topics.second).first
+          tx_hash = Eth::Util.bin_to_prefixed_hex(
+            Eth::Abi.decode(['bytes32'], topics.third).first
+          )
         rescue Eth::Abi::DecodingError
           next
         end
 
-        next unless valid_bytes32?(topics.third)
-
-        target_ethscription = Ethscription.find_by(transaction_hash: topics.third)
+        target_ethscription = Ethscription.find_by(transaction_hash: tx_hash)
 
         if target_ethscription.present?
           ethscription_transfers.create!(
@@ -181,13 +182,14 @@ def create_ethscription_transfers_from_events!
         begin
           event_previous_owner = Eth::Abi.decode(['address'], topics.second).first
           event_to = Eth::Abi.decode(['address'], topics.third).first
+          tx_hash = Eth::Util.bin_to_prefixed_hex(
+            Eth::Abi.decode(['bytes32'], topics.fourth).first
+          )
         rescue Eth::Abi::DecodingError
           next
         end
 
-        next unless valid_bytes32?(topics.fourth)
-        
-        target_ethscription = Ethscription.find_by(transaction_hash: topics.fourth)
+        target_ethscription = Ethscription.find_by(transaction_hash: tx_hash)
 
         if target_ethscription.present?
           ethscription_transfers.create!(
@@ -289,10 +291,6 @@ def self.esip1_enabled?(block_number)
     block_number >= 17672762
   end
 
-  def valid_bytes32?(value)
-    /\A0x[0-9a-f]{64}\z/i.match?(value.to_s)
-  end
-  
   def self.contract_transfer_event_signatures(block_number)
     [].tap do |res|
       res << Esip1EventSig if esip1_enabled?(block_number)

db/migrate/20231216161930_create_eth_blocks.rb

@@ -18,6 +18,8 @@ def change
       t.index :imported_at
       t.index [:imported_at, :block_number]
       t.index :parent_blockhash, unique: true
+      t.index :state_hash, unique: true
+      t.index :parent_state_hash, unique: true
       t.index :timestamp
 
       t.check_constraint "blockhash ~ '^0x[a-f0-9]{64}$'"

db/migrate/20231216163233_create_eth_transactions.rb

@@ -18,10 +18,12 @@ def change
 
       t.index [:block_number, :transaction_index], unique: true
       t.index :block_number
+      t.index :block_timestamp
       t.index :from_address
       t.index :status
       t.index :to_address
       t.index :transaction_hash, unique: true
+      t.index :logs, using: :gin
 
       t.check_constraint "block_number <= 4370000 AND status IS NULL OR block_number > 4370000 AND status = 1", name: "status_check"
       t.check_constraint "created_contract_address IS NULL AND to_address IS NOT NULL OR

db/migrate/20231216213103_create_ethscription_transfers.rb

@@ -12,6 +12,7 @@ def change
       t.bigint :transaction_index, null: false
       t.string :enforced_previous_owner
 
+      t.index :ethscription_transaction_hash
       t.index :block_number
       t.index :from_address
       t.index :to_address

db/migrate/20231216215348_create_ethscription_ownership_versions.rb

@@ -11,6 +11,9 @@ def change
       t.string :current_owner, null: false
       t.string :previous_owner, null: false
 
+      t.index :current_owner
+      t.index :previous_owner
+      t.index [:current_owner, :previous_owner]
       t.index :ethscription_transaction_hash
       t.index :transaction_hash
       t.index :block_number

db/structure.sql

@@ -64,7 +64,7 @@ CREATE FUNCTION public.check_block_order() RETURNS trigger
               NEW.parent_blockhash <> (SELECT blockhash FROM eth_blocks WHERE block_number = NEW.block_number - 1) THEN
               RAISE EXCEPTION 'Parent block hash does not match the parent''s block hash';
             END IF;
-            
+
             RETURN NEW;
           END;
           $$;
@@ -603,6 +603,13 @@ CREATE UNIQUE INDEX idx_on_block_number_transaction_index_transfer_inde_8090d24b
 CREATE UNIQUE INDEX idx_on_block_number_transaction_index_transfer_inde_fc9ee59957 ON public.ethscription_transfers USING btree (block_number, transaction_index, transfer_index);
 
 
+--
+-- Name: idx_on_current_owner_previous_owner_7bb4bbf3cf; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX idx_on_current_owner_previous_owner_7bb4bbf3cf ON public.ethscription_ownership_versions USING btree (current_owner, previous_owner);
+
+
 --
 -- Name: idx_on_ethscription_transaction_hash_block_number_t_a807d2b571; Type: INDEX; Schema: public; Owner: -
 --
@@ -673,6 +680,20 @@ CREATE INDEX index_eth_blocks_on_imported_at_and_block_number ON public.eth_bloc
 CREATE UNIQUE INDEX index_eth_blocks_on_parent_blockhash ON public.eth_blocks USING btree (parent_blockhash);
 
 
+--
+-- Name: index_eth_blocks_on_parent_state_hash; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX index_eth_blocks_on_parent_state_hash ON public.eth_blocks USING btree (parent_state_hash);
+
+
+--
+-- Name: index_eth_blocks_on_state_hash; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX index_eth_blocks_on_state_hash ON public.eth_blocks USING btree (state_hash);
+
+
 --
 -- Name: index_eth_blocks_on_timestamp; Type: INDEX; Schema: public; Owner: -
 --
@@ -694,13 +715,27 @@ CREATE INDEX index_eth_transactions_on_block_number ON public.eth_transactions U
 CREATE UNIQUE INDEX index_eth_transactions_on_block_number_and_transaction_index ON public.eth_transactions USING btree (block_number, transaction_index);
 
 
+--
+-- Name: index_eth_transactions_on_block_timestamp; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_eth_transactions_on_block_timestamp ON public.eth_transactions USING btree (block_timestamp);
+
+
 --
 -- Name: index_eth_transactions_on_from_address; Type: INDEX; Schema: public; Owner: -
 --
 
 CREATE INDEX index_eth_transactions_on_from_address ON public.eth_transactions USING btree (from_address);
 
 
+--
+-- Name: index_eth_transactions_on_logs; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_eth_transactions_on_logs ON public.eth_transactions USING gin (logs);
+
+
 --
 -- Name: index_eth_transactions_on_status; Type: INDEX; Schema: public; Owner: -
 --
@@ -729,6 +764,20 @@ CREATE UNIQUE INDEX index_eth_transactions_on_transaction_hash ON public.eth_tra
 CREATE INDEX index_ethscription_ownership_versions_on_block_number ON public.ethscription_ownership_versions USING btree (block_number);
 
 
+--
+-- Name: index_ethscription_ownership_versions_on_current_owner; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_ethscription_ownership_versions_on_current_owner ON public.ethscription_ownership_versions USING btree (current_owner);
+
+
+--
+-- Name: index_ethscription_ownership_versions_on_previous_owner; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_ethscription_ownership_versions_on_previous_owner ON public.ethscription_ownership_versions USING btree (previous_owner);
+
+
 --
 -- Name: index_ethscription_ownership_versions_on_transaction_hash; Type: INDEX; Schema: public; Owner: -
 --
@@ -743,6 +792,13 @@ CREATE INDEX index_ethscription_ownership_versions_on_transaction_hash ON public
 CREATE INDEX index_ethscription_transfers_on_block_number ON public.ethscription_transfers USING btree (block_number);
 
 
+--
+-- Name: index_ethscription_transfers_on_ethscription_transaction_hash; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_ethscription_transfers_on_ethscription_transaction_hash ON public.ethscription_transfers USING btree (ethscription_transaction_hash);
+
+
 --
 -- Name: index_ethscription_transfers_on_from_address; Type: INDEX; Schema: public; Owner: -
 --

lib/ethscription_test_helper.rb

@@ -1,9 +1,29 @@
 module EthscriptionTestHelper
+  def self.create_from_hash(hash)
+    resp = AlchemyClient.query_api(
+      method: 'eth_getTransactionByHash',
+      params: [hash]
+    )['result']
+    
+    resp2 = AlchemyClient.query_api(
+      method: 'eth_getTransactionReceipt',
+      params: [hash]
+    )['result']
+    
+    create_eth_transaction(
+      input: resp['input'],
+      to: resp['to'],
+      from: resp['from'],
+      logs: resp2['logs']
+    )
+  end
+  
   def self.create_eth_transaction(
     input:,
     from:,
     to:,
-    logs:
+    logs: [],
+    tx_hash: nil
   )
     existing = Ethscription.newest_first.first
 
@@ -12,8 +32,11 @@ def self.create_eth_transaction(
     transaction_index = existing&.transaction_index.to_i + 1
     overall_order_number = block_number * 1e8 + transaction_index
 
-    hex_input = input.bytes.map { |byte| byte.to_s(16).rjust(2, '0') }.join
-    hex_input = "0x" + hex_input
+    hex_input = if input.match?(/\A0x([a-f0-9]{2})+\z/i)
+      input.downcase
+    else
+      "0x" + input.bytes.map { |byte| byte.to_s(16).rjust(2, '0') }.join
+    end
 
     if EthBlock.exists?
       parent_block = EthBlock.order(block_number: :desc).first
@@ -33,7 +56,7 @@ def self.create_eth_transaction(
     tx = EthTransaction.create!(
       block_number: block_number,
       block_timestamp: eth_block.timestamp,
-      transaction_hash: "0x" + SecureRandom.hex(32),
+      transaction_hash: tx_hash || "0x" + SecureRandom.hex(32),
       from_address: from.downcase,
       to_address: to.downcase,
       transaction_index: transaction_index,
@@ -49,6 +72,7 @@ def self.create_eth_transaction(
     tx.process!
 
     eth_block.update!(imported_at: Time.current)
+    tx
   end
 
   def self.t