Preparation for major version release 2.0.0

Author: MrMatthewLayton

build.gradle

@@ -15,7 +15,7 @@ buildscript {
 
         onixlabs_group = 'io.onixlabs'
         onixlabs_corda_core_release_version = '4.0.0-rc3'
-        onixlabs_corda_idfx_release_version = '4.0.0-rc4'
+        onixlabs_corda_idfx_release_version = '4.0.0-rc5'
 
         cordapp_platform_version = 10
         cordapp_contract_name = 'ONIXLabs Corda BNMS Contract'

gradle.properties

@@ -1,5 +1,5 @@
 name=onixlabs-corda-bnms
 group=io.onixlabs
-version=2.0.0-rc10
+version=2.0.0-rc11
 onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
 onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3

onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/membership/MembershipAttestation.kt

@@ -79,7 +79,7 @@ class MembershipAttestation internal constructor(
         membership.state.data.network,
         attestor,
         setOf(membership.state.data.holder),
-        membership.toStaticAttestationPointer(),
+        membership.toStaticAttestationPointer(identifier = membership.state.data.linearId.toString()),
         status,
         metadata,
         linearId,

onixlabs-corda-bnms-workflow/src/main/kotlin/io/onixlabs/corda/bnms/workflow/membership/AmendMembershipAttestationFlow.kt

@@ -21,6 +21,7 @@ import io.onixlabs.corda.bnms.contract.membership.MembershipAttestation
 import io.onixlabs.corda.bnms.workflow.addAmendedMembershipAttestation
 import io.onixlabs.corda.bnms.workflow.findMembershipForAttestation
 import io.onixlabs.corda.core.workflow.*
+import io.onixlabs.corda.identityframework.workflow.checkAttestationExistsForAmendment
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.flows.*
 import net.corda.core.identity.Party
@@ -53,6 +54,8 @@ class AmendMembershipAttestationFlow(
     override fun call(): SignedTransaction {
         currentStep(InitializeFlowStep)
         checkSufficientSessionsForContractStates(sessions, newAttestation)
+        checkAttestationExistsForAmendment(newAttestation)
+
         val membership = findMembershipForAttestation(newAttestation).referenced()
 
         val transaction = buildTransaction(oldAttestation.state.notary) {

onixlabs-corda-bnms-workflow/src/main/kotlin/io/onixlabs/corda/bnms/workflow/membership/IssueMembershipAttestationFlow.kt

@@ -21,6 +21,7 @@ import io.onixlabs.corda.bnms.contract.membership.MembershipAttestation
 import io.onixlabs.corda.bnms.workflow.addIssuedMembershipAttestation
 import io.onixlabs.corda.bnms.workflow.findMembershipForAttestation
 import io.onixlabs.corda.core.workflow.*
+import io.onixlabs.corda.identityframework.workflow.checkAttestationExistsForIssuance
 import net.corda.core.flows.*
 import net.corda.core.identity.Party
 import net.corda.core.transactions.SignedTransaction
@@ -52,6 +53,8 @@ class IssueMembershipAttestationFlow(
     override fun call(): SignedTransaction {
         currentStep(InitializeFlowStep)
         checkSufficientSessionsForContractStates(sessions, attestation)
+        checkAttestationExistsForIssuance(attestation)
+
         val membership = findMembershipForAttestation(attestation).referenced()
 
         val transaction = buildTransaction(notary) {

onixlabs-corda-bnms-workflow/src/main/kotlin/io/onixlabs/corda/bnms/workflow/relationship/AmendRelationshipAttestationFlow.kt

@@ -21,6 +21,7 @@ import io.onixlabs.corda.bnms.contract.relationship.RelationshipAttestation
 import io.onixlabs.corda.bnms.workflow.addAmendedRelationshipAttestation
 import io.onixlabs.corda.bnms.workflow.findRelationshipForAttestation
 import io.onixlabs.corda.core.workflow.*
+import io.onixlabs.corda.identityframework.workflow.checkAttestationExistsForAmendment
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.flows.*
 import net.corda.core.transactions.SignedTransaction
@@ -52,6 +53,8 @@ class AmendRelationshipAttestationFlow(
     override fun call(): SignedTransaction {
         currentStep(InitializeFlowStep)
         checkSufficientSessionsForContractStates(sessions, newAttestation, oldAttestation.state.data)
+        checkAttestationExistsForAmendment(newAttestation)
+
         val relationship = findRelationshipForAttestation(newAttestation).referenced()
 
         val transaction = buildTransaction(oldAttestation.state.notary) {

onixlabs-corda-bnms-workflow/src/main/kotlin/io/onixlabs/corda/bnms/workflow/relationship/IssueRelationshipAttestationFlow.kt

@@ -21,6 +21,7 @@ import io.onixlabs.corda.bnms.contract.relationship.RelationshipAttestation
 import io.onixlabs.corda.bnms.workflow.addIssuedRelationshipAttestation
 import io.onixlabs.corda.bnms.workflow.findRelationshipForAttestation
 import io.onixlabs.corda.core.workflow.*
+import io.onixlabs.corda.identityframework.workflow.checkAttestationExistsForIssuance
 import net.corda.core.flows.*
 import net.corda.core.identity.Party
 import net.corda.core.transactions.SignedTransaction
@@ -52,6 +53,8 @@ class IssueRelationshipAttestationFlow(
     override fun call(): SignedTransaction {
         currentStep(InitializeFlowStep)
         checkSufficientSessionsForContractStates(sessions, attestation)
+        checkAttestationExistsForIssuance(attestation)
+
         val relationship = findRelationshipForAttestation(attestation).referenced()
 
         val transaction = buildTransaction(notary) {