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

ENT-10110 Back-port changes from ENT + additional clean-up (#7532)

Browse Source
This commit is contained in:
Jose Coll
2023-10-17 07:03:49 +01:00
committed by GitHub
parent 1981334921
commit 6a2bad8077
6 changed files with 223 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
core/src/main/kotlin/net/corda/core/flows/FlowTransaction.kt
View File

@ -1,78 +0,0 @@
package net.corda.core.flows
import net.corda.core.identity.CordaX500Name
import net.corda.core.node.StatesToRecord
import net.corda.core.serialization.CordaSerializable
import java.time.Instant
/**
* Flow data object representing key information required for recovery.
*/
@CordaSerializable
data class FlowTransactionInfo(
val stateMachineRunId: StateMachineRunId,
val txId: String,
val status: TransactionStatus,
val timestamp: Instant,
val metadata: TransactionMetadata?
) {
fun isInitiator(myCordaX500Name: CordaX500Name) =
this.metadata?.initiator == myCordaX500Name
}
@CordaSerializable
data class TransactionMetadata(
val initiator: CordaX500Name,
val distributionList: DistributionList
)
@CordaSerializable
sealed class DistributionList {
@CordaSerializable
data class SenderDistributionList(
val senderStatesToRecord: StatesToRecord,
val peersToStatesToRecord: Map<CordaX500Name, StatesToRecord>
) : DistributionList()
@CordaSerializable
data class ReceiverDistributionList(
val opaqueData: ByteArray, // decipherable only by sender
val receiverStatesToRecord: StatesToRecord // inferred or actual
) : DistributionList()
}
@CordaSerializable
enum class TransactionStatus {
UNVERIFIED,
VERIFIED,
IN_FLIGHT;
}
@CordaSerializable
data class RecoveryTimeWindow(val fromTime: Instant, val untilTime: Instant = Instant.now()) {
init {
if (untilTime < fromTime) {
throw IllegalArgumentException("$fromTime must be before $untilTime")
}
}
companion object {
@JvmStatic
fun between(fromTime: Instant, untilTime: Instant): RecoveryTimeWindow {
return RecoveryTimeWindow(fromTime, untilTime)
}
@JvmStatic
fun fromOnly(fromTime: Instant): RecoveryTimeWindow {
return RecoveryTimeWindow(fromTime = fromTime)
}
@JvmStatic
fun untilOnly(untilTime: Instant): RecoveryTimeWindow {
return RecoveryTimeWindow(fromTime = Instant.EPOCH, untilTime = untilTime)
}
}
}

150
core/src/main/kotlin/net/corda/core/flows/RecoveryTypes.kt Normal file
View File

@ -0,0 +1,150 @@
package net.corda.core.flows
import net.corda.core.contracts.NamedByHash
import net.corda.core.crypto.SecureHash
import net.corda.core.identity.CordaX500Name
import net.corda.core.node.StatesToRecord
import net.corda.core.serialization.CordaSerializable
import net.corda.core.utilities.OpaqueBytes
import java.time.Instant
import java.time.temporal.ChronoUnit
/**
* Transaction recovery type information.
*/
@CordaSerializable
data class FlowTransactionInfo(
val stateMachineRunId: StateMachineRunId,
val txId: String,
val status: TransactionStatus,
val timestamp: Instant,
val metadata: TransactionMetadata?
) {
fun isInitiator(myCordaX500Name: CordaX500Name) =
this.metadata?.initiator == myCordaX500Name
}
@CordaSerializable
data class TransactionMetadata(
val initiator: CordaX500Name,
val distributionList: DistributionList
)
@CordaSerializable
sealed class DistributionList {
@CordaSerializable
data class SenderDistributionList(
val senderStatesToRecord: StatesToRecord,
val peersToStatesToRecord: Map<CordaX500Name, StatesToRecord>
) : DistributionList()
@CordaSerializable
data class ReceiverDistributionList(
val opaqueData: ByteArray, // decipherable only by sender
val receiverStatesToRecord: StatesToRecord // inferred or actual
) : DistributionList()
}
@CordaSerializable
enum class TransactionStatus {
UNVERIFIED,
VERIFIED,
IN_FLIGHT;
}
@CordaSerializable
class DistributionRecords(
val senderRecords: List<SenderDistributionRecord> = emptyList(),
val receiverRecords: List<ReceiverDistributionRecord> = emptyList()
) {
val size = senderRecords.size + receiverRecords.size
}
@CordaSerializable
abstract class DistributionRecord : NamedByHash {
abstract val txId: SecureHash
abstract val peerPartyId: SecureHash
abstract val timestamp: Instant
abstract val timestampDiscriminator: Int
}
@CordaSerializable
data class SenderDistributionRecord(
override val txId: SecureHash,
override val peerPartyId: SecureHash,
override val timestamp: Instant,
override val timestampDiscriminator: Int,
val senderStatesToRecord: StatesToRecord,
val receiverStatesToRecord: StatesToRecord
) : DistributionRecord() {
override val id: SecureHash
get() = this.txId
}
@CordaSerializable
data class ReceiverDistributionRecord(
override val txId: SecureHash,
override val peerPartyId: SecureHash,
override val timestamp: Instant,
override val timestampDiscriminator: Int,
val encryptedDistributionList: OpaqueBytes,
val receiverStatesToRecord: StatesToRecord
) : DistributionRecord() {
override val id: SecureHash
get() = this.txId
}
@CordaSerializable
enum class DistributionRecordType {
SENDER, RECEIVER, ALL
}
@CordaSerializable
data class DistributionRecordKey(
val txnId: SecureHash,
val timestamp: Instant,
val timestampDiscriminator: Int
)
@CordaSerializable
data class RecoveryTimeWindow(val fromTime: Instant, val untilTime: Instant = Instant.now()) {
init {
if (untilTime < fromTime) {
throw IllegalArgumentException("$fromTime must be before $untilTime")
}
}
companion object {
@JvmStatic
fun between(fromTime: Instant, untilTime: Instant): RecoveryTimeWindow {
return RecoveryTimeWindow(fromTime, untilTime)
}
@JvmStatic
fun fromOnly(fromTime: Instant): RecoveryTimeWindow {
return RecoveryTimeWindow(fromTime = fromTime)
}
@JvmStatic
fun untilOnly(untilTime: Instant): RecoveryTimeWindow {
return RecoveryTimeWindow(fromTime = Instant.EPOCH, untilTime = untilTime)
}
}
}
@CordaSerializable
data class ComparableRecoveryTimeWindow(
val fromTime: Instant,
val fromTimestampDiscriminator: Int,
val untilTime: Instant,
val untilTimestampDiscriminator: Int
) {
companion object {
fun from(timeWindow: RecoveryTimeWindow) =
ComparableRecoveryTimeWindow(
timeWindow.fromTime.truncatedTo(ChronoUnit.SECONDS), 0,
timeWindow.untilTime.truncatedTo(ChronoUnit.SECONDS), Int.MAX_VALUE)
}
}