Merge branch 'release/os/5.1' into malachy/CORE-9975-e2eTests

.ci/dev/forward-merge/JenkinsInteropMerge

@@ -0,0 +1,31 @@
+@Library('[email protected]') _
+
+/*
+ * Forward merge any changes in current branch to the branch with following version.
+ *
+ * Please note, the branches names are intentionally separated as variables, to minimised conflicts
+ * during automated merges for this file.
+ *
+ * These variables should be updated when a new version is cut
+ */
+
+/**
+ * the branch name of origin branch, it should match the current branch
+ * and it acts as a fail-safe inside {@code forwardMerger} pipeline
+ */
+String originBranch = 'release/os/5.1'
+
+/**
+ * the branch name of target branch, it should be the branch with the next version
+ * after the one in current branch.
+ */
+String targetBranch = 'release/interop/syntax'
+
+/**
+ * Forward merge any changes between #originBranch and #targetBranch
+ */
+forwardMerger(
+    targetBranch: targetBranch,
+    originBranch: originBranch,
+    slackChannel: '#interop-forward-merge-bot-notifications',
+)

data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/db.changelog-master.xml

@@ -5,6 +5,6 @@
     <include file="net/corda/db/schema/vnode-vault/migration/vnode-vault-creation-v1.0.xml"/>
     <include file="net/corda/db/schema/vnode-vault/migration/ledger-consensual-creation-v1.0.xml"/>
     <include file="net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v1.0.xml"/>
-
+    <include file="net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml"/>
     <include file="net/corda/db/schema/vnode-vault/migration/vnode-vault-creation-v5.1.xml"/>
 </databaseChangeLog>

data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml

@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
+
+    <changeSet author="R3.Corda" id="ledger-utxo-creation-v5.1">
+       <createIndex
+           indexName="utxo_visible_transaction_state_idx_consumed"
+           tableName="utxo_visible_transaction_state">
+           <column name="consumed"/>
+       </createIndex>
+
+        <createIndex
+                indexName="utxo_transaction_output_idx_type"
+                tableName="utxo_transaction_output">
+            <column name="type"/>
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>