cleanup

Author: Savid

deploy/migrations/clickhouse/xatu/006_gloas_bals_support.up.sql

@@ -67,4 +67,4 @@ SETTINGS allow_nullable_key = 1;
 
 CREATE TABLE IF NOT EXISTS canonical_beacon_block_access_list ON CLUSTER '{cluster}'
     AS canonical_beacon_block_access_list_local
-    ENGINE = Distributed('{cluster}', currentDatabase(), canonical_beacon_block_access_list_local, rand());
+    ENGINE = Distributed('{cluster}', currentDatabase(), canonical_beacon_block_access_list_local, cityHash64(slot_start_date_time, meta_network_name, block_hash, address, change_type, ifNull(storage_key, ''), block_access_index));

deploy/migrations/clickhouse/xatu/007_gloas_epbs_support.up.sql

@@ -52,7 +52,7 @@ COMMENT 'Aggregated PTC payload attestations from canonical beacon blocks (max 4
 
 CREATE TABLE canonical_beacon_block_payload_attestation ON CLUSTER '{cluster}'
     AS canonical_beacon_block_payload_attestation_local
-    ENGINE = Distributed('{cluster}', currentDatabase(), canonical_beacon_block_payload_attestation_local, rand());
+    ENGINE = Distributed('{cluster}', currentDatabase(), canonical_beacon_block_payload_attestation_local, cityHash64(slot_start_date_time, meta_network_name, block_root, position));
 
 ---------------------------------------------------------------------
 -- 2. CANNON: canonical_beacon_block_execution_payload_bid
@@ -108,7 +108,7 @@ COMMENT 'Winning execution payload bid from canonical beacon blocks (1 per block
 
 CREATE TABLE canonical_beacon_block_execution_payload_bid ON CLUSTER '{cluster}'
     AS canonical_beacon_block_execution_payload_bid_local
-    ENGINE = Distributed('{cluster}', currentDatabase(), canonical_beacon_block_execution_payload_bid_local, rand());
+    ENGINE = Distributed('{cluster}', currentDatabase(), canonical_beacon_block_execution_payload_bid_local, cityHash64(slot_start_date_time, meta_network_name, block_root));
 
 ---------------------------------------------------------------------
 -- 3. SENTRY SSE: beacon_api_eth_v1_events_execution_payload

deploy/migrations/clickhouse/xatu/012_gloas_epbs_nullable_builder_index.up.sql

@@ -67,29 +67,3 @@ ALTER TABLE libp2p_gossipsub_execution_payload_envelope ON CLUSTER '{cluster}'
     MODIFY COLUMN builder_index Nullable(UInt64)
         COMMENT 'Index of the builder that produced the payload, NULL when self-built'
         CODEC(ZSTD(1));
-
----------------------------------------------------------------------
--- Rewrite the historical UInt64-max sentinel to NULL.
---
--- Mutations run against the _local tables only, as the Distributed tables have
--- no data of their own. Each is scoped by the sentinel so the mutation only
--- rewrites the affected parts.
----------------------------------------------------------------------
-
-ALTER TABLE beacon_api_eth_v1_events_execution_payload_local ON CLUSTER '{cluster}'
-    UPDATE builder_index = NULL WHERE builder_index = 18446744073709551615;
-
-ALTER TABLE beacon_api_eth_v1_events_execution_payload_gossip_local ON CLUSTER '{cluster}'
-    UPDATE builder_index = NULL WHERE builder_index = 18446744073709551615;
-
-ALTER TABLE beacon_api_eth_v1_events_execution_payload_bid_local ON CLUSTER '{cluster}'
-    UPDATE builder_index = NULL WHERE builder_index = 18446744073709551615;
-
-ALTER TABLE canonical_beacon_block_execution_payload_bid_local ON CLUSTER '{cluster}'
-    UPDATE builder_index = NULL WHERE builder_index = 18446744073709551615;
-
-ALTER TABLE libp2p_gossipsub_execution_payload_bid_local ON CLUSTER '{cluster}'
-    UPDATE builder_index = NULL WHERE builder_index = 18446744073709551615;
-
-ALTER TABLE libp2p_gossipsub_execution_payload_envelope_local ON CLUSTER '{cluster}'
-    UPDATE builder_index = NULL WHERE builder_index = 18446744073709551615;