CORE-13098 - Merge feature branch back into release branch (#1169)

Merging re-registration feature branch to release.
corda · Jul 11, 2023 · 813604f · 813604f
1 parent b5cc437
commit 813604f
Show file tree

Hide file tree

Showing 14 changed files with 130 additions and 23 deletions.
diff --git a/...in/resources/avro/net/corda/data/membership/command/registration/RegistrationCommand.avsc b/...in/resources/avro/net/corda/data/membership/command/registration/RegistrationCommand.avsc
@@ -8,6 +8,8 @@
       "name": "command",
       "doc": "Indicator of the type of registration command that was issued.",
       "type": [
+        "net.corda.data.membership.command.registration.mgm.QueueRegistration",
+        "net.corda.data.membership.command.registration.mgm.CheckForPendingRegistration",
         "net.corda.data.membership.command.registration.mgm.StartRegistration",
         "net.corda.data.membership.command.registration.mgm.VerifyMember",
         "net.corda.data.membership.command.registration.mgm.ProcessMemberVerificationResponse",

diff --git a/...net/corda/data/membership/command/registration/member/PersistMemberRegistrationState.avsc b/...net/corda/data/membership/command/registration/member/PersistMemberRegistrationState.avsc
@@ -12,7 +12,7 @@
     {
       "name": "setStatusRequest",
       "doc" : "The request to set the status.",
-      "type": "net.corda.data.membership.p2p.SetOwnRegistrationStatus"
+      "type": "net.corda.data.membership.p2p.v2.SetOwnRegistrationStatus"
     }
   ]
 }
diff --git a/.../avro/net/corda/data/membership/command/registration/mgm/CheckForPendingRegistration.avsc b/.../avro/net/corda/data/membership/command/registration/mgm/CheckForPendingRegistration.avsc
@@ -0,0 +1,23 @@
+{
+  "type": "record",
+  "name": "CheckForPendingRegistration",
+  "namespace": "net.corda.data.membership.command.registration.mgm",
+  "doc": " Command issued when a member registration request is successfully queued.",
+  "fields": [
+    {
+      "name": "mgm",
+      "doc": "Holding identity of the MGM.",
+      "type": "net.corda.data.identity.HoldingIdentity"
+    },
+    {
+      "name": "member",
+      "doc": "Holding identity of the registering member as provided during P2P communication. Used to verify the registration request.",
+      "type": "net.corda.data.identity.HoldingIdentity"
+    },
+    {
+      "name": "numberOfRetriesSoFar",
+      "doc": "The number of times this request failed so far.",
+      "type": "int"
+    }
+  ]
+}
diff --git a/.../resources/avro/net/corda/data/membership/command/registration/mgm/QueueRegistration.avsc b/.../resources/avro/net/corda/data/membership/command/registration/mgm/QueueRegistration.avsc
@@ -0,0 +1,28 @@
+{
+  "type": "record",
+  "name": "QueueRegistration",
+  "namespace": "net.corda.data.membership.command.registration.mgm",
+  "doc": " Command issued when a member registration request is received and needs to be processed.",
+  "fields": [
+    {
+      "name": "mgm",
+      "doc": "Holding identity of the target MGM.",
+      "type": "net.corda.data.identity.HoldingIdentity"
+    },
+    {
+      "name": "member",
+      "doc": "Holding identity of the requesting member.",
+      "type": "net.corda.data.identity.HoldingIdentity"
+    },
+    {
+      "name": "memberRegistrationRequest",
+      "doc": "The full registration request as received from a registering member.",
+      "type": "net.corda.data.membership.p2p.MembershipRegistrationRequest"
+    },
+    {
+       "name": "numberOfRetriesSoFar",
+       "doc": "The number of times this request failed so far.",
+       "type": "int"
+    }
+  ]
+}
diff --git a/.../resources/avro/net/corda/data/membership/command/registration/mgm/StartRegistration.avsc b/.../resources/avro/net/corda/data/membership/command/registration/mgm/StartRegistration.avsc
@@ -3,21 +3,5 @@
   "name": "StartRegistration",
   "namespace": "net.corda.data.membership.command.registration.mgm",
   "doc": " Command issued when a member registration request is received and needs to be processed.",
-  "fields": [
-    {
-      "name": "destination",
-      "doc": "Holding identity of the target MGM.",
-      "type": "net.corda.data.identity.HoldingIdentity"
-    },
-    {
-      "name": "source",
-      "doc": "Holding identity of the requesting member.",
-      "type": "net.corda.data.identity.HoldingIdentity"
-    },
-    {
-      "name": "memberRegistrationRequest",
-      "doc": "The full registration request as received from a registering member.",
-      "type": "net.corda.data.membership.p2p.MembershipRegistrationRequest"
-    }
-  ]
+  "fields": []
 }
diff --git a/.../src/main/resources/avro/net/corda/data/membership/common/RegistrationRequestDetails.avsc b/.../src/main/resources/avro/net/corda/data/membership/common/RegistrationRequestDetails.avsc
@@ -23,13 +23,18 @@
     {
       "name": "registrationStatus",
       "doc": "Status of the registration request.",
-      "type": "RegistrationStatus"
+      "type": "net.corda.data.membership.common.v2.RegistrationStatus"
     },
     {
       "name": "registrationId",
       "doc": "ID of the registration request.",
       "type": "string"
     },
+    {
+      "name": "holdingIdentityId",
+      "doc": "ID of the owner of this registration request.",
+      "type": "string"
+    },
     {
       "name": "registrationProtocolVersion",
       "doc": "Registration protocol number.",

diff --git a/...chema/src/main/resources/avro/net/corda/data/membership/common/v2/RegistrationStatus.avsc b/...chema/src/main/resources/avro/net/corda/data/membership/common/v2/RegistrationStatus.avsc
@@ -0,0 +1,20 @@
+{
+  "type": "enum",
+  "name": "RegistrationStatus",
+  "namespace": "net.corda.data.membership.common.v2",
+  "doc": "Registration request status.",
+  "symbols": [
+    "NEW",
+    "SENT_TO_MGM",
+    "RECEIVED_BY_MGM",
+    "STARTED_PROCESSING_BY_MGM",
+    "PENDING_MEMBER_VERIFICATION",
+    "PENDING_MANUAL_APPROVAL",
+    "PENDING_AUTO_APPROVAL",
+    "DECLINED",
+    "INVALID",
+    "FAILED",
+    "APPROVED"
+  ],
+  "default": "NEW"
+}
diff --git a/...sources/avro/net/corda/data/membership/db/request/command/PersistRegistrationRequest.avsc b/...sources/avro/net/corda/data/membership/db/request/command/PersistRegistrationRequest.avsc
@@ -7,7 +7,7 @@
     {
       "name": "status",
       "doc": "Indicator of the current status of the request.",
-      "type": "net.corda.data.membership.common.RegistrationStatus"
+      "type": "net.corda.data.membership.common.v2.RegistrationStatus"
     },
     {
       "name": "registeringHoldingIdentity",

diff --git a/...es/avro/net/corda/data/membership/db/request/command/UpdateRegistrationRequestStatus.avsc b/...es/avro/net/corda/data/membership/db/request/command/UpdateRegistrationRequestStatus.avsc
@@ -15,7 +15,7 @@
     {
       "name": "registrationStatus",
       "doc": "The new status for this registration request.",
-      "type": "net.corda.data.membership.common.RegistrationStatus"
+      "type": "net.corda.data.membership.common.v2.RegistrationStatus"
     },
     {
       "name": "reason",

diff --git a/.../resources/avro/net/corda/data/membership/db/request/query/QueryRegistrationRequests.avsc b/.../resources/avro/net/corda/data/membership/db/request/query/QueryRegistrationRequests.avsc
@@ -14,7 +14,7 @@
       "doc": "Requests in the specified statuses will be included in the query result.",
       "type": {
         "type": "array",
-        "items": "net.corda.data.membership.common.RegistrationStatus"
+        "items": "net.corda.data.membership.common.v2.RegistrationStatus"
       }
     },
     {

diff --git a/...ma/src/main/resources/avro/net/corda/data/membership/p2p/v2/SetOwnRegistrationStatus.avsc b/...ma/src/main/resources/avro/net/corda/data/membership/p2p/v2/SetOwnRegistrationStatus.avsc
@@ -0,0 +1,21 @@
+{
+  "type": "record",
+  "name": "SetOwnRegistrationStatus",
+  "namespace": "net.corda.data.membership.p2p.v2",
+  "doc": "Set the member registration status.",
+  "fields": [
+    {
+      "name": "registrationId",
+      "doc": "ID of the registration to set the status.",
+      "type": {
+        "type": "string",
+        "logicalType": "uuid"
+      }
+    },
+    {
+      "name": "newStatus",
+      "doc": "The new registration status.",
+      "type": "net.corda.data.membership.common.v2.RegistrationStatus"
+    }
+  ]
+}
diff --git a/data/config-schema/src/main/java/net/corda/schema/configuration/MembershipConfig.java b/data/config-schema/src/main/java/net/corda/schema/configuration/MembershipConfig.java
@@ -12,6 +12,16 @@ private MembershipConfig() {
      */
     public static final String MAX_DURATION_BETWEEN_SYNC_REQUESTS_MINUTES = "maxDurationBetweenSyncRequestsMinutes";
 
+    /**
+     * The configuration key to get the maximum duration in minutes between polling for expired registration requests.
+     */
+    public static final String MAX_DURATION_BETWEEN_EXPIRED_REGISTRATION_REQUESTS_POLLS = "frequencyOfExpirationPoll";
+
+    /**
+     * The configuration key to get the time frame in minutes after which a registration request is considered as expired and gets force declined.
+     */
+    public static final String EXPIRATION_DATE_FOR_REGISTRATION_REQUESTS = "expirationTimeFrame";
+
     public static final class TtlsConfig {
         private TtlsConfig() {
         }

diff --git a/...ma/src/main/resources/net/corda/schema/configuration/membership/1.0/corda.membership.json b/...ma/src/main/resources/net/corda/schema/configuration/membership/1.0/corda.membership.json
@@ -13,6 +13,20 @@
       "maximum": 2880,
       "default": 480
     },
+    "frequencyOfExpirationPoll": {
+      "description": "The maximum duration in minutes between polling for expired registration requests.",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 2880,
+      "default": 300
+    },
+    "expirationTimeFrame": {
+      "description": "The time frame in minutes after which a registration request is considered as expired and gets force declined.",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 2880,
+      "default": 180
+    },
     "TTLs": {
       "description": "The maximum durations in minutes to wait for different types of message to send. If set to null, Corda waits forever.",
       "type": "object",

diff --git 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 = 5
+cordaApiRevision = 6
 
 # Main
 kotlinVersion = 1.8.21