Release candidate changes

RogerPodacter · RogerPodacter · commit 95587d782e70 · 2023-12-19T11:00:10.000-05:00
diff --git a/app/models/eth_transaction.rb b/app/models/eth_transaction.rb
@@ -10,6 +10,14 @@ class EthTransaction < ApplicationRecord
 
   attr_accessor :transfer_index
   
+  def self.event_signature(event_name)
+    "0x" + Digest::Keccak256.hexdigest(event_name)
+  end
+  
+  CreateEthscriptionEventSig = event_signature("ethscriptions_protocol_CreateEthscription(address,string)")
+  Esip2EventSig = event_signature("ethscriptions_protocol_TransferEthscriptionForPreviousOwner(address,address,bytes32)")
+  Esip1EventSig = event_signature("ethscriptions_protocol_TransferEthscription(address,bytes32)")
+  
   def possibly_relevant?
     status != 0 &&
     (possibly_creates_ethscription? || possibly_transfers_ethscription?)
@@ -104,7 +112,7 @@ def ethscription_creation_events
     return [] unless EthTransaction.esip3_enabled?(block_number)
     
     ordered_events.select do |log|
-      EthTransaction.contracts_create_ethscription_event_sig == log['topics'].first
+      CreateEthscriptionEventSig == log['topics'].first
     end
   end
   
@@ -143,7 +151,7 @@ def create_ethscription_transfers_from_events!
       topics = log['topics']
       event_type = topics.first
       
-      if event_type == EthTransaction.esip1_transfer_event_signature
+      if event_type == Esip1EventSig
         begin
           event_to = Eth::Abi.decode(['address'], topics.third).first
         rescue Eth::Abi::DecodingError
@@ -165,7 +173,7 @@ def create_ethscription_transfers_from_events!
             }.merge(transfer_attrs)
           )
         end
-      elsif event_type == EthTransaction.esip2_transfer_event_signature
+      elsif event_type == Esip2EventSig
         begin
           event_previous_owner = Eth::Abi.decode(['address'], topics.second).first
           event_to = Eth::Abi.decode(['address'], topics.third).first
@@ -283,34 +291,9 @@ def valid_bytes32?(value)
   
   def self.contract_transfer_event_signatures(block_number)
     [].tap do |res|
-      res << esip1_transfer_event_signature if esip1_enabled?(block_number)
-      res << esip2_transfer_event_signature if esip2_enabled?(block_number)
-    end
-  end
-  
-  class << self
-    extend Memoist
-    
-    def contracts_create_ethscription_event_sig
-      "0x" + Digest::Keccak256.hexdigest(
-        "ethscriptions_protocol_CreateEthscription(address,string)"
-      )
-    end
-    memoize :contracts_create_ethscription_event_sig
-    
-    def esip2_transfer_event_signature
-      "0x" + Digest::Keccak256.hexdigest(
-        "ethscriptions_protocol_TransferEthscriptionForPreviousOwner(address,address,bytes32)"
-      )
-    end
-    memoize :esip2_transfer_event_signature
-    
-    def esip1_transfer_event_signature
-      "0x" + Digest::Keccak256.hexdigest(
-        "ethscriptions_protocol_TransferEthscription(address,bytes32)"
-      )
+      res << Esip1EventSig if esip1_enabled?(block_number)
+      res << Esip2EventSig if esip2_enabled?(block_number)
     end
-    memoize :esip1_transfer_event_signature
   end
   
   def self.prune_transactions
diff --git a/app/models/ethscription.rb b/app/models/ethscription.rb
@@ -46,7 +46,7 @@ def parsed_data_uri
   end
   
   def content_sha
-    "0x" + Digest::SHA256.hexdigest(content_uri)
+    Digest::SHA256.hexdigest(content_uri)
   end
 
   def esip6
diff --git a/db/migrate/20231216161930_create_eth_blocks.rb b/db/migrate/20231216161930_create_eth_blocks.rb
@@ -12,6 +12,7 @@ def change
       t.index :block_number, unique: true
       t.index :blockhash, unique: true
       t.index :imported_at
+      t.index [:imported_at, :block_number]
       t.index :parent_blockhash, unique: true
       t.index :timestamp
     
diff --git a/db/migrate/20231216164707_create_ethscriptions.rb b/db/migrate/20231216164707_create_ethscriptions.rb
@@ -7,16 +7,14 @@ def change
       t.bigint :block_timestamp, null: false
       t.bigint :event_log_index
       
-      t.bigint :ethscription_number#, null: false
+      t.bigint :ethscription_number, null: false
       t.string :creator, null: false
       t.string :initial_owner, null: false
       t.string :current_owner, null: false
       t.string :previous_owner, null: false
 
-      # t.boolean :valid_data_uri, null: false
       t.text :content_uri, null: false
       t.string :content_sha, null: false
-      # t.boolean :content_unique
       t.boolean :esip6, null: false
       t.string :mimetype, null: false
       t.string :media_type, null: false
@@ -35,21 +33,18 @@ def change
       t.index :creator
       t.index :current_owner
       t.index :ethscription_number, unique: true
-      # t.index [:content_unique, :valid_data_uri]
-      # t.index :content_unique, where: "(content_unique IS NOT NULL)"
       t.index :content_sha
       t.index :content_sha, unique: true, where: "(esip6 = false)",
         name: :index_ethscriptions_on_content_sha_unique
-      # t.index :valid_data_uri
       t.index :initial_owner
       t.index :media_type
       t.index :mime_subtype
       t.index :mimetype
       t.index :previous_owner
       t.index :transaction_index
+      t.index :esip6
       
-      # t.check_constraint "esip6 = true OR content_unique IS NOT NULL"
-      t.check_constraint "content_sha ~ '^0x[a-f0-9]{64}$'"
+      t.check_constraint "content_sha ~ '^[a-f0-9]{64}$'"
       t.check_constraint "transaction_hash ~ '^0x[a-f0-9]{64}$'"
       t.check_constraint "creator ~ '^0x[a-f0-9]{40}$'"
       t.check_constraint "current_owner ~ '^0x[a-f0-9]{40}$'"
@@ -65,27 +60,31 @@ def change
     reversible do |dir|
       dir.up do
         execute <<-SQL
-          CREATE OR REPLACE FUNCTION check_ethscription_order()
+          DROP TRIGGER IF EXISTS trigger_check_ethscription_order ON ethscriptions;
+          DROP FUNCTION IF EXISTS check_ethscription_order();
+
+          CREATE OR REPLACE FUNCTION check_ethscription_order_and_sequence()
           RETURNS TRIGGER AS $$
           BEGIN
             IF NEW.block_number < (SELECT MAX(block_number) FROM ethscriptions) OR
             (NEW.block_number = (SELECT MAX(block_number) FROM ethscriptions) AND NEW.transaction_index <= (SELECT MAX(transaction_index) FROM ethscriptions WHERE block_number = NEW.block_number)) THEN
               RAISE EXCEPTION 'Ethscriptions must be created in order';
             END IF;
+            NEW.ethscription_number := (SELECT COALESCE(MAX(ethscription_number), -1) + 1 FROM ethscriptions);
             RETURN NEW;
           END;
           $$ LANGUAGE plpgsql;
 
-          CREATE TRIGGER trigger_check_ethscription_order
+          CREATE TRIGGER trigger_check_ethscription_order_and_sequence
           BEFORE INSERT ON ethscriptions
-          FOR EACH ROW EXECUTE FUNCTION check_ethscription_order();
+          FOR EACH ROW EXECUTE FUNCTION check_ethscription_order_and_sequence();
         SQL
       end
 
       dir.down do
         execute <<-SQL
-          DROP TRIGGER IF EXISTS trigger_check_ethscription_order ON ethscriptions;
-          DROP FUNCTION IF EXISTS check_ethscription_order();
+          DROP TRIGGER IF EXISTS trigger_check_ethscription_order_and_sequence ON ethscriptions;
+          DROP FUNCTION IF EXISTS check_ethscription_order_and_sequence();
         SQL
       end
     end
diff --git a/db/migrate/20231216213103_create_ethscription_transfers.rb b/db/migrate/20231216213103_create_ethscription_transfers.rb
@@ -10,7 +10,6 @@ def change
       t.bigint :event_log_index
       t.bigint :transfer_index, null: false
       t.bigint :transaction_index, null: false
-      # t.integer :creation_esip, null: false
       t.string :enforced_previous_owner
 
       t.index :block_number
diff --git a/db/migrate/20231219131956_set_ethscription_numbers_non_nullable.rb b/db/migrate/20231219131956_set_ethscription_numbers_non_nullable.rb
diff --git a/db/structure.sql b/db/structure.sql
@@ -9,27 +9,6 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Name: heroku_ext; Type: SCHEMA; Schema: -; Owner: -
---
-
-CREATE SCHEMA heroku_ext;
-
-
---
--- Name: pg_stat_statements; Type: EXTENSION; Schema: -; Owner: -
---
-
-CREATE EXTENSION IF NOT EXISTS pg_stat_statements WITH SCHEMA public;
-
-
---
--- Name: EXTENSION pg_stat_statements; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON EXTENSION pg_stat_statements IS 'track planning and execution statistics of all SQL statements executed';
-
-
 --
 -- Name: check_block_imported_at(); Type: FUNCTION; Schema: public; Owner: -
 --
@@ -407,10 +386,10 @@ CREATE TABLE public.ethscriptions (
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
     CONSTRAINT chk_rails_52497428f2 CHECK (((previous_owner)::text ~ '^0x[a-f0-9]{40}$'::text)),
-    CONSTRAINT chk_rails_528fcbfbaa CHECK (((content_sha)::text ~ '^0x[a-f0-9]{64}$'::text)),
     CONSTRAINT chk_rails_6f8922831e CHECK (((current_owner)::text ~ '^0x[a-f0-9]{40}$'::text)),
     CONSTRAINT chk_rails_84591e2730 CHECK (((transaction_hash)::text ~ '^0x[a-f0-9]{64}$'::text)),
     CONSTRAINT chk_rails_b577b97822 CHECK (((creator)::text ~ '^0x[a-f0-9]{40}$'::text)),
+    CONSTRAINT chk_rails_d741e3044d CHECK (((content_sha)::text ~ '^[a-f0-9]{64}$'::text)),
     CONSTRAINT chk_rails_df21fdbe02 CHECK (((initial_owner)::text ~ '^0x[a-f0-9]{40}$'::text))
 );
 
@@ -640,6 +619,13 @@ CREATE UNIQUE INDEX index_eth_blocks_on_blockhash ON public.eth_blocks USING btr
 CREATE INDEX index_eth_blocks_on_imported_at ON public.eth_blocks USING btree (imported_at);
 
 
+--
+-- Name: index_eth_blocks_on_imported_at_and_block_number; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_eth_blocks_on_imported_at_and_block_number ON public.eth_blocks USING btree (imported_at, block_number);
+
+
 --
 -- Name: index_eth_blocks_on_parent_blockhash; Type: INDEX; Schema: public; Owner: -
 --
@@ -780,6 +766,13 @@ CREATE INDEX index_ethscriptions_on_creator ON public.ethscriptions USING btree
 CREATE INDEX index_ethscriptions_on_current_owner ON public.ethscriptions USING btree (current_owner);
 
 
+--
+-- Name: index_ethscriptions_on_esip6; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_ethscriptions_on_esip6 ON public.ethscriptions USING btree (esip6);
+
+
 --
 -- Name: index_ethscriptions_on_ethscription_number; Type: INDEX; Schema: public; Owner: -
 --
@@ -950,7 +943,6 @@ ALTER TABLE ONLY public.ethscription_ownership_versions
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
-('20231219131956'),
 ('20231217190431'),
 ('20231216215348'),
 ('20231216213103'),
diff --git a/spec/models/eth_transaction_spec.rb b/spec/models/eth_transaction_spec.rb
