From 212182466222093a77578147411c4c5b21b76c5a Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Thu, 30 Jun 2016 10:37:25 +0100 Subject: [PATCH] Rename com.r3cord.contracts.cash package to ...asset --- .../contracts/JavaCommercialPaper.java | 6 +-- .../com/r3corda/contracts/CommercialPaper.kt | 6 +-- .../r3corda/contracts/{cash => asset}/Cash.kt | 2 +- .../{cash => asset}/FungibleAsset.kt | 2 +- .../{cash => asset}/FungibleAssetState.kt | 2 +- .../contracts/{ => asset}/Obligation.kt | 12 +++--- .../r3corda/contracts/testing/TestUtils.kt | 5 ++- .../r3corda/contracts/testing/WalletFiller.kt | 2 +- .../protocols/TwoPartyTradeProtocol.kt | 4 +- .../{cash => asset}/CashTestsJava.java | 4 +- .../r3corda/contracts/CommercialPaperTests.kt | 2 +- .../contracts/{cash => asset}/CashTests.kt | 6 +-- .../contracts/{ => asset}/ObligationTests.kt | 38 +++++++++---------- docs/build/html/api/alltypes/index.html | 10 ++--- .../-asset-issuance-definition/deposit.html | 4 +- .../-asset-issuance-definition/index.html | 2 +- .../-asset-issuance-definition/token.html | 4 +- .../-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html | 4 +- .../-cash/-commands/-exit/-init-.html | 4 +- .../-cash/-commands/-exit/amount.html | 4 +- .../-cash/-commands/-exit/index.html | 4 +- .../-cash/-commands/-issue/-init-.html | 4 +- .../-cash/-commands/-issue/index.html | 4 +- .../-cash/-commands/-issue/nonce.html | 4 +- .../-cash/-issuance-definition/-init-.html | 4 +- .../-cash/-issuance-definition/deposit.html | 4 +- .../-cash/-issuance-definition/index.html | 4 +- .../-cash/-issuance-definition/token.html | 4 +- .../-cash/-state/-init-.html | 4 +- .../-cash/-state/amount.html | 4 +- .../-cash/-state/contract.html | 4 +- .../-cash/-state/deposit.html | 4 +- .../-cash/-state/index.html | 10 ++--- .../-cash/-state/issuance-def.html | 4 +- .../-cash/-state/notary.html | 4 +- .../-cash/-state/owner.html | 4 +- .../-cash/-state/to-string.html | 4 +- .../-cash/-state/with-new-owner.html | 6 +-- .../-cash/generate-issue.html | 10 ++--- .../-cash/generate-spend.html | 6 +-- .../-cash/index.html | 10 ++--- .../-cash/legal-contract-reference.html | 4 +- .../-fungible-asset-state/amount.html | 4 +- .../-fungible-asset-state/deposit.html | 4 +- .../-fungible-asset-state/issuance-def.html | 4 +- .../-commands/-exit/amount.html | 4 +- .../-commands/-exit/index.html | 2 +- .../-commands/-issue/index.html | 2 +- .../-commands/-issue/nonce.html | 4 +- .../-fungible-asset/-commands/-move.html | 2 +- .../-fungible-asset/-init-.html | 2 +- .../-fungible-asset/-state/amount.html | 4 +- .../-fungible-asset/-state/deposit.html | 4 +- .../-fungible-asset/-state/index.html | 2 +- .../-fungible-asset/-state/notary.html | 4 +- .../-fungible-asset/-state/owner.html | 4 +- .../-fungible-asset/index.html | 4 +- .../-fungible-asset/verify.html | 6 +-- .../-init-.html | 4 +- .../amount-missing.html | 4 +- .../index.html | 4 +- .../api/com.r3corda.contracts.cash/index.html | 6 +-- .../kotlin.collections.-iterable/index.html | 12 +++--- .../sum-cash-by.html | 6 +-- .../sum-cash-or-null.html | 4 +- .../sum-cash-or-zero.html | 6 +-- .../sum-cash.html | 4 +- .../sum-fungible-by.html | 6 +-- .../sum-fungible-or-null.html | 4 +- .../sum-fungible-or-zero.html | 6 +-- .../sum-fungible.html | 4 +- .../com.r3corda.contracts.testing/index.html | 4 +- .../issued by.html | 4 +- .../owned by.html | 4 +- .../-commercial-paper/generate-redeem.html | 4 +- .../-commercial-paper/index.html | 2 +- docs/build/html/api/index.html | 2 +- .../wallet/CashBalanceAsMetricsObserver.kt | 2 +- .../messaging/TwoPartyTradeProtocolTests.kt | 2 +- .../node/services/NodeInterestRatesTest.kt | 2 +- .../node/services/WalletWithCashTest.kt | 4 +- .../kotlin/com/r3corda/demos/RateFixDemo.kt | 2 +- .../kotlin/com/r3corda/demos/TraderDemo.kt | 2 +- 83 files changed, 197 insertions(+), 196 deletions(-) rename contracts/src/main/kotlin/com/r3corda/contracts/{cash => asset}/Cash.kt (99%) rename contracts/src/main/kotlin/com/r3corda/contracts/{cash => asset}/FungibleAsset.kt (99%) rename contracts/src/main/kotlin/com/r3corda/contracts/{cash => asset}/FungibleAssetState.kt (91%) rename contracts/src/main/kotlin/com/r3corda/contracts/{ => asset}/Obligation.kt (99%) rename contracts/src/test/java/com/r3corda/contracts/{cash => asset}/CashTestsJava.java (95%) rename contracts/src/test/kotlin/com/r3corda/contracts/{cash => asset}/CashTests.kt (99%) rename contracts/src/test/kotlin/com/r3corda/contracts/{ => asset}/ObligationTests.kt (96%) diff --git a/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java b/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java index a1ba26e559..5b37c86887 100644 --- a/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java +++ b/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java @@ -1,9 +1,9 @@ package com.r3corda.contracts; import com.google.common.collect.ImmutableList; -import com.r3corda.contracts.cash.Cash; -import com.r3corda.contracts.cash.CashKt; -import com.r3corda.contracts.cash.InsufficientBalanceException; +import com.r3corda.contracts.asset.Cash; +import com.r3corda.contracts.asset.CashKt; +import com.r3corda.contracts.asset.InsufficientBalanceException; import com.r3corda.core.contracts.*; import com.r3corda.core.contracts.TransactionForContract.InOutGroup; import com.r3corda.core.crypto.NullPublicKey; diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt b/contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt index eabb650386..27d41a59df 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt @@ -1,8 +1,8 @@ package com.r3corda.contracts -import com.r3corda.contracts.cash.Cash -import com.r3corda.contracts.cash.InsufficientBalanceException -import com.r3corda.contracts.cash.sumCashBy +import com.r3corda.contracts.asset.Cash +import com.r3corda.contracts.asset.InsufficientBalanceException +import com.r3corda.contracts.asset.sumCashBy import com.r3corda.core.contracts.* import com.r3corda.core.crypto.NullPublicKey import com.r3corda.core.crypto.Party diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/cash/Cash.kt b/contracts/src/main/kotlin/com/r3corda/contracts/asset/Cash.kt similarity index 99% rename from contracts/src/main/kotlin/com/r3corda/contracts/cash/Cash.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/asset/Cash.kt index 606f430014..446e90f8c2 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/cash/Cash.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/asset/Cash.kt @@ -1,4 +1,4 @@ -package com.r3corda.contracts.cash +package com.r3corda.contracts.asset import com.r3corda.core.contracts.* import com.r3corda.core.crypto.Party diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAsset.kt b/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAsset.kt similarity index 99% rename from contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAsset.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAsset.kt index 869ddea6d5..59ae41fdbc 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAsset.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAsset.kt @@ -1,4 +1,4 @@ -package com.r3corda.contracts.cash +package com.r3corda.contracts.asset import com.r3corda.core.contracts.* import com.r3corda.core.crypto.Party diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAssetState.kt b/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAssetState.kt similarity index 91% rename from contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAssetState.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAssetState.kt index 28a85c173e..436919b690 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/cash/FungibleAssetState.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAssetState.kt @@ -1,4 +1,4 @@ -package com.r3corda.contracts.cash +package com.r3corda.contracts.asset import com.r3corda.core.contracts.Amount import com.r3corda.core.contracts.Issued diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/Obligation.kt b/contracts/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt similarity index 99% rename from contracts/src/main/kotlin/com/r3corda/contracts/Obligation.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt index 6ce0119de3..1aa3538461 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/Obligation.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt @@ -1,8 +1,8 @@ -package com.r3corda.contracts +package com.r3corda.contracts.asset import com.google.common.annotations.VisibleForTesting -import com.r3corda.contracts.cash.FungibleAssetState -import com.r3corda.contracts.cash.sumFungibleOrNull +import com.r3corda.contracts.asset.FungibleAssetState +import com.r3corda.contracts.asset.sumFungibleOrNull import com.r3corda.core.contracts.* import com.r3corda.core.crypto.Party import com.r3corda.core.crypto.SecureHash @@ -152,7 +152,7 @@ class Obligation

: Contract { override val owner: PublicKey get() = beneficiary - override fun move(newAmount: Amount

, newOwner: PublicKey): Obligation.State

+ override fun move(newAmount: Amount

, newOwner: PublicKey): State

= copy(quantity = newAmount.quantity, beneficiary = newOwner) override fun toString() = when (lifecycle) { @@ -249,10 +249,10 @@ class Obligation

: Contract { /** This is the function EVERYONE runs */ override fun verify(tx: TransactionForContract) { - val commands = tx.commands.select() + val commands = tx.commands.select() // Net commands are special, and cross issuance definitions, so handle them first - val netCommands = commands.select() + val netCommands = commands.select() if (netCommands.isNotEmpty()) { val netCommand = netCommands.single() val groups = when (netCommand.value.type) { diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/testing/TestUtils.kt b/contracts/src/main/kotlin/com/r3corda/contracts/testing/TestUtils.kt index f3bc5eab21..bd13e1178e 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/testing/TestUtils.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/testing/TestUtils.kt @@ -1,8 +1,9 @@ package com.r3corda.contracts.testing import com.r3corda.contracts.* -import com.r3corda.contracts.cash.CASH_PROGRAM_ID -import com.r3corda.contracts.cash.Cash +import com.r3corda.contracts.asset.CASH_PROGRAM_ID +import com.r3corda.contracts.asset.Cash +import com.r3corda.contracts.asset.Obligation import com.r3corda.core.contracts.Amount import com.r3corda.core.contracts.Contract import com.r3corda.core.contracts.ContractState diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/testing/WalletFiller.kt b/contracts/src/main/kotlin/com/r3corda/contracts/testing/WalletFiller.kt index ec7bec2404..2a9bd90fac 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/testing/WalletFiller.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/testing/WalletFiller.kt @@ -1,7 +1,7 @@ @file:JvmName("WalletFiller") package com.r3corda.contracts.testing -import com.r3corda.contracts.cash.Cash +import com.r3corda.contracts.asset.Cash import com.r3corda.core.contracts.Amount import com.r3corda.core.contracts.Issued import com.r3corda.core.contracts.SignedTransaction diff --git a/contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt b/contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt index 9959de2fb8..9a3a5db056 100644 --- a/contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt +++ b/contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt @@ -1,8 +1,8 @@ package com.r3corda.protocols import co.paralleluniverse.fibers.Suspendable -import com.r3corda.contracts.cash.Cash -import com.r3corda.contracts.cash.sumCashBy +import com.r3corda.contracts.asset.Cash +import com.r3corda.contracts.asset.sumCashBy import com.r3corda.core.contracts.* import com.r3corda.core.crypto.DigitalSignature import com.r3corda.core.crypto.Party diff --git a/contracts/src/test/java/com/r3corda/contracts/cash/CashTestsJava.java b/contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java similarity index 95% rename from contracts/src/test/java/com/r3corda/contracts/cash/CashTestsJava.java rename to contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java index 63772ab0dc..4d62148f70 100644 --- a/contracts/src/test/java/com/r3corda/contracts/cash/CashTestsJava.java +++ b/contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java @@ -1,4 +1,4 @@ -package com.r3corda.contracts.cash; +package com.r3corda.contracts.asset; import com.r3corda.core.contracts.PartyAndReference; import com.r3corda.core.serialization.OpaqueBytes; @@ -33,7 +33,7 @@ public class CashTestsJava { tx.tweak(tw -> { tw.output(outState); // No command arguments - return tw.failsRequirement("required com.r3corda.contracts.cash.FungibleAsset.Commands.Move command"); + return tw.failsRequirement("required com.r3corda.contracts.asset.FungibleAsset.Commands.Move command"); }); tx.tweak(tw -> { tw.output(outState); diff --git a/contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt index 9b69908e1e..e7f0fb3083 100644 --- a/contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt +++ b/contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt @@ -1,6 +1,6 @@ package com.r3corda.contracts -import com.r3corda.contracts.cash.Cash +import com.r3corda.contracts.asset.Cash import com.r3corda.contracts.testing.* import com.r3corda.core.contracts.* import com.r3corda.core.crypto.SecureHash diff --git a/contracts/src/test/kotlin/com/r3corda/contracts/cash/CashTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt similarity index 99% rename from contracts/src/test/kotlin/com/r3corda/contracts/cash/CashTests.kt rename to contracts/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt index 000a7bb959..72f0cde8ab 100644 --- a/contracts/src/test/kotlin/com/r3corda/contracts/cash/CashTests.kt +++ b/contracts/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt @@ -1,4 +1,4 @@ -package com.r3corda.contracts.cash +package com.r3corda.contracts.asset import com.r3corda.contracts.testing.`issued by` import com.r3corda.contracts.testing.`owned by` @@ -40,7 +40,7 @@ class CashTests { tweak { output { outState } // No command arguments - this `fails requirement` "required com.r3corda.contracts.cash.FungibleAsset.Commands.Move command" + this `fails requirement` "required com.r3corda.contracts.asset.FungibleAsset.Commands.Move command" } tweak { output { outState } @@ -294,7 +294,7 @@ class CashTests { tweak { arg(MEGA_CORP_PUBKEY) { Cash.Commands.Exit(200.DOLLARS `issued by` defaultIssuer) } - this `fails requirement` "required com.r3corda.contracts.cash.FungibleAsset.Commands.Move command" + this `fails requirement` "required com.r3corda.contracts.asset.FungibleAsset.Commands.Move command" tweak { arg(DUMMY_PUBKEY_1) { Cash.Commands.Move() } diff --git a/contracts/src/test/kotlin/com/r3corda/contracts/ObligationTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt similarity index 96% rename from contracts/src/test/kotlin/com/r3corda/contracts/ObligationTests.kt rename to contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt index f7144334bd..ea0cd5ea2c 100644 --- a/contracts/src/test/kotlin/com/r3corda/contracts/ObligationTests.kt +++ b/contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt @@ -1,7 +1,7 @@ -package com.r3corda.contracts +package com.r3corda.contracts.asset -import com.r3corda.contracts.cash.Cash -import com.r3corda.contracts.Obligation.Lifecycle +import com.r3corda.contracts.asset.* +import com.r3corda.contracts.asset.Obligation.Lifecycle import com.r3corda.contracts.testing.* import com.r3corda.core.contracts.* import com.r3corda.core.crypto.SecureHash @@ -18,7 +18,7 @@ class ObligationTests { val defaultIssuer = MEGA_CORP.ref(1) val defaultUsd = USD `issued by` defaultIssuer val oneMillionDollars = 1000000.DOLLARS `issued by` defaultIssuer - val trustedCashContract = nonEmptySetOf(SecureHash.randomSHA256() as SecureHash) + val trustedCashContract = nonEmptySetOf(SecureHash.Companion.randomSHA256() as SecureHash) val megaIssuedDollars = nonEmptySetOf(Issued(defaultIssuer, USD)) val megaIssuedPounds = nonEmptySetOf(Issued(defaultIssuer, GBP)) val fivePm = Instant.parse("2016-01-01T17:00:00.00Z") @@ -54,7 +54,7 @@ class ObligationTests { tweak { output { outState } // No command arguments - this `fails requirement` "required com.r3corda.contracts.Obligation.Commands.Move command" + this `fails requirement` "required com.r3corda.contracts.asset.Obligation.Commands.Move command" } tweak { output { outState } @@ -280,23 +280,23 @@ class ObligationTests { // Now generate a transaction marking the obligation as having defaulted tx = TransactionType.General.Builder(DUMMY_NOTARY).apply { - Obligation().generateSetLifecycle(this, listOf(stateAndRef), Obligation.Lifecycle.DEFAULTED, DUMMY_NOTARY) + Obligation().generateSetLifecycle(this, listOf(stateAndRef), Lifecycle.DEFAULTED, DUMMY_NOTARY) signWith(MINI_CORP_KEY) signWith(DUMMY_NOTARY_KEY) }.toSignedTransaction() assertEquals(1, tx.tx.outputs.size) - assertEquals(stateAndRef.state.data.copy(lifecycle = Obligation.Lifecycle.DEFAULTED), tx.tx.outputs[0].data) + assertEquals(stateAndRef.state.data.copy(lifecycle = Lifecycle.DEFAULTED), tx.tx.outputs[0].data) assertTrue(tx.verify().isEmpty()) // And set it back stateAndRef = tx.tx.outRef>(0) tx = TransactionType.General.Builder(DUMMY_NOTARY).apply { - Obligation().generateSetLifecycle(this, listOf(stateAndRef), Obligation.Lifecycle.NORMAL, DUMMY_NOTARY) + Obligation().generateSetLifecycle(this, listOf(stateAndRef), Lifecycle.NORMAL, DUMMY_NOTARY) signWith(MINI_CORP_KEY) signWith(DUMMY_NOTARY_KEY) }.toSignedTransaction() assertEquals(1, tx.tx.outputs.size) - assertEquals(stateAndRef.state.data.copy(lifecycle = Obligation.Lifecycle.NORMAL), tx.tx.outputs[0].data) + assertEquals(stateAndRef.state.data.copy(lifecycle = Lifecycle.NORMAL), tx.tx.outputs[0].data) assertTrue(tx.verify().isEmpty()) } @@ -450,8 +450,8 @@ class ObligationTests { obligationTestRoots(this) transaction("Settlement") { input("Alice's $1,000,000 obligation to Bob") - output("Alice's defaulted $1,000,000 obligation to Bob") { (oneMillionDollars.OBLIGATION `between` Pair(ALICE, BOB_PUBKEY)).copy(lifecycle = Obligation.Lifecycle.DEFAULTED) } - arg(BOB_PUBKEY) { Obligation.Commands.SetLifecycle(Obligation.IssuanceDefinition(ALICE, defaultUsd.OBLIGATION_DEF), Obligation.Lifecycle.DEFAULTED) } + output("Alice's defaulted $1,000,000 obligation to Bob") { (oneMillionDollars.OBLIGATION `between` Pair(ALICE, BOB_PUBKEY)).copy(lifecycle = Lifecycle.DEFAULTED) } + arg(BOB_PUBKEY) { Obligation.Commands.SetLifecycle(Obligation.IssuanceDefinition(ALICE, defaultUsd.OBLIGATION_DEF), Lifecycle.DEFAULTED) } } }.expectFailureOfTx(1, "there is a timestamp from the authority") @@ -464,8 +464,8 @@ class ObligationTests { } transaction("Settlement") { input("Alice's $1,000,000 obligation to Bob") - output("Alice's defaulted $1,000,000 obligation to Bob") { (oneMillionDollars.OBLIGATION `between` Pair(ALICE, BOB_PUBKEY) `at` futureTestTime).copy(lifecycle = Obligation.Lifecycle.DEFAULTED) } - arg(BOB_PUBKEY) { Obligation.Commands.SetLifecycle(Obligation.IssuanceDefinition(ALICE, defaultUsd.OBLIGATION_DEF) `at` futureTestTime, Obligation.Lifecycle.DEFAULTED) } + output("Alice's defaulted $1,000,000 obligation to Bob") { (oneMillionDollars.OBLIGATION `between` Pair(ALICE, BOB_PUBKEY) `at` futureTestTime).copy(lifecycle = Lifecycle.DEFAULTED) } + arg(BOB_PUBKEY) { Obligation.Commands.SetLifecycle(Obligation.IssuanceDefinition(ALICE, defaultUsd.OBLIGATION_DEF) `at` futureTestTime, Lifecycle.DEFAULTED) } timestamp(TEST_TX_TIME) } }.expectFailureOfTx(1, "the due date has passed") @@ -477,8 +477,8 @@ class ObligationTests { } transaction("Settlement") { input("Alice's $1,000,000 obligation to Bob") - output("Alice's defaulted $1,000,000 obligation to Bob") { (oneMillionDollars.OBLIGATION `between` Pair(ALICE, BOB_PUBKEY) `at` pastTestTime).copy(lifecycle = Obligation.Lifecycle.DEFAULTED) } - arg(BOB_PUBKEY) { Obligation.Commands.SetLifecycle(Obligation.IssuanceDefinition(ALICE, defaultUsd.OBLIGATION_DEF) `at` pastTestTime, Obligation.Lifecycle.DEFAULTED) } + output("Alice's defaulted $1,000,000 obligation to Bob") { (oneMillionDollars.OBLIGATION `between` Pair(ALICE, BOB_PUBKEY) `at` pastTestTime).copy(lifecycle = Lifecycle.DEFAULTED) } + arg(BOB_PUBKEY) { Obligation.Commands.SetLifecycle(Obligation.IssuanceDefinition(ALICE, defaultUsd.OBLIGATION_DEF) `at` pastTestTime, Lifecycle.DEFAULTED) } timestamp(TEST_TX_TIME) } }.verify() @@ -557,8 +557,8 @@ class ObligationTests { input { inState } input { inState `issued by` MINI_CORP } output { outState } - arg(DUMMY_PUBKEY_1) {Obligation.Commands.Move(inState.issuanceDef) } - arg(DUMMY_PUBKEY_1) {Obligation.Commands.Move((inState `issued by` MINI_CORP).issuanceDef) } + arg(DUMMY_PUBKEY_1) { Obligation.Commands.Move(inState.issuanceDef) } + arg(DUMMY_PUBKEY_1) { Obligation.Commands.Move((inState `issued by` MINI_CORP).issuanceDef) } this `fails requirement` "at obligor MiniCorp the amounts balance" } } @@ -578,7 +578,7 @@ class ObligationTests { tweak { arg(MEGA_CORP_PUBKEY) { Obligation.Commands.Exit(inState.issuanceDef, 200.DOLLARS) } - this `fails requirement` "required com.r3corda.contracts.Obligation.Commands.Move command" + this `fails requirement` "required com.r3corda.contracts.asset.Obligation.Commands.Move command" tweak { arg(DUMMY_PUBKEY_1) { Obligation.Commands.Move(inState.issuanceDef) } @@ -683,7 +683,7 @@ class ObligationTests { // States must not be nettable if the cash contract differs assertNotEquals(fiveKDollarsFromMegaToMega.bilateralNetState, - fiveKDollarsFromMegaToMega.copy(template = megaCorpDollarSettlement.copy(acceptableContracts = nonEmptySetOf(SecureHash.randomSHA256()))).bilateralNetState) + fiveKDollarsFromMegaToMega.copy(template = megaCorpDollarSettlement.copy(acceptableContracts = nonEmptySetOf(SecureHash.Companion.randomSHA256()))).bilateralNetState) // States must not be nettable if the trusted issuers differ val miniCorpIssuer = nonEmptySetOf(Issued(MINI_CORP.ref(1), USD)) diff --git a/docs/build/html/api/alltypes/index.html b/docs/build/html/api/alltypes/index.html index a61c9e0e8b..aede8b799b 100644 --- a/docs/build/html/api/alltypes/index.html +++ b/docs/build/html/api/alltypes/index.html @@ -124,7 +124,7 @@ as well.

-com.r3corda.contracts.cash.AssetIssuanceDefinition +com.r3corda.contracts.asset.AssetIssuanceDefinition

Subset of cash-like contract state, containing the issuance definition. If these definitions match for two contracts states, those states can be aggregated.

@@ -209,7 +209,7 @@ no staff are around to handle problems.

-com.r3corda.contracts.cash.Cash +com.r3corda.contracts.asset.Cash

A cash transaction may split and merge money represented by a set of (issuer, depositRef) pairs, across multiple input and output states. Imagine a Bitcoin transaction but in which all UTXOs had a colour @@ -569,7 +569,7 @@ that would divide into (eg annually = 1, semiannual = 2, monthly = 12 etc).

-com.r3corda.contracts.cash.FungibleAsset +com.r3corda.contracts.asset.FungibleAsset

Superclass for contracts representing assets which are fungible, countable and issued by a specific party. States contain assets which are equivalent (such as cash of the same currency), so records of their existence can @@ -581,7 +581,7 @@ countable, and so on.

-com.r3corda.contracts.cash.FungibleAssetState +com.r3corda.contracts.asset.FungibleAssetState

Common elements of cash contract states.

@@ -656,7 +656,7 @@ testing).

-com.r3corda.contracts.cash.InsufficientBalanceException +com.r3corda.contracts.asset.InsufficientBalanceException diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/deposit.html b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/deposit.html index a301089776..35629ba7c5 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/deposit.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/deposit.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / AssetIssuanceDefinition / deposit
+com.r3corda.contracts.asset / AssetIssuanceDefinition / deposit

deposit

- + abstract val deposit: PartyAndReference

Where the underlying asset backing this ledger entry can be found (propagated)


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/index.html index 8c90481cca..b140e10db6 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / AssetIssuanceDefinition
+com.r3corda.contracts.asset / AssetIssuanceDefinition

AssetIssuanceDefinition

interface AssetIssuanceDefinition<T> : IssuanceDefinition
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/token.html b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/token.html index 1f0863afa4..ff26264a37 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/token.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/token.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / AssetIssuanceDefinition / token
+com.r3corda.contracts.asset / AssetIssuanceDefinition / token

token

- + abstract val token: T


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html b/docs/build/html/api/com.r3corda.contracts.cash/-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html index 45544c9893..663d79fe8f 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / CASH_PROGRAM_ID
+com.r3corda.contracts.asset / CASH_PROGRAM_ID

CASH_PROGRAM_ID

- + val CASH_PROGRAM_ID: Cash


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/-init-.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/-init-.html index 3101bfed2a..f56b66c5b4 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/-init-.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/-init-.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / Commands / Exit / <init>
+com.r3corda.contracts.asset / Cash / Commands / Exit / <init>

<init>

-Exit(amount: Amount<Currency>)
+Exit(amount: Amount<Currency>)

A command stating that money has been withdrawn from the shared ledger and is now accounted for in some other way.


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/amount.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/amount.html index 5178e04d6e..310f5ee798 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/amount.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/amount.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / Commands / Exit / amount
+com.r3corda.contracts.asset / Cash / Commands / Exit / amount

amount

- + val amount: Amount<Currency>
Overrides Exit.amount

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/index.html index 4d7475222e..b84e6c7ee1 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / Cash / Commands / Exit
+com.r3corda.contracts.asset / Cash / Commands / Exit

Exit

data class Exit : Commands, Exit<Currency>
@@ -19,7 +19,7 @@ in some other way.

<init> -Exit(amount: Amount<Currency>)

A command stating that money has been withdrawn from the shared ledger and is now accounted for +Exit(amount: Amount<Currency>)

A command stating that money has been withdrawn from the shared ledger and is now accounted for in some other way.

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/-init-.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/-init-.html index d14e6d85de..ab8a7b3a61 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/-init-.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/-init-.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / Commands / Issue / <init>
+com.r3corda.contracts.asset / Cash / Commands / Issue / <init>

<init>

-Issue(nonce: Long = SecureRandom.getInstanceStrong().nextLong())
+Issue(nonce: Long = SecureRandom.getInstanceStrong().nextLong())

Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction has a unique ID even when there are no inputs.


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/index.html index 5fb028818d..b24c274985 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / Cash / Commands / Issue
+com.r3corda.contracts.asset / Cash / Commands / Issue

Issue

data class Issue : Issue
@@ -19,7 +19,7 @@ has a unique ID even when there are no inputs.

<init> -Issue(nonce: Long = SecureRandom.getInstanceStrong().nextLong())

Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction +Issue(nonce: Long = SecureRandom.getInstanceStrong().nextLong())

Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction has a unique ID even when there are no inputs.

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/nonce.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/nonce.html index e9551f169b..cbac655421 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/nonce.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/nonce.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / Commands / Issue / nonce
+com.r3corda.contracts.asset / Cash / Commands / Issue / nonce

nonce

- + val nonce: Long
Overrides Issue.nonce

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/-init-.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/-init-.html index 90b93a9810..78d3da604a 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/-init-.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/-init-.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / IssuanceDefinition / <init>
+com.r3corda.contracts.asset / Cash / IssuanceDefinition / <init>

<init>

-IssuanceDefinition(deposit: PartyAndReference, token: T)
+IssuanceDefinition(deposit: PartyAndReference, token: T)


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/deposit.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/deposit.html index a7af136488..1577a0c22a 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/deposit.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/deposit.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / IssuanceDefinition / deposit
+com.r3corda.contracts.asset / Cash / IssuanceDefinition / deposit

deposit

- + val deposit: PartyAndReference
Overrides AssetIssuanceDefinition.deposit

Where the underlying currency backing this ledger entry can be found (propagated)

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/index.html index 92ba11b85f..f3b3bd692b 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / Cash / IssuanceDefinition
+com.r3corda.contracts.asset / Cash / IssuanceDefinition

IssuanceDefinition

data class IssuanceDefinition<T> : AssetIssuanceDefinition<T>
@@ -17,7 +17,7 @@ <init> -IssuanceDefinition(deposit: PartyAndReference, token: T) +IssuanceDefinition(deposit: PartyAndReference, token: T) diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/token.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/token.html index f2198b84d9..446f4cce08 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/token.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/token.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / IssuanceDefinition / token
+com.r3corda.contracts.asset / Cash / IssuanceDefinition / token

token

- + val token: T
Overrides AssetIssuanceDefinition.token

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/-init-.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/-init-.html index 051dafea4c..fd387fc606 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/-init-.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/-init-.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / State / <init>
+com.r3corda.contracts.asset / Cash / State / <init>

<init>

-State(deposit: PartyAndReference, amount: Amount<Currency>, owner: PublicKey, notary: Party)
+State(deposit: PartyAndReference, amount: Amount<Currency>, owner: PublicKey, notary: Party)

A state representing a cash claim against some party



diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/amount.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/amount.html index 875ded550f..459c6819d5 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/amount.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/amount.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / State / amount
+com.r3corda.contracts.asset / Cash / State / amount

amount

- + val amount: Amount<Currency>
Overrides State.amount

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/contract.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/contract.html index 2d4374c009..fed4080ebc 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/contract.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/contract.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / State / contract
+com.r3corda.contracts.asset / Cash / State / contract

contract

- + val contract: Cash
Overrides ContractState.contract

Contract by which the state belongs

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/deposit.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/deposit.html index 098ecb1ab7..8196717f65 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/deposit.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/deposit.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / State / deposit
+com.r3corda.contracts.asset / Cash / State / deposit

deposit

- + val deposit: PartyAndReference
Overrides State.deposit

Where the underlying currency backing this ledger entry can be found (propagated)

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/index.html index ce72e23d98..16d3ce9533 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / Cash / State
+com.r3corda.contracts.asset / Cash / State

State

data class State : State<Currency>
@@ -18,7 +18,7 @@ <init> -State(deposit: PartyAndReference, amount: Amount<Currency>, owner: PublicKey, notary: Party)

A state representing a cash claim against some party

+State(deposit: PartyAndReference, amount: Amount<Currency>, owner: PublicKey, notary: Party)

A state representing a cash claim against some party

@@ -81,7 +81,7 @@ withNewOwner -fun withNewOwner(newOwner: PublicKey): <ERROR CLASS>

Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone

+fun withNewOwner(newOwner: PublicKey): <ERROR CLASS>

Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone

@@ -93,13 +93,13 @@ issued by -infix fun State.issued by(party: Party): State +infix fun State.issued by(party: Party): State owned by -infix fun State.owned by(owner: PublicKey): State +infix fun State.owned by(owner: PublicKey): State diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/issuance-def.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/issuance-def.html index e11f23a197..00f59635c9 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/issuance-def.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/issuance-def.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / State / issuanceDef
+com.r3corda.contracts.asset / Cash / State / issuanceDef

issuanceDef

- + val issuanceDef: IssuanceDefinition<Currency>
Overrides FungibleAssetState.issuanceDef

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/notary.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/notary.html index 9dbf7ee9ea..607a64a7d3 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/notary.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/notary.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / State / notary
+com.r3corda.contracts.asset / Cash / State / notary

notary

- + val notary: Party
Overrides State.notary

Identity of the notary that ensures this state is not used as an input to a transaction more than once

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/owner.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/owner.html index 156afc21eb..60b915aa35 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/owner.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/owner.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / State / owner
+com.r3corda.contracts.asset / Cash / State / owner

owner

- + val owner: PublicKey
Overrides State.owner

There must be a MoveCommand signed by this key to claim the amount

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/to-string.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/to-string.html index 1362fb6a6f..94c2abeecd 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/to-string.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/to-string.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / State / toString
+com.r3corda.contracts.asset / Cash / State / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/with-new-owner.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/with-new-owner.html index acb1a8c71c..d0fdf7138e 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/with-new-owner.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/with-new-owner.html @@ -4,11 +4,11 @@ -com.r3corda.contracts.cash / Cash / State / withNewOwner
+com.r3corda.contracts.asset / Cash / State / withNewOwner

withNewOwner

- -fun withNewOwner(newOwner: PublicKey): <ERROR CLASS>
+ +fun withNewOwner(newOwner: PublicKey): <ERROR CLASS>
Overrides OwnableState.withNewOwner

Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-issue.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-issue.html index bbef2a8e04..df54fe9cb5 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-issue.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-issue.html @@ -4,16 +4,16 @@ -com.r3corda.contracts.cash / Cash / generateIssue
+com.r3corda.contracts.asset / Cash / generateIssue

generateIssue

- -fun generateIssue(tx: TransactionBuilder, issuanceDef: AssetIssuanceDefinition<Currency>, pennies: Long, owner: PublicKey, notary: Party): Unit
+ +fun generateIssue(tx: TransactionBuilder, issuanceDef: AssetIssuanceDefinition<Currency>, pennies: Long, owner: PublicKey, notary: Party): Unit

Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.



- -fun generateIssue(tx: TransactionBuilder, amount: Amount<Currency>, at: PartyAndReference, owner: PublicKey, notary: Party): Unit
+ +fun generateIssue(tx: TransactionBuilder, amount: Amount<Currency>, at: PartyAndReference, owner: PublicKey, notary: Party): Unit

Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.



diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-spend.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-spend.html index 096c6f0bca..ca1d11d271 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-spend.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-spend.html @@ -4,11 +4,11 @@ -com.r3corda.contracts.cash / Cash / generateSpend
+com.r3corda.contracts.asset / Cash / generateSpend

generateSpend

- -fun generateSpend(tx: TransactionBuilder, amount: Amount<Currency>, to: PublicKey, cashStates: List<StateAndRef<State>>, onlyFromParties: Set<Party>? = null): List<PublicKey>
+ +fun generateSpend(tx: TransactionBuilder, amount: Amount<Currency>, to: PublicKey, cashStates: List<StateAndRef<State>>, onlyFromParties: Set<Party>? = null): List<PublicKey>

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: its up to you to do that.

Parameters

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/index.html index 5080176564..fe92eabb22 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / Cash
+com.r3corda.contracts.asset / Cash

Cash

class Cash : FungibleAsset<Currency>
@@ -79,15 +79,15 @@ the same transaction.

generateIssue -fun generateIssue(tx: TransactionBuilder, issuanceDef: AssetIssuanceDefinition<Currency>, pennies: Long, owner: PublicKey, notary: Party): Unit

Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.

-fun generateIssue(tx: TransactionBuilder, amount: Amount<Currency>, at: PartyAndReference, owner: PublicKey, notary: Party): Unit

Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.

+fun generateIssue(tx: TransactionBuilder, issuanceDef: AssetIssuanceDefinition<Currency>, pennies: Long, owner: PublicKey, notary: Party): Unit

Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.

+fun generateIssue(tx: TransactionBuilder, amount: Amount<Currency>, at: PartyAndReference, owner: PublicKey, notary: Party): Unit

Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.

generateSpend -fun generateSpend(tx: TransactionBuilder, amount: Amount<Currency>, to: PublicKey, cashStates: List<StateAndRef<State>>, onlyFromParties: Set<Party>? = null): List<PublicKey>

Generate a transaction that consumes one or more of the given input states to move money to the given pubkey. +fun generateSpend(tx: TransactionBuilder, amount: Amount<Currency>, to: PublicKey, cashStates: List<StateAndRef<State>>, onlyFromParties: Set<Party>? = null): List<PublicKey>

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: its up to you to do that.

@@ -100,7 +100,7 @@ Note that the wallet list is not updated: its up to you to do that.

verify -open fun verify(tx: TransactionForVerification): Unit

This is the function EVERYONE runs

+open fun verify(tx: TransactionForVerification): Unit

This is the function EVERYONE runs

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash/legal-contract-reference.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/legal-contract-reference.html index d6776b7a41..5978af553b 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-cash/legal-contract-reference.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/legal-contract-reference.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / Cash / legalContractReference
+com.r3corda.contracts.asset / Cash / legalContractReference

legalContractReference

- + val legalContractReference: SecureHash
Overrides Contract.legalContractReference

TODO:

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/amount.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/amount.html index 076438a8cc..40f49864c0 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/amount.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/amount.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAssetState / amount
+com.r3corda.contracts.asset / FungibleAssetState / amount

amount

- + abstract val amount: Amount<T>


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/deposit.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/deposit.html index 299676e75a..3589c82b02 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/deposit.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/deposit.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAssetState / deposit
+com.r3corda.contracts.asset / FungibleAssetState / deposit

deposit

- + abstract val deposit: PartyAndReference

Where the underlying currency backing this ledger entry can be found (propagated)


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/issuance-def.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/issuance-def.html index 8fcf9f7a8b..40ec6c2a50 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/issuance-def.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/issuance-def.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAssetState / issuanceDef
+com.r3corda.contracts.asset / FungibleAssetState / issuanceDef

issuanceDef

- + abstract val issuanceDef: I


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/amount.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/amount.html index 481952eaba..cd30f12509 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/amount.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/amount.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAsset / Commands / Exit / amount
+com.r3corda.contracts.asset / FungibleAsset / Commands / Exit / amount

amount

- + abstract val amount: Amount<T>


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/index.html index cbf15d9eba..5c7cde8417 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / FungibleAsset / Commands / Exit
+com.r3corda.contracts.asset / FungibleAsset / Commands / Exit

Exit

interface Exit<T> : Commands
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/index.html index a044b1f185..90e24de693 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / FungibleAsset / Commands / Issue
+com.r3corda.contracts.asset / FungibleAsset / Commands / Issue

Issue

interface Issue : Commands
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/nonce.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/nonce.html index e3cdabc6f6..7e9375b9ff 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/nonce.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/nonce.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAsset / Commands / Issue / nonce
+com.r3corda.contracts.asset / FungibleAsset / Commands / Issue / nonce

nonce

- + abstract val nonce: Long


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-move.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-move.html index 89fda720ff..68c60d51ae 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-move.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-move.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / FungibleAsset / Commands / Move
+com.r3corda.contracts.asset / FungibleAsset / Commands / Move

Move

interface Move : Commands
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-init-.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-init-.html index bf8d4a2cca..0058e07544 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-init-.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-init-.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / FungibleAsset / <init>
+com.r3corda.contracts.asset / FungibleAsset / <init>

<init>

FungibleAsset()
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/amount.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/amount.html index 9b942f2354..cc262f412c 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/amount.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/amount.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAsset / State / amount
+com.r3corda.contracts.asset / FungibleAsset / State / amount

amount

- + abstract val amount: Amount<T>
Overrides FungibleAssetState.amount

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/deposit.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/deposit.html index 7e8119cf05..5ee95110f0 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/deposit.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/deposit.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAsset / State / deposit
+com.r3corda.contracts.asset / FungibleAsset / State / deposit

deposit

- + abstract val deposit: PartyAndReference
Overrides FungibleAssetState.deposit

Where the underlying asset backing this ledger entry can be found (propagated)

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/index.html index 155a9b194c..adf7971ac1 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / FungibleAsset / State
+com.r3corda.contracts.asset / FungibleAsset / State

State

interface State<T> : FungibleAssetState<T, AssetIssuanceDefinition<T>>
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/notary.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/notary.html index b4feb6c780..30ddb54fce 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/notary.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/notary.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAsset / State / notary
+com.r3corda.contracts.asset / FungibleAsset / State / notary

notary

- + abstract val notary: Party
Overrides ContractState.notary

Identity of the notary that ensures this state is not used as an input to a transaction more than once

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/owner.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/owner.html index 015df89228..65b4b0cd45 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/owner.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/owner.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / FungibleAsset / State / owner
+com.r3corda.contracts.asset / FungibleAsset / State / owner

owner

- + abstract val owner: PublicKey
Overrides OwnableState.owner

There must be a MoveCommand signed by this key to claim the amount

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/index.html index ec0662e349..572e123294 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / FungibleAsset
+com.r3corda.contracts.asset / FungibleAsset

FungibleAsset

abstract class FungibleAsset<T> : Contract
@@ -78,7 +78,7 @@ the contracts contents).

verify -open fun verify(tx: TransactionForVerification): Unit

This is the function EVERYONE runs

+open fun verify(tx: TransactionForVerification): Unit

This is the function EVERYONE runs

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/verify.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/verify.html index 8d9a996009..3114c7dda2 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/verify.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/verify.html @@ -4,11 +4,11 @@ -com.r3corda.contracts.cash / FungibleAsset / verify
+com.r3corda.contracts.asset / FungibleAsset / verify

verify

- -open fun verify(tx: TransactionForVerification): Unit
+ +open fun verify(tx: TransactionForVerification): Unit
Overrides Contract.verify

This is the function EVERYONE runs


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/-init-.html b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/-init-.html index bc075fdf5e..db5fc3d6c7 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/-init-.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/-init-.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / InsufficientBalanceException / <init>
+com.r3corda.contracts.asset / InsufficientBalanceException / <init>

<init>

-InsufficientBalanceException(amountMissing: Amount<*>)
+InsufficientBalanceException(amountMissing: Amount<*>)


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/amount-missing.html b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/amount-missing.html index d24c6f7020..9323ad1b72 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/amount-missing.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/amount-missing.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / InsufficientBalanceException / amountMissing
+com.r3corda.contracts.asset / InsufficientBalanceException / amountMissing

amountMissing

- + val amountMissing: Amount<*>


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/index.html index d306f5cc82..6616fccdfd 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/index.html @@ -4,7 +4,7 @@ -com.r3corda.contracts.cash / InsufficientBalanceException
+com.r3corda.contracts.asset / InsufficientBalanceException

InsufficientBalanceException

class InsufficientBalanceException : Exception
@@ -17,7 +17,7 @@ <init> -InsufficientBalanceException(amountMissing: Amount<*>) +InsufficientBalanceException(amountMissing: Amount<*>) diff --git a/docs/build/html/api/com.r3corda.contracts.cash/index.html b/docs/build/html/api/com.r3corda.contracts.cash/index.html index 80832fa684..333f510d81 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/index.html @@ -1,12 +1,12 @@ -com.r3corda.contracts.cash - +com.r3corda.contracts.asset - -com.r3corda.contracts.cash
+com.r3corda.contracts.asset

-

Package com.r3corda.contracts.cash

+

Package com.r3corda.contracts.asset

Types

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/index.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/index.html index 5b8ca017e8..04ee7fee4f 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/index.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/index.html @@ -1,10 +1,10 @@ -com.r3corda.contracts.cash.kotlin.collections.Iterable - +com.r3corda.contracts.asset.kotlin.collections.Iterable - -com.r3corda.contracts.cash / kotlin.collections.Iterable
+com.r3corda.contracts.asset / kotlin.collections.Iterable

Extensions for kotlin.collections.Iterable

@@ -21,7 +21,7 @@ states cannot be added together (i.e. are different currencies).

@@ -37,7 +37,7 @@ different currencies).

@@ -52,7 +52,7 @@ states cannot be added together (i.e. are different tokens).

@@ -68,7 +68,7 @@ different tokens).

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-by.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-by.html index 9065fe85d9..94c663004e 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-by.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-by.html @@ -4,11 +4,11 @@ -com.r3corda.contracts.cash / kotlin.collections.Iterable / sumCashBy
+com.r3corda.contracts.asset / kotlin.collections.Iterable / sumCashBy

sumCashBy

- -fun Iterable<ContractState>.sumCashBy(owner: PublicKey): <ERROR CLASS>
+ +fun Iterable<ContractState>.sumCashBy(owner: PublicKey): <ERROR CLASS>

Sums the cash states in the list belonging to a single owner, throwing an exception if there are none, or if any of the cash states cannot be added together (i.e. are different currencies).

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-null.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-null.html index 2de2afb815..3503e531b1 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-null.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-null.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / kotlin.collections.Iterable / sumCashOrNull
+com.r3corda.contracts.asset / kotlin.collections.Iterable / sumCashOrNull

sumCashOrNull

- +fun Iterable<ContractState>.sumCashOrNull(): <ERROR CLASS>

Sums the cash states in the list, returning null if there are none.


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-zero.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-zero.html index 306eae07c6..4b2a779908 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-zero.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-zero.html @@ -4,11 +4,11 @@ -com.r3corda.contracts.cash / kotlin.collections.Iterable / sumCashOrZero
+com.r3corda.contracts.asset / kotlin.collections.Iterable / sumCashOrZero

sumCashOrZero

- -fun Iterable<ContractState>.sumCashOrZero(currency: Currency): <ERROR CLASS>
+ +fun Iterable<ContractState>.sumCashOrZero(currency: Currency): <ERROR CLASS>

Sums the cash states in the list, returning zero of the given currency if there are none.



diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash.html index 91578aa2fb..6283fb4e19 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / kotlin.collections.Iterable / sumCash
+com.r3corda.contracts.asset / kotlin.collections.Iterable / sumCash

sumCash

- +fun Iterable<ContractState>.sumCash(): <ERROR CLASS>

Sums the cash states in the list, throwing an exception if there are none, or if any of the cash states cannot be added together (i.e. are different currencies).

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-by.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-by.html index b1d90b04d2..cc0a42b341 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-by.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-by.html @@ -4,11 +4,11 @@ -com.r3corda.contracts.cash / kotlin.collections.Iterable / sumFungibleBy
+com.r3corda.contracts.asset / kotlin.collections.Iterable / sumFungibleBy

sumFungibleBy

- -fun <T> Iterable<ContractState>.sumFungibleBy(owner: PublicKey): <ERROR CLASS>
+ +fun <T> Iterable<ContractState>.sumFungibleBy(owner: PublicKey): <ERROR CLASS>

Sums the asset states in the list belonging to a single owner, throwing an exception if there are none, or if any of the asset states cannot be added together (i.e. are different tokens).

diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-null.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-null.html index 31652ff2b0..e2b4162f63 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-null.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-null.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / kotlin.collections.Iterable / sumFungibleOrNull
+com.r3corda.contracts.asset / kotlin.collections.Iterable / sumFungibleOrNull

sumFungibleOrNull

- +fun <T> Iterable<ContractState>.sumFungibleOrNull(): <ERROR CLASS>

Sums the asset states in the list, returning null if there are none.


diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-zero.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-zero.html index 2a2d710875..8b73f5d2b7 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-zero.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-zero.html @@ -4,11 +4,11 @@ -com.r3corda.contracts.cash / kotlin.collections.Iterable / sumFungibleOrZero
+com.r3corda.contracts.asset / kotlin.collections.Iterable / sumFungibleOrZero

sumFungibleOrZero

- -fun <T> Iterable<ContractState>.sumFungibleOrZero(token: T): <ERROR CLASS>
+ +fun <T> Iterable<ContractState>.sumFungibleOrZero(token: T): <ERROR CLASS>

Sums the asset states in the list, returning zero of the given token if there are none.



diff --git a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible.html index 52e6305fd7..b594939bb4 100644 --- a/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible.html +++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible.html @@ -4,10 +4,10 @@ -com.r3corda.contracts.cash / kotlin.collections.Iterable / sumFungible
+com.r3corda.contracts.asset / kotlin.collections.Iterable / sumFungible

sumFungible

- +fun <T> Iterable<ContractState>.sumFungible(): <ERROR CLASS>

Sums the asset states in the list, throwing an exception if there are none, or if any of the asset states cannot be added together (i.e. are different tokens).

diff --git a/docs/build/html/api/com.r3corda.contracts.testing/index.html b/docs/build/html/api/com.r3corda.contracts.testing/index.html index 0b5757ab5d..6904052376 100644 --- a/docs/build/html/api/com.r3corda.contracts.testing/index.html +++ b/docs/build/html/api/com.r3corda.contracts.testing/index.html @@ -37,13 +37,13 @@ +infix fun State.issued by(party: Party): State diff --git a/docs/build/html/api/com.r3corda.contracts.testing/issued by.html b/docs/build/html/api/com.r3corda.contracts.testing/issued by.html index 22c2c6ca4b..ef47702d38 100644 --- a/docs/build/html/api/com.r3corda.contracts.testing/issued by.html +++ b/docs/build/html/api/com.r3corda.contracts.testing/issued by.html @@ -7,8 +7,8 @@ com.r3corda.contracts.testing / issued by

issued by

- -infix fun State.issued by(party: Party): State
+ +infix fun State.issued by(party: Party): State


diff --git a/docs/build/html/api/com.r3corda.contracts.testing/owned by.html b/docs/build/html/api/com.r3corda.contracts.testing/owned by.html index 2f3420c01e..ed366ba82a 100644 --- a/docs/build/html/api/com.r3corda.contracts.testing/owned by.html +++ b/docs/build/html/api/com.r3corda.contracts.testing/owned by.html @@ -7,8 +7,8 @@ com.r3corda.contracts.testing / owned by

owned by

- -infix fun State.owned by(owner: PublicKey): State
+ +infix fun State.owned by(owner: PublicKey): State
infix fun State.owned by(owner: PublicKey): State
diff --git a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/generate-redeem.html b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/generate-redeem.html index 210b83543f..26faf02ea0 100644 --- a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/generate-redeem.html +++ b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/generate-redeem.html @@ -7,8 +7,8 @@ com.r3corda.contracts / CommercialPaper / generateRedeem

generateRedeem

- -fun generateRedeem(tx: TransactionBuilder, paper: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
+ +fun generateRedeem(tx: TransactionBuilder, paper: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit

Intended to be called by the issuer of some commercial paper, when an owner has notified us that they wish to redeem the paper. We must therefore send enough money to the key that owns the paper to satisfy the face value, and then ensure the paper is removed from the ledger.

diff --git a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/index.html b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/index.html index 953611e3f8..09e0690fa6 100644 --- a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/index.html +++ b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/index.html @@ -74,7 +74,7 @@ at the moment: this restriction is not fundamental and may be lifted later.

diff --git a/docs/build/html/api/index.html b/docs/build/html/api/index.html index 89d4c0fbf7..b1fd259ca0 100644 --- a/docs/build/html/api/index.html +++ b/docs/build/html/api/index.html @@ -17,7 +17,7 @@ +com.r3corda.contracts.asset diff --git a/node/src/main/kotlin/com/r3corda/node/services/wallet/CashBalanceAsMetricsObserver.kt b/node/src/main/kotlin/com/r3corda/node/services/wallet/CashBalanceAsMetricsObserver.kt index 8f0df76574..336b962569 100644 --- a/node/src/main/kotlin/com/r3corda/node/services/wallet/CashBalanceAsMetricsObserver.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/wallet/CashBalanceAsMetricsObserver.kt @@ -1,7 +1,7 @@ package com.r3corda.node.services.wallet import com.codahale.metrics.Gauge -import com.r3corda.contracts.cash.cashBalances +import com.r3corda.contracts.asset.cashBalances import com.r3corda.core.node.services.Wallet import com.r3corda.node.services.api.ServiceHubInternal import java.util.* diff --git a/node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt b/node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt index 0934eed820..3f3629008b 100644 --- a/node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt @@ -2,7 +2,7 @@ package com.r3corda.node.messaging import com.google.common.util.concurrent.ListenableFuture import com.r3corda.contracts.CommercialPaper -import com.r3corda.contracts.cash.Cash +import com.r3corda.contracts.asset.Cash import com.r3corda.contracts.testing.CASH import com.r3corda.contracts.testing.`issued by` import com.r3corda.contracts.testing.`owned by` diff --git a/node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt b/node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt index 2cb5ba4f38..3e25f4326c 100644 --- a/node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt @@ -1,6 +1,6 @@ package com.r3corda.node.services -import com.r3corda.contracts.cash.Cash +import com.r3corda.contracts.asset.Cash import com.r3corda.contracts.testing.CASH import com.r3corda.contracts.testing.`issued by` import com.r3corda.contracts.testing.`owned by` diff --git a/node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt b/node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt index 3cfe70e806..ce48cae626 100644 --- a/node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt @@ -1,7 +1,7 @@ package com.r3corda.node.services -import com.r3corda.contracts.cash.Cash -import com.r3corda.contracts.cash.cashBalances +import com.r3corda.contracts.asset.Cash +import com.r3corda.contracts.asset.cashBalances import com.r3corda.contracts.testing.fillWithSomeTestCash import com.r3corda.core.contracts.* import com.r3corda.core.crypto.SecureHash diff --git a/src/main/kotlin/com/r3corda/demos/RateFixDemo.kt b/src/main/kotlin/com/r3corda/demos/RateFixDemo.kt index e795510e85..96473b033c 100644 --- a/src/main/kotlin/com/r3corda/demos/RateFixDemo.kt +++ b/src/main/kotlin/com/r3corda/demos/RateFixDemo.kt @@ -1,7 +1,7 @@ package com.r3corda.demos import com.google.common.net.HostAndPort -import com.r3corda.contracts.cash.Cash +import com.r3corda.contracts.asset.Cash import com.r3corda.core.contracts.* import com.r3corda.core.crypto.Party import com.r3corda.core.hours diff --git a/src/main/kotlin/com/r3corda/demos/TraderDemo.kt b/src/main/kotlin/com/r3corda/demos/TraderDemo.kt index c15bfd82e7..0d29284155 100644 --- a/src/main/kotlin/com/r3corda/demos/TraderDemo.kt +++ b/src/main/kotlin/com/r3corda/demos/TraderDemo.kt @@ -3,7 +3,7 @@ package com.r3corda.demos import co.paralleluniverse.fibers.Suspendable import com.google.common.net.HostAndPort import com.r3corda.contracts.CommercialPaper -import com.r3corda.contracts.cash.cashBalances +import com.r3corda.contracts.asset.cashBalances import com.r3corda.contracts.testing.fillWithSomeTestCash import com.r3corda.core.contracts.* import com.r3corda.core.crypto.Party
sumCashBy -fun Iterable<ContractState>.sumCashBy(owner: PublicKey): <ERROR CLASS>

Sums the cash states in the list belonging to a single owner, throwing an exception +fun Iterable<ContractState>.sumCashBy(owner: PublicKey): <ERROR CLASS>

Sums the cash states in the list belonging to a single owner, throwing an exception if there are none, or if any of the cash states cannot be added together (i.e. are different currencies).

 sumCashOrZero -fun Iterable<ContractState>.sumCashOrZero(currency: Currency): <ERROR CLASS>

Sums the cash states in the list, returning zero of the given currency if there are none.

+fun Iterable<ContractState>.sumCashOrZero(currency: Currency): <ERROR CLASS>

Sums the cash states in the list, returning zero of the given currency if there are none.
sumFungibleBy -fun <T> Iterable<ContractState>.sumFungibleBy(owner: PublicKey): <ERROR CLASS>

Sums the asset states in the list belonging to a single owner, throwing an exception +fun <T> Iterable<ContractState>.sumFungibleBy(owner: PublicKey): <ERROR CLASS>

Sums the asset states in the list belonging to a single owner, throwing an exception if there are none, or if any of the asset states cannot be added together (i.e. are different tokens).

 sumFungibleOrZero -fun <T> Iterable<ContractState>.sumFungibleOrZero(token: T): <ERROR CLASS>

Sums the asset states in the list, returning zero of the given token if there are none.

+fun <T> Iterable<ContractState>.sumFungibleOrZero(token: T): <ERROR CLASS>

Sums the asset states in the list, returning zero of the given token if there are none.
issued by -infix fun State.issued by(party: Party): State
owned by -infix fun State.owned by(owner: PublicKey): State
+infix fun State.owned by(owner: PublicKey): State
infix fun State.owned by(owner: PublicKey): State
infix fun <ERROR CLASS>.owned by(new_owner: PublicKey): <ERROR CLASS>
generateRedeem -fun generateRedeem(tx: TransactionBuilder, paper: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit

Intended to be called by the issuer of some commercial paper, when an owner has notified us that they wish +fun generateRedeem(tx: TransactionBuilder, paper: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit

Intended to be called by the issuer of some commercial paper, when an owner has notified us that they wish to redeem the paper. We must therefore send enough money to the key that owns the paper to satisfy the face value, and then ensure the paper is removed from the ledger.

-com.r3corda.contracts.cash