Merge branch 'main' into release

Author: MrMatthewLayton

build.gradle

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

gradle.properties

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

onixlabs-corda-core-workflow/src/main/kotlin/io/onixlabs/corda/core/workflow/Extensions.FlowLogic.Transaction.kt

@@ -142,10 +142,10 @@ fun FlowLogic<*>.signTransaction(transaction: TransactionBuilder): SignedTransac
  * @throws FlowException if the local node has been passed to this function as a counter-party or in a flow session.
  */
 @Suspendable
-fun FlowLogic<*>.collectSignatures(
+inline fun FlowLogic<*>.collectSignatures(
     transaction: SignedTransaction,
     sessions: Iterable<FlowSession>,
-    additionalSigningAction: ((SignedTransaction) -> SignedTransaction)? = null
+    additionalSigningAction: ((SignedTransaction) -> SignedTransaction) = { it }
 ): SignedTransaction {
     currentStep(CollectTransactionSignaturesStep)
     val missingSigningKeys = transaction.getMissingSigners()
@@ -164,7 +164,7 @@ fun FlowLogic<*>.collectSignatures(
         CollectSignaturesFlow(transaction, signingSessions, CollectTransactionSignaturesStep.childProgressTracker())
     )
 
-    return additionalSigningAction?.invoke(signedTransaction) ?: signedTransaction
+    return additionalSigningAction(signedTransaction)
 }
 
 /**