Merge branch 'master' into pk910/mini-launchpad-checks

ethpandaops · Nov 4, 2024 · 6461595 · 6461595
2 parents 8c8cc42 + 648becb
commit 6461595
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/db/consolidation_request_txs.go b/db/consolidation_request_txs.go
@@ -53,7 +53,7 @@ func InsertConsolidationRequestTxs(consolidationTxs []*dbtypes.ConsolidationRequ
 		argIdx += fieldCount
 	}
 	fmt.Fprint(&sql, EngineQuery(map[dbtypes.DBEngineType]string{
-		dbtypes.DBEnginePgsql:  " ON CONFLICT (block_number, block_index) DO UPDATE SET source_index = excluded.source_index, target_index = excluded.target_index, fork_id = excluded.fork_id",
+		dbtypes.DBEnginePgsql:  " ON CONFLICT (block_root, block_index) DO UPDATE SET source_index = excluded.source_index, target_index = excluded.target_index, fork_id = excluded.fork_id",
 		dbtypes.DBEngineSqlite: "",
 	}))
 

diff --git a/db/consolidation_requests.go b/db/consolidation_requests.go
@@ -50,7 +50,7 @@ func InsertConsolidationRequests(consolidations []*dbtypes.ConsolidationRequest,
 		argIdx += fieldCount
 	}
 	fmt.Fprint(&sql, EngineQuery(map[dbtypes.DBEngineType]string{
-		dbtypes.DBEnginePgsql:  " ON CONFLICT (slot_index, slot_root) DO UPDATE SET orphaned = excluded.orphaned, fork_id = excluded.fork_id",
+		dbtypes.DBEnginePgsql:  " ON CONFLICT (slot_root, slot_index) DO UPDATE SET orphaned = excluded.orphaned, fork_id = excluded.fork_id",
 		dbtypes.DBEngineSqlite: "",
 	}))
 	_, err := tx.Exec(sql.String(), args...)

diff --git a/db/schema/pgsql/20240805095505_pectra-updates2.sql b/db/schema/pgsql/20240805095505_pectra-updates2.sql
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS public."consolidation_requests" (
     target_index BIGINT NULL,
     target_pubkey bytea NULL,
     tx_hash bytea NULL,
-    CONSTRAINT consolidation_pkey PRIMARY KEY (slot_root, slot_index)
+    CONSTRAINT consolidation_requests_pkey PRIMARY KEY (slot_root, slot_index)
 );
 
 CREATE INDEX IF NOT EXISTS "consolidation_requests_slot_idx"

diff --git a/db/schema/pgsql/20241006182734_pectra-updates3.sql b/db/schema/pgsql/20241006182734_pectra-updates3.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS public."consolidation_request_txs" (
     tx_sender bytea NOT NULL,
     tx_target bytea NOT NULL,
     dequeue_block BIGINT NOT NULL,
-    CONSTRAINT consolidation_pkey PRIMARY KEY (block_root, block_index)
+    CONSTRAINT consolidation_request_txs_pkey PRIMARY KEY (block_root, block_index)
 );
 
 CREATE INDEX IF NOT EXISTS "consolidation_request_txs_block_number_idx"

diff --git a/db/schema/sqlite/20240805095505_pectra-updates2.sql b/db/schema/sqlite/20240805095505_pectra-updates2.sql
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS "consolidation_requests" (
     target_index BIGINT NULL,
     target_pubkey BLOB NULL,
     tx_hash BLOB NULL,
-    CONSTRAINT consolidation_pkey PRIMARY KEY (slot_root, slot_index)
+    CONSTRAINT consolidation_requests_pkey PRIMARY KEY (slot_root, slot_index)
 );
 
 CREATE INDEX IF NOT EXISTS "consolidation_requests_slot_idx"

diff --git a/db/schema/sqlite/20241006182734_pectra-updates3.sql b/db/schema/sqlite/20241006182734_pectra-updates3.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS "consolidation_request_txs" (
     tx_sender BLOB NOT NULL,
     tx_target BLOB NOT NULL,
     dequeue_block BIGINT NOT NULL,
-    CONSTRAINT consolidation_pkey PRIMARY KEY (block_root, block_index)
+    CONSTRAINT consolidation_request_txs_pkey PRIMARY KEY (block_root, block_index)
 );
 
 CREATE INDEX IF NOT EXISTS "consolidation_request_txs_block_number_idx"