ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-29 15:43:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-9927 Ledger Recovery tweaks (#7409)

Browse Source
This commit is contained in:
Jose Coll 2023-07-17 09:48:37 +01:00 committed by GitHub
parent 58ecce1713
commit c3e8284f28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/kotlin/net/corda/core/flows/FinalityFlow.kt
View File

@ -283,7 +283,7 @@ class FinalityFlow private constructor(val transaction: SignedTransaction,
try {
logger.debug { "Sending transaction to party sessions: $sessions." }
val (participantSessions, observerSessions) = deriveSessions(sessions)
subFlow(SendTransactionFlow(tx, participantSessions, observerSessions, statesToRecord))
subFlow(SendTransactionFlow(tx, participantSessions, observerSessions, statesToRecord, true))
} catch (e: UnexpectedFlowEndException) {
throw UnexpectedFlowEndException(
"One of the sessions ${sessions.map { it.counterparty }} has finished prematurely and we're trying to send them a transaction." +
@ -367,7 +367,7 @@ class FinalityFlow private constructor(val transaction: SignedTransaction,
oldV3Broadcast(tx, oldParticipants.toSet())
try {
logger.debug { "Sending transaction to party sessions $sessions." }
subFlow(SendTransactionFlow(tx, sessions.toSet(), emptySet(), statesToRecord))
subFlow(SendTransactionFlow(tx, sessions.toSet(), emptySet(), statesToRecord, true))
} catch (e: UnexpectedFlowEndException) {
throw UnexpectedFlowEndException(
"One of the sessions ${sessions.map { it.counterparty }} has finished prematurely and we're trying to send them the finalised transaction. " +

30
core/src/main/kotlin/net/corda/core/flows/SendTransactionFlow.kt
View File

@ -6,6 +6,7 @@ import net.corda.core.contracts.StateAndRef
import net.corda.core.crypto.SecureHash
import net.corda.core.identity.CordaX500Name
import net.corda.core.internal.*
import net.corda.core.node.ServicesForResolution
import net.corda.core.node.StatesToRecord
import net.corda.core.serialization.CordaSerializable
import net.corda.core.serialization.SerializedBytes
@ -78,20 +79,37 @@ class MaybeSerializedSignedTransaction(override val id: SecureHash, val serializ
* @param participantSessions the target parties which are participants to the transaction.
* @param observerSessions the target parties which are observers to the transaction.
* @param senderStatesToRecord the [StatesToRecord] relevancy information of the sender.
* @param recordMetaDataEvenIfNotFullySigned whether to store recovery metadata when a txn is not fully signed.
*/
open class SendTransactionFlow(val stx: SignedTransaction,
val participantSessions: Set<FlowSession>,
val observerSessions: Set<FlowSession>,
val senderStatesToRecord: StatesToRecord) : DataVendingFlow(participantSessions + observerSessions, stx,
TransactionMetadata(DUMMY_PARTICIPANT_NAME,
DistributionList(senderStatesToRecord,
(participantSessions.map { it.counterparty.name to StatesToRecord.ONLY_RELEVANT}).toMap() +
(observerSessions.map { it.counterparty.name to StatesToRecord.ALL_VISIBLE}).toMap()
))) {
val senderStatesToRecord: StatesToRecord,
private val recordMetaDataEvenIfNotFullySigned: Boolean = false)
: DataVendingFlow(participantSessions + observerSessions, stx,
makeMetaData(stx, recordMetaDataEvenIfNotFullySigned, senderStatesToRecord, participantSessions, observerSessions)) {
constructor(otherSide: FlowSession, stx: SignedTransaction) : this(stx, setOf(otherSide), emptySet(), StatesToRecord.NONE)
// Note: DUMMY_PARTICIPANT_NAME to be substituted with actual "ourIdentity.name" in flow call()
companion object {
val DUMMY_PARTICIPANT_NAME = CordaX500Name("Transaction Participant", "London", "GB")
fun makeMetaData(stx: SignedTransaction, recordMetaDataEvenIfNotFullySigned: Boolean, senderStatesToRecord: StatesToRecord, participantSessions: Set<FlowSession>, observerSessions: Set<FlowSession>): TransactionMetadata? {
return if (recordMetaDataEvenIfNotFullySigned || isFullySigned(stx))
TransactionMetadata(DUMMY_PARTICIPANT_NAME,
DistributionList(senderStatesToRecord,
(participantSessions.map { it.counterparty.name to StatesToRecord.ONLY_RELEVANT}).toMap() +
(observerSessions.map { it.counterparty.name to StatesToRecord.ALL_VISIBLE}).toMap()))
else null
}
private fun isFullySigned(stx: SignedTransaction): Boolean {
val serviceHub = (currentTopLevel?.serviceHub as? ServicesForResolution)
return if (serviceHub != null)
stx.resolveTransactionWithSignatures(serviceHub).getMissingSigners().isEmpty()
else false
}
}
}