ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-07 19:34:41 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cash: add an onlyParties parameter to the spend crafting method. This allows you to restrict the wallet to only cash issued by particular parties.

Browse Source
This commit is contained in:
Mike Hearn 2015-11-30 17:58:58 +00:00
parent 513b2a0b8b
commit 1f68727f31
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/contracts/Cash.kt
View File

@ -154,9 +154,14 @@ class Cash : Contract {
/**
* Generate a transaction that consumes one or more of the given input states to move money to the given pubkey.
* Note that the wallet list is not updated: it's up to you to do that.
*
* @param onlyFromParties if non-null, the wallet will be filtered to only include cash states issued by the set
* of given parties. This can be useful if the party you're trying to pay has expectations
* about which type of cash claims they are willing to accept.
*/
@Throws(InsufficientBalanceException::class)
fun craftSpend(tx: PartialTransaction, amount: Amount, to: PublicKey, wallet: List<StateAndRef<Cash.State>>) {
fun craftSpend(tx: PartialTransaction, amount: Amount, to: PublicKey,
wallet: List<StateAndRef<Cash.State>>, onlyFromParties: Set<Party>? = null) {
// Discussion
//
// This code is analogous to the Wallet.send() set of methods in bitcoinj, and has the same general outline.
@ -178,11 +183,17 @@ class Cash : Contract {
// Finally, we add the states to the provided partial transaction.
val currency = amount.currency
val coinsOfCurrency = wallet.filter { it.state.amount.currency == currency }
val acceptableCoins = run {
val ofCurrency = wallet.filter { it.state.amount.currency == currency }
if (onlyFromParties != null)
ofCurrency.filter { it.state.deposit.party in onlyFromParties }
else
ofCurrency
}
val gathered = arrayListOf<StateAndRef<Cash.State>>()
var gatheredAmount = Amount(0, currency)
for (c in coinsOfCurrency) {
for (c in acceptableCoins) {
if (gatheredAmount >= amount) break
gathered.add(c)
gatheredAmount += c.state.amount

7
tests/contracts/CashTests.kt
View File

@ -316,6 +316,13 @@ class CashTests {
assertEquals(OUR_PUBKEY_1, wtx.commands[0].pubkeys[0])
}
@Test
fun craftSimpleSpendWithParties() {
val tx = PartialTransaction()
Cash().craftSpend(tx, 80.DOLLARS, ALICE, WALLET, setOf(MINI_CORP))
assertEquals(WALLET[2].ref, tx.inputStates()[0])
}
@Test
fun craftSimpleSpendWithChange() {
val wtx = makeSpend(10.DOLLARS, THEIR_PUBKEY_1)