Version bump and code fixes for major release 4.0.0

Author: MrMatthewLayton

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         junit_version = '5.3.1'
 
         onixlabs_group = 'io.onixlabs'
-        onixlabs_corda_core_release_version = '4.0.0-rc3'
+        onixlabs_corda_core_release_version = '4.0.0'
 
         cordapp_platform_version = 10
         cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'

gradle.properties

@@ -1,5 +1,5 @@
 name=onixlabs-corda-identity-framework
 group=io.onixlabs
-version=4.0.0-rc5
+version=4.0.0
 onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
 onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Extensions.Attestation.kt

@@ -53,7 +53,7 @@ inline fun <reified T : ContractState, reified U : Attestation<T>> StateAndRef<U
     status: AttestationStatus,
     stateAndRef: StateAndRef<T>,
     metadata: Map<String, String> = emptyMap()
-): U = amendAttestation(status, stateAndRef.toStaticAttestationPointer(state.data.pointer.identifier), metadata)
+): U = amendAttestation(status, stateAndRef.toStaticAttestationPointer(), metadata)
 
 /**
  * Amends an attestation of a [LinearState].
@@ -69,7 +69,7 @@ inline fun <reified T : LinearState, reified U : Attestation<T>> StateAndRef<U>.
     status: AttestationStatus,
     stateAndRef: StateAndRef<T>,
     metadata: Map<String, String> = emptyMap()
-): U = amendAttestation(status, stateAndRef.toLinearAttestationPointer(state.data.pointer.identifier), metadata)
+): U = amendAttestation(status, stateAndRef.toLinearAttestationPointer(), metadata)
 
 /**
  * Accepts an attestation.
@@ -97,7 +97,7 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.accept
 inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.acceptStaticAttestation(
     stateAndRef: StateAndRef<T>,
     metadata: Map<String, String> = emptyMap()
-): U = amendAttestation(AttestationStatus.ACCEPTED, stateAndRef.toStaticAttestationPointer(state.data.pointer.identifier), metadata)
+): U = amendAttestation(AttestationStatus.ACCEPTED, stateAndRef.toStaticAttestationPointer(), metadata)
 
 /**
  * Accepts an attestation of a [LinearState].
@@ -111,7 +111,7 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.accept
 inline fun <T : LinearState, reified U : Attestation<T>> StateAndRef<U>.acceptLinearAttestation(
     stateAndRef: StateAndRef<T>,
     metadata: Map<String, String> = emptyMap()
-): U = amendAttestation(AttestationStatus.ACCEPTED, stateAndRef.toLinearAttestationPointer(state.data.pointer.identifier), metadata)
+): U = amendAttestation(AttestationStatus.ACCEPTED, stateAndRef.toLinearAttestationPointer(), metadata)
 
 /**
  * Rejects an attestation.
@@ -139,7 +139,7 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.reject
 inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.rejectStaticAttestation(
     stateAndRef: StateAndRef<T>,
     metadata: Map<String, String> = emptyMap()
-): U = amendAttestation(AttestationStatus.REJECTED, stateAndRef.toStaticAttestationPointer(state.data.pointer.identifier), metadata)
+): U = amendAttestation(AttestationStatus.REJECTED, stateAndRef.toStaticAttestationPointer(), metadata)
 
 /**
  * Rejects an attestation of a [LinearState].
@@ -153,4 +153,4 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.reject
 inline fun <T : LinearState, reified U : Attestation<T>> StateAndRef<U>.rejectLinearAttestation(
     stateAndRef: StateAndRef<T>,
     metadata: Map<String, String> = emptyMap()
-): U = amendAttestation(AttestationStatus.REJECTED, stateAndRef.toLinearAttestationPointer(state.data.pointer.identifier), metadata)
+): U = amendAttestation(AttestationStatus.REJECTED, stateAndRef.toLinearAttestationPointer(), metadata)

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Extensions.StateAndRef.kt

@@ -30,22 +30,20 @@ import net.corda.core.identity.AbstractParty
  * Creates a static attestation pointer from a [StateAndRef].
  *
  * @param T The underlying [ContractState] type.
- * @param identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @return Returns a static attestation pointer for the specified [StateAndRef].
  */
-fun <T : ContractState> StateAndRef<T>.toStaticAttestationPointer(identifier: String? = null): StaticAttestationPointer<T> {
-    return StaticAttestationPointer(this, identifier)
+fun <T : ContractState> StateAndRef<T>.toStaticAttestationPointer(): StaticAttestationPointer<T> {
+    return StaticAttestationPointer(this)
 }
 
 /**
  * Creates a linear attestation pointer from a [StateAndRef].
  *
  * @param T The underlying [LinearState] type.
- * @param identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @return Returns a linear attestation pointer for the specified [StateAndRef].
  */
-fun <T : LinearState> StateAndRef<T>.toLinearAttestationPointer(identifier: String? = state.data.linearId.toString()): LinearAttestationPointer<T> {
-    return LinearAttestationPointer(this, identifier)
+fun <T : LinearState> StateAndRef<T>.toLinearAttestationPointer(): LinearAttestationPointer<T> {
+    return LinearAttestationPointer(this)
 }
 
 /**
@@ -56,19 +54,17 @@ fun <T : LinearState> StateAndRef<T>.toLinearAttestationPointer(identifier: Stri
  * @param status The status of the attestation.
  * @param metadata Additional information about the attestation.
  * @param linearId The unique identifier of the attestation.
- * @param identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @return Returns an attestation for the specified [StateAndRef].
  */
 fun <T : ContractState> StateAndRef<T>.createStaticAttestation(
     attestor: AbstractParty,
     status: AttestationStatus,
     metadata: Map<String, String> = emptyMap(),
-    linearId: UniqueIdentifier = UniqueIdentifier(),
-    identifier: String? = null
+    linearId: UniqueIdentifier = UniqueIdentifier()
 ): Attestation<T> = Attestation(
     attestor,
     state.data.participants.toSet(),
-    toStaticAttestationPointer(identifier),
+    toStaticAttestationPointer(),
     status,
     metadata,
     linearId,
@@ -82,15 +78,13 @@ fun <T : ContractState> StateAndRef<T>.createStaticAttestation(
  * @param attestor The attestor of the witnessed state.
  * @param metadata Additional information about the attestation.
  * @param linearId The unique identifier of the attestation.
- * @param identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @return Returns an accepted attestation for the specified [StateAndRef].
  */
 fun <T : ContractState> StateAndRef<T>.createAcceptedStaticAttestation(
     attestor: AbstractParty,
     metadata: Map<String, String> = emptyMap(),
-    linearId: UniqueIdentifier = UniqueIdentifier(),
-    identifier: String? = null
-): Attestation<T> = createStaticAttestation(attestor, AttestationStatus.ACCEPTED, metadata, linearId, identifier)
+    linearId: UniqueIdentifier = UniqueIdentifier()
+): Attestation<T> = createStaticAttestation(attestor, AttestationStatus.ACCEPTED, metadata, linearId)
 
 /**
  * Creates a rejected attestation from the specified [StateAndRef].
@@ -99,15 +93,13 @@ fun <T : ContractState> StateAndRef<T>.createAcceptedStaticAttestation(
  * @param attestor The attestor of the witnessed state.
  * @param metadata Additional information about the attestation.
  * @param linearId The unique identifier of the attestation.
- * @param identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @return Returns an rejected attestation for the specified [StateAndRef].
  */
 fun <T : ContractState> StateAndRef<T>.createRejectedStaticAttestation(
     attestor: AbstractParty,
     metadata: Map<String, String> = emptyMap(),
-    linearId: UniqueIdentifier = UniqueIdentifier(),
-    identifier: String? = null
-): Attestation<T> = createStaticAttestation(attestor, AttestationStatus.REJECTED, metadata, linearId, identifier)
+    linearId: UniqueIdentifier = UniqueIdentifier()
+): Attestation<T> = createStaticAttestation(attestor, AttestationStatus.REJECTED, metadata, linearId)
 
 /**
  * Creates an attestation from the specified [StateAndRef].
@@ -117,19 +109,17 @@ fun <T : ContractState> StateAndRef<T>.createRejectedStaticAttestation(
  * @param status The status of the attestation.
  * @param metadata Additional information about the attestation.
  * @param linearId The unique identifier of the attestation.
- * @param identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @return Returns an attestation for the specified [StateAndRef].
  */
 fun <T : LinearState> StateAndRef<T>.createLinearAttestation(
     attestor: AbstractParty,
     status: AttestationStatus,
     metadata: Map<String, String> = emptyMap(),
-    linearId: UniqueIdentifier = UniqueIdentifier(),
-    identifier: String? = state.data.linearId.toString()
+    linearId: UniqueIdentifier = UniqueIdentifier()
 ): Attestation<T> = Attestation(
     attestor,
     state.data.participants.toSet(),
-    toLinearAttestationPointer(identifier),
+    toLinearAttestationPointer(),
     status,
     metadata,
     linearId,
@@ -143,15 +133,13 @@ fun <T : LinearState> StateAndRef<T>.createLinearAttestation(
  * @param attestor The attestor of the witnessed state.
  * @param metadata Additional information about the attestation.
  * @param linearId The unique identifier of the attestation.
- * @param identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @return Returns an accepted attestation for the specified [StateAndRef].
  */
 fun <T : LinearState> StateAndRef<T>.createAcceptedLinearAttestation(
     attestor: AbstractParty,
     metadata: Map<String, String> = emptyMap(),
-    linearId: UniqueIdentifier = UniqueIdentifier(),
-    identifier: String? = state.data.linearId.toString()
-): Attestation<T> = createLinearAttestation(attestor, AttestationStatus.ACCEPTED, metadata, linearId, identifier)
+    linearId: UniqueIdentifier = UniqueIdentifier()
+): Attestation<T> = createLinearAttestation(attestor, AttestationStatus.ACCEPTED, metadata, linearId)
 
 /**
  * Creates a rejected attestation from the specified [StateAndRef].
@@ -160,12 +148,10 @@ fun <T : LinearState> StateAndRef<T>.createAcceptedLinearAttestation(
  * @param attestor The attestor of the witnessed state.
  * @param metadata Additional information about the attestation.
  * @param linearId The unique identifier of the attestation.
- * @param identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @return Returns an rejected attestation for the specified [StateAndRef].
  */
 fun <T : LinearState> StateAndRef<T>.createRejectedLinearAttestation(
     attestor: AbstractParty,
     metadata: Map<String, String> = emptyMap(),
-    linearId: UniqueIdentifier = UniqueIdentifier(),
-    identifier: String? = state.data.linearId.toString()
-): Attestation<T> = createLinearAttestation(attestor, AttestationStatus.REJECTED, metadata, linearId, identifier)
+    linearId: UniqueIdentifier = UniqueIdentifier()
+): Attestation<T> = createLinearAttestation(attestor, AttestationStatus.REJECTED, metadata, linearId)

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationContract.kt

@@ -78,7 +78,7 @@ open class AttestationContract : Contract {
             "On attestation amending, only one attestation state must be created."
 
         internal const val CONTRACT_RULE_CHANGES =
-            "On attestation amending, the attestor, linear ID, pointer class and pointer identifier must not change."
+            "On attestation amending, the attestor, linear ID and pointer class must not change."
 
         internal const val CONTRACT_RULE_STATE_REF =
             "On attestation amending, the created attestation state must point to the consumed attestation state."

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationPointer.kt

@@ -18,7 +18,7 @@ package io.onixlabs.corda.identityframework.contract.attestations
 
 import io.onixlabs.corda.core.contract.Hashable
 import io.onixlabs.corda.core.contract.SingularResolvable
-import io.onixlabs.corda.core.contract.TransactionResolution
+import io.onixlabs.corda.core.contract.StatePosition
 import io.onixlabs.corda.core.services.vaultQuery
 import io.onixlabs.corda.identityframework.contract.toDataClassString
 import net.corda.core.contracts.*
@@ -37,7 +37,6 @@ import java.util.*
  * @param T The underlying [ContractState] type.
  * @property stateType The [Class] of the witnessed state being attested.
  * @property statePointer The pointer to the witnessed state being attested.
- * @property identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @property hash The hash of the attestation pointer.
  *
  * Note that attestation pointer hashes should be unique for static attestation pointers since they point to the
@@ -48,10 +47,9 @@ import java.util.*
 sealed class AttestationPointer<T : ContractState> : SingularResolvable<T>, Hashable {
     abstract val stateType: Class<T>
     abstract val statePointer: Any
-    abstract val identifier: String?
 
     final override val hash: SecureHash
-        get() = SecureHash.sha256("$stateType$statePointer$identifier")
+        get() = SecureHash.sha256("$stateType$statePointer")
 
     /**
      * Determines whether the specified object is equal to the current object.
@@ -123,20 +121,15 @@ sealed class AttestationPointer<T : ContractState> : SingularResolvable<T>, Hash
  * @param T The underlying [LinearState] type.
  * @property stateType The [Class] of the witnessed state being attested.
  * @property statePointer The pointer to the witnessed state being attested.
- * @property identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @property hash The hash of the attestation pointer.
  */
 class LinearAttestationPointer<T : LinearState> internal constructor(
     override val stateType: Class<T>,
-    override val statePointer: UniqueIdentifier,
-    override val identifier: String?
+    override val statePointer: UniqueIdentifier
 ) : AttestationPointer<T>() {
 
-    constructor(stateAndRef: StateAndRef<T>, identifier: String?) : this(
-        stateType = stateAndRef.state.data.javaClass,
-        statePointer = stateAndRef.state.data.linearId,
-        identifier = identifier
-    )
+    constructor(state: T) : this(state.javaClass, state.linearId)
+    constructor(stateAndRef: StateAndRef<T>) : this(stateAndRef.state.data)
 
     private val criteria: QueryCriteria = vaultQuery(stateType) {
         stateStatus(Vault.StateStatus.UNCONSUMED)
@@ -178,16 +171,11 @@ class LinearAttestationPointer<T : LinearState> internal constructor(
      * Resolves a [ContractState] using a [LedgerTransaction] instance.
      *
      * @param transaction The [LedgerTransaction] instance to use to resolve the state.
-     * @param resolution The transaction resolution method to use to resolve the [ContractState] instance.
+     * @param position The position of the [ContractState]  instance to resolve in the transaction.
      * @return Returns the resolved [ContractState], or null if no matching state is found.
      */
-    override fun resolve(transaction: LedgerTransaction, resolution: TransactionResolution): StateAndRef<T>? {
-        val states: List<StateAndRef<T>> = when (resolution) {
-            TransactionResolution.INPUT -> transaction.inRefsOfType(stateType)
-            TransactionResolution.OUTPUT -> transaction.outRefsOfType(stateType)
-            TransactionResolution.REFERENCE -> transaction.referenceInputRefsOfType(stateType)
-        }
-
+    override fun resolve(transaction: LedgerTransaction, position: StatePosition): StateAndRef<T>? {
+        val states = position.getStateAndRefs(transaction, stateType)
         return getOrThrow(states.singleOrNull { isPointingTo(it) })
     }
 
@@ -201,7 +189,6 @@ class LinearAttestationPointer<T : LinearState> internal constructor(
         return other is LinearAttestationPointer<*>
                 && other.stateType == stateType
                 && other.statePointer == statePointer
-                && other.identifier == identifier
     }
 }
 
@@ -218,20 +205,14 @@ class LinearAttestationPointer<T : LinearState> internal constructor(
  * @param T The underlying [LinearState] type.
  * @property stateType The [Class] of the witnessed state being attested.
  * @property statePointer The pointer to the witnessed state being attested.
- * @property identifier Provides an additional, external identifier which can be used to track states across state transitions.
  * @property hash The hash of the attestation pointer.
  */
 class StaticAttestationPointer<T : ContractState> internal constructor(
     override val stateType: Class<T>,
-    override val statePointer: StateRef,
-    override val identifier: String?
+    override val statePointer: StateRef
 ) : AttestationPointer<T>() {
 
-    constructor(stateAndRef: StateAndRef<T>, identifier: String?) : this(
-        stateType = stateAndRef.state.data.javaClass,
-        statePointer = stateAndRef.ref,
-        identifier = identifier
-    )
+    constructor(stateAndRef: StateAndRef<T>) : this(stateAndRef.state.data.javaClass, stateAndRef.ref)
 
     private val criteria: QueryCriteria = vaultQuery(stateType) {
         stateStatus(Vault.StateStatus.ALL)
@@ -273,16 +254,11 @@ class StaticAttestationPointer<T : ContractState> internal constructor(
      * Resolves a [ContractState] using a [LedgerTransaction] instance.
      *
      * @param transaction The [LedgerTransaction] instance to use to resolve the state.
-     * @param resolution The transaction resolution method to use to resolve the [ContractState] instance.
+     * @param position The position of the [ContractState]  instance to resolve in the transaction.
      * @return Returns the resolved [ContractState], or null if no matching state is found.
      */
-    override fun resolve(transaction: LedgerTransaction, resolution: TransactionResolution): StateAndRef<T>? {
-        val states: List<StateAndRef<T>> = when (resolution) {
-            TransactionResolution.INPUT -> transaction.inRefsOfType(stateType)
-            TransactionResolution.OUTPUT -> transaction.outRefsOfType(stateType)
-            TransactionResolution.REFERENCE -> transaction.referenceInputRefsOfType(stateType)
-        }
-
+    override fun resolve(transaction: LedgerTransaction, position: StatePosition): StateAndRef<T>? {
+        val states = position.getStateAndRefs(transaction, stateType)
         return getOrThrow(states.singleOrNull { isPointingTo(it) })
     }
 
@@ -293,8 +269,6 @@ class StaticAttestationPointer<T : ContractState> internal constructor(
      * @return Returns true if the immutable properties remain unchanged; otherwise, false.
      */
     override fun immutableEquals(other: AttestationPointer<T>): Boolean {
-        return other is StaticAttestationPointer<*>
-                && other.stateType == stateType
-                && other.identifier == identifier
+        return other is StaticAttestationPointer<*> && other.stateType == stateType
     }
 }

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationSchema.kt

@@ -54,9 +54,6 @@ object AttestationSchema {
         @Column(name = "pointer_state_type", nullable = false)
         val pointerStateType: String = "",
 
-        @Column(name = "pointer_identifier", nullable = true)
-        val pointerIdentifier: String? = null,
-
         @Column(name = "pointer_hash", nullable = false)
         val pointerHash: String = "",
 
@@ -81,7 +78,6 @@ object AttestationSchema {
             attestorAccountExternalId = attestation.attestor.accountLinearId?.externalId,
             pointer = attestation.pointer.statePointer.toString(),
             pointerStateType = attestation.pointer.stateType.canonicalName,
-            pointerIdentifier = attestation.pointer.identifier,
             pointerHash = attestation.pointer.hash.toString(),
             status = attestation.status,
             previousStateRef = attestation.previousStateRef?.toString(),