Refactor to use corda identity framework.

Author: MrMatthewLayton

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 
         corda_artifactory_url = 'https://ci-artifactory.corda.r3cev.com/artifactory'
         corda_group = 'net.corda'
-        corda_release_version = '4.3'
+        corda_release_version = '4.5'
 
         corda_gradle_plugin_group = 'net.corda.plugins'
         corda_gradle_plugin_version = '5.0.4'
@@ -14,7 +14,7 @@ buildscript {
         junit_version = '5.3.1'
 
         onixlabs_group = 'io.onixlabs'
-        onixlabs_claims_release_version = '1.0.0-rc1'
+        onixlabs_idfx_release_version = '0.0.9-beta'
 
         cordapp_platform_version = 5
         cordapp_signing_enabled = true
@@ -30,6 +30,7 @@ buildscript {
         mavenCentral()
         jcenter()
         maven { url "$corda_artifactory_url/corda-releases" }
+        maven { url "$corda_artifactory_url/corda-dependencies" }
     }
 
     dependencies {
@@ -48,6 +49,7 @@ subprojects {
         jcenter()
         maven { url "https://jitpack.io" }
         maven { url "$corda_artifactory_url/corda-releases" }
+        maven { url "$corda_artifactory_url/corda-dependencies" }
         maven { url "https://repo.gradle.org/gradle/libs-releases" }
     }
 

onixlabs-corda-bnms-contract/build.gradle

@@ -18,7 +18,7 @@ dependencies {
 
     // Corda Development Dependencies
     cordaCompile "$corda_group:corda-core:$corda_release_version"
-    cordaCompile "$onixlabs_group:onixlabs-corda-claims-contract:$onixlabs_claims_release_version"
+    cordaCompile "$onixlabs_group:onixlabs-corda-identity-framework-contract:$onixlabs_idfx_release_version"
 
     // Test Dependencies
     testRuntimeOnly "$junit_group:junit-jupiter-engine:$junit_version"

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

@@ -1,41 +1,11 @@
 package io.onixlabs.corda.bnms.contract
 
-import io.onixlabs.corda.bnms.contract.membership.Membership
-import io.onixlabs.corda.bnms.contract.relationship.Relationship
-import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
 import net.corda.core.identity.AbstractParty
-import net.corda.core.transactions.LedgerTransaction
-import java.security.PublicKey
-import java.util.*
-import kotlin.reflect.KClass
-
-interface VerifiedCommand : CommandData {
-    fun verify(tx: LedgerTransaction, signers: Set<PublicKey>)
-}
 
 val Iterable<AbstractParty>.identityHash: SecureHash
     get() = SecureHash.sha256(toSortedSet(IdentityComparator).joinToString())
 
-internal inline fun <reified T : VerifiedCommand> Contract.verifySingleCommand(tx: LedgerTransaction) {
-    val command = tx.commands.requireSingleCommand<T>()
-    if (command.value.javaClass.enclosingClass != this.javaClass) {
-        throw IllegalArgumentException("Unknown contract command.")
-    }
-    command.value.verify(tx, command.signers.toSet())
-}
-
-internal val KClass<*>.contractClassName: ContractClassName
-    get() {
-        return if (!this.isCompanion) {
-            throw IllegalArgumentException("Must be called from a companion object.")
-        } else this.java.enclosingClass.canonicalName
-    }
-
-fun StateAndRef<Membership>.getNextOutput() = state.data.copy(previousStateRef = ref)
-
-fun StateAndRef<Relationship>.getNextOutput() = state.data.copy(previousStateRef = ref)
-
 private object IdentityComparator : Comparator<AbstractParty> {
     override fun compare(p0: AbstractParty?, p1: AbstractParty?): Int {
         return (p0?.hashCode() ?: 0).compareTo(p1?.hashCode() ?: 0)

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

@@ -1,26 +1,27 @@
 package io.onixlabs.corda.bnms.contract
 
+import io.onixlabs.corda.identity.framework.contract.Claim
+import io.onixlabs.corda.identity.framework.contract.Hashable
 import net.corda.core.crypto.SecureHash
 import net.corda.core.identity.AbstractParty
-import net.corda.core.serialization.CordaSerializable
 import java.util.*
 
 /**
- * Represents the identity of a network.
+ * Represents a claim that describes the identity of a business network.
  *
- * @property name The name of the network.
- * @property operator The identity of the network operator, or null if the network is decentralized.
- * @property normalizedName The normalized name of the network.
- * @property hash A SHA-256 hashed representation of the identity of a network.
+ * @property property The property of the Network claim, which is set to "Network".
+ * @property value The value of the Network claim, which is the name of the business network.
+ * @property normalizedValue The normalized value of the Network claim.
+ * @property operator The identity of the business network operator.
+ * @property hash The hash that uniquely identifies the identity of the business network.
  */
-@CordaSerializable
-class Network(val name: String, val operator: AbstractParty? = null) : Hashable {
+class Network(value: String, val operator: AbstractParty? = null) : Claim<String>("Network", value), Hashable {
 
-    val normalizedName: String
-        get() = name.toLowerCase()
+    val normalizedValue: String
+        get() = value.toLowerCase()
 
     override val hash: SecureHash
-        get() = SecureHash.sha256("$normalizedName$operator")
+        get() = SecureHash.sha256("$normalizedValue$operator")
 
     /**
      * Compares this object for equality with the specified object.
@@ -29,21 +30,14 @@ class Network(val name: String, val operator: AbstractParty? = null) : Hashable
      * @return Returns true if the objects are considered equal; otherwise, false.
      */
     override fun equals(other: Any?): Boolean {
-        return other === this || (other != null
-                && other is Network
-                && other.operator == operator
-                && other.normalizedName == normalizedName)
+        return this === other || (other is Network && other.hash == hash)
     }
 
     /**
      * Serves as the default hash code implementation.
      * @return Returns a unique hash code for this object instance.
      */
-    override fun hashCode() = Objects.hash(normalizedName, operator)
-
-    /**
-     * Gets a string representation of this object instance.
-     * @return Returns a string representation of this object instance.
-     */
-    override fun toString() = "Network: name = $name, normalized name = $normalizedName, operator = $operator"
+    override fun hashCode(): Int {
+        return Objects.hash(hash)
+    }
 }