1.0.0-rc4

MrMatthewLayton · MrMatthewLayton · commit 2ec1c1e9635c · 2021-01-07T21:10:17.000Z
diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,9 @@ buildscript {
         junit_group = 'org.junit.jupiter'
         junit_version = '5.3.1'
 
+        onixlabs_group = 'io.onixlabs'
+        onixlabs_corda_core_release_version = '1.0.0-rc1'
+
         cordapp_platform_version = 8
         cordapp_signing_enabled = false
         cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'
@@ -37,7 +40,7 @@ buildscript {
 }
 
 group 'io.onixlabs'
-version '1.0.0-rc3'
+version '1.0.0-rc4'
 
 subprojects {
     repositories {
diff --git a/onixlabs-corda-identity-framework-contract/build.gradle b/onixlabs-corda-identity-framework-contract/build.gradle
@@ -18,6 +18,7 @@ dependencies {
 
     // Corda Development Dependencies
     cordaCompile "$corda_group:corda-core:$corda_release_version"
+    cordaCompile "$onixlabs_group:onixlabs-corda-core-contract:$onixlabs_corda_core_release_version"
 
     // Test Dependencies
     testRuntimeOnly "$junit_group:junit-jupiter-engine:$junit_version"
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Attestation.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Attestation.kt
@@ -16,6 +16,8 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.core.contract.ChainState
+import io.onixlabs.corda.core.contract.Hashable
 import io.onixlabs.corda.identityframework.contract.AttestationSchema.AttestationEntity
 import io.onixlabs.corda.identityframework.contract.AttestationSchema.AttestationSchemaV1
 import net.corda.core.contracts.*
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationContract.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationContract.kt
@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.core.contract.isPointingTo
 import net.corda.core.contracts.*
 import net.corda.core.transactions.LedgerTransaction
 import java.security.PublicKey
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationPointer.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationPointer.kt
@@ -16,6 +16,9 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.core.contract.Hashable
+import io.onixlabs.corda.core.contract.Resolvable
+import io.onixlabs.corda.core.contract.TransactionResolution
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
 import net.corda.core.messaging.CordaRPCOps
@@ -161,4 +164,4 @@ class AttestationPointer<T : ContractState>(
             stateAndRef
         }
     }
-}
+}
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/ChainState.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/ChainState.kt
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/ChainStateExtensions.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/ChainStateExtensions.kt
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/ClaimPointer.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/ClaimPointer.kt
@@ -16,6 +16,8 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.core.contract.Resolvable
+import io.onixlabs.corda.core.contract.TransactionResolution
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/CordaClaim.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/CordaClaim.kt
@@ -16,6 +16,8 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.core.contract.ChainState
+import io.onixlabs.corda.core.contract.Hashable
 import io.onixlabs.corda.identityframework.contract.CordaClaimSchema.CordaClaimEntity
 import io.onixlabs.corda.identityframework.contract.CordaClaimSchema.CordaClaimSchemaV1
 import net.corda.core.contracts.BelongsToContract
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/CordaClaimContract.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/CordaClaimContract.kt
@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.core.contract.isPointingTo
 import net.corda.core.contracts.*
 import net.corda.core.transactions.LedgerTransaction
 import java.security.PublicKey
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Hashable.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Hashable.kt
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Resolvable.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Resolvable.kt
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/StateAndRefExtensions.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/StateAndRefExtensions.kt
@@ -16,7 +16,10 @@
 
 package io.onixlabs.corda.identityframework.contract
 
-import net.corda.core.contracts.*
+import net.corda.core.contracts.ContractState
+import net.corda.core.contracts.LinearState
+import net.corda.core.contracts.StateAndRef
+import net.corda.core.contracts.UniqueIdentifier
 import net.corda.core.identity.AbstractParty
 
 /**
@@ -84,15 +87,4 @@ fun <T : ContractState> StateAndRef<T>.reject(
     attestor: AbstractParty,
     metadata: Map<String, String> = emptyMap(),
     linearId: UniqueIdentifier = UniqueIdentifier()
-): Attestation<T> = attest(attestor, AttestationStatus.REJECTED, metadata, linearId)
-
-/**
- * Casts a [StateAndRef] of an unknown [ContractState] to a [StateAndRef] of type [T].
- *
- * @param T The underlying [ContractState] type to cast to.
- * @return Returns a [StateAndRef] of type [T].
- * @throws ClassCastException if the unknown [ContractState] type cannot be cast to [T].
- */
-inline fun <reified T : ContractState> StateAndRef<*>.cast(): StateAndRef<T> = with(state) {
-    StateAndRef(TransactionState(T::class.java.cast(data), contract, notary, encumbrance, constraint), ref)
-}
+): Attestation<T> = attest(attestor, AttestationStatus.REJECTED, metadata, linearId)
diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/TransactionResolution.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/TransactionResolution.kt
diff --git a/onixlabs-corda-identity-framework-integration/src/main/kotlin/io/onixlabs/corda/identityframework/integration/AttestationQueryService.kt b/onixlabs-corda-identity-framework-integration/src/main/kotlin/io/onixlabs/corda/identityframework/integration/AttestationQueryService.kt
@@ -16,10 +16,10 @@
 
 package io.onixlabs.corda.identityframework.integration
 
+import io.onixlabs.corda.core.contract.cast
 import io.onixlabs.corda.identityframework.contract.Attestation
 import io.onixlabs.corda.identityframework.contract.AttestationPointer
 import io.onixlabs.corda.identityframework.contract.AttestationStatus
-import io.onixlabs.corda.identityframework.contract.cast
 import io.onixlabs.corda.identityframework.workflow.DEFAULT_PAGE_SPECIFICATION
 import io.onixlabs.corda.identityframework.workflow.FindAttestationFlow
 import io.onixlabs.corda.identityframework.workflow.FindAttestationsFlow
diff --git a/onixlabs-corda-identity-framework-integration/src/main/kotlin/io/onixlabs/corda/identityframework/integration/ClaimQueryService.kt b/onixlabs-corda-identity-framework-integration/src/main/kotlin/io/onixlabs/corda/identityframework/integration/ClaimQueryService.kt
@@ -16,8 +16,8 @@
 
 package io.onixlabs.corda.identityframework.integration
 
+import io.onixlabs.corda.core.contract.cast
 import io.onixlabs.corda.identityframework.contract.CordaClaim
-import io.onixlabs.corda.identityframework.contract.cast
 import io.onixlabs.corda.identityframework.workflow.DEFAULT_PAGE_SPECIFICATION
 import io.onixlabs.corda.identityframework.workflow.FindClaimFlow
 import io.onixlabs.corda.identityframework.workflow.FindClaimsFlow
diff --git a/onixlabs-corda-identity-framework-workflow/build.gradle b/onixlabs-corda-identity-framework-workflow/build.gradle
@@ -18,6 +18,7 @@ dependencies {
 
     // Corda Development Dependencies
     cordaCompile "$corda_group:corda-core:$corda_release_version"
+    cordaCompile "$onixlabs_group:onixlabs-corda-core-workflow:$onixlabs_corda_core_release_version"
 
     // CorDapp Dependencies
     cordapp project(":onixlabs-corda-identity-framework-contract")

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`
`17`	`17`	`package io.onixlabs.corda.identityframework.contract`
`18`	`18`
	`19`	`+import io.onixlabs.corda.core.contract.Hashable`
	`20`	`+import io.onixlabs.corda.core.contract.Resolvable`
	`21`	`+import io.onixlabs.corda.core.contract.TransactionResolution`
`19`	`22`	`import net.corda.core.contracts.*`
`20`	`23`	`import net.corda.core.crypto.SecureHash`
`21`	`24`	`import net.corda.core.messaging.CordaRPCOps`
`@@ -161,4 +164,4 @@ class AttestationPointer<T : ContractState>(`
`161`	`164`	`stateAndRef`
`162`	`165`	`}`
`163`	`166`	`}`
`164`		`-}`
	`167`	`+}`