ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-14 00:06:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Tudor Malene 2018-06-01 14:28:23 +01:00 committed by tudor.malene@gmail.com
parent eb801d40b8
commit 6dc778e404
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt
View File

@ -55,7 +55,7 @@ interface Cordapp {
val allFlows: List<Class<out FlowLogic<*>>>
val jarPath: URL
val cordappClasses: List<String>
val info: Info,
val info: Info
val jarHash: SecureHash.SHA256
/**

8
node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
View File

@ -108,7 +108,9 @@ class CordappLoader private constructor(private val cordappJarPaths: List<Restri
serializationCustomSerializers = listOf(),
customSchemas = setOf(),
jarPath = ContractUpgradeFlow.javaClass.protectionDomain.codeSource.location, // Core JAR location
info = CordappImpl.Info("corda-core", versionInfo.vendor, versionInfo.releaseVersion)
info = CordappImpl.Info("corda-core", versionInfo.vendor, versionInfo.releaseVersion),
allFlows = coreRPCFlows,
jarHash = SecureHash.allOnesHash
)
companion object {
@ -255,11 +257,9 @@ class CordappLoader private constructor(private val cordappJarPaths: List<Restri
findPlugins(it),
findSerializers(scanResult),
findCustomSchemas(scanResult),
url,
info,
name)
findAllFlows(scanResult),
it.url,
info,
getJarHash(it.url)
)
}

3
node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt
View File

@ -527,7 +527,8 @@ class MultiThreadedStateMachineManager(
flowLogic.stateMachine = flowStateMachineImpl
val frozenFlowLogic = (flowLogic as FlowLogic<*>).serialize(context = checkpointSerializationContext!!)
val initialCheckpoint = Checkpoint.create(invocationContext, flowStart, flowLogic.javaClass, frozenFlowLogic, ourIdentity, deduplicationSeed).getOrThrow()
val flowCorDappVersion= FlowStateMachineImpl.createSubFlowVersion(serviceHub.cordappProvider.getCordappForFlow(flowLogic), serviceHub.myInfo.platformVersion)
val initialCheckpoint = Checkpoint.create(invocationContext, flowStart, flowLogic.javaClass, frozenFlowLogic, ourIdentity, deduplicationSeed, flowCorDappVersion).getOrThrow()
val startedFuture = openFuture<Unit>()
val initialState = StateMachineState(
checkpoint = initialCheckpoint,