From 2fed96cad0eb81e0fb4e3919d5316df58b28af82 Mon Sep 17 00:00:00 2001
From: Ross Nicoll
Date: Mon, 13 Jun 2016 18:27:53 +0100
Subject: [PATCH] Rebuild documentation
---
docs/build/html/_sources/index.txt | 1 +
docs/build/html/_sources/release-notes.txt | 5 +-
docs/build/html/_sources/release-process.txt | 21 +-
.../build/html/_sources/running-the-demos.txt | 66 +-
.../html/_sources/transaction-data-types.txt | 100 +
docs/build/html/api/alltypes/index.html | 225 +-
.../deposit.html | 8 +-
.../-asset-issuance-definition/index.html | 45 +
.../-asset-issuance-definition/token.html | 15 +
.../-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html | 4 +-
.../-cash-issuance-definition/currency.html | 15 -
.../-cash-issuance-definition/index.html | 45 -
.../-cash/-commands/-exit/-init-.html | 16 +
.../-cash/-commands/-exit/amount.html | 16 +
.../-cash/-commands/-exit/index.html | 40 +
.../-cash/-commands/-issue/-init-.html | 16 +
.../-cash/-commands/-issue/index.html | 6 +-
.../-cash/-commands/-issue/nonce.html | 16 +
.../-cash/-commands/-move/-init-.html | 2 +-
.../-cash/-commands/-move/index.html | 4 +-
.../-cash/-commands/index.html | 24 +-
.../-cash/-init-.html | 2 +-
.../-cash/-issuance-definition/-init-.html | 14 +
.../-cash/-issuance-definition/deposit.html | 6 +-
.../-cash/-issuance-definition/index.html | 43 +
.../-cash/-issuance-definition/token.html | 16 +
.../-cash/-state/-init-.html | 15 +
.../-cash/-state/amount.html | 16 +
.../-cash/-state/contract.html | 4 +-
.../-cash/-state/deposit.html | 6 +-
.../-cash/-state/index.html | 107 +
.../-cash/-state/issuance-def.html | 16 +
.../-cash}/-state/notary.html | 8 +-
.../-cash/-state/owner.html | 6 +-
.../-cash/-state/to-string.html | 4 +-
.../-cash/-state/with-new-owner.html | 17 +
.../-cash/generate-issue.html | 21 +
.../-cash/generate-spend.html | 22 +
.../-cash/index.html | 109 +
.../-cash/legal-contract-reference.html | 4 +-
.../amount.html | 8 +-
.../deposit.html | 6 +-
.../index.html | 14 +-
.../issuance-def.html | 6 +-
.../-commands/-exit/amount.html | 15 +
.../-commands/-exit/index.html | 40 +
.../-commands/-issue/index.html | 40 +
.../-commands/-issue/nonce.html | 15 +
.../-fungible-asset/-commands/-move.html | 25 +
.../-fungible-asset/-commands/index.html | 68 +
.../-fungible-asset/-init-.html | 27 +
.../-fungible-asset/-state/amount.html | 16 +
.../-fungible-asset/-state/deposit.html | 17 +
.../-fungible-asset/-state/index.html | 70 +
.../-fungible-asset/-state/notary.html | 17 +
.../-fungible-asset/-state/owner.html | 17 +
.../-fungible-asset/index.html | 102 +
.../-fungible-asset/verify.html | 17 +
.../-init-.html | 14 +
.../amount-missing.html | 15 +
.../index.html | 6 +-
.../api/com.r3corda.contracts.cash/index.html | 63 +-
.../kotlin.collections.-iterable/index.html | 77 +
.../sum-cash-by.html | 18 +
.../sum-cash-or-null.html | 4 +-
.../sum-cash-or-zero.html | 16 +
.../sum-cash.html | 7 +-
.../sum-fungible-by.html | 18 +
.../sum-fungible-or-null.html | 16 +
.../sum-fungible-or-zero.html | 16 +
.../sum-fungible.html | 17 +
.../-c-a-s-h.html | 4 +-
.../generate-state.html | 2 +-
.../com.r3corda.contracts.testing/index.html | 8 +-
.../issued by.html | 4 +-
.../owned by.html | 4 +-
...c-r-o-w-d-f-u-n-d_-p-r-o-g-r-a-m_-i-d.html | 15 -
.../-cash/-commands/-exit/-init-.html | 16 -
.../-cash/-commands/-exit/amount.html | 15 -
.../-cash/-commands/-exit/index.html | 40 -
.../-cash/-commands/-issue/-init-.html | 16 -
.../-cash/-commands/-issue/nonce.html | 15 -
.../-cash/-issuance-definition/-init-.html | 14 -
.../-cash/-issuance-definition/currency.html | 16 -
.../-cash/-issuance-definition/index.html | 43 -
.../-cash/-state/-init-.html | 15 -
.../-cash/-state/amount.html | 16 -
.../-cash/-state/index.html | 107 -
.../-cash/-state/issuance-def.html | 16 -
.../-cash/-state/notary.html | 17 -
.../-cash/-state/with-new-owner.html | 17 -
.../-cash/generate-issue.html | 21 -
.../-cash/generate-spend.html | 22 -
.../com.r3corda.contracts/-cash/index.html | 104 -
.../com.r3corda.contracts/-cash/verify.html | 17 -
.../-commercial-paper/-state/-init-.html | 2 +-
.../-commercial-paper/-state/face-value.html | 2 +-
.../-commercial-paper/-state/index.html | 6 +-
.../-state/with-face-value.html | 4 +-
.../-commercial-paper/generate-issue.html | 4 +-
.../-commercial-paper/generate-redeem.html | 4 +-
.../-commercial-paper/index.html | 4 +-
.../-crowd-fund/-campaign/-init-.html | 14 -
.../-crowd-fund/-campaign/closing-time.html | 15 -
.../-crowd-fund/-campaign/index.html | 65 -
.../-crowd-fund/-campaign/name.html | 15 -
.../-crowd-fund/-campaign/owner.html | 15 -
.../-crowd-fund/-campaign/target.html | 15 -
.../-crowd-fund/-campaign/to-string.html | 15 -
.../-crowd-fund/-commands/-close/-init-.html | 14 -
.../-crowd-fund/-commands/-close/index.html | 42 -
.../-crowd-fund/-commands/-pledge/-init-.html | 14 -
.../-crowd-fund/-commands/-pledge/index.html | 42 -
.../-commands/-register/-init-.html | 14 -
.../-commands/-register/index.html | 42 -
.../-crowd-fund/-commands/index.html | 60 -
.../-crowd-fund/-init-.html | 32 -
.../-crowd-fund/-pledge/-init-.html | 14 -
.../-crowd-fund/-pledge/amount.html | 15 -
.../-crowd-fund/-pledge/index.html | 42 -
.../-crowd-fund/-pledge/owner.html | 15 -
.../-crowd-fund/-state/-init-.html | 14 -
.../-crowd-fund/-state/campaign.html | 15 -
.../-crowd-fund/-state/closed.html | 15 -
.../-crowd-fund/-state/contract.html | 17 -
.../-crowd-fund/-state/index.html | 68 -
.../-crowd-fund/-state/pledged-amount.html | 15 -
.../-crowd-fund/-state/pledges.html | 15 -
.../-crowd-fund/generate-close.html | 15 -
.../-crowd-fund/generate-pledge.html | 16 -
.../-crowd-fund/generate-register.html | 17 -
.../-crowd-fund/index.html | 124 -
.../-crowd-fund/legal-contract-reference.html | 18 -
.../-crowd-fund/verify.html | 20 -
.../-dummy-contract/-state/-init-.html | 14 -
.../-dummy-contract/generate-initial.html | 15 -
.../-dummy-contract/verify.html | 20 -
.../-fixed-rate-payment-event/-init-.html | 2 +-
.../-fixed-rate-payment-event/flow.html | 2 +-
.../-fixed-rate-payment-event/index.html | 8 +-
.../-fixed-rate/hash-code.html | 4 +-
.../-floating-rate-payment-event/-init-.html | 2 +-
.../-floating-rate-payment-event/copy.html | 4 +-
.../-floating-rate-payment-event/flow.html | 2 +-
.../-floating-rate-payment-event/index.html | 10 +-
.../-init-.html | 14 -
.../amount-missing.html | 15 -
.../-calculation/next-fixing-date.html | 4 +-
.../-common-leg/-init-.html | 2 +-
.../-common-leg/index.html | 4 +-
.../-common-leg/notional.html | 2 +-
.../-interest-rate-swap/-common/-init-.html | 2 +-
.../-common/independent-amounts.html | 2 +-
.../-interest-rate-swap/-common/index.html | 10 +-
.../-common/minimum-transfer-amount.html | 2 +-
.../-interest-rate-swap/-common/rounding.html | 2 +-
.../-common/threshold.html | 2 +-
.../-fixed-leg/-init-.html | 2 +-
.../-interest-rate-swap/-fixed-leg/copy.html | 4 +-
.../-interest-rate-swap/-fixed-leg/index.html | 6 +-
.../-floating-leg/-init-.html | 2 +-
.../-floating-leg/copy.html | 4 +-
.../-floating-leg/index.html | 6 +-
.../-interest-rate-swap/-state/parties.html | 4 +-
.../-payment-event/calculate.html | 2 +-
.../-payment-event/index.html | 2 +-
.../-rate-payment-event/-init-.html | 2 +-
.../-rate-payment-event/calculate.html | 2 +-
.../-rate-payment-event/flow.html | 2 +-
.../-rate-payment-event/index.html | 8 +-
.../-rate-payment-event/notional.html | 2 +-
.../-rate/hash-code.html | 4 +-
.../html/api/com.r3corda.contracts/index.html | 62 +-
.../kotlin.-string/index.html | 4 +-
.../kotlin.-string/percent.html | 4 +-
.../kotlin.collections.-iterable/index.html | 43 -
.../sum-cash-by.html | 16 -
.../sum-cash-or-zero.html | 16 -
.../html/api/com.r3corda.contracts/times.html | 4 +-
.../-amount/-init-.html | 22 +-
.../-amount/compare-to.html | 4 +-
.../-amount/currency.html | 15 -
.../-amount/div.html | 4 +-
.../-amount/index.html | 50 +-
.../-amount/minus.html | 4 +-
.../-amount/pennies.html | 15 -
.../-amount/plus.html | 4 +-
.../-amount/quantity.html | 15 +
.../-amount/times.html | 4 +-
.../-amount/token.html | 15 +
.../-business-calendar/get-offset-date.html | 17 +
.../-business-calendar/index.html | 8 +
.../-command-data.html | 26 +-
.../-contract-state/index.html | 8 +-
.../-contract/index.html | 27 +-
.../-d-u-m-m-y_-p-r-o-g-r-a-m_-i-d.html | 4 +-
.../-commands/-create/-init-.html | 2 +-
.../-commands/-create/index.html | 8 +-
.../-dummy-contract/-commands/index.html | 8 +-
.../-dummy-contract/-init-.html | 2 +-
.../-dummy-contract/-state/-init-.html | 14 +
.../-dummy-contract/-state/contract.html | 6 +-
.../-dummy-contract/-state/index.html | 6 +-
.../-dummy-contract/-state/magic-number.html | 4 +-
.../-dummy-contract/-state/notary.html | 6 +-
.../-dummy-contract/generate-initial.html | 15 +
.../-dummy-contract/index.html | 12 +-
.../legal-contract-reference.html | 6 +-
.../-dummy-contract/verify.html | 20 +
.../-frequency/-annual/index.html | 2 +-
.../-frequency/-annual/offset.html | 4 +-
.../-frequency/-bi-weekly/index.html | 2 +-
.../-frequency/-bi-weekly/offset.html | 4 +-
.../-frequency/-daily/index.html | 36 +
.../-frequency/-daily/offset.html | 16 +
.../-frequency/-monthly/index.html | 2 +-
.../-frequency/-monthly/offset.html | 4 +-
.../-frequency/-quarterly/index.html | 2 +-
.../-frequency/-quarterly/offset.html | 4 +-
.../-frequency/-semi-annual/index.html | 2 +-
.../-frequency/-semi-annual/offset.html | 4 +-
.../-frequency/-weekly/index.html | 2 +-
.../-frequency/-weekly/offset.html | 4 +-
.../-frequency/index.html | 8 +-
.../-frequency/offset.html | 4 +-
.../-issuance-definition.html | 4 +-
.../-ownable-state/index.html | 4 +-
.../-signed-transaction/tx.html | 4 +-
.../-transaction-graph-search/-init-.html | 9 +-
.../-transaction-graph-search/index.html | 11 +-
.../transactions.html | 2 +-
.../-type-only-command-data/index.html | 26 +-
.../api/com.r3corda.core.contracts/index.html | 16 +-
.../kotlin.-double/-d-o-l-l-a-r-s.html | 2 +-
.../kotlin.-double/index.html | 2 +-
.../kotlin.-int/-d-o-l-l-a-r-s.html | 2 +-
.../kotlin.-int/-p-o-u-n-d-s.html | 2 +-
.../kotlin.-int/-s-w-i-s-s_-f-r-a-n-c-s.html | 2 +-
.../kotlin.-int/index.html | 6 +-
.../kotlin.collections.-iterable/index.html | 6 +-
.../sum-or-null.html | 4 +-
.../sum-or-throw.html | 4 +-
.../sum-or-zero.html | 4 +-
.../-messaging-service/index.html | 6 +-
.../api/com.r3corda.core.messaging/index.html | 2 +-
.../api/com.r3corda.core.messaging/send.html | 2 +-
.../-mock-identity-service/index.html | 13 +-
.../-mock-key-management-service/index.html | 8 +-
.../-mock-storage-service/-init-.html | 2 +-
.../-mock-storage-service/index.html | 29 +-
.../-mock-storage-service/recording-as.html | 15 -
.../-mock-storage-service/tables.html | 15 -
.../validated-transactions.html | 7 +-
.../-mock-transaction-storage/-init-.html | 14 +
.../add-transaction.html | 18 +
.../get-transaction.html | 17 +
.../-mock-transaction-storage/index.html | 45 +
.../index.html | 12 +-
.../-identity-service/index.html | 4 +-
.../-key-management-service/index.html | 4 +-
.../-network-map-cache/index.html | 2 +-
.../-service-type/index.html | 18 +
.../-service-type/is-sub-type-of.html | 15 +
.../-storage-service/index.html | 6 +-
.../validated-transactions.html | 2 +-
.../-timestamp-checker/-init-.html | 15 +
.../-timestamp-checker/clock.html | 4 +-
.../-timestamp-checker/index.html | 6 +-
.../-timestamp-checker/is-valid.html | 15 +
.../-timestamp-checker/tolerance.html | 4 +-
.../-transaction-storage/add-transaction.html | 17 +
.../-transaction-storage/get-transaction.html | 16 +
.../-transaction-storage/index.html | 53 +
.../-wallet-service/cash-balances.html | 2 +-
.../-wallet-service/index.html | 12 +-
.../-wallet-service/updates.html | 17 +
.../-wallet/-no-update.html | 15 +
.../-wallet/-update/-init-.html | 21 +
.../-wallet/-update/consumed.html | 15 +
.../-wallet/-update/index.html | 65 +
.../-wallet/-update/plus.html | 20 +
.../-wallet/-update/produced.html | 15 +
.../-wallet/cash-balances.html | 2 +-
.../-wallet/index.html | 27 +-
.../com.r3corda.core.node.services/index.html | 14 +
.../-service-hub/index.html | 6 +-
.../-service-hub/record-transactions.html | 10 +-
.../-protocol-logic/index.html | 18 +-
.../-no-references-serializer/-init-.html | 14 +
.../base-serializer.html | 15 +
.../-no-references-serializer/index.html | 53 +
.../-no-references-serializer/read.html | 15 +
.../-no-references-serializer/write.html | 15 +
.../index.html | 32 +
.../read.html | 15 +
.../write.html | 15 +
.../-serialization-token/from-token.html | 4 +-
.../-serialization-token/index.html | 15 +-
.../-serialize-as-string-token/-init-.html | 20 -
.../-serialize-as-string-token/index.html | 50 -
.../-serialize-as-string-token/key.html | 15 -
.../-serialize-as-string-token/token.html | 16 -
.../-serialize-as-token-context/-init-.html | 21 +
.../-serialize-as-token-context/index.html | 33 +
.../-init-.html | 2 +-
.../clear-context.html | 15 +
.../-serialize-as-token-serializer/index.html | 19 +-
.../set-context.html | 15 +
.../-serialize-as-token/index.html | 25 +-
.../-serialize-as-token/to-token.html | 15 +
.../-serialize-as-token/token.html | 15 -
.../-init-.html | 14 +
.../from-token.html | 16 +
.../-singleton-serialization-token/index.html | 49 +
.../register-with-context.html | 15 +
.../-singleton-serialize-as-token/-init-.html | 16 +
.../-singleton-serialize-as-token/index.html | 137 +
.../to-token.html | 16 +
.../com.r3corda.core.serialization/index.html | 53 +-
.../no-references-within.html | 18 +
.../-non-empty-set/-init-.html | 16 +
.../-non-empty-set/-iterator/-init-.html | 14 +
.../-non-empty-set/-iterator/has-next.html | 15 +
.../-non-empty-set/-iterator/index.html | 59 +
.../-non-empty-set/-iterator/iterator.html | 15 +
.../-non-empty-set/-iterator/next.html | 15 +
.../-non-empty-set/-iterator/remove.html | 15 +
.../-non-empty-set/add-all.html | 15 +
.../-non-empty-set/add.html | 15 +
.../-non-empty-set/clear.html | 15 +
.../-non-empty-set/contains-all.html | 15 +
.../-non-empty-set/contains.html | 15 +
.../-non-empty-set/equals.html | 15 +
.../-non-empty-set/hash-code.html | 15 +
.../-non-empty-set/index.html | 134 +
.../-non-empty-set/is-empty.html | 15 +
.../-non-empty-set/iterator.html | 15 +
.../-non-empty-set/remove-all.html | 15 +
.../-non-empty-set/remove.html | 15 +
.../-non-empty-set/retain-all.html | 15 +
.../-non-empty-set/size.html | 15 +
.../-non-empty-set}/to-string.html | 6 +-
.../-progress-tracker/-d-o-n-e/index.html | 11 +
.../-relabelable-step/index.html | 11 +
.../-step/child-progress-tracker.html | 15 +
.../-progress-tracker/-step/index.html | 23 +-
.../-u-n-s-t-a-r-t-e-d/index.html | 11 +
.../-progress-tracker/children-for.html | 17 -
.../get-child-progress-tracker.html | 15 +
.../-progress-tracker/index.html | 20 +-
.../set-child-progress-tracker.html | 15 +
.../api/com.r3corda.core.utilities/index.html | 14 +
.../non-empty-set-of.html | 15 +
.../-retryable-exception/-init-.html | 19 +
.../-retryable-exception/index.html | 32 +
.../html/api/com.r3corda.core/index.html | 13 +
.../kotlin.-string/abbreviate.html | 15 +
.../kotlin.-string/index.html | 6 +
.../child-progress-tracker.html | 16 +
.../-handler/-d-e-a-l-i-n-g/index.html | 42 +
.../-handler/-r-e-c-e-i-v-e-d.html | 11 +
.../-auto-offer-protocol/-handler/index.html | 4 +-
.../-handler/tracker.html | 2 +-
.../-requester/-a-n-n-o-u-n-c-i-n-g.html | 11 +
.../child-progress-tracker.html | 16 +
.../-requester/-d-e-a-l-i-n-g/index.html | 42 +
.../-requester/-r-e-c-e-i-v-e-d.html | 11 +
.../-requester/index.html | 10 +-
.../-requester/progress-tracker.html | 2 +-
.../-requester/tracker.html | 2 +-
.../-l-o-c-a-l/child-progress-tracker.html | 16 +
.../-broadcast/-l-o-c-a-l/index.html | 42 +
.../-broadcast/-n-o-t-i-f-y-i-n-g.html | 11 +
.../-broadcast/index.html | 4 +-
.../-broadcast/tracker.html | 2 +-
.../-updater/-f-e-t-c-h-i-n-g.html | 11 +
.../-updater/-f-i-x-i-n-g.html | 11 +
.../-i-t-e-r-a-t-i-n-g_-d-e-a-l-s.html | 11 +
.../-i-t-e-r-a-t-i-n-g_-f-i-x-i-n-g-s.html | 11 +
.../-updater/index.html | 4 +-
.../com.r3corda.demos/-demo-clock/index.html | 52 +-
.../-demo-clock/to-token.html | 16 +
.../-i-r-s-demo-role/-date.html | 14 +
.../-i-r-s-demo-role/-node-a.html | 14 +
.../-i-r-s-demo-role/-node-b.html | 14 +
.../-i-r-s-demo-role/-setup-node-a.html | 14 +
.../-i-r-s-demo-role/-setup-node-b.html | 14 +
.../-i-r-s-demo-role/-trade.html | 14 +
.../-i-r-s-demo-role/index.html | 55 +
.../-s-t-a-r-t-i-n-g_-b-u-y.html | 11 +
...-o-r_-s-e-l-l-e-r_-t-o_-c-o-n-n-e-c-t.html | 11 +
.../-a-n-n-o-u-n-c-i-n-g.html | 11 +
.../-s-e-l-f_-i-s-s-u-i-n-g.html | 11 +
.../-t-r-a-d-i-n-g.html | 31 -
.../child-progress-tracker.html | 16 +
.../-t-r-a-d-i-n-g/index.html} | 19 +-
.../-trader-demo-protocol-seller/index.html | 8 +-
.../-trader-demo-protocol-seller/tracker.html | 2 +-
.../html/api/com.r3corda.demos/index.html | 14 +-
.../html/api/com.r3corda.demos/node-info.html | 15 -
.../-a-p-i-server/fetch-transactions.html | 4 +-
.../-a-p-i-server/query-states.html | 4 +-
.../-i-r-s-simulation/index.html | 8 +-
.../-i-r-s-simulation/iterate.html | 4 +-
.../-mock-network/-mock-node/index.html | 13 +-
.../-simulation/index.html | 8 +-
.../-simulation/iterate.html | 4 +-
.../network-initialisation-finished.html | 15 +
.../-simulation/start-trading-circle.html | 4 +-
.../-test-clock/-init-.html | 15 +
.../-test-clock/advance-by.html | 15 +
.../-test-clock/get-zone.html | 15 +
.../-test-clock/index.html | 100 +
.../-test-clock/instant.html | 15 +
.../-test-clock/with-zone.html | 15 +
.../-trade-simulation/index.html | 8 +-
.../fill-with-some-test-cash.html | 22 +
.../-wallet-filler/index.html | 27 +
.../index.html | 30 +
.../issue-invalid-state.html | 15 +
.../issue-state.html | 15 +
.../fetch-transactions.html | 4 +-
.../-a-p-i-server-impl/query-states.html | 4 +-
.../construct-storage-service.html | 4 +-
.../-abstract-node/index.html | 13 +-
.../is-previous-checkpoints-present.html | 15 +
.../-abstract-node/make-notary-service.html | 4 +-
.../network-map-registration-future.html | 3 +-
.../-node/-init-.html | 2 +-
.../-node/index.html | 15 +-
.../-node-clock/-init-.html | 15 +
.../-node-clock/get-zone.html | 15 +
.../-node-clock/index.html | 69 +
.../-node-clock/instant.html | 15 +
.../-node-clock/to-token.html | 16 +
.../-node-clock/with-zone.html | 15 +
.../com.r3corda.node.serialization/index.html | 23 +
.../-abstract-node-service/index.html | 2 +-
.../-checkpoint/-init-.html | 2 +-
.../-checkpoint/awaiting-payload-type.html | 15 +
.../-checkpoint/awaiting-topic.html | 2 +-
.../-checkpoint/index.html | 27 +-
...ect-of-type.html => received-payload.html} | 10 +-
.../-checkpoint/serialised-fiber.html | 2 +-
.../-monitoring-service/index.html | 13 +-
.../-regulator-service/-type.html | 6 +
.../-service-hub-internal/index.html | 2 +-
.../com.r3corda.node.services.api/index.html | 2 +-
.../-node-interest-rates/-type.html | 6 +
.../-in-memory-identity-service/index.html | 13 +-
.../index.html | 2 +-
.../index.html | 8 +-
.../keys.html | 4 +-
.../com.r3corda.node.services.keys/index.html | 2 +-
.../-artemis-messaging-service/index.html | 15 +-
.../index.html | 2 +-
.../-in-memory-messaging/index.html | 13 +-
.../-in-memory-messaging/pump.html | 4 +-
.../-in-memory-messaging-network/index.html | 15 +-
.../-in-memory-network-map-cache/index.html | 13 +-
.../network-map-nodes.html | 4 +-
.../notary-nodes.html | 4 +-
.../party-nodes.html | 4 +-
.../rates-oracle-nodes.html | 4 +-
.../regulators.html | 4 +-
.../-network-map-service/-type.html | 6 +
.../index.html | 4 +-
.../checkpoints.html | 4 +-
.../-per-file-transaction-storage/-init-.html | 15 +
.../add-transaction.html | 18 +
.../get-transaction.html | 17 +
.../-per-file-transaction-storage/index.html | 64 +
.../store-dir.html | 15 +
.../transactions.html | 15 +
.../-storage-service-impl/-init-.html | 2 +-
.../-storage-service-impl/index.html | 29 +-
.../-storage-service-impl/recording-as.html | 15 -
.../-storage-service-impl/tables.html | 15 -
.../validated-transactions.html | 7 +-
.../index.html | 9 +-
.../-protocol-state-machine-impl/index.html | 8 +-
.../logger-name.html | 15 -
.../prepare-for-resume-with.html | 4 +-
.../-expecting-response/index.html | 4 +-
.../-fiber-request/-init-.html | 2 +-
.../-not-expecting-response/index.html | 4 +-
.../-fiber-request/index.html | 6 +-
.../-fiber-request/{obj.html => payload.html} | 10 +-
.../-state-machine-manager/-init-.html | 6 +-
.../all-state-machines.html | 15 +
.../-state-machine-manager/changes.html | 15 +
.../find-state-machines.html | 4 +-
.../-state-machine-manager/index.html | 29 +-
.../restore-checkpoints-on-start.html | 15 -
.../-state-machine-manager/start.html | 15 +
.../index.html | 2 +-
.../-notary-service/-init-.html | 5 +-
.../-notary-service/-type.html | 6 +
.../-notary-service/identity.html | 15 -
.../-notary-service/index.html | 56 +-
.../-notary-service/logger.html | 15 +
.../-notary-service/process-request.html | 25 -
.../-notary-service/protocol-factory.html | 16 +
.../-notary-service/signing-key.html | 15 -
.../-notary-service/smm.html | 15 +
.../-notary-service/timestamp-checker.html | 2 +-
.../-simple-notary-service/-init-.html | 15 +
.../-simple-notary-service/-type.html | 54 +
.../-simple-notary-service/index.html | 79 +
.../-simple-notary-service/logger.html | 16 +
.../protocol-factory.html | 17 +
.../-timestamp-checker/-init-.html | 15 -
.../-timestamp-checker/is-valid.html | 15 -
.../-validating-notary-service/-init-.html | 15 +
.../-validating-notary-service/-type.html | 54 +
.../-validating-notary-service/index.html | 79 +
.../-validating-notary-service/logger.html | 16 +
.../protocol-factory.html | 17 +
.../index.html | 13 +-
.../-init-.html | 15 +
.../index.html | 38 +
.../service-hub-internal.html | 15 +
.../-node-wallet-service/cash-balances.html | 6 +-
.../-node-wallet-service/current-wallet.html | 4 +-
.../fill-with-some-test-cash.html | 23 -
.../-node-wallet-service/index.html | 26 +-
.../-node-wallet-service/linear-heads.html | 4 +-
.../-node-wallet-service/updates.html | 22 +
.../-wallet-impl/cash-balances.html | 6 +-
.../-wallet-impl/index.html | 2 +-
.../index.html | 9 +-
.../api/com.r3corda.node.testutils/index.html | 22 -
.../issue-state.html | 15 -
.../-a-n-s-i-progress-observer/-init-.html | 16 +
.../-a-n-s-i-progress-observer/index.html | 40 +
.../-a-n-s-i-progress-observer/smm.html | 15 +
.../-gate/is-on-thread.html | 4 +-
.../-service-affinity-executor/index.html | 6 -
.../is-on-thread.html | 4 +-
.../-service-affinity-executor/threads.html | 15 -
.../-fiber-box/-init-.html | 35 +
.../-fiber-box/index.html | 70 +
.../-fiber-box/read-with-deadline.html | 15 +
.../-fiber-box/read.html | 15 +
.../-fiber-box/write.html | 15 +
.../-mutable-clock/-init-.html | 19 +
.../-mutable-clock/index.html | 95 +
.../-mutable-clock/mutation-count.html | 19 +
.../-mutable-clock/mutations.html | 19 +
.../notify-mutation-observers.html | 16 +
.../api/com.r3corda.node.utilities/index.html | 34 +
.../java.time.-clock/await-with-deadline.html | 19 +
.../java.time.-clock/index.html | 23 +
.../-abstract-request-message/index.html | 13 +-
.../-fetch-data-protocol/index.html | 4 +-
.../-transaction-invalid/-init-.html | 14 +
.../-transaction-invalid/index.html | 25 +
.../-notary-error/index.html | 12 +
.../-notary-protocol/-client/-init-.html | 20 +
.../-client/-r-e-q-u-e-s-t-i-n-g.html} | 19 +-
.../-client/-v-a-l-i-d-a-t-i-n-g.html} | 19 +-
.../-notary-protocol/-client/call.html | 17 +
.../-notary-protocol/-client/index.html | 152 +
.../-notary-protocol/-client/notary-node.html | 15 +
.../-client/progress-tracker.html | 24 +
.../-notary-protocol/-client/tracker.html | 15 +
.../-default-factory/create.html | 16 +
.../-default-factory/index.html | 25 +
.../-notary-protocol/-factory/create.html | 15 +
.../-notary-protocol/-factory/index.html | 36 +
.../-notary-protocol/-handshake/-init-.html | 14 +
.../-notary-protocol/-handshake/index.html | 53 +
.../-handshake/send-session-i-d.html | 15 +
.../-notary-protocol/-init-.html | 20 -
.../-r-e-q-u-e-s-t-i-n-g.html | 31 -
.../-notary-protocol/-service/-init-.html | 20 +
.../-service/before-commit.html | 21 +
.../-notary-protocol/-service/call.html | 17 +
.../-notary-protocol/-service/index.html | 175 ++
.../-notary-protocol/-service/other-side.html | 15 +
.../-service/receive-session-i-d.html | 15 +
.../-service/send-session-i-d.html | 15 +
.../-service/timestamp-checker.html | 15 +
.../-service/uniqueness-provider.html | 15 +
.../-sign-request/-init-.html | 2 +-
.../-notary-protocol/-sign-request/index.html | 21 +-
.../-notary-protocol/-t-o-p-i-c.html | 2 +-
.../-t-o-p-i-c_-i-n-i-t-i-a-t-e.html | 15 +
.../-v-a-l-i-d-a-t-i-n-g.html | 31 -
.../-notary-protocol/call.html | 17 -
.../-notary-protocol/index.html | 153 +-
.../-notary-protocol/notary-node.html | 15 -
.../-notary-protocol/progress-tracker.html | 24 -
.../-notary-protocol/tracker.html | 15 -
.../-q-u-e-r-y-i-n-g/index.html | 11 +
.../-rates-fix-protocol/-s-i-g-n-i-n-g.html | 11 +
.../-rates-fix-protocol/-w-o-r-k-i-n-g.html | 11 +
.../-resolve-transactions-protocol/index.html | 4 +-
.../-a-w-a-i-t-i-n-g_-p-r-o-p-o-s-a-l.html | 11 +
...c-o-p-y-i-n-g_-t-o_-r-e-g-u-l-a-t-o-r.html | 11 +
.../-primary/-n-o-t-a-r-y.html | 11 +
.../-primary/-r-e-c-o-r-d-i-n-g.html | 11 +
.../-primary/-s-e-n-d-i-n-g_-s-i-g-s.html | 11 +
.../-primary/-s-i-g-n-i-n-g.html | 11 +
.../-primary/-v-e-r-i-f-y-i-n-g.html | 11 +
.../-primary/index.html | 4 +-
.../-secondary/-r-e-c-e-i-v-i-n-g.html | 11 +
.../-secondary/-r-e-c-o-r-d-i-n-g.html | 11 +
.../-secondary/-s-i-g-n-i-n-g.html | 11 +
...-s-w-a-p-p-i-n-g_-s-i-g-n-a-t-u-r-e-s.html | 11 +
.../-secondary/-v-e-r-i-f-y-i-n-g.html | 11 +
.../-buyer/-init-.html | 2 +-
.../-buyer/-r-e-c-e-i-v-i-n-g.html | 11 +
.../-buyer/-s-i-g-n-i-n-g.html | 11 +
...-s-w-a-p-p-i-n-g_-s-i-g-n-a-t-u-r-e-s.html | 11 +
.../-buyer/-v-e-r-i-f-y-i-n-g.html | 11 +
.../-buyer/acceptable-price.html | 2 +-
.../-buyer/index.html | 8 +-
.../-seller-trade-info/-init-.html | 2 +-
.../-seller-trade-info/index.html | 4 +-
.../-seller-trade-info/price.html | 2 +-
.../-a-w-a-i-t-i-n-g_-p-r-o-p-o-s-a-l.html | 11 +
.../-seller/-init-.html | 2 +-
.../-seller/-n-o-t-a-r-y.html | 11 +
.../-seller/-s-e-n-d-i-n-g_-s-i-g-s.html | 11 +
.../-seller/-s-i-g-n-i-n-g.html | 11 +
.../-seller/-v-e-r-i-f-y-i-n-g.html | 11 +
.../-seller/index.html | 4 +-
.../-seller/price.html | 2 +-
.../-unacceptable-price-exception/-init-.html | 2 +-
.../given-price.html | 2 +-
.../-unacceptable-price-exception/index.html | 4 +-
.../-validating-notary-protocol/-init-.html | 18 +
.../before-commit.html | 22 +
.../-validating-notary-protocol/index.html | 97 +
.../html/api/com.r3corda.protocols/index.html | 14 +-
docs/build/html/api/index-outline.html | 2505 +++++++++++------
docs/build/html/api/index.html | 12 +-
docs/build/html/building-the-docs.html | 2 +
docs/build/html/codestyle.html | 2 +
docs/build/html/consensus.html | 6 +-
docs/build/html/data-model.html | 6 +-
docs/build/html/genindex.html | 2 +
docs/build/html/getting-set-up.html | 2 +
docs/build/html/index.html | 12 +
docs/build/html/inthebox.html | 2 +
docs/build/html/irs.html | 2 +
docs/build/html/messaging.html | 2 +
docs/build/html/node-administration.html | 2 +
docs/build/html/objects.inv | Bin 631 -> 658 bytes
docs/build/html/oracles.html | 2 +
docs/build/html/protocol-state-machines.html | 2 +
docs/build/html/release-notes.html | 7 +-
docs/build/html/release-process.html | 23 +-
docs/build/html/running-the-demos.html | 66 +-
docs/build/html/search.html | 2 +
docs/build/html/searchindex.js | 2 +-
docs/build/html/transaction-data-types.html | 329 +++
docs/build/html/tutorial-contract.html | 2 +
docs/build/html/visualiser.html | 2 +
docs/build/html/where-to-start.html | 2 +
661 files changed, 10109 insertions(+), 4091 deletions(-)
create mode 100644 docs/build/html/_sources/transaction-data-types.txt
rename docs/build/html/api/com.r3corda.contracts.cash/{-cash-issuance-definition => -asset-issuance-definition}/deposit.html (61%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/token.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html (69%)
delete mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash-issuance-definition/currency.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash-issuance-definition/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/amount.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/-init-.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-commands/-issue/index.html (55%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/nonce.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-commands/-move/-init-.html (54%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-commands/-move/index.html (83%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-commands/index.html (53%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-init-.html (88%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/-init-.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-issuance-definition/deposit.html (56%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/token.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/amount.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-state/contract.html (67%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-state/deposit.html (58%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/issuance-def.html
rename docs/build/html/api/{com.r3corda.contracts/-crowd-fund => com.r3corda.contracts.cash/-cash}/-state/notary.html (60%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-state/owner.html (58%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/-state/to-string.html (60%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/with-new-owner.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-issue.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-spend.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-cash/index.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-cash/legal-contract-reference.html (83%)
rename docs/build/html/api/com.r3corda.contracts.cash/{-common-cash-state => -fungible-asset-state}/amount.html (51%)
rename docs/build/html/api/com.r3corda.contracts.cash/{-common-cash-state => -fungible-asset-state}/deposit.html (73%)
rename docs/build/html/api/com.r3corda.contracts.cash/{-common-cash-state => -fungible-asset-state}/index.html (73%)
rename docs/build/html/api/com.r3corda.contracts.cash/{-common-cash-state => -fungible-asset-state}/issuance-def.html (64%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/amount.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/nonce.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-move.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/amount.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/deposit.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/notary.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/owner.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/verify.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/amount-missing.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/-insufficient-balance-exception/index.html (60%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/index.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-by.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/kotlin.collections.-iterable/sum-cash-or-null.html (71%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-zero.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.contracts.cash}/kotlin.collections.-iterable/sum-cash.html (64%)
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-by.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-null.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-zero.html
create mode 100644 docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-c-r-o-w-d-f-u-n-d_-p-r-o-g-r-a-m_-i-d.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/amount.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/nonce.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/currency.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-state/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-state/amount.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-state/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-state/issuance-def.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-state/notary.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/-state/with-new-owner.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/generate-issue.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/generate-spend.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-cash/verify.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/closing-time.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/name.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/owner.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/target.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/to-string.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-close/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-close/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-pledge/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-pledge/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-register/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-register/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/amount.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/owner.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/campaign.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/closed.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/contract.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/pledged-amount.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/pledges.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-close.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-pledge.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-register.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/legal-contract-reference.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-crowd-fund/verify.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-dummy-contract/-state/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-dummy-contract/generate-initial.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-dummy-contract/verify.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/amount-missing.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/index.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/sum-cash-by.html
delete mode 100644 docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/sum-cash-or-zero.html
delete mode 100644 docs/build/html/api/com.r3corda.core.contracts/-amount/currency.html
delete mode 100644 docs/build/html/api/com.r3corda.core.contracts/-amount/pennies.html
create mode 100644 docs/build/html/api/com.r3corda.core.contracts/-amount/quantity.html
create mode 100644 docs/build/html/api/com.r3corda.core.contracts/-amount/token.html
create mode 100644 docs/build/html/api/com.r3corda.core.contracts/-business-calendar/get-offset-date.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-d-u-m-m-y_-p-r-o-g-r-a-m_-i-d.html (70%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/-commands/-create/-init-.html (54%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/-commands/-create/index.html (67%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/-commands/index.html (53%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/-init-.html (65%)
create mode 100644 docs/build/html/api/com.r3corda.core.contracts/-dummy-contract/-state/-init-.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/-state/contract.html (52%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/-state/index.html (61%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/-state/magic-number.html (55%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/-state/notary.html (57%)
create mode 100644 docs/build/html/api/com.r3corda.core.contracts/-dummy-contract/generate-initial.html
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/index.html (50%)
rename docs/build/html/api/{com.r3corda.contracts => com.r3corda.core.contracts}/-dummy-contract/legal-contract-reference.html (61%)
create mode 100644 docs/build/html/api/com.r3corda.core.contracts/-dummy-contract/verify.html
create mode 100644 docs/build/html/api/com.r3corda.core.contracts/-frequency/-daily/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.contracts/-frequency/-daily/offset.html
delete mode 100644 docs/build/html/api/com.r3corda.core.node.services.testing/-mock-storage-service/recording-as.html
delete mode 100644 docs/build/html/api/com.r3corda.core.node.services.testing/-mock-storage-service/tables.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services.testing/-mock-transaction-storage/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services.testing/-mock-transaction-storage/add-transaction.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services.testing/-mock-transaction-storage/get-transaction.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services.testing/-mock-transaction-storage/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-service-type/is-sub-type-of.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-timestamp-checker/-init-.html
rename docs/build/html/api/{com.r3corda.node.services.transactions => com.r3corda.core.node.services}/-timestamp-checker/clock.html (62%)
rename docs/build/html/api/{com.r3corda.node.services.transactions => com.r3corda.core.node.services}/-timestamp-checker/index.html (50%)
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-timestamp-checker/is-valid.html
rename docs/build/html/api/{com.r3corda.node.services.transactions => com.r3corda.core.node.services}/-timestamp-checker/tolerance.html (62%)
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-transaction-storage/add-transaction.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-transaction-storage/get-transaction.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-transaction-storage/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-wallet-service/updates.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-wallet/-no-update.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-wallet/-update/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-wallet/-update/consumed.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-wallet/-update/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-wallet/-update/plus.html
create mode 100644 docs/build/html/api/com.r3corda.core.node.services/-wallet/-update/produced.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-no-references-serializer/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-no-references-serializer/base-serializer.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-no-references-serializer/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-no-references-serializer/read.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-no-references-serializer/write.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-references-aware-java-serializer/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-references-aware-java-serializer/read.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-references-aware-java-serializer/write.html
delete mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-string-token/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-string-token/index.html
delete mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-string-token/key.html
delete mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-string-token/token.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-token-context/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-token-context/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-token-serializer/clear-context.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-token-serializer/set-context.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-token/to-token.html
delete mode 100644 docs/build/html/api/com.r3corda.core.serialization/-serialize-as-token/token.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-singleton-serialization-token/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-singleton-serialization-token/from-token.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-singleton-serialization-token/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-singleton-serialization-token/register-with-context.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-singleton-serialize-as-token/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-singleton-serialize-as-token/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/-singleton-serialize-as-token/to-token.html
create mode 100644 docs/build/html/api/com.r3corda.core.serialization/no-references-within.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/-iterator/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/-iterator/has-next.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/-iterator/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/-iterator/iterator.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/-iterator/next.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/-iterator/remove.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/add-all.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/add.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/clear.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/contains-all.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/contains.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/equals.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/hash-code.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/index.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/is-empty.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/iterator.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/remove-all.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/remove.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/retain-all.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-non-empty-set/size.html
rename docs/build/html/api/{com.r3corda.node.services.api/-checkpoint => com.r3corda.core.utilities/-non-empty-set}/to-string.html (57%)
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-progress-tracker/-step/child-progress-tracker.html
delete mode 100644 docs/build/html/api/com.r3corda.core.utilities/-progress-tracker/children-for.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-progress-tracker/get-child-progress-tracker.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/-progress-tracker/set-child-progress-tracker.html
create mode 100644 docs/build/html/api/com.r3corda.core.utilities/non-empty-set-of.html
create mode 100644 docs/build/html/api/com.r3corda.core/-retryable-exception/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.core/-retryable-exception/index.html
create mode 100644 docs/build/html/api/com.r3corda.core/kotlin.-string/abbreviate.html
create mode 100644 docs/build/html/api/com.r3corda.demos.protocols/-auto-offer-protocol/-handler/-d-e-a-l-i-n-g/child-progress-tracker.html
create mode 100644 docs/build/html/api/com.r3corda.demos.protocols/-auto-offer-protocol/-handler/-d-e-a-l-i-n-g/index.html
create mode 100644 docs/build/html/api/com.r3corda.demos.protocols/-auto-offer-protocol/-requester/-d-e-a-l-i-n-g/child-progress-tracker.html
create mode 100644 docs/build/html/api/com.r3corda.demos.protocols/-auto-offer-protocol/-requester/-d-e-a-l-i-n-g/index.html
create mode 100644 docs/build/html/api/com.r3corda.demos.protocols/-update-business-day-protocol/-broadcast/-l-o-c-a-l/child-progress-tracker.html
create mode 100644 docs/build/html/api/com.r3corda.demos.protocols/-update-business-day-protocol/-broadcast/-l-o-c-a-l/index.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-demo-clock/to-token.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-i-r-s-demo-role/-date.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-i-r-s-demo-role/-node-a.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-i-r-s-demo-role/-node-b.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-i-r-s-demo-role/-setup-node-a.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-i-r-s-demo-role/-setup-node-b.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-i-r-s-demo-role/-trade.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-i-r-s-demo-role/index.html
delete mode 100644 docs/build/html/api/com.r3corda.demos/-trader-demo-protocol-seller/-t-r-a-d-i-n-g.html
create mode 100644 docs/build/html/api/com.r3corda.demos/-trader-demo-protocol-seller/-t-r-a-d-i-n-g/child-progress-tracker.html
rename docs/build/html/api/{com.r3corda.demos.protocols/-auto-offer-protocol/-requester/-d-e-a-l-i-n-g.html => com.r3corda.demos/-trader-demo-protocol-seller/-t-r-a-d-i-n-g/index.html} (61%)
delete mode 100644 docs/build/html/api/com.r3corda.demos/node-info.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-simulation/network-initialisation-finished.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-test-clock/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-test-clock/advance-by.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-test-clock/get-zone.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-test-clock/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-test-clock/instant.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-test-clock/with-zone.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-wallet-filler/fill-with-some-test-cash.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/-wallet-filler/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/issue-invalid-state.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal.testing/issue-state.html
create mode 100644 docs/build/html/api/com.r3corda.node.internal/-abstract-node/is-previous-checkpoints-present.html
create mode 100644 docs/build/html/api/com.r3corda.node.serialization/-node-clock/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.serialization/-node-clock/get-zone.html
create mode 100644 docs/build/html/api/com.r3corda.node.serialization/-node-clock/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.serialization/-node-clock/instant.html
create mode 100644 docs/build/html/api/com.r3corda.node.serialization/-node-clock/to-token.html
create mode 100644 docs/build/html/api/com.r3corda.node.serialization/-node-clock/with-zone.html
create mode 100644 docs/build/html/api/com.r3corda.node.serialization/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.api/-checkpoint/awaiting-payload-type.html
rename docs/build/html/api/com.r3corda.node.services.api/-checkpoint/{awaiting-object-of-type.html => received-payload.html} (50%)
create mode 100644 docs/build/html/api/com.r3corda.node.services.persistence/-per-file-transaction-storage/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.persistence/-per-file-transaction-storage/add-transaction.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.persistence/-per-file-transaction-storage/get-transaction.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.persistence/-per-file-transaction-storage/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.persistence/-per-file-transaction-storage/store-dir.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.persistence/-per-file-transaction-storage/transactions.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.persistence/-storage-service-impl/recording-as.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.persistence/-storage-service-impl/tables.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.statemachine/-protocol-state-machine-impl/logger-name.html
rename docs/build/html/api/com.r3corda.node.services.statemachine/-state-machine-manager/-fiber-request/{obj.html => payload.html} (62%)
create mode 100644 docs/build/html/api/com.r3corda.node.services.statemachine/-state-machine-manager/all-state-machines.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.statemachine/-state-machine-manager/changes.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.statemachine/-state-machine-manager/restore-checkpoints-on-start.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.statemachine/-state-machine-manager/start.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-notary-service/identity.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-notary-service/logger.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-notary-service/process-request.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-notary-service/protocol-factory.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-notary-service/signing-key.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-notary-service/smm.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-simple-notary-service/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-simple-notary-service/-type.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-simple-notary-service/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-simple-notary-service/logger.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-simple-notary-service/protocol-factory.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-timestamp-checker/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-timestamp-checker/is-valid.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-validating-notary-service/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-validating-notary-service/-type.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-validating-notary-service/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-validating-notary-service/logger.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.transactions/-validating-notary-service/protocol-factory.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.wallet/-cash-balance-as-metrics-observer/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.wallet/-cash-balance-as-metrics-observer/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.wallet/-cash-balance-as-metrics-observer/service-hub-internal.html
delete mode 100644 docs/build/html/api/com.r3corda.node.services.wallet/-node-wallet-service/fill-with-some-test-cash.html
create mode 100644 docs/build/html/api/com.r3corda.node.services.wallet/-node-wallet-service/updates.html
delete mode 100644 docs/build/html/api/com.r3corda.node.testutils/index.html
delete mode 100644 docs/build/html/api/com.r3corda.node.testutils/issue-state.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-a-n-s-i-progress-observer/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-a-n-s-i-progress-observer/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-a-n-s-i-progress-observer/smm.html
delete mode 100644 docs/build/html/api/com.r3corda.node.utilities/-affinity-executor/-service-affinity-executor/threads.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-fiber-box/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-fiber-box/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-fiber-box/read-with-deadline.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-fiber-box/read.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-fiber-box/write.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-mutable-clock/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-mutable-clock/index.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-mutable-clock/mutation-count.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-mutable-clock/mutations.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/-mutable-clock/notify-mutation-observers.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/java.time.-clock/await-with-deadline.html
create mode 100644 docs/build/html/api/com.r3corda.node.utilities/java.time.-clock/index.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-error/-transaction-invalid/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-error/-transaction-invalid/index.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-client/-init-.html
rename docs/build/html/api/{com.r3corda.demos.protocols/-auto-offer-protocol/-handler/-d-e-a-l-i-n-g.html => com.r3corda.protocols/-notary-protocol/-client/-r-e-q-u-e-s-t-i-n-g.html} (50%)
rename docs/build/html/api/{com.r3corda.demos.protocols/-update-business-day-protocol/-broadcast/-l-o-c-a-l.html => com.r3corda.protocols/-notary-protocol/-client/-v-a-l-i-d-a-t-i-n-g.html} (50%)
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-client/call.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-client/index.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-client/notary-node.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-client/progress-tracker.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-client/tracker.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-default-factory/create.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-default-factory/index.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-factory/create.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-factory/index.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-handshake/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-handshake/index.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-handshake/send-session-i-d.html
delete mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-init-.html
delete mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-r-e-q-u-e-s-t-i-n-g.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/before-commit.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/call.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/index.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/other-side.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/receive-session-i-d.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/send-session-i-d.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/timestamp-checker.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-service/uniqueness-provider.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-t-o-p-i-c_-i-n-i-t-i-a-t-e.html
delete mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/-v-a-l-i-d-a-t-i-n-g.html
delete mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/call.html
delete mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/notary-node.html
delete mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/progress-tracker.html
delete mode 100644 docs/build/html/api/com.r3corda.protocols/-notary-protocol/tracker.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-validating-notary-protocol/-init-.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-validating-notary-protocol/before-commit.html
create mode 100644 docs/build/html/api/com.r3corda.protocols/-validating-notary-protocol/index.html
create mode 100644 docs/build/html/transaction-data-types.html
diff --git a/docs/build/html/_sources/index.txt b/docs/build/html/_sources/index.txt
index d4f6725976..f18a72c5a4 100644
--- a/docs/build/html/_sources/index.txt
+++ b/docs/build/html/_sources/index.txt
@@ -26,6 +26,7 @@ Read on to learn:
inthebox
getting-set-up
data-model
+ transaction-data-types
consensus
messaging
running-the-demos
diff --git a/docs/build/html/_sources/release-notes.txt b/docs/build/html/_sources/release-notes.txt
index 8861e16a60..f8dcde9f73 100644
--- a/docs/build/html/_sources/release-notes.txt
+++ b/docs/build/html/_sources/release-notes.txt
@@ -8,7 +8,10 @@ Unreleased
Here are changes in git master that haven't yet made it to a snapshot release:
-* Nothing yet
+* The cash contract has moved from com.r3corda.contracts to com.r3corda.contracts.cash.
+* Amount class is now generic, to support non-currency types (such as assets, or currency with additional information).
+* Refactored the Cash contract to have a new FungibleAsset superclass, to model all countable assets that can be merged
+ and split (currency, barrels of oil, etc.)
Milestone 0
diff --git a/docs/build/html/_sources/release-process.txt b/docs/build/html/_sources/release-process.txt
index 46768f32cf..7116ba0b09 100644
--- a/docs/build/html/_sources/release-process.txt
+++ b/docs/build/html/_sources/release-process.txt
@@ -20,4 +20,23 @@ forever and the software will be considered production ready. Until then, expect
hard hat.
Our goal is to cut a new milestone roughly once a month. There are no fixed dates. If need be, a milestone may slip by
-a few days to ensure the code is sufficiently usable.
\ No newline at end of file
+a few days to ensure the code is sufficiently usable. Usually the release will happen around the end of the month.
+
+Steps to cut a release
+======================
+
+1. Pick a commit that is stable and do basic QA: run all the tests, run the demos.
+2. Review the commits between this release and the last looking for new features, API changes, etc. Make sure the
+ summary in the current section of the :doc:`release-notes` is correct and update if not. Then move it into the right
+ section for this release. This is the right place to put any advice on how to port app code from the last release.
+3. Additionally, if there are any new features or APIs that deserve a new section in the docsite and the author didn't
+ create one, bug them to do so a day or two before the release.
+4. Regenerate the docsite if necessary and commit.
+5. Create a branch with a name like `release-M0` where 0 is replaced by the number of the milestone.
+6. Tag that branch with a tag like `release-M0.0`
+7. Push the branch and the tag to git.
+8. Write up a short announcement containing the summary of new features, changes, and API breaks. Send it to the
+ r3dlg-awg mailing list.
+
+If there are serious bugs found in the release, backport the fix to the branch and then tag it with e.g. `release-M0.1`
+Minor changes to the branch don't have to be announced unless it'd be critical to get all developers updated.
\ No newline at end of file
diff --git a/docs/build/html/_sources/running-the-demos.txt b/docs/build/html/_sources/running-the-demos.txt
index fdc6a7c92c..93499522a5 100644
--- a/docs/build/html/_sources/running-the-demos.txt
+++ b/docs/build/html/_sources/running-the-demos.txt
@@ -12,23 +12,35 @@ so far. We have:
The demos create node data directories in the root of the project. If something goes wrong with them, blow away the
directories and try again.
-.. warning:: Corda is developed on MacOS and works best on UNIX systems. The trader demo is easily run on Windows but
- you won't get the nice coloured output. The IRS demo relies on a shell script wrapper and isn't so easily run on
- Windows currently: we will fix this soon.
+.. note:: Corda is developed on MacOS and works best on UNIX systems. Both demos are easily run on Windows but
+ you won't get the nice coloured output.
Trader demo
-----------
-.. note:: On Windows, use the same commands, but run the batch file instead of the shell file (add .bat to the command)
+Open two terminals, and in the first run:
-Open two terminals, and in the first run:::
+.. note:: If you are planning to use non-default configuration you will need to run with --role=SetupA and --role=SetupB
+ beforehand with the same parameters you plan to supply to the respective nodes.
- gradle installDist && ./build/install/r3prototyping/bin/trader-demo --role=BUYER
+**Windows**::
+
+ gradlew.bat & .\build\install\r3prototyping\bin\trader-demo --role=BUYER
+
+**Other**::
+
+ Other: ./gradlew installDist && ./build/install/r3prototyping/bin/trader-demo --role=BUYER
It will compile things, if necessary, then create a directory named trader-demo/buyer with a bunch of files inside and
start the node. You should see it waiting for a trade to begin.
-In the second terminal, run::
+In the second terminal, run:
+
+**Windows**::
+
+ .\build\install\r3prototyping\bin\trader-demo --role=SELLER
+
+**Other**::
./build/install/r3prototyping/bin/trader-demo --role=SELLER
@@ -41,26 +53,48 @@ If it doesn't work, jump on the mailing list and let us know.
IRS demo
--------
-.. warning:: This demo currently works best on MacOS or Linux
+Open three terminals. In the first run:
-Open three terminals. In the first run:::
+**Windows**::
- ./scripts/irs-demo.sh nodeA
+ gradlew.bat installDist & .\build\install\r3prototyping\bin\irsdemo.bat --role=NodeA
-And in the second run:::
+**Other**::
- ./scripts/irs-demo.sh nodeB
+ ./gradlew installDist && ./build/install/r3prototyping/bin/irsdemo --role=NodeA
+
+And in the second run:
+
+**Windows**::
+
+ .\build\install\r3prototyping\bin\irsdemo.bat --role=NodeB
+
+**Other**::
+
+ ./build/install/r3prototyping/bin/irsdemo --role=NodeB
The node in the first terminal will complain that it didn't know about nodeB, so restart it. It'll then find the
location and identity keys of nodeA and be happy. NodeB also doubles up as the interest rates oracle and you should
see some rates data get loaded.
-Now in the third terminal run:::
+Now in the third terminal run:
- ./scripts/irs-demo.sh trade trade1
+**Windows**::
+
+ .\build\install\r3prototyping\bin\irsdemo.bat --role=Trade trade1
+
+**Other**::
+
+ ./build/install/r3prototyping/bin/irsdemo --role=Trade trade1
You should see some activity in the other two terminals as they set up the deal. You can now run this command in
a separate window to roll the fake clock forward and trigger lots of fixing events. Things go fast so make sure you
-can see the other terminals whilst you run this command!::
+can see the other terminals whilst you run this command!:
- ./scripts/irs-demo.sh date 2017-01-30
\ No newline at end of file
+**Windows**::
+
+ .\build\install\r3prototyping\bin\irsdemo.bat --role=Date 2017-01-30
+
+**Other**::
+
+ ./build/install/r3prototyping/bin/irsdemo --role=Date 2017-01-30
diff --git a/docs/build/html/_sources/transaction-data-types.txt b/docs/build/html/_sources/transaction-data-types.txt
new file mode 100644
index 0000000000..20872a7c01
--- /dev/null
+++ b/docs/build/html/_sources/transaction-data-types.txt
@@ -0,0 +1,100 @@
+Transaction Data Types
+======================
+
+There is a large library of data types used in Corda transactions and contract state objects.
+
+Amount
+------
+
+The ``Amount`` class is used to represent an amount of some fungible asset. It is a generic class which wraps around
+a type used to define the underlying product, generally represented by an ``Issued`` instance, or this can be a more
+complex type such as an obligation contract issuance definition (which in turn contains a token definition for whatever
+the obligation is to be settled in).
+
+.. note:: Fungible is used here to mean that instances of an asset is interchangeable for any other identical instance,
+ and that they can be split/merged. For example a £5 note can reasonably be exchanged for any other £5 note, and a
+ £10 note can be exchanged for two £5 notes, or vice-versa.
+
+Where a contract refers directly to an amount of something, ``Amount`` should wrap ``Issued``, which in
+turn can refer to a ``Currency`` (GBP, USD, CHF, etc.), or any other class. Future work in this area will include
+introducing classes to represent non-currency things (such as commodities) that Issued can wrap. For more
+complex amounts, ``Amount`` can wrap other types, for example to represent a number of Obligation contracts to be
+delivered (themselves referring to a currency), an ``Amount`` such as the following would used:
+
+.. container:: codeset
+
+ .. sourcecode:: kotlin
+
+ Amount>
+
+Contract State
+--------------
+
+A Corda contract is composed of three parts; the executable code, the legal prose, and the state objects that represent
+the details of the contract (see :doc:`data-model` for further detail). States essentially convert the generic template
+(code and legal prose) into a specific instance. In a ``WireTransaction``, outputs are provided as ``ContractState``
+implementations, while the inputs are references to the outputs of a previous transaction. These references are then
+stored as ``StateRef`` objects, which are converted to ``StateAndRef`` on demand.
+
+A number of interfaces then extend ``ContractState``, representing standardised functionality for states:
+
+ ``OwnableState``
+ A state which has an owner (represented as a ``PublicKey``, discussed later). Exposes the owner and a function for
+ replacing the owner.
+
+ ``LinearState``
+ A state which links back to its previous state, creating a thread of states over time. Intended to simplify tracking
+ state versions.
+
+ ``DealState``
+ A state representing an agreement between two or more parties. Intended to simplify implementing generic protocols
+ that manipulate many agreement types.
+
+ ``FixableDealState``
+ A deal state, with further functions exposed to support fixing of interest rates.
+
+Things (such as attachments) which are identified by their hash should implement the ``NamedByHash`` interface,
+which standardises how the ID is extracted.
+
+FungibleAssets and Cash
+-----------------------
+
+There is a common ``FungibleAsset`` superclass for contracts which model fungible assets, which also provides a standard
+interface for its subclasses' state objects to implement. The clear use-case is ``Cash``, however ``FungibleAsset`` is
+intended to be readily extensible to cover other assets, for example commodities could be modelled by using a subclass
+whose state objects include further details (location of the commodity, origin, grade, etc.) as needed.
+
+Transaction Types
+-----------------
+
+The ``WireTransaction`` class contains the core of a transaction without signatures, and with references to attachments
+in place of the attachments themselves (see also :doc:`data-model`). Once signed these are encapsulated in the
+``SignedTransaction`` class. For processing a transaction (i.e. to verify it) it is first converted to a
+``LedgerTransaction``, which involves verifying the signatures and associating them to the relevant command(s), and
+resolving the attachment references to the attachments. Commands with valid signatures are encapsulated in the
+``AuthenticatedObject`` type.
+
+Party and PublicKey
+-------------------
+
+Identities of parties involved in signing a transaction can be represented simply by their ``PublicKey``, or by further
+information (such as name) using the ``Party`` class. An ``AuthenticatedObject`` contains a list of the public keys
+for signatures present on the transaction, as well as list of parties for those public keys (where known).
+
+.. note:: These types are provisional and are likely to change in future, for example to add additional information to
+ ``Party``.
+
+Date Support
+------------
+
+There are a number of supporting interfaces and classes for use by contract which deal with dates (especially in the
+context of deadlines). As contract negotiation typically deals with deadlines in terms such as "overnight", "T+3",
+etc., it's desirable to allow conversion of these terms to their equivalent deadline. ``Tenor`` models the interval
+before a deadline, such as 3 days, etc., while ``DateRollConvention`` describes how deadlines are modified to take
+into account bank holidays or other events that modify normal working days.
+
+Calculating the rollover of a deadline based on working days requires information on the bank holidays involved
+(and where a contract's parties are in different countries, for example, this can involve multiple separate sets of
+bank holidays). The ``BusinessCalendar`` class models these calendars of business holidays; currently it loads these
+from files on disk, but in future this is likely to involve reference data oracles in order to ensure consensus on the
+dates used.
diff --git a/docs/build/html/api/alltypes/index.html b/docs/build/html/api/alltypes/index.html
index dc8620840c..a61c9e0e8b 100644
--- a/docs/build/html/api/alltypes/index.html
+++ b/docs/build/html/api/alltypes/index.html
@@ -9,6 +9,14 @@
+com.r3corda.node.utilities.ANSIProgressObserver
+
+This observes the StateMachineManager and follows the progress of ProtocolLogic s until they complete in the order
+they are added to the StateMachineManager .
+
+
+
+
com.r3corda.node.utilities.ANSIProgressRenderer
Knows how to render a ProgressTracker to the terminal using coloured, emoji-fied output. Useful when writing small
@@ -99,7 +107,9 @@ for ensuring code runs on the right thread, and also for unit testing.
com.r3corda.core.contracts.Amount
-Amount represents a positive quantity of currency, measured in pennies, which are the smallest representable units.
+Amount represents a positive quantity of some token (currency, asset, etc.), measured in quantity of the smallest
+representable units. Note that quantity is not necessarily 1/100ths of a currency unit, but are the actual smallest
+amount used in whatever underlying thing the amount represents.
@@ -114,6 +124,14 @@ as well.
+com.r3corda.contracts.cash.AssetIssuanceDefinition
+
+Subset of cash-like contract state, containing the issuance definition. If these definitions match for two
+contracts states, those states can be aggregated.
+
+
+
+
com.r3corda.core.contracts.Attachment
An attachment is a ZIP (or an optionally signed JAR) that contains one or more files. Attachments are meant to
@@ -191,7 +209,7 @@ no staff are around to handle problems.
-com.r3corda.contracts.Cash
+com.r3corda.contracts.cash.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
@@ -201,10 +219,9 @@ the same transaction.
-com.r3corda.contracts.cash.CashIssuanceDefinition
+com.r3corda.node.services.wallet.CashBalanceAsMetricsObserver
-Subset of cash-like contract state, containing the issuance definition. If these definitions match for two
-contracts states, those states can be aggregated.
+This class observes the wallet and reflect current cash balances as exposed metrics in the monitoring service.
@@ -229,6 +246,12 @@ contracts states, those states can be aggregated.
+java.time.Clock (extensions in package com.r3corda.node.utilities)
+
+
+
+
+
com.r3corda.core.contracts.Command
Command data/content plus pubkey pair: the signature is stored at the end of the serialized bytes
@@ -249,13 +272,6 @@ contracts states, those states can be aggregated.
-com.r3corda.contracts.cash.CommonCashState
-
-Common elements of cash contract states.
-
-
-
-
com.r3corda.node.servlets.Config
Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work
@@ -308,15 +324,6 @@ updated, instead, any changes must generate a new successor state.
-com.r3corda.contracts.CrowdFund
-
-This is a basic crowd funding contract. It allows a party to create a funding opportunity, then for others to
-pledge during the funding period , and then for the party to either accept the funding (if the target has been reached)
-return the funds to the pledge-makers (if the target has not been reached).
-
-
-
-
com.r3corda.core.math.CubicSplineInterpolator
Interpolates values between the given data points using a SplineFunction .
@@ -416,7 +423,7 @@ building partially signed transactions.
-com.r3corda.contracts.DummyContract
+com.r3corda.core.contracts.DummyContract
@@ -496,6 +503,13 @@ attachments are saved to local storage automatically.
+com.r3corda.node.utilities.FiberBox
+
+Modelled on ThreadBox , but with support for waiting that is compatible with Quasar Fiber s and MutableClock s
+
+
+
+
com.r3corda.core.contracts.Fix
A Fix represents a named interest rate, on a given day, for a given duration. It can be embedded in a tx.
@@ -555,6 +569,31 @@ that would divide into (eg annually = 1, semiannual = 2, monthly = 12 etc).
+com.r3corda.contracts.cash.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
+be merged or split as needed where the issuer is the same. For instance, dollars issued by the Fed are fungible and
+countable (in cents), barrels of West Texas crude are fungible and countable (oil from two small containers
+can be poured into one large container), shares of the same class in a specific company are fungible and
+countable, and so on.
+
+
+
+
+com.r3corda.contracts.cash.FungibleAssetState
+
+Common elements of cash contract states.
+
+
+
+
+com.r3corda.demos.IRSDemoRole
+
+
+
+
+
com.r3corda.node.internal.testing.IRSSimulation
A simulation in which banks execute interest rate swaps with each other, including the fixing events.
@@ -617,7 +656,7 @@ testing).
-com.r3corda.contracts.InsufficientBalanceException
+com.r3corda.contracts.cash.InsufficientBalanceException
@@ -691,7 +730,7 @@ from which the state object is initialised.
-kotlin.collections.Iterable (extensions in package com.r3corda.contracts)
+kotlin.collections.Iterable (extensions in package com.r3corda.contracts.cash)
@@ -864,6 +903,12 @@ Components that do IO are either swapped out for mocks, or pointed to a
+com.r3corda.core.node.services.testing.MockTransactionStorage
+
+
+
+
+
com.r3corda.node.services.api.MonitoringService
Provides access to various metrics and ways to notify monitoring services of things, for sysadmin purposes.
@@ -872,6 +917,14 @@ This is not an interface because it is too lightweight to bother mocking out.
+com.r3corda.node.utilities.MutableClock
+
+An abstract class with helper methods for a type of Clock that might have its concept of "now"
+adjusted externally.
+
+
+
+
com.r3corda.core.contracts.NamedByHash
Implemented by anything that can be named by a secure hash value (e.g. transactions, attachments).
@@ -905,6 +958,12 @@ replace each other based on a serial number present in the change.
+com.r3corda.core.serialization.NoReferencesSerializer
+
+
+
+
+
com.r3corda.node.internal.Node
A Node manages a standalone server that takes part in the P2P network. It creates the services found in ServiceHub ,
@@ -920,6 +979,13 @@ loads important data off disk and starts listening for connections.
+com.r3corda.node.serialization.NodeClock
+
+A Clock that tokenizes itself when serialized, and delegates to an underlying Clock implementation.
+
+
+
+
com.r3corda.node.services.config.NodeConfiguration
@@ -969,6 +1035,14 @@ states relevant to us into a database and once such a wallet is implemented, thi
+com.r3corda.core.utilities.NonEmptySet
+
+A set which is constrained to ensure it can never be empty. An initial value must be provided at
+construction, and attempting to remove the last element will cause an IllegalStateException.
+
+
+
+
com.r3corda.protocols.NotaryError
@@ -983,8 +1057,6 @@ states relevant to us into a database and once such a wallet is implemented, thi
com.r3corda.protocols.NotaryProtocol
-A protocol to be used for obtaining a signature from a NotaryService ascertaining the transaction
-timestamp is correct and none of its inputs have been used in another completed transaction
@@ -1060,6 +1132,13 @@ ledger. The reference is intended to be encrypted so its meaningless to anyone o
+com.r3corda.node.services.persistence.PerFileTransactionStorage
+
+File-based transaction storage, storing transactions per file.
+
+
+
+
com.r3corda.contracts.PercentageRatioUnit
A class to reprecent a percentage in an unambiguous way.
@@ -1204,6 +1283,13 @@ e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value
+com.r3corda.core.serialization.ReferencesAwareJavaSerializer
+
+Improvement to the builtin JavaSerializer by honouring the Kryo.getReferences setting.
+
+
+
+
com.r3corda.node.services.api.RegulatorService
Placeholder interface for regulator services.
@@ -1233,6 +1319,14 @@ all the transactions have been successfully verified and inserted into the local
+com.r3corda.core.RetryableException
+
+This represents a transient exception or condition that might no longer be thrown if the operation is re-run or called
+again.
+
+
+
+
com.r3corda.demos.Role
@@ -1252,14 +1346,6 @@ all the transactions have been successfully verified and inserted into the local
-com.r3corda.core.serialization.SerializeAsStringToken
-
-A base class for implementing large objects / components / services that need to serialize themselves to a string token
-to indicate which instance the token is a serialized form of.
-
-
-
-
com.r3corda.core.serialization.SerializeAsToken
This interface should be implemented by classes that want to substitute a token representation of themselves if
@@ -1268,6 +1354,13 @@ they are serialized because they have a lot of internal state that does not seri
+com.r3corda.core.serialization.SerializeAsTokenContext
+
+A context for mapping SerializationTokens to/from SerializeAsTokens.
+
+
+
+
com.r3corda.core.serialization.SerializeAsTokenSerializer
A Kryo serializer for SerializeAsToken implementations.
@@ -1330,6 +1423,13 @@ contained within.
+com.r3corda.node.services.transactions.SimpleNotaryService
+
+A simple Notary service that does not perform transaction validation
+
+
+
+
com.r3corda.node.internal.testing.Simulation
Base class for network simulations that are based on the unit test / mock environment.
@@ -1344,6 +1444,22 @@ contained within.
+com.r3corda.core.serialization.SingletonSerializationToken
+
+A class representing a SerializationToken for some object that is not serializable but can be looked up
+(when deserialized) via just the class name.
+
+
+
+
+com.r3corda.core.serialization.SingletonSerializeAsToken
+
+A base class for implementing large objects / components / services that need to serialize themselves to a string token
+to indicate which instance the token is a serialized form of.
+
+
+
+
com.r3corda.core.math.SplineFunction
A spline is function piecewise-defined by polynomial functions.
@@ -1367,7 +1483,7 @@ Points at which polynomial pieces connect are known as knots .
com.r3corda.node.services.statemachine.StateMachineManager
-A StateMachineManager is responsible for coordination and persistence of multiple ProtocolStateMachine objects.
+
A StateMachineManager is responsible for coordination and persistence of multiple ProtocolStateMachine objects.
Each such object represents an instantiation of a (two-party) protocol that has reached a particular point.
@@ -1428,6 +1544,13 @@ anything like that, this interface is only big enough to support the prototyping
+com.r3corda.node.internal.testing.TestClock
+
+A Clock that can have the time advanced for use in testing
+
+
+
+
com.r3corda.core.testing.TestUtils
@@ -1444,7 +1567,7 @@ way that ensures itll be released if theres an exception.
-com.r3corda.node.services.transactions.TimestampChecker
+com.r3corda.core.node.services.TimestampChecker
Checks if the given timestamp falls within the allowed tolerance interval
@@ -1551,6 +1674,13 @@ this subgraph does not contain conflicts and is accepted by the involved contrac
+com.r3corda.core.node.services.TransactionStorage
+
+Thread-safe storage of transactions.
+
+
+
+
com.r3corda.core.contracts.TransactionVerificationException
@@ -1625,6 +1755,23 @@ intended as the way things will necessarily be done longer term
+com.r3corda.protocols.ValidatingNotaryProtocol
+
+A notary commit protocol that makes sure a given transaction is valid before committing it. This does mean that the calling
+party has to reveal the whole transaction history; however, we avoid complex conflict resolution logic where a party
+has its input states "blocked" by a transaction from another party, and needs to establish whether that transaction was
+indeed valid
+
+
+
+
+com.r3corda.node.services.transactions.ValidatingNotaryService
+
+A Notary service that validates the transaction chain of he submitted transaction before committing it
+
+
+
+
com.r3corda.core.node.services.Wallet
A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance,
@@ -1635,6 +1782,12 @@ about new transactions from our peers and generate new transactions that consume
+com.r3corda.node.internal.testing.WalletFiller
+
+
+
+
+
com.r3corda.node.services.wallet.WalletImpl
A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance,
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/-asset-issuance-definition/deposit.html
similarity index 61%
rename from docs/build/html/api/com.r3corda.contracts.cash/-cash-issuance-definition/deposit.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/deposit.html
index d7fc002575..a301089776 100644
--- a/docs/build/html/api/com.r3corda.contracts.cash/-cash-issuance-definition/deposit.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/deposit.html
@@ -1,15 +1,15 @@
-CashIssuanceDefinition.deposit -
+AssetIssuanceDefinition.deposit -
-com.r3corda.contracts.cash / CashIssuanceDefinition / deposit
+com.r3corda.contracts.cash / AssetIssuanceDefinition / deposit
deposit
-
+
abstract val deposit : PartyAndReference
-Where the underlying currency backing this ledger entry can be found (propagated)
+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
new file mode 100644
index 0000000000..8c90481cca
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/index.html
@@ -0,0 +1,45 @@
+
+
+AssetIssuanceDefinition -
+
+
+
+com.r3corda.contracts.cash / AssetIssuanceDefinition
+
+AssetIssuanceDefinition
+interface AssetIssuanceDefinition < T > : IssuanceDefinition
+Subset of cash-like contract state, containing the issuance definition. If these definitions match for two
+contracts states, those states can be aggregated.
+
+
+Properties
+
+
+
+
+deposit
+
+abstract val deposit : PartyAndReference
Where the underlying asset backing this ledger entry can be found (propagated)
+
+
+
+
+token
+
+abstract val token : T
+
+
+
+Inheritors
+
+
+
+
+IssuanceDefinition
+
+data class IssuanceDefinition < T > : AssetIssuanceDefinition < T >
+
+
+
+
+
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
new file mode 100644
index 0000000000..1f0863afa4
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-asset-issuance-definition/token.html
@@ -0,0 +1,15 @@
+
+
+AssetIssuanceDefinition.token -
+
+
+
+com.r3corda.contracts.cash / AssetIssuanceDefinition / token
+
+token
+
+abstract val token : T
+
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts/-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
similarity index 69%
rename from docs/build/html/api/com.r3corda.contracts/-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-c-a-s-h_-p-r-o-g-r-a-m_-i-d.html
index c74be03b53..45544c9893 100644
--- a/docs/build/html/api/com.r3corda.contracts/-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_PROGRAM_ID
+com.r3corda.contracts.cash / CASH_PROGRAM_ID
CASH_PROGRAM_ID
-
+
val CASH_PROGRAM_ID : Cash
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-cash-issuance-definition/currency.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash-issuance-definition/currency.html
deleted file mode 100644
index 208086de48..0000000000
--- a/docs/build/html/api/com.r3corda.contracts.cash/-cash-issuance-definition/currency.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CashIssuanceDefinition.currency -
-
-
-
-com.r3corda.contracts.cash / CashIssuanceDefinition / currency
-
-currency
-
-abstract val currency : Currency
-
-
-
-
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
deleted file mode 100644
index b0f905241d..0000000000
--- a/docs/build/html/api/com.r3corda.contracts.cash/-cash-issuance-definition/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-CashIssuanceDefinition -
-
-
-
-com.r3corda.contracts.cash / CashIssuanceDefinition
-
-CashIssuanceDefinition
-interface CashIssuanceDefinition : IssuanceDefinition
-Subset of cash-like contract state, containing the issuance definition. If these definitions match for two
-contracts states, those states can be aggregated.
-
-
-Properties
-
-Inheritors
-
-
-
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
new file mode 100644
index 0000000000..3101bfed2a
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/-init-.html
@@ -0,0 +1,16 @@
+
+
+Cash.Commands.Exit. -
+
+
+
+com.r3corda.contracts.cash / Cash / Commands / Exit / <init>
+
+<init>
+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
new file mode 100644
index 0000000000..5178e04d6e
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/amount.html
@@ -0,0 +1,16 @@
+
+
+Cash.Commands.Exit.amount -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..4d7475222e
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-exit/index.html
@@ -0,0 +1,40 @@
+
+
+Cash.Commands.Exit -
+
+
+
+com.r3corda.contracts.cash / Cash / Commands / Exit
+
+Exit
+data class Exit : Commands , Exit < Currency >
+A command stating that money has been withdrawn from the shared ledger and is now accounted for
+in some other way.
+
+
+Constructors
+
+
+
+
+<init>
+
+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.
+
+
+
+
+Properties
+
+
+
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
new file mode 100644
index 0000000000..d14e6d85de
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/-init-.html
@@ -0,0 +1,16 @@
+
+
+Cash.Commands.Issue. -
+
+
+
+com.r3corda.contracts.cash / Cash / Commands / Issue / <init>
+
+<init>
+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/-commands/-issue/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/index.html
similarity index 55%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/index.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/index.html
index 704eaceb49..5fb028818d 100644
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/index.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/index.html
@@ -4,10 +4,10 @@
-com.r3corda.contracts / Cash / Commands / Issue
+com.r3corda.contracts.cash / Cash / Commands / Issue
Issue
-data class Issue : Commands
+data class Issue : Issue
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.
@@ -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
new file mode 100644
index 0000000000..e9551f169b
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-issue/nonce.html
@@ -0,0 +1,16 @@
+
+
+Cash.Commands.Issue.nonce -
+
+
+
+ com.r3corda.contracts.cash / Cash / Commands / Issue / nonce
+
+nonce
+
+val nonce : Long
+Overrides Issue.nonce
+
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-move/-init-.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-move/-init-.html
similarity index 54%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-commands/-move/-init-.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-move/-init-.html
index db75e252fd..36c30ff18c 100644
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-move/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-move/-init-.html
@@ -4,7 +4,7 @@
-com.r3corda.contracts / Cash / Commands / Move / <init>
+com.r3corda.contracts.cash / Cash / Commands / Move / <init>
<init>
Move ( )
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-move/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-move/index.html
similarity index 83%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-commands/-move/index.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-move/index.html
index 067afe7ea5..ec45671930 100644
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-move/index.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/-move/index.html
@@ -4,10 +4,10 @@
-com.r3corda.contracts / Cash / Commands / Move
+com.r3corda.contracts.cash / Cash / Commands / Move
Move
-class Move : TypeOnlyCommandData , Commands
+class Move : TypeOnlyCommandData , Move
Constructors
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/index.html
similarity index 53%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-commands/index.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/index.html
index 228ef10105..78ee4da649 100644
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/index.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-commands/index.html
@@ -4,7 +4,7 @@
-com.r3corda.contracts / Cash / Commands
+com.r3corda.contracts.cash / Cash / Commands
Commands
interface Commands : CommandData
@@ -17,7 +17,7 @@
Exit
-data class Exit : Commands
A command stating that money has been withdrawn from the shared ledger and is now accounted for
+data class Exit : Commands , Exit < Currency >
A command stating that money has been withdrawn from the shared ledger and is now accounted for
in some other way.
@@ -25,7 +25,7 @@ in some other way.
Issue
-data class Issue : Commands
Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction
+data class Issue : Issue
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.
@@ -33,7 +33,7 @@ has a unique ID even when there are no inputs.
Move
-class Move : TypeOnlyCommandData , Commands
+class Move : TypeOnlyCommandData , Move
@@ -44,24 +44,10 @@ has a unique ID even when there are no inputs.
Exit
-data class Exit : Commands
A command stating that money has been withdrawn from the shared ledger and is now accounted for
+data class Exit : Commands , Exit < Currency >
A command stating that money has been withdrawn from the shared ledger and is now accounted for
in some other way.
-
-
-Issue
-
-data class Issue : Commands
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.
-
-
-
-
-Move
-
-class Move : TypeOnlyCommandData , Commands
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-init-.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-init-.html
similarity index 88%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-init-.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-init-.html
index bba2e0b9d4..e314ee9d88 100644
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-init-.html
@@ -4,7 +4,7 @@
-com.r3corda.contracts / Cash / <init>
+com.r3corda.contracts.cash / Cash / <init>
<init>
Cash ( )
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
new file mode 100644
index 0000000000..90b93a9810
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/-init-.html
@@ -0,0 +1,14 @@
+
+
+Cash.IssuanceDefinition. -
+
+
+
+com.r3corda.contracts.cash / Cash / IssuanceDefinition / <init>
+
+<init>
+IssuanceDefinition ( deposit : PartyAndReference , token : T )
+
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/deposit.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/deposit.html
similarity index 56%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/deposit.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/deposit.html
index 3bd2bdff62..a7af136488 100644
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/deposit.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/deposit.html
@@ -4,12 +4,12 @@
-com.r3corda.contracts / Cash / IssuanceDefinition / deposit
+com.r3corda.contracts.cash / Cash / IssuanceDefinition / deposit
deposit
-
+
val deposit : PartyAndReference
-Overrides CashIssuanceDefinition.deposit
+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
new file mode 100644
index 0000000000..92ba11b85f
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/index.html
@@ -0,0 +1,43 @@
+
+
+Cash.IssuanceDefinition -
+
+
+
+com.r3corda.contracts.cash / Cash / IssuanceDefinition
+
+IssuanceDefinition
+data class IssuanceDefinition < T > : AssetIssuanceDefinition < T >
+
+
+Constructors
+
+Properties
+
+
+
+
+deposit
+
+val deposit : PartyAndReference
Where the underlying currency backing this ledger entry can be found (propagated)
+
+
+
+
+token
+
+val 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
new file mode 100644
index 0000000000..f2198b84d9
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-issuance-definition/token.html
@@ -0,0 +1,16 @@
+
+
+Cash.IssuanceDefinition.token -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..051dafea4c
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/-init-.html
@@ -0,0 +1,15 @@
+
+
+Cash.State. -
+
+
+
+com.r3corda.contracts.cash / Cash / State / <init>
+
+<init>
+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
new file mode 100644
index 0000000000..875ded550f
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/amount.html
@@ -0,0 +1,16 @@
+
+
+Cash.State.amount -
+
+
+
+com.r3corda.contracts.cash / Cash / State / amount
+
+amount
+
+val amount : Amount < Currency >
+Overrides State.amount
+
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-state/contract.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/contract.html
similarity index 67%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-state/contract.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/contract.html
index e46c978e8c..2d4374c009 100644
--- a/docs/build/html/api/com.r3corda.contracts/-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 / State / contract
+com.r3corda.contracts.cash / 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/-state/deposit.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/deposit.html
similarity index 58%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-state/deposit.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/deposit.html
index 300e8bd15d..098ecb1ab7 100644
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-state/deposit.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/deposit.html
@@ -4,12 +4,12 @@
-com.r3corda.contracts / Cash / State / deposit
+com.r3corda.contracts.cash / Cash / State / deposit
deposit
-
+
val deposit : PartyAndReference
-Overrides CommonCashState.deposit
+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
new file mode 100644
index 0000000000..ce72e23d98
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/index.html
@@ -0,0 +1,107 @@
+
+
+Cash.State -
+
+
+
+com.r3corda.contracts.cash / Cash / State
+
+State
+data class State : State < Currency >
+A state representing a cash claim against some party
+
+
+Constructors
+
+Properties
+
+Functions
+
+
+
+
+toString
+
+fun toString ( ) : String
+
+
+
+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
+
+
+
+
+Extension Functions
+
+
+
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
new file mode 100644
index 0000000000..e11f23a197
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/issuance-def.html
@@ -0,0 +1,16 @@
+
+
+Cash.State.issuanceDef -
+
+
+
+com.r3corda.contracts.cash / Cash / State / issuanceDef
+
+issuanceDef
+
+val issuanceDef : IssuanceDefinition < Currency >
+Overrides FungibleAssetState.issuanceDef
+
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/notary.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/notary.html
similarity index 60%
rename from docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/notary.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/notary.html
index c5b588e676..9dbf7ee9ea 100644
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/notary.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/notary.html
@@ -1,15 +1,15 @@
-CrowdFund.State.notary -
+Cash.State.notary -
-com.r3corda.contracts / CrowdFund / State / notary
+com.r3corda.contracts.cash / Cash / State / notary
notary
-
+
val notary : Party
-Overrides ContractState.notary
+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/-state/owner.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/owner.html
similarity index 58%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-state/owner.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/owner.html
index 00d166170f..156afc21eb 100644
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-state/owner.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/owner.html
@@ -4,12 +4,12 @@
-com.r3corda.contracts / Cash / State / owner
+com.r3corda.contracts.cash / Cash / State / owner
owner
-
+
val owner : PublicKey
-Overrides OwnableState.owner
+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/-state/to-string.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/to-string.html
similarity index 60%
rename from docs/build/html/api/com.r3corda.contracts/-cash/-state/to-string.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/to-string.html
index 0c88697f90..1362fb6a6f 100644
--- a/docs/build/html/api/com.r3corda.contracts/-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 / State / toString
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..acb1a8c71c
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/-state/with-new-owner.html
@@ -0,0 +1,17 @@
+
+
+Cash.State.withNewOwner -
+
+
+
+com.r3corda.contracts.cash / Cash / State / withNewOwner
+
+withNewOwner
+
+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
new file mode 100644
index 0000000000..bbef2a8e04
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-issue.html
@@ -0,0 +1,21 @@
+
+
+Cash.generateIssue -
+
+
+
+com.r3corda.contracts.cash / Cash / generateIssue
+
+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.
+
+
+
+
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
new file mode 100644
index 0000000000..096c6f0bca
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/generate-spend.html
@@ -0,0 +1,22 @@
+
+
+Cash.generateSpend -
+
+
+
+com.r3corda.contracts.cash / Cash / generateSpend
+
+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.
+Note that the wallet list is not updated: its up to you to do that.
+Parameters
+
+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 youre trying to pay has expectations
+about which type of cash claims they are willing to accept.
+
+
+
+
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
new file mode 100644
index 0000000000..5080176564
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-cash/index.html
@@ -0,0 +1,109 @@
+
+
+Cash -
+
+
+
+com.r3corda.contracts.cash / Cash
+
+Cash
+class Cash : FungibleAsset < Currency >
+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
+(a blend of issuer+depositRef) and you couldnt merge outputs of two colours together, but you COULD put them in
+the same transaction.
+The goal of this design is to ensure that money can be withdrawn from the ledger easily: if you receive some money
+via this contract, you always know where to go in order to extract it from the R3 ledger, no matter how many hands
+it has passed through in the intervening time.
+At the same time, other contracts that just want money and dont care much who is currently holding it in their
+vaults can ignore the issuer/depositRefs and just examine the amount fields.
+
+
+
+
+Types
+
+Constructors
+
+
+
+
+<init>
+
+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
+(a blend of issuer+depositRef) and you couldnt merge outputs of two colours together, but you COULD put them in
+the same transaction.
+
+
+
+
+Properties
+
+Functions
+
+
+
+
+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.
+
+
+
+
+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.
+Note that the wallet list is not updated: its up to you to do that.
+
+
+
+
+Inherited Functions
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/legal-contract-reference.html b/docs/build/html/api/com.r3corda.contracts.cash/-cash/legal-contract-reference.html
similarity index 83%
rename from docs/build/html/api/com.r3corda.contracts/-cash/legal-contract-reference.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-cash/legal-contract-reference.html
index 4683ecd91f..d6776b7a41 100644
--- a/docs/build/html/api/com.r3corda.contracts/-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 / legalContractReference
+com.r3corda.contracts.cash / Cash / legalContractReference
legalContractReference
-
+
val legalContractReference : SecureHash
Overrides Contract.legalContractReference
TODO:
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/amount.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/amount.html
similarity index 51%
rename from docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/amount.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/amount.html
index fd365edc69..076438a8cc 100644
--- a/docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/amount.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/amount.html
@@ -1,14 +1,14 @@
-CommonCashState.amount -
+FungibleAssetState.amount -
-com.r3corda.contracts.cash / CommonCashState / amount
+com.r3corda.contracts.cash / FungibleAssetState / amount
amount
-
-abstract val amount : Amount
+
+abstract val amount : Amount < T >
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/deposit.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/deposit.html
similarity index 73%
rename from docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/deposit.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/deposit.html
index 6c4fde1d4b..299676e75a 100644
--- a/docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/deposit.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/deposit.html
@@ -1,13 +1,13 @@
-CommonCashState.deposit -
+FungibleAssetState.deposit -
-com.r3corda.contracts.cash / CommonCashState / deposit
+com.r3corda.contracts.cash / 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/-common-cash-state/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/index.html
similarity index 73%
rename from docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/index.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/index.html
index da562599ad..1cdec1643e 100644
--- a/docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/index.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/index.html
@@ -1,13 +1,13 @@
-CommonCashState -
+FungibleAssetState -
-com.r3corda.contracts.cash / CommonCashState
+com.r3corda.contracts.cash / FungibleAssetState
-CommonCashState
-interface CommonCashState < I : CashIssuanceDefinition > : OwnableState
+FungibleAssetState
+interface FungibleAssetState < T , I : AssetIssuanceDefinition < T > > : OwnableState
Common elements of cash contract states.
@@ -18,7 +18,7 @@
amount
-abstract val amount : Amount
+abstract val amount : Amount < T >
@@ -82,9 +82,9 @@
-State
+State
-data class State : CommonCashState < IssuanceDefinition >
A state representing a cash claim against some party
+interface State < T > : FungibleAssetState < T , AssetIssuanceDefinition < T > >
A state representing a claim against some party
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/issuance-def.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/issuance-def.html
similarity index 64%
rename from docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/issuance-def.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/issuance-def.html
index 546425e001..8fcf9f7a8b 100644
--- a/docs/build/html/api/com.r3corda.contracts.cash/-common-cash-state/issuance-def.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset-state/issuance-def.html
@@ -1,13 +1,13 @@
-CommonCashState.issuanceDef -
+FungibleAssetState.issuanceDef -
-com.r3corda.contracts.cash / CommonCashState / issuanceDef
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..481952eaba
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/amount.html
@@ -0,0 +1,15 @@
+
+
+FungibleAsset.Commands.Exit.amount -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..cbf15d9eba
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-exit/index.html
@@ -0,0 +1,40 @@
+
+
+FungibleAsset.Commands.Exit -
+
+
+
+com.r3corda.contracts.cash / FungibleAsset / Commands / Exit
+
+Exit
+interface Exit < T > : Commands
+A command stating that money has been withdrawn from the shared ledger and is now accounted for
+in some other way.
+
+
+Properties
+
+Inheritors
+
+
+
+
+Exit
+
+data class Exit : Commands , Exit < 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/-fungible-asset/-commands/-issue/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/index.html
new file mode 100644
index 0000000000..a044b1f185
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/index.html
@@ -0,0 +1,40 @@
+
+
+FungibleAsset.Commands.Issue -
+
+
+
+com.r3corda.contracts.cash / FungibleAsset / Commands / Issue
+
+Issue
+interface Issue : Commands
+Allows new asset states to be issued into existence: the nonce ("number used once") ensures the transaction
+has a unique ID even when there are no inputs.
+
+
+Properties
+
+
+
+
+nonce
+
+abstract val nonce : Long
+
+
+
+Inheritors
+
+
+
+
+Issue
+
+data class Issue : Issue
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/-fungible-asset/-commands/-issue/nonce.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/nonce.html
new file mode 100644
index 0000000000..e3cdabc6f6
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-issue/nonce.html
@@ -0,0 +1,15 @@
+
+
+FungibleAsset.Commands.Issue.nonce -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..89fda720ff
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/-move.html
@@ -0,0 +1,25 @@
+
+
+FungibleAsset.Commands.Move -
+
+
+
+com.r3corda.contracts.cash / FungibleAsset / Commands / Move
+
+Move
+interface Move : Commands
+
+
+Inheritors
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/index.html
new file mode 100644
index 0000000000..cdb7833551
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-commands/index.html
@@ -0,0 +1,68 @@
+
+
+FungibleAsset.Commands -
+
+
+
+com.r3corda.contracts.cash / FungibleAsset / Commands
+
+Commands
+interface Commands : CommandData
+
+
+Types
+
+
+
+
+Exit
+
+interface Exit < T > : Commands
A command stating that money has been withdrawn from the shared ledger and is now accounted for
+in some other way.
+
+
+
+
+Issue
+
+interface Issue : Commands
Allows new asset states to be issued into existence: the nonce ("number used once") ensures the transaction
+has a unique ID even when there are no inputs.
+
+
+
+
+Move
+
+interface Move : Commands
+
+
+
+Inheritors
+
+
+
+
+Exit
+
+interface Exit < T > : Commands
A command stating that money has been withdrawn from the shared ledger and is now accounted for
+in some other way.
+
+
+
+
+Issue
+
+interface Issue : Commands
Allows new asset states to be issued into existence: the nonce ("number used once") ensures the transaction
+has a unique ID even when there are no inputs.
+
+
+
+
+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
new file mode 100644
index 0000000000..bf8d4a2cca
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-init-.html
@@ -0,0 +1,27 @@
+
+
+FungibleAsset. -
+
+
+
+com.r3corda.contracts.cash / FungibleAsset / <init>
+
+<init>
+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
+be merged or split as needed where the issuer is the same. For instance, dollars issued by the Fed are fungible and
+countable (in cents), barrels of West Texas crude are fungible and countable (oil from two small containers
+can be poured into one large container), shares of the same class in a specific company are fungible and
+countable, and so on.
+See Cash for an example subclass that implements currency.
+
+
+Parameters
+
+T
- a type that represents the asset in question. This should describe the basic type of the asset
+(GBP, USD, oil, shares in company , etc.) and any additional metadata (issuer, grade, class, etc.)
+
+
+
+
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
new file mode 100644
index 0000000000..9b942f2354
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/amount.html
@@ -0,0 +1,16 @@
+
+
+FungibleAsset.State.amount -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..7e8119cf05
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/deposit.html
@@ -0,0 +1,17 @@
+
+
+FungibleAsset.State.deposit -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..155a9b194c
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/index.html
@@ -0,0 +1,70 @@
+
+
+FungibleAsset.State -
+
+
+
+com.r3corda.contracts.cash / FungibleAsset / State
+
+State
+interface State < T > : FungibleAssetState < T , AssetIssuanceDefinition < T > >
+A state representing a claim against some party
+
+
+Properties
+
+
+
+
+amount
+
+abstract val amount : Amount < T >
+
+
+
+deposit
+
+abstract val deposit : PartyAndReference
Where the underlying asset backing this ledger entry can be found (propagated)
+
+
+
+
+notary
+
+abstract val notary : Party
Identity of the notary that ensures this state is not used as an input to a transaction more than once
+
+
+
+
+owner
+
+abstract val owner : PublicKey
There must be a MoveCommand signed by this key to claim the amount
+
+
+
+
+Inherited Properties
+
+
+
+
+issuanceDef
+
+abstract val issuanceDef : I
+
+
+
+Inheritors
+
+
+
+
+State
+
+data class State : State < Currency >
A state representing a cash claim against some party
+
+
+
+
+
+
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
new file mode 100644
index 0000000000..b4feb6c780
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/notary.html
@@ -0,0 +1,17 @@
+
+
+FungibleAsset.State.notary -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..015df89228
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/-state/owner.html
@@ -0,0 +1,17 @@
+
+
+FungibleAsset.State.owner -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..ec0662e349
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/index.html
@@ -0,0 +1,102 @@
+
+
+FungibleAsset -
+
+
+
+com.r3corda.contracts.cash / FungibleAsset
+
+FungibleAsset
+abstract class FungibleAsset < T > : Contract
+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
+be merged or split as needed where the issuer is the same. For instance, dollars issued by the Fed are fungible and
+countable (in cents), barrels of West Texas crude are fungible and countable (oil from two small containers
+can be poured into one large container), shares of the same class in a specific company are fungible and
+countable, and so on.
+See Cash for an example subclass that implements currency.
+
+
+Parameters
+
+T
- a type that represents the asset in question. This should describe the basic type of the asset
+(GBP, USD, oil, shares in company , etc.) and any additional metadata (issuer, grade, class, etc.)
+
+
+Types
+
+Constructors
+
+
+
+
+<init>
+
+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
+be merged or split as needed where the issuer is the same. For instance, dollars issued by the Fed are fungible and
+countable (in cents), barrels of West Texas crude are fungible and countable (oil from two small containers
+can be poured into one large container), shares of the same class in a specific company are fungible and
+countable, and so on.
+
+
+
+
+Inherited Properties
+
+
+
+
+legalContractReference
+
+abstract val legalContractReference : SecureHash
Unparsed reference to the natural language contract that this code is supposed to express (usually a hash of
+the contracts contents).
+
+
+
+
+Functions
+
+Inheritors
+
+
+
+
+Cash
+
+class Cash : FungibleAsset < Currency >
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
+(a blend of issuer+depositRef) and you couldnt merge outputs of two colours together, but you COULD put them in
+the same transaction.
+
+
+
+
+
+
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
new file mode 100644
index 0000000000..8d9a996009
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-fungible-asset/verify.html
@@ -0,0 +1,17 @@
+
+
+FungibleAsset.verify -
+
+
+
+com.r3corda.contracts.cash / FungibleAsset / verify
+
+verify
+
+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
new file mode 100644
index 0000000000..bc075fdf5e
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/-init-.html
@@ -0,0 +1,14 @@
+
+
+InsufficientBalanceException. -
+
+
+
+com.r3corda.contracts.cash / InsufficientBalanceException / <init>
+
+<init>
+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
new file mode 100644
index 0000000000..d24c6f7020
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/amount-missing.html
@@ -0,0 +1,15 @@
+
+
+InsufficientBalanceException.amountMissing -
+
+
+
+com.r3corda.contracts.cash / InsufficientBalanceException / amountMissing
+
+amountMissing
+
+val amountMissing : Amount < * >
+
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/index.html b/docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/index.html
similarity index 60%
rename from docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/index.html
rename to docs/build/html/api/com.r3corda.contracts.cash/-insufficient-balance-exception/index.html
index c8d819ed5c..d306f5cc82 100644
--- a/docs/build/html/api/com.r3corda.contracts/-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 / InsufficientBalanceException
+com.r3corda.contracts.cash / InsufficientBalanceException
InsufficientBalanceException
class InsufficientBalanceException : Exception
@@ -17,7 +17,7 @@
<init>
-InsufficientBalanceException ( amountMissing : Amount )
+InsufficientBalanceException ( amountMissing : Amount < * > )
@@ -28,7 +28,7 @@
amountMissing
-val amountMissing : Amount
+val 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 83dd8a9c07..80832fa684 100644
--- a/docs/build/html/api/com.r3corda.contracts.cash/index.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/index.html
@@ -12,19 +12,74 @@
-CashIssuanceDefinition
+AssetIssuanceDefinition
-interface CashIssuanceDefinition : IssuanceDefinition
Subset of cash-like contract state, containing the issuance definition. If these definitions match for two
+interface AssetIssuanceDefinition < T > : IssuanceDefinition
Subset of cash-like contract state, containing the issuance definition. If these definitions match for two
contracts states, those states can be aggregated.
-CommonCashState
+Cash
-interface CommonCashState < I : CashIssuanceDefinition > : OwnableState
Common elements of cash contract states.
+class Cash : FungibleAsset < Currency >
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
+(a blend of issuer+depositRef) and you couldnt merge outputs of two colours together, but you COULD put them in
+the same transaction.
+
+
+FungibleAsset
+
+abstract class FungibleAsset < T > : Contract
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
+be merged or split as needed where the issuer is the same. For instance, dollars issued by the Fed are fungible and
+countable (in cents), barrels of West Texas crude are fungible and countable (oil from two small containers
+can be poured into one large container), shares of the same class in a specific company are fungible and
+countable, and so on.
+
+
+
+
+FungibleAssetState
+
+interface FungibleAssetState < T , I : AssetIssuanceDefinition < T > > : OwnableState
Common elements of cash contract states.
+
+
+
+
+Exceptions
+
+Extensions for External Classes
+
+Properties
+
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
new file mode 100644
index 0000000000..5b8ca017e8
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/index.html
@@ -0,0 +1,77 @@
+
+
+com.r3corda.contracts.cash.kotlin.collections.Iterable -
+
+
+
+com.r3corda.contracts.cash / kotlin.collections.Iterable
+
+Extensions for kotlin.collections.Iterable
+
+
+
+
+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).
+
+
+
+
+sumCashBy
+
+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).
+
+
+
+
+sumCashOrNull
+
+fun Iterable < ContractState > . sumCashOrNull ( ) : <ERROR CLASS>
Sums the cash states in the list, returning null if there are none.
+
+
+
+
+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.
+
+
+
+
+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).
+
+
+
+
+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
+if there are none, or if any of the asset states cannot be added together (i.e. are
+different tokens).
+
+
+
+
+sumFungibleOrNull
+
+fun < T > Iterable < ContractState > . sumFungibleOrNull ( ) : <ERROR CLASS>
Sums the asset states in the list, returning null if there are none.
+
+
+
+
+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.
+
+
+
+
+
+
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
new file mode 100644
index 0000000000..9065fe85d9
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-by.html
@@ -0,0 +1,18 @@
+
+
+sumCashBy -
+
+
+
+com.r3corda.contracts.cash / kotlin.collections.Iterable / sumCashBy
+
+sumCashBy
+
+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/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
similarity index 71%
rename from docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/sum-cash-or-null.html
rename to docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-null.html
index b3b933cdff..2de2afb815 100644
--- a/docs/build/html/api/com.r3corda.contracts/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 / kotlin.collections.Iterable / sumCashOrNull
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..306eae07c6
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash-or-zero.html
@@ -0,0 +1,16 @@
+
+
+sumCashOrZero -
+
+
+
+com.r3corda.contracts.cash / kotlin.collections.Iterable / sumCashOrZero
+
+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.
+
+
+
+
diff --git a/docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/sum-cash.html b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash.html
similarity index 64%
rename from docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/sum-cash.html
rename to docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash.html
index db174aca5d..91578aa2fb 100644
--- a/docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/sum-cash.html
+++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-cash.html
@@ -4,12 +4,13 @@
-com.r3corda.contracts / kotlin.collections.Iterable / sumCash
+com.r3corda.contracts.cash / 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.
+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
new file mode 100644
index 0000000000..b1d90b04d2
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-by.html
@@ -0,0 +1,18 @@
+
+
+sumFungibleBy -
+
+
+
+com.r3corda.contracts.cash / kotlin.collections.Iterable / sumFungibleBy
+
+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
+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
new file mode 100644
index 0000000000..31652ff2b0
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-null.html
@@ -0,0 +1,16 @@
+
+
+sumFungibleOrNull -
+
+
+
+com.r3corda.contracts.cash / 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
new file mode 100644
index 0000000000..2a2d710875
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible-or-zero.html
@@ -0,0 +1,16 @@
+
+
+sumFungibleOrZero -
+
+
+
+com.r3corda.contracts.cash / kotlin.collections.Iterable / sumFungibleOrZero
+
+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.
+
+
+
+
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
new file mode 100644
index 0000000000..52e6305fd7
--- /dev/null
+++ b/docs/build/html/api/com.r3corda.contracts.cash/kotlin.collections.-iterable/sum-fungible.html
@@ -0,0 +1,17 @@
+
+
+sumFungible -
+
+
+
+com.r3corda.contracts.cash / 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/-c-a-s-h.html b/docs/build/html/api/com.r3corda.contracts.testing/-c-a-s-h.html
index 2b7325af01..05953f3971 100644
--- a/docs/build/html/api/com.r3corda.contracts.testing/-c-a-s-h.html
+++ b/docs/build/html/api/com.r3corda.contracts.testing/-c-a-s-h.html
@@ -7,8 +7,8 @@
com.r3corda.contracts.testing / CASH
CASH
-
-val Amount . CASH : State
+
+val Amount < Currency > . CASH : State
diff --git a/docs/build/html/api/com.r3corda.contracts.testing/generate-state.html b/docs/build/html/api/com.r3corda.contracts.testing/generate-state.html
index c5b5432780..4d78aeb3c8 100644
--- a/docs/build/html/api/com.r3corda.contracts.testing/generate-state.html
+++ b/docs/build/html/api/com.r3corda.contracts.testing/generate-state.html
@@ -8,7 +8,7 @@
generateState
-fun generateState ( notary : Party = DUMMY_NOTARY) : State
+fun generateState ( notary : Party = DUMMY_NOTARY) : State
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 96665ade6d..0b5757ab5d 100644
--- a/docs/build/html/api/com.r3corda.contracts.testing/index.html
+++ b/docs/build/html/api/com.r3corda.contracts.testing/index.html
@@ -14,7 +14,7 @@
CASH
-val Amount . CASH : State
+val Amount < Currency > . CASH : State
@@ -31,19 +31,19 @@
generateState
-fun generateState ( notary : Party = DUMMY_NOTARY) : State
+fun generateState ( notary : Party = DUMMY_NOTARY) : State
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
infix fun State . owned by ( owner : PublicKey ) : State
infix fun <ERROR CLASS> . owned by ( new_owner : PublicKey ) : <ERROR CLASS>
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 bf6d2dca71..22c2c6ca4b 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 1c65fe7113..2f3420c01e 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/-c-r-o-w-d-f-u-n-d_-p-r-o-g-r-a-m_-i-d.html b/docs/build/html/api/com.r3corda.contracts/-c-r-o-w-d-f-u-n-d_-p-r-o-g-r-a-m_-i-d.html
deleted file mode 100644
index 3118b4a8c9..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-c-r-o-w-d-f-u-n-d_-p-r-o-g-r-a-m_-i-d.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CROWDFUND_PROGRAM_ID -
-
-
-
-com.r3corda.contracts / CROWDFUND_PROGRAM_ID
-
-CROWDFUND_PROGRAM_ID
-
-val CROWDFUND_PROGRAM_ID : CrowdFund
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/-init-.html b/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/-init-.html
deleted file mode 100644
index 59a63beea6..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/-init-.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-Cash.Commands.Exit. -
-
-
-
-com.r3corda.contracts / Cash / Commands / Exit / <init>
-
-<init>
-Exit ( amount : Amount )
-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/-commands/-exit/amount.html b/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/amount.html
deleted file mode 100644
index b7e266fd45..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/amount.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-Cash.Commands.Exit.amount -
-
-
-
-com.r3corda.contracts / Cash / Commands / Exit / amount
-
-amount
-
-val amount : Amount
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/index.html b/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/index.html
deleted file mode 100644
index 27d2f42b67..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-exit/index.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-Cash.Commands.Exit -
-
-
-
-com.r3corda.contracts / Cash / Commands / Exit
-
-Exit
-data class Exit : Commands
-A command stating that money has been withdrawn from the shared ledger and is now accounted for
-in some other way.
-
-
-Constructors
-
-
-
-
-<init>
-
-Exit ( amount : Amount )
A command stating that money has been withdrawn from the shared ledger and is now accounted for
-in some other way.
-
-
-
-
-Properties
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/-init-.html b/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/-init-.html
deleted file mode 100644
index cb3db841f8..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/-init-.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-Cash.Commands.Issue. -
-
-
-
-com.r3corda.contracts / Cash / Commands / Issue / <init>
-
-<init>
-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/-commands/-issue/nonce.html b/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/nonce.html
deleted file mode 100644
index 93d752732a..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-commands/-issue/nonce.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-Cash.Commands.Issue.nonce -
-
-
-
-com.r3corda.contracts / Cash / Commands / Issue / nonce
-
-nonce
-
-val nonce : Long
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/-init-.html b/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/-init-.html
deleted file mode 100644
index f83226ca12..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-Cash.IssuanceDefinition. -
-
-
-
-com.r3corda.contracts / Cash / IssuanceDefinition / <init>
-
-<init>
-IssuanceDefinition ( deposit : PartyAndReference , currency : Currency )
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/currency.html b/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/currency.html
deleted file mode 100644
index b82233789e..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/currency.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-Cash.IssuanceDefinition.currency -
-
-
-
-com.r3corda.contracts / Cash / IssuanceDefinition / currency
-
-currency
-
-val currency : Currency
-Overrides CashIssuanceDefinition.currency
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/index.html b/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/index.html
deleted file mode 100644
index b3fa0bb4a6..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-issuance-definition/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-Cash.IssuanceDefinition -
-
-
-
-com.r3corda.contracts / Cash / IssuanceDefinition
-
-IssuanceDefinition
-data class IssuanceDefinition : CashIssuanceDefinition
-
-
-Constructors
-
-Properties
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-state/-init-.html b/docs/build/html/api/com.r3corda.contracts/-cash/-state/-init-.html
deleted file mode 100644
index df8ccaa1b9..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-state/-init-.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-Cash.State. -
-
-
-
-com.r3corda.contracts / Cash / State / <init>
-
-<init>
-State ( deposit : PartyAndReference , amount : Amount , owner : PublicKey , notary : Party )
-A state representing a cash claim against some party
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-state/amount.html b/docs/build/html/api/com.r3corda.contracts/-cash/-state/amount.html
deleted file mode 100644
index 253aa14d9f..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-state/amount.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-Cash.State.amount -
-
-
-
-com.r3corda.contracts / Cash / State / amount
-
-amount
-
-val amount : Amount
-Overrides CommonCashState.amount
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-state/index.html b/docs/build/html/api/com.r3corda.contracts/-cash/-state/index.html
deleted file mode 100644
index 3dfd65ea5a..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-state/index.html
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-Cash.State -
-
-
-
-com.r3corda.contracts / Cash / State
-
-State
-data class State : CommonCashState < IssuanceDefinition >
-A state representing a cash claim against some party
-
-
-Constructors
-
-Properties
-
-
-
-
-amount
-
-val amount : Amount
-
-
-
-contract
-
-val contract : Cash
Contract by which the state belongs
-
-
-
-
-deposit
-
-val deposit : PartyAndReference
Where the underlying currency backing this ledger entry can be found (propagated)
-
-
-
-
-issuanceDef
-
-val issuanceDef : IssuanceDefinition
-
-
-
-notary
-
-val notary : Party
Identity of the notary that ensures this state is not used as an input to a transaction more than once
-
-
-
-
-owner
-
-val owner : PublicKey
There must be a MoveCommand signed by this key to claim the amount
-
-
-
-
-Functions
-
-
-
-
-toString
-
-fun toString ( ) : String
-
-
-
-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
-
-
-
-
-Extension Functions
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-state/issuance-def.html b/docs/build/html/api/com.r3corda.contracts/-cash/-state/issuance-def.html
deleted file mode 100644
index 3c5a4b10d6..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-state/issuance-def.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-Cash.State.issuanceDef -
-
-
-
-com.r3corda.contracts / Cash / State / issuanceDef
-
-issuanceDef
-
-val issuanceDef : IssuanceDefinition
-Overrides CommonCashState.issuanceDef
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/-state/notary.html b/docs/build/html/api/com.r3corda.contracts/-cash/-state/notary.html
deleted file mode 100644
index 5b6f075fb8..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-state/notary.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-Cash.State.notary -
-
-
-
-com.r3corda.contracts / Cash / State / notary
-
-notary
-
-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/-state/with-new-owner.html b/docs/build/html/api/com.r3corda.contracts/-cash/-state/with-new-owner.html
deleted file mode 100644
index 3b6381cae1..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/-state/with-new-owner.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-Cash.State.withNewOwner -
-
-
-
-com.r3corda.contracts / Cash / State / withNewOwner
-
-withNewOwner
-
-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/generate-issue.html b/docs/build/html/api/com.r3corda.contracts/-cash/generate-issue.html
deleted file mode 100644
index 38b8ed09d7..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/generate-issue.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Cash.generateIssue -
-
-
-
-com.r3corda.contracts / Cash / generateIssue
-
-generateIssue
-
-fun generateIssue ( tx : TransactionBuilder , issuanceDef : CashIssuanceDefinition , 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 , 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/generate-spend.html b/docs/build/html/api/com.r3corda.contracts/-cash/generate-spend.html
deleted file mode 100644
index d780824e85..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/generate-spend.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-Cash.generateSpend -
-
-
-
-com.r3corda.contracts / Cash / generateSpend
-
-generateSpend
-
-fun generateSpend ( tx : TransactionBuilder , amount : Amount , 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
-
-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 youre trying to pay has expectations
-about which type of cash claims they are willing to accept.
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/index.html b/docs/build/html/api/com.r3corda.contracts/-cash/index.html
deleted file mode 100644
index e656971c13..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/index.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-Cash -
-
-
-
-com.r3corda.contracts / Cash
-
-Cash
-class Cash : Contract
-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
-(a blend of issuer+depositRef) and you couldnt merge outputs of two colours together, but you COULD put them in
-the same transaction.
-The goal of this design is to ensure that money can be withdrawn from the ledger easily: if you receive some money
-via this contract, you always know where to go in order to extract it from the R3 ledger, no matter how many hands
-it has passed through in the intervening time.
-At the same time, other contracts that just want money and dont care much who is currently holding it in their
-vaults can ignore the issuer/depositRefs and just examine the amount fields.
-
-
-
-
-Types
-
-Constructors
-
-
-
-
-<init>
-
-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
-(a blend of issuer+depositRef) and you couldnt merge outputs of two colours together, but you COULD put them in
-the same transaction.
-
-
-
-
-Properties
-
-Functions
-
-
-
-
-generateIssue
-
-fun generateIssue ( tx : TransactionBuilder , issuanceDef : CashIssuanceDefinition , 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 , 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 , 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.
-
-
-
-
-verify
-
-fun verify ( tx : TransactionForVerification ) : Unit
This is the function EVERYONE runs
-
-
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-cash/verify.html b/docs/build/html/api/com.r3corda.contracts/-cash/verify.html
deleted file mode 100644
index 03241d3004..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-cash/verify.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-Cash.verify -
-
-
-
-com.r3corda.contracts / Cash / verify
-
-verify
-
-fun verify ( tx : TransactionForVerification ) : Unit
-Overrides Contract.verify
-This is the function EVERYONE runs
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/-init-.html b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/-init-.html
index 175ae55fb9..5a7cb07409 100644
--- a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/-init-.html
@@ -7,7 +7,7 @@
com.r3corda.contracts / CommercialPaper / State / <init>
<init>
-State ( issuance : PartyAndReference , owner : PublicKey , faceValue : Amount , maturityDate : Instant , notary : Party )
+State ( issuance : PartyAndReference , owner : PublicKey , faceValue : Amount < Currency > , maturityDate : Instant , notary : Party )
diff --git a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/face-value.html b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/face-value.html
index 4ba714cdef..b03d33e1d5 100644
--- a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/face-value.html
+++ b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/face-value.html
@@ -8,7 +8,7 @@
faceValue
-val faceValue : Amount
+val faceValue : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/index.html b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/index.html
index e79ea7c160..8fd8f29de4 100644
--- a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/index.html
@@ -17,7 +17,7 @@
<init>
-State ( issuance : PartyAndReference , owner : PublicKey , faceValue : Amount , maturityDate : Instant , notary : Party )
+State ( issuance : PartyAndReference , owner : PublicKey , faceValue : Amount < Currency > , maturityDate : Instant , notary : Party )
@@ -35,7 +35,7 @@
faceValue
-val faceValue : Amount
+val faceValue : Amount < Currency >
@@ -78,7 +78,7 @@
withFaceValue
-fun withFaceValue ( newFaceValue : Amount ) : <ERROR CLASS>
+fun withFaceValue ( newFaceValue : Amount < Currency > ) : <ERROR CLASS>
diff --git a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/with-face-value.html b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/with-face-value.html
index f572cf9377..d56566210a 100644
--- a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/with-face-value.html
+++ b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/-state/with-face-value.html
@@ -7,8 +7,8 @@
com.r3corda.contracts / CommercialPaper / State / withFaceValue
withFaceValue
-
-fun withFaceValue ( newFaceValue : Amount ) : <ERROR CLASS>
+
+fun withFaceValue ( newFaceValue : Amount < Currency > ) : <ERROR CLASS>
diff --git a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/generate-issue.html b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/generate-issue.html
index 456091da4c..29b7f9c950 100644
--- a/docs/build/html/api/com.r3corda.contracts/-commercial-paper/generate-issue.html
+++ b/docs/build/html/api/com.r3corda.contracts/-commercial-paper/generate-issue.html
@@ -7,8 +7,8 @@
com.r3corda.contracts / CommercialPaper / generateIssue
generateIssue
-
-fun generateIssue ( issuance : PartyAndReference , faceValue : Amount , maturityDate : Instant , notary : Party ) : TransactionBuilder
+
+fun generateIssue ( issuance : PartyAndReference , faceValue : Amount < Currency > , maturityDate : Instant , notary : Party ) : TransactionBuilder
Returns a transaction that issues commercial paper, owned by the issuing parties key. Does not update
an existing transaction because you arent able to issue multiple pieces of CP in a single transaction
at the moment: this restriction is not fundamental and may be lifted later.
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 c4ec2181d6..210b83543f 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 4367166e41..953611e3f8 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
@@ -58,7 +58,7 @@ the contracts contents).
generateIssue
-fun generateIssue ( issuance : PartyAndReference , faceValue : Amount , maturityDate : Instant , notary : Party ) : TransactionBuilder
Returns a transaction that issues commercial paper, owned by the issuing parties key. Does not update
+fun generateIssue ( issuance : PartyAndReference , faceValue : Amount < Currency > , maturityDate : Instant , notary : Party ) : TransactionBuilder
Returns a transaction that issues commercial paper, owned by the issuing parties key. Does not update
an existing transaction because you arent able to issue multiple pieces of CP in a single transaction
at the moment: this restriction is not fundamental and may be lifted later.
@@ -74,7 +74,7 @@ at the moment: this restriction is not fundamental and may be lifted later.
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.
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/-init-.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/-init-.html
deleted file mode 100644
index e4bbf11618..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-CrowdFund.Campaign. -
-
-
-
-com.r3corda.contracts / CrowdFund / Campaign / <init>
-
-<init>
-Campaign ( owner : PublicKey , name : String , target : Amount , closingTime : Instant )
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/closing-time.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/closing-time.html
deleted file mode 100644
index 5c41d32445..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/closing-time.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.Campaign.closingTime -
-
-
-
-com.r3corda.contracts / CrowdFund / Campaign / closingTime
-
-closingTime
-
-val closingTime : Instant
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/index.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/index.html
deleted file mode 100644
index 25c8badfef..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/index.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-CrowdFund.Campaign -
-
-
-
-com.r3corda.contracts / CrowdFund / Campaign
-
-Campaign
-data class Campaign
-
-
-Constructors
-
-Properties
-
-Functions
-
-
-
-
-toString
-
-fun toString ( ) : String
-
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/name.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/name.html
deleted file mode 100644
index 459c621900..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/name.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.Campaign.name -
-
-
-
-com.r3corda.contracts / CrowdFund / Campaign / name
-
-name
-
-val name : String
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/owner.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/owner.html
deleted file mode 100644
index 54e049b599..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/owner.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.Campaign.owner -
-
-
-
-com.r3corda.contracts / CrowdFund / Campaign / owner
-
-owner
-
-val owner : PublicKey
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/target.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/target.html
deleted file mode 100644
index ccf79ac48f..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/target.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.Campaign.target -
-
-
-
-com.r3corda.contracts / CrowdFund / Campaign / target
-
-target
-
-val target : Amount
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/to-string.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/to-string.html
deleted file mode 100644
index 7298b6c363..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-campaign/to-string.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.Campaign.toString -
-
-
-
-com.r3corda.contracts / CrowdFund / Campaign / toString
-
-toString
-
-fun toString ( ) : String
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-close/-init-.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-close/-init-.html
deleted file mode 100644
index f42e2e44fd..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-close/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-CrowdFund.Commands.Close. -
-
-
-
-com.r3corda.contracts / CrowdFund / Commands / Close / <init>
-
-<init>
-Close ( )
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-close/index.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-close/index.html
deleted file mode 100644
index ed7d3d00aa..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-close/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-CrowdFund.Commands.Close -
-
-
-
-com.r3corda.contracts / CrowdFund / Commands / Close
-
-Close
-class Close : TypeOnlyCommandData , Commands
-
-
-Constructors
-
-
-
-
-<init>
-
-Close ( )
-
-
-
-Inherited Functions
-
-
-
-
-equals
-
-open fun equals ( other : Any ? ) : Boolean
-
-
-
-hashCode
-
-open fun hashCode ( ) : <ERROR CLASS>
-
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-pledge/-init-.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-pledge/-init-.html
deleted file mode 100644
index bceac4a4a2..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-pledge/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-CrowdFund.Commands.Pledge. -
-
-
-
-com.r3corda.contracts / CrowdFund / Commands / Pledge / <init>
-
-<init>
-Pledge ( )
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-pledge/index.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-pledge/index.html
deleted file mode 100644
index fa1b905147..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-pledge/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-CrowdFund.Commands.Pledge -
-
-
-
-com.r3corda.contracts / CrowdFund / Commands / Pledge
-
-Pledge
-class Pledge : TypeOnlyCommandData , Commands
-
-
-Constructors
-
-
-
-
-<init>
-
-Pledge ( )
-
-
-
-Inherited Functions
-
-
-
-
-equals
-
-open fun equals ( other : Any ? ) : Boolean
-
-
-
-hashCode
-
-open fun hashCode ( ) : <ERROR CLASS>
-
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-register/-init-.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-register/-init-.html
deleted file mode 100644
index f3fff133f0..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-register/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-CrowdFund.Commands.Register. -
-
-
-
-com.r3corda.contracts / CrowdFund / Commands / Register / <init>
-
-<init>
-Register ( )
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-register/index.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-register/index.html
deleted file mode 100644
index eea95ce83f..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/-register/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-CrowdFund.Commands.Register -
-
-
-
-com.r3corda.contracts / CrowdFund / Commands / Register
-
-Register
-class Register : TypeOnlyCommandData , Commands
-
-
-Constructors
-
-
-
-
-<init>
-
-Register ( )
-
-
-
-Inherited Functions
-
-
-
-
-equals
-
-open fun equals ( other : Any ? ) : Boolean
-
-
-
-hashCode
-
-open fun hashCode ( ) : <ERROR CLASS>
-
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/index.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/index.html
deleted file mode 100644
index bd369eda7f..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-commands/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-CrowdFund.Commands -
-
-
-
-com.r3corda.contracts / CrowdFund / Commands
-
-Commands
-interface Commands : CommandData
-
-
-Types
-
-Inheritors
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-init-.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-init-.html
deleted file mode 100644
index 66dc8f1c3c..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-init-.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-CrowdFund. -
-
-
-
-com.r3corda.contracts / CrowdFund / <init>
-
-<init>
-CrowdFund ( )
-This is a basic crowd funding contract. It allows a party to create a funding opportunity, then for others to
-pledge during the funding period , and then for the party to either accept the funding (if the target has been reached)
-return the funds to the pledge-makers (if the target has not been reached).
-DiscussionThis method of modelling a crowdfund is similar to how itd be done in Ethereum. The state is essentially a database
-in which transactions evolve it over time. The state transition model we are using here though means its possible
-to do it in a different approach, with some additional (not yet implemented) extensions to the model. In the UTXO
-model you can do something more like the Lighthouse application (https://www.vinumeris.com/lighthouse) in which
-the campaign data and peoples pledges are transmitted out of band, with a pledge being a partially signed
-transaction which is valid only when merged with other transactions. The pledges can then be combined by the project
-owner at the point at which sufficient amounts of money have been gathered, and this creates a valid transaction
-that claims the money.
-TODO: Prototype this second variant of crowdfunding once the core model has been sufficiently extended.
-TODO: Experiment with the use of the javax.validation API to simplify the validation logic by annotating state members.
-See JIRA bug PD-21 for further discussion and followup.
-
-
-Author
-James Carlyle
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/-init-.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/-init-.html
deleted file mode 100644
index c0811eeb5f..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-CrowdFund.Pledge. -
-
-
-
-com.r3corda.contracts / CrowdFund / Pledge / <init>
-
-<init>
-Pledge ( owner : PublicKey , amount : Amount )
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/amount.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/amount.html
deleted file mode 100644
index f5e2e85494..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/amount.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.Pledge.amount -
-
-
-
-com.r3corda.contracts / CrowdFund / Pledge / amount
-
-amount
-
-val amount : Amount
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/index.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/index.html
deleted file mode 100644
index e66b4133b5..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-CrowdFund.Pledge -
-
-
-
-com.r3corda.contracts / CrowdFund / Pledge
-
-Pledge
-data class Pledge
-
-
-Constructors
-
-Properties
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/owner.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/owner.html
deleted file mode 100644
index b231b4041b..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-pledge/owner.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.Pledge.owner -
-
-
-
-com.r3corda.contracts / CrowdFund / Pledge / owner
-
-owner
-
-val owner : PublicKey
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/-init-.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/-init-.html
deleted file mode 100644
index d4d927f9a7..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-CrowdFund.State. -
-
-
-
-com.r3corda.contracts / CrowdFund / State / <init>
-
-<init>
-State ( campaign : Campaign , notary : Party , closed : Boolean = false, pledges : List < Pledge > = ArrayList())
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/campaign.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/campaign.html
deleted file mode 100644
index 8dca21df62..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/campaign.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.State.campaign -
-
-
-
-com.r3corda.contracts / CrowdFund / State / campaign
-
-campaign
-
-val campaign : Campaign
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/closed.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/closed.html
deleted file mode 100644
index 16cac7d056..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/closed.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.State.closed -
-
-
-
-com.r3corda.contracts / CrowdFund / State / closed
-
-closed
-
-val closed : Boolean
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/contract.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/contract.html
deleted file mode 100644
index 6d9bac8256..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/contract.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-CrowdFund.State.contract -
-
-
-
-com.r3corda.contracts / CrowdFund / State / contract
-
-contract
-
-val contract : CrowdFund
-Overrides ContractState.contract
-Contract by which the state belongs
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/index.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/index.html
deleted file mode 100644
index 58fa7265d3..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-CrowdFund.State -
-
-
-
-com.r3corda.contracts / CrowdFund / State
-
-State
-data class State : ContractState
-
-
-Constructors
-
-
-
-
-<init>
-
-State ( campaign : Campaign , notary : Party , closed : Boolean = false, pledges : List < Pledge > = ArrayList())
-
-
-
-Properties
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/pledged-amount.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/pledged-amount.html
deleted file mode 100644
index 5bca5c1c4e..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/pledged-amount.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.State.pledgedAmount -
-
-
-
-com.r3corda.contracts / CrowdFund / State / pledgedAmount
-
-pledgedAmount
-
-val pledgedAmount : Amount
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/pledges.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/pledges.html
deleted file mode 100644
index ba7dec04fd..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/-state/pledges.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.State.pledges -
-
-
-
-com.r3corda.contracts / CrowdFund / State / pledges
-
-pledges
-
-val pledges : List < Pledge >
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-close.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-close.html
deleted file mode 100644
index 1e525cec0f..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-close.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-CrowdFund.generateClose -
-
-
-
-com.r3corda.contracts / CrowdFund / generateClose
-
-generateClose
-
-fun generateClose ( tx : TransactionBuilder , campaign : StateAndRef < State > , wallet : List < StateAndRef < State > > ) : Unit
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-pledge.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-pledge.html
deleted file mode 100644
index ce503f947b..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-pledge.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-CrowdFund.generatePledge -
-
-
-
-com.r3corda.contracts / CrowdFund / generatePledge
-
-generatePledge
-
-fun generatePledge ( tx : TransactionBuilder , campaign : StateAndRef < State > , subscriber : PublicKey ) : Unit
-Updates the given partial transaction with an input/output/command to fund the opportunity.
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-register.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-register.html
deleted file mode 100644
index 0fc4b1ec07..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/generate-register.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-CrowdFund.generateRegister -
-
-
-
-com.r3corda.contracts / CrowdFund / generateRegister
-
-generateRegister
-
-fun generateRegister ( owner : PartyAndReference , fundingTarget : Amount , fundingName : String , closingTime : Instant , notary : Party ) : TransactionBuilder
-Returns a transaction that registers a crowd-funding campaing, owned by the issuing institutions key. Does not update
-an existing transaction because its not possible to register multiple campaigns in a single transaction
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/index.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/index.html
deleted file mode 100644
index 54f3b4152b..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-CrowdFund -
-
-
-
-com.r3corda.contracts / CrowdFund
-
-CrowdFund
-class CrowdFund : Contract
-This is a basic crowd funding contract. It allows a party to create a funding opportunity, then for others to
-pledge during the funding period , and then for the party to either accept the funding (if the target has been reached)
-return the funds to the pledge-makers (if the target has not been reached).
-DiscussionThis method of modelling a crowdfund is similar to how itd be done in Ethereum. The state is essentially a database
-in which transactions evolve it over time. The state transition model we are using here though means its possible
-to do it in a different approach, with some additional (not yet implemented) extensions to the model. In the UTXO
-model you can do something more like the Lighthouse application (https://www.vinumeris.com/lighthouse) in which
-the campaign data and peoples pledges are transmitted out of band, with a pledge being a partially signed
-transaction which is valid only when merged with other transactions. The pledges can then be combined by the project
-owner at the point at which sufficient amounts of money have been gathered, and this creates a valid transaction
-that claims the money.
-TODO: Prototype this second variant of crowdfunding once the core model has been sufficiently extended.
-TODO: Experiment with the use of the javax.validation API to simplify the validation logic by annotating state members.
-See JIRA bug PD-21 for further discussion and followup.
-
-
-Author
-James Carlyle
-
-
-Types
-
-Constructors
-
-
-
-
-<init>
-
-CrowdFund ( )
This is a basic crowd funding contract. It allows a party to create a funding opportunity, then for others to
-pledge during the funding period , and then for the party to either accept the funding (if the target has been reached)
-return the funds to the pledge-makers (if the target has not been reached).
-
-
-
-
-Properties
-
-
-
-
-legalContractReference
-
-val legalContractReference : SecureHash
Unparsed reference to the natural language contract that this code is supposed to express (usually a hash of
-the contracts contents).
-
-
-
-
-Functions
-
-
-
-
-generateClose
-
-fun generateClose ( tx : TransactionBuilder , campaign : StateAndRef < State > , wallet : List < StateAndRef < State > > ) : Unit
-
-
-
-generatePledge
-
-fun generatePledge ( tx : TransactionBuilder , campaign : StateAndRef < State > , subscriber : PublicKey ) : Unit
Updates the given partial transaction with an input/output/command to fund the opportunity.
-
-
-
-
-generateRegister
-
-fun generateRegister ( owner : PartyAndReference , fundingTarget : Amount , fundingName : String , closingTime : Instant , notary : Party ) : TransactionBuilder
Returns a transaction that registers a crowd-funding campaing, owned by the issuing institutions key. Does not update
-an existing transaction because its not possible to register multiple campaigns in a single transaction
-
-
-
-
-verify
-
-fun verify ( tx : TransactionForVerification ) : Unit
Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense.
-Must throw an exception if theres a problem that should prevent state transition. Takes a single object
-rather than an argument so that additional data can be added without breaking binary compatibility with
-existing contract code.
-
-
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/legal-contract-reference.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/legal-contract-reference.html
deleted file mode 100644
index 4f60280b5a..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/legal-contract-reference.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-CrowdFund.legalContractReference -
-
-
-
-com.r3corda.contracts / CrowdFund / legalContractReference
-
-legalContractReference
-
-val legalContractReference : SecureHash
-Overrides Contract.legalContractReference
-Unparsed reference to the natural language contract that this code is supposed to express (usually a hash of
-the contracts contents).
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/verify.html b/docs/build/html/api/com.r3corda.contracts/-crowd-fund/verify.html
deleted file mode 100644
index b2a0240a4e..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-crowd-fund/verify.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-CrowdFund.verify -
-
-
-
-com.r3corda.contracts / CrowdFund / verify
-
-verify
-
-fun verify ( tx : TransactionForVerification ) : Unit
-Overrides Contract.verify
-Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense.
-Must throw an exception if theres a problem that should prevent state transition. Takes a single object
-rather than an argument so that additional data can be added without breaking binary compatibility with
-existing contract code.
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-dummy-contract/-state/-init-.html b/docs/build/html/api/com.r3corda.contracts/-dummy-contract/-state/-init-.html
deleted file mode 100644
index 3cff064c34..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-dummy-contract/-state/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-DummyContract.State. -
-
-
-
-com.r3corda.contracts / DummyContract / State / <init>
-
-<init>
-State ( magicNumber : Int = 0, notary : Party )
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-dummy-contract/generate-initial.html b/docs/build/html/api/com.r3corda.contracts/-dummy-contract/generate-initial.html
deleted file mode 100644
index bed28dfb48..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-dummy-contract/generate-initial.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-DummyContract.generateInitial -
-
-
-
-com.r3corda.contracts / DummyContract / generateInitial
-
-generateInitial
-
-fun generateInitial ( owner : PartyAndReference , magicNumber : Int , notary : Party ) : TransactionBuilder
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-dummy-contract/verify.html b/docs/build/html/api/com.r3corda.contracts/-dummy-contract/verify.html
deleted file mode 100644
index 2ca6e5b79d..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-dummy-contract/verify.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-DummyContract.verify -
-
-
-
-com.r3corda.contracts / DummyContract / verify
-
-verify
-
-fun verify ( tx : TransactionForVerification ) : Unit
-Overrides Contract.verify
-Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense.
-Must throw an exception if theres a problem that should prevent state transition. Takes a single object
-rather than an argument so that additional data can be added without breaking binary compatibility with
-existing contract code.
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/-init-.html b/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/-init-.html
index 19dd1eff9d..5a48ed6f1e 100644
--- a/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/-init-.html
@@ -7,7 +7,7 @@
com.r3corda.contracts / FixedRatePaymentEvent / <init>
<init>
-FixedRatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , notional : Amount , rate : Rate )
+FixedRatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , notional : Amount < Currency > , rate : Rate )
Basic class for the Fixed Rate Payments on the fixed leg - see RatePaymentEvent
Assumes that the rate is valid.
diff --git a/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/flow.html b/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/flow.html
index 3597ba6049..e7f98224f6 100644
--- a/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/flow.html
+++ b/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/flow.html
@@ -8,7 +8,7 @@
flow
-val flow : Amount
+val flow : Amount < Currency >
Overrides RatePaymentEvent.flow
diff --git a/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/index.html b/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/index.html
index 3527bdb5ab..03a22266d6 100644
--- a/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-fixed-rate-payment-event/index.html
@@ -19,7 +19,7 @@ Assumes that the rate is valid.
<init>
-FixedRatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , notional : Amount , rate : Rate )
Basic class for the Fixed Rate Payments on the fixed leg - see RatePaymentEvent
+FixedRatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , notional : Amount < Currency > , rate : Rate )
Basic class for the Fixed Rate Payments on the fixed leg - see RatePaymentEvent
Assumes that the rate is valid.
@@ -32,7 +32,7 @@ Assumes that the rate is valid.
flow
-val flow : Amount
+val flow : Amount < Currency >
@@ -79,7 +79,7 @@ Assumes that the rate is valid.
notional
-val notional : Amount
+val notional : Amount < Currency >
@@ -113,7 +113,7 @@ Assumes that the rate is valid.
calculate
-open fun calculate ( ) : Amount
+open fun calculate ( ) : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-fixed-rate/hash-code.html b/docs/build/html/api/com.r3corda.contracts/-fixed-rate/hash-code.html
index 84764d7c6c..951e1e4acf 100644
--- a/docs/build/html/api/com.r3corda.contracts/-fixed-rate/hash-code.html
+++ b/docs/build/html/api/com.r3corda.contracts/-fixed-rate/hash-code.html
@@ -10,10 +10,10 @@
fun hashCode ( ) : Int
Overrides Rate.hashCode
-Returns
+Returns
the hash code of the ratioUnit or zero if the ratioUnit is null, as is the case for floating rate fixings
that have not yet happened. Yet-to-be fixed floating rates need to be equal such that schedules can be tested
-for equality.
+for equality.
diff --git a/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/-init-.html b/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/-init-.html
index ca4186c13f..1d87bc7fbb 100644
--- a/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/-init-.html
@@ -7,7 +7,7 @@
com.r3corda.contracts / FloatingRatePaymentEvent / <init>
<init>
-FloatingRatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , fixingDate : LocalDate , notional : Amount , rate : Rate )
+FloatingRatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , fixingDate : LocalDate , notional : Amount < Currency > , rate : Rate )
Basic class for the Floating Rate Payments on the floating leg - see RatePaymentEvent
If the rate is null returns a zero payment. // TODO: Is this the desired behaviour?
diff --git a/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/copy.html b/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/copy.html
index fdf7f0398c..123dd897ad 100644
--- a/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/copy.html
+++ b/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/copy.html
@@ -7,8 +7,8 @@
com.r3corda.contracts / FloatingRatePaymentEvent / copy
copy
-
-fun copy ( date : LocalDate = this.date, accrualStartDate : LocalDate = this.accrualStartDate, accrualEndDate : LocalDate = this.accrualEndDate, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, fixingDate : LocalDate = this.fixingDate, notional : Amount = this.notional, rate : Rate = this.rate) : FloatingRatePaymentEvent
+
+fun copy ( date : LocalDate = this.date, accrualStartDate : LocalDate = this.accrualStartDate, accrualEndDate : LocalDate = this.accrualEndDate, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, fixingDate : LocalDate = this.fixingDate, notional : Amount < Currency > = this.notional, rate : Rate = this.rate) : FloatingRatePaymentEvent
diff --git a/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/flow.html b/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/flow.html
index 0c2623e3b3..49bee8403b 100644
--- a/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/flow.html
+++ b/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/flow.html
@@ -8,7 +8,7 @@
flow
-val flow : Amount
+val flow : Amount < Currency >
Overrides RatePaymentEvent.flow
diff --git a/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/index.html b/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/index.html
index 01844cc57e..bb3692c7ca 100644
--- a/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-floating-rate-payment-event/index.html
@@ -19,7 +19,7 @@ If the rate is null returns a zero payment. // TODO: Is this the desired behavio
<init>
-FloatingRatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , fixingDate : LocalDate , notional : Amount , rate : Rate )
Basic class for the Floating Rate Payments on the floating leg - see RatePaymentEvent
+FloatingRatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , fixingDate : LocalDate , notional : Amount < Currency > , rate : Rate )
Basic class for the Floating Rate Payments on the floating leg - see RatePaymentEvent
If the rate is null returns a zero payment. // TODO: Is this the desired behaviour?
@@ -38,7 +38,7 @@ If the rate is null returns a zero payment. // TODO: Is this the desired behavio
flow
-val flow : Amount
+val flow : Amount < Currency >
@@ -85,7 +85,7 @@ If the rate is null returns a zero payment. // TODO: Is this the desired behavio
notional
-val notional : Amount
+val notional : Amount < Currency >
@@ -108,7 +108,7 @@ If the rate is null returns a zero payment. // TODO: Is this the desired behavio
copy
-fun copy ( date : LocalDate = this.date, accrualStartDate : LocalDate = this.accrualStartDate, accrualEndDate : LocalDate = this.accrualEndDate, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, fixingDate : LocalDate = this.fixingDate, notional : Amount = this.notional, rate : Rate = this.rate) : FloatingRatePaymentEvent
+fun copy ( date : LocalDate = this.date, accrualStartDate : LocalDate = this.accrualStartDate, accrualEndDate : LocalDate = this.accrualEndDate, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, fixingDate : LocalDate = this.fixingDate, notional : Amount < Currency > = this.notional, rate : Rate = this.rate) : FloatingRatePaymentEvent
@@ -144,7 +144,7 @@ If the rate is null returns a zero payment. // TODO: Is this the desired behavio
calculate
-open fun calculate ( ) : Amount
+open fun calculate ( ) : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/-init-.html b/docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/-init-.html
deleted file mode 100644
index acacb30fd4..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-InsufficientBalanceException. -
-
-
-
-com.r3corda.contracts / InsufficientBalanceException / <init>
-
-<init>
-InsufficientBalanceException ( amountMissing : Amount )
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/amount-missing.html b/docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/amount-missing.html
deleted file mode 100644
index 12bdae7141..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/-insufficient-balance-exception/amount-missing.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-InsufficientBalanceException.amountMissing -
-
-
-
-com.r3corda.contracts / InsufficientBalanceException / amountMissing
-
-amountMissing
-
-val amountMissing : Amount
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-calculation/next-fixing-date.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-calculation/next-fixing-date.html
index 52cb69daf2..186db672bc 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-calculation/next-fixing-date.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-calculation/next-fixing-date.html
@@ -10,8 +10,8 @@
fun nextFixingDate ( ) : LocalDate ?
Gets the date of the next fixing.
-Return
-LocalDate or null if no more fixings.
+Return
+LocalDate or null if no more fixings.
-com.r3corda.contracts / kotlin.collections.Iterable
-
-Extensions for kotlin.collections.Iterable
-
-
-
-
-sumCash
-
-fun Iterable < ContractState > . sumCash ( ) : <ERROR CLASS>
Sums the cash states in the list, throwing an exception if there are none.
-
-
-
-
-sumCashBy
-
-fun Iterable < ContractState > . sumCashBy ( owner : PublicKey ) : <ERROR CLASS>
Sums the cash states in the list that are owned by the given key, throwing an exception if there are none.
-
-
-
-
-sumCashOrNull
-
-fun Iterable < ContractState > . sumCashOrNull ( ) : <ERROR CLASS>
Sums the cash states in the list, returning null if there are none.
-
-
-
-
-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.
-
-
-
-
-
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/-init-.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/-init-.html
index afa0fae440..0b3d51fee7 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/-init-.html
@@ -7,7 +7,7 @@
com.r3corda.contracts / InterestRateSwap / CommonLeg / <init>
<init>
-CommonLeg ( notional : Amount , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment )
+CommonLeg ( notional : Amount < Currency > , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment )
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/index.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/index.html
index f66fcae06e..471efa56cd 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/index.html
@@ -17,7 +17,7 @@
<init>
-CommonLeg ( notional : Amount , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment )
+CommonLeg ( notional : Amount < Currency > , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment )
@@ -64,7 +64,7 @@
notional
-val notional : Amount
+val notional : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/notional.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/notional.html
index a9bc0101fd..18bf7567f5 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/notional.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common-leg/notional.html
@@ -8,7 +8,7 @@
notional
-val notional : Amount
+val notional : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/-init-.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/-init-.html
index 0e05b92502..2d763a585b 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/-init-.html
@@ -7,7 +7,7 @@
com.r3corda.contracts / InterestRateSwap / Common / <init>
<init>
-Common ( baseCurrency : Currency , eligibleCurrency : Currency , eligibleCreditSupport : String , independentAmounts : Amount , threshold : Amount , minimumTransferAmount : Amount , rounding : Amount , valuationDate : String , notificationTime : String , resolutionTime : String , interestRate : ReferenceRate , addressForTransfers : String , exposure : UnknownType , localBusinessDay : BusinessCalendar , dailyInterestAmount : Expression , tradeID : String , hashLegalDocs : String )
+Common ( baseCurrency : Currency , eligibleCurrency : Currency , eligibleCreditSupport : String , independentAmounts : Amount < Currency > , threshold : Amount < Currency > , minimumTransferAmount : Amount < Currency > , rounding : Amount < Currency > , valuationDate : String , notificationTime : String , resolutionTime : String , interestRate : ReferenceRate , addressForTransfers : String , exposure : UnknownType , localBusinessDay : BusinessCalendar , dailyInterestAmount : Expression , tradeID : String , hashLegalDocs : String )
This Common area contains all the information that is not leg specific.
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/independent-amounts.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/independent-amounts.html
index 19887120a5..767a0e3be9 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/independent-amounts.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/independent-amounts.html
@@ -8,7 +8,7 @@
independentAmounts
-val independentAmounts : Amount
+val independentAmounts : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/index.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/index.html
index 6ea2ebcbf3..f427267c58 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/index.html
@@ -18,7 +18,7 @@
<init>
-Common ( baseCurrency : Currency , eligibleCurrency : Currency , eligibleCreditSupport : String , independentAmounts : Amount , threshold : Amount , minimumTransferAmount : Amount , rounding : Amount , valuationDate : String , notificationTime : String , resolutionTime : String , interestRate : ReferenceRate , addressForTransfers : String , exposure : UnknownType , localBusinessDay : BusinessCalendar , dailyInterestAmount : Expression , tradeID : String , hashLegalDocs : String )
This Common area contains all the information that is not leg specific.
+Common ( baseCurrency : Currency , eligibleCurrency : Currency , eligibleCreditSupport : String , independentAmounts : Amount < Currency > , threshold : Amount < Currency > , minimumTransferAmount : Amount < Currency > , rounding : Amount < Currency > , valuationDate : String , notificationTime : String , resolutionTime : String , interestRate : ReferenceRate , addressForTransfers : String , exposure : UnknownType , localBusinessDay : BusinessCalendar , dailyInterestAmount : Expression , tradeID : String , hashLegalDocs : String )
This Common area contains all the information that is not leg specific.
@@ -72,7 +72,7 @@
independentAmounts
-val independentAmounts : Amount
+val independentAmounts : Amount < Currency >
@@ -90,7 +90,7 @@
minimumTransferAmount
-val minimumTransferAmount : Amount
+val minimumTransferAmount : Amount < Currency >
@@ -108,13 +108,13 @@
rounding
-val rounding : Amount
+val rounding : Amount < Currency >
threshold
-val threshold : Amount
+val threshold : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/minimum-transfer-amount.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/minimum-transfer-amount.html
index ae56f1f144..b69747ede2 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/minimum-transfer-amount.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/minimum-transfer-amount.html
@@ -8,7 +8,7 @@
minimumTransferAmount
-val minimumTransferAmount : Amount
+val minimumTransferAmount : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/rounding.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/rounding.html
index 03ab11e8e3..d2a551949b 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/rounding.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/rounding.html
@@ -8,7 +8,7 @@
rounding
-val rounding : Amount
+val rounding : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/threshold.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/threshold.html
index 8b604f3e9d..5f3d33d4f0 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/threshold.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-common/threshold.html
@@ -8,7 +8,7 @@
threshold
-val threshold : Amount
+val threshold : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/-init-.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/-init-.html
index f19a3898e0..5855f21395 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/-init-.html
@@ -7,7 +7,7 @@
com.r3corda.contracts / InterestRateSwap / FixedLeg / <init>
<init>
-FixedLeg ( fixedRatePayer : Party , notional : Amount , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment , fixedRate : FixedRate , rollConvention : DateRollConvention )
+FixedLeg ( fixedRatePayer : Party , notional : Amount < Currency > , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment , fixedRate : FixedRate , rollConvention : DateRollConvention )
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/copy.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/copy.html
index 6ae8af77d7..39e0c23eae 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/copy.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/copy.html
@@ -7,8 +7,8 @@
com.r3corda.contracts / InterestRateSwap / FixedLeg / copy
copy
-
-fun copy ( fixedRatePayer : Party = this.fixedRatePayer, notional : Amount = this.notional, paymentFrequency : Frequency = this.paymentFrequency, effectiveDate : LocalDate = this.effectiveDate, effectiveDateAdjustment : DateRollConvention ? = this.effectiveDateAdjustment, terminationDate : LocalDate = this.terminationDate, terminationDateAdjustment : DateRollConvention ? = this.terminationDateAdjustment, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, dayInMonth : Int = this.dayInMonth, paymentRule : PaymentRule = this.paymentRule, paymentDelay : Int = this.paymentDelay, paymentCalendar : BusinessCalendar = this.paymentCalendar, interestPeriodAdjustment : AccrualAdjustment = this.interestPeriodAdjustment, fixedRate : FixedRate = this.fixedRate) : FixedLeg
+
+fun copy ( fixedRatePayer : Party = this.fixedRatePayer, notional : Amount < Currency > = this.notional, paymentFrequency : Frequency = this.paymentFrequency, effectiveDate : LocalDate = this.effectiveDate, effectiveDateAdjustment : DateRollConvention ? = this.effectiveDateAdjustment, terminationDate : LocalDate = this.terminationDate, terminationDateAdjustment : DateRollConvention ? = this.terminationDateAdjustment, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, dayInMonth : Int = this.dayInMonth, paymentRule : PaymentRule = this.paymentRule, paymentDelay : Int = this.paymentDelay, paymentCalendar : BusinessCalendar = this.paymentCalendar, interestPeriodAdjustment : AccrualAdjustment = this.interestPeriodAdjustment, fixedRate : FixedRate = this.fixedRate) : FixedLeg
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/index.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/index.html
index eed2ef6680..bd5ceecd10 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-fixed-leg/index.html
@@ -17,7 +17,7 @@
<init>
-FixedLeg ( fixedRatePayer : Party , notional : Amount , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment , fixedRate : FixedRate , rollConvention : DateRollConvention )
+FixedLeg ( fixedRatePayer : Party , notional : Amount < Currency > , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment , fixedRate : FixedRate , rollConvention : DateRollConvention )
@@ -87,7 +87,7 @@
notional
-val notional : Amount
+val notional : Amount < Currency >
@@ -134,7 +134,7 @@
copy
-fun copy ( fixedRatePayer : Party = this.fixedRatePayer, notional : Amount = this.notional, paymentFrequency : Frequency = this.paymentFrequency, effectiveDate : LocalDate = this.effectiveDate, effectiveDateAdjustment : DateRollConvention ? = this.effectiveDateAdjustment, terminationDate : LocalDate = this.terminationDate, terminationDateAdjustment : DateRollConvention ? = this.terminationDateAdjustment, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, dayInMonth : Int = this.dayInMonth, paymentRule : PaymentRule = this.paymentRule, paymentDelay : Int = this.paymentDelay, paymentCalendar : BusinessCalendar = this.paymentCalendar, interestPeriodAdjustment : AccrualAdjustment = this.interestPeriodAdjustment, fixedRate : FixedRate = this.fixedRate) : FixedLeg
+fun copy ( fixedRatePayer : Party = this.fixedRatePayer, notional : Amount < Currency > = this.notional, paymentFrequency : Frequency = this.paymentFrequency, effectiveDate : LocalDate = this.effectiveDate, effectiveDateAdjustment : DateRollConvention ? = this.effectiveDateAdjustment, terminationDate : LocalDate = this.terminationDate, terminationDateAdjustment : DateRollConvention ? = this.terminationDateAdjustment, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, dayInMonth : Int = this.dayInMonth, paymentRule : PaymentRule = this.paymentRule, paymentDelay : Int = this.paymentDelay, paymentCalendar : BusinessCalendar = this.paymentCalendar, interestPeriodAdjustment : AccrualAdjustment = this.interestPeriodAdjustment, fixedRate : FixedRate = this.fixedRate) : FixedLeg
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/-init-.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/-init-.html
index 3bd1ab161e..8c445d37fd 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/-init-.html
@@ -7,7 +7,7 @@
com.r3corda.contracts / InterestRateSwap / FloatingLeg / <init>
<init>
-FloatingLeg ( floatingRatePayer : Party , notional : Amount , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment , rollConvention : DateRollConvention , fixingRollConvention : DateRollConvention , resetDayInMonth : Int , fixingPeriod : DateOffset , resetRule : PaymentRule , fixingsPerPayment : Frequency , fixingCalendar : BusinessCalendar , index : String , indexSource : String , indexTenor : Tenor )
+FloatingLeg ( floatingRatePayer : Party , notional : Amount < Currency > , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment , rollConvention : DateRollConvention , fixingRollConvention : DateRollConvention , resetDayInMonth : Int , fixingPeriod : DateOffset , resetRule : PaymentRule , fixingsPerPayment : Frequency , fixingCalendar : BusinessCalendar , index : String , indexSource : String , indexTenor : Tenor )
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/copy.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/copy.html
index e592810549..067f666975 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/copy.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/copy.html
@@ -7,8 +7,8 @@
com.r3corda.contracts / InterestRateSwap / FloatingLeg / copy
copy
-
-fun copy ( floatingRatePayer : Party = this.floatingRatePayer, notional : Amount = this.notional, paymentFrequency : Frequency = this.paymentFrequency, effectiveDate : LocalDate = this.effectiveDate, effectiveDateAdjustment : DateRollConvention ? = this.effectiveDateAdjustment, terminationDate : LocalDate = this.terminationDate, terminationDateAdjustment : DateRollConvention ? = this.terminationDateAdjustment, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, dayInMonth : Int = this.dayInMonth, paymentRule : PaymentRule = this.paymentRule, paymentDelay : Int = this.paymentDelay, paymentCalendar : BusinessCalendar = this.paymentCalendar, interestPeriodAdjustment : AccrualAdjustment = this.interestPeriodAdjustment, rollConvention : DateRollConvention = this.rollConvention, fixingRollConvention : DateRollConvention = this.fixingRollConvention, resetDayInMonth : Int = this.resetDayInMonth, fixingPeriod : DateOffset = this.fixingPeriod, resetRule : PaymentRule = this.resetRule, fixingsPerPayment : Frequency = this.fixingsPerPayment, fixingCalendar : BusinessCalendar = this.fixingCalendar, index : String = this.index, indexSource : String = this.indexSource, indexTenor : Tenor = this.indexTenor) : FloatingLeg
+
+fun copy ( floatingRatePayer : Party = this.floatingRatePayer, notional : Amount < Currency > = this.notional, paymentFrequency : Frequency = this.paymentFrequency, effectiveDate : LocalDate = this.effectiveDate, effectiveDateAdjustment : DateRollConvention ? = this.effectiveDateAdjustment, terminationDate : LocalDate = this.terminationDate, terminationDateAdjustment : DateRollConvention ? = this.terminationDateAdjustment, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, dayInMonth : Int = this.dayInMonth, paymentRule : PaymentRule = this.paymentRule, paymentDelay : Int = this.paymentDelay, paymentCalendar : BusinessCalendar = this.paymentCalendar, interestPeriodAdjustment : AccrualAdjustment = this.interestPeriodAdjustment, rollConvention : DateRollConvention = this.rollConvention, fixingRollConvention : DateRollConvention = this.fixingRollConvention, resetDayInMonth : Int = this.resetDayInMonth, fixingPeriod : DateOffset = this.fixingPeriod, resetRule : PaymentRule = this.resetRule, fixingsPerPayment : Frequency = this.fixingsPerPayment, fixingCalendar : BusinessCalendar = this.fixingCalendar, index : String = this.index, indexSource : String = this.indexSource, indexTenor : Tenor = this.indexTenor) : FloatingLeg
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/index.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/index.html
index 68f03a7c92..15799fb581 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-floating-leg/index.html
@@ -17,7 +17,7 @@
<init>
-FloatingLeg ( floatingRatePayer : Party , notional : Amount , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment , rollConvention : DateRollConvention , fixingRollConvention : DateRollConvention , resetDayInMonth : Int , fixingPeriod : DateOffset , resetRule : PaymentRule , fixingsPerPayment : Frequency , fixingCalendar : BusinessCalendar , index : String , indexSource : String , indexTenor : Tenor )
+FloatingLeg ( floatingRatePayer : Party , notional : Amount < Currency > , paymentFrequency : Frequency , effectiveDate : LocalDate , effectiveDateAdjustment : DateRollConvention ? , terminationDate : LocalDate , terminationDateAdjustment : DateRollConvention ? , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , dayInMonth : Int , paymentRule : PaymentRule , paymentDelay : Int , paymentCalendar : BusinessCalendar , interestPeriodAdjustment : AccrualAdjustment , rollConvention : DateRollConvention , fixingRollConvention : DateRollConvention , resetDayInMonth : Int , fixingPeriod : DateOffset , resetRule : PaymentRule , fixingsPerPayment : Frequency , fixingCalendar : BusinessCalendar , index : String , indexSource : String , indexTenor : Tenor )
@@ -135,7 +135,7 @@
notional
-val notional : Amount
+val notional : Amount < Currency >
@@ -182,7 +182,7 @@
copy
-fun copy ( floatingRatePayer : Party = this.floatingRatePayer, notional : Amount = this.notional, paymentFrequency : Frequency = this.paymentFrequency, effectiveDate : LocalDate = this.effectiveDate, effectiveDateAdjustment : DateRollConvention ? = this.effectiveDateAdjustment, terminationDate : LocalDate = this.terminationDate, terminationDateAdjustment : DateRollConvention ? = this.terminationDateAdjustment, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, dayInMonth : Int = this.dayInMonth, paymentRule : PaymentRule = this.paymentRule, paymentDelay : Int = this.paymentDelay, paymentCalendar : BusinessCalendar = this.paymentCalendar, interestPeriodAdjustment : AccrualAdjustment = this.interestPeriodAdjustment, rollConvention : DateRollConvention = this.rollConvention, fixingRollConvention : DateRollConvention = this.fixingRollConvention, resetDayInMonth : Int = this.resetDayInMonth, fixingPeriod : DateOffset = this.fixingPeriod, resetRule : PaymentRule = this.resetRule, fixingsPerPayment : Frequency = this.fixingsPerPayment, fixingCalendar : BusinessCalendar = this.fixingCalendar, index : String = this.index, indexSource : String = this.indexSource, indexTenor : Tenor = this.indexTenor) : FloatingLeg
+fun copy ( floatingRatePayer : Party = this.floatingRatePayer, notional : Amount < Currency > = this.notional, paymentFrequency : Frequency = this.paymentFrequency, effectiveDate : LocalDate = this.effectiveDate, effectiveDateAdjustment : DateRollConvention ? = this.effectiveDateAdjustment, terminationDate : LocalDate = this.terminationDate, terminationDateAdjustment : DateRollConvention ? = this.terminationDateAdjustment, dayCountBasisDay : DayCountBasisDay = this.dayCountBasisDay, dayCountBasisYear : DayCountBasisYear = this.dayCountBasisYear, dayInMonth : Int = this.dayInMonth, paymentRule : PaymentRule = this.paymentRule, paymentDelay : Int = this.paymentDelay, paymentCalendar : BusinessCalendar = this.paymentCalendar, interestPeriodAdjustment : AccrualAdjustment = this.interestPeriodAdjustment, rollConvention : DateRollConvention = this.rollConvention, fixingRollConvention : DateRollConvention = this.fixingRollConvention, resetDayInMonth : Int = this.resetDayInMonth, fixingPeriod : DateOffset = this.fixingPeriod, resetRule : PaymentRule = this.resetRule, fixingsPerPayment : Frequency = this.fixingsPerPayment, fixingCalendar : BusinessCalendar = this.fixingCalendar, index : String = this.index, indexSource : String = this.indexSource, indexTenor : Tenor = this.indexTenor) : FloatingLeg
diff --git a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-state/parties.html b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-state/parties.html
index 9eb43a3855..c6ad978be4 100644
--- a/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-state/parties.html
+++ b/docs/build/html/api/com.r3corda.contracts/-interest-rate-swap/-state/parties.html
@@ -11,9 +11,9 @@
val parties : Array < Party >
Overrides DealState.parties
Exposes the Parties involved in a generic way
-Getter
+Getter
Exposes the Parties involved in a generic way
-
+
diff --git a/docs/build/html/api/com.r3corda.contracts/-payment-event/calculate.html b/docs/build/html/api/com.r3corda.contracts/-payment-event/calculate.html
index 56be01793a..ed3beaddd3 100644
--- a/docs/build/html/api/com.r3corda.contracts/-payment-event/calculate.html
+++ b/docs/build/html/api/com.r3corda.contracts/-payment-event/calculate.html
@@ -8,7 +8,7 @@
calculate
-abstract fun calculate ( ) : Amount
+abstract fun calculate ( ) : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-payment-event/index.html b/docs/build/html/api/com.r3corda.contracts/-payment-event/index.html
index bb6f50478a..2163c229b2 100644
--- a/docs/build/html/api/com.r3corda.contracts/-payment-event/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-payment-event/index.html
@@ -41,7 +41,7 @@
calculate
-abstract fun calculate ( ) : Amount
+abstract fun calculate ( ) : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/-init-.html b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/-init-.html
index cf984ca106..7f3003bba1 100644
--- a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/-init-.html
+++ b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/-init-.html
@@ -7,7 +7,7 @@
com.r3corda.contracts / RatePaymentEvent / <init>
<init>
-RatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , notional : Amount , rate : Rate )
+RatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , notional : Amount < Currency > , rate : Rate )
A RatePaymentEvent represents a dated obligation of payment.
It is a specialisation / modification of a basic cash flow event (to be written) that has some additional assistance
functions for interest rate swap legs of the fixed and floating nature.
diff --git a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/calculate.html b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/calculate.html
index 5bf0ab2554..0ba442dd57 100644
--- a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/calculate.html
+++ b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/calculate.html
@@ -8,7 +8,7 @@
calculate
-open fun calculate ( ) : Amount
+open fun calculate ( ) : Amount < Currency >
Overrides PaymentEvent.calculate
diff --git a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/flow.html b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/flow.html
index 3a1cade95c..e65c228e95 100644
--- a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/flow.html
+++ b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/flow.html
@@ -8,7 +8,7 @@
flow
-abstract val flow : Amount
+abstract val flow : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/index.html b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/index.html
index 4f1b127d0f..cf6327fef1 100644
--- a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/index.html
@@ -22,7 +22,7 @@ For the floating leg, the rate refers to a reference rate which is to be "fixed"
<init>
-RatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , notional : Amount , rate : Rate )
A RatePaymentEvent represents a dated obligation of payment.
+RatePaymentEvent ( date : LocalDate , accrualStartDate : LocalDate , accrualEndDate : LocalDate , dayCountBasisDay : DayCountBasisDay , dayCountBasisYear : DayCountBasisYear , notional : Amount < Currency > , rate : Rate )
A RatePaymentEvent represents a dated obligation of payment.
It is a specialisation / modification of a basic cash flow event (to be written) that has some additional assistance
functions for interest rate swap legs of the fixed and floating nature.
For the fixed leg, the rate is already known at creation and therefore the flows can be pre-determined.
@@ -74,13 +74,13 @@ For the floating leg, the rate refers to a reference rate which is to be "fixed"
flow
-abstract val flow : Amount
+abstract val flow : Amount < Currency >
notional
-val notional : Amount
+val notional : Amount < Currency >
@@ -103,7 +103,7 @@ For the floating leg, the rate refers to a reference rate which is to be "fixed"
calculate
-open fun calculate ( ) : Amount
+open fun calculate ( ) : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/notional.html b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/notional.html
index 6945524c9a..6695717687 100644
--- a/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/notional.html
+++ b/docs/build/html/api/com.r3corda.contracts/-rate-payment-event/notional.html
@@ -8,7 +8,7 @@
notional
-val notional : Amount
+val notional : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/-rate/hash-code.html b/docs/build/html/api/com.r3corda.contracts/-rate/hash-code.html
index e48fba36d8..3827fa867d 100644
--- a/docs/build/html/api/com.r3corda.contracts/-rate/hash-code.html
+++ b/docs/build/html/api/com.r3corda.contracts/-rate/hash-code.html
@@ -9,10 +9,10 @@
hashCode
open fun hashCode ( ) : Int
-Returns
+Returns
the hash code of the ratioUnit or zero if the ratioUnit is null, as is the case for floating rate fixings
that have not yet happened. Yet-to-be fixed floating rates need to be equal such that schedules can be tested
-for equality.
+for equality.
diff --git a/docs/build/html/api/com.r3corda.contracts/index.html b/docs/build/html/api/com.r3corda.contracts/index.html
index c1c30bed9d..a9ce25db84 100644
--- a/docs/build/html/api/com.r3corda.contracts/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/index.html
@@ -12,37 +12,12 @@
-Cash
-
-class Cash : Contract
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
-(a blend of issuer+depositRef) and you couldnt merge outputs of two colours together, but you COULD put them in
-the same transaction.
-
-
-
-
CommercialPaper
class CommercialPaper : Contract
-CrowdFund
-
-class CrowdFund : Contract
This is a basic crowd funding contract. It allows a party to create a funding opportunity, then for others to
-pledge during the funding period , and then for the party to either accept the funding (if the target has been reached)
-return the funds to the pledge-makers (if the target has not been reached).
-
-
-
-
-DummyContract
-
-class DummyContract : Contract
-
-
-
Event
open class Event
Event superclass - everything happens on a date.
@@ -144,17 +119,6 @@ e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value
-
Exceptions
-
Extensions for External Classes
@@ -170,12 +134,6 @@ e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value
-
-
-kotlin.collections.Iterable
-
-
-
Properties
@@ -183,12 +141,6 @@ e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value
-CASH_PROGRAM_ID
-
-val CASH_PROGRAM_ID : Cash
-
-
-
CP_PROGRAM_ID
val CP_PROGRAM_ID : CommercialPaper
This is an ultra-trivial implementation of commercial paper, which is essentially a simpler version of a corporate
@@ -200,18 +152,6 @@ is adjusted as if the paper was redeemed and immediately repurchased, but withou
-CROWDFUND_PROGRAM_ID
-
-val CROWDFUND_PROGRAM_ID : CrowdFund
-
-
-
-DUMMY_PROGRAM_ID
-
-val DUMMY_PROGRAM_ID : DummyContract
-
-
-
IRS_PROGRAM_ID
val IRS_PROGRAM_ID : InterestRateSwap
@@ -231,7 +171,7 @@ is adjusted as if the paper was redeemed and immediately repurchased, but withou
times
-operator fun Amount . times ( other : RatioUnit ) : Amount
+operator fun Amount < Currency > . times ( other : RatioUnit ) : Amount < Currency >
diff --git a/docs/build/html/api/com.r3corda.contracts/kotlin.-string/index.html b/docs/build/html/api/com.r3corda.contracts/kotlin.-string/index.html
index e958dbe771..918eedd028 100644
--- a/docs/build/html/api/com.r3corda.contracts/kotlin.-string/index.html
+++ b/docs/build/html/api/com.r3corda.contracts/kotlin.-string/index.html
@@ -14,8 +14,8 @@
percent
val String . percent : PercentageRatioUnit
For the convenience of writing "5".percent
-Note that we do not currently allow 10.percent (ie no quotes) as this might get a little confusing if
-0.1.percent was written TODO: Discuss
+Note that we do not currently allow 10.percent (ie no quotes) as this might get a little confusing if 0.1.percent was
+written. Additionally, there is a possibility of creating a precision error in the implicit conversion.
diff --git a/docs/build/html/api/com.r3corda.contracts/kotlin.-string/percent.html b/docs/build/html/api/com.r3corda.contracts/kotlin.-string/percent.html
index 9103897130..9c0124a207 100644
--- a/docs/build/html/api/com.r3corda.contracts/kotlin.-string/percent.html
+++ b/docs/build/html/api/com.r3corda.contracts/kotlin.-string/percent.html
@@ -10,8 +10,8 @@
val String . percent : PercentageRatioUnit
For the convenience of writing "5".percent
-Note that we do not currently allow 10.percent (ie no quotes) as this might get a little confusing if
-0.1.percent was written TODO: Discuss
+Note that we do not currently allow 10.percent (ie no quotes) as this might get a little confusing if 0.1.percent was
+written. Additionally, there is a possibility of creating a precision error in the implicit conversion.
diff --git a/docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/index.html b/docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/index.html
deleted file mode 100644
index 068a7710c0..0000000000
--- a/docs/build/html/api/com.r3corda.contracts/kotlin.collections.-iterable/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
com.r3corda.contracts.kotlin.collections.Iterable -
-
-
-
-