1.0.0-rc3

Author: MrMatthewLayton

build.gradle

@@ -29,7 +29,7 @@ buildscript {
 }
 
 group 'io.onixlabs'
-version '1.0.0-rc2'
+version '1.0.0-rc3'
 
 subprojects {
     repositories {

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

@@ -34,13 +34,4 @@ val Iterable<AbstractParty>.owningKeys: Set<PublicKey>
  * @return Returns a [SecureHash] representing the participants of the initial [Iterable].
  */
 val Iterable<AbstractParty>.participantHash: SecureHash
-    get() = SecureHash.sha256(toSortedSet(IdentityComparator).joinToString())
-
-/**
- * Represents the comparator which orders the participants in a collection.
- */
-private object IdentityComparator : Comparator<AbstractParty> {
-    override fun compare(p0: AbstractParty?, p1: AbstractParty?): Int {
-        return (p0?.hashCode() ?: 0).compareTo(p1?.hashCode() ?: 0)
-    }
-}
+    get() = SecureHash.sha256(map { SecureHash.sha256(it.toString()) }.toSortedSet().joinToString())

onixlabs-corda-core-workflow/src/main/kotlin/io/onixlabs/corda/core/workflow/FlowLogicExtensions.kt

@@ -20,6 +20,7 @@ import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef
+import net.corda.core.cordapp.CordappContext
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic
@@ -51,12 +52,18 @@ val FlowLogic<*>.randomNotary: Party
  * Gets the preferred notary from the CorDapp config, or alternatively a default notary in the event that
  * a preferred notary has not been specified in the CorDapp config.
  *
+ * @param serviceHub The service hub which will be used to obtain a notary from the config file.
  * @param defaultSelector The selector function to obtain a notary if none have been specified in the CorDapp config.
  * @return Returns the preferred or default notary.
  * @throws IllegalArgumentException If the preferred notary cannot be found in the network map cache.
  */
 @Suspendable
-inline fun FlowLogic<*>.getPreferredNotary(defaultSelector: (ServiceHub) -> Party = { firstNotary }): Party {
+fun FlowLogic<*>.getPreferredNotary(
+    serviceHub: ServiceHub = this.serviceHub,
+    defaultSelector: (ServiceHub) -> Party = { firstNotary }
+): Party {
+    val cordappContext: CordappContext = serviceHub.getAppContext()
+    logger.info("Using the specified cordapp for notary selection: ${cordappContext.cordapp.name}")
     return if (serviceHub.getAppContext().config.exists("notary")) {
         val name = CordaX500Name.parse(serviceHub.getAppContext().config.getString("notary"))
         serviceHub.networkMapCache.getNotary(name) ?: throw IllegalArgumentException(