Added claims to accounts.

Author: MrMatthewLayton

build.gradle

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

gradle.properties

@@ -1,9 +1,5 @@
 name=onixlabs-corda-identity-framework
 group=io.onixlabs
-version=3.0.0-rc1
-
-kotlin.incremental=false
-kotlin.code.style=official
-
+version=3.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/accounts/Account.kt

@@ -53,7 +53,7 @@ open class Account(
      * @return Returns a persistent state entity.
      */
     override fun generateMappedObject(schema: MappedSchema): PersistentState = when (schema) {
-        is AccountSchemaV1 -> AccountEntity(this)
+        is AccountSchemaV1 -> AccountEntity.fromAccount(this)
         else -> throw IllegalArgumentException("Unrecognised schema: $schema.")
     }
 

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/accounts/AccountSchema.kt

@@ -16,20 +16,18 @@
 
 package io.onixlabs.corda.identityframework.contract.accounts
 
-import io.onixlabs.corda.identityframework.contract.claims.AbstractClaim
 import net.corda.core.crypto.NullKeys.NULL_PARTY
 import net.corda.core.identity.AbstractParty
-import net.corda.core.schemas.*
-import java.io.Serializable
+import net.corda.core.schemas.MappedSchema
+import net.corda.core.schemas.PersistentState
 import java.util.*
 import javax.persistence.*
-import kotlin.jvm.Transient
 
 object AccountSchema {
 
     object AccountSchemaV1 :
-        MappedSchema(AccountSchema.javaClass, 1, listOf(AccountEntity::class.java, AccountClaim::class.java)) {
-        override val migrationResource = super.migrationResource
+        MappedSchema(AccountSchema.javaClass, 1, listOf(AccountEntity::class.java, AccountClaimEntity::class.java)) {
+        override val migrationResource = "account-schema.changelog-master"
     }
 
     @Entity
@@ -44,23 +42,48 @@ object AccountSchema {
         @Column(name = "owner", nullable = false)
         val owner: AbstractParty = NULL_PARTY,
 
-        @OneToMany(cascade = [CascadeType.PERSIST])
+        @OneToMany(fetch = FetchType.LAZY, cascade = [CascadeType.PERSIST])
         @JoinColumns(
-            JoinColumn(name = "output_index", referencedColumnName = "output_index"),
-            JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id")
+            JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id"),
+            JoinColumn(name = "output_index", referencedColumnName = "output_index")
         )
-        val claims: List<AccountClaim> = emptyList()
+        @OrderColumn
+        val claims: MutableSet<AccountClaimEntity> = mutableSetOf()
     ) : PersistentState() {
-        constructor(account: Account) : this(
-            account.linearId.id,
-            account.linearId.externalId,
-            account.owner,
-            account.claims.map { AccountClaim(it) })
+
+        companion object {
+            fun fromAccount(account: Account): AccountEntity {
+                val entity = AccountEntity(
+                    account.linearId.id,
+                    account.linearId.externalId,
+                    account.owner
+                )
+
+                account.claims.forEach {
+                    val claimEntity = AccountClaimEntity(
+                        null,
+                        it.property,
+                        it.value.toString(),
+                        it.computeHash().toString(),
+                        entity
+                    )
+
+                    entity.claims.add(claimEntity)
+                }
+
+                return entity
+            }
+        }
     }
 
     @Entity
     @Table(name = "onixlabs_account_claims")
-    class AccountClaim(
+    class AccountClaimEntity(
+        @Id
+        @GeneratedValue
+        @Column(name = "id", unique = true, nullable = true)
+        val id: UUID? = null,
+
         @Column(name = "property", nullable = false)
         val property: String = "",
 
@@ -70,25 +93,11 @@ object AccountSchema {
         @Column(name = "hash", nullable = false)
         val hash: String = "",
 
-        @EmbeddedId
-        override val compositeKey: Key
-        ) : IndirectStatePersistable<Key> {
-        constructor(claim: AbstractClaim<*>) : this(
-            //UUID.randomUUID(),
-            claim.property,
-            claim.value.toString(),
-            claim.computeHash().toString(),
-            Key()
+        @ManyToOne(fetch = FetchType.LAZY)
+        @JoinColumns(
+            JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id"),
+            JoinColumn(name = "output_index", referencedColumnName = "output_index")
         )
-    }
-
-    class Key(override val stateRef: PersistentStateRef? = null) : DirectStatePersistable, Serializable {
-        override fun equals(other: Any?): Boolean {
-            return this === other || (other is Key && other.stateRef == stateRef)
-        }
-
-        override fun hashCode(): Int {
-            return Objects.hash(stateRef)
-        }
-    }
+        val account: AccountEntity? = null
+    )
 }

onixlabs-corda-identity-framework-contract/src/main/resources/migration/account-schema.changelog-v1.xml

@@ -21,12 +21,6 @@
         <addPrimaryKey columnNames="output_index, transaction_id"
                        constraintName="PK_onixlabs_account_states"
                        tableName="onixlabs_account_states"/>
-        <createIndex tableName="onixlabs_account_states" indexName="IDX_account_id">
-            <column name="linear_id"/>
-        </createIndex>
-        <createIndex tableName="onixlabs_account_states" indexName="IDX_owner">
-            <column name="owner"/>
-        </createIndex>
     </changeSet>
     <changeSet author="ONIXLabs" id="create-onixlabs_account_claims">
         <createTable tableName="onixlabs_account_claims">
@@ -52,9 +46,6 @@
         <addPrimaryKey columnNames="id"
                        constraintName="PK_onixlabs_account_claims"
                        tableName="onixlabs_account_claims"/>
-        <createIndex tableName="onixlabs_account_claims" indexName="IDX_account_claim_index">
-            <column name="hash"/>
-        </createIndex>
         <createIndex tableName="onixlabs_account_claims" indexName="IDX_transaction_reference">
             <column name="output_index"/>
             <column name="transaction_id"/>

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/Extensions.QueryDsl.Account.kt

@@ -20,9 +20,7 @@ import io.onixlabs.corda.core.services.QueryDsl
 import io.onixlabs.corda.core.services.QueryDslContext
 import io.onixlabs.corda.core.services.equalTo
 import io.onixlabs.corda.identityframework.contract.accounts.Account
-import io.onixlabs.corda.identityframework.contract.accounts.AccountSchema.AccountClaim
 import io.onixlabs.corda.identityframework.contract.accounts.AccountSchema.AccountEntity
-import io.onixlabs.corda.identityframework.contract.claims.AbstractClaim
 import net.corda.core.identity.AbstractParty
 
 /**
@@ -34,33 +32,3 @@ import net.corda.core.identity.AbstractParty
 fun QueryDsl<out Account>.accountOwner(value: AbstractParty) {
     expression(AccountEntity::owner equalTo value)
 }
-
-/**
- * Adds a vault query expression to filter by account claim equal to the specified value.
- *
- * @param value The value to filter by in the vault query expression.
- */
-@QueryDslContext
-fun QueryDsl<out Account>.accountClaim(value: AbstractClaim<*>) {
-    expression(AccountClaim::hash equalTo value.computeHash().toString())
-}
-
-/**
- * Adds a vault query expression to filter by account claim equal property to the specified value.
- *
- * @param value The value to filter by in the vault query expression.
- */
-@QueryDslContext
-fun QueryDsl<out Account>.accountClaimProperty(value: String) {
-    expression(AccountClaim::property equalTo value)
-}
-
-/**
- * Adds a vault query expression to filter by account claim equal value to the specified value.
- *
- * @param value The value to filter by in the vault query expression.
- */
-@QueryDslContext
-fun QueryDsl<out Account>.accountClaimValue(value: Any) {
-    expression(AccountClaim::value equalTo value.toString())
-}

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/accounts/GetAccountStateRefsByClaimFlow.kt

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.identityframework.workflow.accounts
+
+import co.paralleluniverse.fibers.Suspendable
+import net.corda.core.contracts.StateRef
+import net.corda.core.crypto.SecureHash
+import net.corda.core.flows.FlowLogic
+import net.corda.core.flows.StartableByRPC
+import net.corda.core.flows.StartableByService
+import java.sql.ResultSet
+
+@StartableByRPC
+@StartableByService
+class GetAccountStateRefsByClaimFlow(
+    private val property: String? = null,
+    private val value: Any? = null,
+    private val hash: SecureHash? = null
+) : FlowLogic<List<StateRef>>() {
+
+    private companion object {
+        const val TRANSACTION_ID = "transaction_id"
+        const val OUTPUT_INDEX = "output_index"
+    }
+
+    @Suspendable
+    override fun call(): List<StateRef> {
+        return if (property == null && value == null && hash == null) emptyList() else executeQuery(buildString {
+            val criteria = mutableListOf<String>()
+
+            property?.let { criteria.add("property = '$it'") }
+            value?.let { criteria.add("value = '$it'") }
+            hash?.let { criteria.add("hash = '$it'") }
+
+            appendln("select $TRANSACTION_ID, $OUTPUT_INDEX")
+            appendln("from onixlabs_account_claims")
+            appendln("where ${criteria.joinToString("\nand ")}")
+        })
+    }
+
+    @Suspendable
+    private fun executeQuery(query: String): List<StateRef> {
+        return with(serviceHub.jdbcSession()) {
+            val nativeQuery = nativeSQL(query)
+            prepareStatement(nativeQuery).use {
+                it.executeQuery().use(::getStateRefsFromResults)
+            }
+        }
+    }
+
+    @Suspendable
+    private fun getStateRefsFromResults(results: ResultSet): List<StateRef> {
+        val stateRefs = mutableListOf<StateRef>()
+
+        while (results.next()) {
+            val txHash = SecureHash.parse(results.getString(TRANSACTION_ID))
+            val index = results.getInt(OUTPUT_INDEX)
+            stateRefs.add(StateRef(txHash, index))
+        }
+
+        return stateRefs
+    }
+}