From 8885312dcd0a76263452a45be217d26c936bce16 Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Wed, 6 Sep 2023 10:19:51 +0100 Subject: [PATCH 01/11] CORE-14025 Add request to find existing tx for backchain --- .../FindExistingNotInvalidTransactionIds.avsc | 14 ++++++++++++++ .../persistence/LedgerPersistenceRequest.avsc | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc new file mode 100644 index 0000000000..8b076632ed --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc @@ -0,0 +1,14 @@ +{ + "type": "record", + "name": "FindExistingNotInvalidTransactionIds", + "doc": "TODO", + "namespace": "net.corda.data.ledger.persistence", + "fields": [{ + "name": "transactionIds", + "type": { + "type" : "array", + "items" : "string" + }, + "doc": "TODO" + }] +} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc index f45bde6967..6a4dbbc13b 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc @@ -39,7 +39,8 @@ "net.corda.data.persistence.FindWithNamedQuery", "net.corda.data.ledger.persistence.FindSignedGroupParameters", "net.corda.data.ledger.persistence.PersistSignedGroupParametersIfDoNotExist", - "net.corda.data.ledger.persistence.FindSignedLedgerTransaction" + "net.corda.data.ledger.persistence.FindSignedLedgerTransaction", + "net.corda.data.ledger.persistence.FindExistingNotInvalidTransactionIds" ] }, { From b5eed547d249a8793d2268953bf6c76d4756e519 Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Wed, 6 Sep 2023 12:37:47 +0100 Subject: [PATCH 02/11] Add docs to avro schema --- .../persistence/FindExistingNotInvalidTransactionIds.avsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc index 8b076632ed..2ae6b26492 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "FindExistingNotInvalidTransactionIds", - "doc": "TODO", + "doc": "A request to fetch transaction that are not invalid (i.e. Verified or Unverified).", "namespace": "net.corda.data.ledger.persistence", "fields": [{ "name": "transactionIds", @@ -9,6 +9,6 @@ "type" : "array", "items" : "string" }, - "doc": "TODO" + "doc": "A list of the transaction IDs to fetch." }] } From 2f1d076be6d0493ece836781f4cc810a62cb8014 Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Thu, 14 Sep 2023 09:39:41 +0100 Subject: [PATCH 03/11] Modify request to be more generic --- .../FindExistingNotInvalidTransactionIds.avsc | 14 ----------- .../persistence/FindTransactionIds.avsc | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 14 deletions(-) delete mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc deleted file mode 100644 index 2ae6b26492..0000000000 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindExistingNotInvalidTransactionIds.avsc +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "record", - "name": "FindExistingNotInvalidTransactionIds", - "doc": "A request to fetch transaction that are not invalid (i.e. Verified or Unverified).", - "namespace": "net.corda.data.ledger.persistence", - "fields": [{ - "name": "transactionIds", - "type": { - "type" : "array", - "items" : "string" - }, - "doc": "A list of the transaction IDs to fetch." - }] -} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc new file mode 100644 index 0000000000..bcfb48dadb --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc @@ -0,0 +1,23 @@ +{ + "type": "record", + "name": "FindExistingNotInvalidTransactionIds", + "doc": "A request to fetch transactions that are in one of the given statuses.", + "namespace": "net.corda.data.ledger.persistence", + "fields": [ + { + "name": "ids", + "type": { + "type" : "array", + "items" : "string" + }, + "doc": "A list of the transaction IDs to fetch." + }, + { + "name": "transactionStatuses", + "type": { + "type" : "array", + "items" : "string" + }, + "doc": "The statuses of the transactions. The transaction must to have one of these statuses in order to be fetched." + }] +} From 3e40b1a01c233e53182a4f4b55e912b97101caf7 Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Thu, 14 Sep 2023 10:28:46 +0100 Subject: [PATCH 04/11] Change request name --- .../net/corda/data/ledger/persistence/FindTransactionIds.avsc | 2 +- .../corda/data/ledger/persistence/LedgerPersistenceRequest.avsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc index bcfb48dadb..b110b76cd2 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc @@ -1,6 +1,6 @@ { "type": "record", - "name": "FindExistingNotInvalidTransactionIds", + "name": "FindTransactionIds", "doc": "A request to fetch transactions that are in one of the given statuses.", "namespace": "net.corda.data.ledger.persistence", "fields": [ diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc index 6a4dbbc13b..835404e64a 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc @@ -40,7 +40,7 @@ "net.corda.data.ledger.persistence.FindSignedGroupParameters", "net.corda.data.ledger.persistence.PersistSignedGroupParametersIfDoNotExist", "net.corda.data.ledger.persistence.FindSignedLedgerTransaction", - "net.corda.data.ledger.persistence.FindExistingNotInvalidTransactionIds" + "net.corda.data.ledger.persistence.FindTransactionIds" ] }, { From 83c5b5d83c813118fb5e181086f77c1b1232ae12 Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Thu, 14 Sep 2023 11:34:32 +0100 Subject: [PATCH 05/11] small fix in doc --- .../net/corda/data/ledger/persistence/FindTransactionIds.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc index b110b76cd2..50c99d972d 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "FindTransactionIds", - "doc": "A request to fetch transactions that are in one of the given statuses.", + "doc": "A request to fetch transaction IDs that are in one of the given statuses.", "namespace": "net.corda.data.ledger.persistence", "fields": [ { From 07229c9c2475f6ef4f157bfe1af005c710caffa1 Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Thu, 14 Sep 2023 15:45:45 +0100 Subject: [PATCH 06/11] small fix in doc --- .../net/corda/data/ledger/persistence/FindTransactionIds.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc index 50c99d972d..a65ff90d86 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc @@ -18,6 +18,6 @@ "type" : "array", "items" : "string" }, - "doc": "The statuses of the transactions. The transaction must to have one of these statuses in order to be fetched." + "doc": "The required statuses of the transactions. The transaction must have one of these statuses in order to be fetched." }] } From 5b24c28a8f9d057d76038d9a873777dc13c2dcba Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Fri, 15 Sep 2023 14:22:36 +0100 Subject: [PATCH 07/11] Change request to return statuses --- .../persistence/FindTransactionIds.avsc | 23 ------------------- .../FindTransactionIdsAndStatuses.avsc | 15 ++++++++++++ .../persistence/LedgerPersistenceRequest.avsc | 2 +- 3 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIdsAndStatuses.avsc diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc deleted file mode 100644 index a65ff90d86..0000000000 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIds.avsc +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "record", - "name": "FindTransactionIds", - "doc": "A request to fetch transaction IDs that are in one of the given statuses.", - "namespace": "net.corda.data.ledger.persistence", - "fields": [ - { - "name": "ids", - "type": { - "type" : "array", - "items" : "string" - }, - "doc": "A list of the transaction IDs to fetch." - }, - { - "name": "transactionStatuses", - "type": { - "type" : "array", - "items" : "string" - }, - "doc": "The required statuses of the transactions. The transaction must have one of these statuses in order to be fetched." - }] -} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIdsAndStatuses.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIdsAndStatuses.avsc new file mode 100644 index 0000000000..382a85cd6e --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIdsAndStatuses.avsc @@ -0,0 +1,15 @@ +{ + "type": "record", + "name": "FindTransactionIdsAndStatuses", + "doc": "A request to fetch transaction IDs and their statuses.", + "namespace": "net.corda.data.ledger.persistence", + "fields": [ + { + "name": "ids", + "type": { + "type" : "array", + "items" : "string" + }, + "doc": "A list of the transaction IDs to fetch." + }] +} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc index 835404e64a..d2a1676686 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc @@ -40,7 +40,7 @@ "net.corda.data.ledger.persistence.FindSignedGroupParameters", "net.corda.data.ledger.persistence.PersistSignedGroupParametersIfDoNotExist", "net.corda.data.ledger.persistence.FindSignedLedgerTransaction", - "net.corda.data.ledger.persistence.FindTransactionIds" + "net.corda.data.ledger.persistence.FindTransactionIdsAndStatuses" ] }, { From d4c3d528a87ba55fbbfa72ed4f018a88276202b5 Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Wed, 4 Oct 2023 16:21:33 +0100 Subject: [PATCH 08/11] vbump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 71ee4f7d4a..6aa6039b3f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ cordaProductVersion = 5.1.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 = 27 +cordaApiRevision = 28 # Main kotlinVersion = 1.8.21 From faf99cd0db475b89cb238222c75b499180772528 Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Thu, 5 Oct 2023 09:42:22 +0100 Subject: [PATCH 09/11] vbump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6aa6039b3f..46c05bffb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ cordaProductVersion = 5.1.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 = 28 +cordaApiRevision = 29 # Main kotlinVersion = 1.8.21 From dcb4de57601765c737e1826329a9b5ecc96ec47e Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Thu, 5 Oct 2023 14:40:55 +0100 Subject: [PATCH 10/11] vbump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 46c05bffb8..1ecfa815e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ cordaProductVersion = 5.1.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 = 29 +cordaApiRevision = 30 # Main kotlinVersion = 1.8.21 From 7aba0615cc5ff732fef6657454967be8d3bf812c Mon Sep 17 00:00:00 2001 From: nkovacsx Date: Thu, 5 Oct 2023 14:41:40 +0100 Subject: [PATCH 11/11] vbump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1ecfa815e1..46c05bffb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ cordaProductVersion = 5.1.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 = 30 +cordaApiRevision = 29 # Main kotlinVersion = 1.8.21