From 4a16ec98142bf027bb6da7572347de0a081dec79 Mon Sep 17 00:00:00 2001
From: Dan Newton <dan.newton@r3.com>
Date: Fri, 3 May 2024 09:53:21 +0100
Subject: [PATCH] CORE-19840 Make `pub_key_hash` part of PK for signature table
 (#1631)

Remove `signature_idx` column and use `pub_key_hash` in the primary key
instead, which simplifies the insert and `ON CONFLICT` logic, while
ensuring that we don't have issues when storing a filtered transaction
followed by a signed transaction for the same transaction id.
---
 .../persistence/PersistTransactionSignatures.avsc    |  5 -----
 .../migration/ledger-utxo-creation-v5.3.xml          | 12 ++++++++++++
 gradle.properties                                    |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/PersistTransactionSignatures.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/PersistTransactionSignatures.avsc
index ea0e17b4e3..44950b7b21 100644
--- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/PersistTransactionSignatures.avsc
+++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/PersistTransactionSignatures.avsc
@@ -9,11 +9,6 @@
       "type": "string",
       "doc": "The transaction ID, derived from the root hash of its Merkle tree"
     },
-    {
-      "name": "startingIndex",
-      "type": "int",
-      "doc": "The index to insert the new signatures from"
-    },
     {
       "name": "signatures",
       "type": {
diff --git a/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.3.xml b/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.3.xml
index 0d4b245c21..0495915622 100644
--- a/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.3.xml
+++ b/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.3.xml
@@ -17,6 +17,18 @@
             <column name="transaction_id"/>
         </createIndex>
 
+        <dropPrimaryKey constraintName="utxo_transaction_signature_pkey"
+            dropIndex="true"
+            tableName="utxo_transaction_signature"
+        />
+
+        <addPrimaryKey columnNames="transaction_id, pub_key_hash"
+            constraintName="utxo_transaction_signature_pkey"
+            tableName="utxo_transaction_signature"
+        />
+
+        <dropColumn columnName="signature_idx" tableName="utxo_transaction_signature"/>
+
     </changeSet>
 
 </databaseChangeLog>
diff --git a/gradle.properties b/gradle.properties
index 133551ca58..2472247473 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ cordaProductVersion = 5.3.0
 # NOTE: update this each time this module contains a breaking change
 ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to
 ##   a per module property in which case module versions can change independently.
-cordaApiRevision = 12
+cordaApiRevision = 13
 
 # Main
 kotlin.stdlib.default.dependency = false