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

Add back V3 TransactionBuilder c'tor (#4587)

Browse Source
This commit is contained in:
Shams Asari
2019-01-15 18:52:58 +00:00
committed by GitHub
parent 78a70d2355
commit 5bb38e455c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
View File

@ -42,7 +42,7 @@ import kotlin.collections.component2
@DeleteForDJVM @DeleteForDJVM
open class TransactionBuilder( open class TransactionBuilder(
var notary: Party? = null, var notary: Party? = null,
var lockId: UUID = (Strand.currentStrand() as? FlowStateMachine<*>)?.id?.uuid ?: UUID.randomUUID(), var lockId: UUID = defaultLockId(),
protected val inputs: MutableList<StateRef> = arrayListOf(), protected val inputs: MutableList<StateRef> = arrayListOf(),
protected val attachments: MutableList<SecureHash> = arrayListOf(), protected val attachments: MutableList<SecureHash> = arrayListOf(),
protected val outputs: MutableList<TransactionState<ContractState>> = arrayListOf(), protected val outputs: MutableList<TransactionState<ContractState>> = arrayListOf(),
@ -52,9 +52,20 @@ open class TransactionBuilder(
protected val references: MutableList<StateRef> = arrayListOf(), protected val references: MutableList<StateRef> = arrayListOf(),
protected val serviceHub: ServiceHub? = (Strand.currentStrand() as? FlowStateMachine<*>)?.serviceHub protected val serviceHub: ServiceHub? = (Strand.currentStrand() as? FlowStateMachine<*>)?.serviceHub
) { ) {
constructor(notary: Party? = null,
lockId: UUID = defaultLockId(),
inputs: MutableList<StateRef> = arrayListOf(),
attachments: MutableList<SecureHash> = arrayListOf(),
outputs: MutableList<TransactionState<ContractState>> = arrayListOf(),
commands: MutableList<Command<*>> = arrayListOf(),
window: TimeWindow? = null,
privacySalt: PrivacySalt = PrivacySalt()
) : this(notary, lockId, inputs, attachments, outputs, commands, window, privacySalt, arrayListOf())
constructor(notary: Party) : this(notary, window = null) constructor(notary: Party) : this(notary, window = null)
private companion object { private companion object {
private fun defaultLockId() = (Strand.currentStrand() as? FlowStateMachine<*>)?.id?.uuid ?: UUID.randomUUID()
private val log = contextLogger() private val log = contextLogger()
private const val CORDA_VERSION_THAT_INTRODUCED_FLATTENED_COMMANDS = 4 private const val CORDA_VERSION_THAT_INTRODUCED_FLATTENED_COMMANDS = 4
} }