Merge branch 'main' into release

Author: MrMatthewLayton

build.gradle

@@ -41,7 +41,7 @@ buildscript {
 }
 
 group 'io.onixlabs'
-version '2.1.1'
+version '2.1.2'
 
 subprojects {
     repositories {

docs/CHANGELOG-2.1.1.md

@@ -0,0 +1,35 @@
+![ONIX Labs](https://raw.githubusercontent.com/onix-labs/onix-labs.github.io/master/content/logo/master_full_md.png)
+
+# Change Log - Version 2.1.1
+
+This document serves as the change log for the ONIXLabs Corda Core API.
+
+## Release Notes
+
+This release contains a bug fix in the workflow API to allow additional signing steps to remain suspendible when called from the `collectSignatures` function.
+
+---
+
+### collectSignatures _Extension Function_
+
+**Module:** onixlabs-corda-core-modulename
+
+**Package:** io.onixlabs.corda.core.packagename
+
+Collects all remaining required signatures from the specified counter-parties.
+
+```kotlin
+@Suspendable
+inline fun FlowLogic<*>.collectSignatures(
+    transaction: SignedTransaction,
+    sessions: Iterable<FlowSession>,
+    additionalSigningAction: ((SignedTransaction) -> SignedTransaction) = { it }
+): SignedTransaction
+```
+
+#### Remarks
+
+In version 2.1.0, adding additional signing requirements caused an exception where the transaction context was missing. This is typical when a function is not marked `@Suspendable`. Since `additionalSigningAction` is a functional parameter it cannot be marked suspendable, therefore the solution is to inline the outer `collectSignatures` function signature.
+
+---
+

docs/CHANGELOG-2.1.2.md

@@ -0,0 +1,53 @@
+![ONIX Labs](https://raw.githubusercontent.com/onix-labs/onix-labs.github.io/master/content/logo/master_full_md.png)
+
+# Change Log - Version 2.1.2
+
+This document serves as the change log for the ONIXLabs Corda Core API.
+
+## Release Notes
+
+This release contains a bug fix in the contract API to allow `contractStateType` to be overridden in resolvable classes, where the generic type parameter of the derived resolvable is `T`.
+
+---
+
+### AbstractPluralResolvable _Class_
+
+**Module:** onixlabs-corda-core-contract
+
+**Package:** io.onixlabs.corda.core.contract
+
+Represents the base class for implementing plural (one-to-many) contract state resolvers.
+
+```kotlin
+abstract class AbstractPluralResolvable<T> : PluralResolvable<T> where T : ContractState
+```
+
+#### Remarks
+
+In version 2.0.0, the `contractStateType` of this class was final and automatically resolved the class of the generic parameter type in a derived class, however this breaks if the generic parameter type in the derived class is also generic.
+
+In this version the property is declared using the `open` modifier, allowing derived classes to specify the `contractStateType` manually.
+
+---
+
+### AbstractSingularResolvable _Class_
+
+**Module:** onixlabs-corda-core-contract
+
+**Package:** io.onixlabs.corda.core.contract
+
+Represents the base class for implementing singular (one-to-one) contract state resolvers.
+
+```kotlin
+abstract class AbstractSingularResolvable<T> : SingularResolvable<T> where T : ContractState
+```
+
+#### Remarks
+
+In version 2.0.0, the `contractStateType` of this class was final and automatically resolved the class of the generic parameter type in a derived class, however this breaks if the generic parameter type in the derived class is also generic.
+
+In this version the property is declared using the `open` modifier, allowing derived classes to specify the `contractStateType` manually.
+
+---
+
+### 

gradle.properties

@@ -1,6 +1,6 @@
 name=onixlabs-corda-core
 group=io.onixlabs
-version=2.1.1
+version=2.1.2
 
 kotlin.incremental=false
 kotlin.code.style=official

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/contract/AbstractPluralResolvable.kt

@@ -29,13 +29,13 @@ import net.corda.core.transactions.LedgerTransaction
  * Represents the base class for implementing plural (one-to-many) contract state resolvers.
  *
  * @param T The underlying [ContractState] type.
+ * @property criteria The vault query criteria which will be used to resolve contract states.
  * @property contractStateType The contract state class to resolve.
  */
 abstract class AbstractPluralResolvable<T> : PluralResolvable<T> where T : ContractState {
 
-    @Suppress
-    protected val contractStateType: Class<T> = javaClass.getArgumentType(0).toTypedClass()
     protected abstract val criteria: QueryCriteria
+    protected open val contractStateType: Class<T> get() = javaClass.getArgumentType(0).toTypedClass()
 
     /**
      * Resolves a [ContractState] using a [CordaRPCOps] instance.

onixlabs-corda-core-contract/src/main/kotlin/io/onixlabs/corda/core/contract/AbstractSingularResolvable.kt

@@ -29,13 +29,13 @@ import net.corda.core.transactions.LedgerTransaction
  * Represents the base class for implementing singular (one-to-one) contract state resolvers.
  *
  * @param T The underlying [ContractState] type.
+ * @property criteria The vault query criteria which will be used to resolve contract states.
  * @property contractStateType The contract state class to resolve.
  */
 abstract class AbstractSingularResolvable<T> : SingularResolvable<T> where T : ContractState {
 
-    @Suppress
-    protected val contractStateType: Class<T> = javaClass.getArgumentType(0).toTypedClass()
     protected abstract val criteria: QueryCriteria
+    protected open val contractStateType: Class<T> get() = javaClass.getArgumentType(0).toTypedClass()
 
     /**
      * Resolves a [ContractState] using a [CordaRPCOps] instance.