diff --git a/build.gradle b/build.gradle index 9cb9ab1..0dd8c50 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { junit_version = '5.3.1' onixlabs_group = 'io.onixlabs' - onixlabs_corda_core_release_version = '4.0.2' + onixlabs_corda_core_release_version = '4.0.3' cordapp_platform_version = 11 cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract' diff --git a/gradle.properties b/gradle.properties index 5e1bbbb..a070bd8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ name=onixlabs-corda-identity-framework group=io.onixlabs -version=4.0.2 +version=4.0.3 onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12 onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3 diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/accounts/AccountParty.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/accounts/AccountParty.kt index 977aa7c..54e128a 100644 --- a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/accounts/AccountParty.kt +++ b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/accounts/AccountParty.kt @@ -143,11 +143,9 @@ class AccountParty( private val accountType: Class ) : AbstractSingularResolvable() { - override val contractStateType: Class - get() = accountType + override val contractStateType: Class get() = accountType - @Transient - override val criteria = vaultQuery(accountType) { + override val criteria get() = vaultQuery(accountType) { contractStateTypes(accountType) linearIds(accountLinearId) } diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationPointer.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationPointer.kt index 91a3bbd..6d2654f 100644 --- a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationPointer.kt +++ b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationPointer.kt @@ -131,8 +131,7 @@ class LinearAttestationPointer internal constructor( constructor(state: T) : this(state.javaClass, state.linearId) constructor(stateAndRef: StateAndRef) : this(stateAndRef.state.data) - @Transient - private val criteria: QueryCriteria = vaultQuery(stateType) { + private val criteria: QueryCriteria get() = vaultQuery(stateType) { stateStatus(Vault.StateStatus.UNCONSUMED) relevancyStatus(Vault.RelevancyStatus.ALL) linearIds(statePointer) @@ -215,8 +214,7 @@ class StaticAttestationPointer internal constructor( constructor(stateAndRef: StateAndRef) : this(stateAndRef.state.data.javaClass, stateAndRef.ref) - @Transient - private val criteria: QueryCriteria = vaultQuery(stateType) { + private val criteria: QueryCriteria get() = vaultQuery(stateType) { stateStatus(Vault.StateStatus.ALL) relevancyStatus(Vault.RelevancyStatus.ALL) stateRefs(statePointer) diff --git a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/claims/ClaimPointer.kt b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/claims/ClaimPointer.kt index 73469f2..dae8d98 100644 --- a/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/claims/ClaimPointer.kt +++ b/onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/claims/ClaimPointer.kt @@ -129,8 +129,7 @@ class LinearClaimPointer> private constructor( valueType = claim.value.javaClass ) - @Transient - private val criteria = vaultQuery(claimType) { + private val criteria get() = vaultQuery(claimType) { stateStatus(Vault.StateStatus.UNCONSUMED) relevancyStatus(Vault.RelevancyStatus.ALL) linearIds(value) @@ -214,8 +213,7 @@ class StaticClaimPointer> private constructor( valueType = claim.state.data.value.javaClass ) - @Transient - private val criteria = vaultQuery(claimType) { + private val criteria get() = vaultQuery(claimType) { stateStatus(Vault.StateStatus.ALL) relevancyStatus(Vault.RelevancyStatus.ALL) stateRefs(value)