ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 05:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CashUtils.generateSpend: add anonymous flag, default to true (#5048)

Browse Source
This commit is contained in:
cxyzhang0 2019-04-26 01:57:32 -07:00 committed by Shams Asari
parent 45b2d06936
commit b37c422ff7
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
finance/workflows/src/main/kotlin/net/corda/finance/workflows/asset/CashUtils.kt
View File

@ -56,10 +56,13 @@ object CashUtils {
* to move the cash will be added on top. * to move the cash will be added on top.
* @param amount How much currency to send. * @param amount How much currency to send.
* @param to the recipient party. * @param to the recipient party.
* @param ourIdentity well known identity to create a new confidential identity from, for sending change to. * @param ourIdentity ourIdentity is used to determine the where the change will be sent.
* If anonymous is true then an anonymous identity will be generated from this and the change
* will be spent to that, otherwise ourIdentity will be used as is.
* @param onlyFromParties if non-null, the asset states will be filtered to only include those issued by the set * @param onlyFromParties if non-null, the asset states will be filtered to only include those issued by the set
* of given parties. This can be useful if the party you're trying to pay has expectations * of given parties. This can be useful if the party you're trying to pay has expectations
* about which type of asset claims they are willing to accept. * about which type of asset claims they are willing to accept.
* @param anonymous whether or not to use CI to send the change to
* @return A [Pair] of the same transaction builder passed in as [tx], and the list of keys that need to sign * @return A [Pair] of the same transaction builder passed in as [tx], and the list of keys that need to sign
* the resulting transaction for it to be valid. * the resulting transaction for it to be valid.
* @throws InsufficientBalanceException when a cash spending transaction fails because * @throws InsufficientBalanceException when a cash spending transaction fails because
@ -73,8 +76,9 @@ object CashUtils {
amount: Amount<Currency>, amount: Amount<Currency>,
ourIdentity: PartyAndCertificate, ourIdentity: PartyAndCertificate,
to: AbstractParty, to: AbstractParty,
onlyFromParties: Set<AbstractParty> = emptySet()): Pair<TransactionBuilder, List<PublicKey>> { onlyFromParties: Set<AbstractParty> = emptySet(),
return generateSpend(services, tx, listOf(PartyAndAmount(to, amount)), ourIdentity, onlyFromParties) anonymous: Boolean = true): Pair<TransactionBuilder, List<PublicKey>> {
return generateSpend(services, tx, listOf(PartyAndAmount(to, amount)), ourIdentity, onlyFromParties, anonymous)
} }
/** /**
@ -115,10 +119,13 @@ object CashUtils {
* @param tx A builder, which may contain inputs, outputs and commands already. The relevant components needed * @param tx A builder, which may contain inputs, outputs and commands already. The relevant components needed
* to move the cash will be added on top. * to move the cash will be added on top.
* @param payments A list of amounts to pay, and the party to send the payment to. * @param payments A list of amounts to pay, and the party to send the payment to.
* @param ourIdentity well known identity to create a new confidential identity from, for sending change to. * @param ourIdentity ourIdentity is used to determine the where the change will be sent.
* If anonymous is true then an anonymous identity will be generated from this and the change
* will be spent to that, otherwise ourIdentity will be used as is.
* @param onlyFromParties if non-null, the asset states will be filtered to only include those issued by the set * @param onlyFromParties if non-null, the asset states will be filtered to only include those issued by the set
* of given parties. This can be useful if the party you're trying to pay has expectations * of given parties. This can be useful if the party you're trying to pay has expectations
* about which type of asset claims they are willing to accept. * about which type of asset claims they are willing to accept.
* @param anonymous whether or not to use CI to send the change to
* @return A [Pair] of the same transaction builder passed in as [tx], and the list of keys that need to sign * @return A [Pair] of the same transaction builder passed in as [tx], and the list of keys that need to sign
* the resulting transaction for it to be valid. * the resulting transaction for it to be valid.
* @throws InsufficientBalanceException when a cash spending transaction fails because * @throws InsufficientBalanceException when a cash spending transaction fails because
@ -131,7 +138,8 @@ object CashUtils {
tx: TransactionBuilder, tx: TransactionBuilder,
payments: List<PartyAndAmount<Currency>>, payments: List<PartyAndAmount<Currency>>,
ourIdentity: PartyAndCertificate, ourIdentity: PartyAndCertificate,
onlyFromParties: Set<AbstractParty> = emptySet()): Pair<TransactionBuilder, List<PublicKey>> { onlyFromParties: Set<AbstractParty> = emptySet(),
anonymous: Boolean = true): Pair<TransactionBuilder, List<PublicKey>> {
fun deriveState(txState: TransactionState<Cash.State>, amt: Amount<Issued<Currency>>, owner: AbstractParty): TransactionState<Cash.State> { fun deriveState(txState: TransactionState<Cash.State>, amt: Amount<Issued<Currency>>, owner: AbstractParty): TransactionState<Cash.State> {
return txState.copy(data = txState.data.copy(amount = amt, owner = owner)) return txState.copy(data = txState.data.copy(amount = amt, owner = owner))
} }
@ -141,17 +149,18 @@ object CashUtils {
val cashSelection = AbstractCashSelection.getInstance { services.jdbcSession().metaData } val cashSelection = AbstractCashSelection.getInstance { services.jdbcSession().metaData }
val acceptableCoins = cashSelection.unconsumedCashStatesForSpending(services, totalAmount, onlyFromParties, tx.notary, tx.lockId) val acceptableCoins = cashSelection.unconsumedCashStatesForSpending(services, totalAmount, onlyFromParties, tx.notary, tx.lockId)
val revocationEnabled = false // Revocation is currently unsupported val revocationEnabled = false // Revocation is currently unsupported
// Generate a new identity that change will be sent to for confidentiality purposes. This means that a // If anonymous is true, generate a new identity that change will be sent to for confidentiality purposes. This means that a
// third party with a copy of the transaction (such as the notary) cannot identify who the change was // third party with a copy of the transaction (such as the notary) cannot identify who the change was
// sent to // sent to
val changeIdentity = services.keyManagementService.freshKeyAndCert(ourIdentity, revocationEnabled) val changeIdentity = if (anonymous) services.keyManagementService.freshKeyAndCert(ourIdentity, revocationEnabled).party.anonymise() else ourIdentity.party
return OnLedgerAsset.generateSpend( return OnLedgerAsset.generateSpend(
tx, tx,
payments, payments,
acceptableCoins, acceptableCoins,
changeIdentity.party.anonymise(), changeIdentity,
::deriveState, ::deriveState,
Cash()::generateMoveCommand Cash()::generateMoveCommand
) )
} }
} }