From ff2824780c764f34e14b7a4c24245c6131954606 Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Wed, 11 May 2016 11:47:52 +0100 Subject: [PATCH 01/10] A proposal for how to restructure the gradle modules and namespaces. --- project-structure-proposal.txt | 79 ++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 project-structure-proposal.txt diff --git a/project-structure-proposal.txt b/project-structure-proposal.txt new file mode 100644 index 0000000000..524d0d190b --- /dev/null +++ b/project-structure-proposal.txt @@ -0,0 +1,79 @@ +Proposed module structure + +:r3prototyping - gradle top level module. No actual code, just resources for this project to make distributable artefacts, plus drives build of code modules. + |--docs - docs for developers + |--scripts - scripts to start\stop nodes, run demos, etc + |--tools - utilities such as tools to create keys, etc + |--libs - external libs not available on maven, or signed specific versions + |--contracts - fully signed and versioned contract jars for approved contracts that other contracts might reference. + +:core - gradle module for language helpers, pure algorithms, etc + |--crypto - helpers for crypto + |--math - helpers for calculations e.g. financial rounding + |--utilities - stuff + +:client-api - gradle module for a jar that can be embedded inside JVM compatible clients. Depends only on :core + |--api - standard rpc services exposed on a node for supporting bank side interactions and node management + |--transport - support for concrete transport layers + | |--jaxrs - e.g. annotated api interface for rest-json + | |--mq - e.g. wrapper for using messaging to communicate to the node + |--serialization - abstraction\helpers for client side serialisation via JSON (e.g. pre-configured jackson mapper), Kryo, etc (doesn't have to line up with node to node communication formats) + +:contract-api - Gradle module to make minimum jar library required to write a contract jar, but should not contain business logic. Depends only on :core + |--financetypes - basic finance types and helpers + |--protocol + | |--api - node services available internally only to contracts. + | |--core - protocol support and implementation functions e.g. our TwoPartyDealProtocol + |--contract - base\abstract types for smart contracts e.g ContractState, Transaction, Command + |--extensionsapi - marker interfaces\annotations for contracts to extend a node's public network interface and allow clients to interact with a contract e.g. register a servlet + |--utilities - helpers\builders without any business logic + |--test - hooks to allow testability of contracts + |--serialization - helpers for state object storage and transport by nodes + +:contract-core - Gradle module for important financial concepts modelled as smart contracts. R3 mjaintained reference implementations. Depends upon :core and :contract-api. + |--validators - helpers for standard business validations e.g. must be positive, net cash must be equal, etc + |--utilities - some common code for business day calculations and holiday oracle + |--cash + | |--states + | |--contract + | |--protocol + |--irs + | |--states + | |--contract + | |--protocol + |--dvp + | |--states + | |--contract + | |--protocol + +:contract-demos - Gradle module for external developers to play with and modify. Depends upon :core, :contract-api and :contract-core for complicated contracts + |--minimum - hello world of smart contracts + | |--states + | |--contract + | |--protocol + |--demo1 - something for an external developer to start working on + | |--states + | |--contract + | |--protocol + |--webapp - some simple web content that calls against JAX-RS to exercise the demo contracts. Content registered via the extensions-api + | |--minimum + | |--demo1 + +:node - Gradle module for the actual runtime implementation of node. Must NOT depend upon :contract-core, or :contract-demos, otherwise references :core, :client-api and :contract-api + |--bootstrap - start\stop sequence, config loading, dependency injection, loading service plugins,etc + |--clientapi - implementation of the common public API entry point via JAX-RS, MQ, etc, perhaps does some security checking and then passes to actual services + |--recovery - code to carry out checking on startup and possibly recovery\undo\redo of the transactions + |--services - services listed below are only suggestions!! + | |--api - internal non-serialised service interfaces and data types. Used for decoupling + | |--messaging + | |--networkmapper + | |--persistence + | |--identity + | |--notary + | |--protocol - node side implementation of primitives exposed to contracts + | |--statemachine + | |--scheduler + | |--contractsandbox + | |--wallet + |--configuration + |--utilities From e672344639bdc6e3d8bdeb33df341226f6e98369 Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Wed, 11 May 2016 16:56:45 +0100 Subject: [PATCH 02/10] Convert proposed structure into a doc source file and include in index --- docs/source/index.rst | 1 + .../source/project-structure-proposal.rst | 58 ++++++++++++++----- 2 files changed, 45 insertions(+), 14 deletions(-) rename project-structure-proposal.txt => docs/source/project-structure-proposal.rst (56%) diff --git a/docs/source/index.rst b/docs/source/index.rst index a11b6fcd76..edc27930d9 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -48,4 +48,5 @@ Read on to learn: visualiser codestyle building-the-docs + project-structure-proposal diff --git a/project-structure-proposal.txt b/docs/source/project-structure-proposal.rst similarity index 56% rename from project-structure-proposal.txt rename to docs/source/project-structure-proposal.rst index 524d0d190b..6ccb79d121 100644 --- a/project-structure-proposal.txt +++ b/docs/source/project-structure-proposal.rst @@ -1,36 +1,58 @@ Proposed module structure +========================= -:r3prototyping - gradle top level module. No actual code, just resources for this project to make distributable artefacts, plus drives build of code modules. +``:r3prototyping`` - gradle top level module. No actual code, just resources for this project to make distributable artefacts, plus drives build of code modules. + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--docs - docs for developers - |--scripts - scripts to start\stop nodes, run demos, etc + |--scripts - scripts to start/stop nodes, run demos, etc |--tools - utilities such as tools to create keys, etc |--libs - external libs not available on maven, or signed specific versions |--contracts - fully signed and versioned contract jars for approved contracts that other contracts might reference. -:core - gradle module for language helpers, pure algorithms, etc +``:utilities`` - gradle module for language helpers, pure algorithms, etc + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--crypto - helpers for crypto |--math - helpers for calculations e.g. financial rounding |--utilities - stuff -:client-api - gradle module for a jar that can be embedded inside JVM compatible clients. Depends only on :core +``:client-api`` - gradle module for a jar that can be embedded inside JVM compatible clients. Depends only on :core + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--api - standard rpc services exposed on a node for supporting bank side interactions and node management |--transport - support for concrete transport layers | |--jaxrs - e.g. annotated api interface for rest-json | |--mq - e.g. wrapper for using messaging to communicate to the node - |--serialization - abstraction\helpers for client side serialisation via JSON (e.g. pre-configured jackson mapper), Kryo, etc (doesn't have to line up with node to node communication formats) + |--serialization - abstraction/helpers for client side serialisation via JSON (e.g. pre-configured jackson mapper), Kryo, etc (doesn't have to line up with node to node communication formats) -:contract-api - Gradle module to make minimum jar library required to write a contract jar, but should not contain business logic. Depends only on :core +``:contract-api`` - Gradle module to make minimum jar library required to write a contract jar, but should not contain business logic. Depends only on :core + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--financetypes - basic finance types and helpers |--protocol | |--api - node services available internally only to contracts. | |--core - protocol support and implementation functions e.g. our TwoPartyDealProtocol - |--contract - base\abstract types for smart contracts e.g ContractState, Transaction, Command - |--extensionsapi - marker interfaces\annotations for contracts to extend a node's public network interface and allow clients to interact with a contract e.g. register a servlet - |--utilities - helpers\builders without any business logic + |--contract - base/abstract types for smart contracts e.g ContractState, Transaction, Command + |--extensionsapi - marker interfaces/annotations for contracts to extend a node's public network interface and allow clients to interact with a contract e.g. register a servlet + |--utilities - helpers/builders without any business logic |--test - hooks to allow testability of contracts |--serialization - helpers for state object storage and transport by nodes -:contract-core - Gradle module for important financial concepts modelled as smart contracts. R3 mjaintained reference implementations. Depends upon :core and :contract-api. +``:base-contract`` - Gradle module for important financial concepts modelled as smart contracts. R3 mjaintained reference implementations. Depends upon :core and :contract-api. + +.. code-block:: none + + + folders/namespaces under src/main/kotlin and src/test/kotlin |--validators - helpers for standard business validations e.g. must be positive, net cash must be equal, etc |--utilities - some common code for business day calculations and holiday oracle |--cash @@ -46,7 +68,11 @@ Proposed module structure | |--contract | |--protocol -:contract-demos - Gradle module for external developers to play with and modify. Depends upon :core, :contract-api and :contract-core for complicated contracts +``:demos`` - Gradle module for external developers to play with and modify. Depends upon :core, :contract-api and :contract-core for complicated contracts + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--minimum - hello world of smart contracts | |--states | |--contract @@ -59,10 +85,14 @@ Proposed module structure | |--minimum | |--demo1 -:node - Gradle module for the actual runtime implementation of node. Must NOT depend upon :contract-core, or :contract-demos, otherwise references :core, :client-api and :contract-api - |--bootstrap - start\stop sequence, config loading, dependency injection, loading service plugins,etc +``:node`` - Gradle module for the actual runtime implementation of node. Must NOT depend upon :contract-core, or :contract-demos, otherwise references :core, :client-api and :contract-api + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin + |--bootstrap - start/stop sequence, config loading, dependency injection, loading service plugins,etc |--clientapi - implementation of the common public API entry point via JAX-RS, MQ, etc, perhaps does some security checking and then passes to actual services - |--recovery - code to carry out checking on startup and possibly recovery\undo\redo of the transactions + |--recovery - code to carry out checking on startup and possibly recovery/undo/redo of the transactions |--services - services listed below are only suggestions!! | |--api - internal non-serialised service interfaces and data types. Used for decoupling | |--messaging From 2942e7dc948ebd653a88cb5fc2f85717a09803ad Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Wed, 11 May 2016 11:47:52 +0100 Subject: [PATCH 03/10] A proposal for how to restructure the gradle modules and namespaces. --- project-structure-proposal.txt | 79 ++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 project-structure-proposal.txt diff --git a/project-structure-proposal.txt b/project-structure-proposal.txt new file mode 100644 index 0000000000..524d0d190b --- /dev/null +++ b/project-structure-proposal.txt @@ -0,0 +1,79 @@ +Proposed module structure + +:r3prototyping - gradle top level module. No actual code, just resources for this project to make distributable artefacts, plus drives build of code modules. + |--docs - docs for developers + |--scripts - scripts to start\stop nodes, run demos, etc + |--tools - utilities such as tools to create keys, etc + |--libs - external libs not available on maven, or signed specific versions + |--contracts - fully signed and versioned contract jars for approved contracts that other contracts might reference. + +:core - gradle module for language helpers, pure algorithms, etc + |--crypto - helpers for crypto + |--math - helpers for calculations e.g. financial rounding + |--utilities - stuff + +:client-api - gradle module for a jar that can be embedded inside JVM compatible clients. Depends only on :core + |--api - standard rpc services exposed on a node for supporting bank side interactions and node management + |--transport - support for concrete transport layers + | |--jaxrs - e.g. annotated api interface for rest-json + | |--mq - e.g. wrapper for using messaging to communicate to the node + |--serialization - abstraction\helpers for client side serialisation via JSON (e.g. pre-configured jackson mapper), Kryo, etc (doesn't have to line up with node to node communication formats) + +:contract-api - Gradle module to make minimum jar library required to write a contract jar, but should not contain business logic. Depends only on :core + |--financetypes - basic finance types and helpers + |--protocol + | |--api - node services available internally only to contracts. + | |--core - protocol support and implementation functions e.g. our TwoPartyDealProtocol + |--contract - base\abstract types for smart contracts e.g ContractState, Transaction, Command + |--extensionsapi - marker interfaces\annotations for contracts to extend a node's public network interface and allow clients to interact with a contract e.g. register a servlet + |--utilities - helpers\builders without any business logic + |--test - hooks to allow testability of contracts + |--serialization - helpers for state object storage and transport by nodes + +:contract-core - Gradle module for important financial concepts modelled as smart contracts. R3 mjaintained reference implementations. Depends upon :core and :contract-api. + |--validators - helpers for standard business validations e.g. must be positive, net cash must be equal, etc + |--utilities - some common code for business day calculations and holiday oracle + |--cash + | |--states + | |--contract + | |--protocol + |--irs + | |--states + | |--contract + | |--protocol + |--dvp + | |--states + | |--contract + | |--protocol + +:contract-demos - Gradle module for external developers to play with and modify. Depends upon :core, :contract-api and :contract-core for complicated contracts + |--minimum - hello world of smart contracts + | |--states + | |--contract + | |--protocol + |--demo1 - something for an external developer to start working on + | |--states + | |--contract + | |--protocol + |--webapp - some simple web content that calls against JAX-RS to exercise the demo contracts. Content registered via the extensions-api + | |--minimum + | |--demo1 + +:node - Gradle module for the actual runtime implementation of node. Must NOT depend upon :contract-core, or :contract-demos, otherwise references :core, :client-api and :contract-api + |--bootstrap - start\stop sequence, config loading, dependency injection, loading service plugins,etc + |--clientapi - implementation of the common public API entry point via JAX-RS, MQ, etc, perhaps does some security checking and then passes to actual services + |--recovery - code to carry out checking on startup and possibly recovery\undo\redo of the transactions + |--services - services listed below are only suggestions!! + | |--api - internal non-serialised service interfaces and data types. Used for decoupling + | |--messaging + | |--networkmapper + | |--persistence + | |--identity + | |--notary + | |--protocol - node side implementation of primitives exposed to contracts + | |--statemachine + | |--scheduler + | |--contractsandbox + | |--wallet + |--configuration + |--utilities From 8beaf08239dafdb56de88771b437751ee9be17df Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Wed, 11 May 2016 16:56:45 +0100 Subject: [PATCH 04/10] Convert proposed structure into a doc source file and include in index --- docs/source/index.rst | 1 + .../source/project-structure-proposal.rst | 58 ++++++++++++++----- 2 files changed, 45 insertions(+), 14 deletions(-) rename project-structure-proposal.txt => docs/source/project-structure-proposal.rst (56%) diff --git a/docs/source/index.rst b/docs/source/index.rst index d633ffb715..43432854c4 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -49,4 +49,5 @@ Read on to learn: visualiser codestyle building-the-docs + project-structure-proposal diff --git a/project-structure-proposal.txt b/docs/source/project-structure-proposal.rst similarity index 56% rename from project-structure-proposal.txt rename to docs/source/project-structure-proposal.rst index 524d0d190b..6ccb79d121 100644 --- a/project-structure-proposal.txt +++ b/docs/source/project-structure-proposal.rst @@ -1,36 +1,58 @@ Proposed module structure +========================= -:r3prototyping - gradle top level module. No actual code, just resources for this project to make distributable artefacts, plus drives build of code modules. +``:r3prototyping`` - gradle top level module. No actual code, just resources for this project to make distributable artefacts, plus drives build of code modules. + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--docs - docs for developers - |--scripts - scripts to start\stop nodes, run demos, etc + |--scripts - scripts to start/stop nodes, run demos, etc |--tools - utilities such as tools to create keys, etc |--libs - external libs not available on maven, or signed specific versions |--contracts - fully signed and versioned contract jars for approved contracts that other contracts might reference. -:core - gradle module for language helpers, pure algorithms, etc +``:utilities`` - gradle module for language helpers, pure algorithms, etc + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--crypto - helpers for crypto |--math - helpers for calculations e.g. financial rounding |--utilities - stuff -:client-api - gradle module for a jar that can be embedded inside JVM compatible clients. Depends only on :core +``:client-api`` - gradle module for a jar that can be embedded inside JVM compatible clients. Depends only on :core + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--api - standard rpc services exposed on a node for supporting bank side interactions and node management |--transport - support for concrete transport layers | |--jaxrs - e.g. annotated api interface for rest-json | |--mq - e.g. wrapper for using messaging to communicate to the node - |--serialization - abstraction\helpers for client side serialisation via JSON (e.g. pre-configured jackson mapper), Kryo, etc (doesn't have to line up with node to node communication formats) + |--serialization - abstraction/helpers for client side serialisation via JSON (e.g. pre-configured jackson mapper), Kryo, etc (doesn't have to line up with node to node communication formats) -:contract-api - Gradle module to make minimum jar library required to write a contract jar, but should not contain business logic. Depends only on :core +``:contract-api`` - Gradle module to make minimum jar library required to write a contract jar, but should not contain business logic. Depends only on :core + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--financetypes - basic finance types and helpers |--protocol | |--api - node services available internally only to contracts. | |--core - protocol support and implementation functions e.g. our TwoPartyDealProtocol - |--contract - base\abstract types for smart contracts e.g ContractState, Transaction, Command - |--extensionsapi - marker interfaces\annotations for contracts to extend a node's public network interface and allow clients to interact with a contract e.g. register a servlet - |--utilities - helpers\builders without any business logic + |--contract - base/abstract types for smart contracts e.g ContractState, Transaction, Command + |--extensionsapi - marker interfaces/annotations for contracts to extend a node's public network interface and allow clients to interact with a contract e.g. register a servlet + |--utilities - helpers/builders without any business logic |--test - hooks to allow testability of contracts |--serialization - helpers for state object storage and transport by nodes -:contract-core - Gradle module for important financial concepts modelled as smart contracts. R3 mjaintained reference implementations. Depends upon :core and :contract-api. +``:base-contract`` - Gradle module for important financial concepts modelled as smart contracts. R3 mjaintained reference implementations. Depends upon :core and :contract-api. + +.. code-block:: none + + + folders/namespaces under src/main/kotlin and src/test/kotlin |--validators - helpers for standard business validations e.g. must be positive, net cash must be equal, etc |--utilities - some common code for business day calculations and holiday oracle |--cash @@ -46,7 +68,11 @@ Proposed module structure | |--contract | |--protocol -:contract-demos - Gradle module for external developers to play with and modify. Depends upon :core, :contract-api and :contract-core for complicated contracts +``:demos`` - Gradle module for external developers to play with and modify. Depends upon :core, :contract-api and :contract-core for complicated contracts + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin |--minimum - hello world of smart contracts | |--states | |--contract @@ -59,10 +85,14 @@ Proposed module structure | |--minimum | |--demo1 -:node - Gradle module for the actual runtime implementation of node. Must NOT depend upon :contract-core, or :contract-demos, otherwise references :core, :client-api and :contract-api - |--bootstrap - start\stop sequence, config loading, dependency injection, loading service plugins,etc +``:node`` - Gradle module for the actual runtime implementation of node. Must NOT depend upon :contract-core, or :contract-demos, otherwise references :core, :client-api and :contract-api + +.. code-block:: none + + folders/namespaces under src/main/kotlin and src/test/kotlin + |--bootstrap - start/stop sequence, config loading, dependency injection, loading service plugins,etc |--clientapi - implementation of the common public API entry point via JAX-RS, MQ, etc, perhaps does some security checking and then passes to actual services - |--recovery - code to carry out checking on startup and possibly recovery\undo\redo of the transactions + |--recovery - code to carry out checking on startup and possibly recovery/undo/redo of the transactions |--services - services listed below are only suggestions!! | |--api - internal non-serialised service interfaces and data types. Used for decoupling | |--messaging From 058ac986bd76b4da6416dbd22c3dfcedf5d8456a Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Sat, 14 May 2016 13:47:07 +0100 Subject: [PATCH 05/10] Move contracts base files to namespace to make api aspect clearer in includes. Move Party to core.crypto as Party is closely aligned with the signing and used in code areas unrelated to the contract code. --- .../kotlin/contracts/AnotherDummyContract.kt | 4 +- .../kotlin/core/node/DummyContractBackdoor.kt | 11 +- .../java/contracts/ICommercialPaperState.java | 4 +- .../java/contracts/JavaCommercialPaper.java | 9 +- contracts/src/main/kotlin/contracts/Cash.kt | 6 +- .../main/kotlin/contracts/CommercialPaper.kt | 2 + .../src/main/kotlin/contracts/CrowdFund.kt | 4 +- .../main/kotlin/contracts/DummyContract.kt | 2 + contracts/src/main/kotlin/contracts/IRS.kt | 10 +- .../src/main/kotlin/contracts/IRSUtils.kt | 4 +- .../contracts/cash/CashIssuanceDefinition.kt | 4 +- .../kotlin/contracts/cash/CommonCashState.kt | 6 +- .../core/{ => contracts}/ContractsDSL.kt | 4 +- .../core/{ => contracts}/FinanceTypes.kt | 5 +- .../kotlin/core/{ => contracts}/Structures.kt | 15 +- .../{ => contracts}/TransactionBuilder.kt | 6 +- .../{ => contracts}/TransactionGraphSearch.kt | 5 +- .../core/{ => contracts}/TransactionTools.kt | 6 +- .../TransactionVerification.kt | 4 +- .../core/{ => contracts}/Transactions.kt | 4 +- .../kotlin/core/crypto/CryptoUtilities.kt | 2 +- core/src/main/kotlin/core/crypto/Party.kt | 16 + .../core/node/AttachmentsClassLoader.kt | 2 +- core/src/main/kotlin/core/node/NodeInfo.kt | 2 +- core/src/main/kotlin/core/node/ServiceHub.kt | 1 + .../core/node/services/AttachmentStorage.kt | 2 +- .../core/node/services/IdentityService.kt | 2 +- .../core/node/services/UniquenessProvider.kt | 6 +- .../core/node/subsystems/NetworkMapCache.kt | 4 +- .../kotlin/core/node/subsystems/Services.kt | 2 + .../main/kotlin/core/serialization/Kryo.kt | 1 + .../protocols/FetchAttachmentsProtocol.kt | 2 +- .../kotlin/protocols/FetchDataProtocol.kt | 2 +- .../protocols/FetchTransactionsProtocol.kt | 2 +- .../main/kotlin/protocols/NotaryProtocol.kt | 6 +- .../main/kotlin/protocols/RatesFixProtocol.kt | 4 + .../protocols/ResolveTransactionsProtocol.kt | 1 + .../kotlin/protocols/TwoPartyDealProtocol.kt | 2 + .../{ => contracts}/LondonHolidayCalendar.txt | 0 .../NewYorkHolidayCalendar.txt | 0 core/src/test/kotlin/core/FinanceTypesTest.kt | 1 + .../build/html/_sources/tutorial_contract.txt | 2 +- docs/build/html/api/alltypes/index.html | 84 +- .../commit-transaction.html | 4 +- .../api/-a-p-i-server-impl/fetch-states.html | 4 +- .../generate-transaction-signature.html | 4 +- .../api/api/-a-p-i-server-impl/index.html | 6 +- .../api/-a-p-i-server/commit-transaction.html | 4 +- .../api/api/-a-p-i-server/fetch-states.html | 4 +- .../generate-transaction-signature.html | 4 +- .../html/api/api/-a-p-i-server/index.html | 6 +- .../-cash/-commands/-exit/-init-.html | 2 +- .../-cash/-commands/-exit/index.html | 2 +- .../-cash/-commands/-move/index.html | 2 +- .../api/contracts/-cash/-state/-init-.html | 2 +- .../api/contracts/-cash/-state/index.html | 2 +- .../api/contracts/-cash/generate-issue.html | 4 +- .../api/contracts/-cash/generate-spend.html | 4 +- .../build/html/api/contracts/-cash/index.html | 6 +- .../html/api/contracts/-cash/verify.html | 4 +- .../-commands/-issue/index.html | 2 +- .../-commands/-move/index.html | 2 +- .../-commands/-redeem/index.html | 2 +- .../-commercial-paper/-state/-init-.html | 2 +- .../-commercial-paper/-state/index.html | 6 +- .../-state/with-face-value.html | 4 +- .../-state/with-issuance.html | 4 +- .../-commercial-paper/generate-issue.html | 4 +- .../-commercial-paper/generate-move.html | 4 +- .../-commercial-paper/generate-redeem.html | 4 +- .../contracts/-commercial-paper/index.html | 8 +- .../contracts/-commercial-paper/verify.html | 4 +- .../-crowd-fund/-campaign/-init-.html | 2 +- .../-crowd-fund/-campaign/index.html | 2 +- .../-crowd-fund/-commands/-close/index.html | 2 +- .../-crowd-fund/-commands/-pledge/index.html | 2 +- .../-commands/-register/index.html | 2 +- .../contracts/-crowd-fund/-pledge/-init-.html | 2 +- .../contracts/-crowd-fund/-pledge/index.html | 2 +- .../contracts/-crowd-fund/generate-close.html | 4 +- .../-crowd-fund/generate-pledge.html | 4 +- .../-crowd-fund/generate-register.html | 4 +- .../html/api/contracts/-crowd-fund/index.html | 8 +- .../api/contracts/-crowd-fund/verify.html | 4 +- .../html/api/contracts/-deal-state/index.html | 4 +- .../-deal-state/with-public-key.html | 4 +- .../-commands/-create/index.html | 2 +- .../-dummy-contract/generate-initial.html | 4 +- .../api/contracts/-dummy-contract/index.html | 4 +- .../api/contracts/-dummy-contract/verify.html | 4 +- .../-fixable-deal-state/generate-fix.html | 4 +- .../contracts/-fixable-deal-state/index.html | 4 +- .../-fixed-rate-payment-event/-init-.html | 2 +- .../-fixed-rate-payment-event/index.html | 2 +- .../-floating-rate-payment-event/-init-.html | 2 +- .../-floating-rate-payment-event/copy.html | 4 +- .../-floating-rate-payment-event/index.html | 4 +- .../-init-.html | 2 +- .../index.html | 2 +- .../-calculation/-init-.html | 2 +- .../-calculation/index.html | 2 +- .../-commands/-agree/index.html | 2 +- .../-commands/-fix/index.html | 2 +- .../-commands/-mature/index.html | 2 +- .../-commands/-pay/index.html | 2 +- .../-common-leg/-init-.html | 2 +- .../-common-leg/index.html | 2 +- .../-interest-rate-swap/-common/-init-.html | 2 +- .../-interest-rate-swap/-common/index.html | 2 +- .../-fixed-leg/-init-.html | 2 +- .../-interest-rate-swap/-fixed-leg/copy.html | 4 +- .../-interest-rate-swap/-fixed-leg/index.html | 4 +- .../-floating-leg/-init-.html | 2 +- .../-floating-leg/copy.html | 4 +- .../-floating-leg/index.html | 4 +- .../-state/evaluate-calculation.html | 4 +- .../-state/generate-fix.html | 4 +- .../-interest-rate-swap/-state/index.html | 6 +- .../-state/with-public-key.html | 4 +- .../-interest-rate-swap/generate-fix.html | 4 +- .../contracts/-interest-rate-swap/index.html | 4 +- .../contracts/-interest-rate-swap/verify.html | 4 +- .../contracts/-rate-payment-event/-init-.html | 2 +- .../contracts/-rate-payment-event/index.html | 2 +- .../api/contracts/-reference-rate/-init-.html | 2 +- .../api/contracts/-reference-rate/index.html | 2 +- docs/build/html/api/contracts/index.html | 2 +- .../kotlin.collections.-iterable/index.html | 4 +- .../sum-cash-by.html | 4 +- .../sum-cash-or-null.html | 2 +- .../sum-cash-or-zero.html | 4 +- .../sum-cash.html | 2 +- docs/build/html/api/contracts/times.html | 4 +- .../-legally-identifiable/-init-.html | 2 +- .../-legally-identifiable/index.html | 2 +- .../java.security.-key-pair/index.html | 4 +- .../sign-with-e-c-d-s-a.html | 8 +- .../-identity-service/index.html | 2 +- .../-identity-service/register-identity.html | 4 +- .../-query-identity-request/-init-.html | 2 +- .../-query-identity-request/index.html | 2 +- .../-fix-container/-init-.html | 2 +- .../-fix-container/get.html | 4 +- .../-fix-container/index.html | 4 +- .../-interpolating-rate-map/-init-.html | 2 +- .../-interpolating-rate-map/get-rate.html | 4 +- .../-interpolating-rate-map/index.html | 4 +- .../-node-interest-rates/-oracle/-init-.html | 2 +- .../-node-interest-rates/-oracle/index.html | 6 +- .../-node-interest-rates/-oracle/query.html | 4 +- .../-node-interest-rates/-oracle/sign.html | 4 +- .../-unknown-fix/-init-.html | 2 +- .../-unknown-fix/index.html | 2 +- .../-node-timestamper-service/-init-.html | 2 +- .../-node-timestamper-service/index.html | 2 +- .../-timestamper-service/index.html | 2 +- .../-timestamper-service/timestamp.html | 4 +- .../-in-memory-identity-service/index.html | 2 +- .../register-identity.html | 4 +- .../get-recommended.html | 4 +- .../-in-memory-network-map-cache/index.html | 2 +- .../-network-map-cache/get-recommended.html | 4 +- .../-network-map-cache/index.html | 2 +- .../fill-with-some-test-cash.html | 4 +- .../-node-wallet-service/index.html | 8 +- .../-node-wallet-service/notify-all.html | 4 +- .../-storage-service-impl/-init-.html | 2 +- .../-storage-service-impl/index.html | 2 +- .../-wallet-impl/-init-.html | 2 +- .../-wallet-impl/index.html | 2 +- .../-wallet-service/index.html | 6 +- .../-wallet-service/notify-all.html | 4 +- .../-wallet-service/notify.html | 4 +- .../-wallet-service/states-for-refs.html | 4 +- .../construct-storage-service.html | 4 +- .../api/core.node/-abstract-node/index.html | 2 +- .../-attachments-class-loader/-init-.html | 2 +- .../-attachments-class-loader/index.html | 2 +- .../html/api/core.node/-node-info/-init-.html | 2 +- .../html/api/core.node/-node-info/index.html | 2 +- .../build/html/api/core.node/-node/index.html | 2 +- .../api/core.node/-service-hub/index.html | 4 +- .../-service-hub/record-transactions.html | 4 +- .../-service-hub/verify-transaction.html | 4 +- .../-serialized-bytes/index.html | 2 +- .../-wire-transaction-serializer/index.html | 4 +- .../-wire-transaction-serializer/read.html | 4 +- .../-wire-transaction-serializer/write.html | 4 +- .../api/core.serialization/deserialize.html | 4 +- .../html/api/core.serialization/index.html | 2 +- .../-mock-identity-service/-init-.html | 2 +- .../-mock-identity-service/index.html | 4 +- .../register-identity.html | 4 +- .../delete-registration.html | 4 +- .../-mock-network-map-cache/index.html | 4 +- .../-mock-network/-mock-node/index.html | 2 +- .../-party-serializer/index.html | 2 +- .../-party-serializer/serialize.html | 4 +- docs/build/html/api/core/-amount/-init-.html | 4 +- .../html/api/core/-amount/compare-to.html | 4 +- .../build/html/api/core/-amount/currency.html | 2 +- docs/build/html/api/core/-amount/div.html | 8 +- docs/build/html/api/core/-amount/index.html | 18 +- docs/build/html/api/core/-amount/minus.html | 4 +- docs/build/html/api/core/-amount/pennies.html | 2 +- docs/build/html/api/core/-amount/plus.html | 4 +- docs/build/html/api/core/-amount/times.html | 8 +- .../html/api/core/-amount/to-string.html | 2 +- .../api/core/-attachment/extract-file.html | 4 +- .../html/api/core/-attachment/index.html | 2 +- .../api/core/-attachment/open-as-j-a-r.html | 2 +- .../build/html/api/core/-attachment/open.html | 2 +- .../core/-authenticated-object/-init-.html | 2 +- .../api/core/-authenticated-object/index.html | 2 +- .../core/-authenticated-object/signers.html | 2 +- .../signing-parties.html | 2 +- .../api/core/-authenticated-object/value.html | 2 +- .../-t-e-s-t_-c-a-l-e-n-d-a-r_-d-a-t-a.html | 2 +- .../-unknown-calendar/-init-.html | 2 +- .../-unknown-calendar/index.html | 2 +- .../apply-roll-convention.html | 4 +- .../core/-business-calendar/calendars.html | 4 +- .../create-generic-schedule.html | 4 +- .../api/core/-business-calendar/equals.html | 4 +- .../core/-business-calendar/get-instance.html | 4 +- .../core/-business-calendar/hash-code.html | 2 +- .../-business-calendar/holiday-dates.html | 2 +- .../api/core/-business-calendar/index.html | 14 +- .../-business-calendar/is-working-day.html | 4 +- .../move-business-days.html | 4 +- .../parse-date-from-string.html | 4 +- docs/build/html/api/core/-command/-init-.html | 4 +- docs/build/html/api/core/-command/index.html | 2 +- .../build/html/api/core/-command/signers.html | 2 +- .../html/api/core/-command/to-string.html | 2 +- docs/build/html/api/core/-command/value.html | 2 +- .../api/core/-contract-state/contract.html | 2 +- docs/build/html/api/core/-contract/index.html | 2 +- .../-contract/legal-contract-reference.html | 2 +- .../build/html/api/core/-contract/verify.html | 4 +- .../-actual/direction.html | 2 +- .../-actual/is-modified.html | 2 +- .../-following/direction.html | 2 +- .../-following/is-modified.html | 2 +- .../-modified-following/direction.html | 2 +- .../-modified-following/is-modified.html | 2 +- .../-modified-previous/direction.html | 2 +- .../-modified-previous/is-modified.html | 2 +- .../-previous/direction.html | 2 +- .../-previous/is-modified.html | 2 +- .../core/-date-roll-convention/direction.html | 2 +- .../-date-roll-convention/is-modified.html | 2 +- .../api/core/-date-roll-direction/value.html | 2 +- .../core/-day-count-basis-day/to-string.html | 2 +- .../core/-day-count-basis-year/to-string.html | 2 +- .../-expression-deserializer/deserialize.html | 4 +- .../core/-expression-deserializer/index.html | 2 +- .../core/-expression-serializer/index.html | 2 +- .../-expression-serializer/serialize.html | 4 +- .../html/api/core/-expression/-init-.html | 2 +- .../build/html/api/core/-expression/expr.html | 2 +- .../html/api/core/-expression/index.html | 2 +- docs/build/html/api/core/-fix-of/-init-.html | 2 +- docs/build/html/api/core/-fix-of/for-day.html | 2 +- docs/build/html/api/core/-fix-of/index.html | 2 +- docs/build/html/api/core/-fix-of/name.html | 2 +- .../build/html/api/core/-fix-of/of-tenor.html | 2 +- docs/build/html/api/core/-fix/-init-.html | 2 +- docs/build/html/api/core/-fix/index.html | 2 +- docs/build/html/api/core/-fix/of.html | 2 +- docs/build/html/api/core/-fix/value.html | 2 +- .../api/core/-frequency/-annual/index.html | 2 +- .../api/core/-frequency/-annual/offset.html | 4 +- .../api/core/-frequency/-bi-weekly/index.html | 2 +- .../core/-frequency/-bi-weekly/offset.html | 4 +- .../api/core/-frequency/-monthly/index.html | 2 +- .../api/core/-frequency/-monthly/offset.html | 4 +- .../api/core/-frequency/-quarterly/index.html | 2 +- .../core/-frequency/-quarterly/offset.html | 4 +- .../core/-frequency/-semi-annual/index.html | 2 +- .../core/-frequency/-semi-annual/offset.html | 4 +- .../api/core/-frequency/-weekly/index.html | 2 +- .../api/core/-frequency/-weekly/offset.html | 4 +- .../-frequency/annual-compound-count.html | 2 +- .../build/html/api/core/-frequency/index.html | 2 +- .../html/api/core/-frequency/offset.html | 4 +- .../api/core/-ledger-transaction/-init-.html | 2 +- .../core/-ledger-transaction/attachments.html | 2 +- .../core/-ledger-transaction/commands.html | 2 +- .../html/api/core/-ledger-transaction/id.html | 2 +- .../api/core/-ledger-transaction/index.html | 4 +- .../api/core/-ledger-transaction/inputs.html | 2 +- .../api/core/-ledger-transaction/out-ref.html | 4 +- .../api/core/-ledger-transaction/outputs.html | 2 +- .../html/api/core/-linear-state/index.html | 2 +- .../api/core/-linear-state/is-relevant.html | 4 +- .../html/api/core/-linear-state/thread.html | 2 +- .../html/api/core/-named-by-hash/id.html | 2 +- .../html/api/core/-ownable-state/index.html | 2 +- .../html/api/core/-ownable-state/owner.html | 2 +- .../core/-ownable-state/with-new-owner.html | 4 +- .../api/core/-party-and-reference/-init-.html | 2 +- .../api/core/-party-and-reference/index.html | 2 +- .../api/core/-party-and-reference/party.html | 2 +- .../core/-party-and-reference/reference.html | 2 +- .../core/-party-and-reference/to-string.html | 2 +- .../api/core/-party-reference/-init-.html | 2 +- .../html/api/core/-party-reference/index.html | 2 +- docs/build/html/api/core/-party/-init-.html | 2 +- docs/build/html/api/core/-party/index.html | 6 +- docs/build/html/api/core/-party/name.html | 2 +- .../html/api/core/-party/owning-key.html | 2 +- docs/build/html/api/core/-party/ref.html | 8 +- .../build/html/api/core/-party/to-string.html | 2 +- .../build/html/api/core/-requirements/by.html | 4 +- .../html/api/core/-requirements/index.html | 2 +- .../api/core/-signed-transaction/-init-.html | 2 +- .../html/api/core/-signed-transaction/id.html | 2 +- .../api/core/-signed-transaction/index.html | 10 +- .../api/core/-signed-transaction/plus.html | 4 +- .../api/core/-signed-transaction/sigs.html | 2 +- .../api/core/-signed-transaction/tx-bits.html | 2 +- .../html/api/core/-signed-transaction/tx.html | 2 +- .../verify-signatures.html | 2 +- .../api/core/-signed-transaction/verify.html | 4 +- .../with-additional-signature.html | 4 +- .../html/api/core/-state-and-ref/-init-.html | 2 +- .../html/api/core/-state-and-ref/index.html | 2 +- .../html/api/core/-state-and-ref/ref.html | 2 +- .../html/api/core/-state-and-ref/state.html | 2 +- .../html/api/core/-state-ref/--index--.html | 2 +- .../html/api/core/-state-ref/-init-.html | 2 +- .../build/html/api/core/-state-ref/index.html | 2 +- .../html/api/core/-state-ref/to-string.html | 2 +- .../html/api/core/-state-ref/txhash.html | 2 +- docs/build/html/api/core/-tenor/-init-.html | 2 +- .../html/api/core/-tenor/-time-unit/code.html | 2 +- .../api/core/-tenor/days-to-maturity.html | 4 +- docs/build/html/api/core/-tenor/index.html | 4 +- docs/build/html/api/core/-tenor/name.html | 2 +- .../build/html/api/core/-tenor/to-string.html | 2 +- .../api/core/-timestamp-command/-init-.html | 4 +- .../api/core/-timestamp-command/after.html | 2 +- .../api/core/-timestamp-command/before.html | 2 +- .../api/core/-timestamp-command/index.html | 2 +- .../api/core/-timestamp-command/midpoint.html | 2 +- .../api/core/-transaction-builder/-init-.html | 2 +- .../-transaction-builder/add-attachment.html | 4 +- .../-transaction-builder/add-command.html | 12 +- .../-transaction-builder/add-input-state.html | 4 +- .../add-output-state.html | 4 +- .../add-signature-unchecked.html | 4 +- .../-transaction-builder/attachments.html | 2 +- .../check-and-add-signature.html | 4 +- .../-transaction-builder/check-signature.html | 4 +- .../core/-transaction-builder/commands.html | 2 +- .../api/core/-transaction-builder/index.html | 30 +- .../-transaction-builder/input-states.html | 2 +- .../-transaction-builder/output-states.html | 2 +- .../core/-transaction-builder/set-time.html | 6 +- .../core/-transaction-builder/sign-with.html | 4 +- .../api/core/-transaction-builder/time.html | 2 +- .../core/-transaction-builder/timestamp.html | 4 +- .../to-signed-transaction.html | 4 +- .../to-wire-transaction.html | 2 +- .../core/-transaction-builder/with-items.html | 4 +- .../-init-.html | 2 +- .../conflict-ref.html | 2 +- .../index.html | 2 +- .../-transaction-conflict-exception/tx1.html | 2 +- .../-transaction-conflict-exception/tx2.html | 2 +- .../-in-out-group/-init-.html | 2 +- .../-in-out-group/grouping-key.html | 2 +- .../-in-out-group/index.html | 2 +- .../-in-out-group/inputs.html | 2 +- .../-in-out-group/outputs.html | 2 +- .../-transaction-for-verification/-init-.html | 2 +- .../attachments.html | 2 +- .../commands.html | 2 +- .../-transaction-for-verification/equals.html | 4 +- .../get-timestamp-by.html | 4 +- .../group-states-internal.html | 4 +- .../group-states.html | 8 +- .../hash-code.html | 2 +- .../in-states.html | 2 +- .../-transaction-for-verification/index.html | 12 +- .../orig-hash.html | 2 +- .../out-states.html | 2 +- .../-transaction-for-verification/verify.html | 2 +- .../-transaction-graph-search/-init-.html | 2 +- .../-query/-init-.html | 2 +- .../-query/index.html | 2 +- .../-query/with-command-of-type.html | 2 +- .../core/-transaction-graph-search/call.html | 2 +- .../core/-transaction-graph-search/index.html | 2 +- .../core/-transaction-graph-search/query.html | 2 +- .../start-points.html | 2 +- .../transactions.html | 2 +- .../api/core/-transaction-group/-init-.html | 6 +- .../api/core/-transaction-group/index.html | 2 +- .../non-verified-roots.html | 2 +- .../core/-transaction-group/transactions.html | 2 +- .../api/core/-transaction-group/verify.html | 2 +- .../-init-.html | 2 +- .../hash.html | 2 +- .../index.html | 2 +- .../-init-.html | 2 +- .../contract.html | 2 +- .../index.html | 2 +- .../tx.html | 2 +- .../core/-type-only-command-data/equals.html | 4 +- .../-type-only-command-data/hash-code.html | 2 +- .../core/-type-only-command-data/index.html | 2 +- .../api/core/-wire-transaction/-init-.html | 2 +- .../core/-wire-transaction/attachments.html | 2 +- .../api/core/-wire-transaction/commands.html | 2 +- .../core/-wire-transaction/deserialize.html | 4 +- .../html/api/core/-wire-transaction/id.html | 2 +- .../api/core/-wire-transaction/index.html | 10 +- .../api/core/-wire-transaction/inputs.html | 2 +- .../api/core/-wire-transaction/out-ref.html | 8 +- .../api/core/-wire-transaction/outputs.html | 2 +- .../core/-wire-transaction/serialized.html | 2 +- .../api/core/-wire-transaction/to-string.html | 2 +- .../html/api/core/calculate-days-between.html | 4 +- docs/build/html/api/core/hash.html | 2 +- docs/build/html/api/core/index.html | 10 +- .../api/core/java.time.-local-date/index.html | 2 +- .../java.time.-local-date/is-working-day.html | 4 +- .../kotlin.collections.-iterable/index.html | 2 +- .../sum-or-null.html | 2 +- .../sum-or-throw.html | 2 +- .../sum-or-zero.html | 4 +- .../filter-states-of-type.html | 2 +- .../get-timestamp-by-name.html | 4 +- .../get-timestamp-by.html | 4 +- .../core/kotlin.collections.-list/index.html | 8 +- .../require-single-command.html | 6 +- .../core/kotlin.collections.-list/select.html | 4 +- docs/build/html/api/core/require-that.html | 4 +- .../html/api/core/to-ledger-transaction.html | 4 +- .../html/api/core/verify-move-commands.html | 4 +- .../core/verify-to-ledger-transaction.html | 4 +- .../-handler/-callback/-init-.html | 2 +- .../-handler/-callback/index.html | 4 +- .../-handler/-callback/on-success.html | 4 +- .../-requester/index.html | 2 +- .../-requester/not-us.html | 4 +- .../-updater/index.html | 4 +- .../-updater/process-deal.html | 4 +- .../-updater/process-interest-rate-swap.html | 4 +- docs/build/html/api/index-outline.html | 846 +++++++++--------- .../-fetch-attachments-protocol/index.html | 2 +- .../maybe-write-to-disk.html | 4 +- .../protocols/-rates-fix-protocol/-init-.html | 2 +- .../-query-request/-init-.html | 2 +- .../-query-request/index.html | 2 +- .../-sign-request/-init-.html | 2 +- .../-sign-request/index.html | 2 +- .../-rates-fix-protocol/before-signing.html | 4 +- .../protocols/-rates-fix-protocol/index.html | 4 +- .../-init-.html | 4 +- .../-resolve-transactions-protocol/index.html | 4 +- .../-timestamping-protocol/-client/index.html | 2 +- .../-client/timestamp.html | 4 +- .../-timestamping-protocol/-init-.html | 2 +- .../-request/-init-.html | 2 +- .../-request/index.html | 2 +- .../-timestamping-protocol/index.html | 2 +- .../-acceptor/-init-.html | 2 +- .../-acceptor/index.html | 2 +- .../-deal-mismatch-exception/-init-.html | 2 +- .../-deal-mismatch-exception/index.html | 2 +- .../-deal-ref-mismatch-exception/-init-.html | 2 +- .../-deal-ref-mismatch-exception/index.html | 2 +- .../-fixer/-init-.html | 2 +- .../-fixer/assemble-shared-t-x.html | 4 +- .../-fixer/index.html | 6 +- .../-fixer/validate-handshake.html | 4 +- .../-floater/-init-.html | 2 +- .../-floater/index.html | 6 +- .../-instigator/index.html | 4 +- .../-primary/index.html | 4 +- .../-primary/sign-with-our-key.html | 4 +- .../-primary/verify-partial-transaction.html | 4 +- .../-secondary/-init-.html | 2 +- .../-secondary/index.html | 2 +- .../-buyer/-init-.html | 2 +- .../-buyer/index.html | 2 +- .../-seller-trade-info/-init-.html | 2 +- .../-seller-trade-info/index.html | 2 +- .../-seller/-init-.html | 2 +- .../-seller/index.html | 4 +- .../-seller/sign-with-our-key.html | 4 +- .../-unacceptable-price-exception/-init-.html | 2 +- .../-unacceptable-price-exception/index.html | 2 +- .../-two-party-trade-protocol/index.html | 4 +- .../-two-party-trade-protocol/run-buyer.html | 4 +- .../-two-party-trade-protocol/run-seller.html | 4 +- docs/source/tutorial_contract.rst | 2 +- gradle.properties | 2 +- src/main/kotlin/api/APIServer.kt | 8 +- src/main/kotlin/api/APIServerImpl.kt | 1 + src/main/kotlin/core/node/AbstractNode.kt | 2 +- .../services/InMemoryUniquenessProvider.kt | 6 +- .../core/node/services/NetworkMapService.kt | 2 +- .../node/services/NodeAttachmentService.kt | 2 +- .../core/node/services/NodeInterestRates.kt | 2 + .../core/node/services/NotaryService.kt | 6 +- .../core/node/services/TimestampChecker.kt | 2 +- .../node/subsystems/DataVendingService.kt | 2 +- .../subsystems/InMemoryIdentityService.kt | 2 +- .../subsystems/InMemoryNetworkMapCache.kt | 4 +- .../core/node/subsystems/NodeWalletService.kt | 2 + .../node/subsystems/StorageServiceImpl.kt | 4 +- .../kotlin/core/node/subsystems/WalletImpl.kt | 8 +- src/main/kotlin/core/testing/IRSSimulation.kt | 2 + .../core/testing/MockIdentityService.kt | 2 +- .../core/testing/MockNetworkMapCache.kt | 2 +- src/main/kotlin/core/testing/MockNode.kt | 2 +- .../kotlin/core/testing/TradeSimulation.kt | 4 +- src/main/kotlin/core/utilities/JsonSupport.kt | 4 +- src/main/kotlin/demos/IRSDemo.kt | 2 +- src/main/kotlin/demos/RateFixDemo.kt | 4 + src/main/kotlin/demos/TraderDemo.kt | 2 + .../demos/protocols/AutoOfferProtocol.kt | 6 +- .../protocols/UpdateBusinessDayProtocol.kt | 4 +- .../kotlin/protocols/TwoPartyTradeProtocol.kt | 2 + src/test/kotlin/contracts/CashTests.kt | 2 + .../kotlin/contracts/CommercialPaperTests.kt | 1 + src/test/kotlin/contracts/CrowdFundTests.kt | 1 + src/test/kotlin/contracts/IRSTests.kt | 1 + src/test/kotlin/core/MockServices.kt | 1 + src/test/kotlin/core/TransactionGroupTests.kt | 1 + .../kotlin/core/messaging/AttachmentTests.kt | 2 +- .../messaging/TwoPartyTradeProtocolTests.kt | 6 +- .../core/node/AttachmentClassLoaderTests.kt | 2 + .../node/services/NodeInterestRatesTest.kt | 6 +- .../core/node/services/NotaryServiceTests.kt | 2 +- .../node/services/TimestampCheckerTests.kt | 2 +- .../node/services/UniquenessProviderTests.kt | 2 +- .../node/subsystems/NodeWalletServiceTest.kt | 4 + .../TransactionSerializationTests.kt | 1 + src/test/kotlin/core/testutils/TestUtils.kt | 1 + .../core/visualiser/GroupToGraphConversion.kt | 4 +- src/test/resources/core/node/isolated.jar | Bin 6912 -> 6945 bytes 546 files changed, 1384 insertions(+), 1287 deletions(-) rename core/src/main/kotlin/core/{ => contracts}/ContractsDSL.kt (98%) rename core/src/main/kotlin/core/{ => contracts}/FinanceTypes.kt (99%) rename core/src/main/kotlin/core/{ => contracts}/Structures.kt (96%) rename core/src/main/kotlin/core/{ => contracts}/TransactionBuilder.kt (97%) rename core/src/main/kotlin/core/{ => contracts}/TransactionGraphSearch.kt (92%) rename core/src/main/kotlin/core/{ => contracts}/TransactionTools.kt (88%) rename core/src/main/kotlin/core/{ => contracts}/TransactionVerification.kt (99%) rename core/src/main/kotlin/core/{ => contracts}/Transactions.kt (99%) create mode 100644 core/src/main/kotlin/core/crypto/Party.kt rename core/src/main/resources/core/{ => contracts}/LondonHolidayCalendar.txt (100%) rename core/src/main/resources/core/{ => contracts}/NewYorkHolidayCalendar.txt (100%) diff --git a/contracts/isolated/src/main/kotlin/contracts/AnotherDummyContract.kt b/contracts/isolated/src/main/kotlin/contracts/AnotherDummyContract.kt index 32146ab88c..e2762df95c 100644 --- a/contracts/isolated/src/main/kotlin/contracts/AnotherDummyContract.kt +++ b/contracts/isolated/src/main/kotlin/contracts/AnotherDummyContract.kt @@ -9,6 +9,8 @@ package contracts.isolated import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash // The dummy contract doesn't do anything useful. It exists for testing purposes. @@ -36,6 +38,6 @@ class AnotherDummyContract : Contract, core.node.DummyContractBackdoor { return TransactionBuilder().withItems(state, Command(Commands.Create(), owner.party.owningKey)) } - override fun inspectState(state: core.ContractState): Int = (state as State).magicNumber + override fun inspectState(state: ContractState): Int = (state as State).magicNumber } \ No newline at end of file diff --git a/contracts/isolated/src/main/kotlin/core/node/DummyContractBackdoor.kt b/contracts/isolated/src/main/kotlin/core/node/DummyContractBackdoor.kt index 50f16869c9..22560d4f8a 100644 --- a/contracts/isolated/src/main/kotlin/core/node/DummyContractBackdoor.kt +++ b/contracts/isolated/src/main/kotlin/core/node/DummyContractBackdoor.kt @@ -1,7 +1,12 @@ package core.node -interface DummyContractBackdoor { - fun generateInitial(owner: core.PartyAndReference, magicNumber: Int, notary: core.Party): core.TransactionBuilder +import core.contracts.ContractState +import core.crypto.Party +import core.contracts.PartyAndReference +import core.contracts.TransactionBuilder - fun inspectState(state: core.ContractState): Int +interface DummyContractBackdoor { + fun generateInitial(owner: PartyAndReference, magicNumber: Int, notary: Party): TransactionBuilder + + fun inspectState(state: ContractState): Int } \ No newline at end of file diff --git a/contracts/src/main/java/contracts/ICommercialPaperState.java b/contracts/src/main/java/contracts/ICommercialPaperState.java index 9c08b81539..5cde906a9d 100644 --- a/contracts/src/main/java/contracts/ICommercialPaperState.java +++ b/contracts/src/main/java/contracts/ICommercialPaperState.java @@ -1,6 +1,8 @@ package contracts; -import core.*; +import core.contracts.Amount; +import core.contracts.ContractState; +import core.contracts.PartyAndReference; import java.security.*; import java.time.*; diff --git a/contracts/src/main/java/contracts/JavaCommercialPaper.java b/contracts/src/main/java/contracts/JavaCommercialPaper.java index e3fe617bba..7b283c31f7 100644 --- a/contracts/src/main/java/contracts/JavaCommercialPaper.java +++ b/contracts/src/main/java/contracts/JavaCommercialPaper.java @@ -1,8 +1,9 @@ package contracts; -import core.*; -import core.TransactionForVerification.InOutGroup; +import core.contracts.TransactionForVerification.InOutGroup; +import core.contracts.*; import core.crypto.NullPublicKey; +import core.crypto.Party; import core.crypto.SecureHash; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -11,7 +12,7 @@ import java.security.PublicKey; import java.time.Instant; import java.util.List; -import static core.ContractsDSLKt.requireSingleCommand; +import static core.contracts.ContractsDSLKt.requireSingleCommand; import static kotlin.collections.CollectionsKt.single; @@ -119,7 +120,7 @@ public class JavaCommercialPaper implements Contract { } } - public static class Commands implements core.CommandData { + public static class Commands implements CommandData { public static class Move extends Commands { @Override public boolean equals(Object obj) { diff --git a/contracts/src/main/kotlin/contracts/Cash.kt b/contracts/src/main/kotlin/contracts/Cash.kt index 6961688ef0..2707ea05a7 100644 --- a/contracts/src/main/kotlin/contracts/Cash.kt +++ b/contracts/src/main/kotlin/contracts/Cash.kt @@ -3,6 +3,8 @@ package contracts import contracts.cash.CashIssuanceDefinition import contracts.cash.CommonCashState import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import core.crypto.toStringShort import core.utilities.Emoji @@ -185,7 +187,7 @@ class Cash : Contract { */ @Throws(InsufficientBalanceException::class) fun generateSpend(tx: TransactionBuilder, amount: Amount, to: PublicKey, - cashStates: List>, onlyFromParties: Set? = null): List { + cashStates: List>, onlyFromParties: Set? = null): List { // Discussion // // This code is analogous to the Wallet.send() set of methods in bitcoinj, and has the same general outline. @@ -215,7 +217,7 @@ class Cash : Contract { ofCurrency } - val gathered = arrayListOf>() + val gathered = arrayListOf>() var gatheredAmount = Amount(0, currency) for (c in acceptableCoins) { if (gatheredAmount >= amount) break diff --git a/contracts/src/main/kotlin/contracts/CommercialPaper.kt b/contracts/src/main/kotlin/contracts/CommercialPaper.kt index 5e4587bfa3..57c970a5cc 100644 --- a/contracts/src/main/kotlin/contracts/CommercialPaper.kt +++ b/contracts/src/main/kotlin/contracts/CommercialPaper.kt @@ -1,7 +1,9 @@ package contracts import core.* +import core.contracts.* import core.crypto.NullPublicKey +import core.crypto.Party import core.crypto.SecureHash import core.crypto.toStringShort import core.utilities.Emoji diff --git a/contracts/src/main/kotlin/contracts/CrowdFund.kt b/contracts/src/main/kotlin/contracts/CrowdFund.kt index 4b7709aaa0..13c4d12848 100644 --- a/contracts/src/main/kotlin/contracts/CrowdFund.kt +++ b/contracts/src/main/kotlin/contracts/CrowdFund.kt @@ -1,6 +1,8 @@ package contracts import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import java.security.PublicKey import java.time.Instant @@ -80,7 +82,7 @@ class CrowdFund : Contract { when (command.value) { is Commands.Register -> { requireThat { - "there is no input state" by tx.inStates.filterIsInstance().isEmpty() + "there is no input state" by tx.inStates.filterIsInstance().isEmpty() "the transaction is signed by the owner of the crowdsourcing" by (command.signers.contains(outputCrowdFund.campaign.owner)) "the output registration is empty of pledges" by (outputCrowdFund.pledges.isEmpty()) "the output registration has a non-zero target" by (outputCrowdFund.campaign.target.pennies > 0) diff --git a/contracts/src/main/kotlin/contracts/DummyContract.kt b/contracts/src/main/kotlin/contracts/DummyContract.kt index b43fae4284..c47003d1f9 100644 --- a/contracts/src/main/kotlin/contracts/DummyContract.kt +++ b/contracts/src/main/kotlin/contracts/DummyContract.kt @@ -1,6 +1,8 @@ package contracts import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash // The dummy contract doesn't do anything useful. It exists for testing purposes. diff --git a/contracts/src/main/kotlin/contracts/IRS.kt b/contracts/src/main/kotlin/contracts/IRS.kt index 503585bc52..d01c61f63d 100644 --- a/contracts/src/main/kotlin/contracts/IRS.kt +++ b/contracts/src/main/kotlin/contracts/IRS.kt @@ -1,6 +1,8 @@ package contracts import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import org.apache.commons.jexl3.JexlBuilder import org.apache.commons.jexl3.MapContext @@ -503,8 +505,8 @@ class InterestRateSwap() : Contract { "There are no in states for an agreement" by inputs.isEmpty() "There are events in the fix schedule" by (irs.calculation.fixedLegPaymentSchedule.size > 0) "There are events in the float schedule" by (irs.calculation.floatingLegPaymentSchedule.size > 0) - "All notionals must be non zero" by ( irs.fixedLeg.notional.pennies > 0 && irs.floatingLeg.notional.pennies > 0) - "The fixed leg rate must be positive" by ( irs.fixedLeg.fixedRate.isPositive() ) + "All notionals must be non zero" by (irs.fixedLeg.notional.pennies > 0 && irs.floatingLeg.notional.pennies > 0) + "The fixed leg rate must be positive" by (irs.fixedLeg.fixedRate.isPositive()) "The currency of the notionals must be the same" by (irs.fixedLeg.notional.currency == irs.floatingLeg.notional.currency) "All leg notionals must be the same" by (irs.fixedLeg.notional == irs.floatingLeg.notional) @@ -539,7 +541,7 @@ class InterestRateSwap() : Contract { val fixValue = fixCommand.value // Need to check that everything is the same apart from the new fixed rate entry. requireThat { - "The fixed leg parties are constant" by ( irs.fixedLeg.fixedRatePayer == prevIrs.fixedLeg.fixedRatePayer) // Although superseded by the below test, this is included for a regression issue + "The fixed leg parties are constant" by (irs.fixedLeg.fixedRatePayer == prevIrs.fixedLeg.fixedRatePayer) // Although superseded by the below test, this is included for a regression issue "The fixed leg is constant" by (irs.fixedLeg == prevIrs.fixedLeg) "The floating leg is constant" by (irs.floatingLeg == prevIrs.floatingLeg) "The common values are constant" by (irs.common == prevIrs.common) @@ -548,7 +550,7 @@ class InterestRateSwap() : Contract { "There is only one changed payment in the floating leg" by (paymentDifferences.size == 1) "There changed payment is a floating payment" by (oldFloatingRatePaymentEvent.rate is ReferenceRate) "The new payment is a fixed payment" by (newFixedRatePaymentEvent.rate is FixedRate) - "The changed payments dates are aligned" by ( oldFloatingRatePaymentEvent.date == newFixedRatePaymentEvent.date) + "The changed payments dates are aligned" by (oldFloatingRatePaymentEvent.date == newFixedRatePaymentEvent.date) "The new payment has the correct rate" by (newFixedRatePaymentEvent.rate.ratioUnit!!.value == fixValue.value) "The fixing is for the next required date" by (prevIrs.calculation.nextFixingDate() == fixValue.of.forDay) "The fix payment has the same currency as the notional" by (newFixedRatePaymentEvent.flow.currency == irs.floatingLeg.notional.currency) diff --git a/contracts/src/main/kotlin/contracts/IRSUtils.kt b/contracts/src/main/kotlin/contracts/IRSUtils.kt index 4cab943f50..62aa3bca89 100644 --- a/contracts/src/main/kotlin/contracts/IRSUtils.kt +++ b/contracts/src/main/kotlin/contracts/IRSUtils.kt @@ -1,7 +1,7 @@ package contracts -import core.Amount -import core.Tenor +import core.contracts.Amount +import core.contracts.Tenor import java.math.BigDecimal diff --git a/contracts/src/main/kotlin/contracts/cash/CashIssuanceDefinition.kt b/contracts/src/main/kotlin/contracts/cash/CashIssuanceDefinition.kt index 9519289a04..7098013e5b 100644 --- a/contracts/src/main/kotlin/contracts/cash/CashIssuanceDefinition.kt +++ b/contracts/src/main/kotlin/contracts/cash/CashIssuanceDefinition.kt @@ -1,7 +1,7 @@ package contracts.cash -import core.IssuanceDefinition -import core.PartyAndReference +import core.contracts.IssuanceDefinition +import core.contracts.PartyAndReference import java.util.* /** diff --git a/contracts/src/main/kotlin/contracts/cash/CommonCashState.kt b/contracts/src/main/kotlin/contracts/cash/CommonCashState.kt index cce0e1871b..ee842d5f42 100644 --- a/contracts/src/main/kotlin/contracts/cash/CommonCashState.kt +++ b/contracts/src/main/kotlin/contracts/cash/CommonCashState.kt @@ -1,8 +1,8 @@ package contracts.cash -import core.Amount -import core.OwnableState -import core.PartyAndReference +import core.contracts.Amount +import core.contracts.OwnableState +import core.contracts.PartyAndReference /** * Common elements of cash contract states. diff --git a/core/src/main/kotlin/core/ContractsDSL.kt b/core/src/main/kotlin/core/contracts/ContractsDSL.kt similarity index 98% rename from core/src/main/kotlin/core/ContractsDSL.kt rename to core/src/main/kotlin/core/contracts/ContractsDSL.kt index 54e55130cc..bec287067d 100644 --- a/core/src/main/kotlin/core/ContractsDSL.kt +++ b/core/src/main/kotlin/core/contracts/ContractsDSL.kt @@ -1,5 +1,7 @@ -package core +package core.contracts +import core.* +import core.crypto.Party import java.security.PublicKey import java.util.* diff --git a/core/src/main/kotlin/core/FinanceTypes.kt b/core/src/main/kotlin/core/contracts/FinanceTypes.kt similarity index 99% rename from core/src/main/kotlin/core/FinanceTypes.kt rename to core/src/main/kotlin/core/contracts/FinanceTypes.kt index e10e735c96..4a8f9ebab3 100644 --- a/core/src/main/kotlin/core/FinanceTypes.kt +++ b/core/src/main/kotlin/core/contracts/FinanceTypes.kt @@ -1,4 +1,4 @@ -package core +package core.contracts import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.JsonSerializer import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize +import core.contracts.CommandData import java.math.BigDecimal import java.time.DayOfWeek import java.time.LocalDate @@ -304,7 +305,7 @@ open class BusinessCalendar private constructor(val calendars: Array /** Calculates an event schedule that moves events around to ensure they fall on working days. */ fun createGenericSchedule(startDate: LocalDate, period: Frequency, - calendar: BusinessCalendar = BusinessCalendar.getInstance(), + calendar: BusinessCalendar = getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, diff --git a/core/src/main/kotlin/core/Structures.kt b/core/src/main/kotlin/core/contracts/Structures.kt similarity index 96% rename from core/src/main/kotlin/core/Structures.kt rename to core/src/main/kotlin/core/contracts/Structures.kt index bead33a49e..1b88425775 100644 --- a/core/src/main/kotlin/core/Structures.kt +++ b/core/src/main/kotlin/core/contracts/Structures.kt @@ -1,5 +1,10 @@ -package core +package core.contracts +import core.contracts.TransactionBuilder +import core.contracts.TransactionForVerification +import core.contracts.Fix +import core.contracts.FixOf +import core.crypto.Party import core.crypto.SecureHash import core.crypto.toStringShort import core.serialization.OpaqueBytes @@ -126,14 +131,6 @@ inline fun List>.filterSt return mapNotNull { if (it.state is T) StateAndRef(it.state, it.ref) else null } } -/** A [Party] is well known (name, pubkey) pair. In a real system this would probably be an X.509 certificate. */ -data class Party(val name: String, val owningKey: PublicKey) { - override fun toString() = name - - fun ref(bytes: OpaqueBytes) = PartyAndReference(this, bytes) - fun ref(vararg bytes: Byte) = ref(OpaqueBytes.of(*bytes)) -} - /** * Reference to something being stored or issued by a party e.g. in a vault or (more likely) on their normal * ledger. The reference is intended to be encrypted so it's meaningless to anyone other than the party. diff --git a/core/src/main/kotlin/core/TransactionBuilder.kt b/core/src/main/kotlin/core/contracts/TransactionBuilder.kt similarity index 97% rename from core/src/main/kotlin/core/TransactionBuilder.kt rename to core/src/main/kotlin/core/contracts/TransactionBuilder.kt index ed6629413a..f248ddd829 100644 --- a/core/src/main/kotlin/core/TransactionBuilder.kt +++ b/core/src/main/kotlin/core/contracts/TransactionBuilder.kt @@ -1,6 +1,10 @@ -package core +package core.contracts +import core.contracts.SignedTransaction +import core.contracts.WireTransaction +import core.contracts.* import core.crypto.DigitalSignature +import core.crypto.Party import core.crypto.SecureHash import core.crypto.signWithECDSA import core.serialization.serialize diff --git a/core/src/main/kotlin/core/TransactionGraphSearch.kt b/core/src/main/kotlin/core/contracts/TransactionGraphSearch.kt similarity index 92% rename from core/src/main/kotlin/core/TransactionGraphSearch.kt rename to core/src/main/kotlin/core/contracts/TransactionGraphSearch.kt index 1099579fab..901d0b41b4 100644 --- a/core/src/main/kotlin/core/TransactionGraphSearch.kt +++ b/core/src/main/kotlin/core/contracts/TransactionGraphSearch.kt @@ -1,5 +1,8 @@ -package core +package core.contracts +import core.contracts.SignedTransaction +import core.contracts.WireTransaction +import core.contracts.CommandData import core.crypto.SecureHash import java.util.* import java.util.concurrent.Callable diff --git a/core/src/main/kotlin/core/TransactionTools.kt b/core/src/main/kotlin/core/contracts/TransactionTools.kt similarity index 88% rename from core/src/main/kotlin/core/TransactionTools.kt rename to core/src/main/kotlin/core/contracts/TransactionTools.kt index 026d72030b..d2e223a6f1 100644 --- a/core/src/main/kotlin/core/TransactionTools.kt +++ b/core/src/main/kotlin/core/contracts/TransactionTools.kt @@ -1,5 +1,9 @@ -package core +package core.contracts +import core.contracts.AuthenticatedObject +import core.contracts.LedgerTransaction +import core.contracts.SignedTransaction +import core.contracts.WireTransaction import core.node.services.AttachmentStorage import core.node.services.IdentityService import java.io.FileNotFoundException diff --git a/core/src/main/kotlin/core/TransactionVerification.kt b/core/src/main/kotlin/core/contracts/TransactionVerification.kt similarity index 99% rename from core/src/main/kotlin/core/TransactionVerification.kt rename to core/src/main/kotlin/core/contracts/TransactionVerification.kt index 5a9b878831..9902cdf25a 100644 --- a/core/src/main/kotlin/core/TransactionVerification.kt +++ b/core/src/main/kotlin/core/contracts/TransactionVerification.kt @@ -1,5 +1,7 @@ -package core +package core.contracts +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import java.util.* diff --git a/core/src/main/kotlin/core/Transactions.kt b/core/src/main/kotlin/core/contracts/Transactions.kt similarity index 99% rename from core/src/main/kotlin/core/Transactions.kt rename to core/src/main/kotlin/core/contracts/Transactions.kt index a485605647..9166b32e73 100644 --- a/core/src/main/kotlin/core/Transactions.kt +++ b/core/src/main/kotlin/core/contracts/Transactions.kt @@ -1,9 +1,11 @@ -package core +package core.contracts import com.esotericsoftware.kryo.Kryo +import core.contracts.* import core.crypto.DigitalSignature import core.crypto.SecureHash import core.crypto.toStringShort +import core.indexOfOrThrow import core.serialization.SerializedBytes import core.serialization.THREAD_LOCAL_KRYO import core.serialization.deserialize diff --git a/core/src/main/kotlin/core/crypto/CryptoUtilities.kt b/core/src/main/kotlin/core/crypto/CryptoUtilities.kt index f5a30e7c2c..d79c9e831b 100644 --- a/core/src/main/kotlin/core/crypto/CryptoUtilities.kt +++ b/core/src/main/kotlin/core/crypto/CryptoUtilities.kt @@ -1,7 +1,7 @@ package core.crypto import com.google.common.io.BaseEncoding -import core.Party +import core.crypto.Party import core.serialization.OpaqueBytes import core.serialization.SerializedBytes import core.serialization.deserialize diff --git a/core/src/main/kotlin/core/crypto/Party.kt b/core/src/main/kotlin/core/crypto/Party.kt new file mode 100644 index 0000000000..b1237f3ada --- /dev/null +++ b/core/src/main/kotlin/core/crypto/Party.kt @@ -0,0 +1,16 @@ +package core.crypto + +import core.contracts.PartyAndReference +import core.serialization.OpaqueBytes +import java.security.PublicKey + +/** + * Created by matth on 14/05/2016. + */ +/** A [Party] is well known (name, pubkey) pair. In a real system this would probably be an X.509 certificate. */ +data class Party(val name: String, val owningKey: PublicKey) { + override fun toString() = name + + fun ref(bytes: OpaqueBytes) = PartyAndReference(this, bytes) + fun ref(vararg bytes: Byte) = ref(OpaqueBytes.of(*bytes)) +} \ No newline at end of file diff --git a/core/src/main/kotlin/core/node/AttachmentsClassLoader.kt b/core/src/main/kotlin/core/node/AttachmentsClassLoader.kt index 3fb9878109..6c80332b21 100644 --- a/core/src/main/kotlin/core/node/AttachmentsClassLoader.kt +++ b/core/src/main/kotlin/core/node/AttachmentsClassLoader.kt @@ -1,6 +1,6 @@ package core.node -import core.Attachment +import core.contracts.Attachment import core.crypto.SecureHash import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream diff --git a/core/src/main/kotlin/core/node/NodeInfo.kt b/core/src/main/kotlin/core/node/NodeInfo.kt index a5abf72df2..96a200d453 100644 --- a/core/src/main/kotlin/core/node/NodeInfo.kt +++ b/core/src/main/kotlin/core/node/NodeInfo.kt @@ -1,6 +1,6 @@ package core.node -import core.Party +import core.crypto.Party import core.messaging.SingleMessageRecipient import core.node.services.ServiceType diff --git a/core/src/main/kotlin/core/node/ServiceHub.kt b/core/src/main/kotlin/core/node/ServiceHub.kt index e278ca5ee9..b5ead2d5e0 100644 --- a/core/src/main/kotlin/core/node/ServiceHub.kt +++ b/core/src/main/kotlin/core/node/ServiceHub.kt @@ -1,6 +1,7 @@ package core.node import core.* +import core.contracts.* import core.crypto.SecureHash import core.messaging.MessagingService import core.node.services.IdentityService diff --git a/core/src/main/kotlin/core/node/services/AttachmentStorage.kt b/core/src/main/kotlin/core/node/services/AttachmentStorage.kt index 5eefb4427d..91732ab0a1 100644 --- a/core/src/main/kotlin/core/node/services/AttachmentStorage.kt +++ b/core/src/main/kotlin/core/node/services/AttachmentStorage.kt @@ -1,6 +1,6 @@ package core.node.services -import core.Attachment +import core.contracts.Attachment import core.crypto.SecureHash import java.io.InputStream diff --git a/core/src/main/kotlin/core/node/services/IdentityService.kt b/core/src/main/kotlin/core/node/services/IdentityService.kt index ae312f51fd..31e3b6e848 100644 --- a/core/src/main/kotlin/core/node/services/IdentityService.kt +++ b/core/src/main/kotlin/core/node/services/IdentityService.kt @@ -1,6 +1,6 @@ package core.node.services -import core.Party +import core.crypto.Party import java.security.PublicKey /** diff --git a/core/src/main/kotlin/core/node/services/UniquenessProvider.kt b/core/src/main/kotlin/core/node/services/UniquenessProvider.kt index e9be4c4b3d..1b642c95ee 100644 --- a/core/src/main/kotlin/core/node/services/UniquenessProvider.kt +++ b/core/src/main/kotlin/core/node/services/UniquenessProvider.kt @@ -1,8 +1,8 @@ package core.node.services -import core.Party -import core.StateRef -import core.WireTransaction +import core.crypto.Party +import core.contracts.StateRef +import core.contracts.WireTransaction import core.crypto.SecureHash /** diff --git a/core/src/main/kotlin/core/node/subsystems/NetworkMapCache.kt b/core/src/main/kotlin/core/node/subsystems/NetworkMapCache.kt index cf96b5eab4..f1e7e3f9e4 100644 --- a/core/src/main/kotlin/core/node/subsystems/NetworkMapCache.kt +++ b/core/src/main/kotlin/core/node/subsystems/NetworkMapCache.kt @@ -1,8 +1,8 @@ package core.node.subsystems import com.google.common.util.concurrent.ListenableFuture -import core.Contract -import core.Party +import core.contracts.Contract +import core.crypto.Party import core.crypto.SecureHash import core.messaging.MessagingService import core.node.NodeInfo diff --git a/core/src/main/kotlin/core/node/subsystems/Services.kt b/core/src/main/kotlin/core/node/subsystems/Services.kt index 832c7e9f12..f9978f71fa 100644 --- a/core/src/main/kotlin/core/node/subsystems/Services.kt +++ b/core/src/main/kotlin/core/node/subsystems/Services.kt @@ -2,6 +2,8 @@ package core.node.subsystems import com.codahale.metrics.MetricRegistry import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import core.node.services.AttachmentStorage import core.node.storage.CheckpointStorage diff --git a/core/src/main/kotlin/core/serialization/Kryo.kt b/core/src/main/kotlin/core/serialization/Kryo.kt index 40ff9ededd..bf20a92881 100644 --- a/core/src/main/kotlin/core/serialization/Kryo.kt +++ b/core/src/main/kotlin/core/serialization/Kryo.kt @@ -9,6 +9,7 @@ import com.esotericsoftware.kryo.io.Input import com.esotericsoftware.kryo.io.Output import com.esotericsoftware.kryo.serializers.JavaSerializer import core.* +import core.contracts.* import core.crypto.SecureHash import core.crypto.generateKeyPair import core.crypto.sha256 diff --git a/core/src/main/kotlin/protocols/FetchAttachmentsProtocol.kt b/core/src/main/kotlin/protocols/FetchAttachmentsProtocol.kt index a39810cb3f..2db2a5cbf2 100644 --- a/core/src/main/kotlin/protocols/FetchAttachmentsProtocol.kt +++ b/core/src/main/kotlin/protocols/FetchAttachmentsProtocol.kt @@ -1,6 +1,6 @@ package protocols -import core.Attachment +import core.contracts.Attachment import core.crypto.SecureHash import core.crypto.sha256 import core.messaging.SingleMessageRecipient diff --git a/core/src/main/kotlin/protocols/FetchDataProtocol.kt b/core/src/main/kotlin/protocols/FetchDataProtocol.kt index 6c4e09732a..cfd378079c 100644 --- a/core/src/main/kotlin/protocols/FetchDataProtocol.kt +++ b/core/src/main/kotlin/protocols/FetchDataProtocol.kt @@ -1,7 +1,7 @@ package protocols import co.paralleluniverse.fibers.Suspendable -import core.NamedByHash +import core.contracts.NamedByHash import core.crypto.SecureHash import core.messaging.SingleMessageRecipient import core.protocols.ProtocolLogic diff --git a/core/src/main/kotlin/protocols/FetchTransactionsProtocol.kt b/core/src/main/kotlin/protocols/FetchTransactionsProtocol.kt index 53698ed4f6..38ece2ed54 100644 --- a/core/src/main/kotlin/protocols/FetchTransactionsProtocol.kt +++ b/core/src/main/kotlin/protocols/FetchTransactionsProtocol.kt @@ -1,6 +1,6 @@ package protocols -import core.SignedTransaction +import core.contracts.SignedTransaction import core.crypto.SecureHash import core.messaging.SingleMessageRecipient diff --git a/core/src/main/kotlin/protocols/NotaryProtocol.kt b/core/src/main/kotlin/protocols/NotaryProtocol.kt index 93f1dbb13f..b4b7c591bd 100644 --- a/core/src/main/kotlin/protocols/NotaryProtocol.kt +++ b/core/src/main/kotlin/protocols/NotaryProtocol.kt @@ -1,9 +1,9 @@ package protocols import co.paralleluniverse.fibers.Suspendable -import core.Party -import core.TimestampCommand -import core.WireTransaction +import core.crypto.Party +import core.contracts.TimestampCommand +import core.contracts.WireTransaction import core.crypto.DigitalSignature import core.crypto.SignedData import core.messaging.SingleMessageRecipient diff --git a/core/src/main/kotlin/protocols/RatesFixProtocol.kt b/core/src/main/kotlin/protocols/RatesFixProtocol.kt index 254aa1b23a..5f964dd198 100644 --- a/core/src/main/kotlin/protocols/RatesFixProtocol.kt +++ b/core/src/main/kotlin/protocols/RatesFixProtocol.kt @@ -2,6 +2,10 @@ package protocols import co.paralleluniverse.fibers.Suspendable import core.* +import core.contracts.Fix +import core.contracts.FixOf +import core.contracts.TransactionBuilder +import core.contracts.WireTransaction import core.crypto.DigitalSignature import core.messaging.SingleMessageRecipient import core.node.NodeInfo diff --git a/core/src/main/kotlin/protocols/ResolveTransactionsProtocol.kt b/core/src/main/kotlin/protocols/ResolveTransactionsProtocol.kt index 7c22eedebe..c86ab8743a 100644 --- a/core/src/main/kotlin/protocols/ResolveTransactionsProtocol.kt +++ b/core/src/main/kotlin/protocols/ResolveTransactionsProtocol.kt @@ -2,6 +2,7 @@ package protocols import co.paralleluniverse.fibers.Suspendable import core.* +import core.contracts.* import core.crypto.SecureHash import core.messaging.SingleMessageRecipient import core.protocols.ProtocolLogic diff --git a/core/src/main/kotlin/protocols/TwoPartyDealProtocol.kt b/core/src/main/kotlin/protocols/TwoPartyDealProtocol.kt index 51e3c0377c..df518ce36b 100644 --- a/core/src/main/kotlin/protocols/TwoPartyDealProtocol.kt +++ b/core/src/main/kotlin/protocols/TwoPartyDealProtocol.kt @@ -2,7 +2,9 @@ package protocols import co.paralleluniverse.fibers.Suspendable import core.* +import core.contracts.* import core.crypto.DigitalSignature +import core.crypto.Party import core.crypto.signWithECDSA import core.messaging.SingleMessageRecipient import core.node.NodeInfo diff --git a/core/src/main/resources/core/LondonHolidayCalendar.txt b/core/src/main/resources/core/contracts/LondonHolidayCalendar.txt similarity index 100% rename from core/src/main/resources/core/LondonHolidayCalendar.txt rename to core/src/main/resources/core/contracts/LondonHolidayCalendar.txt diff --git a/core/src/main/resources/core/NewYorkHolidayCalendar.txt b/core/src/main/resources/core/contracts/NewYorkHolidayCalendar.txt similarity index 100% rename from core/src/main/resources/core/NewYorkHolidayCalendar.txt rename to core/src/main/resources/core/contracts/NewYorkHolidayCalendar.txt diff --git a/core/src/test/kotlin/core/FinanceTypesTest.kt b/core/src/test/kotlin/core/FinanceTypesTest.kt index 418d12eaa9..a878167efd 100644 --- a/core/src/test/kotlin/core/FinanceTypesTest.kt +++ b/core/src/test/kotlin/core/FinanceTypesTest.kt @@ -1,5 +1,6 @@ package core +import core.contracts.* import org.junit.Test import java.time.LocalDate import java.util.* diff --git a/docs/build/html/_sources/tutorial_contract.txt b/docs/build/html/_sources/tutorial_contract.txt index 98e33e4b5a..cc5f3fcf89 100644 --- a/docs/build/html/_sources/tutorial_contract.txt +++ b/docs/build/html/_sources/tutorial_contract.txt @@ -200,7 +200,7 @@ Let's define a few commands now: .. sourcecode:: java - public static class Commands implements core.Command { + public static class Commands implements core.contract.Command { public static class Move extends Commands { @Override public boolean equals(Object obj) { diff --git a/docs/build/html/api/alltypes/index.html b/docs/build/html/api/alltypes/index.html index b5e41f5157..c3ff70f22b 100644 --- a/docs/build/html/api/alltypes/index.html +++ b/docs/build/html/api/alltypes/index.html @@ -61,7 +61,7 @@ fields such as replyTo and replyToTopic.

-core.AccrualAdjustment +core.contracts.AccrualAdjustment

Simple enum for returning accurals adjusted or unadjusted. We dont actually do anything with this yet though, so its ignored for now.

@@ -91,7 +91,7 @@ for ensuring code runs on the right thread, and also for unit testing.

-core.Amount +core.contracts.Amount

Amount represents a positive quantity of currency, measured in pennies, which are the smallest representable units.

@@ -108,7 +108,7 @@ as well.

-core.Attachment +core.contracts.Attachment

An attachment is a ZIP (or an optionally signed JAR) that contains one or more files. Attachments are meant to contain public static data which can be referenced from transactions and utilised from contracts. Good examples @@ -142,7 +142,7 @@ file paths.

-core.AuthenticatedObject +core.contracts.AuthenticatedObject

Wraps an object that was signed by a public key, which may be a well known/recognised institutional key.

@@ -164,7 +164,7 @@ API call from a single party without bi-directional access to the database of of -core.BusinessCalendar +core.contracts.BusinessCalendar

A business calendar performs date calculations that take into account national holidays and weekends. This is a typical feature of financial contracts, in which a business may not want a payment event to fall on a day when @@ -215,14 +215,14 @@ the same transaction.

-core.Command +core.contracts.Command

Command data/content plus pubkey pair: the signature is stored at the end of the serialized bytes

-core.CommandData +core.contracts.CommandData

Marker interface for classes that represent commands

@@ -249,7 +249,7 @@ and to organise serializers / deserializers for java.time.* classes as necessary -core.Contract +core.contracts.Contract

Implemented by a program that implements business logic on the shared ledger. All participants run this code for every LedgerTransaction they see on the network, for every input and output state. All contracts must accept the @@ -278,7 +278,7 @@ timestamp attached to the transaction itself i.e. it is NOT necessarily the curr -core.ContractState +core.contracts.ContractState

A contract state (or just "state") contains opaque data used by a contract program. It can be thought of as a disk file that the program can use to persist data across transactions. States are immutable: once created they are never @@ -318,7 +318,7 @@ glue that sits between the network layer and the database layer.

-core.DateOffset +core.contracts.DateOffset

Date offset that the fixing is done prior to the accrual start date. Currently not used in the calculation.

@@ -326,7 +326,7 @@ Currently not used in the calculation.

-core.DateRollConvention +core.contracts.DateRollConvention

This reflects what happens if a date on which a business event is supposed to happen actually falls upon a non-working day Depending on the accounting requirement, we can move forward until we get to a business day, or backwards @@ -335,7 +335,7 @@ There are some additional rules which are explained in the individual cases belo -core.DateRollDirection +core.contracts.DateRollDirection

This is utilised in the DateRollConvention class to determine which way we should initially step when finding a business day

@@ -343,7 +343,7 @@ finding a business day

-core.DayCountBasisDay +core.contracts.DayCountBasisDay

This forms the day part of the "Day Count Basis" used for interest calculation. Note that the first character cannot be a number (enum naming constraints), so we drop that @@ -352,7 +352,7 @@ in the toString lest some people get confused.

-core.DayCountBasisYear +core.contracts.DayCountBasisYear

This forms the year part of the "Day Count Basis" used for interest calculation.

@@ -434,20 +434,20 @@ building partially signed transactions.

-core.Expression +core.contracts.Expression

Represents a textual expression of e.g. a formula

-core.ExpressionDeserializer +core.contracts.ExpressionDeserializer -core.ExpressionSerializer +core.contracts.ExpressionSerializer @@ -475,14 +475,14 @@ attachments are saved to local storage automatically.

-core.Fix +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.

-core.FixOf +core.contracts.FixOf

A FixOf identifies the question side of a fix: what day, tenor and type of fix ("LIBOR", "EURIBOR" etc)

@@ -526,7 +526,7 @@ If the rate is null returns a zero payment. // TODO: Is this the desired behavio -core.Frequency +core.contracts.Frequency

Frequency at which an event occurs - the enumerator also casts to an integer specifying the number of times per year that would divide into (eg annually = 1, semiannual = 2, monthly = 12 etc).

@@ -671,7 +671,7 @@ call out to a hardware security module that enforces various auditing and freque -core.LedgerTransaction +core.contracts.LedgerTransaction

A LedgerTransaction wraps the data needed to calculate one or more successor states from a set of input states. It is the first step after extraction from a WireTransaction. The signatures at this point have been lined up @@ -687,7 +687,7 @@ with the commands from the wire, and verified/looked up.

-core.LinearState +core.contracts.LinearState

A state that evolves by superseding itself, all of which share the common "thread"

@@ -798,7 +798,7 @@ This is not an interface because it is too lightweight to bother mocking out.

-core.NamedByHash +core.contracts.NamedByHash

Implemented by anything that can be named by a secure hash value (e.g. transactions, attachments).

@@ -918,20 +918,20 @@ functionality to Java, but it wont arrive for a few years yet

-core.OwnableState +core.contracts.OwnableState -core.Party +core.crypto.Party

A Party is well known (name, pubkey) pair. In a real system this would probably be an X.509 certificate.

-core.PartyAndReference +core.contracts.PartyAndReference

Reference to something being stored or issued by a party e.g. in a vault or (more likely) on their normal ledger. The reference is intended to be encrypted so its meaningless to anyone other than the party.

@@ -952,7 +952,7 @@ ledger. The reference is intended to be encrypted so its meaningless to anyone o -core.PaymentRule +core.contracts.PaymentRule

Whether the payment should be made before the due date, or after it.

@@ -1110,7 +1110,7 @@ e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value -core.Requirements +core.contracts.Requirements @@ -1180,7 +1180,7 @@ contained within.

-core.SignedTransaction +core.contracts.SignedTransaction

Container for a WireTransaction and attached signatures.

@@ -1215,7 +1215,7 @@ Points at which polynomial pieces connect are known as knots.

-core.StateAndRef +core.contracts.StateAndRef

A StateAndRef is simply a (state, ref) pair. For instance, a wallet (which holds available assets) contains these.

@@ -1230,7 +1230,7 @@ Each such object represents an instantiation of a (two-party) protocol that has -core.StateRef +core.contracts.StateRef

A stateref is a pointer (reference) to a state, this is an equivalent of an "outpoint" in Bitcoin. It records which transaction defined the state and where in that transaction it was.

@@ -1278,7 +1278,7 @@ anything like that, this interface is only big enough to support the prototyping -core.Tenor +core.contracts.Tenor

Placeholder class for the Tenor datatype - which is a standardised duration of time until maturity

@@ -1295,7 +1295,7 @@ way that ensures itll be released if theres an exception.

-core.TimestampCommand +core.contracts.TimestampCommand

If present in a transaction, contains a time that was verified by the timestamping authority/authorities whose public keys are identified in the containing Command object. The true time must be between (after, before)

@@ -1362,7 +1362,7 @@ then B and C trade with each other, then C and A etc).

-core.TransactionBuilder +core.contracts.TransactionBuilder

A TransactionBuilder is a transaction class thats mutable (unlike the others which are all immutable). It is intended to be passed around contracts that may edit it by adding new states/commands or modifying the existing set. @@ -1372,20 +1372,20 @@ multiple parties.

-core.TransactionConflictException +core.contracts.TransactionConflictException -core.TransactionForVerification +core.contracts.TransactionForVerification

A transaction in fully resolved and sig-checked form, ready for passing as input to a verification function.

-core.TransactionGraphSearch +core.contracts.TransactionGraphSearch

Given a map of transaction id to SignedTransaction, performs a breadth first search of the dependency graph from the starting point down in order to find transactions that match the given query criteria.

@@ -1393,7 +1393,7 @@ the starting point down in order to find transactions that match the given query -core.TransactionGroup +core.contracts.TransactionGroup

A TransactionGroup defines a directed acyclic graph of transactions that can be resolved with each other and then verified. Successful verification does not imply the non-existence of other conflicting transactions: simply that @@ -1402,13 +1402,13 @@ this subgraph does not contain conflicts and is accepted by the involved contrac -core.TransactionResolutionException +core.contracts.TransactionResolutionException -core.TransactionVerificationException +core.contracts.TransactionVerificationException

Thrown if a verification fails due to a contract rejection.

@@ -1439,7 +1439,7 @@ and seller) and the following steps:

-core.TypeOnlyCommandData +core.contracts.TypeOnlyCommandData

Commands that inherit from this are intended to have no data items: its only their presence that matters.

@@ -1506,7 +1506,7 @@ consumed by someone else first

-core.WireTransaction +core.contracts.WireTransaction

Transaction ready for serialisation, without any signatures attached.

diff --git a/docs/build/html/api/api/-a-p-i-server-impl/commit-transaction.html b/docs/build/html/api/api/-a-p-i-server-impl/commit-transaction.html index bc016ec96e..5d1f347005 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/commit-transaction.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/commit-transaction.html @@ -7,8 +7,8 @@ api / APIServerImpl / commitTransaction

commitTransaction

- -fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+ +fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
Overrides APIServer.commitTransaction

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be successful, otherwise exception is thrown.

diff --git a/docs/build/html/api/api/-a-p-i-server-impl/fetch-states.html b/docs/build/html/api/api/-a-p-i-server-impl/fetch-states.html index 1b5a977dab..c737dadd81 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/fetch-states.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/fetch-states.html @@ -7,8 +7,8 @@ api / APIServerImpl / fetchStates

fetchStates

- -fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+ +fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
Overrides APIServer.fetchStates


diff --git a/docs/build/html/api/api/-a-p-i-server-impl/generate-transaction-signature.html b/docs/build/html/api/api/-a-p-i-server-impl/generate-transaction-signature.html index c24ed027ab..46bed4c2b5 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/generate-transaction-signature.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/generate-transaction-signature.html @@ -7,8 +7,8 @@ api / APIServerImpl / generateTransactionSignature

generateTransactionSignature

- -fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+ +fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
Overrides APIServer.generateTransactionSignature

Generate a signature for this transaction signed by us.


diff --git a/docs/build/html/api/api/-a-p-i-server-impl/index.html b/docs/build/html/api/api/-a-p-i-server-impl/index.html index 3b254c4a0b..f2778a26f2 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/index.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/index.html @@ -48,7 +48,7 @@ which would automatically be passed as the first argument (wed need that to be a commitTransaction -fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be +fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be successful, otherwise exception is thrown.

@@ -63,7 +63,7 @@ successful, otherwise exception is thrown.

fetchStates -fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?> +fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?> @@ -76,7 +76,7 @@ successful, otherwise exception is thrown.

generateTransactionSignature -fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.

+fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.

diff --git a/docs/build/html/api/api/-a-p-i-server/commit-transaction.html b/docs/build/html/api/api/-a-p-i-server/commit-transaction.html index 4c2ebf9684..3bc3fa1980 100644 --- a/docs/build/html/api/api/-a-p-i-server/commit-transaction.html +++ b/docs/build/html/api/api/-a-p-i-server/commit-transaction.html @@ -7,8 +7,8 @@ api / APIServer / commitTransaction

commitTransaction

- -abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+ +abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be successful, otherwise exception is thrown.


diff --git a/docs/build/html/api/api/-a-p-i-server/fetch-states.html b/docs/build/html/api/api/-a-p-i-server/fetch-states.html index df4ee4df0b..aec13fe64c 100644 --- a/docs/build/html/api/api/-a-p-i-server/fetch-states.html +++ b/docs/build/html/api/api/-a-p-i-server/fetch-states.html @@ -7,8 +7,8 @@ api / APIServer / fetchStates

fetchStates

- -abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+ +abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>


diff --git a/docs/build/html/api/api/-a-p-i-server/generate-transaction-signature.html b/docs/build/html/api/api/-a-p-i-server/generate-transaction-signature.html index 6ac63292c4..9eccef19a4 100644 --- a/docs/build/html/api/api/-a-p-i-server/generate-transaction-signature.html +++ b/docs/build/html/api/api/-a-p-i-server/generate-transaction-signature.html @@ -7,8 +7,8 @@ api / APIServer / generateTransactionSignature

generateTransactionSignature

- -abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+ +abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.



diff --git a/docs/build/html/api/api/-a-p-i-server/index.html b/docs/build/html/api/api/-a-p-i-server/index.html index 44806903f5..52f25cab7c 100644 --- a/docs/build/html/api/api/-a-p-i-server/index.html +++ b/docs/build/html/api/api/-a-p-i-server/index.html @@ -31,7 +31,7 @@ which would automatically be passed as the first argument (wed need that to be a commitTransaction -abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be +abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be successful, otherwise exception is thrown.

@@ -46,7 +46,7 @@ successful, otherwise exception is thrown.

fetchStates -abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?> +abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?> @@ -59,7 +59,7 @@ successful, otherwise exception is thrown.

generateTransactionSignature -abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.

+abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.

diff --git a/docs/build/html/api/contracts/-cash/-commands/-exit/-init-.html b/docs/build/html/api/contracts/-cash/-commands/-exit/-init-.html index c24ad10c11..b7da2eef80 100644 --- a/docs/build/html/api/contracts/-cash/-commands/-exit/-init-.html +++ b/docs/build/html/api/contracts/-cash/-commands/-exit/-init-.html @@ -7,7 +7,7 @@ contracts / Cash / Commands / Exit / <init>

<init>

-Exit(amount: Amount)
+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/contracts/-cash/-commands/-exit/index.html b/docs/build/html/api/contracts/-cash/-commands/-exit/index.html index fdec1b649f..ec127a2633 100644 --- a/docs/build/html/api/contracts/-cash/-commands/-exit/index.html +++ b/docs/build/html/api/contracts/-cash/-commands/-exit/index.html @@ -19,7 +19,7 @@ in some other way.

<init> -Exit(amount: Amount)

A command stating that money has been withdrawn from the shared ledger and is now accounted for +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/contracts/-cash/-commands/-move/index.html b/docs/build/html/api/contracts/-cash/-commands/-move/index.html index 6e6fe443da..801628b5ba 100644 --- a/docs/build/html/api/contracts/-cash/-commands/-move/index.html +++ b/docs/build/html/api/contracts/-cash/-commands/-move/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-cash/-state/-init-.html b/docs/build/html/api/contracts/-cash/-state/-init-.html index fee165d2a1..b858985a9c 100644 --- a/docs/build/html/api/contracts/-cash/-state/-init-.html +++ b/docs/build/html/api/contracts/-cash/-state/-init-.html @@ -7,7 +7,7 @@ contracts / Cash / State / <init>

<init>

-State(deposit: PartyAndReference, amount: Amount, owner: PublicKey)
+State(deposit: PartyAndReference, amount: Amount, owner: PublicKey)

A state representing a cash claim against some party



diff --git a/docs/build/html/api/contracts/-cash/-state/index.html b/docs/build/html/api/contracts/-cash/-state/index.html index a4355918d8..78519c97b0 100644 --- a/docs/build/html/api/contracts/-cash/-state/index.html +++ b/docs/build/html/api/contracts/-cash/-state/index.html @@ -18,7 +18,7 @@ <init> -State(deposit: PartyAndReference, amount: Amount, owner: PublicKey)

A state representing a cash claim against some party

+State(deposit: PartyAndReference, amount: Amount, owner: PublicKey)

A state representing a cash claim against some party

diff --git a/docs/build/html/api/contracts/-cash/generate-issue.html b/docs/build/html/api/contracts/-cash/generate-issue.html index 40c68d08f2..34b9d97c35 100644 --- a/docs/build/html/api/contracts/-cash/generate-issue.html +++ b/docs/build/html/api/contracts/-cash/generate-issue.html @@ -7,8 +7,8 @@ contracts / Cash / generateIssue

generateIssue

- -fun generateIssue(tx: TransactionBuilder, amount: Amount, at: PartyAndReference, owner: PublicKey): Unit
+ +fun generateIssue(tx: TransactionBuilder, amount: Amount, at: PartyAndReference, owner: PublicKey): 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/contracts/-cash/generate-spend.html b/docs/build/html/api/contracts/-cash/generate-spend.html index a19da53fbe..790e6be186 100644 --- a/docs/build/html/api/contracts/-cash/generate-spend.html +++ b/docs/build/html/api/contracts/-cash/generate-spend.html @@ -7,8 +7,8 @@ contracts / Cash / generateSpend

generateSpend

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

diff --git a/docs/build/html/api/contracts/-cash/index.html b/docs/build/html/api/contracts/-cash/index.html index b6b628d0c8..468b9f8375 100644 --- a/docs/build/html/api/contracts/-cash/index.html +++ b/docs/build/html/api/contracts/-cash/index.html @@ -73,14 +73,14 @@ the same transaction.

generateIssue -fun generateIssue(tx: TransactionBuilder, amount: Amount, at: PartyAndReference, owner: PublicKey): Unit

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

+fun generateIssue(tx: TransactionBuilder, amount: Amount, at: PartyAndReference, owner: PublicKey): 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. +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.

@@ -88,7 +88,7 @@ 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

+fun verify(tx: TransactionForVerification): Unit

This is the function EVERYONE runs

diff --git a/docs/build/html/api/contracts/-cash/verify.html b/docs/build/html/api/contracts/-cash/verify.html index ef5a95f9a6..47087f4885 100644 --- a/docs/build/html/api/contracts/-cash/verify.html +++ b/docs/build/html/api/contracts/-cash/verify.html @@ -7,8 +7,8 @@ contracts / Cash / verify

verify

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

This is the function EVERYONE runs


diff --git a/docs/build/html/api/contracts/-commercial-paper/-commands/-issue/index.html b/docs/build/html/api/contracts/-commercial-paper/-commands/-issue/index.html index aaf6dffe72..90ea3cf52a 100644 --- a/docs/build/html/api/contracts/-commercial-paper/-commands/-issue/index.html +++ b/docs/build/html/api/contracts/-commercial-paper/-commands/-issue/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-commercial-paper/-commands/-move/index.html b/docs/build/html/api/contracts/-commercial-paper/-commands/-move/index.html index fb104aae5a..3e8c3006ae 100644 --- a/docs/build/html/api/contracts/-commercial-paper/-commands/-move/index.html +++ b/docs/build/html/api/contracts/-commercial-paper/-commands/-move/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-commercial-paper/-commands/-redeem/index.html b/docs/build/html/api/contracts/-commercial-paper/-commands/-redeem/index.html index 12ccadeb7b..3a16d63a28 100644 --- a/docs/build/html/api/contracts/-commercial-paper/-commands/-redeem/index.html +++ b/docs/build/html/api/contracts/-commercial-paper/-commands/-redeem/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-commercial-paper/-state/-init-.html b/docs/build/html/api/contracts/-commercial-paper/-state/-init-.html index 3d39997a1b..65bc0afb4d 100644 --- a/docs/build/html/api/contracts/-commercial-paper/-state/-init-.html +++ b/docs/build/html/api/contracts/-commercial-paper/-state/-init-.html @@ -7,7 +7,7 @@ contracts / CommercialPaper / State / <init>

<init>

-State(issuance: PartyAndReference, owner: PublicKey, faceValue: Amount, maturityDate: Instant)
+State(issuance: PartyAndReference, owner: PublicKey, faceValue: Amount, maturityDate: Instant)


diff --git a/docs/build/html/api/contracts/-commercial-paper/-state/index.html b/docs/build/html/api/contracts/-commercial-paper/-state/index.html index ce3cb54d54..b9ac88de3e 100644 --- a/docs/build/html/api/contracts/-commercial-paper/-state/index.html +++ b/docs/build/html/api/contracts/-commercial-paper/-state/index.html @@ -17,7 +17,7 @@ <init> -State(issuance: PartyAndReference, owner: PublicKey, faceValue: Amount, maturityDate: Instant) +State(issuance: PartyAndReference, owner: PublicKey, faceValue: Amount, maturityDate: Instant) @@ -71,13 +71,13 @@ withFaceValue -fun withFaceValue(newFaceValue: Amount): <ERROR CLASS> +fun withFaceValue(newFaceValue: Amount): <ERROR CLASS> withIssuance -fun withIssuance(newIssuance: PartyAndReference): <ERROR CLASS> +fun withIssuance(newIssuance: PartyAndReference): <ERROR CLASS> diff --git a/docs/build/html/api/contracts/-commercial-paper/-state/with-face-value.html b/docs/build/html/api/contracts/-commercial-paper/-state/with-face-value.html index bfe75c8f1b..8c03dcbe12 100644 --- a/docs/build/html/api/contracts/-commercial-paper/-state/with-face-value.html +++ b/docs/build/html/api/contracts/-commercial-paper/-state/with-face-value.html @@ -7,8 +7,8 @@ contracts / CommercialPaper / State / withFaceValue

withFaceValue

- -fun withFaceValue(newFaceValue: Amount): <ERROR CLASS>
+ +fun withFaceValue(newFaceValue: Amount): <ERROR CLASS>


diff --git a/docs/build/html/api/contracts/-commercial-paper/-state/with-issuance.html b/docs/build/html/api/contracts/-commercial-paper/-state/with-issuance.html index 2c97ca9e5d..5e32d8ca87 100644 --- a/docs/build/html/api/contracts/-commercial-paper/-state/with-issuance.html +++ b/docs/build/html/api/contracts/-commercial-paper/-state/with-issuance.html @@ -7,8 +7,8 @@ contracts / CommercialPaper / State / withIssuance

withIssuance

- -fun withIssuance(newIssuance: PartyAndReference): <ERROR CLASS>
+ +fun withIssuance(newIssuance: PartyAndReference): <ERROR CLASS>


diff --git a/docs/build/html/api/contracts/-commercial-paper/generate-issue.html b/docs/build/html/api/contracts/-commercial-paper/generate-issue.html index 029938de61..23b8812901 100644 --- a/docs/build/html/api/contracts/-commercial-paper/generate-issue.html +++ b/docs/build/html/api/contracts/-commercial-paper/generate-issue.html @@ -7,8 +7,8 @@ contracts / CommercialPaper / generateIssue

generateIssue

- -fun generateIssue(issuance: PartyAndReference, faceValue: Amount, maturityDate: Instant): TransactionBuilder
+ +fun generateIssue(issuance: PartyAndReference, faceValue: Amount, maturityDate: Instant): 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/contracts/-commercial-paper/generate-move.html b/docs/build/html/api/contracts/-commercial-paper/generate-move.html index 834b461948..c9b24b13ca 100644 --- a/docs/build/html/api/contracts/-commercial-paper/generate-move.html +++ b/docs/build/html/api/contracts/-commercial-paper/generate-move.html @@ -7,8 +7,8 @@ contracts / CommercialPaper / generateMove

generateMove

- -fun generateMove(tx: TransactionBuilder, paper: StateAndRef<State>, newOwner: PublicKey): Unit
+ +fun generateMove(tx: TransactionBuilder, paper: StateAndRef<State>, newOwner: PublicKey): Unit

Updates the given partial transaction with an input/output/command to reassign ownership of the paper.



diff --git a/docs/build/html/api/contracts/-commercial-paper/generate-redeem.html b/docs/build/html/api/contracts/-commercial-paper/generate-redeem.html index d424ecf98f..5908735b33 100644 --- a/docs/build/html/api/contracts/-commercial-paper/generate-redeem.html +++ b/docs/build/html/api/contracts/-commercial-paper/generate-redeem.html @@ -7,8 +7,8 @@ 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/contracts/-commercial-paper/index.html b/docs/build/html/api/contracts/-commercial-paper/index.html index 9a25ee98c8..b6ddfc7cff 100644 --- a/docs/build/html/api/contracts/-commercial-paper/index.html +++ b/docs/build/html/api/contracts/-commercial-paper/index.html @@ -58,7 +58,7 @@ the contracts contents).

generateIssue -fun generateIssue(issuance: PartyAndReference, faceValue: Amount, maturityDate: Instant): TransactionBuilder

Returns a transaction that issues commercial paper, owned by the issuing parties key. Does not update +fun generateIssue(issuance: PartyAndReference, faceValue: Amount, maturityDate: Instant): 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.

@@ -67,14 +67,14 @@ at the moment: this restriction is not fundamental and may be lifted later.

generateMove -fun generateMove(tx: TransactionBuilder, paper: StateAndRef<State>, newOwner: PublicKey): Unit

Updates the given partial transaction with an input/output/command to reassign ownership of the paper.

+fun generateMove(tx: TransactionBuilder, paper: StateAndRef<State>, newOwner: PublicKey): Unit

Updates the given partial transaction with an input/output/command to reassign ownership of the paper.

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.

@@ -83,7 +83,7 @@ value, and then ensure the paper is removed from the ledger.

verify -fun verify(tx: TransactionForVerification): Unit

Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense. +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/contracts/-commercial-paper/verify.html b/docs/build/html/api/contracts/-commercial-paper/verify.html index 193eabd96b..c1908b94c5 100644 --- a/docs/build/html/api/contracts/-commercial-paper/verify.html +++ b/docs/build/html/api/contracts/-commercial-paper/verify.html @@ -7,8 +7,8 @@ contracts / CommercialPaper / verify

verify

- -fun verify(tx: TransactionForVerification): Unit
+ +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 diff --git a/docs/build/html/api/contracts/-crowd-fund/-campaign/-init-.html b/docs/build/html/api/contracts/-crowd-fund/-campaign/-init-.html index 1d92af3e0e..727c6823af 100644 --- a/docs/build/html/api/contracts/-crowd-fund/-campaign/-init-.html +++ b/docs/build/html/api/contracts/-crowd-fund/-campaign/-init-.html @@ -7,7 +7,7 @@ contracts / CrowdFund / Campaign / <init>

<init>

-Campaign(owner: PublicKey, name: String, target: Amount, closingTime: Instant)
+Campaign(owner: PublicKey, name: String, target: Amount, closingTime: Instant)


diff --git a/docs/build/html/api/contracts/-crowd-fund/-campaign/index.html b/docs/build/html/api/contracts/-crowd-fund/-campaign/index.html index eb908975bb..85a576b08f 100644 --- a/docs/build/html/api/contracts/-crowd-fund/-campaign/index.html +++ b/docs/build/html/api/contracts/-crowd-fund/-campaign/index.html @@ -17,7 +17,7 @@ <init> -Campaign(owner: PublicKey, name: String, target: Amount, closingTime: Instant) +Campaign(owner: PublicKey, name: String, target: Amount, closingTime: Instant) diff --git a/docs/build/html/api/contracts/-crowd-fund/-commands/-close/index.html b/docs/build/html/api/contracts/-crowd-fund/-commands/-close/index.html index ea6b929738..7c30eb3ad1 100644 --- a/docs/build/html/api/contracts/-crowd-fund/-commands/-close/index.html +++ b/docs/build/html/api/contracts/-crowd-fund/-commands/-close/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-crowd-fund/-commands/-pledge/index.html b/docs/build/html/api/contracts/-crowd-fund/-commands/-pledge/index.html index 06a44297b2..8dd3082b25 100644 --- a/docs/build/html/api/contracts/-crowd-fund/-commands/-pledge/index.html +++ b/docs/build/html/api/contracts/-crowd-fund/-commands/-pledge/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-crowd-fund/-commands/-register/index.html b/docs/build/html/api/contracts/-crowd-fund/-commands/-register/index.html index 0167d7b0c1..38d679c3ed 100644 --- a/docs/build/html/api/contracts/-crowd-fund/-commands/-register/index.html +++ b/docs/build/html/api/contracts/-crowd-fund/-commands/-register/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-crowd-fund/-pledge/-init-.html b/docs/build/html/api/contracts/-crowd-fund/-pledge/-init-.html index 3131431ae9..7cac09bf41 100644 --- a/docs/build/html/api/contracts/-crowd-fund/-pledge/-init-.html +++ b/docs/build/html/api/contracts/-crowd-fund/-pledge/-init-.html @@ -7,7 +7,7 @@ contracts / CrowdFund / Pledge / <init>

<init>

-Pledge(owner: PublicKey, amount: Amount)
+Pledge(owner: PublicKey, amount: Amount)


diff --git a/docs/build/html/api/contracts/-crowd-fund/-pledge/index.html b/docs/build/html/api/contracts/-crowd-fund/-pledge/index.html index dd43ef2737..8cdeff360e 100644 --- a/docs/build/html/api/contracts/-crowd-fund/-pledge/index.html +++ b/docs/build/html/api/contracts/-crowd-fund/-pledge/index.html @@ -17,7 +17,7 @@ <init> -Pledge(owner: PublicKey, amount: Amount) +Pledge(owner: PublicKey, amount: Amount) diff --git a/docs/build/html/api/contracts/-crowd-fund/generate-close.html b/docs/build/html/api/contracts/-crowd-fund/generate-close.html index a79c87e28c..a6a2a07ad5 100644 --- a/docs/build/html/api/contracts/-crowd-fund/generate-close.html +++ b/docs/build/html/api/contracts/-crowd-fund/generate-close.html @@ -7,8 +7,8 @@ contracts / CrowdFund / generateClose

generateClose

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


diff --git a/docs/build/html/api/contracts/-crowd-fund/generate-pledge.html b/docs/build/html/api/contracts/-crowd-fund/generate-pledge.html index acbdad624b..646c823f05 100644 --- a/docs/build/html/api/contracts/-crowd-fund/generate-pledge.html +++ b/docs/build/html/api/contracts/-crowd-fund/generate-pledge.html @@ -7,8 +7,8 @@ contracts / CrowdFund / generatePledge

generatePledge

- -fun generatePledge(tx: TransactionBuilder, campaign: StateAndRef<State>, subscriber: PublicKey): Unit
+ +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/contracts/-crowd-fund/generate-register.html b/docs/build/html/api/contracts/-crowd-fund/generate-register.html index 77e4bbc232..5075e7bcc1 100644 --- a/docs/build/html/api/contracts/-crowd-fund/generate-register.html +++ b/docs/build/html/api/contracts/-crowd-fund/generate-register.html @@ -7,8 +7,8 @@ contracts / CrowdFund / generateRegister

generateRegister

- -fun generateRegister(owner: PartyAndReference, fundingTarget: Amount, fundingName: String, closingTime: Instant): TransactionBuilder
+ +fun generateRegister(owner: PartyAndReference, fundingTarget: Amount, fundingName: String, closingTime: Instant): 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/contracts/-crowd-fund/index.html b/docs/build/html/api/contracts/-crowd-fund/index.html index 8ed8505718..dd26b263c1 100644 --- a/docs/build/html/api/contracts/-crowd-fund/index.html +++ b/docs/build/html/api/contracts/-crowd-fund/index.html @@ -91,20 +91,20 @@ the contracts contents).

generateClose -fun generateClose(tx: TransactionBuilder, campaign: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit +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.

+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): TransactionBuilder

Returns a transaction that registers a crowd-funding campaing, owned by the issuing institutions key. Does not update +fun generateRegister(owner: PartyAndReference, fundingTarget: Amount, fundingName: String, closingTime: Instant): 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

@@ -112,7 +112,7 @@ an existing transaction because its not possible to register multiple campaigns verify -fun verify(tx: TransactionForVerification): Unit

Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense. +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/contracts/-crowd-fund/verify.html b/docs/build/html/api/contracts/-crowd-fund/verify.html index 696d65a209..e9d6b29eba 100644 --- a/docs/build/html/api/contracts/-crowd-fund/verify.html +++ b/docs/build/html/api/contracts/-crowd-fund/verify.html @@ -7,8 +7,8 @@ contracts / CrowdFund / verify

verify

- -fun verify(tx: TransactionForVerification): Unit
+ +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 diff --git a/docs/build/html/api/contracts/-deal-state/index.html b/docs/build/html/api/contracts/-deal-state/index.html index 9c6062cec7..f723ff5a6a 100644 --- a/docs/build/html/api/contracts/-deal-state/index.html +++ b/docs/build/html/api/contracts/-deal-state/index.html @@ -58,7 +58,7 @@ deal/agreement protocol to generate the necessary transaction for potential impl withPublicKey -abstract fun withPublicKey(before: Party, after: PublicKey): DealState +abstract fun withPublicKey(before: Party, after: PublicKey): DealState @@ -69,7 +69,7 @@ deal/agreement protocol to generate the necessary transaction for potential impl isRelevant -abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean

true if this should be tracked by our wallet(s)

+abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean

true if this should be tracked by our wallet(s)

diff --git a/docs/build/html/api/contracts/-deal-state/with-public-key.html b/docs/build/html/api/contracts/-deal-state/with-public-key.html index 3c52c95858..35654e6fc8 100644 --- a/docs/build/html/api/contracts/-deal-state/with-public-key.html +++ b/docs/build/html/api/contracts/-deal-state/with-public-key.html @@ -7,8 +7,8 @@ contracts / DealState / withPublicKey

withPublicKey

- -abstract fun withPublicKey(before: Party, after: PublicKey): DealState
+ +abstract fun withPublicKey(before: Party, after: PublicKey): DealState


diff --git a/docs/build/html/api/contracts/-dummy-contract/-commands/-create/index.html b/docs/build/html/api/contracts/-dummy-contract/-commands/-create/index.html index 9502a44f8a..1d7c222130 100644 --- a/docs/build/html/api/contracts/-dummy-contract/-commands/-create/index.html +++ b/docs/build/html/api/contracts/-dummy-contract/-commands/-create/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-dummy-contract/generate-initial.html b/docs/build/html/api/contracts/-dummy-contract/generate-initial.html index 2ce3efe320..b65c44ba83 100644 --- a/docs/build/html/api/contracts/-dummy-contract/generate-initial.html +++ b/docs/build/html/api/contracts/-dummy-contract/generate-initial.html @@ -7,8 +7,8 @@ contracts / DummyContract / generateInitial

generateInitial

- -fun generateInitial(owner: PartyAndReference, magicNumber: Int): TransactionBuilder
+ +fun generateInitial(owner: PartyAndReference, magicNumber: Int): TransactionBuilder


diff --git a/docs/build/html/api/contracts/-dummy-contract/index.html b/docs/build/html/api/contracts/-dummy-contract/index.html index ee0f09db2f..3df390084b 100644 --- a/docs/build/html/api/contracts/-dummy-contract/index.html +++ b/docs/build/html/api/contracts/-dummy-contract/index.html @@ -58,13 +58,13 @@ the contracts contents).

generateInitial -fun generateInitial(owner: PartyAndReference, magicNumber: Int): TransactionBuilder +fun generateInitial(owner: PartyAndReference, magicNumber: Int): TransactionBuilder verify -fun verify(tx: TransactionForVerification): Unit

Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense. +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/contracts/-dummy-contract/verify.html b/docs/build/html/api/contracts/-dummy-contract/verify.html index f71aa682b9..492288dea8 100644 --- a/docs/build/html/api/contracts/-dummy-contract/verify.html +++ b/docs/build/html/api/contracts/-dummy-contract/verify.html @@ -7,8 +7,8 @@ contracts / DummyContract / verify

verify

- -fun verify(tx: TransactionForVerification): Unit
+ +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 diff --git a/docs/build/html/api/contracts/-fixable-deal-state/generate-fix.html b/docs/build/html/api/contracts/-fixable-deal-state/generate-fix.html index 9c852008ec..50ecca6fd4 100644 --- a/docs/build/html/api/contracts/-fixable-deal-state/generate-fix.html +++ b/docs/build/html/api/contracts/-fixable-deal-state/generate-fix.html @@ -7,8 +7,8 @@ contracts / FixableDealState / generateFix

generateFix

- -abstract fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
+ +abstract fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit

Generate a fixing command for this deal and fix

TODO: This would also likely move to methods on the Contract once the changes to reference the Contract from the ContractState are in

diff --git a/docs/build/html/api/contracts/-fixable-deal-state/index.html b/docs/build/html/api/contracts/-fixable-deal-state/index.html index d7cebbd7cd..95b66acfa9 100644 --- a/docs/build/html/api/contracts/-fixable-deal-state/index.html +++ b/docs/build/html/api/contracts/-fixable-deal-state/index.html @@ -37,7 +37,7 @@ generateFix -abstract fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit

Generate a fixing command for this deal and fix

+abstract fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit

Generate a fixing command for this deal and fix

@@ -64,7 +64,7 @@ deal/agreement protocol to generate the necessary transaction for potential impl withPublicKey -abstract fun withPublicKey(before: Party, after: PublicKey): DealState +abstract fun withPublicKey(before: Party, after: PublicKey): DealState diff --git a/docs/build/html/api/contracts/-fixed-rate-payment-event/-init-.html b/docs/build/html/api/contracts/-fixed-rate-payment-event/-init-.html index 28756419a1..275fa94a63 100644 --- a/docs/build/html/api/contracts/-fixed-rate-payment-event/-init-.html +++ b/docs/build/html/api/contracts/-fixed-rate-payment-event/-init-.html @@ -7,7 +7,7 @@ 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, 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/contracts/-fixed-rate-payment-event/index.html b/docs/build/html/api/contracts/-fixed-rate-payment-event/index.html index f1779ecc20..98fa1eec7a 100644 --- a/docs/build/html/api/contracts/-fixed-rate-payment-event/index.html +++ b/docs/build/html/api/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, 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/contracts/-floating-rate-payment-event/-init-.html b/docs/build/html/api/contracts/-floating-rate-payment-event/-init-.html index ff95f11fbc..d08faf914e 100644 --- a/docs/build/html/api/contracts/-floating-rate-payment-event/-init-.html +++ b/docs/build/html/api/contracts/-floating-rate-payment-event/-init-.html @@ -7,7 +7,7 @@ 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, 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/contracts/-floating-rate-payment-event/copy.html b/docs/build/html/api/contracts/-floating-rate-payment-event/copy.html index 90fb1383b0..d04086ec16 100644 --- a/docs/build/html/api/contracts/-floating-rate-payment-event/copy.html +++ b/docs/build/html/api/contracts/-floating-rate-payment-event/copy.html @@ -7,8 +7,8 @@ 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 = this.notional, rate: Rate = this.rate): FloatingRatePaymentEvent


diff --git a/docs/build/html/api/contracts/-floating-rate-payment-event/index.html b/docs/build/html/api/contracts/-floating-rate-payment-event/index.html index 6524b299b7..e43f32ca41 100644 --- a/docs/build/html/api/contracts/-floating-rate-payment-event/index.html +++ b/docs/build/html/api/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, 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?

@@ -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 = this.notional, rate: Rate = this.rate): FloatingRatePaymentEvent diff --git a/docs/build/html/api/contracts/-insufficient-balance-exception/-init-.html b/docs/build/html/api/contracts/-insufficient-balance-exception/-init-.html index 8968497aa1..df4103471e 100644 --- a/docs/build/html/api/contracts/-insufficient-balance-exception/-init-.html +++ b/docs/build/html/api/contracts/-insufficient-balance-exception/-init-.html @@ -7,7 +7,7 @@ contracts / InsufficientBalanceException / <init>

<init>

-InsufficientBalanceException(amountMissing: Amount)
+InsufficientBalanceException(amountMissing: Amount)


diff --git a/docs/build/html/api/contracts/-insufficient-balance-exception/index.html b/docs/build/html/api/contracts/-insufficient-balance-exception/index.html index eb79ffe2f4..d00fcf1c63 100644 --- a/docs/build/html/api/contracts/-insufficient-balance-exception/index.html +++ b/docs/build/html/api/contracts/-insufficient-balance-exception/index.html @@ -17,7 +17,7 @@ <init> -InsufficientBalanceException(amountMissing: Amount) +InsufficientBalanceException(amountMissing: Amount) diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-calculation/-init-.html b/docs/build/html/api/contracts/-interest-rate-swap/-calculation/-init-.html index 106c73c07a..ba115a294d 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-calculation/-init-.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-calculation/-init-.html @@ -7,7 +7,7 @@ contracts / InterestRateSwap / Calculation / <init>

<init>

-Calculation(expression: Expression, floatingLegPaymentSchedule: Map<LocalDate, FloatingRatePaymentEvent>, fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>)
+Calculation(expression: Expression, floatingLegPaymentSchedule: Map<LocalDate, FloatingRatePaymentEvent>, fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>)

The Calculation data class is "mutable" through out the life of the swap, as in, its the only thing that contains data that will changed from state to state (Recall that the design insists that everything is immutable, so we actually copy / update for each transition)

diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-calculation/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-calculation/index.html index 7f6cab3732..ee196eb5e2 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-calculation/index.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-calculation/index.html @@ -20,7 +20,7 @@ copy / update for each transition)

<init> -Calculation(expression: Expression, floatingLegPaymentSchedule: Map<LocalDate, FloatingRatePaymentEvent>, fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>)

The Calculation data class is "mutable" through out the life of the swap, as in, its the only thing that contains +Calculation(expression: Expression, floatingLegPaymentSchedule: Map<LocalDate, FloatingRatePaymentEvent>, fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>)

The Calculation data class is "mutable" through out the life of the swap, as in, its the only thing that contains data that will changed from state to state (Recall that the design insists that everything is immutable, so we actually copy / update for each transition)

diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-commands/-agree/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-commands/-agree/index.html index 6de47ac409..9fc62090c0 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-commands/-agree/index.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-commands/-agree/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-commands/-fix/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-commands/-fix/index.html index a82b427aa2..a601b43bda 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-commands/-fix/index.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-commands/-fix/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-commands/-mature/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-commands/-mature/index.html index 3ba7ad8410..b2eaa0b9c6 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-commands/-mature/index.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-commands/-mature/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-commands/-pay/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-commands/-pay/index.html index 1f16d74d50..f7286b0914 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-commands/-pay/index.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-commands/-pay/index.html @@ -28,7 +28,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-common-leg/-init-.html b/docs/build/html/api/contracts/-interest-rate-swap/-common-leg/-init-.html index 8f5d29858b..ac7e48e193 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-common-leg/-init-.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-common-leg/-init-.html @@ -7,7 +7,7 @@ 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, 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/contracts/-interest-rate-swap/-common-leg/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-common-leg/index.html index b185eef6ba..9f40bf0c73 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-common-leg/index.html +++ b/docs/build/html/api/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, 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/contracts/-interest-rate-swap/-common/-init-.html b/docs/build/html/api/contracts/-interest-rate-swap/-common/-init-.html index 1350bf6fc6..8f6920f72e 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-common/-init-.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-common/-init-.html @@ -7,7 +7,7 @@ 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, 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.



diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-common/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-common/index.html index db18d66344..34544277d5 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-common/index.html +++ b/docs/build/html/api/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, 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.

diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/-init-.html b/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/-init-.html index ce86f8551b..fae0dab355 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/-init-.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/-init-.html @@ -7,7 +7,7 @@ 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, 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/contracts/-interest-rate-swap/-fixed-leg/copy.html b/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/copy.html index fd6303cd16..b1a2cc2730 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/copy.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/copy.html @@ -7,8 +7,8 @@ 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 = 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/contracts/-interest-rate-swap/-fixed-leg/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/index.html index 10bd515575..b1ea44b977 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-fixed-leg/index.html +++ b/docs/build/html/api/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, 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) @@ -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 = 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/contracts/-interest-rate-swap/-floating-leg/-init-.html b/docs/build/html/api/contracts/-interest-rate-swap/-floating-leg/-init-.html index f1d12a2b9c..e2410d6fc5 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-floating-leg/-init-.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-floating-leg/-init-.html @@ -7,7 +7,7 @@ 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, 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/contracts/-interest-rate-swap/-floating-leg/copy.html b/docs/build/html/api/contracts/-interest-rate-swap/-floating-leg/copy.html index fc4fac06f6..00c890e04a 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-floating-leg/copy.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-floating-leg/copy.html @@ -7,8 +7,8 @@ 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 = 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/contracts/-interest-rate-swap/-floating-leg/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-floating-leg/index.html index 679731578c..34a7e0b4fe 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-floating-leg/index.html +++ b/docs/build/html/api/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, 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) @@ -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 = 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/contracts/-interest-rate-swap/-state/evaluate-calculation.html b/docs/build/html/api/contracts/-interest-rate-swap/-state/evaluate-calculation.html index c0e49fa51d..ebc4fc8dd2 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-state/evaluate-calculation.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-state/evaluate-calculation.html @@ -7,8 +7,8 @@ contracts / InterestRateSwap / State / evaluateCalculation

evaluateCalculation

- -fun evaluateCalculation(businessDate: LocalDate, expression: Expression = calculation.expression): Any
+ +fun evaluateCalculation(businessDate: LocalDate, expression: Expression = calculation.expression): Any

For evaluating arbitrary java on the platform



diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-state/generate-fix.html b/docs/build/html/api/contracts/-interest-rate-swap/-state/generate-fix.html index cf541e0933..abda8a4cbb 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-state/generate-fix.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-state/generate-fix.html @@ -7,8 +7,8 @@ contracts / InterestRateSwap / State / generateFix

generateFix

- -fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
+ +fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
Overrides FixableDealState.generateFix

Generate a fixing command for this deal and fix

TODO: This would also likely move to methods on the Contract once the changes to reference diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-state/index.html b/docs/build/html/api/contracts/-interest-rate-swap/-state/index.html index c118cacf0b..4fcb0d7468 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-state/index.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-state/index.html @@ -87,7 +87,7 @@ evaluateCalculation -fun evaluateCalculation(businessDate: LocalDate, expression: Expression = calculation.expression): Any

For evaluating arbitrary java on the platform

+fun evaluateCalculation(businessDate: LocalDate, expression: Expression = calculation.expression): Any

For evaluating arbitrary java on the platform

@@ -102,7 +102,7 @@ deal/agreement protocol to generate the necessary transaction for potential impl generateFix -fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit

Generate a fixing command for this deal and fix

+fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit

Generate a fixing command for this deal and fix

@@ -130,7 +130,7 @@ deal/agreement protocol to generate the necessary transaction for potential impl withPublicKey -fun withPublicKey(before: Party, after: PublicKey): DealState +fun withPublicKey(before: Party, after: PublicKey): DealState diff --git a/docs/build/html/api/contracts/-interest-rate-swap/-state/with-public-key.html b/docs/build/html/api/contracts/-interest-rate-swap/-state/with-public-key.html index ac870e886e..aef85e3256 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/-state/with-public-key.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/-state/with-public-key.html @@ -7,8 +7,8 @@ contracts / InterestRateSwap / State / withPublicKey

withPublicKey

- -fun withPublicKey(before: Party, after: PublicKey): DealState
+ +fun withPublicKey(before: Party, after: PublicKey): DealState
Overrides DealState.withPublicKey


diff --git a/docs/build/html/api/contracts/-interest-rate-swap/generate-fix.html b/docs/build/html/api/contracts/-interest-rate-swap/generate-fix.html index 61338083f0..11595aa193 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/generate-fix.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/generate-fix.html @@ -7,8 +7,8 @@ contracts / InterestRateSwap / generateFix

generateFix

- -fun generateFix(tx: TransactionBuilder, irs: StateAndRef<State>, fixing: <ERROR CLASS><LocalDate, Rate>): Unit
+ +fun generateFix(tx: TransactionBuilder, irs: StateAndRef<State>, fixing: <ERROR CLASS><LocalDate, Rate>): Unit


diff --git a/docs/build/html/api/contracts/-interest-rate-swap/index.html b/docs/build/html/api/contracts/-interest-rate-swap/index.html index 9c5a13fdfa..057ec8c349 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/index.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/index.html @@ -135,7 +135,7 @@ Note: The day count, interest rate calculation etc are not finished yet, but the generateFix -fun generateFix(tx: TransactionBuilder, irs: StateAndRef<State>, fixing: <ERROR CLASS><LocalDate, Rate>): Unit +fun generateFix(tx: TransactionBuilder, irs: StateAndRef<State>, fixing: <ERROR CLASS><LocalDate, Rate>): Unit @@ -148,7 +148,7 @@ Note: The day count, interest rate calculation etc are not finished yet, but the verify -fun verify(tx: TransactionForVerification): Unit

verify() with some examples of what needs to be checked.

+fun verify(tx: TransactionForVerification): Unit

verify() with some examples of what needs to be checked.

diff --git a/docs/build/html/api/contracts/-interest-rate-swap/verify.html b/docs/build/html/api/contracts/-interest-rate-swap/verify.html index 4649204108..470cdd5ae3 100644 --- a/docs/build/html/api/contracts/-interest-rate-swap/verify.html +++ b/docs/build/html/api/contracts/-interest-rate-swap/verify.html @@ -7,8 +7,8 @@ contracts / InterestRateSwap / verify

verify

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

verify() with some examples of what needs to be checked.


diff --git a/docs/build/html/api/contracts/-rate-payment-event/-init-.html b/docs/build/html/api/contracts/-rate-payment-event/-init-.html index a981dc1f5f..6b62f13a05 100644 --- a/docs/build/html/api/contracts/-rate-payment-event/-init-.html +++ b/docs/build/html/api/contracts/-rate-payment-event/-init-.html @@ -7,7 +7,7 @@ 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, 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/contracts/-rate-payment-event/index.html b/docs/build/html/api/contracts/-rate-payment-event/index.html index ea4d284474..bf9f35ed04 100644 --- a/docs/build/html/api/contracts/-rate-payment-event/index.html +++ b/docs/build/html/api/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, 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. diff --git a/docs/build/html/api/contracts/-reference-rate/-init-.html b/docs/build/html/api/contracts/-reference-rate/-init-.html index 75114f93c0..56888c5462 100644 --- a/docs/build/html/api/contracts/-reference-rate/-init-.html +++ b/docs/build/html/api/contracts/-reference-rate/-init-.html @@ -7,7 +7,7 @@ contracts / ReferenceRate / <init>

<init>

-ReferenceRate(oracle: String, tenor: Tenor, name: String)
+ReferenceRate(oracle: String, tenor: Tenor, name: String)

So a reference rate is a rate that takes its value from a source at a given date e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value date in the getAsOf(..) method.


diff --git a/docs/build/html/api/contracts/-reference-rate/index.html b/docs/build/html/api/contracts/-reference-rate/index.html index 6b0ffb7dbb..d794869a6e 100644 --- a/docs/build/html/api/contracts/-reference-rate/index.html +++ b/docs/build/html/api/contracts/-reference-rate/index.html @@ -19,7 +19,7 @@ e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value <init> -ReferenceRate(oracle: String, tenor: Tenor, name: String)

So a reference rate is a rate that takes its value from a source at a given date +ReferenceRate(oracle: String, tenor: Tenor, name: String)

So a reference rate is a rate that takes its value from a source at a given date e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value date in the getAsOf(..) method.

diff --git a/docs/build/html/api/contracts/index.html b/docs/build/html/api/contracts/index.html index 717dac9af8..3563236a21 100644 --- a/docs/build/html/api/contracts/index.html +++ b/docs/build/html/api/contracts/index.html @@ -246,7 +246,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.times(other: RatioUnit): Amount diff --git a/docs/build/html/api/contracts/kotlin.collections.-iterable/index.html b/docs/build/html/api/contracts/kotlin.collections.-iterable/index.html index 233dc75fb1..83cae12cb8 100644 --- a/docs/build/html/api/contracts/kotlin.collections.-iterable/index.html +++ b/docs/build/html/api/contracts/kotlin.collections.-iterable/index.html @@ -20,7 +20,7 @@ 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.

+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.

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

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

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

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

diff --git a/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-by.html b/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-by.html index d8e3203abf..2f61feb60f 100644 --- a/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-by.html +++ b/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-by.html @@ -7,8 +7,8 @@ contracts / kotlin.collections.Iterable / sumCashBy

sumCashBy

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

Sums the cash states in the list that are owned by the given key, throwing an exception if there are none.



diff --git a/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-or-null.html b/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-or-null.html index 04c256bd56..38840e7475 100644 --- a/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-or-null.html +++ b/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-or-null.html @@ -7,7 +7,7 @@ contracts / 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/contracts/kotlin.collections.-iterable/sum-cash-or-zero.html b/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-or-zero.html index eb2e4faab0..63a9d94c99 100644 --- a/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-or-zero.html +++ b/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash-or-zero.html @@ -7,8 +7,8 @@ contracts / kotlin.collections.Iterable / sumCashOrZero

sumCashOrZero

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

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



diff --git a/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash.html b/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash.html index 7e9b5ab3c7..724d09ede4 100644 --- a/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash.html +++ b/docs/build/html/api/contracts/kotlin.collections.-iterable/sum-cash.html @@ -7,7 +7,7 @@ contracts / 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.


diff --git a/docs/build/html/api/contracts/times.html b/docs/build/html/api/contracts/times.html index 835b035a66..78569345a5 100644 --- a/docs/build/html/api/contracts/times.html +++ b/docs/build/html/api/contracts/times.html @@ -7,8 +7,8 @@ contracts / times

times

- -operator fun Amount.times(other: RatioUnit): Amount
+ +operator fun Amount.times(other: RatioUnit): Amount


diff --git a/docs/build/html/api/core.crypto/-digital-signature/-legally-identifiable/-init-.html b/docs/build/html/api/core.crypto/-digital-signature/-legally-identifiable/-init-.html index 5ee39f099f..66c74b793c 100644 --- a/docs/build/html/api/core.crypto/-digital-signature/-legally-identifiable/-init-.html +++ b/docs/build/html/api/core.crypto/-digital-signature/-legally-identifiable/-init-.html @@ -7,7 +7,7 @@ core.crypto / DigitalSignature / LegallyIdentifiable / <init>

<init>

-LegallyIdentifiable(signer: Party, bits: ByteArray, covering: Int)
+LegallyIdentifiable(signer: Party, bits: ByteArray, covering: Int)


diff --git a/docs/build/html/api/core.crypto/-digital-signature/-legally-identifiable/index.html b/docs/build/html/api/core.crypto/-digital-signature/-legally-identifiable/index.html index 471c4af279..e70c27263c 100644 --- a/docs/build/html/api/core.crypto/-digital-signature/-legally-identifiable/index.html +++ b/docs/build/html/api/core.crypto/-digital-signature/-legally-identifiable/index.html @@ -17,7 +17,7 @@ <init> -LegallyIdentifiable(signer: Party, bits: ByteArray, covering: Int) +LegallyIdentifiable(signer: Party, bits: ByteArray, covering: Int) diff --git a/docs/build/html/api/core.crypto/java.security.-key-pair/index.html b/docs/build/html/api/core.crypto/java.security.-key-pair/index.html index 64d437b063..6f2e6e3355 100644 --- a/docs/build/html/api/core.crypto/java.security.-key-pair/index.html +++ b/docs/build/html/api/core.crypto/java.security.-key-pair/index.html @@ -27,8 +27,8 @@ fun KeyPair.signWithECDSA(bitsToSign: ByteArray): WithKey
fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes): WithKey
-fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party): LegallyIdentifiable
-fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): LegallyIdentifiable +fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party): LegallyIdentifiable
+fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): LegallyIdentifiable diff --git a/docs/build/html/api/core.crypto/java.security.-key-pair/sign-with-e-c-d-s-a.html b/docs/build/html/api/core.crypto/java.security.-key-pair/sign-with-e-c-d-s-a.html index ea70ec4e1c..8aa10d91cb 100644 --- a/docs/build/html/api/core.crypto/java.security.-key-pair/sign-with-e-c-d-s-a.html +++ b/docs/build/html/api/core.crypto/java.security.-key-pair/sign-with-e-c-d-s-a.html @@ -11,10 +11,10 @@ fun KeyPair.signWithECDSA(bitsToSign: ByteArray): WithKey
fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes): WithKey
- -fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party): LegallyIdentifiable
- -fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): LegallyIdentifiable
+ +fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party): LegallyIdentifiable
+ +fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): LegallyIdentifiable


diff --git a/docs/build/html/api/core.node.services/-identity-service/index.html b/docs/build/html/api/core.node.services/-identity-service/index.html index 375ac3b3f9..e700d621c9 100644 --- a/docs/build/html/api/core.node.services/-identity-service/index.html +++ b/docs/build/html/api/core.node.services/-identity-service/index.html @@ -32,7 +32,7 @@ service would provide.

registerIdentity -abstract fun registerIdentity(party: Party): Unit +abstract fun registerIdentity(party: Party): Unit diff --git a/docs/build/html/api/core.node.services/-identity-service/register-identity.html b/docs/build/html/api/core.node.services/-identity-service/register-identity.html index 26eb9fbfe6..f5b197fb3f 100644 --- a/docs/build/html/api/core.node.services/-identity-service/register-identity.html +++ b/docs/build/html/api/core.node.services/-identity-service/register-identity.html @@ -7,8 +7,8 @@ core.node.services / IdentityService / registerIdentity

registerIdentity

- -abstract fun registerIdentity(party: Party): Unit
+ +abstract fun registerIdentity(party: Party): Unit


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/-init-.html index 0674016254..95f9857219 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / QueryIdentityRequest / <init>

<init>

-QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
+QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/index.html b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/index.html index 2dfb1685a6..fc3f89669f 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/index.html @@ -17,7 +17,7 @@ <init> -QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long) +QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long) diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/-init-.html index 36f92e1c38..52a1ef0098 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / FixContainer / <init>

<init>

-FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
+FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)

Fix container, for every fix name & date pair stores a tenor to interest rate map - InterpolatingRateMap



diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/get.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/get.html index b7272a3790..b63c9640d0 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/get.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/get.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / FixContainer / get

get

- -operator fun get(fixOf: FixOf): Fix?
+ +operator fun get(fixOf: FixOf): Fix?


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/index.html index ea478236e2..155fed04e4 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/index.html @@ -18,7 +18,7 @@ <init> -FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)

Fix container, for every fix name & date pair stores a tenor to interest rate map - InterpolatingRateMap

+FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)

Fix container, for every fix name & date pair stores a tenor to interest rate map - InterpolatingRateMap

@@ -53,7 +53,7 @@ get -operator fun get(fixOf: FixOf): Fix? +operator fun get(fixOf: FixOf): Fix? diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/-init-.html index 7cd5d20fb9..d0a93dcfaf 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / <init>

<init>

-InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
+InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)

Stores a mapping between tenors and interest rates. Interpolates missing values using the provided interpolation mechanism.


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/get-rate.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/get-rate.html index 33de60f5f1..ed2ad3c07b 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/get-rate.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/get-rate.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / getRate

getRate

- -fun getRate(tenor: Tenor): BigDecimal?
+ +fun getRate(tenor: Tenor): BigDecimal?

Returns the interest rate for a given Tenor, or null if the rate is not found and cannot be interpolated


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/index.html index 6bb224fe5e..86d373d59f 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/index.html @@ -19,7 +19,7 @@ Interpolates missing values using the provided interpolation mechanism.

<init> -InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)

Stores a mapping between tenors and interest rates. +InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)

Stores a mapping between tenors and interest rates. Interpolates missing values using the provided interpolation mechanism.

@@ -68,7 +68,7 @@ Interpolates missing values using the provided interpolation mechanism.

getRate -fun getRate(tenor: Tenor): BigDecimal?

Returns the interest rate for a given Tenor, +fun getRate(tenor: Tenor): BigDecimal?

Returns the interest rate for a given Tenor, or null if the rate is not found and cannot be interpolated

diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/-init-.html index 3150ff3822..3db3e9fdc9 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Oracle / <init>

<init>

-Oracle(identity: Party, signingKey: KeyPair)
+Oracle(identity: Party, signingKey: KeyPair)

An implementation of an interest rate fix oracle which is given data in a simple string format.

The oracle will try to interpolate the missing value of a tenor for the given fix name and date.


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/index.html index 6dda32a4fb..cbbc7da54c 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/index.html @@ -21,7 +21,7 @@ <init> -Oracle(identity: Party, signingKey: KeyPair)

An implementation of an interest rate fix oracle which is given data in a simple string format.

+Oracle(identity: Party, signingKey: KeyPair)

An implementation of an interest rate fix oracle which is given data in a simple string format.

@@ -50,13 +50,13 @@ query -fun query(queries: List<FixOf>): List<Fix> +fun query(queries: List<FixOf>): List<Fix> sign -fun sign(wtx: WireTransaction): LegallyIdentifiable +fun sign(wtx: WireTransaction): LegallyIdentifiable diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/query.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/query.html index 792c9726c5..93b13745eb 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/query.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/query.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / Oracle / query

query

- -fun query(queries: List<FixOf>): List<Fix>
+ +fun query(queries: List<FixOf>): List<Fix>


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/sign.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/sign.html index f031c1ec55..e26c60f829 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/sign.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/sign.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / Oracle / sign

sign

- -fun sign(wtx: WireTransaction): LegallyIdentifiable
+ +fun sign(wtx: WireTransaction): LegallyIdentifiable


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/-init-.html index f1327796f5..efa04ca31a 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / UnknownFix / <init>

<init>

-UnknownFix(fix: FixOf)
+UnknownFix(fix: FixOf)


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/index.html index cf1db518d6..6c2710ffd8 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/index.html @@ -17,7 +17,7 @@ <init> -UnknownFix(fix: FixOf) +UnknownFix(fix: FixOf) diff --git a/docs/build/html/api/core.node.services/-node-timestamper-service/-init-.html b/docs/build/html/api/core.node.services/-node-timestamper-service/-init-.html index 070a1e8ce8..563c835502 100644 --- a/docs/build/html/api/core.node.services/-node-timestamper-service/-init-.html +++ b/docs/build/html/api/core.node.services/-node-timestamper-service/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeTimestamperService / <init>

<init>

-NodeTimestamperService(net: MessagingService, identity: Party, signingKey: KeyPair, clock: Clock = Clock.systemDefaultZone(), tolerance: Duration = 30.seconds)
+NodeTimestamperService(net: MessagingService, identity: Party, signingKey: KeyPair, clock: Clock = Clock.systemDefaultZone(), tolerance: Duration = 30.seconds)

This class implements the server side of the timestamping protocol, using the local clock. A future version might add features like checking against other NTP servers to make sure the clock hasnt drifted by too much.

See the doc site to learn more about timestamping authorities (nodes) and the role they play in the data model.

diff --git a/docs/build/html/api/core.node.services/-node-timestamper-service/index.html b/docs/build/html/api/core.node.services/-node-timestamper-service/index.html index 6b2d3b8d50..9aa52b05d0 100644 --- a/docs/build/html/api/core.node.services/-node-timestamper-service/index.html +++ b/docs/build/html/api/core.node.services/-node-timestamper-service/index.html @@ -22,7 +22,7 @@ add features like checking against other NTP servers to make sure the clock hasn <init> -NodeTimestamperService(net: MessagingService, identity: Party, signingKey: KeyPair, clock: Clock = Clock.systemDefaultZone(), tolerance: Duration = 30.seconds)

This class implements the server side of the timestamping protocol, using the local clock. A future version might +NodeTimestamperService(net: MessagingService, identity: Party, signingKey: KeyPair, clock: Clock = Clock.systemDefaultZone(), tolerance: Duration = 30.seconds)

This class implements the server side of the timestamping protocol, using the local clock. A future version might add features like checking against other NTP servers to make sure the clock hasnt drifted by too much.

diff --git a/docs/build/html/api/core.node.services/-timestamper-service/index.html b/docs/build/html/api/core.node.services/-timestamper-service/index.html index e8321734e9..4dddf00504 100644 --- a/docs/build/html/api/core.node.services/-timestamper-service/index.html +++ b/docs/build/html/api/core.node.services/-timestamper-service/index.html @@ -45,7 +45,7 @@ themselves.

timestamp -abstract fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable +abstract fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable diff --git a/docs/build/html/api/core.node.services/-timestamper-service/timestamp.html b/docs/build/html/api/core.node.services/-timestamper-service/timestamp.html index 5a861dd890..9abb024e1a 100644 --- a/docs/build/html/api/core.node.services/-timestamper-service/timestamp.html +++ b/docs/build/html/api/core.node.services/-timestamper-service/timestamp.html @@ -7,8 +7,8 @@ core.node.services / TimestamperService / timestamp

timestamp

- -abstract fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
+ +abstract fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/index.html b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/index.html index 7c2d45fb14..c5448aff95 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/index.html @@ -42,7 +42,7 @@ registerIdentity -fun registerIdentity(party: Party): Unit +fun registerIdentity(party: Party): Unit diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/register-identity.html b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/register-identity.html index eba11a64d9..c1cca7d334 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/register-identity.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/register-identity.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryIdentityService / registerIdentity

registerIdentity

- -fun registerIdentity(party: Party): Unit
+ +fun registerIdentity(party: Party): Unit
Overrides IdentityService.registerIdentity


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get-recommended.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get-recommended.html index 69ad678f54..d8bf059350 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get-recommended.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get-recommended.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryNetworkMapCache / getRecommended

getRecommended

- -open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+ +open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
Overrides NetworkMapCache.getRecommended

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/index.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/index.html index 5568aeaddf..68edb24b12 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/index.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/index.html @@ -108,7 +108,7 @@ updates.

getRecommended -open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. +open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, or the appropriate oracle for a contract.

diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/get-recommended.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/get-recommended.html index 4344ba301b..a56d77a41d 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/get-recommended.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/get-recommended.html @@ -7,8 +7,8 @@ core.node.subsystems / NetworkMapCache / getRecommended

getRecommended

- -abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+ +abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, or the appropriate oracle for a contract.

diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/index.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/index.html index 300c87bd15..5668c347c7 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/index.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/index.html @@ -93,7 +93,7 @@ updates.

getRecommended -abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. +abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, or the appropriate oracle for a contract.

diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/fill-with-some-test-cash.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/fill-with-some-test-cash.html index 6028160c7d..8823c5c2fa 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/fill-with-some-test-cash.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/fill-with-some-test-cash.html @@ -7,8 +7,8 @@ core.node.subsystems / NodeWalletService / fillWithSomeTestCash

fillWithSomeTestCash

- -fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
+ +fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit

Creates a random set of between (by default) 3 and 10 cash states that add up to the given amount and adds them to the wallet.

The cash is self issued with the current nodes identity, as fetched from the storage service. Thus it diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/index.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/index.html index af8730cf29..c5822728e7 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/index.html @@ -62,7 +62,7 @@ keys in this wallet, you must inform the wallet service so it can update its int fillWithSomeTestCash -fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit

Creates a random set of between (by default) 3 and 10 cash states that add up to the given amount and adds them +fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit

Creates a random set of between (by default) 3 and 10 cash states that add up to the given amount and adds them to the wallet.

@@ -70,7 +70,7 @@ to the wallet.

notifyAll -fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant +fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant new states that they create. You should only insert transactions that have been successfully verified here

@@ -90,14 +90,14 @@ new states that they create. You should only insert transactions that have been notify -open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.

+open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.

statesForRefs -open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?> +open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?> diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/notify-all.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/notify-all.html index 12d07f7f37..d09173bde2 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/notify-all.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/notify-all.html @@ -7,8 +7,8 @@ core.node.subsystems / NodeWalletService / notifyAll

notifyAll

- -fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+ +fun notifyAll(txns: Iterable<WireTransaction>): Wallet
Overrides WalletService.notifyAll

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant new states that they create. You should only insert transactions that have been successfully verified here

diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/-init-.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/-init-.html index f84f5d08f5..7550d6c34c 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / <init>

<init>

-StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
+StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })


diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/index.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/index.html index 74a5accab2..ec96259268 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/index.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/index.html @@ -17,7 +17,7 @@ <init> -StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" }) +StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" }) diff --git a/docs/build/html/api/core.node.subsystems/-wallet-impl/-init-.html b/docs/build/html/api/core.node.subsystems/-wallet-impl/-init-.html index e61503c170..0f0afc9f63 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-impl/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-impl/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / WalletImpl / <init>

<init>

-WalletImpl(states: List<StateAndRef<ContractState>>)
+WalletImpl(states: List<StateAndRef<ContractState>>)

A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance, because we own them. This class represents an immutable, stable state of a wallet: it is guaranteed not to change out from underneath you, even though the canonical currently-best-known wallet may change as we learn diff --git a/docs/build/html/api/core.node.subsystems/-wallet-impl/index.html b/docs/build/html/api/core.node.subsystems/-wallet-impl/index.html index bf46a492ed..4524f1e404 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-impl/index.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-impl/index.html @@ -24,7 +24,7 @@ about new transactions from our peers and generate new transactions that consume <init> -WalletImpl(states: List<StateAndRef<ContractState>>)

A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance, +WalletImpl(states: List<StateAndRef<ContractState>>)

A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance, because we own them. This class represents an immutable, stable state of a wallet: it is guaranteed not to change out from underneath you, even though the canonical currently-best-known wallet may change as we learn about new transactions from our peers and generate new transactions that consume states ourselves.

diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/index.html b/docs/build/html/api/core.node.subsystems/-wallet-service/index.html index 2c6346b471..e9099f5848 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/index.html @@ -56,14 +56,14 @@ keys in this wallet, you must inform the wallet service so it can update its int notify -open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.

+open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.

notifyAll -abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant +abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant new states that they create. You should only insert transactions that have been successfully verified here

@@ -71,7 +71,7 @@ new states that they create. You should only insert transactions that have been statesForRefs -open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?> +open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?> diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/notify-all.html b/docs/build/html/api/core.node.subsystems/-wallet-service/notify-all.html index 853c3f5505..271e5f2bef 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/notify-all.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/notify-all.html @@ -7,8 +7,8 @@ core.node.subsystems / WalletService / notifyAll

notifyAll

- -abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+ +abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant new states that they create. You should only insert transactions that have been successfully verified here

Returns the new wallet that resulted from applying the transactions (note: it may quickly become out of date).

diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/notify.html b/docs/build/html/api/core.node.subsystems/-wallet-service/notify.html index e936cf2684..3069039cdf 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/notify.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/notify.html @@ -7,8 +7,8 @@ core.node.subsystems / WalletService / notify

notify

- -open fun notify(tx: WireTransaction): Wallet
+ +open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.



diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/states-for-refs.html b/docs/build/html/api/core.node.subsystems/-wallet-service/states-for-refs.html index 533ceffb1a..bf81c71da7 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/states-for-refs.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/states-for-refs.html @@ -7,8 +7,8 @@ core.node.subsystems / WalletService / statesForRefs

statesForRefs

- -open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
+ +open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>


diff --git a/docs/build/html/api/core.node/-abstract-node/construct-storage-service.html b/docs/build/html/api/core.node/-abstract-node/construct-storage-service.html index 3a50a23be6..d2c4cff596 100644 --- a/docs/build/html/api/core.node/-abstract-node/construct-storage-service.html +++ b/docs/build/html/api/core.node/-abstract-node/construct-storage-service.html @@ -7,8 +7,8 @@ core.node / AbstractNode / constructStorageService

constructStorageService

- -protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
+ +protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl


diff --git a/docs/build/html/api/core.node/-abstract-node/index.html b/docs/build/html/api/core.node/-abstract-node/index.html index 742cc4b9fb..a889f8f8fe 100644 --- a/docs/build/html/api/core.node/-abstract-node/index.html +++ b/docs/build/html/api/core.node/-abstract-node/index.html @@ -176,7 +176,7 @@ I/O), or a mock implementation suitable for unit test environments.

constructStorageService -open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl +open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl diff --git a/docs/build/html/api/core.node/-attachments-class-loader/-init-.html b/docs/build/html/api/core.node/-attachments-class-loader/-init-.html index 47bfe46fdd..9a3e50f750 100644 --- a/docs/build/html/api/core.node/-attachments-class-loader/-init-.html +++ b/docs/build/html/api/core.node/-attachments-class-loader/-init-.html @@ -7,7 +7,7 @@ core.node / AttachmentsClassLoader / <init>

<init>

-AttachmentsClassLoader(attachments: List<Attachment>, parent: ClassLoader = ClassLoader.getSystemClassLoader())
+AttachmentsClassLoader(attachments: List<Attachment>, parent: ClassLoader = ClassLoader.getSystemClassLoader())

A custom ClassLoader that knows how to load classes from a set of attachments. The attachments themselves only need to provide JAR streams, and so could be fetched from a database, local disk, etc. Constructing an AttachmentsClassLoader is somewhat expensive, as every attachment is scanned to ensure that there are no overlapping diff --git a/docs/build/html/api/core.node/-attachments-class-loader/index.html b/docs/build/html/api/core.node/-attachments-class-loader/index.html index cd99a4e3d2..b45952864e 100644 --- a/docs/build/html/api/core.node/-attachments-class-loader/index.html +++ b/docs/build/html/api/core.node/-attachments-class-loader/index.html @@ -32,7 +32,7 @@ file paths.

<init> -AttachmentsClassLoader(attachments: List<Attachment>, parent: ClassLoader = ClassLoader.getSystemClassLoader())

A custom ClassLoader that knows how to load classes from a set of attachments. The attachments themselves only +AttachmentsClassLoader(attachments: List<Attachment>, parent: ClassLoader = ClassLoader.getSystemClassLoader())

A custom ClassLoader that knows how to load classes from a set of attachments. The attachments themselves only need to provide JAR streams, and so could be fetched from a database, local disk, etc. Constructing an AttachmentsClassLoader is somewhat expensive, as every attachment is scanned to ensure that there are no overlapping file paths.

diff --git a/docs/build/html/api/core.node/-node-info/-init-.html b/docs/build/html/api/core.node/-node-info/-init-.html index 4bad4bc915..6ef8ddf508 100644 --- a/docs/build/html/api/core.node/-node-info/-init-.html +++ b/docs/build/html/api/core.node/-node-info/-init-.html @@ -7,7 +7,7 @@ core.node / NodeInfo / <init>

<init>

-NodeInfo(address: SingleMessageRecipient, identity: Party, advertisedServices: Set<ServiceType> = emptySet(), physicalLocation: PhysicalLocation? = null)
+NodeInfo(address: SingleMessageRecipient, identity: Party, advertisedServices: Set<ServiceType> = emptySet(), physicalLocation: PhysicalLocation? = null)

Info about a network node that acts on behalf of some form of contract party.



diff --git a/docs/build/html/api/core.node/-node-info/index.html b/docs/build/html/api/core.node/-node-info/index.html index 728e4aff3c..8977c9ab3f 100644 --- a/docs/build/html/api/core.node/-node-info/index.html +++ b/docs/build/html/api/core.node/-node-info/index.html @@ -18,7 +18,7 @@ <init> -NodeInfo(address: SingleMessageRecipient, identity: Party, advertisedServices: Set<ServiceType> = emptySet(), physicalLocation: PhysicalLocation? = null)

Info about a network node that acts on behalf of some form of contract party.

+NodeInfo(address: SingleMessageRecipient, identity: Party, advertisedServices: Set<ServiceType> = emptySet(), physicalLocation: PhysicalLocation? = null)

Info about a network node that acts on behalf of some form of contract party.

diff --git a/docs/build/html/api/core.node/-node/index.html b/docs/build/html/api/core.node/-node/index.html index 51b2601de2..6bc01d4570 100644 --- a/docs/build/html/api/core.node/-node/index.html +++ b/docs/build/html/api/core.node/-node/index.html @@ -243,7 +243,7 @@ loads important data off disk and starts listening for connections.

constructStorageService -open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl +open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl diff --git a/docs/build/html/api/core.node/-service-hub/index.html b/docs/build/html/api/core.node/-service-hub/index.html index e30d19fce6..365d345228 100644 --- a/docs/build/html/api/core.node/-service-hub/index.html +++ b/docs/build/html/api/core.node/-service-hub/index.html @@ -73,7 +73,7 @@ functionality and you dont want to hard-code which types in the interface.

recordTransactions -open fun recordTransactions(txs: List<SignedTransaction>, skipRecordingMap: Boolean = false): Unit

Given a list of SignedTransactions, writes them to the local storage for validated transactions and then +open fun recordTransactions(txs: List<SignedTransaction>, skipRecordingMap: Boolean = false): Unit

Given a list of SignedTransactions, writes them to the local storage for validated transactions and then sends them to the wallet for further processing.

@@ -81,7 +81,7 @@ sends them to the wallet for further processing.

verifyTransaction -open fun verifyTransaction(ltx: LedgerTransaction): Unit

Given a LedgerTransaction, looks up all its dependencies in the local database, uses the identity service to map +open fun verifyTransaction(ltx: LedgerTransaction): Unit

Given a LedgerTransaction, looks up all its dependencies in the local database, uses the identity service to map the SignedTransactions the DB gives back into LedgerTransactions, and then runs the smart contracts for the transaction. If no exception is thrown, the transaction is valid.

diff --git a/docs/build/html/api/core.node/-service-hub/record-transactions.html b/docs/build/html/api/core.node/-service-hub/record-transactions.html index 2b7f5c3e8c..b182f951a4 100644 --- a/docs/build/html/api/core.node/-service-hub/record-transactions.html +++ b/docs/build/html/api/core.node/-service-hub/record-transactions.html @@ -7,8 +7,8 @@ core.node / ServiceHub / recordTransactions

recordTransactions

- -open fun recordTransactions(txs: List<SignedTransaction>, skipRecordingMap: Boolean = false): Unit
+ +open fun recordTransactions(txs: List<SignedTransaction>, skipRecordingMap: Boolean = false): Unit

Given a list of SignedTransactions, writes them to the local storage for validated transactions and then sends them to the wallet for further processing.

TODO: Need to come up with a way for preventing transactions being written other than by this method. diff --git a/docs/build/html/api/core.node/-service-hub/verify-transaction.html b/docs/build/html/api/core.node/-service-hub/verify-transaction.html index fb20112548..72db0f5feb 100644 --- a/docs/build/html/api/core.node/-service-hub/verify-transaction.html +++ b/docs/build/html/api/core.node/-service-hub/verify-transaction.html @@ -7,8 +7,8 @@ core.node / ServiceHub / verifyTransaction

verifyTransaction

- -open fun verifyTransaction(ltx: LedgerTransaction): Unit
+ +open fun verifyTransaction(ltx: LedgerTransaction): Unit

Given a LedgerTransaction, looks up all its dependencies in the local database, uses the identity service to map the SignedTransactions the DB gives back into LedgerTransactions, and then runs the smart contracts for the transaction. If no exception is thrown, the transaction is valid.

diff --git a/docs/build/html/api/core.serialization/-serialized-bytes/index.html b/docs/build/html/api/core.serialization/-serialized-bytes/index.html index 3ff44aca5a..56bf6498ba 100644 --- a/docs/build/html/api/core.serialization/-serialized-bytes/index.html +++ b/docs/build/html/api/core.serialization/-serialized-bytes/index.html @@ -94,7 +94,7 @@ to get the original object back.

deserialize -fun SerializedBytes<WireTransaction>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
+fun SerializedBytes<WireTransaction>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
fun <T : Any> SerializedBytes<T>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): T
fun <T : Any> OpaqueBytes.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): T diff --git a/docs/build/html/api/core.serialization/-wire-transaction-serializer/index.html b/docs/build/html/api/core.serialization/-wire-transaction-serializer/index.html index 38503259ee..c9df222de7 100644 --- a/docs/build/html/api/core.serialization/-wire-transaction-serializer/index.html +++ b/docs/build/html/api/core.serialization/-wire-transaction-serializer/index.html @@ -18,13 +18,13 @@ read -fun read(kryo: <ERROR CLASS>, input: <ERROR CLASS>, type: Class<WireTransaction>): WireTransaction +fun read(kryo: <ERROR CLASS>, input: <ERROR CLASS>, type: Class<WireTransaction>): WireTransaction write -fun write(kryo: <ERROR CLASS>, output: <ERROR CLASS>, obj: WireTransaction): Unit +fun write(kryo: <ERROR CLASS>, output: <ERROR CLASS>, obj: WireTransaction): Unit diff --git a/docs/build/html/api/core.serialization/-wire-transaction-serializer/read.html b/docs/build/html/api/core.serialization/-wire-transaction-serializer/read.html index 391e852af3..7a36b13a05 100644 --- a/docs/build/html/api/core.serialization/-wire-transaction-serializer/read.html +++ b/docs/build/html/api/core.serialization/-wire-transaction-serializer/read.html @@ -7,8 +7,8 @@ core.serialization / WireTransactionSerializer / read

read

- -fun read(kryo: <ERROR CLASS>, input: <ERROR CLASS>, type: Class<WireTransaction>): WireTransaction
+ +fun read(kryo: <ERROR CLASS>, input: <ERROR CLASS>, type: Class<WireTransaction>): WireTransaction


diff --git a/docs/build/html/api/core.serialization/-wire-transaction-serializer/write.html b/docs/build/html/api/core.serialization/-wire-transaction-serializer/write.html index 38bd8fef79..cf4ed61462 100644 --- a/docs/build/html/api/core.serialization/-wire-transaction-serializer/write.html +++ b/docs/build/html/api/core.serialization/-wire-transaction-serializer/write.html @@ -7,8 +7,8 @@ core.serialization / WireTransactionSerializer / write

write

- -fun write(kryo: <ERROR CLASS>, output: <ERROR CLASS>, obj: WireTransaction): Unit
+ +fun write(kryo: <ERROR CLASS>, output: <ERROR CLASS>, obj: WireTransaction): Unit


diff --git a/docs/build/html/api/core.serialization/deserialize.html b/docs/build/html/api/core.serialization/deserialize.html index 054ff66478..b60d0acf82 100644 --- a/docs/build/html/api/core.serialization/deserialize.html +++ b/docs/build/html/api/core.serialization/deserialize.html @@ -9,8 +9,8 @@

deserialize

fun <T : Any> OpaqueBytes.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): T
- -fun SerializedBytes<WireTransaction>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
+ +fun SerializedBytes<WireTransaction>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
fun <T : Any> SerializedBytes<T>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): T

diff --git a/docs/build/html/api/core.serialization/index.html b/docs/build/html/api/core.serialization/index.html index 18571e7889..16668b42cf 100644 --- a/docs/build/html/api/core.serialization/index.html +++ b/docs/build/html/api/core.serialization/index.html @@ -114,7 +114,7 @@ simple, totally non-extensible binary (sub)format.

deserialize fun <T : Any> OpaqueBytes.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): T
-fun SerializedBytes<WireTransaction>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
+fun SerializedBytes<WireTransaction>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
fun <T : Any> SerializedBytes<T>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): T diff --git a/docs/build/html/api/core.testing/-mock-identity-service/-init-.html b/docs/build/html/api/core.testing/-mock-identity-service/-init-.html index 490bec9770..d3faadd71c 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/-init-.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/-init-.html @@ -7,7 +7,7 @@ core.testing / MockIdentityService / <init>

<init>

-MockIdentityService(identities: List<Party>)
+MockIdentityService(identities: List<Party>)

Scaffolding: a dummy identity service that just expects to have identities loaded off disk or found elsewhere. This class allows the provided list of identities to be mutated after construction, so it takes the list lock when doing lookups and recalculates the mapping each time. The ability to change the list is used by the diff --git a/docs/build/html/api/core.testing/-mock-identity-service/index.html b/docs/build/html/api/core.testing/-mock-identity-service/index.html index 4006a2806c..a8c820459b 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/index.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/index.html @@ -21,7 +21,7 @@ MockNetwork code.

<init> -MockIdentityService(identities: List<Party>)

Scaffolding: a dummy identity service that just expects to have identities loaded off disk or found elsewhere. +MockIdentityService(identities: List<Party>)

Scaffolding: a dummy identity service that just expects to have identities loaded off disk or found elsewhere. This class allows the provided list of identities to be mutated after construction, so it takes the list lock when doing lookups and recalculates the mapping each time. The ability to change the list is used by the MockNetwork code.

@@ -59,7 +59,7 @@ MockNetwork code.

registerIdentity -fun registerIdentity(party: Party): Unit +fun registerIdentity(party: Party): Unit diff --git a/docs/build/html/api/core.testing/-mock-identity-service/register-identity.html b/docs/build/html/api/core.testing/-mock-identity-service/register-identity.html index a3c8c2288a..e12893370f 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/register-identity.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/register-identity.html @@ -7,8 +7,8 @@ core.testing / MockIdentityService / registerIdentity

registerIdentity

- -fun registerIdentity(party: Party): Unit
+ +fun registerIdentity(party: Party): Unit
Overrides IdentityService.registerIdentity


diff --git a/docs/build/html/api/core.testing/-mock-network-map-cache/delete-registration.html b/docs/build/html/api/core.testing/-mock-network-map-cache/delete-registration.html index 1077e8986c..6d0b6aa366 100644 --- a/docs/build/html/api/core.testing/-mock-network-map-cache/delete-registration.html +++ b/docs/build/html/api/core.testing/-mock-network-map-cache/delete-registration.html @@ -7,8 +7,8 @@ core.testing / MockNetworkMapCache / deleteRegistration

deleteRegistration

- -fun deleteRegistration(identity: Party): Boolean
+ +fun deleteRegistration(identity: Party): Boolean

Directly remove a registration from the internal cache. DOES NOT fire the change listeners, as its not a change being received.


diff --git a/docs/build/html/api/core.testing/-mock-network-map-cache/index.html b/docs/build/html/api/core.testing/-mock-network-map-cache/index.html index 3a85d5eb0b..d5090dee11 100644 --- a/docs/build/html/api/core.testing/-mock-network-map-cache/index.html +++ b/docs/build/html/api/core.testing/-mock-network-map-cache/index.html @@ -97,7 +97,7 @@ not a change being received.

deleteRegistration -fun deleteRegistration(identity: Party): Boolean

Directly remove a registration from the internal cache. DOES NOT fire the change listeners, as its +fun deleteRegistration(identity: Party): Boolean

Directly remove a registration from the internal cache. DOES NOT fire the change listeners, as its not a change being received.

@@ -140,7 +140,7 @@ updates.

getRecommended -open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. +open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, or the appropriate oracle for a contract.

diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/index.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/index.html index 8f0737214d..acb46876e5 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/index.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/index.html @@ -230,7 +230,7 @@ constructStorageService -open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl +open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl diff --git a/docs/build/html/api/core.utilities/-json-support/-party-serializer/index.html b/docs/build/html/api/core.utilities/-json-support/-party-serializer/index.html index c61545a84b..c2279c24e2 100644 --- a/docs/build/html/api/core.utilities/-json-support/-party-serializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-party-serializer/index.html @@ -17,7 +17,7 @@ serialize -fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit +fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit diff --git a/docs/build/html/api/core.utilities/-json-support/-party-serializer/serialize.html b/docs/build/html/api/core.utilities/-json-support/-party-serializer/serialize.html index f90ee398bb..13cf63beb6 100644 --- a/docs/build/html/api/core.utilities/-json-support/-party-serializer/serialize.html +++ b/docs/build/html/api/core.utilities/-json-support/-party-serializer/serialize.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / PartySerializer / serialize

serialize

- -fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+ +fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit


diff --git a/docs/build/html/api/core/-amount/-init-.html b/docs/build/html/api/core/-amount/-init-.html index 52662cb8d0..3b20be4288 100644 --- a/docs/build/html/api/core/-amount/-init-.html +++ b/docs/build/html/api/core/-amount/-init-.html @@ -7,10 +7,10 @@ core / Amount / <init>

<init>

-Amount(amount: BigDecimal, currency: Currency)
+Amount(amount: BigDecimal, currency: Currency)


-Amount(pennies: Long, currency: Currency)
+Amount(pennies: Long, currency: Currency)

Amount represents a positive quantity of currency, measured in pennies, which are the smallest representable units.

Note that "pennies" are not necessarily 1/100ths of a currency unit, but are the actual smallest amount used in whatever currency the amount represents.

diff --git a/docs/build/html/api/core/-amount/compare-to.html b/docs/build/html/api/core/-amount/compare-to.html index c24817ff64..97f94c9c4d 100644 --- a/docs/build/html/api/core/-amount/compare-to.html +++ b/docs/build/html/api/core/-amount/compare-to.html @@ -7,8 +7,8 @@ core / Amount / compareTo

compareTo

- -fun compareTo(other: Amount): Int
+ +fun compareTo(other: Amount): Int


diff --git a/docs/build/html/api/core/-amount/currency.html b/docs/build/html/api/core/-amount/currency.html index c7ca2d0e17..d10b4799c8 100644 --- a/docs/build/html/api/core/-amount/currency.html +++ b/docs/build/html/api/core/-amount/currency.html @@ -7,7 +7,7 @@ core / Amount / currency

currency

- + val currency: Currency


diff --git a/docs/build/html/api/core/-amount/div.html b/docs/build/html/api/core/-amount/div.html index 4a3f5654ea..092ea2fd4f 100644 --- a/docs/build/html/api/core/-amount/div.html +++ b/docs/build/html/api/core/-amount/div.html @@ -7,10 +7,10 @@ core / Amount / div

div

- -operator fun div(other: Long): Amount
- -operator fun div(other: Int): Amount
+ +operator fun div(other: Long): Amount
+ +operator fun div(other: Int): Amount


diff --git a/docs/build/html/api/core/-amount/index.html b/docs/build/html/api/core/-amount/index.html index 01c7925a49..062ff6e41b 100644 --- a/docs/build/html/api/core/-amount/index.html +++ b/docs/build/html/api/core/-amount/index.html @@ -30,7 +30,7 @@ TODO: Think about how positive-only vs positive-or-negative amounts can be repre <init> -Amount(amount: BigDecimal, currency: Currency)Amount(pennies: Long, currency: Currency)

Amount represents a positive quantity of currency, measured in pennies, which are the smallest representable units.

+Amount(amount: BigDecimal, currency: Currency)Amount(pennies: Long, currency: Currency)

Amount represents a positive quantity of currency, measured in pennies, which are the smallest representable units.

@@ -59,33 +59,33 @@ TODO: Think about how positive-only vs positive-or-negative amounts can be repre compareTo -fun compareTo(other: Amount): Int +fun compareTo(other: Amount): Int div -operator fun div(other: Long): Amount
-operator fun div(other: Int): Amount +operator fun div(other: Long): Amount
+operator fun div(other: Int): Amount minus -operator fun minus(other: Amount): Amount +operator fun minus(other: Amount): Amount plus -operator fun plus(other: Amount): Amount +operator fun plus(other: Amount): Amount times -operator fun times(other: Long): Amount
-operator fun times(other: Int): Amount +operator fun times(other: Long): Amount
+operator fun times(other: Int): Amount @@ -102,7 +102,7 @@ TODO: Think about how positive-only vs positive-or-negative amounts can be repre times -operator fun Amount.times(other: RatioUnit): Amount +operator fun Amount.times(other: RatioUnit): Amount diff --git a/docs/build/html/api/core/-amount/minus.html b/docs/build/html/api/core/-amount/minus.html index 7b46b0b7b8..6715093f7a 100644 --- a/docs/build/html/api/core/-amount/minus.html +++ b/docs/build/html/api/core/-amount/minus.html @@ -7,8 +7,8 @@ core / Amount / minus

minus

- -operator fun minus(other: Amount): Amount
+ +operator fun minus(other: Amount): Amount


diff --git a/docs/build/html/api/core/-amount/pennies.html b/docs/build/html/api/core/-amount/pennies.html index 89373ffc17..bc799f2f56 100644 --- a/docs/build/html/api/core/-amount/pennies.html +++ b/docs/build/html/api/core/-amount/pennies.html @@ -7,7 +7,7 @@ core / Amount / pennies

pennies

- + val pennies: Long


diff --git a/docs/build/html/api/core/-amount/plus.html b/docs/build/html/api/core/-amount/plus.html index e9f60611b6..c37cd6f8aa 100644 --- a/docs/build/html/api/core/-amount/plus.html +++ b/docs/build/html/api/core/-amount/plus.html @@ -7,8 +7,8 @@ core / Amount / plus

plus

- -operator fun plus(other: Amount): Amount
+ +operator fun plus(other: Amount): Amount


diff --git a/docs/build/html/api/core/-amount/times.html b/docs/build/html/api/core/-amount/times.html index 9e1b616af5..ec03704834 100644 --- a/docs/build/html/api/core/-amount/times.html +++ b/docs/build/html/api/core/-amount/times.html @@ -7,10 +7,10 @@ core / Amount / times

times

- -operator fun times(other: Long): Amount
- -operator fun times(other: Int): Amount
+ +operator fun times(other: Long): Amount
+ +operator fun times(other: Int): Amount


diff --git a/docs/build/html/api/core/-amount/to-string.html b/docs/build/html/api/core/-amount/to-string.html index e2bf66cca5..81dc5413c9 100644 --- a/docs/build/html/api/core/-amount/to-string.html +++ b/docs/build/html/api/core/-amount/to-string.html @@ -7,7 +7,7 @@ core / Amount / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/-attachment/extract-file.html b/docs/build/html/api/core/-attachment/extract-file.html index 57235e160a..69786ede7b 100644 --- a/docs/build/html/api/core/-attachment/extract-file.html +++ b/docs/build/html/api/core/-attachment/extract-file.html @@ -7,8 +7,8 @@ core / Attachment / extractFile

extractFile

- -open fun extractFile(path: String, outputTo: OutputStream): Unit
+ +open fun extractFile(path: String, outputTo: OutputStream): Unit

Finds the named file case insensitively and copies it to the output stream.

Exceptions

diff --git a/docs/build/html/api/core/-attachment/index.html b/docs/build/html/api/core/-attachment/index.html index 0f80af0e32..769ac45f47 100644 --- a/docs/build/html/api/core/-attachment/index.html +++ b/docs/build/html/api/core/-attachment/index.html @@ -38,7 +38,7 @@ of how attachments are meant to be used include:

extractFile -open fun extractFile(path: String, outputTo: OutputStream): Unit

Finds the named file case insensitively and copies it to the output stream.

+open fun extractFile(path: String, outputTo: OutputStream): Unit

Finds the named file case insensitively and copies it to the output stream.

diff --git a/docs/build/html/api/core/-attachment/open-as-j-a-r.html b/docs/build/html/api/core/-attachment/open-as-j-a-r.html index d4861d6f58..d9094c1b37 100644 --- a/docs/build/html/api/core/-attachment/open-as-j-a-r.html +++ b/docs/build/html/api/core/-attachment/open-as-j-a-r.html @@ -7,7 +7,7 @@ core / Attachment / openAsJAR

openAsJAR

- + open fun openAsJAR(): JarInputStream


diff --git a/docs/build/html/api/core/-attachment/open.html b/docs/build/html/api/core/-attachment/open.html index f3d25f4b3b..5ba30f2a22 100644 --- a/docs/build/html/api/core/-attachment/open.html +++ b/docs/build/html/api/core/-attachment/open.html @@ -7,7 +7,7 @@ core / Attachment / open

open

- + abstract fun open(): InputStream


diff --git a/docs/build/html/api/core/-authenticated-object/-init-.html b/docs/build/html/api/core/-authenticated-object/-init-.html index 110cafc4ed..d4e2daff6e 100644 --- a/docs/build/html/api/core/-authenticated-object/-init-.html +++ b/docs/build/html/api/core/-authenticated-object/-init-.html @@ -7,7 +7,7 @@ core / AuthenticatedObject / <init>

<init>

-AuthenticatedObject(signers: List<PublicKey>, signingParties: List<Party>, value: T)
+AuthenticatedObject(signers: List<PublicKey>, signingParties: List<Party>, value: T)

Wraps an object that was signed by a public key, which may be a well known/recognised institutional key.



diff --git a/docs/build/html/api/core/-authenticated-object/index.html b/docs/build/html/api/core/-authenticated-object/index.html index 7ef638481a..40fbb8abc3 100644 --- a/docs/build/html/api/core/-authenticated-object/index.html +++ b/docs/build/html/api/core/-authenticated-object/index.html @@ -18,7 +18,7 @@ <init> -AuthenticatedObject(signers: List<PublicKey>, signingParties: List<Party>, value: T)

Wraps an object that was signed by a public key, which may be a well known/recognised institutional key.

+AuthenticatedObject(signers: List<PublicKey>, signingParties: List<Party>, value: T)

Wraps an object that was signed by a public key, which may be a well known/recognised institutional key.

diff --git a/docs/build/html/api/core/-authenticated-object/signers.html b/docs/build/html/api/core/-authenticated-object/signers.html index acc0700c35..34bbcca515 100644 --- a/docs/build/html/api/core/-authenticated-object/signers.html +++ b/docs/build/html/api/core/-authenticated-object/signers.html @@ -7,7 +7,7 @@ core / AuthenticatedObject / signers

signers

- + val signers: List<PublicKey>


diff --git a/docs/build/html/api/core/-authenticated-object/signing-parties.html b/docs/build/html/api/core/-authenticated-object/signing-parties.html index c18c83829d..4d7f8820e4 100644 --- a/docs/build/html/api/core/-authenticated-object/signing-parties.html +++ b/docs/build/html/api/core/-authenticated-object/signing-parties.html @@ -7,7 +7,7 @@ core / AuthenticatedObject / signingParties

signingParties

- + val signingParties: List<Party>

If any public keys were recognised, the looked up institutions are available here


diff --git a/docs/build/html/api/core/-authenticated-object/value.html b/docs/build/html/api/core/-authenticated-object/value.html index 95fd39959a..5ad98f49f2 100644 --- a/docs/build/html/api/core/-authenticated-object/value.html +++ b/docs/build/html/api/core/-authenticated-object/value.html @@ -7,7 +7,7 @@ core / AuthenticatedObject / value

value

- + val value: T


diff --git a/docs/build/html/api/core/-business-calendar/-t-e-s-t_-c-a-l-e-n-d-a-r_-d-a-t-a.html b/docs/build/html/api/core/-business-calendar/-t-e-s-t_-c-a-l-e-n-d-a-r_-d-a-t-a.html index dcd80431bb..b8c7db65b2 100644 --- a/docs/build/html/api/core/-business-calendar/-t-e-s-t_-c-a-l-e-n-d-a-r_-d-a-t-a.html +++ b/docs/build/html/api/core/-business-calendar/-t-e-s-t_-c-a-l-e-n-d-a-r_-d-a-t-a.html @@ -7,7 +7,7 @@ core / BusinessCalendar / TEST_CALENDAR_DATA

TEST_CALENDAR_DATA

- + val TEST_CALENDAR_DATA: <ERROR CLASS>


diff --git a/docs/build/html/api/core/-business-calendar/-unknown-calendar/-init-.html b/docs/build/html/api/core/-business-calendar/-unknown-calendar/-init-.html index 24b880d02a..824e87b218 100644 --- a/docs/build/html/api/core/-business-calendar/-unknown-calendar/-init-.html +++ b/docs/build/html/api/core/-business-calendar/-unknown-calendar/-init-.html @@ -7,7 +7,7 @@ core / BusinessCalendar / UnknownCalendar / <init>

<init>

-UnknownCalendar(name: String)
+UnknownCalendar(name: String)


diff --git a/docs/build/html/api/core/-business-calendar/-unknown-calendar/index.html b/docs/build/html/api/core/-business-calendar/-unknown-calendar/index.html index 793ae18d92..ef6f2d2fe7 100644 --- a/docs/build/html/api/core/-business-calendar/-unknown-calendar/index.html +++ b/docs/build/html/api/core/-business-calendar/-unknown-calendar/index.html @@ -17,7 +17,7 @@ <init> -UnknownCalendar(name: String) +UnknownCalendar(name: String) diff --git a/docs/build/html/api/core/-business-calendar/apply-roll-convention.html b/docs/build/html/api/core/-business-calendar/apply-roll-convention.html index 8b4fd2658b..701c3e25f7 100644 --- a/docs/build/html/api/core/-business-calendar/apply-roll-convention.html +++ b/docs/build/html/api/core/-business-calendar/apply-roll-convention.html @@ -7,8 +7,8 @@ core / BusinessCalendar / applyRollConvention

applyRollConvention

- -open fun applyRollConvention(testDate: LocalDate, dateRollConvention: DateRollConvention): LocalDate
+ +open fun applyRollConvention(testDate: LocalDate, dateRollConvention: DateRollConvention): LocalDate


diff --git a/docs/build/html/api/core/-business-calendar/calendars.html b/docs/build/html/api/core/-business-calendar/calendars.html index 355ec625c5..9f7f9ff037 100644 --- a/docs/build/html/api/core/-business-calendar/calendars.html +++ b/docs/build/html/api/core/-business-calendar/calendars.html @@ -7,9 +7,9 @@ core / BusinessCalendar / calendars

calendars

- + val calendars: Array<out String>
- + val calendars: <ERROR CLASS>


diff --git a/docs/build/html/api/core/-business-calendar/create-generic-schedule.html b/docs/build/html/api/core/-business-calendar/create-generic-schedule.html index 0249ca1e8b..5d70648e3b 100644 --- a/docs/build/html/api/core/-business-calendar/create-generic-schedule.html +++ b/docs/build/html/api/core/-business-calendar/create-generic-schedule.html @@ -7,8 +7,8 @@ core / BusinessCalendar / createGenericSchedule

createGenericSchedule

- -fun createGenericSchedule(startDate: LocalDate, period: Frequency, calendar: BusinessCalendar = BusinessCalendar.getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, periodOffset: Int? = null): List<LocalDate>
+ +fun createGenericSchedule(startDate: LocalDate, period: Frequency, calendar: BusinessCalendar = BusinessCalendar.getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, periodOffset: Int? = null): List<LocalDate>

Calculates an event schedule that moves events around to ensure they fall on working days.



diff --git a/docs/build/html/api/core/-business-calendar/equals.html b/docs/build/html/api/core/-business-calendar/equals.html index b8ed3d8041..a4f58faab5 100644 --- a/docs/build/html/api/core/-business-calendar/equals.html +++ b/docs/build/html/api/core/-business-calendar/equals.html @@ -7,8 +7,8 @@ core / BusinessCalendar / equals

equals

- -open fun equals(other: Any?): Boolean
+ +open fun equals(other: Any?): Boolean


diff --git a/docs/build/html/api/core/-business-calendar/get-instance.html b/docs/build/html/api/core/-business-calendar/get-instance.html index ed60237ba2..d02d60b5bc 100644 --- a/docs/build/html/api/core/-business-calendar/get-instance.html +++ b/docs/build/html/api/core/-business-calendar/get-instance.html @@ -7,8 +7,8 @@ core / BusinessCalendar / getInstance

getInstance

- -fun getInstance(vararg calname: String): BusinessCalendar
+ +fun getInstance(vararg calname: String): BusinessCalendar

Returns a business calendar that combines all the named holiday calendars into one list of holiday dates.



diff --git a/docs/build/html/api/core/-business-calendar/hash-code.html b/docs/build/html/api/core/-business-calendar/hash-code.html index 17d49a9732..7c4fea8b02 100644 --- a/docs/build/html/api/core/-business-calendar/hash-code.html +++ b/docs/build/html/api/core/-business-calendar/hash-code.html @@ -7,7 +7,7 @@ core / BusinessCalendar / hashCode

hashCode

- + open fun hashCode(): Int


diff --git a/docs/build/html/api/core/-business-calendar/holiday-dates.html b/docs/build/html/api/core/-business-calendar/holiday-dates.html index c93e97086e..73537ef29f 100644 --- a/docs/build/html/api/core/-business-calendar/holiday-dates.html +++ b/docs/build/html/api/core/-business-calendar/holiday-dates.html @@ -7,7 +7,7 @@ core / BusinessCalendar / holidayDates

holidayDates

- + val holidayDates: List<LocalDate>


diff --git a/docs/build/html/api/core/-business-calendar/index.html b/docs/build/html/api/core/-business-calendar/index.html index 36141aafb4..c6e8a783b1 100644 --- a/docs/build/html/api/core/-business-calendar/index.html +++ b/docs/build/html/api/core/-business-calendar/index.html @@ -48,13 +48,13 @@ no staff are around to handle problems.

applyRollConvention -open fun applyRollConvention(testDate: LocalDate, dateRollConvention: DateRollConvention): LocalDate +open fun applyRollConvention(testDate: LocalDate, dateRollConvention: DateRollConvention): LocalDate equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean @@ -66,13 +66,13 @@ no staff are around to handle problems.

isWorkingDay -open fun isWorkingDay(date: LocalDate): Boolean +open fun isWorkingDay(date: LocalDate): Boolean moveBusinessDays -fun moveBusinessDays(date: LocalDate, direction: DateRollDirection, i: Int): LocalDate

Returns a date which is the inbound date plus/minus a given number of business days. +fun moveBusinessDays(date: LocalDate, direction: DateRollDirection, i: Int): LocalDate

Returns a date which is the inbound date plus/minus a given number of business days. TODO: Make more efficient if necessary

@@ -102,21 +102,21 @@ TODO: Make more efficient if necessary

createGenericSchedule -fun createGenericSchedule(startDate: LocalDate, period: Frequency, calendar: BusinessCalendar = BusinessCalendar.getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, periodOffset: Int? = null): List<LocalDate>

Calculates an event schedule that moves events around to ensure they fall on working days.

+fun createGenericSchedule(startDate: LocalDate, period: Frequency, calendar: BusinessCalendar = BusinessCalendar.getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, periodOffset: Int? = null): List<LocalDate>

Calculates an event schedule that moves events around to ensure they fall on working days.

getInstance -fun getInstance(vararg calname: String): BusinessCalendar

Returns a business calendar that combines all the named holiday calendars into one list of holiday dates.

+fun getInstance(vararg calname: String): BusinessCalendar

Returns a business calendar that combines all the named holiday calendars into one list of holiday dates.

parseDateFromString -fun parseDateFromString(it: String): LocalDate

Parses a date of the form YYYY-MM-DD, like 2016-01-10 for 10th Jan.

+fun parseDateFromString(it: String): LocalDate

Parses a date of the form YYYY-MM-DD, like 2016-01-10 for 10th Jan.

diff --git a/docs/build/html/api/core/-business-calendar/is-working-day.html b/docs/build/html/api/core/-business-calendar/is-working-day.html index a01367a055..d7e2892d46 100644 --- a/docs/build/html/api/core/-business-calendar/is-working-day.html +++ b/docs/build/html/api/core/-business-calendar/is-working-day.html @@ -7,8 +7,8 @@ core / BusinessCalendar / isWorkingDay

isWorkingDay

- -open fun isWorkingDay(date: LocalDate): Boolean
+ +open fun isWorkingDay(date: LocalDate): Boolean


diff --git a/docs/build/html/api/core/-business-calendar/move-business-days.html b/docs/build/html/api/core/-business-calendar/move-business-days.html index 428f658421..e5d7ab1d69 100644 --- a/docs/build/html/api/core/-business-calendar/move-business-days.html +++ b/docs/build/html/api/core/-business-calendar/move-business-days.html @@ -7,8 +7,8 @@ core / BusinessCalendar / moveBusinessDays

moveBusinessDays

- -fun moveBusinessDays(date: LocalDate, direction: DateRollDirection, i: Int): LocalDate
+ +fun moveBusinessDays(date: LocalDate, direction: DateRollDirection, i: Int): LocalDate

Returns a date which is the inbound date plus/minus a given number of business days. TODO: Make more efficient if necessary


diff --git a/docs/build/html/api/core/-business-calendar/parse-date-from-string.html b/docs/build/html/api/core/-business-calendar/parse-date-from-string.html index 4290dbbc9c..eccb528633 100644 --- a/docs/build/html/api/core/-business-calendar/parse-date-from-string.html +++ b/docs/build/html/api/core/-business-calendar/parse-date-from-string.html @@ -7,8 +7,8 @@ core / BusinessCalendar / parseDateFromString

parseDateFromString

- -fun parseDateFromString(it: String): LocalDate
+ +fun parseDateFromString(it: String): LocalDate

Parses a date of the form YYYY-MM-DD, like 2016-01-10 for 10th Jan.



diff --git a/docs/build/html/api/core/-command/-init-.html b/docs/build/html/api/core/-command/-init-.html index 2c77018cca..afd9a074ee 100644 --- a/docs/build/html/api/core/-command/-init-.html +++ b/docs/build/html/api/core/-command/-init-.html @@ -7,10 +7,10 @@ core / Command / <init>

<init>

-Command(data: CommandData, key: PublicKey)
+Command(data: CommandData, key: PublicKey)


-Command(value: CommandData, signers: List<PublicKey>)
+Command(value: CommandData, signers: List<PublicKey>)

Command data/content plus pubkey pair: the signature is stored at the end of the serialized bytes



diff --git a/docs/build/html/api/core/-command/index.html b/docs/build/html/api/core/-command/index.html index b81e4a109c..183d31ab6e 100644 --- a/docs/build/html/api/core/-command/index.html +++ b/docs/build/html/api/core/-command/index.html @@ -18,7 +18,7 @@ <init> -Command(data: CommandData, key: PublicKey)Command(value: CommandData, signers: List<PublicKey>)

Command data/content plus pubkey pair: the signature is stored at the end of the serialized bytes

+Command(data: CommandData, key: PublicKey)Command(value: CommandData, signers: List<PublicKey>)

Command data/content plus pubkey pair: the signature is stored at the end of the serialized bytes

diff --git a/docs/build/html/api/core/-command/signers.html b/docs/build/html/api/core/-command/signers.html index d6f5899fd2..ef9f0a1488 100644 --- a/docs/build/html/api/core/-command/signers.html +++ b/docs/build/html/api/core/-command/signers.html @@ -7,7 +7,7 @@ core / Command / signers

signers

- + val signers: List<PublicKey>


diff --git a/docs/build/html/api/core/-command/to-string.html b/docs/build/html/api/core/-command/to-string.html index 3d72244f93..d776fe746a 100644 --- a/docs/build/html/api/core/-command/to-string.html +++ b/docs/build/html/api/core/-command/to-string.html @@ -7,7 +7,7 @@ core / Command / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/-command/value.html b/docs/build/html/api/core/-command/value.html index c5f601f9dc..7eecab2a5a 100644 --- a/docs/build/html/api/core/-command/value.html +++ b/docs/build/html/api/core/-command/value.html @@ -7,7 +7,7 @@ core / Command / value

value

- + val value: CommandData


diff --git a/docs/build/html/api/core/-contract-state/contract.html b/docs/build/html/api/core/-contract-state/contract.html index 71ce3645be..1381b1cc6d 100644 --- a/docs/build/html/api/core/-contract-state/contract.html +++ b/docs/build/html/api/core/-contract-state/contract.html @@ -7,7 +7,7 @@ core / ContractState / contract

contract

- + abstract val contract: Contract

Contract by which the state belongs


diff --git a/docs/build/html/api/core/-contract/index.html b/docs/build/html/api/core/-contract/index.html index ebc00a0876..ffd53e3989 100644 --- a/docs/build/html/api/core/-contract/index.html +++ b/docs/build/html/api/core/-contract/index.html @@ -34,7 +34,7 @@ the contracts contents).

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

Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense. +abstract 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/core/-contract/legal-contract-reference.html b/docs/build/html/api/core/-contract/legal-contract-reference.html index ad62fa457e..adaef99dd5 100644 --- a/docs/build/html/api/core/-contract/legal-contract-reference.html +++ b/docs/build/html/api/core/-contract/legal-contract-reference.html @@ -7,7 +7,7 @@ core / Contract / legalContractReference

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).

diff --git a/docs/build/html/api/core/-contract/verify.html b/docs/build/html/api/core/-contract/verify.html index b2b6b174b9..1acd399036 100644 --- a/docs/build/html/api/core/-contract/verify.html +++ b/docs/build/html/api/core/-contract/verify.html @@ -7,8 +7,8 @@ core / Contract / verify

verify

- -abstract fun verify(tx: TransactionForVerification): Unit
+ +abstract 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 diff --git a/docs/build/html/api/core/-date-roll-convention/-actual/direction.html b/docs/build/html/api/core/-date-roll-convention/-actual/direction.html index 02df8f991f..4ebfa0c019 100644 --- a/docs/build/html/api/core/-date-roll-convention/-actual/direction.html +++ b/docs/build/html/api/core/-date-roll-convention/-actual/direction.html @@ -7,7 +7,7 @@ core / DateRollConvention / Actual / direction

direction

- + fun direction(): DateRollDirection
Overrides DateRollConvention.direction

diff --git a/docs/build/html/api/core/-date-roll-convention/-actual/is-modified.html b/docs/build/html/api/core/-date-roll-convention/-actual/is-modified.html index 7ad66902b5..c64126d0b3 100644 --- a/docs/build/html/api/core/-date-roll-convention/-actual/is-modified.html +++ b/docs/build/html/api/core/-date-roll-convention/-actual/is-modified.html @@ -7,7 +7,7 @@ core / DateRollConvention / Actual / isModified

isModified

- + val isModified: Boolean
Overrides DateRollConvention.isModified

diff --git a/docs/build/html/api/core/-date-roll-convention/-following/direction.html b/docs/build/html/api/core/-date-roll-convention/-following/direction.html index 01212e6bdb..5de264be38 100644 --- a/docs/build/html/api/core/-date-roll-convention/-following/direction.html +++ b/docs/build/html/api/core/-date-roll-convention/-following/direction.html @@ -7,7 +7,7 @@ core / DateRollConvention / Following / direction

direction

- + fun direction(): DateRollDirection
Overrides DateRollConvention.direction

diff --git a/docs/build/html/api/core/-date-roll-convention/-following/is-modified.html b/docs/build/html/api/core/-date-roll-convention/-following/is-modified.html index cfdacdd0c8..540fa9e9c0 100644 --- a/docs/build/html/api/core/-date-roll-convention/-following/is-modified.html +++ b/docs/build/html/api/core/-date-roll-convention/-following/is-modified.html @@ -7,7 +7,7 @@ core / DateRollConvention / Following / isModified

isModified

- + val isModified: Boolean
Overrides DateRollConvention.isModified

diff --git a/docs/build/html/api/core/-date-roll-convention/-modified-following/direction.html b/docs/build/html/api/core/-date-roll-convention/-modified-following/direction.html index 7d0a7b5044..ebeaf4ad79 100644 --- a/docs/build/html/api/core/-date-roll-convention/-modified-following/direction.html +++ b/docs/build/html/api/core/-date-roll-convention/-modified-following/direction.html @@ -7,7 +7,7 @@ core / DateRollConvention / ModifiedFollowing / direction

direction

- + fun direction(): DateRollDirection
Overrides DateRollConvention.direction

diff --git a/docs/build/html/api/core/-date-roll-convention/-modified-following/is-modified.html b/docs/build/html/api/core/-date-roll-convention/-modified-following/is-modified.html index 93af7ce260..4f800fee37 100644 --- a/docs/build/html/api/core/-date-roll-convention/-modified-following/is-modified.html +++ b/docs/build/html/api/core/-date-roll-convention/-modified-following/is-modified.html @@ -7,7 +7,7 @@ core / DateRollConvention / ModifiedFollowing / isModified

isModified

- + val isModified: Boolean
Overrides DateRollConvention.isModified

diff --git a/docs/build/html/api/core/-date-roll-convention/-modified-previous/direction.html b/docs/build/html/api/core/-date-roll-convention/-modified-previous/direction.html index 669fd6ef56..f486cba08e 100644 --- a/docs/build/html/api/core/-date-roll-convention/-modified-previous/direction.html +++ b/docs/build/html/api/core/-date-roll-convention/-modified-previous/direction.html @@ -7,7 +7,7 @@ core / DateRollConvention / ModifiedPrevious / direction

direction

- + fun direction(): DateRollDirection
Overrides DateRollConvention.direction

diff --git a/docs/build/html/api/core/-date-roll-convention/-modified-previous/is-modified.html b/docs/build/html/api/core/-date-roll-convention/-modified-previous/is-modified.html index d42ee9a53d..651a5daafc 100644 --- a/docs/build/html/api/core/-date-roll-convention/-modified-previous/is-modified.html +++ b/docs/build/html/api/core/-date-roll-convention/-modified-previous/is-modified.html @@ -7,7 +7,7 @@ core / DateRollConvention / ModifiedPrevious / isModified

isModified

- + val isModified: Boolean
Overrides DateRollConvention.isModified

diff --git a/docs/build/html/api/core/-date-roll-convention/-previous/direction.html b/docs/build/html/api/core/-date-roll-convention/-previous/direction.html index f786358109..f473c18cc6 100644 --- a/docs/build/html/api/core/-date-roll-convention/-previous/direction.html +++ b/docs/build/html/api/core/-date-roll-convention/-previous/direction.html @@ -7,7 +7,7 @@ core / DateRollConvention / Previous / direction

direction

- + fun direction(): DateRollDirection
Overrides DateRollConvention.direction

diff --git a/docs/build/html/api/core/-date-roll-convention/-previous/is-modified.html b/docs/build/html/api/core/-date-roll-convention/-previous/is-modified.html index fef5521936..c6720d6b5a 100644 --- a/docs/build/html/api/core/-date-roll-convention/-previous/is-modified.html +++ b/docs/build/html/api/core/-date-roll-convention/-previous/is-modified.html @@ -7,7 +7,7 @@ core / DateRollConvention / Previous / isModified

isModified

- + val isModified: Boolean
Overrides DateRollConvention.isModified

diff --git a/docs/build/html/api/core/-date-roll-convention/direction.html b/docs/build/html/api/core/-date-roll-convention/direction.html index 6675112b9d..cff186ff53 100644 --- a/docs/build/html/api/core/-date-roll-convention/direction.html +++ b/docs/build/html/api/core/-date-roll-convention/direction.html @@ -7,7 +7,7 @@ core / DateRollConvention / direction

direction

- + abstract fun direction(): DateRollDirection


diff --git a/docs/build/html/api/core/-date-roll-convention/is-modified.html b/docs/build/html/api/core/-date-roll-convention/is-modified.html index f999b8fd22..2ac8d3c96e 100644 --- a/docs/build/html/api/core/-date-roll-convention/is-modified.html +++ b/docs/build/html/api/core/-date-roll-convention/is-modified.html @@ -7,7 +7,7 @@ core / DateRollConvention / isModified

isModified

- + abstract val isModified: Boolean


diff --git a/docs/build/html/api/core/-date-roll-direction/value.html b/docs/build/html/api/core/-date-roll-direction/value.html index 33697c2a5f..a7ca9d6ef6 100644 --- a/docs/build/html/api/core/-date-roll-direction/value.html +++ b/docs/build/html/api/core/-date-roll-direction/value.html @@ -7,7 +7,7 @@ core / DateRollDirection / value

value

- + val value: Long


diff --git a/docs/build/html/api/core/-day-count-basis-day/to-string.html b/docs/build/html/api/core/-day-count-basis-day/to-string.html index 59b61a3dfa..2540a3d28c 100644 --- a/docs/build/html/api/core/-day-count-basis-day/to-string.html +++ b/docs/build/html/api/core/-day-count-basis-day/to-string.html @@ -7,7 +7,7 @@ core / DayCountBasisDay / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/-day-count-basis-year/to-string.html b/docs/build/html/api/core/-day-count-basis-year/to-string.html index 0dc4229919..98e1bf7a16 100644 --- a/docs/build/html/api/core/-day-count-basis-year/to-string.html +++ b/docs/build/html/api/core/-day-count-basis-year/to-string.html @@ -7,7 +7,7 @@ core / DayCountBasisYear / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/-expression-deserializer/deserialize.html b/docs/build/html/api/core/-expression-deserializer/deserialize.html index 9e332f7d05..dd0271691f 100644 --- a/docs/build/html/api/core/-expression-deserializer/deserialize.html +++ b/docs/build/html/api/core/-expression-deserializer/deserialize.html @@ -7,8 +7,8 @@ core / ExpressionDeserializer / deserialize

deserialize

- -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Expression
+ +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Expression


diff --git a/docs/build/html/api/core/-expression-deserializer/index.html b/docs/build/html/api/core/-expression-deserializer/index.html index ac4fdec4f6..b8abfd9ff8 100644 --- a/docs/build/html/api/core/-expression-deserializer/index.html +++ b/docs/build/html/api/core/-expression-deserializer/index.html @@ -17,7 +17,7 @@ deserialize -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Expression +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Expression diff --git a/docs/build/html/api/core/-expression-serializer/index.html b/docs/build/html/api/core/-expression-serializer/index.html index dfdbb0f9c5..559f210b99 100644 --- a/docs/build/html/api/core/-expression-serializer/index.html +++ b/docs/build/html/api/core/-expression-serializer/index.html @@ -17,7 +17,7 @@ serialize -fun serialize(expr: Expression, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit +fun serialize(expr: Expression, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit diff --git a/docs/build/html/api/core/-expression-serializer/serialize.html b/docs/build/html/api/core/-expression-serializer/serialize.html index a538100508..185894f700 100644 --- a/docs/build/html/api/core/-expression-serializer/serialize.html +++ b/docs/build/html/api/core/-expression-serializer/serialize.html @@ -7,8 +7,8 @@ core / ExpressionSerializer / serialize

serialize

- -fun serialize(expr: Expression, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+ +fun serialize(expr: Expression, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit


diff --git a/docs/build/html/api/core/-expression/-init-.html b/docs/build/html/api/core/-expression/-init-.html index acef77cdc4..8491c33935 100644 --- a/docs/build/html/api/core/-expression/-init-.html +++ b/docs/build/html/api/core/-expression/-init-.html @@ -7,7 +7,7 @@ core / Expression / <init>

<init>

-Expression(expr: String)
+Expression(expr: String)

Represents a textual expression of e.g. a formula



diff --git a/docs/build/html/api/core/-expression/expr.html b/docs/build/html/api/core/-expression/expr.html index 85e9b5a245..5afed174f6 100644 --- a/docs/build/html/api/core/-expression/expr.html +++ b/docs/build/html/api/core/-expression/expr.html @@ -7,7 +7,7 @@ core / Expression / expr

expr

- + val expr: String


diff --git a/docs/build/html/api/core/-expression/index.html b/docs/build/html/api/core/-expression/index.html index 5fa83a1843..39091e5d9b 100644 --- a/docs/build/html/api/core/-expression/index.html +++ b/docs/build/html/api/core/-expression/index.html @@ -18,7 +18,7 @@ <init> -Expression(expr: String)

Represents a textual expression of e.g. a formula

+Expression(expr: String)

Represents a textual expression of e.g. a formula

diff --git a/docs/build/html/api/core/-fix-of/-init-.html b/docs/build/html/api/core/-fix-of/-init-.html index e7d0c6d687..07e355e047 100644 --- a/docs/build/html/api/core/-fix-of/-init-.html +++ b/docs/build/html/api/core/-fix-of/-init-.html @@ -7,7 +7,7 @@ core / FixOf / <init>

<init>

-FixOf(name: String, forDay: LocalDate, ofTenor: Tenor)
+FixOf(name: String, forDay: LocalDate, ofTenor: Tenor)

A FixOf identifies the question side of a fix: what day, tenor and type of fix ("LIBOR", "EURIBOR" etc)



diff --git a/docs/build/html/api/core/-fix-of/for-day.html b/docs/build/html/api/core/-fix-of/for-day.html index f51365377b..033169e396 100644 --- a/docs/build/html/api/core/-fix-of/for-day.html +++ b/docs/build/html/api/core/-fix-of/for-day.html @@ -7,7 +7,7 @@ core / FixOf / forDay

forDay

- + val forDay: LocalDate


diff --git a/docs/build/html/api/core/-fix-of/index.html b/docs/build/html/api/core/-fix-of/index.html index e476f877d4..9c6b3cae64 100644 --- a/docs/build/html/api/core/-fix-of/index.html +++ b/docs/build/html/api/core/-fix-of/index.html @@ -18,7 +18,7 @@ <init> -FixOf(name: String, forDay: LocalDate, ofTenor: Tenor)

A FixOf identifies the question side of a fix: what day, tenor and type of fix ("LIBOR", "EURIBOR" etc)

+FixOf(name: String, forDay: LocalDate, ofTenor: Tenor)

A FixOf identifies the question side of a fix: what day, tenor and type of fix ("LIBOR", "EURIBOR" etc)

diff --git a/docs/build/html/api/core/-fix-of/name.html b/docs/build/html/api/core/-fix-of/name.html index 2c59fe85d0..f882e34698 100644 --- a/docs/build/html/api/core/-fix-of/name.html +++ b/docs/build/html/api/core/-fix-of/name.html @@ -7,7 +7,7 @@ core / FixOf / name

name

- + val name: String


diff --git a/docs/build/html/api/core/-fix-of/of-tenor.html b/docs/build/html/api/core/-fix-of/of-tenor.html index 3d28b0d19e..bff2652e2b 100644 --- a/docs/build/html/api/core/-fix-of/of-tenor.html +++ b/docs/build/html/api/core/-fix-of/of-tenor.html @@ -7,7 +7,7 @@ core / FixOf / ofTenor

ofTenor

- + val ofTenor: Tenor


diff --git a/docs/build/html/api/core/-fix/-init-.html b/docs/build/html/api/core/-fix/-init-.html index 117f7c4f0d..5f0683d47a 100644 --- a/docs/build/html/api/core/-fix/-init-.html +++ b/docs/build/html/api/core/-fix/-init-.html @@ -7,7 +7,7 @@ core / Fix / <init>

<init>

-Fix(of: FixOf, value: BigDecimal)
+Fix(of: FixOf, value: BigDecimal)

A Fix represents a named interest rate, on a given day, for a given duration. It can be embedded in a tx.



diff --git a/docs/build/html/api/core/-fix/index.html b/docs/build/html/api/core/-fix/index.html index e8fad58f5c..537600d64b 100644 --- a/docs/build/html/api/core/-fix/index.html +++ b/docs/build/html/api/core/-fix/index.html @@ -18,7 +18,7 @@ <init> -Fix(of: FixOf, value: BigDecimal)

A Fix represents a named interest rate, on a given day, for a given duration. It can be embedded in a tx.

+Fix(of: FixOf, value: BigDecimal)

A Fix represents a named interest rate, on a given day, for a given duration. It can be embedded in a tx.

diff --git a/docs/build/html/api/core/-fix/of.html b/docs/build/html/api/core/-fix/of.html index c7d73fa7da..aafbc75bfb 100644 --- a/docs/build/html/api/core/-fix/of.html +++ b/docs/build/html/api/core/-fix/of.html @@ -7,7 +7,7 @@ core / Fix / of

of

- + val of: FixOf


diff --git a/docs/build/html/api/core/-fix/value.html b/docs/build/html/api/core/-fix/value.html index 0b64ccf180..f81b9af725 100644 --- a/docs/build/html/api/core/-fix/value.html +++ b/docs/build/html/api/core/-fix/value.html @@ -7,7 +7,7 @@ core / Fix / value

value

- + val value: BigDecimal


diff --git a/docs/build/html/api/core/-frequency/-annual/index.html b/docs/build/html/api/core/-frequency/-annual/index.html index 181218a44a..ba81dd791f 100644 --- a/docs/build/html/api/core/-frequency/-annual/index.html +++ b/docs/build/html/api/core/-frequency/-annual/index.html @@ -28,7 +28,7 @@ offset -fun offset(d: LocalDate): LocalDate +fun offset(d: LocalDate): LocalDate diff --git a/docs/build/html/api/core/-frequency/-annual/offset.html b/docs/build/html/api/core/-frequency/-annual/offset.html index aba88b1062..8a9c5b0012 100644 --- a/docs/build/html/api/core/-frequency/-annual/offset.html +++ b/docs/build/html/api/core/-frequency/-annual/offset.html @@ -7,8 +7,8 @@ core / Frequency / Annual / offset

offset

- -fun offset(d: LocalDate): LocalDate
+ +fun offset(d: LocalDate): LocalDate
Overrides Frequency.offset


diff --git a/docs/build/html/api/core/-frequency/-bi-weekly/index.html b/docs/build/html/api/core/-frequency/-bi-weekly/index.html index 7b1199ff10..94d61be702 100644 --- a/docs/build/html/api/core/-frequency/-bi-weekly/index.html +++ b/docs/build/html/api/core/-frequency/-bi-weekly/index.html @@ -28,7 +28,7 @@ offset -fun offset(d: LocalDate): LocalDate +fun offset(d: LocalDate): LocalDate diff --git a/docs/build/html/api/core/-frequency/-bi-weekly/offset.html b/docs/build/html/api/core/-frequency/-bi-weekly/offset.html index 11b1855633..4330d0004f 100644 --- a/docs/build/html/api/core/-frequency/-bi-weekly/offset.html +++ b/docs/build/html/api/core/-frequency/-bi-weekly/offset.html @@ -7,8 +7,8 @@ core / Frequency / BiWeekly / offset

offset

- -fun offset(d: LocalDate): LocalDate
+ +fun offset(d: LocalDate): LocalDate
Overrides Frequency.offset


diff --git a/docs/build/html/api/core/-frequency/-monthly/index.html b/docs/build/html/api/core/-frequency/-monthly/index.html index fc84dc0cd8..3228c16f62 100644 --- a/docs/build/html/api/core/-frequency/-monthly/index.html +++ b/docs/build/html/api/core/-frequency/-monthly/index.html @@ -28,7 +28,7 @@ offset -fun offset(d: LocalDate): LocalDate +fun offset(d: LocalDate): LocalDate diff --git a/docs/build/html/api/core/-frequency/-monthly/offset.html b/docs/build/html/api/core/-frequency/-monthly/offset.html index 6f60806089..6c32db6c05 100644 --- a/docs/build/html/api/core/-frequency/-monthly/offset.html +++ b/docs/build/html/api/core/-frequency/-monthly/offset.html @@ -7,8 +7,8 @@ core / Frequency / Monthly / offset

offset

- -fun offset(d: LocalDate): LocalDate
+ +fun offset(d: LocalDate): LocalDate
Overrides Frequency.offset


diff --git a/docs/build/html/api/core/-frequency/-quarterly/index.html b/docs/build/html/api/core/-frequency/-quarterly/index.html index 43deb93886..11fe6d1261 100644 --- a/docs/build/html/api/core/-frequency/-quarterly/index.html +++ b/docs/build/html/api/core/-frequency/-quarterly/index.html @@ -28,7 +28,7 @@ offset -fun offset(d: LocalDate): LocalDate +fun offset(d: LocalDate): LocalDate diff --git a/docs/build/html/api/core/-frequency/-quarterly/offset.html b/docs/build/html/api/core/-frequency/-quarterly/offset.html index 14c9a349c3..3efd002923 100644 --- a/docs/build/html/api/core/-frequency/-quarterly/offset.html +++ b/docs/build/html/api/core/-frequency/-quarterly/offset.html @@ -7,8 +7,8 @@ core / Frequency / Quarterly / offset

offset

- -fun offset(d: LocalDate): LocalDate
+ +fun offset(d: LocalDate): LocalDate
Overrides Frequency.offset


diff --git a/docs/build/html/api/core/-frequency/-semi-annual/index.html b/docs/build/html/api/core/-frequency/-semi-annual/index.html index 0f60cf7f02..c104624c98 100644 --- a/docs/build/html/api/core/-frequency/-semi-annual/index.html +++ b/docs/build/html/api/core/-frequency/-semi-annual/index.html @@ -28,7 +28,7 @@ offset -fun offset(d: LocalDate): LocalDate +fun offset(d: LocalDate): LocalDate diff --git a/docs/build/html/api/core/-frequency/-semi-annual/offset.html b/docs/build/html/api/core/-frequency/-semi-annual/offset.html index 7a9c359397..6349a1522e 100644 --- a/docs/build/html/api/core/-frequency/-semi-annual/offset.html +++ b/docs/build/html/api/core/-frequency/-semi-annual/offset.html @@ -7,8 +7,8 @@ core / Frequency / SemiAnnual / offset

offset

- -fun offset(d: LocalDate): LocalDate
+ +fun offset(d: LocalDate): LocalDate
Overrides Frequency.offset


diff --git a/docs/build/html/api/core/-frequency/-weekly/index.html b/docs/build/html/api/core/-frequency/-weekly/index.html index 0c6fb19cf5..91509a92ba 100644 --- a/docs/build/html/api/core/-frequency/-weekly/index.html +++ b/docs/build/html/api/core/-frequency/-weekly/index.html @@ -28,7 +28,7 @@ offset -fun offset(d: LocalDate): LocalDate +fun offset(d: LocalDate): LocalDate diff --git a/docs/build/html/api/core/-frequency/-weekly/offset.html b/docs/build/html/api/core/-frequency/-weekly/offset.html index a7f7467fd9..39cde27e02 100644 --- a/docs/build/html/api/core/-frequency/-weekly/offset.html +++ b/docs/build/html/api/core/-frequency/-weekly/offset.html @@ -7,8 +7,8 @@ core / Frequency / Weekly / offset

offset

- -fun offset(d: LocalDate): LocalDate
+ +fun offset(d: LocalDate): LocalDate
Overrides Frequency.offset


diff --git a/docs/build/html/api/core/-frequency/annual-compound-count.html b/docs/build/html/api/core/-frequency/annual-compound-count.html index 3794be0a04..3fdd3c9805 100644 --- a/docs/build/html/api/core/-frequency/annual-compound-count.html +++ b/docs/build/html/api/core/-frequency/annual-compound-count.html @@ -7,7 +7,7 @@ core / Frequency / annualCompoundCount

annualCompoundCount

- + val annualCompoundCount: Int


diff --git a/docs/build/html/api/core/-frequency/index.html b/docs/build/html/api/core/-frequency/index.html index 9bf6036f75..93b9f0423e 100644 --- a/docs/build/html/api/core/-frequency/index.html +++ b/docs/build/html/api/core/-frequency/index.html @@ -71,7 +71,7 @@ that would divide into (eg annually = 1, semiannual = 2, monthly = 12 etc).

offset -abstract fun offset(d: LocalDate): LocalDate +abstract fun offset(d: LocalDate): LocalDate diff --git a/docs/build/html/api/core/-frequency/offset.html b/docs/build/html/api/core/-frequency/offset.html index 053108cea9..019f980756 100644 --- a/docs/build/html/api/core/-frequency/offset.html +++ b/docs/build/html/api/core/-frequency/offset.html @@ -7,8 +7,8 @@ core / Frequency / offset

offset

- -abstract fun offset(d: LocalDate): LocalDate
+ +abstract fun offset(d: LocalDate): LocalDate


diff --git a/docs/build/html/api/core/-ledger-transaction/-init-.html b/docs/build/html/api/core/-ledger-transaction/-init-.html index d40f2e61e1..a8b454d292 100644 --- a/docs/build/html/api/core/-ledger-transaction/-init-.html +++ b/docs/build/html/api/core/-ledger-transaction/-init-.html @@ -7,7 +7,7 @@ core / LedgerTransaction / <init>

<init>

-LedgerTransaction(inputs: List<StateRef>, attachments: List<Attachment>, outputs: List<ContractState>, commands: List<AuthenticatedObject<CommandData>>, id: SecureHash)
+LedgerTransaction(inputs: List<StateRef>, attachments: List<Attachment>, outputs: List<ContractState>, commands: List<AuthenticatedObject<CommandData>>, id: SecureHash)

A LedgerTransaction wraps the data needed to calculate one or more successor states from a set of input states. It is the first step after extraction from a WireTransaction. The signatures at this point have been lined up with the commands from the wire, and verified/looked up.

diff --git a/docs/build/html/api/core/-ledger-transaction/attachments.html b/docs/build/html/api/core/-ledger-transaction/attachments.html index 3d8e61e964..c0e1085056 100644 --- a/docs/build/html/api/core/-ledger-transaction/attachments.html +++ b/docs/build/html/api/core/-ledger-transaction/attachments.html @@ -7,7 +7,7 @@ core / LedgerTransaction / attachments

attachments

- + val attachments: List<Attachment>

A list of Attachment objects identified by the transaction that are needed for this transaction to verify.


diff --git a/docs/build/html/api/core/-ledger-transaction/commands.html b/docs/build/html/api/core/-ledger-transaction/commands.html index e182fc5ceb..e63fad77d4 100644 --- a/docs/build/html/api/core/-ledger-transaction/commands.html +++ b/docs/build/html/api/core/-ledger-transaction/commands.html @@ -7,7 +7,7 @@ core / LedgerTransaction / commands

commands

- + val commands: List<AuthenticatedObject<CommandData>>

Arbitrary data passed to the program of each input state.


diff --git a/docs/build/html/api/core/-ledger-transaction/id.html b/docs/build/html/api/core/-ledger-transaction/id.html index 1b8481fef9..f42e8f85a4 100644 --- a/docs/build/html/api/core/-ledger-transaction/id.html +++ b/docs/build/html/api/core/-ledger-transaction/id.html @@ -7,7 +7,7 @@ core / LedgerTransaction / id

id

- + val id: SecureHash
Overrides NamedByHash.id

The hash of the original serialised WireTransaction

diff --git a/docs/build/html/api/core/-ledger-transaction/index.html b/docs/build/html/api/core/-ledger-transaction/index.html index 5e3e948237..cb385cd01b 100644 --- a/docs/build/html/api/core/-ledger-transaction/index.html +++ b/docs/build/html/api/core/-ledger-transaction/index.html @@ -23,7 +23,7 @@ with the commands from the wire, and verified/looked up.

<init> -LedgerTransaction(inputs: List<StateRef>, attachments: List<Attachment>, outputs: List<ContractState>, commands: List<AuthenticatedObject<CommandData>>, id: SecureHash)

A LedgerTransaction wraps the data needed to calculate one or more successor states from a set of input states. +LedgerTransaction(inputs: List<StateRef>, attachments: List<Attachment>, outputs: List<ContractState>, commands: List<AuthenticatedObject<CommandData>>, id: SecureHash)

A LedgerTransaction wraps the data needed to calculate one or more successor states from a set of input states. It is the first step after extraction from a WireTransaction. The signatures at this point have been lined up with the commands from the wire, and verified/looked up.

@@ -77,7 +77,7 @@ with the commands from the wire, and verified/looked up.

outRef -fun <T : ContractState> outRef(index: Int): StateAndRef<T> +fun <T : ContractState> outRef(index: Int): StateAndRef<T> diff --git a/docs/build/html/api/core/-ledger-transaction/inputs.html b/docs/build/html/api/core/-ledger-transaction/inputs.html index 1cb40b5a5d..7a975dd6e5 100644 --- a/docs/build/html/api/core/-ledger-transaction/inputs.html +++ b/docs/build/html/api/core/-ledger-transaction/inputs.html @@ -7,7 +7,7 @@ core / LedgerTransaction / inputs

inputs

- + val inputs: List<StateRef>

The input states which will be consumed/invalidated by the execution of this transaction.


diff --git a/docs/build/html/api/core/-ledger-transaction/out-ref.html b/docs/build/html/api/core/-ledger-transaction/out-ref.html index 89848282ca..7cf384c202 100644 --- a/docs/build/html/api/core/-ledger-transaction/out-ref.html +++ b/docs/build/html/api/core/-ledger-transaction/out-ref.html @@ -7,8 +7,8 @@ core / LedgerTransaction / outRef

outRef

- -fun <T : ContractState> outRef(index: Int): StateAndRef<T>
+ +fun <T : ContractState> outRef(index: Int): StateAndRef<T>


diff --git a/docs/build/html/api/core/-ledger-transaction/outputs.html b/docs/build/html/api/core/-ledger-transaction/outputs.html index fbdb16b89d..3da5022296 100644 --- a/docs/build/html/api/core/-ledger-transaction/outputs.html +++ b/docs/build/html/api/core/-ledger-transaction/outputs.html @@ -7,7 +7,7 @@ core / LedgerTransaction / outputs

outputs

- + val outputs: List<ContractState>

The states that will be generated by the execution of this transaction.


diff --git a/docs/build/html/api/core/-linear-state/index.html b/docs/build/html/api/core/-linear-state/index.html index 14771b63e6..d3d4a3f0cb 100644 --- a/docs/build/html/api/core/-linear-state/index.html +++ b/docs/build/html/api/core/-linear-state/index.html @@ -45,7 +45,7 @@ isRelevant -abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean

true if this should be tracked by our wallet(s)

+abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean

true if this should be tracked by our wallet(s)

diff --git a/docs/build/html/api/core/-linear-state/is-relevant.html b/docs/build/html/api/core/-linear-state/is-relevant.html index e476cfef08..8decf80f85 100644 --- a/docs/build/html/api/core/-linear-state/is-relevant.html +++ b/docs/build/html/api/core/-linear-state/is-relevant.html @@ -7,8 +7,8 @@ core / LinearState / isRelevant

isRelevant

- -abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean
+ +abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean

true if this should be tracked by our wallet(s)



diff --git a/docs/build/html/api/core/-linear-state/thread.html b/docs/build/html/api/core/-linear-state/thread.html index 0dd40bea36..07cea64b2f 100644 --- a/docs/build/html/api/core/-linear-state/thread.html +++ b/docs/build/html/api/core/-linear-state/thread.html @@ -7,7 +7,7 @@ core / LinearState / thread

thread

- + abstract val thread: SecureHash

Unique thread id within the wallets of all parties


diff --git a/docs/build/html/api/core/-named-by-hash/id.html b/docs/build/html/api/core/-named-by-hash/id.html index 8e28e971aa..7e5943cfa3 100644 --- a/docs/build/html/api/core/-named-by-hash/id.html +++ b/docs/build/html/api/core/-named-by-hash/id.html @@ -7,7 +7,7 @@ core / NamedByHash / id

id

- + abstract val id: SecureHash


diff --git a/docs/build/html/api/core/-ownable-state/index.html b/docs/build/html/api/core/-ownable-state/index.html index ddc4efee0e..8f05a83126 100644 --- a/docs/build/html/api/core/-ownable-state/index.html +++ b/docs/build/html/api/core/-ownable-state/index.html @@ -41,7 +41,7 @@ withNewOwner -abstract fun withNewOwner(newOwner: PublicKey): <ERROR CLASS><CommandData, OwnableState>

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

+abstract fun withNewOwner(newOwner: PublicKey): <ERROR CLASS><CommandData, OwnableState>

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/core/-ownable-state/owner.html b/docs/build/html/api/core/-ownable-state/owner.html index 05d702d1bb..64d3690e8c 100644 --- a/docs/build/html/api/core/-ownable-state/owner.html +++ b/docs/build/html/api/core/-ownable-state/owner.html @@ -7,7 +7,7 @@ core / OwnableState / owner

owner

- + abstract val owner: PublicKey

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


diff --git a/docs/build/html/api/core/-ownable-state/with-new-owner.html b/docs/build/html/api/core/-ownable-state/with-new-owner.html index 1b9b41d8e0..3fbee8b9a5 100644 --- a/docs/build/html/api/core/-ownable-state/with-new-owner.html +++ b/docs/build/html/api/core/-ownable-state/with-new-owner.html @@ -7,8 +7,8 @@ core / OwnableState / withNewOwner

withNewOwner

- -abstract fun withNewOwner(newOwner: PublicKey): <ERROR CLASS><CommandData, OwnableState>
+ +abstract fun withNewOwner(newOwner: PublicKey): <ERROR CLASS><CommandData, OwnableState>

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/core/-party-and-reference/-init-.html b/docs/build/html/api/core/-party-and-reference/-init-.html index b8c649ae4a..ee774cdc1e 100644 --- a/docs/build/html/api/core/-party-and-reference/-init-.html +++ b/docs/build/html/api/core/-party-and-reference/-init-.html @@ -7,7 +7,7 @@ core / PartyAndReference / <init>

<init>

-PartyAndReference(party: Party, reference: OpaqueBytes)
+PartyAndReference(party: Party, reference: OpaqueBytes)

Reference to something being stored or issued by a party e.g. in a vault or (more likely) on their normal ledger. The reference is intended to be encrypted so its meaningless to anyone other than the party.


diff --git a/docs/build/html/api/core/-party-and-reference/index.html b/docs/build/html/api/core/-party-and-reference/index.html index 768d52c73d..2ebcfe3f06 100644 --- a/docs/build/html/api/core/-party-and-reference/index.html +++ b/docs/build/html/api/core/-party-and-reference/index.html @@ -19,7 +19,7 @@ ledger. The reference is intended to be encrypted so its meaningless to anyone o <init> -PartyAndReference(party: Party, reference: OpaqueBytes)

Reference to something being stored or issued by a party e.g. in a vault or (more likely) on their normal +PartyAndReference(party: Party, reference: OpaqueBytes)

Reference to something being stored or issued by a party e.g. in a vault or (more likely) on their normal ledger. The reference is intended to be encrypted so its meaningless to anyone other than the party.

diff --git a/docs/build/html/api/core/-party-and-reference/party.html b/docs/build/html/api/core/-party-and-reference/party.html index b7aebccee3..651a0ed296 100644 --- a/docs/build/html/api/core/-party-and-reference/party.html +++ b/docs/build/html/api/core/-party-and-reference/party.html @@ -7,7 +7,7 @@ core / PartyAndReference / party

party

- + val party: Party


diff --git a/docs/build/html/api/core/-party-and-reference/reference.html b/docs/build/html/api/core/-party-and-reference/reference.html index a7a29c3c4f..d84cea175d 100644 --- a/docs/build/html/api/core/-party-and-reference/reference.html +++ b/docs/build/html/api/core/-party-and-reference/reference.html @@ -7,7 +7,7 @@ core / PartyAndReference / reference

reference

- + val reference: OpaqueBytes


diff --git a/docs/build/html/api/core/-party-and-reference/to-string.html b/docs/build/html/api/core/-party-and-reference/to-string.html index 2cbd4b3dcd..0cf6a22a2e 100644 --- a/docs/build/html/api/core/-party-and-reference/to-string.html +++ b/docs/build/html/api/core/-party-and-reference/to-string.html @@ -7,7 +7,7 @@ core / PartyAndReference / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/-party-reference/-init-.html b/docs/build/html/api/core/-party-reference/-init-.html index 391c96996e..9fa5c4289e 100644 --- a/docs/build/html/api/core/-party-reference/-init-.html +++ b/docs/build/html/api/core/-party-reference/-init-.html @@ -7,7 +7,7 @@ core / PartyReference / <init>

<init>

-PartyReference(party: Party, reference: OpaqueBytes)
+PartyReference(party: Party, reference: OpaqueBytes)

Reference to something being stored or issued by a party e.g. in a vault or (more likely) on their normal ledger. The reference is intended to be encrypted so its meaningless to anyone other than the party.


diff --git a/docs/build/html/api/core/-party-reference/index.html b/docs/build/html/api/core/-party-reference/index.html index 8558a27a13..bfaf4e5545 100644 --- a/docs/build/html/api/core/-party-reference/index.html +++ b/docs/build/html/api/core/-party-reference/index.html @@ -19,7 +19,7 @@ ledger. The reference is intended to be encrypted so its meaningless to anyone o <init> -PartyReference(party: Party, reference: OpaqueBytes)

Reference to something being stored or issued by a party e.g. in a vault or (more likely) on their normal +PartyReference(party: Party, reference: OpaqueBytes)

Reference to something being stored or issued by a party e.g. in a vault or (more likely) on their normal ledger. The reference is intended to be encrypted so its meaningless to anyone other than the party.

diff --git a/docs/build/html/api/core/-party/-init-.html b/docs/build/html/api/core/-party/-init-.html index fa5b451522..71d0946eb3 100644 --- a/docs/build/html/api/core/-party/-init-.html +++ b/docs/build/html/api/core/-party/-init-.html @@ -7,7 +7,7 @@ core / Party / <init>

<init>

-Party(name: String, owningKey: PublicKey)
+Party(name: String, owningKey: PublicKey)

A Party is well known (name, pubkey) pair. In a real system this would probably be an X.509 certificate.



diff --git a/docs/build/html/api/core/-party/index.html b/docs/build/html/api/core/-party/index.html index e211d26a04..5a046424ab 100644 --- a/docs/build/html/api/core/-party/index.html +++ b/docs/build/html/api/core/-party/index.html @@ -18,7 +18,7 @@ <init> -Party(name: String, owningKey: PublicKey)

A Party is well known (name, pubkey) pair. In a real system this would probably be an X.509 certificate.

+Party(name: String, owningKey: PublicKey)

A Party is well known (name, pubkey) pair. In a real system this would probably be an X.509 certificate.

@@ -47,8 +47,8 @@ ref -fun ref(bytes: OpaqueBytes): PartyAndReference
-fun ref(vararg bytes: Byte): PartyAndReference +fun ref(bytes: OpaqueBytes): PartyAndReference
+fun ref(vararg bytes: Byte): PartyAndReference diff --git a/docs/build/html/api/core/-party/name.html b/docs/build/html/api/core/-party/name.html index 1153a4a85e..a32eb66717 100644 --- a/docs/build/html/api/core/-party/name.html +++ b/docs/build/html/api/core/-party/name.html @@ -7,7 +7,7 @@ core / Party / name

name

- + val name: String


diff --git a/docs/build/html/api/core/-party/owning-key.html b/docs/build/html/api/core/-party/owning-key.html index efbbdff22f..5e0b7ce37a 100644 --- a/docs/build/html/api/core/-party/owning-key.html +++ b/docs/build/html/api/core/-party/owning-key.html @@ -7,7 +7,7 @@ core / Party / owningKey

owningKey

- + val owningKey: PublicKey


diff --git a/docs/build/html/api/core/-party/ref.html b/docs/build/html/api/core/-party/ref.html index ee12fcb395..8ee6b74940 100644 --- a/docs/build/html/api/core/-party/ref.html +++ b/docs/build/html/api/core/-party/ref.html @@ -7,10 +7,10 @@ core / Party / ref

ref

- -fun ref(bytes: OpaqueBytes): PartyAndReference
- -fun ref(vararg bytes: Byte): PartyAndReference
+ +fun ref(bytes: OpaqueBytes): PartyAndReference
+ +fun ref(vararg bytes: Byte): PartyAndReference


diff --git a/docs/build/html/api/core/-party/to-string.html b/docs/build/html/api/core/-party/to-string.html index 37c022f67c..2b3a6a23db 100644 --- a/docs/build/html/api/core/-party/to-string.html +++ b/docs/build/html/api/core/-party/to-string.html @@ -7,7 +7,7 @@ core / Party / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/-requirements/by.html b/docs/build/html/api/core/-requirements/by.html index 63dc9d818a..f9e8ea2374 100644 --- a/docs/build/html/api/core/-requirements/by.html +++ b/docs/build/html/api/core/-requirements/by.html @@ -7,8 +7,8 @@ core / Requirements / by

by

- -infix fun String.by(expr: Boolean): Unit
+ +infix fun String.by(expr: Boolean): Unit


diff --git a/docs/build/html/api/core/-requirements/index.html b/docs/build/html/api/core/-requirements/index.html index bd3ab917b5..742e2fa273 100644 --- a/docs/build/html/api/core/-requirements/index.html +++ b/docs/build/html/api/core/-requirements/index.html @@ -28,7 +28,7 @@ by -infix fun String.by(expr: Boolean): Unit +infix fun String.by(expr: Boolean): Unit diff --git a/docs/build/html/api/core/-signed-transaction/-init-.html b/docs/build/html/api/core/-signed-transaction/-init-.html index 15149417df..67b3b49605 100644 --- a/docs/build/html/api/core/-signed-transaction/-init-.html +++ b/docs/build/html/api/core/-signed-transaction/-init-.html @@ -7,7 +7,7 @@ core / SignedTransaction / <init>

<init>

-SignedTransaction(txBits: SerializedBytes<WireTransaction>, sigs: List<WithKey>)
+SignedTransaction(txBits: SerializedBytes<WireTransaction>, sigs: List<WithKey>)

Container for a WireTransaction and attached signatures.



diff --git a/docs/build/html/api/core/-signed-transaction/id.html b/docs/build/html/api/core/-signed-transaction/id.html index 7e14131fd3..497b5fd965 100644 --- a/docs/build/html/api/core/-signed-transaction/id.html +++ b/docs/build/html/api/core/-signed-transaction/id.html @@ -7,7 +7,7 @@ core / SignedTransaction / id

id

- + val id: SecureHash
Overrides NamedByHash.id

A transaction ID is the hash of the WireTransaction. Thus adding or removing a signature does not change it.

diff --git a/docs/build/html/api/core/-signed-transaction/index.html b/docs/build/html/api/core/-signed-transaction/index.html index c67d44ecb5..2c71d548ed 100644 --- a/docs/build/html/api/core/-signed-transaction/index.html +++ b/docs/build/html/api/core/-signed-transaction/index.html @@ -18,7 +18,7 @@ <init> -SignedTransaction(txBits: SerializedBytes<WireTransaction>, sigs: List<WithKey>)

Container for a WireTransaction and attached signatures.

+SignedTransaction(txBits: SerializedBytes<WireTransaction>, sigs: List<WithKey>)

Container for a WireTransaction and attached signatures.

@@ -61,14 +61,14 @@ plus -operator fun plus(sig: WithKey): SignedTransaction

Alias for withAdditionalSignature to let you use Kotlin operator overloading.

+operator fun plus(sig: WithKey): SignedTransaction

Alias for withAdditionalSignature to let you use Kotlin operator overloading.

verify -fun verify(throwIfSignaturesAreMissing: Boolean = true): Set<PublicKey>

Verify the signatures, deserialise the wire transaction and then check that the set of signatures found matches +fun verify(throwIfSignaturesAreMissing: Boolean = true): Set<PublicKey>

Verify the signatures, deserialise the wire transaction and then check that the set of signatures found matches the set of pubkeys in the commands. If any signatures are missing, either throws an exception (by default) or returns the list of keys that have missing signatures, depending on the parameter.

@@ -86,7 +86,7 @@ checking a partially signed transaction being prepared by multiple co-operating withAdditionalSignature -fun withAdditionalSignature(sig: WithKey): SignedTransaction

Returns the same transaction but with an additional (unchecked) signature

+fun withAdditionalSignature(sig: WithKey): SignedTransaction

Returns the same transaction but with an additional (unchecked) signature

@@ -98,7 +98,7 @@ checking a partially signed transaction being prepared by multiple co-operating verifyToLedgerTransaction -fun SignedTransaction.verifyToLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Calls verify to check all required signatures are present, and then uses the passed IdentityService to call +fun SignedTransaction.verifyToLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Calls verify to check all required signatures are present, and then uses the passed IdentityService to call WireTransaction.toLedgerTransaction to look up well known identities from pubkeys.

diff --git a/docs/build/html/api/core/-signed-transaction/plus.html b/docs/build/html/api/core/-signed-transaction/plus.html index 378a35e540..6e7acbd4c1 100644 --- a/docs/build/html/api/core/-signed-transaction/plus.html +++ b/docs/build/html/api/core/-signed-transaction/plus.html @@ -7,8 +7,8 @@ core / SignedTransaction / plus

plus

- -operator fun plus(sig: WithKey): SignedTransaction
+ +operator fun plus(sig: WithKey): SignedTransaction

Alias for withAdditionalSignature to let you use Kotlin operator overloading.



diff --git a/docs/build/html/api/core/-signed-transaction/sigs.html b/docs/build/html/api/core/-signed-transaction/sigs.html index f8b0561c3d..85474344fc 100644 --- a/docs/build/html/api/core/-signed-transaction/sigs.html +++ b/docs/build/html/api/core/-signed-transaction/sigs.html @@ -7,7 +7,7 @@ core / SignedTransaction / sigs

sigs

- + val sigs: List<WithKey>


diff --git a/docs/build/html/api/core/-signed-transaction/tx-bits.html b/docs/build/html/api/core/-signed-transaction/tx-bits.html index 0662e6cad7..1f56e23004 100644 --- a/docs/build/html/api/core/-signed-transaction/tx-bits.html +++ b/docs/build/html/api/core/-signed-transaction/tx-bits.html @@ -7,7 +7,7 @@ core / SignedTransaction / txBits

txBits

- + val txBits: SerializedBytes<WireTransaction>


diff --git a/docs/build/html/api/core/-signed-transaction/tx.html b/docs/build/html/api/core/-signed-transaction/tx.html index 40af2438f8..0c897d013a 100644 --- a/docs/build/html/api/core/-signed-transaction/tx.html +++ b/docs/build/html/api/core/-signed-transaction/tx.html @@ -7,7 +7,7 @@ core / SignedTransaction / tx

tx

- + val tx: WireTransaction

Lazily calculated access to the deserialised/hashed transaction data.

Getter
diff --git a/docs/build/html/api/core/-signed-transaction/verify-signatures.html b/docs/build/html/api/core/-signed-transaction/verify-signatures.html index 73eebd118d..fa9cf5aeb5 100644 --- a/docs/build/html/api/core/-signed-transaction/verify-signatures.html +++ b/docs/build/html/api/core/-signed-transaction/verify-signatures.html @@ -7,7 +7,7 @@ core / SignedTransaction / verifySignatures

verifySignatures

- + fun verifySignatures(): Unit

Verifies the given signatures against the serialized transaction data. Does NOT deserialise or check the contents to ensure there are no missing signatures: use verify() to do that. This weaker version can be useful for diff --git a/docs/build/html/api/core/-signed-transaction/verify.html b/docs/build/html/api/core/-signed-transaction/verify.html index a2370789fc..a36ed749bb 100644 --- a/docs/build/html/api/core/-signed-transaction/verify.html +++ b/docs/build/html/api/core/-signed-transaction/verify.html @@ -7,8 +7,8 @@ core / SignedTransaction / verify

verify

- -fun verify(throwIfSignaturesAreMissing: Boolean = true): Set<PublicKey>
+ +fun verify(throwIfSignaturesAreMissing: Boolean = true): Set<PublicKey>

Verify the signatures, deserialise the wire transaction and then check that the set of signatures found matches the set of pubkeys in the commands. If any signatures are missing, either throws an exception (by default) or returns the list of keys that have missing signatures, depending on the parameter.

diff --git a/docs/build/html/api/core/-signed-transaction/with-additional-signature.html b/docs/build/html/api/core/-signed-transaction/with-additional-signature.html index 4c5d153c6a..21ee4638b4 100644 --- a/docs/build/html/api/core/-signed-transaction/with-additional-signature.html +++ b/docs/build/html/api/core/-signed-transaction/with-additional-signature.html @@ -7,8 +7,8 @@ core / SignedTransaction / withAdditionalSignature

withAdditionalSignature

- -fun withAdditionalSignature(sig: WithKey): SignedTransaction
+ +fun withAdditionalSignature(sig: WithKey): SignedTransaction

Returns the same transaction but with an additional (unchecked) signature



diff --git a/docs/build/html/api/core/-state-and-ref/-init-.html b/docs/build/html/api/core/-state-and-ref/-init-.html index 785f77d98a..bdec6f422a 100644 --- a/docs/build/html/api/core/-state-and-ref/-init-.html +++ b/docs/build/html/api/core/-state-and-ref/-init-.html @@ -7,7 +7,7 @@ core / StateAndRef / <init>

<init>

-StateAndRef(state: T, ref: StateRef)
+StateAndRef(state: T, ref: StateRef)

A StateAndRef is simply a (state, ref) pair. For instance, a wallet (which holds available assets) contains these.



diff --git a/docs/build/html/api/core/-state-and-ref/index.html b/docs/build/html/api/core/-state-and-ref/index.html index f702ce9c39..146be5714f 100644 --- a/docs/build/html/api/core/-state-and-ref/index.html +++ b/docs/build/html/api/core/-state-and-ref/index.html @@ -18,7 +18,7 @@ <init> -StateAndRef(state: T, ref: StateRef)

A StateAndRef is simply a (state, ref) pair. For instance, a wallet (which holds available assets) contains these.

+StateAndRef(state: T, ref: StateRef)

A StateAndRef is simply a (state, ref) pair. For instance, a wallet (which holds available assets) contains these.

diff --git a/docs/build/html/api/core/-state-and-ref/ref.html b/docs/build/html/api/core/-state-and-ref/ref.html index dca8979b3d..57af14ab29 100644 --- a/docs/build/html/api/core/-state-and-ref/ref.html +++ b/docs/build/html/api/core/-state-and-ref/ref.html @@ -7,7 +7,7 @@ core / StateAndRef / ref

ref

- + val ref: StateRef


diff --git a/docs/build/html/api/core/-state-and-ref/state.html b/docs/build/html/api/core/-state-and-ref/state.html index 99ea8ed1b2..43f74193b5 100644 --- a/docs/build/html/api/core/-state-and-ref/state.html +++ b/docs/build/html/api/core/-state-and-ref/state.html @@ -7,7 +7,7 @@ core / StateAndRef / state

state

- + val state: T


diff --git a/docs/build/html/api/core/-state-ref/--index--.html b/docs/build/html/api/core/-state-ref/--index--.html index 7c49cd8dfd..393205fc74 100644 --- a/docs/build/html/api/core/-state-ref/--index--.html +++ b/docs/build/html/api/core/-state-ref/--index--.html @@ -7,7 +7,7 @@ core / StateRef / index

index

- + val index: Int


diff --git a/docs/build/html/api/core/-state-ref/-init-.html b/docs/build/html/api/core/-state-ref/-init-.html index 0e1deb3305..d60f92b7cc 100644 --- a/docs/build/html/api/core/-state-ref/-init-.html +++ b/docs/build/html/api/core/-state-ref/-init-.html @@ -7,7 +7,7 @@ core / StateRef / <init>

<init>

-StateRef(txhash: SecureHash, index: Int)
+StateRef(txhash: SecureHash, index: Int)

A stateref is a pointer (reference) to a state, this is an equivalent of an "outpoint" in Bitcoin. It records which transaction defined the state and where in that transaction it was.


diff --git a/docs/build/html/api/core/-state-ref/index.html b/docs/build/html/api/core/-state-ref/index.html index 294ae34657..dec509c958 100644 --- a/docs/build/html/api/core/-state-ref/index.html +++ b/docs/build/html/api/core/-state-ref/index.html @@ -19,7 +19,7 @@ transaction defined the state and where in that transaction it was.

<init> -StateRef(txhash: SecureHash, index: Int)

A stateref is a pointer (reference) to a state, this is an equivalent of an "outpoint" in Bitcoin. It records which +StateRef(txhash: SecureHash, index: Int)

A stateref is a pointer (reference) to a state, this is an equivalent of an "outpoint" in Bitcoin. It records which transaction defined the state and where in that transaction it was.

diff --git a/docs/build/html/api/core/-state-ref/to-string.html b/docs/build/html/api/core/-state-ref/to-string.html index be423b2e16..5781e1b6e4 100644 --- a/docs/build/html/api/core/-state-ref/to-string.html +++ b/docs/build/html/api/core/-state-ref/to-string.html @@ -7,7 +7,7 @@ core / StateRef / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/-state-ref/txhash.html b/docs/build/html/api/core/-state-ref/txhash.html index 7b6af23e3e..05a9da074c 100644 --- a/docs/build/html/api/core/-state-ref/txhash.html +++ b/docs/build/html/api/core/-state-ref/txhash.html @@ -7,7 +7,7 @@ core / StateRef / txhash

txhash

- + val txhash: SecureHash


diff --git a/docs/build/html/api/core/-tenor/-init-.html b/docs/build/html/api/core/-tenor/-init-.html index 736764560e..1f4dce88a9 100644 --- a/docs/build/html/api/core/-tenor/-init-.html +++ b/docs/build/html/api/core/-tenor/-init-.html @@ -7,7 +7,7 @@ core / Tenor / <init>

<init>

-Tenor(name: String)
+Tenor(name: String)

Placeholder class for the Tenor datatype - which is a standardised duration of time until maturity



diff --git a/docs/build/html/api/core/-tenor/-time-unit/code.html b/docs/build/html/api/core/-tenor/-time-unit/code.html index deec081661..a289d23d99 100644 --- a/docs/build/html/api/core/-tenor/-time-unit/code.html +++ b/docs/build/html/api/core/-tenor/-time-unit/code.html @@ -7,7 +7,7 @@ core / Tenor / TimeUnit / code

code

- + val code: String


diff --git a/docs/build/html/api/core/-tenor/days-to-maturity.html b/docs/build/html/api/core/-tenor/days-to-maturity.html index 8e25970bc4..0961c33124 100644 --- a/docs/build/html/api/core/-tenor/days-to-maturity.html +++ b/docs/build/html/api/core/-tenor/days-to-maturity.html @@ -7,8 +7,8 @@ core / Tenor / daysToMaturity

daysToMaturity

- -fun daysToMaturity(startDate: LocalDate, calendar: BusinessCalendar): Int
+ +fun daysToMaturity(startDate: LocalDate, calendar: BusinessCalendar): Int


diff --git a/docs/build/html/api/core/-tenor/index.html b/docs/build/html/api/core/-tenor/index.html index ea7133a59b..d515aecadc 100644 --- a/docs/build/html/api/core/-tenor/index.html +++ b/docs/build/html/api/core/-tenor/index.html @@ -29,7 +29,7 @@ <init> -Tenor(name: String)

Placeholder class for the Tenor datatype - which is a standardised duration of time until maturity

+Tenor(name: String)

Placeholder class for the Tenor datatype - which is a standardised duration of time until maturity

@@ -52,7 +52,7 @@ daysToMaturity -fun daysToMaturity(startDate: LocalDate, calendar: BusinessCalendar): Int +fun daysToMaturity(startDate: LocalDate, calendar: BusinessCalendar): Int diff --git a/docs/build/html/api/core/-tenor/name.html b/docs/build/html/api/core/-tenor/name.html index 40d0d2dac4..34db497202 100644 --- a/docs/build/html/api/core/-tenor/name.html +++ b/docs/build/html/api/core/-tenor/name.html @@ -7,7 +7,7 @@ core / Tenor / name

name

- + val name: String


diff --git a/docs/build/html/api/core/-tenor/to-string.html b/docs/build/html/api/core/-tenor/to-string.html index f445717606..4d5059e3d0 100644 --- a/docs/build/html/api/core/-tenor/to-string.html +++ b/docs/build/html/api/core/-tenor/to-string.html @@ -7,7 +7,7 @@ core / Tenor / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/-timestamp-command/-init-.html b/docs/build/html/api/core/-timestamp-command/-init-.html index 17d53a13ec..1b5331f7ce 100644 --- a/docs/build/html/api/core/-timestamp-command/-init-.html +++ b/docs/build/html/api/core/-timestamp-command/-init-.html @@ -7,10 +7,10 @@ core / TimestampCommand / <init>

<init>

-TimestampCommand(time: Instant, tolerance: Duration)
+TimestampCommand(time: Instant, tolerance: Duration)


-TimestampCommand(after: Instant?, before: Instant?)
+TimestampCommand(after: Instant?, before: Instant?)

If present in a transaction, contains a time that was verified by the timestamping authority/authorities whose public keys are identified in the containing Command object. The true time must be between (after, before)


diff --git a/docs/build/html/api/core/-timestamp-command/after.html b/docs/build/html/api/core/-timestamp-command/after.html index 4729a1a421..b0e1bf4239 100644 --- a/docs/build/html/api/core/-timestamp-command/after.html +++ b/docs/build/html/api/core/-timestamp-command/after.html @@ -7,7 +7,7 @@ core / TimestampCommand / after

after

- + val after: Instant?


diff --git a/docs/build/html/api/core/-timestamp-command/before.html b/docs/build/html/api/core/-timestamp-command/before.html index 3c4739ac9c..aad6173b7b 100644 --- a/docs/build/html/api/core/-timestamp-command/before.html +++ b/docs/build/html/api/core/-timestamp-command/before.html @@ -7,7 +7,7 @@ core / TimestampCommand / before

before

- + val before: Instant?


diff --git a/docs/build/html/api/core/-timestamp-command/index.html b/docs/build/html/api/core/-timestamp-command/index.html index ada95f943b..2ad807658b 100644 --- a/docs/build/html/api/core/-timestamp-command/index.html +++ b/docs/build/html/api/core/-timestamp-command/index.html @@ -19,7 +19,7 @@ public keys are identified in the containing Co <init> -TimestampCommand(time: Instant, tolerance: Duration)TimestampCommand(after: Instant?, before: Instant?)

If present in a transaction, contains a time that was verified by the timestamping authority/authorities whose +TimestampCommand(time: Instant, tolerance: Duration)TimestampCommand(after: Instant?, before: Instant?)

If present in a transaction, contains a time that was verified by the timestamping authority/authorities whose public keys are identified in the containing Command object. The true time must be between (after, before)

diff --git a/docs/build/html/api/core/-timestamp-command/midpoint.html b/docs/build/html/api/core/-timestamp-command/midpoint.html index 80dc20b682..e9430d6abe 100644 --- a/docs/build/html/api/core/-timestamp-command/midpoint.html +++ b/docs/build/html/api/core/-timestamp-command/midpoint.html @@ -7,7 +7,7 @@ core / TimestampCommand / midpoint

midpoint

- + val midpoint: Instant


diff --git a/docs/build/html/api/core/-transaction-builder/-init-.html b/docs/build/html/api/core/-transaction-builder/-init-.html index 88ec27146f..9b92988593 100644 --- a/docs/build/html/api/core/-transaction-builder/-init-.html +++ b/docs/build/html/api/core/-transaction-builder/-init-.html @@ -7,7 +7,7 @@ core / TransactionBuilder / <init>

<init>

-TransactionBuilder(inputs: MutableList<StateRef> = arrayListOf(), attachments: MutableList<SecureHash> = arrayListOf(), outputs: MutableList<ContractState> = arrayListOf(), commands: MutableList<Command> = arrayListOf())
+TransactionBuilder(inputs: MutableList<StateRef> = arrayListOf(), attachments: MutableList<SecureHash> = arrayListOf(), outputs: MutableList<ContractState> = arrayListOf(), commands: MutableList<Command> = arrayListOf())

A TransactionBuilder is a transaction class thats mutable (unlike the others which are all immutable). It is intended to be passed around contracts that may edit it by adding new states/commands or modifying the existing set. Then once the states and commands are right, this class can be used as a holding bucket to gather signatures from diff --git a/docs/build/html/api/core/-transaction-builder/add-attachment.html b/docs/build/html/api/core/-transaction-builder/add-attachment.html index 77e037bd6e..29dd22aac6 100644 --- a/docs/build/html/api/core/-transaction-builder/add-attachment.html +++ b/docs/build/html/api/core/-transaction-builder/add-attachment.html @@ -7,8 +7,8 @@ core / TransactionBuilder / addAttachment

addAttachment

- -fun addAttachment(attachment: Attachment): Unit
+ +fun addAttachment(attachment: Attachment): Unit


diff --git a/docs/build/html/api/core/-transaction-builder/add-command.html b/docs/build/html/api/core/-transaction-builder/add-command.html index 1860833e0f..6969626049 100644 --- a/docs/build/html/api/core/-transaction-builder/add-command.html +++ b/docs/build/html/api/core/-transaction-builder/add-command.html @@ -7,12 +7,12 @@ core / TransactionBuilder / addCommand

addCommand

- -fun addCommand(arg: Command): Unit
- -fun addCommand(data: CommandData, vararg keys: PublicKey): <ERROR CLASS>
- -fun addCommand(data: CommandData, keys: List<PublicKey>): Unit
+ +fun addCommand(arg: Command): Unit
+ +fun addCommand(data: CommandData, vararg keys: PublicKey): <ERROR CLASS>
+ +fun addCommand(data: CommandData, keys: List<PublicKey>): Unit


diff --git a/docs/build/html/api/core/-transaction-builder/add-input-state.html b/docs/build/html/api/core/-transaction-builder/add-input-state.html index 6de3d63ea9..f4d1a65bf2 100644 --- a/docs/build/html/api/core/-transaction-builder/add-input-state.html +++ b/docs/build/html/api/core/-transaction-builder/add-input-state.html @@ -7,8 +7,8 @@ core / TransactionBuilder / addInputState

addInputState

- -fun addInputState(ref: StateRef): Unit
+ +fun addInputState(ref: StateRef): Unit


diff --git a/docs/build/html/api/core/-transaction-builder/add-output-state.html b/docs/build/html/api/core/-transaction-builder/add-output-state.html index 38345bd685..953c9832df 100644 --- a/docs/build/html/api/core/-transaction-builder/add-output-state.html +++ b/docs/build/html/api/core/-transaction-builder/add-output-state.html @@ -7,8 +7,8 @@ core / TransactionBuilder / addOutputState

addOutputState

- -fun addOutputState(state: ContractState): Unit
+ +fun addOutputState(state: ContractState): Unit


diff --git a/docs/build/html/api/core/-transaction-builder/add-signature-unchecked.html b/docs/build/html/api/core/-transaction-builder/add-signature-unchecked.html index ac3d4214a9..37d92adb80 100644 --- a/docs/build/html/api/core/-transaction-builder/add-signature-unchecked.html +++ b/docs/build/html/api/core/-transaction-builder/add-signature-unchecked.html @@ -7,8 +7,8 @@ core / TransactionBuilder / addSignatureUnchecked

addSignatureUnchecked

- -fun addSignatureUnchecked(sig: WithKey): Unit
+ +fun addSignatureUnchecked(sig: WithKey): Unit

Adds the signature directly to the transaction, without checking it for validity.



diff --git a/docs/build/html/api/core/-transaction-builder/attachments.html b/docs/build/html/api/core/-transaction-builder/attachments.html index bd2236fba7..bbe7307b64 100644 --- a/docs/build/html/api/core/-transaction-builder/attachments.html +++ b/docs/build/html/api/core/-transaction-builder/attachments.html @@ -7,7 +7,7 @@ core / TransactionBuilder / attachments

attachments

- + fun attachments(): List<SecureHash>


diff --git a/docs/build/html/api/core/-transaction-builder/check-and-add-signature.html b/docs/build/html/api/core/-transaction-builder/check-and-add-signature.html index 4b2d72310f..1922f7d35c 100644 --- a/docs/build/html/api/core/-transaction-builder/check-and-add-signature.html +++ b/docs/build/html/api/core/-transaction-builder/check-and-add-signature.html @@ -7,8 +7,8 @@ core / TransactionBuilder / checkAndAddSignature

checkAndAddSignature

- -fun checkAndAddSignature(sig: WithKey): Unit
+ +fun checkAndAddSignature(sig: WithKey): Unit

Checks that the given signature matches one of the commands and that it is a correct signature over the tx, then adds it.

Exceptions

diff --git a/docs/build/html/api/core/-transaction-builder/check-signature.html b/docs/build/html/api/core/-transaction-builder/check-signature.html index 00cae79b38..f0bec4f15c 100644 --- a/docs/build/html/api/core/-transaction-builder/check-signature.html +++ b/docs/build/html/api/core/-transaction-builder/check-signature.html @@ -7,8 +7,8 @@ core / TransactionBuilder / checkSignature

checkSignature

- -fun checkSignature(sig: WithKey): Unit
+ +fun checkSignature(sig: WithKey): Unit

Checks that the given signature matches one of the commands and that it is a correct signature over the tx.

Exceptions

diff --git a/docs/build/html/api/core/-transaction-builder/commands.html b/docs/build/html/api/core/-transaction-builder/commands.html index 5e27c7fd88..bc15e02af8 100644 --- a/docs/build/html/api/core/-transaction-builder/commands.html +++ b/docs/build/html/api/core/-transaction-builder/commands.html @@ -7,7 +7,7 @@ core / TransactionBuilder / commands

commands

- + fun commands(): List<Command>


diff --git a/docs/build/html/api/core/-transaction-builder/index.html b/docs/build/html/api/core/-transaction-builder/index.html index 53d991460b..19e7d21a44 100644 --- a/docs/build/html/api/core/-transaction-builder/index.html +++ b/docs/build/html/api/core/-transaction-builder/index.html @@ -21,7 +21,7 @@ multiple parties.

<init> -TransactionBuilder(inputs: MutableList<StateRef> = arrayListOf(), attachments: MutableList<SecureHash> = arrayListOf(), outputs: MutableList<ContractState> = arrayListOf(), commands: MutableList<Command> = arrayListOf())

A TransactionBuilder is a transaction class thats mutable (unlike the others which are all immutable). It is +TransactionBuilder(inputs: MutableList<StateRef> = arrayListOf(), attachments: MutableList<SecureHash> = arrayListOf(), outputs: MutableList<ContractState> = arrayListOf(), commands: MutableList<Command> = arrayListOf())

A TransactionBuilder is a transaction class thats mutable (unlike the others which are all immutable). It is intended to be passed around contracts that may edit it by adding new states/commands or modifying the existing set. Then once the states and commands are right, this class can be used as a holding bucket to gather signatures from multiple parties.

@@ -47,33 +47,33 @@ multiple parties.

addAttachment -fun addAttachment(attachment: Attachment): Unit +fun addAttachment(attachment: Attachment): Unit addCommand -fun addCommand(arg: Command): Unit
-fun addCommand(data: CommandData, vararg keys: PublicKey): <ERROR CLASS>
-fun addCommand(data: CommandData, keys: List<PublicKey>): Unit +fun addCommand(arg: Command): Unit
+fun addCommand(data: CommandData, vararg keys: PublicKey): <ERROR CLASS>
+fun addCommand(data: CommandData, keys: List<PublicKey>): Unit addInputState -fun addInputState(ref: StateRef): Unit +fun addInputState(ref: StateRef): Unit addOutputState -fun addOutputState(state: ContractState): Unit +fun addOutputState(state: ContractState): Unit addSignatureUnchecked -fun addSignatureUnchecked(sig: WithKey): Unit

Adds the signature directly to the transaction, without checking it for validity.

+fun addSignatureUnchecked(sig: WithKey): Unit

Adds the signature directly to the transaction, without checking it for validity.

@@ -86,7 +86,7 @@ multiple parties.

checkAndAddSignature -fun checkAndAddSignature(sig: WithKey): Unit

Checks that the given signature matches one of the commands and that it is a correct signature over the tx, then +fun checkAndAddSignature(sig: WithKey): Unit

Checks that the given signature matches one of the commands and that it is a correct signature over the tx, then adds it.

@@ -94,7 +94,7 @@ adds it.

checkSignature -fun checkSignature(sig: WithKey): Unit

Checks that the given signature matches one of the commands and that it is a correct signature over the tx.

+fun checkSignature(sig: WithKey): Unit

Checks that the given signature matches one of the commands and that it is a correct signature over the tx.

@@ -119,7 +119,7 @@ adds it.

setTime -fun setTime(time: Instant, authenticatedBy: Party, timeTolerance: Duration): Unit

Places a TimestampCommand in this transaction, removing any existing command if there is one. +fun setTime(time: Instant, authenticatedBy: Party, timeTolerance: Duration): Unit

Places a TimestampCommand in this transaction, removing any existing command if there is one. To get the right signature from the timestamping service, use the timestamp method after building is finished, or run use the TimestampingProtocol yourself.

@@ -128,13 +128,13 @@ finished, or run use the TimestampingProtocol yourself.

signWith -fun signWith(key: KeyPair): Unit +fun signWith(key: KeyPair): Unit timestamp -fun timestamp(timestamper: TimestamperService, clock: Clock = Clock.systemUTC()): Unit

Uses the given timestamper service to request a signature over the WireTransaction be added. There must always be +fun timestamp(timestamper: TimestamperService, clock: Clock = Clock.systemUTC()): Unit

Uses the given timestamper service to request a signature over the WireTransaction be added. There must always be at least one such signature, but others may be added as well. You may want to have multiple redundant timestamps in the following cases:

@@ -143,7 +143,7 @@ in the following cases:

toSignedTransaction -fun toSignedTransaction(checkSufficientSignatures: Boolean = true): SignedTransaction +fun toSignedTransaction(checkSufficientSignatures: Boolean = true): SignedTransaction @@ -155,7 +155,7 @@ in the following cases:

withItems -fun withItems(vararg items: Any): TransactionBuilder

A more convenient way to add items to this transaction that calls the add* methods for you based on type

+fun withItems(vararg items: Any): TransactionBuilder

A more convenient way to add items to this transaction that calls the add* methods for you based on type

diff --git a/docs/build/html/api/core/-transaction-builder/input-states.html b/docs/build/html/api/core/-transaction-builder/input-states.html index 895cde09ac..f83b2a9002 100644 --- a/docs/build/html/api/core/-transaction-builder/input-states.html +++ b/docs/build/html/api/core/-transaction-builder/input-states.html @@ -7,7 +7,7 @@ core / TransactionBuilder / inputStates

inputStates

- + fun inputStates(): List<StateRef>


diff --git a/docs/build/html/api/core/-transaction-builder/output-states.html b/docs/build/html/api/core/-transaction-builder/output-states.html index 772d46ba12..709016427a 100644 --- a/docs/build/html/api/core/-transaction-builder/output-states.html +++ b/docs/build/html/api/core/-transaction-builder/output-states.html @@ -7,7 +7,7 @@ core / TransactionBuilder / outputStates

outputStates

- + fun outputStates(): List<ContractState>


diff --git a/docs/build/html/api/core/-transaction-builder/set-time.html b/docs/build/html/api/core/-transaction-builder/set-time.html index 1f9c8bc8f5..117a86c47c 100644 --- a/docs/build/html/api/core/-transaction-builder/set-time.html +++ b/docs/build/html/api/core/-transaction-builder/set-time.html @@ -7,12 +7,12 @@ core / TransactionBuilder / setTime

setTime

- -fun setTime(time: Instant, authenticatedBy: Party, timeTolerance: Duration): Unit
+ +fun setTime(time: Instant, authenticatedBy: Party, timeTolerance: Duration): Unit

Places a TimestampCommand in this transaction, removing any existing command if there is one. To get the right signature from the timestamping service, use the timestamp method after building is finished, or run use the TimestampingProtocol yourself.

-

The window of time in which the final timestamp may lie is defined as time +/- timeTolerance. +

The window of time in which the final timestamp may lie is defined as time +/- timeTolerance. If you want a non-symmetrical time window you must add the command via addCommand yourself. The tolerance should be chosen such that your code can finish building the transaction and sending it to the TSA within that window of time, taking into account factors such as network latency. Transactions being built by a group of diff --git a/docs/build/html/api/core/-transaction-builder/sign-with.html b/docs/build/html/api/core/-transaction-builder/sign-with.html index 232bbf126c..28cc6f4b8a 100644 --- a/docs/build/html/api/core/-transaction-builder/sign-with.html +++ b/docs/build/html/api/core/-transaction-builder/sign-with.html @@ -7,8 +7,8 @@ core / TransactionBuilder / signWith

signWith

- -fun signWith(key: KeyPair): Unit
+ +fun signWith(key: KeyPair): Unit


diff --git a/docs/build/html/api/core/-transaction-builder/time.html b/docs/build/html/api/core/-transaction-builder/time.html index 32ee561872..3db3312ece 100644 --- a/docs/build/html/api/core/-transaction-builder/time.html +++ b/docs/build/html/api/core/-transaction-builder/time.html @@ -7,7 +7,7 @@ core / TransactionBuilder / time

time

- + val time: TimestampCommand?


diff --git a/docs/build/html/api/core/-transaction-builder/timestamp.html b/docs/build/html/api/core/-transaction-builder/timestamp.html index 1cf5ed01da..2ee8baa7e5 100644 --- a/docs/build/html/api/core/-transaction-builder/timestamp.html +++ b/docs/build/html/api/core/-transaction-builder/timestamp.html @@ -7,8 +7,8 @@ core / TransactionBuilder / timestamp

timestamp

- -fun timestamp(timestamper: TimestamperService, clock: Clock = Clock.systemUTC()): Unit
+ +fun timestamp(timestamper: TimestamperService, clock: Clock = Clock.systemUTC()): Unit

Uses the given timestamper service to request a signature over the WireTransaction be added. There must always be at least one such signature, but others may be added as well. You may want to have multiple redundant timestamps in the following cases:

diff --git a/docs/build/html/api/core/-transaction-builder/to-signed-transaction.html b/docs/build/html/api/core/-transaction-builder/to-signed-transaction.html index c9f4b2881e..a606d306db 100644 --- a/docs/build/html/api/core/-transaction-builder/to-signed-transaction.html +++ b/docs/build/html/api/core/-transaction-builder/to-signed-transaction.html @@ -7,8 +7,8 @@ core / TransactionBuilder / toSignedTransaction

toSignedTransaction

- -fun toSignedTransaction(checkSufficientSignatures: Boolean = true): SignedTransaction
+ +fun toSignedTransaction(checkSufficientSignatures: Boolean = true): SignedTransaction


diff --git a/docs/build/html/api/core/-transaction-builder/to-wire-transaction.html b/docs/build/html/api/core/-transaction-builder/to-wire-transaction.html index e4a335085b..87aaba4dd9 100644 --- a/docs/build/html/api/core/-transaction-builder/to-wire-transaction.html +++ b/docs/build/html/api/core/-transaction-builder/to-wire-transaction.html @@ -7,7 +7,7 @@ core / TransactionBuilder / toWireTransaction

toWireTransaction

- + fun toWireTransaction(): WireTransaction


diff --git a/docs/build/html/api/core/-transaction-builder/with-items.html b/docs/build/html/api/core/-transaction-builder/with-items.html index ceb0d0fc8f..c59906dacb 100644 --- a/docs/build/html/api/core/-transaction-builder/with-items.html +++ b/docs/build/html/api/core/-transaction-builder/with-items.html @@ -7,8 +7,8 @@ core / TransactionBuilder / withItems

withItems

- -fun withItems(vararg items: Any): TransactionBuilder
+ +fun withItems(vararg items: Any): TransactionBuilder

A more convenient way to add items to this transaction that calls the add* methods for you based on type



diff --git a/docs/build/html/api/core/-transaction-conflict-exception/-init-.html b/docs/build/html/api/core/-transaction-conflict-exception/-init-.html index 9b42e736cd..a207d1c0a0 100644 --- a/docs/build/html/api/core/-transaction-conflict-exception/-init-.html +++ b/docs/build/html/api/core/-transaction-conflict-exception/-init-.html @@ -7,7 +7,7 @@ core / TransactionConflictException / <init>

<init>

-TransactionConflictException(conflictRef: StateRef, tx1: LedgerTransaction, tx2: LedgerTransaction)
+TransactionConflictException(conflictRef: StateRef, tx1: LedgerTransaction, tx2: LedgerTransaction)


diff --git a/docs/build/html/api/core/-transaction-conflict-exception/conflict-ref.html b/docs/build/html/api/core/-transaction-conflict-exception/conflict-ref.html index 5761ba0597..0427dd18e8 100644 --- a/docs/build/html/api/core/-transaction-conflict-exception/conflict-ref.html +++ b/docs/build/html/api/core/-transaction-conflict-exception/conflict-ref.html @@ -7,7 +7,7 @@ core / TransactionConflictException / conflictRef

conflictRef

- + val conflictRef: StateRef


diff --git a/docs/build/html/api/core/-transaction-conflict-exception/index.html b/docs/build/html/api/core/-transaction-conflict-exception/index.html index 61082d4fad..d1a16c4783 100644 --- a/docs/build/html/api/core/-transaction-conflict-exception/index.html +++ b/docs/build/html/api/core/-transaction-conflict-exception/index.html @@ -17,7 +17,7 @@ <init> -TransactionConflictException(conflictRef: StateRef, tx1: LedgerTransaction, tx2: LedgerTransaction) +TransactionConflictException(conflictRef: StateRef, tx1: LedgerTransaction, tx2: LedgerTransaction) diff --git a/docs/build/html/api/core/-transaction-conflict-exception/tx1.html b/docs/build/html/api/core/-transaction-conflict-exception/tx1.html index acbf905a20..5bc6286227 100644 --- a/docs/build/html/api/core/-transaction-conflict-exception/tx1.html +++ b/docs/build/html/api/core/-transaction-conflict-exception/tx1.html @@ -7,7 +7,7 @@ core / TransactionConflictException / tx1

tx1

- + val tx1: LedgerTransaction


diff --git a/docs/build/html/api/core/-transaction-conflict-exception/tx2.html b/docs/build/html/api/core/-transaction-conflict-exception/tx2.html index ab6e84e697..d7b4b78941 100644 --- a/docs/build/html/api/core/-transaction-conflict-exception/tx2.html +++ b/docs/build/html/api/core/-transaction-conflict-exception/tx2.html @@ -7,7 +7,7 @@ core / TransactionConflictException / tx2

tx2

- + val tx2: LedgerTransaction


diff --git a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/-init-.html b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/-init-.html index 5dbc0e5e91..2bc6205fed 100644 --- a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/-init-.html +++ b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/-init-.html @@ -7,7 +7,7 @@ core / TransactionForVerification / InOutGroup / <init>

<init>

-InOutGroup(inputs: List<T>, outputs: List<T>, groupingKey: K)
+InOutGroup(inputs: List<T>, outputs: List<T>, groupingKey: K)

A set of related inputs and outputs that are connected by some common attributes. An InOutGroup is calculated using groupStates and is useful for handling cases where a transaction may contain similar but unrelated state evolutions, for example, a transaction that moves cash in two different currencies. The numbers must add diff --git a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/grouping-key.html b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/grouping-key.html index c8a8682ae7..fc0dd7bac8 100644 --- a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/grouping-key.html +++ b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/grouping-key.html @@ -7,7 +7,7 @@ core / TransactionForVerification / InOutGroup / groupingKey

groupingKey

- + val groupingKey: K


diff --git a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/index.html b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/index.html index c87dfccc91..f2241be1fc 100644 --- a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/index.html +++ b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/index.html @@ -22,7 +22,7 @@ be used to simplify this logic.

<init> -InOutGroup(inputs: List<T>, outputs: List<T>, groupingKey: K)

A set of related inputs and outputs that are connected by some common attributes. An InOutGroup is calculated +InOutGroup(inputs: List<T>, outputs: List<T>, groupingKey: K)

A set of related inputs and outputs that are connected by some common attributes. An InOutGroup is calculated using groupStates and is useful for handling cases where a transaction may contain similar but unrelated state evolutions, for example, a transaction that moves cash in two different currencies. The numbers must add up on both sides of the transaction, but the values must be summed independently per currency. Grouping can diff --git a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/inputs.html b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/inputs.html index 9eee402d4a..ba83988c14 100644 --- a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/inputs.html +++ b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/inputs.html @@ -7,7 +7,7 @@ core / TransactionForVerification / InOutGroup / inputs

inputs

- + val inputs: List<T>


diff --git a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/outputs.html b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/outputs.html index ae538b9e0a..0e68c100f3 100644 --- a/docs/build/html/api/core/-transaction-for-verification/-in-out-group/outputs.html +++ b/docs/build/html/api/core/-transaction-for-verification/-in-out-group/outputs.html @@ -7,7 +7,7 @@ core / TransactionForVerification / InOutGroup / outputs

outputs

- + val outputs: List<T>


diff --git a/docs/build/html/api/core/-transaction-for-verification/-init-.html b/docs/build/html/api/core/-transaction-for-verification/-init-.html index 3cdf068208..a5d8995f7e 100644 --- a/docs/build/html/api/core/-transaction-for-verification/-init-.html +++ b/docs/build/html/api/core/-transaction-for-verification/-init-.html @@ -7,7 +7,7 @@ core / TransactionForVerification / <init>

<init>

-TransactionForVerification(inStates: List<ContractState>, outStates: List<ContractState>, attachments: List<Attachment>, commands: List<AuthenticatedObject<CommandData>>, origHash: SecureHash)
+TransactionForVerification(inStates: List<ContractState>, outStates: List<ContractState>, attachments: List<Attachment>, commands: List<AuthenticatedObject<CommandData>>, origHash: SecureHash)

A transaction in fully resolved and sig-checked form, ready for passing as input to a verification function.



diff --git a/docs/build/html/api/core/-transaction-for-verification/attachments.html b/docs/build/html/api/core/-transaction-for-verification/attachments.html index a44c3bbfa3..5bd5b45dde 100644 --- a/docs/build/html/api/core/-transaction-for-verification/attachments.html +++ b/docs/build/html/api/core/-transaction-for-verification/attachments.html @@ -7,7 +7,7 @@ core / TransactionForVerification / attachments

attachments

- + val attachments: List<Attachment>


diff --git a/docs/build/html/api/core/-transaction-for-verification/commands.html b/docs/build/html/api/core/-transaction-for-verification/commands.html index e18bf53442..ad3bba28d7 100644 --- a/docs/build/html/api/core/-transaction-for-verification/commands.html +++ b/docs/build/html/api/core/-transaction-for-verification/commands.html @@ -7,7 +7,7 @@ core / TransactionForVerification / commands

commands

- + val commands: List<AuthenticatedObject<CommandData>>


diff --git a/docs/build/html/api/core/-transaction-for-verification/equals.html b/docs/build/html/api/core/-transaction-for-verification/equals.html index 3a9cc9825e..c0d81dcb36 100644 --- a/docs/build/html/api/core/-transaction-for-verification/equals.html +++ b/docs/build/html/api/core/-transaction-for-verification/equals.html @@ -7,8 +7,8 @@ core / TransactionForVerification / equals

equals

- -fun equals(other: Any?): Boolean
+ +fun equals(other: Any?): Boolean


diff --git a/docs/build/html/api/core/-transaction-for-verification/get-timestamp-by.html b/docs/build/html/api/core/-transaction-for-verification/get-timestamp-by.html index f92d00bbb7..4700db8f1c 100644 --- a/docs/build/html/api/core/-transaction-for-verification/get-timestamp-by.html +++ b/docs/build/html/api/core/-transaction-for-verification/get-timestamp-by.html @@ -7,8 +7,8 @@ core / TransactionForVerification / getTimestampBy

getTimestampBy

- -fun getTimestampBy(timestampingAuthority: Party): TimestampCommand?
+ +fun getTimestampBy(timestampingAuthority: Party): TimestampCommand?

Simply calls commands.getTimestampBy as a shortcut to make code completion more intuitive.



diff --git a/docs/build/html/api/core/-transaction-for-verification/group-states-internal.html b/docs/build/html/api/core/-transaction-for-verification/group-states-internal.html index 3a618e2f9c..73470c3695 100644 --- a/docs/build/html/api/core/-transaction-for-verification/group-states-internal.html +++ b/docs/build/html/api/core/-transaction-for-verification/group-states-internal.html @@ -7,8 +7,8 @@ core / TransactionForVerification / groupStatesInternal

groupStatesInternal

- -fun <T : ContractState, K : Any> groupStatesInternal(inGroups: Map<K, List<T>>, outGroups: Map<K, List<T>>): List<InOutGroup<T, K>>
+ +fun <T : ContractState, K : Any> groupStatesInternal(inGroups: Map<K, List<T>>, outGroups: Map<K, List<T>>): List<InOutGroup<T, K>>
Deprecated: Do not use this directly: exposed as public only due to function inlining


diff --git a/docs/build/html/api/core/-transaction-for-verification/group-states.html b/docs/build/html/api/core/-transaction-for-verification/group-states.html index 04468cb059..0cf302ab95 100644 --- a/docs/build/html/api/core/-transaction-for-verification/group-states.html +++ b/docs/build/html/api/core/-transaction-for-verification/group-states.html @@ -7,8 +7,8 @@ core / TransactionForVerification / groupStates

groupStates

- -fun <T : ContractState, K : Any> groupStates(ofType: Class<T>, selector: (T) -> K): List<InOutGroup<T, K>>
+ +fun <T : ContractState, K : Any> groupStates(ofType: Class<T>, selector: (T) -> K): List<InOutGroup<T, K>>

Given a type and a function that returns a grouping key, associates inputs and outputs together so that they can be processed as one. The grouping key is any arbitrary object that can act as a map key (so must implement equals and hashCode).

@@ -24,8 +24,8 @@ currency field: the resulting list can then be iterated over to perform the per-


- -inline fun <reified T : ContractState, K : Any> groupStates(selector: (T) -> K): List<InOutGroup<T, K>>
+ +inline fun <reified T : ContractState, K : Any> groupStates(selector: (T) -> K): List<InOutGroup<T, K>>

See the documentation for the reflection-based version of groupStates



diff --git a/docs/build/html/api/core/-transaction-for-verification/hash-code.html b/docs/build/html/api/core/-transaction-for-verification/hash-code.html index 7ee2562213..34e09786f5 100644 --- a/docs/build/html/api/core/-transaction-for-verification/hash-code.html +++ b/docs/build/html/api/core/-transaction-for-verification/hash-code.html @@ -7,7 +7,7 @@ core / TransactionForVerification / hashCode

hashCode

- + fun hashCode(): Int


diff --git a/docs/build/html/api/core/-transaction-for-verification/in-states.html b/docs/build/html/api/core/-transaction-for-verification/in-states.html index ab5387bfd3..f39674cb1a 100644 --- a/docs/build/html/api/core/-transaction-for-verification/in-states.html +++ b/docs/build/html/api/core/-transaction-for-verification/in-states.html @@ -7,7 +7,7 @@ core / TransactionForVerification / inStates

inStates

- + val inStates: List<ContractState>


diff --git a/docs/build/html/api/core/-transaction-for-verification/index.html b/docs/build/html/api/core/-transaction-for-verification/index.html index e53900581a..fa657aa641 100644 --- a/docs/build/html/api/core/-transaction-for-verification/index.html +++ b/docs/build/html/api/core/-transaction-for-verification/index.html @@ -34,7 +34,7 @@ be used to simplify this logic.

<init> -TransactionForVerification(inStates: List<ContractState>, outStates: List<ContractState>, attachments: List<Attachment>, commands: List<AuthenticatedObject<CommandData>>, origHash: SecureHash)

A transaction in fully resolved and sig-checked form, ready for passing as input to a verification function.

+TransactionForVerification(inStates: List<ContractState>, outStates: List<ContractState>, attachments: List<Attachment>, commands: List<AuthenticatedObject<CommandData>>, origHash: SecureHash)

A transaction in fully resolved and sig-checked form, ready for passing as input to a verification function.

@@ -81,30 +81,30 @@ be used to simplify this logic.

equals -fun equals(other: Any?): Boolean +fun equals(other: Any?): Boolean getTimestampBy -fun getTimestampBy(timestampingAuthority: Party): TimestampCommand?

Simply calls commands.getTimestampBy as a shortcut to make code completion more intuitive.

+fun getTimestampBy(timestampingAuthority: Party): TimestampCommand?

Simply calls commands.getTimestampBy as a shortcut to make code completion more intuitive.

groupStates -fun <T : ContractState, K : Any> groupStates(ofType: Class<T>, selector: (T) -> K): List<InOutGroup<T, K>>

Given a type and a function that returns a grouping key, associates inputs and outputs together so that they +fun <T : ContractState, K : Any> groupStates(ofType: Class<T>, selector: (T) -> K): List<InOutGroup<T, K>>

Given a type and a function that returns a grouping key, associates inputs and outputs together so that they can be processed as one. The grouping key is any arbitrary object that can act as a map key (so must implement equals and hashCode).

-fun <T : ContractState, K : Any> groupStates(selector: (T) -> K): List<InOutGroup<T, K>>

See the documentation for the reflection-based version of groupStates

+fun <T : ContractState, K : Any> groupStates(selector: (T) -> K): List<InOutGroup<T, K>>

See the documentation for the reflection-based version of groupStates

groupStatesInternal -fun <T : ContractState, K : Any> groupStatesInternal(inGroups: Map<K, List<T>>, outGroups: Map<K, List<T>>): List<InOutGroup<T, K>> +fun <T : ContractState, K : Any> groupStatesInternal(inGroups: Map<K, List<T>>, outGroups: Map<K, List<T>>): List<InOutGroup<T, K>> diff --git a/docs/build/html/api/core/-transaction-for-verification/orig-hash.html b/docs/build/html/api/core/-transaction-for-verification/orig-hash.html index d1d8e09a3d..f0305db22a 100644 --- a/docs/build/html/api/core/-transaction-for-verification/orig-hash.html +++ b/docs/build/html/api/core/-transaction-for-verification/orig-hash.html @@ -7,7 +7,7 @@ core / TransactionForVerification / origHash

origHash

- + val origHash: SecureHash


diff --git a/docs/build/html/api/core/-transaction-for-verification/out-states.html b/docs/build/html/api/core/-transaction-for-verification/out-states.html index 38364cca9d..c4bb451cc7 100644 --- a/docs/build/html/api/core/-transaction-for-verification/out-states.html +++ b/docs/build/html/api/core/-transaction-for-verification/out-states.html @@ -7,7 +7,7 @@ core / TransactionForVerification / outStates

outStates

- + val outStates: List<ContractState>


diff --git a/docs/build/html/api/core/-transaction-for-verification/verify.html b/docs/build/html/api/core/-transaction-for-verification/verify.html index 74b73275d7..3bc57bfa27 100644 --- a/docs/build/html/api/core/-transaction-for-verification/verify.html +++ b/docs/build/html/api/core/-transaction-for-verification/verify.html @@ -7,7 +7,7 @@ core / TransactionForVerification / verify

verify

- + fun verify(): Unit

Runs the contracts for this transaction.

TODO: Move this out of the core data structure definitions, once unit tests are more cleanly separated.

diff --git a/docs/build/html/api/core/-transaction-graph-search/-init-.html b/docs/build/html/api/core/-transaction-graph-search/-init-.html index 55fc6a8a61..9b9a9bf6ea 100644 --- a/docs/build/html/api/core/-transaction-graph-search/-init-.html +++ b/docs/build/html/api/core/-transaction-graph-search/-init-.html @@ -7,7 +7,7 @@ core / TransactionGraphSearch / <init>

<init>

-TransactionGraphSearch(transactions: Map<SecureHash, SignedTransaction>, startPoints: List<WireTransaction>)
+TransactionGraphSearch(transactions: Map<SecureHash, SignedTransaction>, startPoints: List<WireTransaction>)

Given a map of transaction id to SignedTransaction, performs a breadth first search of the dependency graph from the starting point down in order to find transactions that match the given query criteria.

Currently, only one kind of query is supported: find any transaction that contains a command of the given type.

diff --git a/docs/build/html/api/core/-transaction-graph-search/-query/-init-.html b/docs/build/html/api/core/-transaction-graph-search/-query/-init-.html index ee4cd2c866..4dccebac9c 100644 --- a/docs/build/html/api/core/-transaction-graph-search/-query/-init-.html +++ b/docs/build/html/api/core/-transaction-graph-search/-query/-init-.html @@ -7,7 +7,7 @@ core / TransactionGraphSearch / Query / <init>

<init>

-Query(withCommandOfType: Class<out CommandData>? = null)
+Query(withCommandOfType: Class<out CommandData>? = null)


diff --git a/docs/build/html/api/core/-transaction-graph-search/-query/index.html b/docs/build/html/api/core/-transaction-graph-search/-query/index.html index a428f35278..d0ce81763f 100644 --- a/docs/build/html/api/core/-transaction-graph-search/-query/index.html +++ b/docs/build/html/api/core/-transaction-graph-search/-query/index.html @@ -17,7 +17,7 @@ <init> -Query(withCommandOfType: Class<out CommandData>? = null) +Query(withCommandOfType: Class<out CommandData>? = null) diff --git a/docs/build/html/api/core/-transaction-graph-search/-query/with-command-of-type.html b/docs/build/html/api/core/-transaction-graph-search/-query/with-command-of-type.html index 9424443322..85987c9d27 100644 --- a/docs/build/html/api/core/-transaction-graph-search/-query/with-command-of-type.html +++ b/docs/build/html/api/core/-transaction-graph-search/-query/with-command-of-type.html @@ -7,7 +7,7 @@ core / TransactionGraphSearch / Query / withCommandOfType

withCommandOfType

- + val withCommandOfType: Class<out CommandData>?


diff --git a/docs/build/html/api/core/-transaction-graph-search/call.html b/docs/build/html/api/core/-transaction-graph-search/call.html index f46cd2c157..2a4d5b21e8 100644 --- a/docs/build/html/api/core/-transaction-graph-search/call.html +++ b/docs/build/html/api/core/-transaction-graph-search/call.html @@ -7,7 +7,7 @@ core / TransactionGraphSearch / call

call

- + fun call(): List<WireTransaction>


diff --git a/docs/build/html/api/core/-transaction-graph-search/index.html b/docs/build/html/api/core/-transaction-graph-search/index.html index 31ade0165c..9bdf808161 100644 --- a/docs/build/html/api/core/-transaction-graph-search/index.html +++ b/docs/build/html/api/core/-transaction-graph-search/index.html @@ -35,7 +35,7 @@ the starting point down in order to find transactions that match the given query <init> -TransactionGraphSearch(transactions: Map<SecureHash, SignedTransaction>, startPoints: List<WireTransaction>)

Given a map of transaction id to SignedTransaction, performs a breadth first search of the dependency graph from +TransactionGraphSearch(transactions: Map<SecureHash, SignedTransaction>, startPoints: List<WireTransaction>)

Given a map of transaction id to SignedTransaction, performs a breadth first search of the dependency graph from the starting point down in order to find transactions that match the given query criteria.

diff --git a/docs/build/html/api/core/-transaction-graph-search/query.html b/docs/build/html/api/core/-transaction-graph-search/query.html index bd7adebefc..11682ff63b 100644 --- a/docs/build/html/api/core/-transaction-graph-search/query.html +++ b/docs/build/html/api/core/-transaction-graph-search/query.html @@ -7,7 +7,7 @@ core / TransactionGraphSearch / query

query

- + var query: Query


diff --git a/docs/build/html/api/core/-transaction-graph-search/start-points.html b/docs/build/html/api/core/-transaction-graph-search/start-points.html index 7b3f6a07c6..167d1edc68 100644 --- a/docs/build/html/api/core/-transaction-graph-search/start-points.html +++ b/docs/build/html/api/core/-transaction-graph-search/start-points.html @@ -7,7 +7,7 @@ core / TransactionGraphSearch / startPoints

startPoints

- + val startPoints: List<WireTransaction>


diff --git a/docs/build/html/api/core/-transaction-graph-search/transactions.html b/docs/build/html/api/core/-transaction-graph-search/transactions.html index 7c7b0904e3..219fade1c6 100644 --- a/docs/build/html/api/core/-transaction-graph-search/transactions.html +++ b/docs/build/html/api/core/-transaction-graph-search/transactions.html @@ -7,7 +7,7 @@ core / TransactionGraphSearch / transactions

transactions

- + val transactions: Map<SecureHash, SignedTransaction>


diff --git a/docs/build/html/api/core/-transaction-group/-init-.html b/docs/build/html/api/core/-transaction-group/-init-.html index 6d6ef51258..86617620d5 100644 --- a/docs/build/html/api/core/-transaction-group/-init-.html +++ b/docs/build/html/api/core/-transaction-group/-init-.html @@ -7,12 +7,12 @@ core / TransactionGroup / <init>

<init>

-TransactionGroup(transactions: Set<LedgerTransaction>, nonVerifiedRoots: Set<LedgerTransaction>)
+TransactionGroup(transactions: Set<LedgerTransaction>, nonVerifiedRoots: Set<LedgerTransaction>)

A TransactionGroup defines a directed acyclic graph of transactions that can be resolved with each other and then verified. Successful verification does not imply the non-existence of other conflicting transactions: simply that this subgraph does not contain conflicts and is accepted by the involved contracts.

-

The inputs of the provided transactions must be resolvable either within the transactions set, or from the -nonVerifiedRoots set. Transactions in the non-verified set are ignored other than for looking up input states.

+

The inputs of the provided transactions must be resolvable either within the transactions set, or from the +nonVerifiedRoots set. Transactions in the non-verified set are ignored other than for looking up input states.




diff --git a/docs/build/html/api/core/-transaction-group/index.html b/docs/build/html/api/core/-transaction-group/index.html index ff285f040e..33cd309d9a 100644 --- a/docs/build/html/api/core/-transaction-group/index.html +++ b/docs/build/html/api/core/-transaction-group/index.html @@ -24,7 +24,7 @@ this subgraph does not contain conflicts and is accepted by the involved contrac <init> -TransactionGroup(transactions: Set<LedgerTransaction>, nonVerifiedRoots: Set<LedgerTransaction>)

A TransactionGroup defines a directed acyclic graph of transactions that can be resolved with each other and then +TransactionGroup(transactions: Set<LedgerTransaction>, nonVerifiedRoots: Set<LedgerTransaction>)

A TransactionGroup defines a directed acyclic graph of transactions that can be resolved with each other and then verified. Successful verification does not imply the non-existence of other conflicting transactions: simply that this subgraph does not contain conflicts and is accepted by the involved contracts.

diff --git a/docs/build/html/api/core/-transaction-group/non-verified-roots.html b/docs/build/html/api/core/-transaction-group/non-verified-roots.html index fb6464118f..322d516957 100644 --- a/docs/build/html/api/core/-transaction-group/non-verified-roots.html +++ b/docs/build/html/api/core/-transaction-group/non-verified-roots.html @@ -7,7 +7,7 @@ core / TransactionGroup / nonVerifiedRoots

nonVerifiedRoots

- + val nonVerifiedRoots: Set<LedgerTransaction>


diff --git a/docs/build/html/api/core/-transaction-group/transactions.html b/docs/build/html/api/core/-transaction-group/transactions.html index 7a3ceceadb..a93aa87b5b 100644 --- a/docs/build/html/api/core/-transaction-group/transactions.html +++ b/docs/build/html/api/core/-transaction-group/transactions.html @@ -7,7 +7,7 @@ core / TransactionGroup / transactions

transactions

- + val transactions: Set<LedgerTransaction>


diff --git a/docs/build/html/api/core/-transaction-group/verify.html b/docs/build/html/api/core/-transaction-group/verify.html index 8ad8b44360..b28bde3c21 100644 --- a/docs/build/html/api/core/-transaction-group/verify.html +++ b/docs/build/html/api/core/-transaction-group/verify.html @@ -7,7 +7,7 @@ core / TransactionGroup / verify

verify

- + fun verify(): Set<TransactionForVerification>

Verifies the group and returns the set of resolved transactions.


diff --git a/docs/build/html/api/core/-transaction-resolution-exception/-init-.html b/docs/build/html/api/core/-transaction-resolution-exception/-init-.html index 0ca83eb33c..2d8dd3921c 100644 --- a/docs/build/html/api/core/-transaction-resolution-exception/-init-.html +++ b/docs/build/html/api/core/-transaction-resolution-exception/-init-.html @@ -7,7 +7,7 @@ core / TransactionResolutionException / <init>

<init>

-TransactionResolutionException(hash: SecureHash)
+TransactionResolutionException(hash: SecureHash)


diff --git a/docs/build/html/api/core/-transaction-resolution-exception/hash.html b/docs/build/html/api/core/-transaction-resolution-exception/hash.html index 410616da55..60bab42f03 100644 --- a/docs/build/html/api/core/-transaction-resolution-exception/hash.html +++ b/docs/build/html/api/core/-transaction-resolution-exception/hash.html @@ -7,7 +7,7 @@ core / TransactionResolutionException / hash

hash

- + val hash: SecureHash


diff --git a/docs/build/html/api/core/-transaction-resolution-exception/index.html b/docs/build/html/api/core/-transaction-resolution-exception/index.html index 930c9fa667..485a5d8f4a 100644 --- a/docs/build/html/api/core/-transaction-resolution-exception/index.html +++ b/docs/build/html/api/core/-transaction-resolution-exception/index.html @@ -17,7 +17,7 @@ <init> -TransactionResolutionException(hash: SecureHash) +TransactionResolutionException(hash: SecureHash) diff --git a/docs/build/html/api/core/-transaction-verification-exception/-init-.html b/docs/build/html/api/core/-transaction-verification-exception/-init-.html index 38662d55cc..44e82060a0 100644 --- a/docs/build/html/api/core/-transaction-verification-exception/-init-.html +++ b/docs/build/html/api/core/-transaction-verification-exception/-init-.html @@ -7,7 +7,7 @@ core / TransactionVerificationException / <init>

<init>

-TransactionVerificationException(tx: TransactionForVerification, contract: Contract, cause: Throwable?)
+TransactionVerificationException(tx: TransactionForVerification, contract: Contract, cause: Throwable?)

Thrown if a verification fails due to a contract rejection.



diff --git a/docs/build/html/api/core/-transaction-verification-exception/contract.html b/docs/build/html/api/core/-transaction-verification-exception/contract.html index 2965cd83c0..12da7b6eee 100644 --- a/docs/build/html/api/core/-transaction-verification-exception/contract.html +++ b/docs/build/html/api/core/-transaction-verification-exception/contract.html @@ -7,7 +7,7 @@ core / TransactionVerificationException / contract

contract

- + val contract: Contract


diff --git a/docs/build/html/api/core/-transaction-verification-exception/index.html b/docs/build/html/api/core/-transaction-verification-exception/index.html index 2b5bbe6ce0..f942a93c8b 100644 --- a/docs/build/html/api/core/-transaction-verification-exception/index.html +++ b/docs/build/html/api/core/-transaction-verification-exception/index.html @@ -18,7 +18,7 @@ <init> -TransactionVerificationException(tx: TransactionForVerification, contract: Contract, cause: Throwable?)

Thrown if a verification fails due to a contract rejection.

+TransactionVerificationException(tx: TransactionForVerification, contract: Contract, cause: Throwable?)

Thrown if a verification fails due to a contract rejection.

diff --git a/docs/build/html/api/core/-transaction-verification-exception/tx.html b/docs/build/html/api/core/-transaction-verification-exception/tx.html index 2a59509917..f64410654b 100644 --- a/docs/build/html/api/core/-transaction-verification-exception/tx.html +++ b/docs/build/html/api/core/-transaction-verification-exception/tx.html @@ -7,7 +7,7 @@ core / TransactionVerificationException / tx

tx

- + val tx: TransactionForVerification


diff --git a/docs/build/html/api/core/-type-only-command-data/equals.html b/docs/build/html/api/core/-type-only-command-data/equals.html index 3858a46095..b30906a888 100644 --- a/docs/build/html/api/core/-type-only-command-data/equals.html +++ b/docs/build/html/api/core/-type-only-command-data/equals.html @@ -7,8 +7,8 @@ core / TypeOnlyCommandData / equals

equals

- -open fun equals(other: Any?): Boolean
+ +open fun equals(other: Any?): Boolean


diff --git a/docs/build/html/api/core/-type-only-command-data/hash-code.html b/docs/build/html/api/core/-type-only-command-data/hash-code.html index 07a0bce78a..3933bbfade 100644 --- a/docs/build/html/api/core/-type-only-command-data/hash-code.html +++ b/docs/build/html/api/core/-type-only-command-data/hash-code.html @@ -7,7 +7,7 @@ core / TypeOnlyCommandData / hashCode

hashCode

- + open fun hashCode(): <ERROR CLASS>


diff --git a/docs/build/html/api/core/-type-only-command-data/index.html b/docs/build/html/api/core/-type-only-command-data/index.html index 442d41d3f6..1573f5cde7 100644 --- a/docs/build/html/api/core/-type-only-command-data/index.html +++ b/docs/build/html/api/core/-type-only-command-data/index.html @@ -30,7 +30,7 @@ equals -open fun equals(other: Any?): Boolean +open fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/core/-wire-transaction/-init-.html b/docs/build/html/api/core/-wire-transaction/-init-.html index 97143a80f6..39a9d0fde2 100644 --- a/docs/build/html/api/core/-wire-transaction/-init-.html +++ b/docs/build/html/api/core/-wire-transaction/-init-.html @@ -7,7 +7,7 @@ core / WireTransaction / <init>

<init>

-WireTransaction(inputs: List<StateRef>, attachments: List<SecureHash>, outputs: List<ContractState>, commands: List<Command>)
+WireTransaction(inputs: List<StateRef>, attachments: List<SecureHash>, outputs: List<ContractState>, commands: List<Command>)

Transaction ready for serialisation, without any signatures attached.



diff --git a/docs/build/html/api/core/-wire-transaction/attachments.html b/docs/build/html/api/core/-wire-transaction/attachments.html index ad948a2821..e9da59a8db 100644 --- a/docs/build/html/api/core/-wire-transaction/attachments.html +++ b/docs/build/html/api/core/-wire-transaction/attachments.html @@ -7,7 +7,7 @@ core / WireTransaction / attachments

attachments

- + val attachments: List<SecureHash>


diff --git a/docs/build/html/api/core/-wire-transaction/commands.html b/docs/build/html/api/core/-wire-transaction/commands.html index cd74dcc4dd..608bbc3230 100644 --- a/docs/build/html/api/core/-wire-transaction/commands.html +++ b/docs/build/html/api/core/-wire-transaction/commands.html @@ -7,7 +7,7 @@ core / WireTransaction / commands

commands

- + val commands: List<Command>


diff --git a/docs/build/html/api/core/-wire-transaction/deserialize.html b/docs/build/html/api/core/-wire-transaction/deserialize.html index 1f69d3c198..1fe218ed00 100644 --- a/docs/build/html/api/core/-wire-transaction/deserialize.html +++ b/docs/build/html/api/core/-wire-transaction/deserialize.html @@ -7,8 +7,8 @@ core / WireTransaction / deserialize

deserialize

- -fun deserialize(bits: SerializedBytes<WireTransaction>, kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
+ +fun deserialize(bits: SerializedBytes<WireTransaction>, kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction


diff --git a/docs/build/html/api/core/-wire-transaction/id.html b/docs/build/html/api/core/-wire-transaction/id.html index e036e71543..212f010784 100644 --- a/docs/build/html/api/core/-wire-transaction/id.html +++ b/docs/build/html/api/core/-wire-transaction/id.html @@ -7,7 +7,7 @@ core / WireTransaction / id

id

- + val id: SecureHash
Overrides NamedByHash.id

diff --git a/docs/build/html/api/core/-wire-transaction/index.html b/docs/build/html/api/core/-wire-transaction/index.html index 9e9482d65c..da1b0f7323 100644 --- a/docs/build/html/api/core/-wire-transaction/index.html +++ b/docs/build/html/api/core/-wire-transaction/index.html @@ -18,7 +18,7 @@ <init> -WireTransaction(inputs: List<StateRef>, attachments: List<SecureHash>, outputs: List<ContractState>, commands: List<Command>)

Transaction ready for serialisation, without any signatures attached.

+WireTransaction(inputs: List<StateRef>, attachments: List<SecureHash>, outputs: List<ContractState>, commands: List<Command>)

Transaction ready for serialisation, without any signatures attached.

@@ -71,8 +71,8 @@ outRef -fun <T : ContractState> outRef(index: Int): StateAndRef<T>

Returns a StateAndRef for the given output index.

-fun <T : ContractState> outRef(state: ContractState): StateAndRef<T>

Returns a StateAndRef for the requested output state, or throws IllegalArgumentException if not found.

+fun <T : ContractState> outRef(index: Int): StateAndRef<T>

Returns a StateAndRef for the given output index.

+fun <T : ContractState> outRef(state: ContractState): StateAndRef<T>

Returns a StateAndRef for the requested output state, or throws IllegalArgumentException if not found.

@@ -90,7 +90,7 @@ deserialize -fun deserialize(bits: SerializedBytes<WireTransaction>, kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction +fun deserialize(bits: SerializedBytes<WireTransaction>, kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction @@ -101,7 +101,7 @@ toLedgerTransaction -fun WireTransaction.toLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Looks up identities and attachments from storage to generate a LedgerTransaction.

+fun WireTransaction.toLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Looks up identities and attachments from storage to generate a LedgerTransaction.

diff --git a/docs/build/html/api/core/-wire-transaction/inputs.html b/docs/build/html/api/core/-wire-transaction/inputs.html index 442019e737..f665a96efd 100644 --- a/docs/build/html/api/core/-wire-transaction/inputs.html +++ b/docs/build/html/api/core/-wire-transaction/inputs.html @@ -7,7 +7,7 @@ core / WireTransaction / inputs

inputs

- + val inputs: List<StateRef>


diff --git a/docs/build/html/api/core/-wire-transaction/out-ref.html b/docs/build/html/api/core/-wire-transaction/out-ref.html index 32fc839f50..a3285233a6 100644 --- a/docs/build/html/api/core/-wire-transaction/out-ref.html +++ b/docs/build/html/api/core/-wire-transaction/out-ref.html @@ -7,13 +7,13 @@ core / WireTransaction / outRef

outRef

- -fun <T : ContractState> outRef(index: Int): StateAndRef<T>
+ +fun <T : ContractState> outRef(index: Int): StateAndRef<T>

Returns a StateAndRef for the given output index.



- -fun <T : ContractState> outRef(state: ContractState): StateAndRef<T>
+ +fun <T : ContractState> outRef(state: ContractState): StateAndRef<T>

Returns a StateAndRef for the requested output state, or throws IllegalArgumentException if not found.



diff --git a/docs/build/html/api/core/-wire-transaction/outputs.html b/docs/build/html/api/core/-wire-transaction/outputs.html index b8e54034dd..6ab1cab826 100644 --- a/docs/build/html/api/core/-wire-transaction/outputs.html +++ b/docs/build/html/api/core/-wire-transaction/outputs.html @@ -7,7 +7,7 @@ core / WireTransaction / outputs

outputs

- + val outputs: List<ContractState>


diff --git a/docs/build/html/api/core/-wire-transaction/serialized.html b/docs/build/html/api/core/-wire-transaction/serialized.html index 1c274ef785..c11387ca0f 100644 --- a/docs/build/html/api/core/-wire-transaction/serialized.html +++ b/docs/build/html/api/core/-wire-transaction/serialized.html @@ -7,7 +7,7 @@ core / WireTransaction / serialized

serialized

- + val serialized: SerializedBytes<WireTransaction>


diff --git a/docs/build/html/api/core/-wire-transaction/to-string.html b/docs/build/html/api/core/-wire-transaction/to-string.html index c411f72d79..d52a3fb583 100644 --- a/docs/build/html/api/core/-wire-transaction/to-string.html +++ b/docs/build/html/api/core/-wire-transaction/to-string.html @@ -7,7 +7,7 @@ core / WireTransaction / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core/calculate-days-between.html b/docs/build/html/api/core/calculate-days-between.html index e18737c848..2280c8b888 100644 --- a/docs/build/html/api/core/calculate-days-between.html +++ b/docs/build/html/api/core/calculate-days-between.html @@ -7,8 +7,8 @@ core / calculateDaysBetween

calculateDaysBetween

- -fun calculateDaysBetween(startDate: LocalDate, endDate: LocalDate, dcbYear: DayCountBasisYear, dcbDay: DayCountBasisDay): Int
+ +fun calculateDaysBetween(startDate: LocalDate, endDate: LocalDate, dcbYear: DayCountBasisYear, dcbDay: DayCountBasisDay): Int


diff --git a/docs/build/html/api/core/hash.html b/docs/build/html/api/core/hash.html index 0402b5b79e..12b56f59ee 100644 --- a/docs/build/html/api/core/hash.html +++ b/docs/build/html/api/core/hash.html @@ -7,7 +7,7 @@ core / hash

hash

- + fun ContractState.hash(): SecureHash

Returns the SHA-256 hash of the serialised contents of this state (not cached)


diff --git a/docs/build/html/api/core/index.html b/docs/build/html/api/core/index.html index f10e35857e..5e2f31ba2f 100644 --- a/docs/build/html/api/core/index.html +++ b/docs/build/html/api/core/index.html @@ -453,7 +453,7 @@ used to set it up. Note that the initializer will be called with the TransientPr calculateDaysBetween -fun calculateDaysBetween(startDate: LocalDate, endDate: LocalDate, dcbYear: DayCountBasisYear, dcbDay: DayCountBasisDay): Int +fun calculateDaysBetween(startDate: LocalDate, endDate: LocalDate, dcbYear: DayCountBasisYear, dcbDay: DayCountBasisDay): Int @@ -501,7 +501,7 @@ avoid potential bugs where the value is used in a context where negative numbers requireThat -fun <R> requireThat(body: Requirements.() -> R): R +fun <R> requireThat(body: Requirements.() -> R): R @@ -528,21 +528,21 @@ avoid potential bugs where the value is used in a context where negative numbers toLedgerTransaction -fun WireTransaction.toLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Looks up identities and attachments from storage to generate a LedgerTransaction.

+fun WireTransaction.toLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Looks up identities and attachments from storage to generate a LedgerTransaction.

verifyMoveCommands -fun <T : CommandData> verifyMoveCommands(inputs: List<OwnableState>, tx: TransactionForVerification): Unit

Simple functionality for verifying a move command. Verifies that each input has a signature from its owning key.

+fun <T : CommandData> verifyMoveCommands(inputs: List<OwnableState>, tx: TransactionForVerification): Unit

Simple functionality for verifying a move command. Verifies that each input has a signature from its owning key.

verifyToLedgerTransaction -fun SignedTransaction.verifyToLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Calls verify to check all required signatures are present, and then uses the passed IdentityService to call +fun SignedTransaction.verifyToLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Calls verify to check all required signatures are present, and then uses the passed IdentityService to call WireTransaction.toLedgerTransaction to look up well known identities from pubkeys.

diff --git a/docs/build/html/api/core/java.time.-local-date/index.html b/docs/build/html/api/core/java.time.-local-date/index.html index 3a55bd247c..c31ba21d20 100644 --- a/docs/build/html/api/core/java.time.-local-date/index.html +++ b/docs/build/html/api/core/java.time.-local-date/index.html @@ -13,7 +13,7 @@ isWorkingDay -fun LocalDate.isWorkingDay(accordingToCalendar: BusinessCalendar): Boolean +fun LocalDate.isWorkingDay(accordingToCalendar: BusinessCalendar): Boolean diff --git a/docs/build/html/api/core/java.time.-local-date/is-working-day.html b/docs/build/html/api/core/java.time.-local-date/is-working-day.html index 6ebe176ff5..70f01381a6 100644 --- a/docs/build/html/api/core/java.time.-local-date/is-working-day.html +++ b/docs/build/html/api/core/java.time.-local-date/is-working-day.html @@ -7,8 +7,8 @@ core / java.time.LocalDate / isWorkingDay

isWorkingDay

- -fun LocalDate.isWorkingDay(accordingToCalendar: BusinessCalendar): Boolean
+ +fun LocalDate.isWorkingDay(accordingToCalendar: BusinessCalendar): Boolean


diff --git a/docs/build/html/api/core/kotlin.collections.-iterable/index.html b/docs/build/html/api/core/kotlin.collections.-iterable/index.html index e5861733cd..438dcb99e5 100644 --- a/docs/build/html/api/core/kotlin.collections.-iterable/index.html +++ b/docs/build/html/api/core/kotlin.collections.-iterable/index.html @@ -25,7 +25,7 @@ sumOrZero -fun Iterable<Amount>.sumOrZero(currency: Currency): Amount +fun Iterable<Amount>.sumOrZero(currency: Currency): Amount diff --git a/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-null.html b/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-null.html index 94840397a3..e813336d4d 100644 --- a/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-null.html +++ b/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-null.html @@ -7,7 +7,7 @@ core / kotlin.collections.Iterable / sumOrNull

sumOrNull

- + fun Iterable<Amount>.sumOrNull(): Nothing?


diff --git a/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-throw.html b/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-throw.html index 30e4673c4f..37d0005b5d 100644 --- a/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-throw.html +++ b/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-throw.html @@ -7,7 +7,7 @@ core / kotlin.collections.Iterable / sumOrThrow

sumOrThrow

- + fun Iterable<Amount>.sumOrThrow(): <ERROR CLASS>


diff --git a/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-zero.html b/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-zero.html index 62958295fa..a0795b4114 100644 --- a/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-zero.html +++ b/docs/build/html/api/core/kotlin.collections.-iterable/sum-or-zero.html @@ -7,8 +7,8 @@ core / kotlin.collections.Iterable / sumOrZero

sumOrZero

- -fun Iterable<Amount>.sumOrZero(currency: Currency): Amount
+ +fun Iterable<Amount>.sumOrZero(currency: Currency): Amount


diff --git a/docs/build/html/api/core/kotlin.collections.-list/filter-states-of-type.html b/docs/build/html/api/core/kotlin.collections.-list/filter-states-of-type.html index f897243131..1db5222573 100644 --- a/docs/build/html/api/core/kotlin.collections.-list/filter-states-of-type.html +++ b/docs/build/html/api/core/kotlin.collections.-list/filter-states-of-type.html @@ -7,7 +7,7 @@ core / kotlin.collections.List / filterStatesOfType

filterStatesOfType

- + inline fun <reified T : ContractState> List<StateAndRef<ContractState>>.filterStatesOfType(): List<StateAndRef<T>>

Filters a list of StateAndRef objects according to the type of the states


diff --git a/docs/build/html/api/core/kotlin.collections.-list/get-timestamp-by-name.html b/docs/build/html/api/core/kotlin.collections.-list/get-timestamp-by-name.html index 101fc4849d..d4b4077148 100644 --- a/docs/build/html/api/core/kotlin.collections.-list/get-timestamp-by-name.html +++ b/docs/build/html/api/core/kotlin.collections.-list/get-timestamp-by-name.html @@ -7,8 +7,8 @@ core / kotlin.collections.List / getTimestampByName

getTimestampByName

- -fun List<AuthenticatedObject<CommandData>>.getTimestampByName(vararg names: String): TimestampCommand?
+ +fun List<AuthenticatedObject<CommandData>>.getTimestampByName(vararg names: String): TimestampCommand?

Returns a timestamp that was signed by any of the the named authorities, or returns null if missing. Note that matching here is done by (verified, legal) name, not by public key. Any signature by any party with a name that matches (case insensitively) any of the given names will yield a match.

diff --git a/docs/build/html/api/core/kotlin.collections.-list/get-timestamp-by.html b/docs/build/html/api/core/kotlin.collections.-list/get-timestamp-by.html index 02c709bfd3..cb257e477d 100644 --- a/docs/build/html/api/core/kotlin.collections.-list/get-timestamp-by.html +++ b/docs/build/html/api/core/kotlin.collections.-list/get-timestamp-by.html @@ -7,8 +7,8 @@ core / kotlin.collections.List / getTimestampBy

getTimestampBy

- -fun List<AuthenticatedObject<CommandData>>.getTimestampBy(timestampingAuthority: Party): TimestampCommand?
+ +fun List<AuthenticatedObject<CommandData>>.getTimestampBy(timestampingAuthority: Party): TimestampCommand?

Returns a timestamp that was signed by the given authority, or returns null if missing.



diff --git a/docs/build/html/api/core/kotlin.collections.-list/index.html b/docs/build/html/api/core/kotlin.collections.-list/index.html index 98a221d7d5..290a03eac7 100644 --- a/docs/build/html/api/core/kotlin.collections.-list/index.html +++ b/docs/build/html/api/core/kotlin.collections.-list/index.html @@ -20,14 +20,14 @@ getTimestampBy -fun List<AuthenticatedObject<CommandData>>.getTimestampBy(timestampingAuthority: Party): TimestampCommand?

Returns a timestamp that was signed by the given authority, or returns null if missing.

+fun List<AuthenticatedObject<CommandData>>.getTimestampBy(timestampingAuthority: Party): TimestampCommand?

Returns a timestamp that was signed by the given authority, or returns null if missing.

getTimestampByName -fun List<AuthenticatedObject<CommandData>>.getTimestampByName(vararg names: String): TimestampCommand?

Returns a timestamp that was signed by any of the the named authorities, or returns null if missing. +fun List<AuthenticatedObject<CommandData>>.getTimestampByName(vararg names: String): TimestampCommand?

Returns a timestamp that was signed by any of the the named authorities, or returns null if missing. Note that matching here is done by (verified, legal) name, not by public key. Any signature by any party with a name that matches (case insensitively) any of the given names will yield a match.

@@ -44,13 +44,13 @@ party with a name that matches (case insensitively) any of the given names will requireSingleCommand fun <T : CommandData> List<AuthenticatedObject<CommandData>>.requireSingleCommand(): <ERROR CLASS>
-fun List<AuthenticatedObject<CommandData>>.requireSingleCommand(klass: Class<out CommandData>): <ERROR CLASS> +fun List<AuthenticatedObject<CommandData>>.requireSingleCommand(klass: Class<out CommandData>): <ERROR CLASS> select -fun <T : CommandData> List<AuthenticatedObject<CommandData>>.select(signer: PublicKey? = null, party: Party? = null): <ERROR CLASS>

Filters the command list by type, party and public key all at once.

+fun <T : CommandData> List<AuthenticatedObject<CommandData>>.select(signer: PublicKey? = null, party: Party? = null): <ERROR CLASS>

Filters the command list by type, party and public key all at once.

diff --git a/docs/build/html/api/core/kotlin.collections.-list/require-single-command.html b/docs/build/html/api/core/kotlin.collections.-list/require-single-command.html index 7c108de011..b517b6fd8a 100644 --- a/docs/build/html/api/core/kotlin.collections.-list/require-single-command.html +++ b/docs/build/html/api/core/kotlin.collections.-list/require-single-command.html @@ -7,10 +7,10 @@ core / kotlin.collections.List / requireSingleCommand

requireSingleCommand

- + inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.requireSingleCommand(): <ERROR CLASS>
- -fun List<AuthenticatedObject<CommandData>>.requireSingleCommand(klass: Class<out CommandData>): <ERROR CLASS>
+ +fun List<AuthenticatedObject<CommandData>>.requireSingleCommand(klass: Class<out CommandData>): <ERROR CLASS>


diff --git a/docs/build/html/api/core/kotlin.collections.-list/select.html b/docs/build/html/api/core/kotlin.collections.-list/select.html index 187d6c2bb8..fa231677c8 100644 --- a/docs/build/html/api/core/kotlin.collections.-list/select.html +++ b/docs/build/html/api/core/kotlin.collections.-list/select.html @@ -7,8 +7,8 @@ core / kotlin.collections.List / select

select

- -inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.select(signer: PublicKey? = null, party: Party? = null): <ERROR CLASS>
+ +inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.select(signer: PublicKey? = null, party: Party? = null): <ERROR CLASS>

Filters the command list by type, party and public key all at once.



diff --git a/docs/build/html/api/core/require-that.html b/docs/build/html/api/core/require-that.html index dac23f1a48..fa8af52d18 100644 --- a/docs/build/html/api/core/require-that.html +++ b/docs/build/html/api/core/require-that.html @@ -7,8 +7,8 @@ core / requireThat

requireThat

- -inline fun <R> requireThat(body: Requirements.() -> R): R
+ +inline fun <R> requireThat(body: Requirements.() -> R): R


diff --git a/docs/build/html/api/core/to-ledger-transaction.html b/docs/build/html/api/core/to-ledger-transaction.html index 41832105eb..66ea75cbea 100644 --- a/docs/build/html/api/core/to-ledger-transaction.html +++ b/docs/build/html/api/core/to-ledger-transaction.html @@ -7,8 +7,8 @@ core / toLedgerTransaction

toLedgerTransaction

- -fun WireTransaction.toLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction
+ +fun WireTransaction.toLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Looks up identities and attachments from storage to generate a LedgerTransaction.

Exceptions

diff --git a/docs/build/html/api/core/verify-move-commands.html b/docs/build/html/api/core/verify-move-commands.html index 573ce80bb3..676aef74f8 100644 --- a/docs/build/html/api/core/verify-move-commands.html +++ b/docs/build/html/api/core/verify-move-commands.html @@ -7,8 +7,8 @@ core / verifyMoveCommands

verifyMoveCommands

- -inline fun <reified T : CommandData> verifyMoveCommands(inputs: List<OwnableState>, tx: TransactionForVerification): Unit
+ +inline fun <reified T : CommandData> verifyMoveCommands(inputs: List<OwnableState>, tx: TransactionForVerification): Unit

Simple functionality for verifying a move command. Verifies that each input has a signature from its owning key.

Parameters

diff --git a/docs/build/html/api/core/verify-to-ledger-transaction.html b/docs/build/html/api/core/verify-to-ledger-transaction.html index 92d7ac9642..6b541c925e 100644 --- a/docs/build/html/api/core/verify-to-ledger-transaction.html +++ b/docs/build/html/api/core/verify-to-ledger-transaction.html @@ -7,8 +7,8 @@ core / verifyToLedgerTransaction

verifyToLedgerTransaction

- -fun SignedTransaction.verifyToLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction
+ +fun SignedTransaction.verifyToLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction

Calls verify to check all required signatures are present, and then uses the passed IdentityService to call WireTransaction.toLedgerTransaction to look up well known identities from pubkeys.


diff --git a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/-init-.html b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/-init-.html index 1d519bd173..a585452d53 100644 --- a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/-init-.html +++ b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/-init-.html @@ -7,7 +7,7 @@ demos.protocols / AutoOfferProtocol / Handler / Callback / <init>

<init>

-Callback(success: (SignedTransaction) -> Unit)
+Callback(success: (SignedTransaction) -> Unit)


diff --git a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/index.html b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/index.html index 308f80f190..6a91988a5f 100644 --- a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/index.html +++ b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/index.html @@ -17,7 +17,7 @@ <init> -Callback(success: (SignedTransaction) -> Unit) +Callback(success: (SignedTransaction) -> Unit) @@ -45,7 +45,7 @@ onSuccess -fun onSuccess(st: SignedTransaction?): Unit +fun onSuccess(st: SignedTransaction?): Unit diff --git a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/on-success.html b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/on-success.html index b19ef01ac6..c2f8b282df 100644 --- a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/on-success.html +++ b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/-callback/on-success.html @@ -7,8 +7,8 @@ demos.protocols / AutoOfferProtocol / Handler / Callback / onSuccess

onSuccess

- -fun onSuccess(st: SignedTransaction?): Unit
+ +fun onSuccess(st: SignedTransaction?): Unit


diff --git a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-requester/index.html b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-requester/index.html index 1b345047a9..5dc9518e35 100644 --- a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-requester/index.html +++ b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-requester/index.html @@ -105,7 +105,7 @@ progress.

notUs -fun notUs(vararg parties: Party): List<Party> +fun notUs(vararg parties: Party): List<Party> diff --git a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-requester/not-us.html b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-requester/not-us.html index 8fa7e4ac6f..fac87cf4b7 100644 --- a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-requester/not-us.html +++ b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-requester/not-us.html @@ -7,8 +7,8 @@ demos.protocols / AutoOfferProtocol / Requester / notUs

notUs

- -fun notUs(vararg parties: Party): List<Party>
+ +fun notUs(vararg parties: Party): List<Party>


diff --git a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/index.html b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/index.html index ce654c8dc8..710a2e2ecd 100644 --- a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/index.html +++ b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/index.html @@ -123,13 +123,13 @@ progress.

processDeal -fun processDeal(party: NodeInfo, deal: StateAndRef<DealState>, date: LocalDate, sessionID: Long): Unit +fun processDeal(party: NodeInfo, deal: StateAndRef<DealState>, date: LocalDate, sessionID: Long): Unit processInterestRateSwap -fun processInterestRateSwap(party: NodeInfo, deal: StateAndRef<State>, date: LocalDate, sessionID: Long): Unit +fun processInterestRateSwap(party: NodeInfo, deal: StateAndRef<State>, date: LocalDate, sessionID: Long): Unit diff --git a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/process-deal.html b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/process-deal.html index 52312c8584..fd07e7cda7 100644 --- a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/process-deal.html +++ b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/process-deal.html @@ -7,8 +7,8 @@ demos.protocols / UpdateBusinessDayProtocol / Updater / processDeal

processDeal

- -fun processDeal(party: NodeInfo, deal: StateAndRef<DealState>, date: LocalDate, sessionID: Long): Unit
+ +fun processDeal(party: NodeInfo, deal: StateAndRef<DealState>, date: LocalDate, sessionID: Long): Unit


diff --git a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/process-interest-rate-swap.html b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/process-interest-rate-swap.html index f225914a97..e8f9ec0b19 100644 --- a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/process-interest-rate-swap.html +++ b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-updater/process-interest-rate-swap.html @@ -7,8 +7,8 @@ demos.protocols / UpdateBusinessDayProtocol / Updater / processInterestRateSwap

processInterestRateSwap

- -fun processInterestRateSwap(party: NodeInfo, deal: StateAndRef<State>, date: LocalDate, sessionID: Long): Unit
+ +fun processInterestRateSwap(party: NodeInfo, deal: StateAndRef<State>, date: LocalDate, sessionID: Long): Unit


diff --git a/docs/build/html/api/index-outline.html b/docs/build/html/api/index-outline.html index a5f31238bb..d0a1b8402d 100644 --- a/docs/build/html/api/index-outline.html +++ b/docs/build/html/api/index-outline.html @@ -41,11 +41,11 @@ abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
-abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
abstract fun queryStates(query: StatesQuery): List<StateRef>
@@ -63,11 +63,11 @@ APIServerImpl(node: AbstractNode)
fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
-fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
val node: AbstractNode
fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
@@ -91,7 +91,7 @@ val advertisedServices: Set<ServiceType>
lateinit var api: APIServer
val configuration: NodeConfiguration
-protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
+protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
val dir: Path
protected open fun findMyLocation(): PhysicalLocation?
lateinit var identity: IdentityService
@@ -251,17 +251,17 @@ -Amount(amount: BigDecimal, currency: Currency)
-Amount(pennies: Long, currency: Currency)
-fun compareTo(other: Amount): Int
+Amount(amount: BigDecimal, currency: Currency)
+Amount(pennies: Long, currency: Currency)
+fun compareTo(other: Amount): Int
val currency: Currency
-operator fun div(other: Long): Amount
-operator fun div(other: Int): Amount
-operator fun minus(other: Amount): Amount
+operator fun div(other: Long): Amount
+operator fun div(other: Int): Amount
+operator fun minus(other: Amount): Amount
val pennies: Long
-operator fun plus(other: Amount): Amount
-operator fun times(other: Long): Amount
-operator fun times(other: Int): Amount
+operator fun plus(other: Amount): Amount
+operator fun times(other: Long): Amount
+operator fun times(other: Int): Amount
fun toString(): String
@@ -316,7 +316,7 @@ -open fun extractFile(path: String, outputTo: OutputStream): Unit
+open fun extractFile(path: String, outputTo: OutputStream): Unit
abstract fun open(): InputStream
open fun openAsJAR(): JarInputStream
@@ -356,7 +356,7 @@ -AttachmentsClassLoader(attachments: List<Attachment>, parent: ClassLoader = ClassLoader.getSystemClassLoader())
+AttachmentsClassLoader(attachments: List<Attachment>, parent: ClassLoader = ClassLoader.getSystemClassLoader())
class OverlappingAttachments : Exception
-open fun applyRollConvention(testDate: LocalDate, dateRollConvention: DateRollConvention): LocalDate
+open fun applyRollConvention(testDate: LocalDate, dateRollConvention: DateRollConvention): LocalDate
val calendars: Array<out String>
val calendars: <ERROR CLASS>
-fun createGenericSchedule(startDate: LocalDate, period: Frequency, calendar: BusinessCalendar = BusinessCalendar.getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, periodOffset: Int? = null): List<LocalDate>
-open fun equals(other: Any?): Boolean
-fun getInstance(vararg calname: String): BusinessCalendar
+fun createGenericSchedule(startDate: LocalDate, period: Frequency, calendar: BusinessCalendar = BusinessCalendar.getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, periodOffset: Int? = null): List<LocalDate>
+open fun equals(other: Any?): Boolean
+fun getInstance(vararg calname: String): BusinessCalendar
open fun hashCode(): Int
val holidayDates: List<LocalDate>
-open fun isWorkingDay(date: LocalDate): Boolean
-fun moveBusinessDays(date: LocalDate, direction: DateRollDirection, i: Int): LocalDate
-fun parseDateFromString(it: String): LocalDate
+open fun isWorkingDay(date: LocalDate): Boolean
+fun moveBusinessDays(date: LocalDate, direction: DateRollDirection, i: Int): LocalDate
+fun parseDateFromString(it: String): LocalDate
@@ -548,7 +548,7 @@ -Exit(amount: Amount)
+Exit(amount: Amount)
val amount: Amount
@@ -589,7 +589,7 @@ -State(deposit: PartyAndReference, amount: Amount, owner: PublicKey)
+State(deposit: PartyAndReference, amount: Amount, owner: PublicKey)
val amount: Amount
val contract: Cash
val deposit: PartyAndReference
@@ -599,10 +599,10 @@ -fun generateIssue(tx: TransactionBuilder, amount: Amount, at: PartyAndReference, owner: PublicKey): Unit
-fun generateSpend(tx: TransactionBuilder, amount: Amount, to: PublicKey, cashStates: List<StateAndRef<State>>, onlyFromParties: Set<Party>? = null): List<PublicKey>
+fun generateIssue(tx: TransactionBuilder, amount: Amount, at: PartyAndReference, owner: PublicKey): Unit
+fun generateSpend(tx: TransactionBuilder, amount: Amount, to: PublicKey, cashStates: List<StateAndRef<State>>, onlyFromParties: Set<Party>? = null): List<PublicKey>
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -656,8 +656,8 @@ -Command(data: CommandData, key: PublicKey)
-Command(value: CommandData, signers: List<PublicKey>)
+Command(data: CommandData, key: PublicKey)
+Command(value: CommandData, signers: List<PublicKey>)
val signers: List<PublicKey>
fun toString(): String
val value: CommandData
@@ -729,15 +729,15 @@ -State(issuance: PartyAndReference, owner: PublicKey, faceValue: Amount, maturityDate: Instant)
+State(issuance: PartyAndReference, owner: PublicKey, faceValue: Amount, maturityDate: Instant)
val contract: CommercialPaper
val faceValue: Amount
val issuance: PartyAndReference
val maturityDate: Instant
val owner: PublicKey
fun toString(): String
-fun withFaceValue(newFaceValue: Amount): <ERROR CLASS>
-fun withIssuance(newIssuance: PartyAndReference): <ERROR CLASS>
+fun withFaceValue(newFaceValue: Amount): <ERROR CLASS>
+fun withIssuance(newIssuance: PartyAndReference): <ERROR CLASS>
fun withMaturityDate(newMaturityDate: Instant): <ERROR CLASS>
fun withNewOwner(newOwner: PublicKey): <ERROR CLASS>
fun withOwner(newOwner: PublicKey): <ERROR CLASS>
@@ -745,11 +745,11 @@ -fun generateIssue(issuance: PartyAndReference, faceValue: Amount, maturityDate: Instant): TransactionBuilder
-fun generateMove(tx: TransactionBuilder, paper: StateAndRef<State>, newOwner: PublicKey): Unit
-fun generateRedeem(tx: TransactionBuilder, paper: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
+fun generateIssue(issuance: PartyAndReference, faceValue: Amount, maturityDate: Instant): TransactionBuilder
+fun generateMove(tx: TransactionBuilder, paper: StateAndRef<State>, newOwner: PublicKey): Unit
+fun generateRedeem(tx: TransactionBuilder, paper: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -789,7 +789,7 @@ abstract val legalContractReference: SecureHash
-abstract fun verify(tx: TransactionForVerification): Unit
+abstract fun verify(tx: TransactionForVerification): Unit
@@ -849,7 +849,7 @@ -Campaign(owner: PublicKey, name: String, target: Amount, closingTime: Instant)
+Campaign(owner: PublicKey, name: String, target: Amount, closingTime: Instant)
val closingTime: Instant
val name: String
val owner: PublicKey
@@ -913,7 +913,7 @@ -Pledge(owner: PublicKey, amount: Amount)
+Pledge(owner: PublicKey, amount: Amount)
val amount: Amount
val owner: PublicKey
@@ -936,11 +936,11 @@ -fun generateClose(tx: TransactionBuilder, campaign: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
-fun generatePledge(tx: TransactionBuilder, campaign: StateAndRef<State>, subscriber: PublicKey): Unit
-fun generateRegister(owner: PartyAndReference, fundingTarget: Amount, fundingName: String, closingTime: Instant): TransactionBuilder
+fun generateClose(tx: TransactionBuilder, campaign: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
+fun generatePledge(tx: TransactionBuilder, campaign: StateAndRef<State>, subscriber: PublicKey): Unit
+fun generateRegister(owner: PartyAndReference, fundingTarget: Amount, fundingName: String, closingTime: Instant): TransactionBuilder
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -1159,7 +1159,7 @@ abstract fun generateAgreement(): TransactionBuilder
abstract val parties: Array<Party>
abstract val ref: String
-abstract fun withPublicKey(before: Party, after: PublicKey): DealState
+abstract fun withPublicKey(before: Party, after: PublicKey): DealState
@@ -1196,7 +1196,7 @@ -LegallyIdentifiable(signer: Party, bits: ByteArray, covering: Int)
+LegallyIdentifiable(signer: Party, bits: ByteArray, covering: Int)
val signer: Party
@@ -1266,9 +1266,9 @@ -fun generateInitial(owner: PartyAndReference, magicNumber: Int): TransactionBuilder
+fun generateInitial(owner: PartyAndReference, magicNumber: Int): TransactionBuilder
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -1419,7 +1419,7 @@ -Expression(expr: String)
+Expression(expr: String)
val expr: String
@@ -1432,7 +1432,7 @@ -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Expression
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Expression
@@ -1444,7 +1444,7 @@ -fun serialize(expr: Expression, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(expr: Expression, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
@@ -1460,7 +1460,7 @@ const val TOPIC: String
protected fun convert(wire: ByteArray): Attachment
protected fun load(txid: SecureHash): Attachment?
-protected fun maybeWriteToDisk(downloaded: List<Attachment>): Unit
+protected fun maybeWriteToDisk(downloaded: List<Attachment>): Unit
protected val queryTopic: String
@@ -1560,7 +1560,7 @@ -Fix(of: FixOf, value: BigDecimal)
+Fix(of: FixOf, value: BigDecimal)
val of: FixOf
val value: BigDecimal
@@ -1574,7 +1574,7 @@ -FixOf(name: String, forDay: LocalDate, ofTenor: Tenor)
+FixOf(name: String, forDay: LocalDate, ofTenor: Tenor)
val forDay: LocalDate
val name: String
val ofTenor: Tenor
@@ -1589,7 +1589,7 @@ -abstract fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
+abstract fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
abstract fun nextFixingOf(): FixOf?
@@ -1619,7 +1619,7 @@ -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, rate: Rate)
val CSVHeader: String
val flow: Amount
fun toString(): String
@@ -1646,10 +1646,10 @@ -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, rate: Rate)
val CSVHeader: String
fun asCSV(): String
-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 = this.notional, rate: Rate = this.rate): FloatingRatePaymentEvent
fun equals(other: Any?): Boolean
val fixingDate: LocalDate
val flow: Amount
@@ -1675,7 +1675,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -1687,7 +1687,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -1699,7 +1699,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -1711,7 +1711,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -1723,7 +1723,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -1735,12 +1735,12 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
val annualCompoundCount: Int
-abstract fun offset(d: LocalDate): LocalDate
+abstract fun offset(d: LocalDate): LocalDate
@@ -1769,7 +1769,7 @@ abstract fun partyFromKey(key: PublicKey): Party?
abstract fun partyFromName(name: String): Party?
-abstract fun registerIdentity(party: Party): Unit
+abstract fun registerIdentity(party: Party): Unit
@@ -1802,7 +1802,7 @@ InMemoryIdentityService()
fun partyFromKey(key: PublicKey): Party?
fun partyFromName(name: String): Party?
-fun registerIdentity(party: Party): Unit
+fun registerIdentity(party: Party): Unit
@@ -1934,7 +1934,7 @@ open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
open fun get(): <ERROR CLASS>
open fun get(serviceType: ServiceType): <ERROR CLASS>
-open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
open val networkMapNodes: List<NodeInfo>
open val partyNodes: List<NodeInfo>
fun processUpdatePush(req: Update): Unit
@@ -1977,7 +1977,7 @@ -InsufficientBalanceException(amountMissing: Amount)
+InsufficientBalanceException(amountMissing: Amount)
val amountMissing: Amount
@@ -1999,7 +1999,7 @@ -Calculation(expression: Expression, floatingLegPaymentSchedule: Map<LocalDate, FloatingRatePaymentEvent>, fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>)
+Calculation(expression: Expression, floatingLegPaymentSchedule: Map<LocalDate, FloatingRatePaymentEvent>, fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>)
fun applyFixing(date: LocalDate, newRate: FixedRate): Calculation
val expression: Expression
val fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>
@@ -2076,7 +2076,7 @@ -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, 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)
val addressForTransfers: String
val baseCurrency: Currency
val dailyInterestAmount: Expression
@@ -2105,7 +2105,7 @@ -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, paymentFrequency: Frequency, effectiveDate: LocalDate, effectiveDateAdjustment: DateRollConvention?, terminationDate: LocalDate, terminationDateAdjustment: DateRollConvention?, dayCountBasisDay: DayCountBasisDay, dayCountBasisYear: DayCountBasisYear, dayInMonth: Int, paymentRule: PaymentRule, paymentDelay: Int, paymentCalendar: BusinessCalendar, interestPeriodAdjustment: AccrualAdjustment)
val dayCountBasisDay: DayCountBasisDay
val dayCountBasisYear: DayCountBasisYear
val dayInMonth: Int
@@ -2133,8 +2133,8 @@ -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)
-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
+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)
+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
open fun equals(other: Any?): Boolean
var fixedRate: FixedRate
var fixedRatePayer: Party
@@ -2152,8 +2152,8 @@ -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)
-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
+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)
+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
open fun equals(other: Any?): Boolean
var fixingCalendar: BusinessCalendar
var fixingPeriod: DateOffset
@@ -2183,18 +2183,18 @@ val calculation: Calculation
val common: Common
val contract: InterestRateSwap
-fun evaluateCalculation(businessDate: LocalDate, expression: Expression = calculation.expression): Any
+fun evaluateCalculation(businessDate: LocalDate, expression: Expression = calculation.expression): Any
val fixedLeg: FixedLeg
val floatingLeg: FloatingLeg
fun generateAgreement(): TransactionBuilder
-fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
+fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
fun isRelevant(ourKeys: Set<PublicKey>): Boolean
fun nextFixingOf(): FixOf?
val parties: Array<Party>
fun prettyPrint(): String
val ref: String
val thread: <ERROR CLASS>
-fun withPublicKey(before: Party, after: PublicKey): DealState
+fun withPublicKey(before: Party, after: PublicKey): DealState
@@ -2203,10 +2203,10 @@ fun checkRates(legs: Array<CommonLeg>): Boolean
fun checkSchedules(legs: Array<CommonLeg>): Boolean
fun generateAgreement(floatingLeg: FloatingLeg, fixedLeg: FixedLeg, calculation: Calculation, common: Common): TransactionBuilder
-fun generateFix(tx: TransactionBuilder, irs: StateAndRef<State>, fixing: <ERROR CLASS><LocalDate, Rate>): Unit
+fun generateFix(tx: TransactionBuilder, irs: StateAndRef<State>, fixing: <ERROR CLASS><LocalDate, Rate>): Unit
fun getFloatingLegPaymentsDifferences(payments1: Map<LocalDate, Event>, payments2: Map<LocalDate, Event>): List<<ERROR CLASS><LocalDate, <ERROR CLASS><FloatingRatePaymentEvent, FloatingRatePaymentEvent>>>
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -2317,7 +2317,7 @@ -fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
@@ -2398,12 +2398,12 @@ -LedgerTransaction(inputs: List<StateRef>, attachments: List<Attachment>, outputs: List<ContractState>, commands: List<AuthenticatedObject<CommandData>>, id: SecureHash)
+LedgerTransaction(inputs: List<StateRef>, attachments: List<Attachment>, outputs: List<ContractState>, commands: List<AuthenticatedObject<CommandData>>, id: SecureHash)
val attachments: List<Attachment>
val commands: List<AuthenticatedObject<CommandData>>
val id: SecureHash
val inputs: List<StateRef>
-fun <T : ContractState> outRef(index: Int): StateAndRef<T>
+fun <T : ContractState> outRef(index: Int): StateAndRef<T>
val outputs: List<ContractState>
@@ -2430,7 +2430,7 @@ -abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean
+abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean
abstract val thread: SecureHash
@@ -2504,11 +2504,11 @@ -MockIdentityService(identities: List<Party>)
+MockIdentityService(identities: List<Party>)
val identities: List<Party>
fun partyFromKey(key: PublicKey): Party?
fun partyFromName(name: String): Party?
-fun registerIdentity(party: Party): Unit
+fun registerIdentity(party: Party): Unit
@@ -2601,7 +2601,7 @@ fun addRegistration(node: NodeInfo): Unit
-fun deleteRegistration(identity: Party): Boolean
+fun deleteRegistration(identity: Party): Boolean
@@ -2666,7 +2666,7 @@ abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
abstract fun get(): Collection<NodeInfo>
abstract fun get(serviceType: ServiceType): Collection<NodeInfo>
-abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
val logger: <ERROR CLASS>
abstract val networkMapNodes: List<NodeInfo>
open fun nodeForPartyName(name: String): NodeInfo?
@@ -2727,7 +2727,7 @@ -QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
+QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
val identity: Party
@@ -2928,7 +2928,7 @@ -NodeInfo(address: SingleMessageRecipient, identity: Party, advertisedServices: Set<ServiceType> = emptySet(), physicalLocation: PhysicalLocation? = null)
+NodeInfo(address: SingleMessageRecipient, identity: Party, advertisedServices: Set<ServiceType> = emptySet(), physicalLocation: PhysicalLocation? = null)
val address: SingleMessageRecipient
var advertisedServices: Set<ServiceType>
val identity: Party
@@ -2952,10 +2952,10 @@ -FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
+FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
val factory: InterpolatorFactory
val fixes: List<Fix>
-operator fun get(fixOf: FixOf): Fix?
+operator fun get(fixOf: FixOf): Fix?
val size: Int
@@ -2968,11 +2968,11 @@ -InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
+InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
val calendar: BusinessCalendar
val date: LocalDate
val factory: InterpolatorFactory
-fun getRate(tenor: Tenor): BigDecimal?
+fun getRate(tenor: Tenor): BigDecimal?
val inputRates: Map<Tenor, BigDecimal>
val size: Int
@@ -2986,11 +2986,11 @@ -Oracle(identity: Party, signingKey: KeyPair)
+Oracle(identity: Party, signingKey: KeyPair)
val identity: Party
var knownFixes: FixContainer
-fun query(queries: List<FixOf>): List<Fix>
-fun sign(wtx: WireTransaction): LegallyIdentifiable
+fun query(queries: List<FixOf>): List<Fix>
+fun sign(wtx: WireTransaction): LegallyIdentifiable
@@ -3020,7 +3020,7 @@ -UnknownFix(fix: FixOf)
+UnknownFix(fix: FixOf)
val fix: FixOf
fun toString(): String
@@ -3105,7 +3105,7 @@ -NodeTimestamperService(net: MessagingService, identity: Party, signingKey: KeyPair, clock: Clock = Clock.systemDefaultZone(), tolerance: Duration = 30.seconds)
+NodeTimestamperService(net: MessagingService, identity: Party, signingKey: KeyPair, clock: Clock = Clock.systemDefaultZone(), tolerance: Duration = 30.seconds)
val TIMESTAMPING_PROTOCOL_TOPIC: String
val clock: Clock
val identity: Party
@@ -3126,9 +3126,9 @@ NodeWalletService(services: ServiceHub)
val cashBalances: Map<Currency, Amount>
val currentWallet: Wallet
-fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
+fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
-fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+fun notifyAll(txns: Iterable<WireTransaction>): Wallet
@@ -3175,7 +3175,7 @@ abstract val owner: PublicKey
-abstract fun withNewOwner(newOwner: PublicKey): <ERROR CLASS><CommandData, OwnableState>
+abstract fun withNewOwner(newOwner: PublicKey): <ERROR CLASS><CommandData, OwnableState>
@@ -3187,11 +3187,11 @@ -Party(name: String, owningKey: PublicKey)
+Party(name: String, owningKey: PublicKey)
val name: String
val owningKey: PublicKey
-fun ref(bytes: OpaqueBytes): PartyAndReference
-fun ref(vararg bytes: Byte): PartyAndReference
+fun ref(bytes: OpaqueBytes): PartyAndReference
+fun ref(vararg bytes: Byte): PartyAndReference
fun toString(): String
@@ -3204,7 +3204,7 @@ -PartyAndReference(party: Party, reference: OpaqueBytes)
+PartyAndReference(party: Party, reference: OpaqueBytes)
val party: Party
val reference: OpaqueBytes
fun toString(): String
@@ -3536,7 +3536,7 @@ -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, rate: Rate)
val CSVHeader: String
val accrualEndDate: LocalDate
val accrualStartDate: LocalDate
@@ -3562,7 +3562,7 @@ -RatesFixProtocol(tx: TransactionBuilder, oracle: NodeInfo, fixOf: FixOf, expectedRate: BigDecimal, rateTolerance: BigDecimal, progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name))
+RatesFixProtocol(tx: TransactionBuilder, oracle: NodeInfo, fixOf: FixOf, expectedRate: BigDecimal, rateTolerance: BigDecimal, progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name))
class FixOutOfRange : Exception
@@ -3740,8 +3740,8 @@ -ResolveTransactionsProtocol(stx: SignedTransaction, otherSide: SingleMessageRecipient)
-ResolveTransactionsProtocol(wtx: WireTransaction, otherSide: SingleMessageRecipient)
+ResolveTransactionsProtocol(stx: SignedTransaction, otherSide: SingleMessageRecipient)
+ResolveTransactionsProtocol(wtx: WireTransaction, otherSide: SingleMessageRecipient)
ResolveTransactionsProtocol(txHashes: Set<SecureHash>, otherSide: SingleMessageRecipient)
class ExcessivelyLargeTransactionGraph : Exception
@@ -4048,7 +4048,7 @@ -StateAndRef(state: T, ref: StateRef)
+StateAndRef(state: T, ref: StateRef)
val ref: StateRef
val state: T
@@ -4134,7 +4134,7 @@ -StateRef(txhash: SecureHash, index: Int)
+StateRef(txhash: SecureHash, index: Int)
val index: Int
fun toString(): String
val txhash: SecureHash
@@ -4217,7 +4217,7 @@ -StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
+StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
open val attachments: AttachmentStorage
open val checkpointStorage: CheckpointStorage
open val myLegalIdentity: Party
@@ -4236,7 +4236,7 @@ -Tenor(name: String)
+Tenor(name: String)
enum class TimeUnit
    @@ -4253,7 +4253,7 @@
-fun daysToMaturity(startDate: LocalDate, calendar: BusinessCalendar): Int
+fun daysToMaturity(startDate: LocalDate, calendar: BusinessCalendar): Int
val name: String
fun toString(): String
@@ -4282,8 +4282,8 @@ -TimestampCommand(time: Instant, tolerance: Duration)
-TimestampCommand(after: Instant?, before: Instant?)
+TimestampCommand(time: Instant, tolerance: Duration)
+TimestampCommand(after: Instant?, before: Instant?)
val after: Instant?
val before: Instant?
val midpoint: Instant
@@ -4300,7 +4300,7 @@ object Type : ServiceType
abstract val identity: Party
-abstract fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
+abstract fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
@@ -4359,7 +4359,7 @@ -TimestampingProtocol(node: NodeInfo, wtxBytes: SerializedBytes<WireTransaction>, progressTracker: ProgressTracker = TimestampingProtocol.tracker())
+TimestampingProtocol(node: NodeInfo, wtxBytes: SerializedBytes<WireTransaction>, progressTracker: ProgressTracker = TimestampingProtocol.tracker())
class Client : TimestamperService
@@ -4383,7 +4383,7 @@ -Request(tx: SerializedBytes<WireTransaction>, replyTo: MessageRecipients, sessionID: Long)
+Request(tx: SerializedBytes<WireTransaction>, replyTo: MessageRecipients, sessionID: Long)
val tx: SerializedBytes<WireTransaction>
@@ -4480,27 +4480,27 @@ -TransactionBuilder(inputs: MutableList<StateRef> = arrayListOf(), attachments: MutableList<SecureHash> = arrayListOf(), outputs: MutableList<ContractState> = arrayListOf(), commands: MutableList<Command> = arrayListOf())
-fun addAttachment(attachment: Attachment): Unit
-fun addCommand(arg: Command): Unit
-fun addCommand(data: CommandData, vararg keys: PublicKey): <ERROR CLASS>
-fun addCommand(data: CommandData, keys: List<PublicKey>): Unit
-fun addInputState(ref: StateRef): Unit
-fun addOutputState(state: ContractState): Unit
-fun addSignatureUnchecked(sig: WithKey): Unit
+TransactionBuilder(inputs: MutableList<StateRef> = arrayListOf(), attachments: MutableList<SecureHash> = arrayListOf(), outputs: MutableList<ContractState> = arrayListOf(), commands: MutableList<Command> = arrayListOf())
+fun addAttachment(attachment: Attachment): Unit
+fun addCommand(arg: Command): Unit
+fun addCommand(data: CommandData, vararg keys: PublicKey): <ERROR CLASS>
+fun addCommand(data: CommandData, keys: List<PublicKey>): Unit
+fun addInputState(ref: StateRef): Unit
+fun addOutputState(state: ContractState): Unit
+fun addSignatureUnchecked(sig: WithKey): Unit
fun attachments(): List<SecureHash>
-fun checkAndAddSignature(sig: WithKey): Unit
-fun checkSignature(sig: WithKey): Unit
+fun checkAndAddSignature(sig: WithKey): Unit
+fun checkSignature(sig: WithKey): Unit
fun commands(): List<Command>
fun inputStates(): List<StateRef>
fun outputStates(): List<ContractState>
-fun setTime(time: Instant, authenticatedBy: Party, timeTolerance: Duration): Unit
-fun signWith(key: KeyPair): Unit
+fun setTime(time: Instant, authenticatedBy: Party, timeTolerance: Duration): Unit
+fun signWith(key: KeyPair): Unit
val time: TimestampCommand?
-fun timestamp(timestamper: TimestamperService, clock: Clock = Clock.systemUTC()): Unit
-fun toSignedTransaction(checkSufficientSignatures: Boolean = true): SignedTransaction
+fun timestamp(timestamper: TimestamperService, clock: Clock = Clock.systemUTC()): Unit
+fun toSignedTransaction(checkSufficientSignatures: Boolean = true): SignedTransaction
fun toWireTransaction(): WireTransaction
-fun withItems(vararg items: Any): TransactionBuilder
+fun withItems(vararg items: Any): TransactionBuilder
@@ -4512,7 +4512,7 @@ -TransactionConflictException(conflictRef: StateRef, tx1: LedgerTransaction, tx2: LedgerTransaction)
+TransactionConflictException(conflictRef: StateRef, tx1: LedgerTransaction, tx2: LedgerTransaction)
val conflictRef: StateRef
val tx1: LedgerTransaction
val tx2: LedgerTransaction
@@ -4527,7 +4527,7 @@ -TransactionForVerification(inStates: List<ContractState>, outStates: List<ContractState>, attachments: List<Attachment>, commands: List<AuthenticatedObject<CommandData>>, origHash: SecureHash)
+TransactionForVerification(inStates: List<ContractState>, outStates: List<ContractState>, attachments: List<Attachment>, commands: List<AuthenticatedObject<CommandData>>, origHash: SecureHash)
data class InOutGroup<T : ContractState, K : Any>
val attachments: List<Attachment>
val commands: List<AuthenticatedObject<CommandData>>
-fun equals(other: Any?): Boolean
-fun getTimestampBy(timestampingAuthority: Party): TimestampCommand?
-fun <T : ContractState, K : Any> groupStates(ofType: Class<T>, selector: (T) -> K): List<InOutGroup<T, K>>
-inline fun <reified T : ContractState, K : Any> groupStates(selector: (T) -> K): List<InOutGroup<T, K>>
-fun <T : ContractState, K : Any> groupStatesInternal(inGroups: Map<K, List<T>>, outGroups: Map<K, List<T>>): List<InOutGroup<T, K>>
+fun equals(other: Any?): Boolean
+fun getTimestampBy(timestampingAuthority: Party): TimestampCommand?
+fun <T : ContractState, K : Any> groupStates(ofType: Class<T>, selector: (T) -> K): List<InOutGroup<T, K>>
+inline fun <reified T : ContractState, K : Any> groupStates(selector: (T) -> K): List<InOutGroup<T, K>>
+fun <T : ContractState, K : Any> groupStatesInternal(inGroups: Map<K, List<T>>, outGroups: Map<K, List<T>>): List<InOutGroup<T, K>>
fun hashCode(): Int
val inStates: List<ContractState>
val origHash: SecureHash
@@ -4566,7 +4566,7 @@ -TransactionGraphSearch(transactions: Map<SecureHash, SignedTransaction>, startPoints: List<WireTransaction>)
+TransactionGraphSearch(transactions: Map<SecureHash, SignedTransaction>, startPoints: List<WireTransaction>)
class Query
@@ -4723,7 +4723,7 @@ -Floater(otherSide: SingleMessageRecipient, otherSessionID: Long, timestampingAuthority: NodeInfo, dealToFix: StateAndRef<T>, myKeyPair: KeyPair, sessionID: Long, progressTracker: ProgressTracker = Primary.tracker())
+Floater(otherSide: SingleMessageRecipient, otherSessionID: Long, timestampingAuthority: NodeInfo, dealToFix: StateAndRef<T>, myKeyPair: KeyPair, sessionID: Long, progressTracker: ProgressTracker = Primary.tracker())
open val progressTracker: ProgressTracker
val sessionID: Long
@@ -4780,10 +4780,10 @@ val otherSide: SingleMessageRecipient
val payload: U
open val progressTracker: ProgressTracker
-open fun signWithOurKey(partialTX: SignedTransaction): WithKey
+open fun signWithOurKey(partialTX: SignedTransaction): WithKey
val timestampingAuthority: NodeInfo
fun tracker(): <ERROR CLASS>
-fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction
+fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction
@@ -4795,7 +4795,7 @@ -Secondary(otherSide: SingleMessageRecipient, timestampingAuthority: Party, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())
+Secondary(otherSide: SingleMessageRecipient, timestampingAuthority: Party, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())
object RECEIVING : Step
object RECORDING : Step
object SIGNING : Step
@@ -4860,7 +4860,7 @@ -Buyer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long)
+Buyer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long)
object RECEIVING : Step
object SIGNING : Step
object SWAPPING_SIGNATURES : Step
@@ -4883,7 +4883,7 @@ -Seller(otherSide: SingleMessageRecipient, timestampingAuthority: NodeInfo, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long, progressTracker: ProgressTracker = Seller.tracker())
+Seller(otherSide: SingleMessageRecipient, timestampingAuthority: NodeInfo, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long, progressTracker: ProgressTracker = Seller.tracker())
object AWAITING_PROPOSAL : Step
object SENDING_SIGS : Step
object SIGNING : Step
@@ -4896,7 +4896,7 @@ val otherSide: SingleMessageRecipient
val price: Amount
open val progressTracker: ProgressTracker
-open fun signWithOurKey(partialTX: SignedTransaction): WithKey
+open fun signWithOurKey(partialTX: SignedTransaction): WithKey
val timestampingAuthority: NodeInfo
fun tracker(): ProgressTracker
@@ -4910,7 +4910,7 @@ -SellerTradeInfo(assetForSale: StateAndRef<OwnableState>, price: Amount, sellerOwnerKey: PublicKey, sessionID: Long)
+SellerTradeInfo(assetForSale: StateAndRef<OwnableState>, price: Amount, sellerOwnerKey: PublicKey, sessionID: Long)
val assetForSale: StateAndRef<OwnableState>
val price: Amount
val sellerOwnerKey: PublicKey
@@ -4941,13 +4941,13 @@ -UnacceptablePriceException(givenPrice: Amount)
+UnacceptablePriceException(givenPrice: Amount)
val givenPrice: Amount
-fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
-fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
+fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
+fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
@@ -4960,7 +4960,7 @@ TypeOnlyCommandData()
-open fun equals(other: Any?): Boolean
+open fun equals(other: Any?): Boolean
open fun hashCode(): <ERROR CLASS>
@@ -5062,8 +5062,8 @@ fun call(): Boolean
val date: LocalDate
fun otherParty(deal: DealState): NodeInfo
-fun processDeal(party: NodeInfo, deal: StateAndRef<DealState>, date: LocalDate, sessionID: Long): Unit
-fun processInterestRateSwap(party: NodeInfo, deal: StateAndRef<State>, date: LocalDate, sessionID: Long): Unit
+fun processDeal(party: NodeInfo, deal: StateAndRef<DealState>, date: LocalDate, sessionID: Long): Unit
+fun processInterestRateSwap(party: NodeInfo, deal: StateAndRef<State>, date: LocalDate, sessionID: Long): Unit
val progressTracker: ProgressTracker
val sessionID: Long
fun tracker(): ProgressTracker
@@ -5096,7 +5096,7 @@ -WalletImpl(states: List<StateAndRef<ContractState>>)
+WalletImpl(states: List<StateAndRef<ContractState>>)
val cashBalances: Map<Currency, Amount>
val states: List<StateAndRef<ContractState>>
@@ -5114,9 +5114,9 @@ abstract val currentWallet: Wallet
abstract val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>
-open fun notify(tx: WireTransaction): Wallet
-abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
-open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
+open fun notify(tx: WireTransaction): Wallet
+abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
@@ -5141,14 +5141,14 @@ -WireTransaction(inputs: List<StateRef>, attachments: List<SecureHash>, outputs: List<ContractState>, commands: List<Command>)
+WireTransaction(inputs: List<StateRef>, attachments: List<SecureHash>, outputs: List<ContractState>, commands: List<Command>)
val attachments: List<SecureHash>
val commands: List<Command>
-fun deserialize(bits: SerializedBytes<WireTransaction>, kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
+fun deserialize(bits: SerializedBytes<WireTransaction>, kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
val id: SecureHash
val inputs: List<StateRef>
-fun <T : ContractState> outRef(index: Int): StateAndRef<T>
-fun <T : ContractState> outRef(state: ContractState): StateAndRef<T>
+fun <T : ContractState> outRef(index: Int): StateAndRef<T>
+fun <T : ContractState> outRef(state: ContractState): StateAndRef<T>
val outputs: List<ContractState>
val serialized: SerializedBytes<WireTransaction>
fun toString(): String
@@ -5163,8 +5163,8 @@ -fun read(kryo: <ERROR CLASS>, input: <ERROR CLASS>, type: Class<WireTransaction>): WireTransaction
-fun write(kryo: <ERROR CLASS>, output: <ERROR CLASS>, obj: WireTransaction): Unit
+fun read(kryo: <ERROR CLASS>, input: <ERROR CLASS>, type: Class<WireTransaction>): WireTransaction
+fun write(kryo: <ERROR CLASS>, output: <ERROR CLASS>, obj: WireTransaction): Unit
@@ -5207,8 +5207,8 @@ operator fun KeyPair.component2(): PublicKey
fun KeyPair.signWithECDSA(bitsToSign: ByteArray): WithKey
fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes): WithKey
-fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party): LegallyIdentifiable
-fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): LegallyIdentifiable
+fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party): LegallyIdentifiable
+fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): LegallyIdentifiable
@@ -5246,7 +5246,7 @@ -fun LocalDate.isWorkingDay(accordingToCalendar: BusinessCalendar): Boolean
+fun LocalDate.isWorkingDay(accordingToCalendar: BusinessCalendar): Boolean
@@ -5379,7 +5379,7 @@ fun Iterable<Amount>.sumOrNull(): Nothing?
fun Iterable<Amount>.sumOrThrow(): <ERROR CLASS>
-fun Iterable<Amount>.sumOrZero(currency: Currency): Amount
+fun Iterable<Amount>.sumOrZero(currency: Currency): Amount
@@ -5392,9 +5392,9 @@ fun Iterable<ContractState>.sumCash(): <ERROR CLASS>
-fun Iterable<ContractState>.sumCashBy(owner: PublicKey): <ERROR CLASS>
+fun Iterable<ContractState>.sumCashBy(owner: PublicKey): <ERROR CLASS>
fun Iterable<ContractState>.sumCashOrNull(): <ERROR CLASS>
-fun Iterable<ContractState>.sumCashOrZero(currency: Currency): <ERROR CLASS>
+fun Iterable<ContractState>.sumCashOrZero(currency: Currency): <ERROR CLASS>
@@ -5407,12 +5407,12 @@ inline fun <reified T : ContractState> List<StateAndRef<ContractState>>.filterStatesOfType(): List<StateAndRef<T>>
-fun List<AuthenticatedObject<CommandData>>.getTimestampBy(timestampingAuthority: Party): TimestampCommand?
-fun List<AuthenticatedObject<CommandData>>.getTimestampByName(vararg names: String): TimestampCommand?
+fun List<AuthenticatedObject<CommandData>>.getTimestampBy(timestampingAuthority: Party): TimestampCommand?
+fun List<AuthenticatedObject<CommandData>>.getTimestampByName(vararg names: String): TimestampCommand?
fun <T> List<T>.indexOfOrThrow(item: T): Int
inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.requireSingleCommand(): <ERROR CLASS>
-fun List<AuthenticatedObject<CommandData>>.requireSingleCommand(klass: Class<out CommandData>): <ERROR CLASS>
-inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.select(signer: PublicKey? = null, party: Party? = null): <ERROR CLASS>
+fun List<AuthenticatedObject<CommandData>>.requireSingleCommand(klass: Class<out CommandData>): <ERROR CLASS>
+inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.select(signer: PublicKey? = null, party: Party? = null): <ERROR CLASS>
@@ -5436,11 +5436,11 @@ abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
-abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
abstract fun queryStates(query: StatesQuery): List<StateRef>
@@ -5458,11 +5458,11 @@ APIServerImpl(node: AbstractNode)
fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
-fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
val node: AbstractNode
fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
@@ -5695,7 +5695,7 @@ -Exit(amount: Amount)
+Exit(amount: Amount)
val amount: Amount
@@ -5736,7 +5736,7 @@ -State(deposit: PartyAndReference, amount: Amount, owner: PublicKey)
+State(deposit: PartyAndReference, amount: Amount, owner: PublicKey)
val amount: Amount
val contract: Cash
val deposit: PartyAndReference
@@ -5746,10 +5746,10 @@ -fun generateIssue(tx: TransactionBuilder, amount: Amount, at: PartyAndReference, owner: PublicKey): Unit
-fun generateSpend(tx: TransactionBuilder, amount: Amount, to: PublicKey, cashStates: List<StateAndRef<State>>, onlyFromParties: Set<Party>? = null): List<PublicKey>
+fun generateIssue(tx: TransactionBuilder, amount: Amount, at: PartyAndReference, owner: PublicKey): Unit
+fun generateSpend(tx: TransactionBuilder, amount: Amount, to: PublicKey, cashStates: List<StateAndRef<State>>, onlyFromParties: Set<Party>? = null): List<PublicKey>
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -5817,15 +5817,15 @@ -State(issuance: PartyAndReference, owner: PublicKey, faceValue: Amount, maturityDate: Instant)
+State(issuance: PartyAndReference, owner: PublicKey, faceValue: Amount, maturityDate: Instant)
val contract: CommercialPaper
val faceValue: Amount
val issuance: PartyAndReference
val maturityDate: Instant
val owner: PublicKey
fun toString(): String
-fun withFaceValue(newFaceValue: Amount): <ERROR CLASS>
-fun withIssuance(newIssuance: PartyAndReference): <ERROR CLASS>
+fun withFaceValue(newFaceValue: Amount): <ERROR CLASS>
+fun withIssuance(newIssuance: PartyAndReference): <ERROR CLASS>
fun withMaturityDate(newMaturityDate: Instant): <ERROR CLASS>
fun withNewOwner(newOwner: PublicKey): <ERROR CLASS>
fun withOwner(newOwner: PublicKey): <ERROR CLASS>
@@ -5833,11 +5833,11 @@ -fun generateIssue(issuance: PartyAndReference, faceValue: Amount, maturityDate: Instant): TransactionBuilder
-fun generateMove(tx: TransactionBuilder, paper: StateAndRef<State>, newOwner: PublicKey): Unit
-fun generateRedeem(tx: TransactionBuilder, paper: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
+fun generateIssue(issuance: PartyAndReference, faceValue: Amount, maturityDate: Instant): TransactionBuilder
+fun generateMove(tx: TransactionBuilder, paper: StateAndRef<State>, newOwner: PublicKey): Unit
+fun generateRedeem(tx: TransactionBuilder, paper: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -5858,7 +5858,7 @@ -Campaign(owner: PublicKey, name: String, target: Amount, closingTime: Instant)
+Campaign(owner: PublicKey, name: String, target: Amount, closingTime: Instant)
val closingTime: Instant
val name: String
val owner: PublicKey
@@ -5922,7 +5922,7 @@ -Pledge(owner: PublicKey, amount: Amount)
+Pledge(owner: PublicKey, amount: Amount)
val amount: Amount
val owner: PublicKey
@@ -5945,11 +5945,11 @@ -fun generateClose(tx: TransactionBuilder, campaign: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
-fun generatePledge(tx: TransactionBuilder, campaign: StateAndRef<State>, subscriber: PublicKey): Unit
-fun generateRegister(owner: PartyAndReference, fundingTarget: Amount, fundingName: String, closingTime: Instant): TransactionBuilder
+fun generateClose(tx: TransactionBuilder, campaign: StateAndRef<State>, wallet: List<StateAndRef<State>>): Unit
+fun generatePledge(tx: TransactionBuilder, campaign: StateAndRef<State>, subscriber: PublicKey): Unit
+fun generateRegister(owner: PartyAndReference, fundingTarget: Amount, fundingName: String, closingTime: Instant): TransactionBuilder
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -5965,7 +5965,7 @@ abstract fun generateAgreement(): TransactionBuilder
abstract val parties: Array<Party>
abstract val ref: String
-abstract fun withPublicKey(before: Party, after: PublicKey): DealState
+abstract fun withPublicKey(before: Party, after: PublicKey): DealState
@@ -6015,9 +6015,9 @@ -fun generateInitial(owner: PartyAndReference, magicNumber: Int): TransactionBuilder
+fun generateInitial(owner: PartyAndReference, magicNumber: Int): TransactionBuilder
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -6044,7 +6044,7 @@ -abstract fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
+abstract fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
abstract fun nextFixingOf(): FixOf?
@@ -6074,7 +6074,7 @@ -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, rate: Rate)
val CSVHeader: String
val flow: Amount
fun toString(): String
@@ -6101,10 +6101,10 @@ -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, rate: Rate)
val CSVHeader: String
fun asCSV(): String
-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 = this.notional, rate: Rate = this.rate): FloatingRatePaymentEvent
fun equals(other: Any?): Boolean
val fixingDate: LocalDate
val flow: Amount
@@ -6123,7 +6123,7 @@ -InsufficientBalanceException(amountMissing: Amount)
+InsufficientBalanceException(amountMissing: Amount)
val amountMissing: Amount
@@ -6145,7 +6145,7 @@ -Calculation(expression: Expression, floatingLegPaymentSchedule: Map<LocalDate, FloatingRatePaymentEvent>, fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>)
+Calculation(expression: Expression, floatingLegPaymentSchedule: Map<LocalDate, FloatingRatePaymentEvent>, fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>)
fun applyFixing(date: LocalDate, newRate: FixedRate): Calculation
val expression: Expression
val fixedLegPaymentSchedule: Map<LocalDate, FixedRatePaymentEvent>
@@ -6222,7 +6222,7 @@ -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, 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)
val addressForTransfers: String
val baseCurrency: Currency
val dailyInterestAmount: Expression
@@ -6251,7 +6251,7 @@ -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, paymentFrequency: Frequency, effectiveDate: LocalDate, effectiveDateAdjustment: DateRollConvention?, terminationDate: LocalDate, terminationDateAdjustment: DateRollConvention?, dayCountBasisDay: DayCountBasisDay, dayCountBasisYear: DayCountBasisYear, dayInMonth: Int, paymentRule: PaymentRule, paymentDelay: Int, paymentCalendar: BusinessCalendar, interestPeriodAdjustment: AccrualAdjustment)
val dayCountBasisDay: DayCountBasisDay
val dayCountBasisYear: DayCountBasisYear
val dayInMonth: Int
@@ -6279,8 +6279,8 @@ -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)
-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
+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)
+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
open fun equals(other: Any?): Boolean
var fixedRate: FixedRate
var fixedRatePayer: Party
@@ -6298,8 +6298,8 @@ -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)
-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
+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)
+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
open fun equals(other: Any?): Boolean
var fixingCalendar: BusinessCalendar
var fixingPeriod: DateOffset
@@ -6329,18 +6329,18 @@ val calculation: Calculation
val common: Common
val contract: InterestRateSwap
-fun evaluateCalculation(businessDate: LocalDate, expression: Expression = calculation.expression): Any
+fun evaluateCalculation(businessDate: LocalDate, expression: Expression = calculation.expression): Any
val fixedLeg: FixedLeg
val floatingLeg: FloatingLeg
fun generateAgreement(): TransactionBuilder
-fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
+fun generateFix(ptx: TransactionBuilder, oldStateRef: StateRef, fix: Fix): Unit
fun isRelevant(ourKeys: Set<PublicKey>): Boolean
fun nextFixingOf(): FixOf?
val parties: Array<Party>
fun prettyPrint(): String
val ref: String
val thread: <ERROR CLASS>
-fun withPublicKey(before: Party, after: PublicKey): DealState
+fun withPublicKey(before: Party, after: PublicKey): DealState
@@ -6349,10 +6349,10 @@ fun checkRates(legs: Array<CommonLeg>): Boolean
fun checkSchedules(legs: Array<CommonLeg>): Boolean
fun generateAgreement(floatingLeg: FloatingLeg, fixedLeg: FixedLeg, calculation: Calculation, common: Common): TransactionBuilder
-fun generateFix(tx: TransactionBuilder, irs: StateAndRef<State>, fixing: <ERROR CLASS><LocalDate, Rate>): Unit
+fun generateFix(tx: TransactionBuilder, irs: StateAndRef<State>, fixing: <ERROR CLASS><LocalDate, Rate>): Unit
fun getFloatingLegPaymentsDifferences(payments1: Map<LocalDate, Event>, payments2: Map<LocalDate, Event>): List<<ERROR CLASS><LocalDate, <ERROR CLASS><FloatingRatePaymentEvent, FloatingRatePaymentEvent>>>
val legalContractReference: SecureHash
-fun verify(tx: TransactionForVerification): Unit
+fun verify(tx: TransactionForVerification): Unit
@@ -6405,7 +6405,7 @@ -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, rate: Rate)
val CSVHeader: String
val accrualEndDate: LocalDate
val accrualStartDate: LocalDate
@@ -6446,7 +6446,7 @@ -ReferenceRate(oracle: String, tenor: Tenor, name: String)
+ReferenceRate(oracle: String, tenor: Tenor, name: String)
val name: String
val oracle: String
val tenor: Tenor
@@ -6504,13 +6504,13 @@ fun Iterable<ContractState>.sumCash(): <ERROR CLASS>
-fun Iterable<ContractState>.sumCashBy(owner: PublicKey): <ERROR CLASS>
+fun Iterable<ContractState>.sumCashBy(owner: PublicKey): <ERROR CLASS>
fun Iterable<ContractState>.sumCashOrNull(): <ERROR CLASS>
-fun Iterable<ContractState>.sumCashOrZero(currency: Currency): <ERROR CLASS>
+fun Iterable<ContractState>.sumCashOrZero(currency: Currency): <ERROR CLASS>
-operator fun Amount.times(other: RatioUnit): Amount
+operator fun Amount.times(other: RatioUnit): Amount
@@ -6543,17 +6543,17 @@ -Amount(amount: BigDecimal, currency: Currency)
-Amount(pennies: Long, currency: Currency)
-fun compareTo(other: Amount): Int
+Amount(amount: BigDecimal, currency: Currency)
+Amount(pennies: Long, currency: Currency)
+fun compareTo(other: Amount): Int
val currency: Currency
-operator fun div(other: Long): Amount
-operator fun div(other: Int): Amount
-operator fun minus(other: Amount): Amount
+operator fun div(other: Long): Amount
+operator fun div(other: Int): Amount
+operator fun minus(other: Amount): Amount
val pennies: Long
-operator fun plus(other: Amount): Amount
-operator fun times(other: Long): Amount
-operator fun times(other: Int): Amount
+operator fun plus(other: Amount): Amount
+operator fun times(other: Long): Amount
+operator fun times(other: Int): Amount
fun toString(): String
@@ -6566,7 +6566,7 @@ -open fun extractFile(path: String, outputTo: OutputStream): Unit
+open fun extractFile(path: String, outputTo: OutputStream): Unit
abstract fun open(): InputStream
open fun openAsJAR(): JarInputStream
@@ -6580,7 +6580,7 @@ -AuthenticatedObject(signers: List<PublicKey>, signingParties: List<Party>, value: T)
+AuthenticatedObject(signers: List<PublicKey>, signingParties: List<Party>, value: T)
val signers: List<PublicKey>
val signingParties: List<Party>
val value: T
@@ -6604,21 +6604,21 @@ -UnknownCalendar(name: String)
+UnknownCalendar(name: String)
-open fun applyRollConvention(testDate: LocalDate, dateRollConvention: DateRollConvention): LocalDate
+open fun applyRollConvention(testDate: LocalDate, dateRollConvention: DateRollConvention): LocalDate
val calendars: Array<out String>
val calendars: <ERROR CLASS>
-fun createGenericSchedule(startDate: LocalDate, period: Frequency, calendar: BusinessCalendar = BusinessCalendar.getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, periodOffset: Int? = null): List<LocalDate>
-open fun equals(other: Any?): Boolean
-fun getInstance(vararg calname: String): BusinessCalendar
+fun createGenericSchedule(startDate: LocalDate, period: Frequency, calendar: BusinessCalendar = BusinessCalendar.getInstance(), dateRollConvention: DateRollConvention = DateRollConvention.Following, noOfAdditionalPeriods: Int = Integer.MAX_VALUE, endDate: LocalDate? = null, periodOffset: Int? = null): List<LocalDate>
+open fun equals(other: Any?): Boolean
+fun getInstance(vararg calname: String): BusinessCalendar
open fun hashCode(): Int
val holidayDates: List<LocalDate>
-open fun isWorkingDay(date: LocalDate): Boolean
-fun moveBusinessDays(date: LocalDate, direction: DateRollDirection, i: Int): LocalDate
-fun parseDateFromString(it: String): LocalDate
+open fun isWorkingDay(date: LocalDate): Boolean
+fun moveBusinessDays(date: LocalDate, direction: DateRollDirection, i: Int): LocalDate
+fun parseDateFromString(it: String): LocalDate
@@ -6631,8 +6631,8 @@ -Command(data: CommandData, key: PublicKey)
-Command(value: CommandData, signers: List<PublicKey>)
+Command(data: CommandData, key: PublicKey)
+Command(value: CommandData, signers: List<PublicKey>)
val signers: List<PublicKey>
fun toString(): String
val value: CommandData
@@ -6649,7 +6649,7 @@ abstract val legalContractReference: SecureHash
-abstract fun verify(tx: TransactionForVerification): Unit
+abstract fun verify(tx: TransactionForVerification): Unit
@@ -6824,7 +6824,7 @@ -Expression(expr: String)
+Expression(expr: String)
val expr: String
@@ -6837,7 +6837,7 @@ -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Expression
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Expression
@@ -6849,7 +6849,7 @@ -fun serialize(expr: Expression, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(expr: Expression, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
@@ -6861,7 +6861,7 @@ -Fix(of: FixOf, value: BigDecimal)
+Fix(of: FixOf, value: BigDecimal)
val of: FixOf
val value: BigDecimal
@@ -6875,7 +6875,7 @@ -FixOf(name: String, forDay: LocalDate, ofTenor: Tenor)
+FixOf(name: String, forDay: LocalDate, ofTenor: Tenor)
val forDay: LocalDate
val name: String
val ofTenor: Tenor
@@ -6898,7 +6898,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -6910,7 +6910,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -6922,7 +6922,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -6934,7 +6934,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -6946,7 +6946,7 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
@@ -6958,12 +6958,12 @@ -fun offset(d: LocalDate): LocalDate
+fun offset(d: LocalDate): LocalDate
val annualCompoundCount: Int
-abstract fun offset(d: LocalDate): LocalDate
+abstract fun offset(d: LocalDate): LocalDate
@@ -6976,12 +6976,12 @@ -LedgerTransaction(inputs: List<StateRef>, attachments: List<Attachment>, outputs: List<ContractState>, commands: List<AuthenticatedObject<CommandData>>, id: SecureHash)
+LedgerTransaction(inputs: List<StateRef>, attachments: List<Attachment>, outputs: List<ContractState>, commands: List<AuthenticatedObject<CommandData>>, id: SecureHash)
val attachments: List<Attachment>
val commands: List<AuthenticatedObject<CommandData>>
val id: SecureHash
val inputs: List<StateRef>
-fun <T : ContractState> outRef(index: Int): StateAndRef<T>
+fun <T : ContractState> outRef(index: Int): StateAndRef<T>
val outputs: List<ContractState>
@@ -6994,7 +6994,7 @@ -abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean
+abstract fun isRelevant(ourKeys: Set<PublicKey>): Boolean
abstract val thread: SecureHash
@@ -7020,7 +7020,7 @@ abstract val owner: PublicKey
-abstract fun withNewOwner(newOwner: PublicKey): <ERROR CLASS><CommandData, OwnableState>
+abstract fun withNewOwner(newOwner: PublicKey): <ERROR CLASS><CommandData, OwnableState>
@@ -7032,11 +7032,11 @@ -Party(name: String, owningKey: PublicKey)
+Party(name: String, owningKey: PublicKey)
val name: String
val owningKey: PublicKey
-fun ref(bytes: OpaqueBytes): PartyAndReference
-fun ref(vararg bytes: Byte): PartyAndReference
+fun ref(bytes: OpaqueBytes): PartyAndReference
+fun ref(vararg bytes: Byte): PartyAndReference
fun toString(): String
@@ -7049,7 +7049,7 @@ -PartyAndReference(party: Party, reference: OpaqueBytes)
+PartyAndReference(party: Party, reference: OpaqueBytes)
val party: Party
val reference: OpaqueBytes
fun toString(): String
@@ -7079,7 +7079,7 @@ Requirements()
-infix fun String.by(expr: Boolean): Unit
+infix fun String.by(expr: Boolean): Unit
@@ -7092,15 +7092,15 @@ -SignedTransaction(txBits: SerializedBytes<WireTransaction>, sigs: List<WithKey>)
+SignedTransaction(txBits: SerializedBytes<WireTransaction>, sigs: List<WithKey>)
val id: SecureHash
-operator fun plus(sig: WithKey): SignedTransaction
+operator fun plus(sig: WithKey): SignedTransaction
val sigs: List<WithKey>
val tx: WireTransaction
val txBits: SerializedBytes<WireTransaction>
-fun verify(throwIfSignaturesAreMissing: Boolean = true): Set<PublicKey>
+fun verify(throwIfSignaturesAreMissing: Boolean = true): Set<PublicKey>
fun verifySignatures(): Unit
-fun withAdditionalSignature(sig: WithKey): SignedTransaction
+fun withAdditionalSignature(sig: WithKey): SignedTransaction
@@ -7112,7 +7112,7 @@ -StateAndRef(state: T, ref: StateRef)
+StateAndRef(state: T, ref: StateRef)
val ref: StateRef
val state: T
@@ -7126,7 +7126,7 @@ -StateRef(txhash: SecureHash, index: Int)
+StateRef(txhash: SecureHash, index: Int)
val index: Int
fun toString(): String
val txhash: SecureHash
@@ -7141,7 +7141,7 @@ -Tenor(name: String)
+Tenor(name: String)
enum class TimeUnit
    @@ -7158,7 +7158,7 @@
-fun daysToMaturity(startDate: LocalDate, calendar: BusinessCalendar): Int
+fun daysToMaturity(startDate: LocalDate, calendar: BusinessCalendar): Int
val name: String
fun toString(): String
@@ -7187,8 +7187,8 @@ -TimestampCommand(time: Instant, tolerance: Duration)
-TimestampCommand(after: Instant?, before: Instant?)
+TimestampCommand(time: Instant, tolerance: Duration)
+TimestampCommand(after: Instant?, before: Instant?)
val after: Instant?
val before: Instant?
val midpoint: Instant
@@ -7203,27 +7203,27 @@ -TransactionBuilder(inputs: MutableList<StateRef> = arrayListOf(), attachments: MutableList<SecureHash> = arrayListOf(), outputs: MutableList<ContractState> = arrayListOf(), commands: MutableList<Command> = arrayListOf())
-fun addAttachment(attachment: Attachment): Unit
-fun addCommand(arg: Command): Unit
-fun addCommand(data: CommandData, vararg keys: PublicKey): <ERROR CLASS>
-fun addCommand(data: CommandData, keys: List<PublicKey>): Unit
-fun addInputState(ref: StateRef): Unit
-fun addOutputState(state: ContractState): Unit
-fun addSignatureUnchecked(sig: WithKey): Unit
+TransactionBuilder(inputs: MutableList<StateRef> = arrayListOf(), attachments: MutableList<SecureHash> = arrayListOf(), outputs: MutableList<ContractState> = arrayListOf(), commands: MutableList<Command> = arrayListOf())
+fun addAttachment(attachment: Attachment): Unit
+fun addCommand(arg: Command): Unit
+fun addCommand(data: CommandData, vararg keys: PublicKey): <ERROR CLASS>
+fun addCommand(data: CommandData, keys: List<PublicKey>): Unit
+fun addInputState(ref: StateRef): Unit
+fun addOutputState(state: ContractState): Unit
+fun addSignatureUnchecked(sig: WithKey): Unit
fun attachments(): List<SecureHash>
-fun checkAndAddSignature(sig: WithKey): Unit
-fun checkSignature(sig: WithKey): Unit
+fun checkAndAddSignature(sig: WithKey): Unit
+fun checkSignature(sig: WithKey): Unit
fun commands(): List<Command>
fun inputStates(): List<StateRef>
fun outputStates(): List<ContractState>
-fun setTime(time: Instant, authenticatedBy: Party, timeTolerance: Duration): Unit
-fun signWith(key: KeyPair): Unit
+fun setTime(time: Instant, authenticatedBy: Party, timeTolerance: Duration): Unit
+fun signWith(key: KeyPair): Unit
val time: TimestampCommand?
-fun timestamp(timestamper: TimestamperService, clock: Clock = Clock.systemUTC()): Unit
-fun toSignedTransaction(checkSufficientSignatures: Boolean = true): SignedTransaction
+fun timestamp(timestamper: TimestamperService, clock: Clock = Clock.systemUTC()): Unit
+fun toSignedTransaction(checkSufficientSignatures: Boolean = true): SignedTransaction
fun toWireTransaction(): WireTransaction
-fun withItems(vararg items: Any): TransactionBuilder
+fun withItems(vararg items: Any): TransactionBuilder
@@ -7235,7 +7235,7 @@ -TransactionConflictException(conflictRef: StateRef, tx1: LedgerTransaction, tx2: LedgerTransaction)
+TransactionConflictException(conflictRef: StateRef, tx1: LedgerTransaction, tx2: LedgerTransaction)
val conflictRef: StateRef
val tx1: LedgerTransaction
val tx2: LedgerTransaction
@@ -7250,7 +7250,7 @@ -TransactionForVerification(inStates: List<ContractState>, outStates: List<ContractState>, attachments: List<Attachment>, commands: List<AuthenticatedObject<CommandData>>, origHash: SecureHash)
+TransactionForVerification(inStates: List<ContractState>, outStates: List<ContractState>, attachments: List<Attachment>, commands: List<AuthenticatedObject<CommandData>>, origHash: SecureHash)
data class InOutGroup<T : ContractState, K : Any>
val attachments: List<Attachment>
val commands: List<AuthenticatedObject<CommandData>>
-fun equals(other: Any?): Boolean
-fun getTimestampBy(timestampingAuthority: Party): TimestampCommand?
-fun <T : ContractState, K : Any> groupStates(ofType: Class<T>, selector: (T) -> K): List<InOutGroup<T, K>>
-inline fun <reified T : ContractState, K : Any> groupStates(selector: (T) -> K): List<InOutGroup<T, K>>
-fun <T : ContractState, K : Any> groupStatesInternal(inGroups: Map<K, List<T>>, outGroups: Map<K, List<T>>): List<InOutGroup<T, K>>
+fun equals(other: Any?): Boolean
+fun getTimestampBy(timestampingAuthority: Party): TimestampCommand?
+fun <T : ContractState, K : Any> groupStates(ofType: Class<T>, selector: (T) -> K): List<InOutGroup<T, K>>
+inline fun <reified T : ContractState, K : Any> groupStates(selector: (T) -> K): List<InOutGroup<T, K>>
+fun <T : ContractState, K : Any> groupStatesInternal(inGroups: Map<K, List<T>>, outGroups: Map<K, List<T>>): List<InOutGroup<T, K>>
fun hashCode(): Int
val inStates: List<ContractState>
val origHash: SecureHash
@@ -7289,7 +7289,7 @@ -TransactionGraphSearch(transactions: Map<SecureHash, SignedTransaction>, startPoints: List<WireTransaction>)
+TransactionGraphSearch(transactions: Map<SecureHash, SignedTransaction>, startPoints: List<WireTransaction>)
class Query
-fun calculateDaysBetween(startDate: LocalDate, endDate: LocalDate, dcbYear: DayCountBasisYear, dcbDay: DayCountBasisDay): Int
+fun calculateDaysBetween(startDate: LocalDate, endDate: LocalDate, dcbYear: DayCountBasisYear, dcbDay: DayCountBasisDay): Int
fun currency(code: String): Currency
fun extractZipFile(zipPath: Path, toPath: Path): Unit
fun <T> <ERROR CLASS><T>.failure(executor: Executor, body: (Throwable) -> Unit): <ERROR CLASS>
@@ -7428,7 +7428,7 @@ -fun LocalDate.isWorkingDay(accordingToCalendar: BusinessCalendar): Boolean
+fun LocalDate.isWorkingDay(accordingToCalendar: BusinessCalendar): Boolean
@@ -7510,7 +7510,7 @@ fun Iterable<Amount>.sumOrNull(): Nothing?
fun Iterable<Amount>.sumOrThrow(): <ERROR CLASS>
-fun Iterable<Amount>.sumOrZero(currency: Currency): Amount
+fun Iterable<Amount>.sumOrZero(currency: Currency): Amount
@@ -7523,26 +7523,26 @@ inline fun <reified T : ContractState> List<StateAndRef<ContractState>>.filterStatesOfType(): List<StateAndRef<T>>
-fun List<AuthenticatedObject<CommandData>>.getTimestampBy(timestampingAuthority: Party): TimestampCommand?
-fun List<AuthenticatedObject<CommandData>>.getTimestampByName(vararg names: String): TimestampCommand?
+fun List<AuthenticatedObject<CommandData>>.getTimestampBy(timestampingAuthority: Party): TimestampCommand?
+fun List<AuthenticatedObject<CommandData>>.getTimestampByName(vararg names: String): TimestampCommand?
fun <T> List<T>.indexOfOrThrow(item: T): Int
inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.requireSingleCommand(): <ERROR CLASS>
-fun List<AuthenticatedObject<CommandData>>.requireSingleCommand(klass: Class<out CommandData>): <ERROR CLASS>
-inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.select(signer: PublicKey? = null, party: Party? = null): <ERROR CLASS>
+fun List<AuthenticatedObject<CommandData>>.requireSingleCommand(klass: Class<out CommandData>): <ERROR CLASS>
+inline fun <reified T : CommandData> List<AuthenticatedObject<CommandData>>.select(signer: PublicKey? = null, party: Party? = null): <ERROR CLASS>
inline fun <T> logElapsedTime(label: String, logger: <ERROR CLASS>? = null, body: () -> T): T
fun random63BitValue(): Long
-inline fun <R> requireThat(body: Requirements.() -> R): R
+inline fun <R> requireThat(body: Requirements.() -> R): R
fun <T> <ERROR CLASS><T>.setFrom(logger: <ERROR CLASS>? = null, block: () -> T): <ERROR CLASS><T>
fun <T> <ERROR CLASS><T>.success(executor: Executor, body: (T) -> Unit): <ERROR CLASS>
infix fun <T> <ERROR CLASS><T>.success(body: (T) -> Unit): <ERROR CLASS><T>
fun <T> <ERROR CLASS><T>.then(executor: Executor, body: () -> Unit): <ERROR CLASS>
infix fun <T> <ERROR CLASS><T>.then(body: () -> Unit): <ERROR CLASS><T>
-fun WireTransaction.toLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction
-inline fun <reified T : CommandData> verifyMoveCommands(inputs: List<OwnableState>, tx: TransactionForVerification): Unit
-fun SignedTransaction.verifyToLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction
+fun WireTransaction.toLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction
+inline fun <reified T : CommandData> verifyMoveCommands(inputs: List<OwnableState>, tx: TransactionForVerification): Unit
+fun SignedTransaction.verifyToLedgerTransaction(identityService: IdentityService, attachmentStorage: AttachmentStorage): LedgerTransaction
@@ -7571,7 +7571,7 @@ -LegallyIdentifiable(signer: Party, bits: ByteArray, covering: Int)
+LegallyIdentifiable(signer: Party, bits: ByteArray, covering: Int)
val signer: Party
@@ -7692,8 +7692,8 @@ operator fun KeyPair.component2(): PublicKey
fun KeyPair.signWithECDSA(bitsToSign: ByteArray): WithKey
fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes): WithKey
-fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party): LegallyIdentifiable
-fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): LegallyIdentifiable
+fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party): LegallyIdentifiable
+fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): LegallyIdentifiable
@@ -8010,7 +8010,7 @@ val advertisedServices: Set<ServiceType>
lateinit var api: APIServer
val configuration: NodeConfiguration
-protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
+protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
val dir: Path
protected open fun findMyLocation(): PhysicalLocation?
lateinit var identity: IdentityService
@@ -8065,7 +8065,7 @@ -AttachmentsClassLoader(attachments: List<Attachment>, parent: ClassLoader = ClassLoader.getSystemClassLoader())
+AttachmentsClassLoader(attachments: List<Attachment>, parent: ClassLoader = ClassLoader.getSystemClassLoader())
class OverlappingAttachments : Exception
@@ -8366,7 +8366,7 @@ -QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
+QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
val identity: Party
@@ -8524,10 +8524,10 @@ -FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
+FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
val factory: InterpolatorFactory
val fixes: List<Fix>
-operator fun get(fixOf: FixOf): Fix?
+operator fun get(fixOf: FixOf): Fix?
val size: Int
@@ -8540,11 +8540,11 @@ -InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
+InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
val calendar: BusinessCalendar
val date: LocalDate
val factory: InterpolatorFactory
-fun getRate(tenor: Tenor): BigDecimal?
+fun getRate(tenor: Tenor): BigDecimal?
val inputRates: Map<Tenor, BigDecimal>
val size: Int
@@ -8558,11 +8558,11 @@ -Oracle(identity: Party, signingKey: KeyPair)
+Oracle(identity: Party, signingKey: KeyPair)
val identity: Party
var knownFixes: FixContainer
-fun query(queries: List<FixOf>): List<Fix>
-fun sign(wtx: WireTransaction): LegallyIdentifiable
+fun query(queries: List<FixOf>): List<Fix>
+fun sign(wtx: WireTransaction): LegallyIdentifiable
@@ -8592,7 +8592,7 @@ -UnknownFix(fix: FixOf)
+UnknownFix(fix: FixOf)
val fix: FixOf
fun toString(): String
@@ -8677,7 +8677,7 @@ -NodeTimestamperService(net: MessagingService, identity: Party, signingKey: KeyPair, clock: Clock = Clock.systemDefaultZone(), tolerance: Duration = 30.seconds)
+NodeTimestamperService(net: MessagingService, identity: Party, signingKey: KeyPair, clock: Clock = Clock.systemDefaultZone(), tolerance: Duration = 30.seconds)
val TIMESTAMPING_PROTOCOL_TOPIC: String
val clock: Clock
val identity: Party
@@ -8725,7 +8725,7 @@ object Type : ServiceType
abstract val identity: Party
-abstract fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
+abstract fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
@@ -8987,7 +8987,7 @@ InMemoryIdentityService()
fun partyFromKey(key: PublicKey): Party?
fun partyFromName(name: String): Party?
-fun registerIdentity(party: Party): Unit
+fun registerIdentity(party: Party): Unit
@@ -9005,7 +9005,7 @@ open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
open fun get(): <ERROR CLASS>
open fun get(serviceType: ServiceType): <ERROR CLASS>
-open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
open val networkMapNodes: List<NodeInfo>
open val partyNodes: List<NodeInfo>
fun processUpdatePush(req: Update): Unit
@@ -9081,7 +9081,7 @@ abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
abstract fun get(): Collection<NodeInfo>
abstract fun get(serviceType: ServiceType): Collection<NodeInfo>
-abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
val logger: <ERROR CLASS>
abstract val networkMapNodes: List<NodeInfo>
open fun nodeForPartyName(name: String): NodeInfo?
@@ -9104,9 +9104,9 @@ NodeWalletService(services: ServiceHub)
val cashBalances: Map<Currency, Amount>
val currentWallet: Wallet
-fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
+fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
-fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+fun notifyAll(txns: Iterable<WireTransaction>): Wallet
@@ -9134,7 +9134,7 @@ -StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
+StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
open val attachments: AttachmentStorage
open val checkpointStorage: CheckpointStorage
open val myLegalIdentity: Party
@@ -9169,7 +9169,7 @@ -WalletImpl(states: List<StateAndRef<ContractState>>)
+WalletImpl(states: List<StateAndRef<ContractState>>)
val cashBalances: Map<Currency, Amount>
val states: List<StateAndRef<ContractState>>
@@ -9187,9 +9187,9 @@ abstract val currentWallet: Wallet
abstract val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>
-open fun notify(tx: WireTransaction): Wallet
-abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
-open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
+open fun notify(tx: WireTransaction): Wallet
+abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
@@ -9346,15 +9346,15 @@ -fun read(kryo: <ERROR CLASS>, input: <ERROR CLASS>, type: Class<WireTransaction>): WireTransaction
-fun write(kryo: <ERROR CLASS>, output: <ERROR CLASS>, obj: WireTransaction): Unit
+fun read(kryo: <ERROR CLASS>, input: <ERROR CLASS>, type: Class<WireTransaction>): WireTransaction
+fun write(kryo: <ERROR CLASS>, output: <ERROR CLASS>, obj: WireTransaction): Unit
var <ERROR CLASS>.attachmentStorage: AttachmentStorage?
fun createKryo(k: <ERROR CLASS> = Kryo()): <ERROR CLASS>
fun <T : Any> OpaqueBytes.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): T
-fun SerializedBytes<WireTransaction>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
+fun SerializedBytes<WireTransaction>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): WireTransaction
fun <T : Any> SerializedBytes<T>.deserialize(kryo: <ERROR CLASS> = THREAD_LOCAL_KRYO.get()): T
kotlin.ByteArray
@@ -9616,7 +9616,7 @@ fun addRegistration(node: NodeInfo): Unit
-fun deleteRegistration(identity: Party): Boolean
+fun deleteRegistration(identity: Party): Boolean
@@ -9937,7 +9937,7 @@ -fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
@@ -10307,9 +10307,9 @@ -Callback(success: (SignedTransaction) -> Unit)
+Callback(success: (SignedTransaction) -> Unit)
fun onFailure(t: Throwable?): Unit
-fun onSuccess(st: SignedTransaction?): Unit
+fun onSuccess(st: SignedTransaction?): Unit
val success: (SignedTransaction) -> Unit
@@ -10335,7 +10335,7 @@ object RECEIVED : Step
fun call(): SignedTransaction
val dealToBeOffered: DealState
-fun notUs(vararg parties: Party): List<Party>
+fun notUs(vararg parties: Party): List<Party>
val progressTracker: <ERROR CLASS>
fun tracker(): <ERROR CLASS>
@@ -10465,8 +10465,8 @@ fun call(): Boolean
val date: LocalDate
fun otherParty(deal: DealState): NodeInfo
-fun processDeal(party: NodeInfo, deal: StateAndRef<DealState>, date: LocalDate, sessionID: Long): Unit
-fun processInterestRateSwap(party: NodeInfo, deal: StateAndRef<State>, date: LocalDate, sessionID: Long): Unit
+fun processDeal(party: NodeInfo, deal: StateAndRef<DealState>, date: LocalDate, sessionID: Long): Unit
+fun processInterestRateSwap(party: NodeInfo, deal: StateAndRef<State>, date: LocalDate, sessionID: Long): Unit
val progressTracker: ProgressTracker
val sessionID: Long
fun tracker(): ProgressTracker
@@ -10513,7 +10513,7 @@ const val TOPIC: String
protected fun convert(wire: ByteArray): Attachment
protected fun load(txid: SecureHash): Attachment?
-protected fun maybeWriteToDisk(downloaded: List<Attachment>): Unit
+protected fun maybeWriteToDisk(downloaded: List<Attachment>): Unit
protected val queryTopic: String
@@ -10613,7 +10613,7 @@ -RatesFixProtocol(tx: TransactionBuilder, oracle: NodeInfo, fixOf: FixOf, expectedRate: BigDecimal, rateTolerance: BigDecimal, progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name))
+RatesFixProtocol(tx: TransactionBuilder, oracle: NodeInfo, fixOf: FixOf, expectedRate: BigDecimal, rateTolerance: BigDecimal, progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name))
class FixOutOfRange : Exception
@@ -10905,7 +10905,7 @@ -Secondary(otherSide: SingleMessageRecipient, timestampingAuthority: Party, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())
+Secondary(otherSide: SingleMessageRecipient, timestampingAuthority: Party, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())
object RECEIVING : Step
object RECORDING : Step
object SIGNING : Step
@@ -10970,7 +10970,7 @@ -Buyer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long)
+Buyer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long)
object RECEIVING : Step
object SIGNING : Step
object SWAPPING_SIGNATURES : Step
@@ -10993,7 +10993,7 @@ -Seller(otherSide: SingleMessageRecipient, timestampingAuthority: NodeInfo, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long, progressTracker: ProgressTracker = Seller.tracker())
+Seller(otherSide: SingleMessageRecipient, timestampingAuthority: NodeInfo, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long, progressTracker: ProgressTracker = Seller.tracker())
object AWAITING_PROPOSAL : Step
object SENDING_SIGS : Step
object SIGNING : Step
@@ -11006,7 +11006,7 @@ val otherSide: SingleMessageRecipient
val price: Amount
open val progressTracker: ProgressTracker
-open fun signWithOurKey(partialTX: SignedTransaction): WithKey
+open fun signWithOurKey(partialTX: SignedTransaction): WithKey
val timestampingAuthority: NodeInfo
fun tracker(): ProgressTracker
@@ -11020,7 +11020,7 @@ -SellerTradeInfo(assetForSale: StateAndRef<OwnableState>, price: Amount, sellerOwnerKey: PublicKey, sessionID: Long)
+SellerTradeInfo(assetForSale: StateAndRef<OwnableState>, price: Amount, sellerOwnerKey: PublicKey, sessionID: Long)
val assetForSale: StateAndRef<OwnableState>
val price: Amount
val sellerOwnerKey: PublicKey
@@ -11051,13 +11051,13 @@ -UnacceptablePriceException(givenPrice: Amount)
+UnacceptablePriceException(givenPrice: Amount)
val givenPrice: Amount
-fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
-fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
+fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
+fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
diff --git a/docs/build/html/api/protocols/-fetch-attachments-protocol/index.html b/docs/build/html/api/protocols/-fetch-attachments-protocol/index.html index 2d1ab582e0..53c31e8fa9 100644 --- a/docs/build/html/api/protocols/-fetch-attachments-protocol/index.html +++ b/docs/build/html/api/protocols/-fetch-attachments-protocol/index.html @@ -72,7 +72,7 @@ attachments are saved to local storage automatically.

maybeWriteToDisk -fun maybeWriteToDisk(downloaded: List<Attachment>): Unit +fun maybeWriteToDisk(downloaded: List<Attachment>): Unit diff --git a/docs/build/html/api/protocols/-fetch-attachments-protocol/maybe-write-to-disk.html b/docs/build/html/api/protocols/-fetch-attachments-protocol/maybe-write-to-disk.html index 487894c398..bfbf7da44d 100644 --- a/docs/build/html/api/protocols/-fetch-attachments-protocol/maybe-write-to-disk.html +++ b/docs/build/html/api/protocols/-fetch-attachments-protocol/maybe-write-to-disk.html @@ -7,8 +7,8 @@ protocols / FetchAttachmentsProtocol / maybeWriteToDisk

maybeWriteToDisk

- -protected fun maybeWriteToDisk(downloaded: List<Attachment>): Unit
+ +protected fun maybeWriteToDisk(downloaded: List<Attachment>): Unit


diff --git a/docs/build/html/api/protocols/-rates-fix-protocol/-init-.html b/docs/build/html/api/protocols/-rates-fix-protocol/-init-.html index ae67f70699..71c70ce98d 100644 --- a/docs/build/html/api/protocols/-rates-fix-protocol/-init-.html +++ b/docs/build/html/api/protocols/-rates-fix-protocol/-init-.html @@ -7,7 +7,7 @@ protocols / RatesFixProtocol / <init>

<init>

-RatesFixProtocol(tx: TransactionBuilder, oracle: NodeInfo, fixOf: FixOf, expectedRate: BigDecimal, rateTolerance: BigDecimal, progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name))
+RatesFixProtocol(tx: TransactionBuilder, oracle: NodeInfo, fixOf: FixOf, expectedRate: BigDecimal, rateTolerance: BigDecimal, progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name))

This protocol queries the given oracle for an interest rate fix, and if it is within the given tolerance embeds the fix in the transaction and then proceeds to get the oracle to sign it. Although the call method combines the query and signing step, you can run the steps individually by constructing this object and then using the public methods diff --git a/docs/build/html/api/protocols/-rates-fix-protocol/-query-request/-init-.html b/docs/build/html/api/protocols/-rates-fix-protocol/-query-request/-init-.html index 37ddb49af9..b646a76d83 100644 --- a/docs/build/html/api/protocols/-rates-fix-protocol/-query-request/-init-.html +++ b/docs/build/html/api/protocols/-rates-fix-protocol/-query-request/-init-.html @@ -7,7 +7,7 @@ protocols / RatesFixProtocol / QueryRequest / <init>

<init>

-QueryRequest(queries: List<FixOf>, replyTo: SingleMessageRecipient, sessionID: Long)
+QueryRequest(queries: List<FixOf>, replyTo: SingleMessageRecipient, sessionID: Long)


diff --git a/docs/build/html/api/protocols/-rates-fix-protocol/-query-request/index.html b/docs/build/html/api/protocols/-rates-fix-protocol/-query-request/index.html index 93629ed704..36f0fbb898 100644 --- a/docs/build/html/api/protocols/-rates-fix-protocol/-query-request/index.html +++ b/docs/build/html/api/protocols/-rates-fix-protocol/-query-request/index.html @@ -17,7 +17,7 @@ <init> -QueryRequest(queries: List<FixOf>, replyTo: SingleMessageRecipient, sessionID: Long) +QueryRequest(queries: List<FixOf>, replyTo: SingleMessageRecipient, sessionID: Long) diff --git a/docs/build/html/api/protocols/-rates-fix-protocol/-sign-request/-init-.html b/docs/build/html/api/protocols/-rates-fix-protocol/-sign-request/-init-.html index bc874b13c5..b8dd908b58 100644 --- a/docs/build/html/api/protocols/-rates-fix-protocol/-sign-request/-init-.html +++ b/docs/build/html/api/protocols/-rates-fix-protocol/-sign-request/-init-.html @@ -7,7 +7,7 @@ protocols / RatesFixProtocol / SignRequest / <init>

<init>

-SignRequest(tx: WireTransaction, replyTo: SingleMessageRecipient, sessionID: Long)
+SignRequest(tx: WireTransaction, replyTo: SingleMessageRecipient, sessionID: Long)


diff --git a/docs/build/html/api/protocols/-rates-fix-protocol/-sign-request/index.html b/docs/build/html/api/protocols/-rates-fix-protocol/-sign-request/index.html index 652ba0fe64..17d4a30752 100644 --- a/docs/build/html/api/protocols/-rates-fix-protocol/-sign-request/index.html +++ b/docs/build/html/api/protocols/-rates-fix-protocol/-sign-request/index.html @@ -17,7 +17,7 @@ <init> -SignRequest(tx: WireTransaction, replyTo: SingleMessageRecipient, sessionID: Long) +SignRequest(tx: WireTransaction, replyTo: SingleMessageRecipient, sessionID: Long) diff --git a/docs/build/html/api/protocols/-rates-fix-protocol/before-signing.html b/docs/build/html/api/protocols/-rates-fix-protocol/before-signing.html index 3f4b9787fa..846face715 100644 --- a/docs/build/html/api/protocols/-rates-fix-protocol/before-signing.html +++ b/docs/build/html/api/protocols/-rates-fix-protocol/before-signing.html @@ -7,8 +7,8 @@ protocols / RatesFixProtocol / beforeSigning

beforeSigning

- -protected open fun beforeSigning(fix: Fix): Unit
+ +protected open fun beforeSigning(fix: Fix): Unit

You can override this to perform any additional work needed after the fix is added to the transaction but before its sent back to the oracle for signing (for example, adding output states that depend on the fix).


diff --git a/docs/build/html/api/protocols/-rates-fix-protocol/index.html b/docs/build/html/api/protocols/-rates-fix-protocol/index.html index 09193ae01b..7178e6411f 100644 --- a/docs/build/html/api/protocols/-rates-fix-protocol/index.html +++ b/docs/build/html/api/protocols/-rates-fix-protocol/index.html @@ -70,7 +70,7 @@ for each step.

<init> -RatesFixProtocol(tx: TransactionBuilder, oracle: NodeInfo, fixOf: FixOf, expectedRate: BigDecimal, rateTolerance: BigDecimal, progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name))

This protocol queries the given oracle for an interest rate fix, and if it is within the given tolerance embeds the +RatesFixProtocol(tx: TransactionBuilder, oracle: NodeInfo, fixOf: FixOf, expectedRate: BigDecimal, rateTolerance: BigDecimal, progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name))

This protocol queries the given oracle for an interest rate fix, and if it is within the given tolerance embeds the fix in the transaction and then proceeds to get the oracle to sign it. Although the call method combines the query and signing step, you can run the steps individually by constructing this object and then using the public methods for each step.

@@ -132,7 +132,7 @@ progress.

beforeSigning -open fun beforeSigning(fix: Fix): Unit

You can override this to perform any additional work needed after the fix is added to the transaction but +open fun beforeSigning(fix: Fix): Unit

You can override this to perform any additional work needed after the fix is added to the transaction but before its sent back to the oracle for signing (for example, adding output states that depend on the fix).

diff --git a/docs/build/html/api/protocols/-resolve-transactions-protocol/-init-.html b/docs/build/html/api/protocols/-resolve-transactions-protocol/-init-.html index 72a5c8ff35..614e5dbd10 100644 --- a/docs/build/html/api/protocols/-resolve-transactions-protocol/-init-.html +++ b/docs/build/html/api/protocols/-resolve-transactions-protocol/-init-.html @@ -7,8 +7,8 @@ protocols / ResolveTransactionsProtocol / <init>

<init>

-ResolveTransactionsProtocol(stx: SignedTransaction, otherSide: SingleMessageRecipient)
-ResolveTransactionsProtocol(wtx: WireTransaction, otherSide: SingleMessageRecipient)
+ResolveTransactionsProtocol(stx: SignedTransaction, otherSide: SingleMessageRecipient)
+ResolveTransactionsProtocol(wtx: WireTransaction, otherSide: SingleMessageRecipient)


ResolveTransactionsProtocol(txHashes: Set<SecureHash>, otherSide: SingleMessageRecipient)
diff --git a/docs/build/html/api/protocols/-resolve-transactions-protocol/index.html b/docs/build/html/api/protocols/-resolve-transactions-protocol/index.html index 98494504fc..2e26af3ce9 100644 --- a/docs/build/html/api/protocols/-resolve-transactions-protocol/index.html +++ b/docs/build/html/api/protocols/-resolve-transactions-protocol/index.html @@ -38,8 +38,8 @@ protocol is helpful when resolving and verifying a finished but partially signed <init> -ResolveTransactionsProtocol(stx: SignedTransaction, otherSide: SingleMessageRecipient)
-ResolveTransactionsProtocol(wtx: WireTransaction, otherSide: SingleMessageRecipient)ResolveTransactionsProtocol(txHashes: Set<SecureHash>, otherSide: SingleMessageRecipient)

This protocol fetches each transaction identified by the given hashes from either disk or network, along with all +ResolveTransactionsProtocol(stx: SignedTransaction, otherSide: SingleMessageRecipient)
+ResolveTransactionsProtocol(wtx: WireTransaction, otherSide: SingleMessageRecipient)ResolveTransactionsProtocol(txHashes: Set<SecureHash>, otherSide: SingleMessageRecipient)

This protocol fetches each transaction identified by the given hashes from either disk or network, along with all their dependencies, and verifies them together using a single TransactionGroup. If no exception is thrown, then all the transactions have been successfully verified and inserted into the local database.

diff --git a/docs/build/html/api/protocols/-timestamping-protocol/-client/index.html b/docs/build/html/api/protocols/-timestamping-protocol/-client/index.html index aceb7cdfc2..ffb03b9c53 100644 --- a/docs/build/html/api/protocols/-timestamping-protocol/-client/index.html +++ b/docs/build/html/api/protocols/-timestamping-protocol/-client/index.html @@ -40,7 +40,7 @@ timestamp -fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable +fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable diff --git a/docs/build/html/api/protocols/-timestamping-protocol/-client/timestamp.html b/docs/build/html/api/protocols/-timestamping-protocol/-client/timestamp.html index c5d2643ab3..700670829e 100644 --- a/docs/build/html/api/protocols/-timestamping-protocol/-client/timestamp.html +++ b/docs/build/html/api/protocols/-timestamping-protocol/-client/timestamp.html @@ -7,8 +7,8 @@ protocols / TimestampingProtocol / Client / timestamp

timestamp

- -fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
+ +fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
Overrides TimestamperService.timestamp


diff --git a/docs/build/html/api/protocols/-timestamping-protocol/-init-.html b/docs/build/html/api/protocols/-timestamping-protocol/-init-.html index fb41587272..bef10447d1 100644 --- a/docs/build/html/api/protocols/-timestamping-protocol/-init-.html +++ b/docs/build/html/api/protocols/-timestamping-protocol/-init-.html @@ -7,7 +7,7 @@ protocols / TimestampingProtocol / <init>

<init>

-TimestampingProtocol(node: NodeInfo, wtxBytes: SerializedBytes<WireTransaction>, progressTracker: ProgressTracker = TimestampingProtocol.tracker())
+TimestampingProtocol(node: NodeInfo, wtxBytes: SerializedBytes<WireTransaction>, progressTracker: ProgressTracker = TimestampingProtocol.tracker())

The TimestampingProtocol class is the client code that talks to a NodeTimestamperService on some remote node. It is a ProtocolLogic, meaning it can either be a sub-protocol of some other protocol, or be driven independently.

If you are not yourself authoring a protocol and want to timestamp something, the TimestampingProtocol.Client class diff --git a/docs/build/html/api/protocols/-timestamping-protocol/-request/-init-.html b/docs/build/html/api/protocols/-timestamping-protocol/-request/-init-.html index 62580daeec..0e9d950686 100644 --- a/docs/build/html/api/protocols/-timestamping-protocol/-request/-init-.html +++ b/docs/build/html/api/protocols/-timestamping-protocol/-request/-init-.html @@ -7,7 +7,7 @@ protocols / TimestampingProtocol / Request / <init>

<init>

-Request(tx: SerializedBytes<WireTransaction>, replyTo: MessageRecipients, sessionID: Long)
+Request(tx: SerializedBytes<WireTransaction>, replyTo: MessageRecipients, sessionID: Long)


diff --git a/docs/build/html/api/protocols/-timestamping-protocol/-request/index.html b/docs/build/html/api/protocols/-timestamping-protocol/-request/index.html index 35dfc2749e..ebcc5fa596 100644 --- a/docs/build/html/api/protocols/-timestamping-protocol/-request/index.html +++ b/docs/build/html/api/protocols/-timestamping-protocol/-request/index.html @@ -17,7 +17,7 @@ <init> -Request(tx: SerializedBytes<WireTransaction>, replyTo: MessageRecipients, sessionID: Long) +Request(tx: SerializedBytes<WireTransaction>, replyTo: MessageRecipients, sessionID: Long) diff --git a/docs/build/html/api/protocols/-timestamping-protocol/index.html b/docs/build/html/api/protocols/-timestamping-protocol/index.html index 4f43b5b7d7..c95856b1f4 100644 --- a/docs/build/html/api/protocols/-timestamping-protocol/index.html +++ b/docs/build/html/api/protocols/-timestamping-protocol/index.html @@ -54,7 +54,7 @@ a network message: use it only from spare application threads that dont have to <init> -TimestampingProtocol(node: NodeInfo, wtxBytes: SerializedBytes<WireTransaction>, progressTracker: ProgressTracker = TimestampingProtocol.tracker())

The TimestampingProtocol class is the client code that talks to a NodeTimestamperService on some remote node. It is a +TimestampingProtocol(node: NodeInfo, wtxBytes: SerializedBytes<WireTransaction>, progressTracker: ProgressTracker = TimestampingProtocol.tracker())

The TimestampingProtocol class is the client code that talks to a NodeTimestamperService on some remote node. It is a ProtocolLogic, meaning it can either be a sub-protocol of some other protocol, or be driven independently.

diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-acceptor/-init-.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-acceptor/-init-.html index 5efadc6a1a..09949a1947 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-acceptor/-init-.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-acceptor/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyDealProtocol / Acceptor / <init>

<init>

-Acceptor(otherSide: SingleMessageRecipient, timestampingAuthority: Party, dealToBuy: T, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())
+Acceptor(otherSide: SingleMessageRecipient, timestampingAuthority: Party, dealToBuy: T, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())

One side of the protocol for inserting a pre-agreed deal.



diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-acceptor/index.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-acceptor/index.html index 3788623890..e7ef7f5de1 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-acceptor/index.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-acceptor/index.html @@ -18,7 +18,7 @@ <init> -Acceptor(otherSide: SingleMessageRecipient, timestampingAuthority: Party, dealToBuy: T, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())

One side of the protocol for inserting a pre-agreed deal.

+Acceptor(otherSide: SingleMessageRecipient, timestampingAuthority: Party, dealToBuy: T, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())

One side of the protocol for inserting a pre-agreed deal.

diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-mismatch-exception/-init-.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-mismatch-exception/-init-.html index f6decc0deb..750e04adaf 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-mismatch-exception/-init-.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-mismatch-exception/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyDealProtocol / DealMismatchException / <init>

<init>

-DealMismatchException(expectedDeal: ContractState, actualDeal: ContractState)
+DealMismatchException(expectedDeal: ContractState, actualDeal: ContractState)


diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-mismatch-exception/index.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-mismatch-exception/index.html index 8e77d7048f..7594399de5 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-mismatch-exception/index.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-mismatch-exception/index.html @@ -17,7 +17,7 @@ <init> -DealMismatchException(expectedDeal: ContractState, actualDeal: ContractState) +DealMismatchException(expectedDeal: ContractState, actualDeal: ContractState) diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-ref-mismatch-exception/-init-.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-ref-mismatch-exception/-init-.html index b483c947af..e94efb7256 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-ref-mismatch-exception/-init-.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-ref-mismatch-exception/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyDealProtocol / DealRefMismatchException / <init>

<init>

-DealRefMismatchException(expectedDeal: StateRef, actualDeal: StateRef)
+DealRefMismatchException(expectedDeal: StateRef, actualDeal: StateRef)


diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-ref-mismatch-exception/index.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-ref-mismatch-exception/index.html index df640e022a..7ceab89338 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-ref-mismatch-exception/index.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-deal-ref-mismatch-exception/index.html @@ -17,7 +17,7 @@ <init> -DealRefMismatchException(expectedDeal: StateRef, actualDeal: StateRef) +DealRefMismatchException(expectedDeal: StateRef, actualDeal: StateRef) diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/-init-.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/-init-.html index 467fe82bd1..3dd98f7fdc 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/-init-.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyDealProtocol / Fixer / <init>

<init>

-Fixer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, dealToFix: StateAndRef<T>, sessionID: Long, replacementProgressTracker: ProgressTracker? = null)
+Fixer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, dealToFix: StateAndRef<T>, sessionID: Long, replacementProgressTracker: ProgressTracker? = null)

One side of the fixing protocol for an interest rate swap, but could easily be generalised further.

Do not infer too much from the name of the class. This is just to indicate that it is the "side" of the protocol that is run by the party with the fixed leg of swap deal, which is the basis for decided diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/assemble-shared-t-x.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/assemble-shared-t-x.html index 0db32f47c3..a46dfdf5ed 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/assemble-shared-t-x.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/assemble-shared-t-x.html @@ -7,8 +7,8 @@ protocols / TwoPartyDealProtocol / Fixer / assembleSharedTX

assembleSharedTX

- -protected open fun assembleSharedTX(handshake: Handshake<StateRef>): <ERROR CLASS><TransactionBuilder, List<PublicKey>>
+ +protected open fun assembleSharedTX(handshake: Handshake<StateRef>): <ERROR CLASS><TransactionBuilder, List<PublicKey>>


diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/index.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/index.html index a58baf214d..a6baa4eaa2 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/index.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/index.html @@ -23,7 +23,7 @@ who does what in the protocol.

<init> -Fixer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, dealToFix: StateAndRef<T>, sessionID: Long, replacementProgressTracker: ProgressTracker? = null)

One side of the fixing protocol for an interest rate swap, but could easily be generalised further.

+Fixer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, dealToFix: StateAndRef<T>, sessionID: Long, replacementProgressTracker: ProgressTracker? = null)

One side of the fixing protocol for an interest rate swap, but could easily be generalised further.

@@ -85,7 +85,7 @@ progress.

assembleSharedTX -open fun assembleSharedTX(handshake: Handshake<StateRef>): <ERROR CLASS><TransactionBuilder, List<PublicKey>> +open fun assembleSharedTX(handshake: Handshake<StateRef>): <ERROR CLASS><TransactionBuilder, List<PublicKey>> @@ -97,7 +97,7 @@ progress.

validateHandshake -open fun validateHandshake(handshake: Handshake<StateRef>): Handshake<StateRef> +open fun validateHandshake(handshake: Handshake<StateRef>): Handshake<StateRef> diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/validate-handshake.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/validate-handshake.html index a32896e1e6..58bcdfdfb3 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/validate-handshake.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-fixer/validate-handshake.html @@ -7,8 +7,8 @@ protocols / TwoPartyDealProtocol / Fixer / validateHandshake

validateHandshake

- -protected open fun validateHandshake(handshake: Handshake<StateRef>): Handshake<StateRef>
+ +protected open fun validateHandshake(handshake: Handshake<StateRef>): Handshake<StateRef>


diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-floater/-init-.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-floater/-init-.html index 938c9d8d2c..dc66ab5543 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-floater/-init-.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-floater/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyDealProtocol / Floater / <init>

<init>

-Floater(otherSide: SingleMessageRecipient, otherSessionID: Long, timestampingAuthority: NodeInfo, dealToFix: StateAndRef<T>, myKeyPair: KeyPair, sessionID: Long, progressTracker: ProgressTracker = Primary.tracker())
+Floater(otherSide: SingleMessageRecipient, otherSessionID: Long, timestampingAuthority: NodeInfo, dealToFix: StateAndRef<T>, myKeyPair: KeyPair, sessionID: Long, progressTracker: ProgressTracker = Primary.tracker())

One side of the fixing protocol for an interest rate swap, but could easily be generalised furher

As per the Fixer, do not infer too much from this class name in terms of business roles. This is just the "side" of the protocol run by the party with the floating leg as a way of deciding who diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-floater/index.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-floater/index.html index 4f4b26ecd0..5819dfc021 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-floater/index.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-floater/index.html @@ -23,7 +23,7 @@ does what in the protocol.

<init> -Floater(otherSide: SingleMessageRecipient, otherSessionID: Long, timestampingAuthority: NodeInfo, dealToFix: StateAndRef<T>, myKeyPair: KeyPair, sessionID: Long, progressTracker: ProgressTracker = Primary.tracker())

One side of the fixing protocol for an interest rate swap, but could easily be generalised furher

+Floater(otherSide: SingleMessageRecipient, otherSessionID: Long, timestampingAuthority: NodeInfo, dealToFix: StateAndRef<T>, myKeyPair: KeyPair, sessionID: Long, progressTracker: ProgressTracker = Primary.tracker())

One side of the fixing protocol for an interest rate swap, but could easily be generalised furher

@@ -104,13 +104,13 @@ progress.

signWithOurKey -open fun signWithOurKey(partialTX: SignedTransaction): WithKey +open fun signWithOurKey(partialTX: SignedTransaction): WithKey verifyPartialTransaction -fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction +fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-instigator/index.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-instigator/index.html index 199d89e762..346c485b53 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-instigator/index.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-instigator/index.html @@ -93,13 +93,13 @@ progress.

signWithOurKey -open fun signWithOurKey(partialTX: SignedTransaction): WithKey +open fun signWithOurKey(partialTX: SignedTransaction): WithKey verifyPartialTransaction -fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction +fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/index.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/index.html index 1c7462e896..417678453a 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/index.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/index.html @@ -165,13 +165,13 @@ progress.

signWithOurKey -open fun signWithOurKey(partialTX: SignedTransaction): WithKey +open fun signWithOurKey(partialTX: SignedTransaction): WithKey verifyPartialTransaction -fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction +fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/sign-with-our-key.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/sign-with-our-key.html index fa9fd9c786..07593e254c 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/sign-with-our-key.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/sign-with-our-key.html @@ -7,8 +7,8 @@ protocols / TwoPartyDealProtocol / Primary / signWithOurKey

signWithOurKey

- -open fun signWithOurKey(partialTX: SignedTransaction): WithKey
+ +open fun signWithOurKey(partialTX: SignedTransaction): WithKey


diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/verify-partial-transaction.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/verify-partial-transaction.html index 0725fb3749..110514f61f 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/verify-partial-transaction.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-primary/verify-partial-transaction.html @@ -7,8 +7,8 @@ protocols / TwoPartyDealProtocol / Primary / verifyPartialTransaction

verifyPartialTransaction

- -fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction
+ +fun verifyPartialTransaction(untrustedPartialTX: UntrustworthyData<SignedTransaction>): SignedTransaction


diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-secondary/-init-.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-secondary/-init-.html index 500f0f3e2e..c4ecaddbe5 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-secondary/-init-.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-secondary/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyDealProtocol / Secondary / <init>

<init>

-Secondary(otherSide: SingleMessageRecipient, timestampingAuthority: Party, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())
+Secondary(otherSide: SingleMessageRecipient, timestampingAuthority: Party, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())

Abstracted bilateral deal protocol participant that is recipient of initial communication.

Theres a good chance we can push at least some of this logic down into core protocol logic and helper methods etc.

diff --git a/docs/build/html/api/protocols/-two-party-deal-protocol/-secondary/index.html b/docs/build/html/api/protocols/-two-party-deal-protocol/-secondary/index.html index 3c3d8716ff..c1e87c5097 100644 --- a/docs/build/html/api/protocols/-two-party-deal-protocol/-secondary/index.html +++ b/docs/build/html/api/protocols/-two-party-deal-protocol/-secondary/index.html @@ -57,7 +57,7 @@ and helper methods etc.

<init> -Secondary(otherSide: SingleMessageRecipient, timestampingAuthority: Party, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())

Abstracted bilateral deal protocol participant that is recipient of initial communication.

+Secondary(otherSide: SingleMessageRecipient, timestampingAuthority: Party, sessionID: Long, progressTracker: ProgressTracker = Secondary.tracker())

Abstracted bilateral deal protocol participant that is recipient of initial communication.

diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-buyer/-init-.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-buyer/-init-.html index 84763d3562..0785aa3bb4 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-buyer/-init-.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-buyer/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyTradeProtocol / Buyer / <init>

<init>

-Buyer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long)
+Buyer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long)


diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-buyer/index.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-buyer/index.html index dfb5064efb..025baaaac3 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-buyer/index.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-buyer/index.html @@ -46,7 +46,7 @@ <init> -Buyer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long) +Buyer(otherSide: SingleMessageRecipient, timestampingAuthority: Party, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long) diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller-trade-info/-init-.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller-trade-info/-init-.html index 942c52ba0f..068996a631 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller-trade-info/-init-.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller-trade-info/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyTradeProtocol / SellerTradeInfo / <init>

<init>

-SellerTradeInfo(assetForSale: StateAndRef<OwnableState>, price: Amount, sellerOwnerKey: PublicKey, sessionID: Long)
+SellerTradeInfo(assetForSale: StateAndRef<OwnableState>, price: Amount, sellerOwnerKey: PublicKey, sessionID: Long)


diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller-trade-info/index.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller-trade-info/index.html index 3dfbcb8df3..9e8e4c2cdf 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller-trade-info/index.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller-trade-info/index.html @@ -17,7 +17,7 @@ <init> -SellerTradeInfo(assetForSale: StateAndRef<OwnableState>, price: Amount, sellerOwnerKey: PublicKey, sessionID: Long) +SellerTradeInfo(assetForSale: StateAndRef<OwnableState>, price: Amount, sellerOwnerKey: PublicKey, sessionID: Long) diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/-init-.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/-init-.html index 67986b2940..2eaf259b6e 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/-init-.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyTradeProtocol / Seller / <init>

<init>

-Seller(otherSide: SingleMessageRecipient, timestampingAuthority: NodeInfo, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long, progressTracker: ProgressTracker = Seller.tracker())
+Seller(otherSide: SingleMessageRecipient, timestampingAuthority: NodeInfo, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long, progressTracker: ProgressTracker = Seller.tracker())


diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/index.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/index.html index 9d9ec9c406..637f4a99b6 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/index.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/index.html @@ -52,7 +52,7 @@ <init> -Seller(otherSide: SingleMessageRecipient, timestampingAuthority: NodeInfo, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long, progressTracker: ProgressTracker = Seller.tracker()) +Seller(otherSide: SingleMessageRecipient, timestampingAuthority: NodeInfo, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long, progressTracker: ProgressTracker = Seller.tracker()) @@ -147,7 +147,7 @@ progress.

signWithOurKey -open fun signWithOurKey(partialTX: SignedTransaction): WithKey +open fun signWithOurKey(partialTX: SignedTransaction): WithKey diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/sign-with-our-key.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/sign-with-our-key.html index df269740ac..57b97e55a3 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/sign-with-our-key.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-seller/sign-with-our-key.html @@ -7,8 +7,8 @@ protocols / TwoPartyTradeProtocol / Seller / signWithOurKey

signWithOurKey

- -open fun signWithOurKey(partialTX: SignedTransaction): WithKey
+ +open fun signWithOurKey(partialTX: SignedTransaction): WithKey


diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-unacceptable-price-exception/-init-.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-unacceptable-price-exception/-init-.html index 8039ffdf70..c439476540 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-unacceptable-price-exception/-init-.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-unacceptable-price-exception/-init-.html @@ -7,7 +7,7 @@ protocols / TwoPartyTradeProtocol / UnacceptablePriceException / <init>

<init>

-UnacceptablePriceException(givenPrice: Amount)
+UnacceptablePriceException(givenPrice: Amount)


diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/-unacceptable-price-exception/index.html b/docs/build/html/api/protocols/-two-party-trade-protocol/-unacceptable-price-exception/index.html index 90585749f0..94044ebbe4 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/-unacceptable-price-exception/index.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/-unacceptable-price-exception/index.html @@ -17,7 +17,7 @@ <init> -UnacceptablePriceException(givenPrice: Amount) +UnacceptablePriceException(givenPrice: Amount) diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/index.html b/docs/build/html/api/protocols/-two-party-trade-protocol/index.html index 9509700778..0be05414e7 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/index.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/index.html @@ -92,13 +92,13 @@ transaction is available: you can either block your thread waiting for the proto runBuyer -fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction> +fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction> runSeller -fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction> +fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction> diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/run-buyer.html b/docs/build/html/api/protocols/-two-party-trade-protocol/run-buyer.html index 214edd450e..c1becb3efa 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/run-buyer.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/run-buyer.html @@ -7,8 +7,8 @@ protocols / TwoPartyTradeProtocol / runBuyer

runBuyer

- -fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
+ +fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>


diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/run-seller.html b/docs/build/html/api/protocols/-two-party-trade-protocol/run-seller.html index 0c5c7ef225..8cae4d2b17 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/run-seller.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/run-seller.html @@ -7,8 +7,8 @@ protocols / TwoPartyTradeProtocol / runSeller

runSeller

- -fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
+ +fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>


diff --git a/docs/source/tutorial_contract.rst b/docs/source/tutorial_contract.rst index 98e33e4b5a..cc5f3fcf89 100644 --- a/docs/source/tutorial_contract.rst +++ b/docs/source/tutorial_contract.rst @@ -200,7 +200,7 @@ Let's define a few commands now: .. sourcecode:: java - public static class Commands implements core.Command { + public static class Commands implements core.contract.Command { public static class Move extends Commands { @Override public boolean equals(Object obj) { diff --git a/gradle.properties b/gradle.properties index 587b727789..6a3b6dd4c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -kotlin.incremental=true \ No newline at end of file +kotlin.incremental=false \ No newline at end of file diff --git a/src/main/kotlin/api/APIServer.kt b/src/main/kotlin/api/APIServer.kt index 2a248fabdb..a97f3af4a6 100644 --- a/src/main/kotlin/api/APIServer.kt +++ b/src/main/kotlin/api/APIServer.kt @@ -1,9 +1,9 @@ package api -import core.ContractState -import core.SignedTransaction -import core.StateRef -import core.WireTransaction +import core.contracts.ContractState +import core.contracts.SignedTransaction +import core.contracts.StateRef +import core.contracts.WireTransaction import core.crypto.DigitalSignature import core.crypto.SecureHash import core.serialization.SerializedBytes diff --git a/src/main/kotlin/api/APIServerImpl.kt b/src/main/kotlin/api/APIServerImpl.kt index c92c117d1e..1b48d9afce 100644 --- a/src/main/kotlin/api/APIServerImpl.kt +++ b/src/main/kotlin/api/APIServerImpl.kt @@ -2,6 +2,7 @@ package api import com.google.common.util.concurrent.ListenableFuture import core.* +import core.contracts.* import core.crypto.DigitalSignature import core.crypto.SecureHash import core.node.AbstractNode diff --git a/src/main/kotlin/core/node/AbstractNode.kt b/src/main/kotlin/core/node/AbstractNode.kt index 0063b91767..7e489b5f6f 100644 --- a/src/main/kotlin/core/node/AbstractNode.kt +++ b/src/main/kotlin/core/node/AbstractNode.kt @@ -6,7 +6,7 @@ import com.codahale.metrics.MetricRegistry import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors import com.google.common.util.concurrent.SettableFuture -import core.Party +import core.crypto.Party import core.messaging.MessagingService import core.messaging.StateMachineManager import core.messaging.runOnNextMessage diff --git a/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt b/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt index b2d4a6070d..5fb1e90f1c 100644 --- a/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt +++ b/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt @@ -1,9 +1,9 @@ package core.node.services -import core.Party -import core.StateRef +import core.crypto.Party +import core.contracts.StateRef import core.ThreadBox -import core.WireTransaction +import core.contracts.WireTransaction import java.util.* import javax.annotation.concurrent.ThreadSafe diff --git a/src/main/kotlin/core/node/services/NetworkMapService.kt b/src/main/kotlin/core/node/services/NetworkMapService.kt index e81e97ecef..311c9dcc56 100644 --- a/src/main/kotlin/core/node/services/NetworkMapService.kt +++ b/src/main/kotlin/core/node/services/NetworkMapService.kt @@ -1,7 +1,7 @@ package core.node.services import co.paralleluniverse.common.util.VisibleForTesting -import core.Party +import core.crypto.Party import core.ThreadBox import core.crypto.DigitalSignature import core.crypto.SecureHash diff --git a/src/main/kotlin/core/node/services/NodeAttachmentService.kt b/src/main/kotlin/core/node/services/NodeAttachmentService.kt index c5421a258b..bbea6ed51c 100644 --- a/src/main/kotlin/core/node/services/NodeAttachmentService.kt +++ b/src/main/kotlin/core/node/services/NodeAttachmentService.kt @@ -5,7 +5,7 @@ import com.google.common.annotations.VisibleForTesting import com.google.common.hash.Hashing import com.google.common.hash.HashingInputStream import com.google.common.io.CountingInputStream -import core.Attachment +import core.contracts.Attachment import core.crypto.SecureHash import core.extractZipFile import core.node.AcceptsFileUpload diff --git a/src/main/kotlin/core/node/services/NodeInterestRates.kt b/src/main/kotlin/core/node/services/NodeInterestRates.kt index 885816968d..d51a822113 100644 --- a/src/main/kotlin/core/node/services/NodeInterestRates.kt +++ b/src/main/kotlin/core/node/services/NodeInterestRates.kt @@ -1,7 +1,9 @@ package core.node.services import core.* +import core.contracts.* import core.crypto.DigitalSignature +import core.crypto.Party import core.crypto.signWithECDSA import core.math.CubicSplineInterpolator import core.math.Interpolator diff --git a/src/main/kotlin/core/node/services/NotaryService.kt b/src/main/kotlin/core/node/services/NotaryService.kt index 357e2889c6..b1dab5a6e5 100644 --- a/src/main/kotlin/core/node/services/NotaryService.kt +++ b/src/main/kotlin/core/node/services/NotaryService.kt @@ -1,8 +1,8 @@ package core.node.services -import core.Party -import core.TimestampCommand -import core.WireTransaction +import core.crypto.Party +import core.contracts.TimestampCommand +import core.contracts.WireTransaction import core.crypto.DigitalSignature import core.crypto.SignedData import core.crypto.signWithECDSA diff --git a/src/main/kotlin/core/node/services/TimestampChecker.kt b/src/main/kotlin/core/node/services/TimestampChecker.kt index 6ac5297990..e4069ff584 100644 --- a/src/main/kotlin/core/node/services/TimestampChecker.kt +++ b/src/main/kotlin/core/node/services/TimestampChecker.kt @@ -1,6 +1,6 @@ package core.node.services -import core.TimestampCommand +import core.contracts.TimestampCommand import core.seconds import core.until import java.time.Clock diff --git a/src/main/kotlin/core/node/subsystems/DataVendingService.kt b/src/main/kotlin/core/node/subsystems/DataVendingService.kt index 44925bac57..146e32d958 100644 --- a/src/main/kotlin/core/node/subsystems/DataVendingService.kt +++ b/src/main/kotlin/core/node/subsystems/DataVendingService.kt @@ -1,6 +1,6 @@ package core.node.subsystems -import core.SignedTransaction +import core.contracts.SignedTransaction import core.messaging.MessagingService import core.node.services.AbstractNodeService import core.utilities.loggerFor diff --git a/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt b/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt index 95748c5526..af931269e8 100644 --- a/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt +++ b/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt @@ -1,6 +1,6 @@ package core.node.subsystems -import core.Party +import core.crypto.Party import core.node.services.IdentityService import java.security.PublicKey import java.util.concurrent.ConcurrentHashMap diff --git a/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt b/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt index 120b16c6d6..b8eb905c87 100644 --- a/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt +++ b/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt @@ -3,8 +3,8 @@ package core.node.subsystems import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors import com.google.common.util.concurrent.SettableFuture -import core.Contract -import core.Party +import core.contracts.Contract +import core.crypto.Party import core.crypto.SecureHash import core.messaging.MessagingService import core.messaging.runOnNextMessage diff --git a/src/main/kotlin/core/node/subsystems/NodeWalletService.kt b/src/main/kotlin/core/node/subsystems/NodeWalletService.kt index e7a9407dd1..251f605b11 100644 --- a/src/main/kotlin/core/node/subsystems/NodeWalletService.kt +++ b/src/main/kotlin/core/node/subsystems/NodeWalletService.kt @@ -3,6 +3,8 @@ package core.node.subsystems import com.codahale.metrics.Gauge import contracts.Cash import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import core.node.ServiceHub import core.utilities.loggerFor diff --git a/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt b/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt index f8b988e9cb..ec5d38fe70 100644 --- a/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt +++ b/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt @@ -1,7 +1,7 @@ package core.node.subsystems -import core.Party -import core.SignedTransaction +import core.crypto.Party +import core.contracts.SignedTransaction import core.crypto.SecureHash import core.node.services.AttachmentStorage import core.node.storage.CheckpointStorage diff --git a/src/main/kotlin/core/node/subsystems/WalletImpl.kt b/src/main/kotlin/core/node/subsystems/WalletImpl.kt index 4400e59e8e..d488092edb 100644 --- a/src/main/kotlin/core/node/subsystems/WalletImpl.kt +++ b/src/main/kotlin/core/node/subsystems/WalletImpl.kt @@ -1,10 +1,10 @@ package core.node.subsystems import contracts.Cash -import core.Amount -import core.ContractState -import core.StateAndRef -import core.sumOrThrow +import core.contracts.Amount +import core.contracts.ContractState +import core.contracts.StateAndRef +import core.contracts.sumOrThrow import java.util.* /** diff --git a/src/main/kotlin/core/testing/IRSSimulation.kt b/src/main/kotlin/core/testing/IRSSimulation.kt index e6ed8756f1..f404f81c28 100644 --- a/src/main/kotlin/core/testing/IRSSimulation.kt +++ b/src/main/kotlin/core/testing/IRSSimulation.kt @@ -6,6 +6,8 @@ import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.SettableFuture import contracts.InterestRateSwap import core.* +import core.contracts.SignedTransaction +import core.contracts.StateAndRef import core.crypto.SecureHash import core.node.subsystems.linearHeadsOfType import core.utilities.JsonSupport diff --git a/src/main/kotlin/core/testing/MockIdentityService.kt b/src/main/kotlin/core/testing/MockIdentityService.kt index 6226a7eb50..8b67b6b01e 100644 --- a/src/main/kotlin/core/testing/MockIdentityService.kt +++ b/src/main/kotlin/core/testing/MockIdentityService.kt @@ -1,6 +1,6 @@ package core.testing -import core.Party +import core.crypto.Party import core.node.services.IdentityService import java.security.PublicKey import javax.annotation.concurrent.ThreadSafe diff --git a/src/main/kotlin/core/testing/MockNetworkMapCache.kt b/src/main/kotlin/core/testing/MockNetworkMapCache.kt index a6456faf23..5deba50f9a 100644 --- a/src/main/kotlin/core/testing/MockNetworkMapCache.kt +++ b/src/main/kotlin/core/testing/MockNetworkMapCache.kt @@ -8,7 +8,7 @@ package core.testing import co.paralleluniverse.common.util.VisibleForTesting -import core.Party +import core.crypto.Party import core.crypto.DummyPublicKey import core.messaging.SingleMessageRecipient import core.node.subsystems.InMemoryNetworkMapCache diff --git a/src/main/kotlin/core/testing/MockNode.kt b/src/main/kotlin/core/testing/MockNode.kt index 89249dbc6c..134b670162 100644 --- a/src/main/kotlin/core/testing/MockNode.kt +++ b/src/main/kotlin/core/testing/MockNode.kt @@ -1,7 +1,7 @@ package core.testing import com.google.common.jimfs.Jimfs -import core.Party +import core.crypto.Party import core.messaging.MessagingService import core.messaging.SingleMessageRecipient import core.node.AbstractNode diff --git a/src/main/kotlin/core/testing/TradeSimulation.kt b/src/main/kotlin/core/testing/TradeSimulation.kt index 984e20cea5..0f41510bcd 100644 --- a/src/main/kotlin/core/testing/TradeSimulation.kt +++ b/src/main/kotlin/core/testing/TradeSimulation.kt @@ -4,6 +4,8 @@ import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture import contracts.CommercialPaper import core.* +import core.contracts.DOLLARS +import core.contracts.SignedTransaction import core.node.subsystems.NodeWalletService import core.utilities.BriefLogFormatter import protocols.TwoPartyTradeProtocol @@ -15,7 +17,7 @@ import java.time.Instant */ class TradeSimulation(runAsync: Boolean, latencyInjector: InMemoryMessagingNetwork.LatencyCalculator?) : Simulation(runAsync, latencyInjector) { override fun start() { - BriefLogFormatter.loggingOn("bank", "core.TransactionGroup", "recordingmap") + BriefLogFormatter.loggingOn("bank", "core.contract.TransactionGroup", "recordingmap") startTradingCircle { i, j -> tradeBetween(i, j) } } diff --git a/src/main/kotlin/core/utilities/JsonSupport.kt b/src/main/kotlin/core/utilities/JsonSupport.kt index 7d3eedba10..f4fe9dd201 100644 --- a/src/main/kotlin/core/utilities/JsonSupport.kt +++ b/src/main/kotlin/core/utilities/JsonSupport.kt @@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.deser.std.NumberDeserializers import com.fasterxml.jackson.databind.deser.std.StringArrayDeserializer import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.module.kotlin.KotlinModule -import core.BusinessCalendar -import core.Party +import core.contracts.BusinessCalendar +import core.crypto.Party import core.crypto.SecureHash import core.node.services.IdentityService import java.math.BigDecimal diff --git a/src/main/kotlin/demos/IRSDemo.kt b/src/main/kotlin/demos/IRSDemo.kt index d38a8a9ffc..9ccf4c0883 100644 --- a/src/main/kotlin/demos/IRSDemo.kt +++ b/src/main/kotlin/demos/IRSDemo.kt @@ -2,7 +2,7 @@ package demos import com.google.common.net.HostAndPort import com.typesafe.config.ConfigFactory -import core.Party +import core.crypto.Party import core.logElapsedTime import core.node.Node import core.node.NodeConfiguration diff --git a/src/main/kotlin/demos/RateFixDemo.kt b/src/main/kotlin/demos/RateFixDemo.kt index c1c5f6080c..ee3d6ae4ed 100644 --- a/src/main/kotlin/demos/RateFixDemo.kt +++ b/src/main/kotlin/demos/RateFixDemo.kt @@ -2,6 +2,10 @@ package demos import contracts.Cash import core.* +import core.contracts.DOLLARS +import core.contracts.FixOf +import core.crypto.Party +import core.contracts.TransactionBuilder import core.node.Node import core.node.NodeConfiguration import core.node.NodeInfo diff --git a/src/main/kotlin/demos/TraderDemo.kt b/src/main/kotlin/demos/TraderDemo.kt index fea07be60e..dd27b5c841 100644 --- a/src/main/kotlin/demos/TraderDemo.kt +++ b/src/main/kotlin/demos/TraderDemo.kt @@ -5,6 +5,8 @@ import com.google.common.net.HostAndPort import com.typesafe.config.ConfigFactory import contracts.CommercialPaper import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import core.crypto.generateKeyPair import core.messaging.SingleMessageRecipient diff --git a/src/main/kotlin/demos/protocols/AutoOfferProtocol.kt b/src/main/kotlin/demos/protocols/AutoOfferProtocol.kt index 0c92e81e24..13e4f02b7b 100644 --- a/src/main/kotlin/demos/protocols/AutoOfferProtocol.kt +++ b/src/main/kotlin/demos/protocols/AutoOfferProtocol.kt @@ -3,9 +3,9 @@ package demos.protocols import co.paralleluniverse.fibers.Suspendable import com.google.common.util.concurrent.FutureCallback import com.google.common.util.concurrent.Futures -import core.DealState -import core.Party -import core.SignedTransaction +import core.contracts.DealState +import core.crypto.Party +import core.contracts.SignedTransaction import core.messaging.SingleMessageRecipient import core.node.Node import core.protocols.ProtocolLogic diff --git a/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt b/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt index e07bc62b1f..89f54aa162 100644 --- a/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt +++ b/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt @@ -2,8 +2,8 @@ package demos.protocols import co.paralleluniverse.fibers.Suspendable import contracts.InterestRateSwap -import core.DealState -import core.StateAndRef +import core.contracts.DealState +import core.contracts.StateAndRef import core.node.Node import core.node.NodeInfo import core.node.subsystems.linearHeadsOfType diff --git a/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt b/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt index e8b5294d66..99b47c6cfd 100644 --- a/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt +++ b/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt @@ -5,7 +5,9 @@ import com.google.common.util.concurrent.ListenableFuture import contracts.Cash import contracts.sumCashBy import core.* +import core.contracts.* import core.crypto.DigitalSignature +import core.crypto.Party import core.crypto.signWithECDSA import core.messaging.SingleMessageRecipient import core.messaging.StateMachineManager diff --git a/src/test/kotlin/contracts/CashTests.kt b/src/test/kotlin/contracts/CashTests.kt index 68fc98c9aa..6ebfb55e52 100644 --- a/src/test/kotlin/contracts/CashTests.kt +++ b/src/test/kotlin/contracts/CashTests.kt @@ -2,6 +2,8 @@ import contracts.Cash import contracts.DummyContract import contracts.InsufficientBalanceException import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import core.serialization.OpaqueBytes import core.testutils.* diff --git a/src/test/kotlin/contracts/CommercialPaperTests.kt b/src/test/kotlin/contracts/CommercialPaperTests.kt index c0ec1d86d1..cb70b1f969 100644 --- a/src/test/kotlin/contracts/CommercialPaperTests.kt +++ b/src/test/kotlin/contracts/CommercialPaperTests.kt @@ -1,6 +1,7 @@ package contracts import core.* +import core.contracts.* import core.crypto.SecureHash import core.testutils.* import org.junit.Test diff --git a/src/test/kotlin/contracts/CrowdFundTests.kt b/src/test/kotlin/contracts/CrowdFundTests.kt index e168d653e4..2b9a044bb8 100644 --- a/src/test/kotlin/contracts/CrowdFundTests.kt +++ b/src/test/kotlin/contracts/CrowdFundTests.kt @@ -1,6 +1,7 @@ package contracts import core.* +import core.contracts.* import core.crypto.SecureHash import core.testutils.* import org.junit.Test diff --git a/src/test/kotlin/contracts/IRSTests.kt b/src/test/kotlin/contracts/IRSTests.kt index 645075f1c6..981fb9055c 100644 --- a/src/test/kotlin/contracts/IRSTests.kt +++ b/src/test/kotlin/contracts/IRSTests.kt @@ -1,6 +1,7 @@ package contracts import core.* +import core.contracts.* import core.testutils.* import org.junit.Test import java.math.BigDecimal diff --git a/src/test/kotlin/core/MockServices.kt b/src/test/kotlin/core/MockServices.kt index 8e28a70d18..6bd2f05d43 100644 --- a/src/test/kotlin/core/MockServices.kt +++ b/src/test/kotlin/core/MockServices.kt @@ -1,6 +1,7 @@ package core import com.codahale.metrics.MetricRegistry +import core.contracts.Attachment import core.crypto.SecureHash import core.crypto.generateKeyPair import core.crypto.sha256 diff --git a/src/test/kotlin/core/TransactionGroupTests.kt b/src/test/kotlin/core/TransactionGroupTests.kt index e16f7eeb6f..f14e0097fb 100644 --- a/src/test/kotlin/core/TransactionGroupTests.kt +++ b/src/test/kotlin/core/TransactionGroupTests.kt @@ -1,6 +1,7 @@ package core import contracts.Cash +import core.contracts.* import core.testutils.* import org.junit.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/core/messaging/AttachmentTests.kt b/src/test/kotlin/core/messaging/AttachmentTests.kt index fa45d29b60..60167f9765 100644 --- a/src/test/kotlin/core/messaging/AttachmentTests.kt +++ b/src/test/kotlin/core/messaging/AttachmentTests.kt @@ -1,6 +1,6 @@ package core.messaging -import core.Attachment +import core.contracts.Attachment import core.crypto.SecureHash import core.crypto.sha256 import core.node.NodeConfiguration diff --git a/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt b/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt index bb16826c02..115d1b17d3 100644 --- a/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt +++ b/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt @@ -3,6 +3,8 @@ package core.messaging import contracts.Cash import contracts.CommercialPaper import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import core.node.NodeConfiguration import core.node.NodeInfo @@ -49,12 +51,12 @@ class TwoPartyTradeProtocolTests { fun before() { net = MockNetwork(false) net.identities += MockIdentityService.identities - BriefLogFormatter.loggingOn("platform.trade", "core.TransactionGroup", "recordingmap") + BriefLogFormatter.loggingOn("platform.trade", "core.contract.TransactionGroup", "recordingmap") } @After fun after() { - BriefLogFormatter.loggingOff("platform.trade", "core.TransactionGroup", "recordingmap") + BriefLogFormatter.loggingOff("platform.trade", "core.contract.TransactionGroup", "recordingmap") } @Test diff --git a/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt b/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt index 0632a2ee48..df29092342 100644 --- a/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt +++ b/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt @@ -3,6 +3,8 @@ package core.node import contracts.DUMMY_PROGRAM_ID import contracts.DummyContract import core.* +import core.contracts.* +import core.crypto.Party import core.crypto.SecureHash import core.node.services.AttachmentStorage import core.serialization.* diff --git a/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt b/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt index 0b81093945..75d95bc345 100644 --- a/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt +++ b/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt @@ -1,9 +1,9 @@ package core.node.services import contracts.Cash -import core.DOLLARS -import core.Fix -import core.TransactionBuilder +import core.contracts.DOLLARS +import core.contracts.Fix +import core.contracts.TransactionBuilder import core.bd import core.testing.MockNetwork import core.testutils.* diff --git a/src/test/kotlin/core/node/services/NotaryServiceTests.kt b/src/test/kotlin/core/node/services/NotaryServiceTests.kt index b39038bfee..8a75250c0f 100644 --- a/src/test/kotlin/core/node/services/NotaryServiceTests.kt +++ b/src/test/kotlin/core/node/services/NotaryServiceTests.kt @@ -1,6 +1,6 @@ package core.node.services -import core.TransactionBuilder +import core.contracts.TransactionBuilder import core.seconds import core.testing.MockNetwork import core.testutils.DUMMY_NOTARY diff --git a/src/test/kotlin/core/node/services/TimestampCheckerTests.kt b/src/test/kotlin/core/node/services/TimestampCheckerTests.kt index d2a093075e..b721a4d444 100644 --- a/src/test/kotlin/core/node/services/TimestampCheckerTests.kt +++ b/src/test/kotlin/core/node/services/TimestampCheckerTests.kt @@ -1,6 +1,6 @@ package core.node.services -import core.TimestampCommand +import core.contracts.TimestampCommand import core.seconds import org.junit.Test import java.time.Clock diff --git a/src/test/kotlin/core/node/services/UniquenessProviderTests.kt b/src/test/kotlin/core/node/services/UniquenessProviderTests.kt index 096418095f..0c4dc16b98 100644 --- a/src/test/kotlin/core/node/services/UniquenessProviderTests.kt +++ b/src/test/kotlin/core/node/services/UniquenessProviderTests.kt @@ -1,6 +1,6 @@ package core.node.services -import core.TransactionBuilder +import core.contracts.TransactionBuilder import core.testutils.MEGA_CORP import core.testutils.generateStateRef import org.junit.Test diff --git a/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt b/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt index 7932622a94..fa0dc0579d 100644 --- a/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt +++ b/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt @@ -2,6 +2,10 @@ package core.node.subsystems import contracts.Cash import core.* +import core.contracts.DOLLARS +import core.contracts.TransactionBuilder +import core.contracts.USD +import core.contracts.verifyToLedgerTransaction import core.node.ServiceHub import core.testutils.* import core.utilities.BriefLogFormatter diff --git a/src/test/kotlin/core/serialization/TransactionSerializationTests.kt b/src/test/kotlin/core/serialization/TransactionSerializationTests.kt index 685b5abb65..5c4999daa1 100644 --- a/src/test/kotlin/core/serialization/TransactionSerializationTests.kt +++ b/src/test/kotlin/core/serialization/TransactionSerializationTests.kt @@ -2,6 +2,7 @@ package core.serialization import contracts.Cash import core.* +import core.contracts.* import core.testutils.* import org.junit.Before import org.junit.Test diff --git a/src/test/kotlin/core/testutils/TestUtils.kt b/src/test/kotlin/core/testutils/TestUtils.kt index 41119fb3d3..76a7c193dc 100644 --- a/src/test/kotlin/core/testutils/TestUtils.kt +++ b/src/test/kotlin/core/testutils/TestUtils.kt @@ -6,6 +6,7 @@ import com.google.common.base.Throwables import com.google.common.net.HostAndPort import contracts.* import core.* +import core.contracts.* import core.crypto.* import core.node.AbstractNode import core.serialization.serialize diff --git a/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt b/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt index a0afb6172d..ef8e057c0a 100644 --- a/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt +++ b/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt @@ -1,7 +1,7 @@ package core.visualiser -import core.CommandData -import core.ContractState +import core.contracts.CommandData +import core.contracts.ContractState import core.crypto.SecureHash import core.testutils.TransactionGroupDSL import org.graphstream.graph.Edge diff --git a/src/test/resources/core/node/isolated.jar b/src/test/resources/core/node/isolated.jar index 8303253ee288ab46fc75418a71155b36d9a0441a..45a3f27e94c3518166fd911a37afceaaaab12f0f 100644 GIT binary patch delta 4953 zcmY+IbyU<_*T;vJRB{+n=}|y(P`VrG5=rSs>H5KiA(a}Mp<4k329OIfz(_YkNlHqC zgwi~E*ZaQDd(R)|kF!4OthHn9y}vsQRtWn@iGyQ}pvK`R-mM@N69Iuh(uianW`qOI z9$*jqsx|G1t#D%ire$5^u-y?cY!iI)UJV7D8Az@cJmxwHeP1ql_iHoBfKv|tr14@P z^$aGnsWjR@9CW!TwiN8Kn3Iogy9JFZL@%4#pdKl%xEh-xh`F)*d9ZyGy319`e8uCv zXSPQ#HYa?GFB(oazNkCb*>{Ft9# zo!Hm-Lajv?#U=KBFe`Uk8jr|awl3!aKOU{evM6xhTzXeHAB>xi7ETfzd)XWT)M%y6R$%JcdfkUAwxhhVlul?dpKr(3+seeRCj%fwOLtNrOp!g()f&Pe+63&PvDI;Q<^F$N&#< zOU;Ck!B+z`H1GuP-Ef)txr7+I?T|hu(EfWiz5rax7DFr7p`pD6+n!xegjIeU%3t+3 zyx&zUqmG=VdrU%-Wt+DYEF5s_A3&gkVX&4Enza*p1$$GiR-(UmsKe;@zOL9kTY4&b z*?FO)a>9)<>`uMkkz7>lgxGSx&NC(cFcp&o&9Y9wqushM*;}Zc-nwQ?kU!SPzYOVG z@0WjnoG7tbpv*DE>Ap^M^-l`x&%Z=W@6ie-wf0&X2WpGfY6WpD=7oI7H)5Y)xMlu} z@dGT>VZa)l2km~4svMJ(tah-fm>W7IJ9F)U-3AG@<65sKcHyW;Ufl`Txq&*pU%dm@ zzz(qiK7(Y$2=3?atMXJ`XpQ;Iy&K~7eQ4)CrBx^l-5>8#Hp@4TVLF&U_`t%Feokl7 zNrG0IqBD(iB~8`+(No)hgE##Bu2LKE0sd-4L}zdIHw@W~=p??W=F75JWLH%eQfbWQ zhWd~1g|;B)cE5cejtc_mXyD<~fbQJ61459}+(Xb3Y6J9m5fK=Stdl&Wrz+uQ%P1;= zxQ}K|kxQvMDUKgQLzw6=Ixk3-6NetvDs^w!E{ZpJs5PMkH~Fce^wdvs!%(F#Me4hB z+i~u%>tB;gx1dawwB@|5=J1gr+0Dj7CKi*qz_HW6%m*x;VGPlwn}M(R3R-CBBN}_| ze%kl+Qvoa&X6pyM7FH@}l4%VtCC2JbULl+;IcBGHE8E?*W zGTn7eoHBe|0b`EVS&%T&5nn}1oC3US3f?LQU?J6F3337{vIq}Q>1c)=i8Hw40sN`xFsamp?;n;FVn!e2K08HBk2yYujfY}Mznr>pUjgyUu- zqe`mEUJXl)6PetyyKgl!NB|`;k1!cW(S4`jx>==cvYuPexU)3>uKly4GKU z10UxFor~w8i<~<|i{7?9vF#q&;oprvSvFn4)61J|dxG0XmyBvmaF#Z3%CmXiM$l`q zlBd+s*2p&0VBLcfmdg>vu_&RE$Xi4)fGVmiOyYh=)i*KPH`XdNz(QefXgHQiX$MQ! za`sAz#abfb(yPcFp|h1sc{fbu)O~_f#w{rCYBYh2%B!$o8;vm!_b}1!fyf)z7 zMGjZVLMu(zkgw>buG8*ZLIV|{wi4RDLyt#@Ltc5i@L9~IPxgLr^%kKoMra zFq8zS9IwP&V;Td z3hHG(?N(go+(<~iUVQ@;!QY;(t8-<+A7$BdqM+O`H8DJIhtW0-V&HARw;J|X7k49u zSFY}Z0Nw2mFo#Y2c^3HWqh0l0P@I2TnP}QNhcQvcD+ktd3t8|76DWer`{Fx12c6(SmUO2Kn12-UCH{1*tieq@6Z4~|GPmf&V>}7;*MmLs+BhO0K&oo|L6bByd zI&&^YYRQi0HVYpQejfS!+TrHc?Z_>j6$wD)-{;M|B&=zYSINmbAsE`t4>-AW^GnWvF=x_K*bphI#%9OO%5F zhr^lyzQQ}@BbDoX=>jOBfD7v3Te9Ku(by{49JD($eC!J9R93sX6own_ZdL>FeR*Eg z$}P2(saGKO*N?{cZSTRQrpIfog;ULC9$FXY)aj>*Z}LzAZ&^-!??*Y{i%$b3>{5Rx zzvf*M>K*Q{9ZgmMg1Vt%W96@-3ot*n#<)L8nAPvrojAT~3Ch3Z^os4HQk`2m6Z}V*#L5i%PHQl_Xp+IR2^UF39L%l>U?e^l;V*5=U3L{8T&Y zg*jzR;)GbX`tm~y`&X#N&8THY1`AsH;OB&n{#y6@PDoYo`C0lJ1IfnEU^V53;`C?7 zJyD{;D)+VCNc>`E`DB*zWaJ*VtpUN7^ZDGx!t6V@EGCXwzaO7z7Qeg!+IMFB&;J0*g!M?LYKPI}^RbIwBVp#!*@Nb2-uW!%y#%7wo+U!4eZ zdzRT$nQrVow=)dHW#jfNB-mO@HTQ)qlIfTXVj9fp1BM?@ihqh7hOp1t4eIyUGKByHRa&Q2cAmUr zp!hnII5`%J8G5Q2CuB>cInVxKr_IuE+Q-7_0rh%VtlFZlT9ueKFxzLs05jQ{_*?LF zTQoewY|JM`s_PuWUnB^72zC9dG2bJ#{I8R@uRM+XD~%dgf|U+U@0pRCS-oD;0#oApx+%&9pPgxgEw=pfeCVrm$k@WNvz6-xTxBToQd`mw za$LSN7B8d9qFMj#5s`J%{@1Cw#|xxcnq1?^^1-NVQdb|{*U5E3Z9%n5Q(3)30Z8KcXZL@>AOr{H80w18#b{m@ovao~fsL!tc z=^YS_j=TAI0RzdW5p+&bi8i8^2GO!3<0`M~tqh9oDvQjHH3P6D;#)|J1~3duO+n6q z<@i~J6PonjL<>gYr>qGuN*eG0Lr6`Xyh7LVUD>$Tp_oMxyEl4_BYD?k;F~^sGS=g! zmKtR+KOqDdGRhVY*Ji80=U;9Lw@~~fLV8X4js+QJ^`RDc`HfX;(Aykh4ND3eh$f@) zryF^|f_t6jj?$;=u8$D$U<=AZCknh^$eiiwJ#AE>e?)v^C*H-+HH(%tgDy@R@p{QV zmg<}w=ePKZY52k1S{w1zywz}C&V8xC_|9U4i%C1cSJ&;9y-&AkAuUqVemnO7LO`}m zK~73`_lz{o^{$1aZLqAGgXDI>)|h!Kv+l74J&ToDAVuGPd)8(z#p_9#C?_Ze!55qiuX| zq~kqMz#x^+I)OVmMH1N=B55Lr?o@)i!SkV-&=a1MhbNV?w^f}ZwEWODS`rep4!z!| zVozghx#bXef=-svrqP+~vI5*Pl>ARiB55V<3icudfu_m-X-V>w$^gxcy_i;G&IFg? z97lDNk${r7na)!w5hL~;YCBQ64>fk*Yy+Y_< z`TP%mfmh-YwVuSH5Fl>S_xoWN)*XHGZc==o)mvhuWzq<(TYf(Dlz>IpRTSg6_6E+N z_=2z&gSXJ4*Ry)Oc zmO2vZ613IkqLkJqJjksAyv{2lty<9rlqDexX-a7v!?ciS+60Zi*G&yqy^l zBFt^0{ScOBbC%PW)mp@F9&G;5XW@F`gK5gmi+Mpz5VcjK(+PNTXRC|%QAhn;ovL_| z3a(w2aG&>7>55)4p)X_`bKIa2mh=ildbpY|{#^95>q~jQM`24vinTKFaKe%Yb^4HH z^hdpb?)i7uE{FRPMQ}VY8VgBDw{GxJc&V5>nqP?%)sSN-Y@olGHr8=}&(_QY(J_)B zrV#bj<+)8J+gpI!+gPPUH>u!}-|Iq0MMqcNE@Fud{_C860qnL*hAM3vWkS!qS6slB zQ+S#B>XA4*DM!7w#TBw6H(#pKU-ZKY!FLDR=ULZ8`0J!2kAebF!7n6a-UrRO0-T3* zt$XqdcjF?dBc-ilKWaW{Zfa)5Pm|Q+M9$7#-E^VTa?JsUtc25BhC?JuypV9UJo%Zn zEt^GRwrz#EM2AC2&qx0!I?u{Z2(?Soaus*4LTSkuGwMZ{@<_M`Em8f+ESajUMeLA` zV=2~}iQ~!#H1#=f;}WM1ZXiuE|2Z#Z&6t>ZFY}w^7##cF;S|nvZmFuon@2PEuT;lc z3=S+9;arj%-K4)Bw=(bzIuycTnO$rwD6cu2@s+|-l?cxGIHgG&XPUwZl#-QKkIj_L zIrvZRoIg+Bdh}c19wGp`Jc55#NeDJ@0FEXC36{k};D8XdICO|pFqrwjs|XNC3Pk*S z;q<>}^*4osD~oWV2Q&YF(G2?+#fATe5=0EsvoimlpZ{lk27!eCMO_j6p`Zw12nX|j zD;fyI_bFx%>T~Y)AU2>&sX{4nDkzPbtKpLc$?gmjBNnyEq z=eys%zw^hLGiRPTGjBcTecmF;P{~?yAci9joB}9_A5-FMD**ri9>bG?OmJ7=0dxhN zsx$j+vI4Sj^CiqfX|gXOnr%uzS;TTYRa+N6qWE@yG%Zh)6@eDWZwsQ3)7YC(&H6esF#y2Sh&M*@JVX$5w6HL593%lgqW_s>jFcL!*OVhfIOe*b zh-~;qsT!2Yin8adn@G9(e{{ZwL+PCKg6P;DfbAsxqeY8O4H*vX$iv?z1xZ9!sBt@l z>7S}Ekmm>7H*C^GmL3k=80TKdZf__5b}ksu#jwSpA|S%$!lJJeSz-m}<;^^tpzJ8+ z&2cMds?*`$@V~w_Qk{x88%sCzDN!;1iH2}lSNZL&T%%6kT|cUuuhX4ggzgcwRmOeB z%e~K%=%Fu?(bF-%2JH@T5Z;1b_ospJ*Cm>HEKY1f8V3T-2V6} z8d=Ngo#}t@HHHriyfkM^Gz9$Iw^I-OZL|ZCTWjdbSevT4HF*?NRUb-x(f_S|NV?{n zeBa6EX0}dT{TxGLuIK#mz&eiSg~7`TX@1%2N5)J!9RPi8Ts%04W?>Kr04QR@Q-F+c zMJ!FIydH)U*=xV@fY6FiyES#NM)j}cz9$UCeLc}46Fo2wX;b-@MF|9943k3ts=Y&W zslw2sLh(Ljc;0+A!pqgxbydOE7C2R>S`lSAZyY&;l`>IRTMv524PkK(TF^@^@4NJC zDuO?$NIX%BR5l}eLPqG%V%_vbwDGaEno1sYXe~F8xB6H_n_Dt?p)Z9%u#}2PEeTIo z)Y}4>!1M@0iZ``c*q}GZOnfF?z8_-IH@K9p-rZ_cqT;)fFCXx<3iM;-UTe3jbVo0N zC@8_$SHi)6!A)vv(1~(5F2?t37gXJ(!}7+QbN{w(uAi4x>_E}{cS7TAL*!DzVR;c$ z&M7ML_OqcVq~|N`ph@~qWW52K*F#W~)2rf^nA#N6zRg|-*z7?9f`sPhK9g~6S3pb& zRWrpd$&CI*{hae{*7a?|K;v5eLs@C*Z#oT2kB0rCuc-&@fpG%gXeo(eaX2DM_5S+4 zdBTX-<&W(>DDqLro6TMs_O2^v<48_-ZW&a;@DFP+d5DG{Xa2OoakeRtHh zTL8VkVd!M@APRUoMjYaaql}2!J?>nX(5|7`w?J!E&CBttZ|t3iI`atQKnhsAm)8%W zHOS_6uWTg(5!k!E>x>nHq(%^tM?bI|yqzHA07`@N>heX^HjJ~kO=og$Xf}2pFN)u z%#TM520$8SJUp!)V~WwMSD5(u4? zuj1XcpWU*FMK^Wg#EHnK3)W|zZlCh=`?ptXXW96s_u{sscm2-7KYNIlrxb%mZ%PvP zN<44T(rM||FKpCqYTDIfnMRl*YfL+qgG}v$4TVe)@#*|8<~zP*xdnQQ*p&F16!Xno zwrvmKQ-rOGVvc?C?Qpo(J|OcNu((R*EOoMO!a#Oo>Ta9m;EF7;a*~pLd98Q{9(QpI zTknULRK|-IN8ZCr;)^R;Q-q)&C?=)`1}BO|$CycWjZG%fL|h(cXnXh+$4uI##%5IS zHc|TgkSbT`-BWdp@11VUs3dKi9%Bh^EH^AR;*c37u1lHz!-cqxj z$s`!5+FC-s)yL4~5C&t_P1j+uyCSqSb0K}C2wF~T^aFKD3kSg0HH( zm*GphFM3g&S)HQDxk%1rnie5p?qkKm2f~8hDi1gc37oNluwd9~Se#g#*vMPbzpQYC zoz8TL2>@W!;QpJELkSe2RsjrVROm$K=gz8$RMVHO38;z$p*eU9gusWVDGz5jCDs0O z+1FBG=DazlB-fsIDIiRNq9viRTR`A?7_NQT2pi$?5F!5?$~Z5zhx3Up9{gkbeizcg z1zxM8`Oy2_Pf%RpI6DGsF`NENqDiyXQtQQI7n6bjYp8Y*f}shzu;SQQt%T>?oM5AZ zAa*nA=%^FG^t3LVeIZ}T0@BFp1ooak*f!38Wq`)2VSS@2I1Bnl8SgT|A=90cyo{Q{^g)4%35Yi$ znF3Ro(9>CK6_Hwm2||YrF+jb3t!eh3Ldw=LBAS=P_cO+0L%8MlvJCB8c)&ry{;Si& zC~%h0Gg%PFZyteKBW%J27 zP`0rn2Eq%C(hSjkz?81@(e;rDu^5I|-YjuS@{mxF=!*gWu&Y3$J1~LNvCN&X^&O;J zO1y2*`3IvCu@^pjw)lE%XRm3ZcwSB)jW=J^SOn`+rW1*f6j%Kp=!b8&z0C|yRkdKY zhDw$e=zMfxor4u8P34Yupj1?Vu#hl_V^Sp4&y4^oDPZ+fsUH%Sub$Cia_pjm?J=WA z^JAVatB)x}`uLv0&j5Rny|4gbn>#NxE7&&a|G>M*6>PcFt_D#F!YEd}XAEF3Z+r6t z%fgfS@zhI|v-llyP!xN{E8R4ks$l=m&$#c~`^&0vcb;(*RzGU1^mPp++>vBg9~!&% z9QDbA?s*TEo7X@VpAI)?>o$)>;&PoJJ39k+;|@(iB%(}0I`{1dwEGX752;XB^fM9l zzx4|{;074;lh(wm8by2qvt6SBsW4)-cNT_HjFy7OLv)#D$o97eHOd#AJt{Ze!f6tSN@3d`ZRIo^r)BQ&JQ0@k;MotI6KXn) zOZ}DLk$k#u*0lU6w+_#C?S)h3tA=i+b695wNx_n4FU(0@uU>VNRXzm8neF_1W`WYz zNqy<+cpW}J=ikNkl21~+ZTxP3HpZM2`EHn9-Dx)16_ic6hm8_<7ur)rAxpcqpK^kr zK7uK(Dx-vq=WsDanHKRDRKeax#qS8WjvvJ+DGHde% z1WHoBS(u^(wVP{HW?mSZMtpR3bE}*duv#I$6ZF2jZ+DcCb4Y*5pUqS-yR6lH@{vAw ztERM?*lLvJb=q;9eTu8dQCyAt+;f;4ly0exz7507JP}N--!rK2sp`(bSJ_<%A|9Zn zCQqTAz6^64k~J09q+yhtQ(e^8@;%ac?|VS`NHT_&PzZ*V`pZG``|W!LdkRhsq2!nF ziwC{(3R~brakURRF2VQVH0VwTB883M+Ceo1oN&q=Zk_zjq=zQ>TgUKFA-48NXw-y8 zRbuFH1Lu8Y-73PrEccs+n>NV%97{1Q^H_AFsCace-V=o~mQ)X%oHx6A6C2_Jz5#3^ zTJs(2*{(A8K)6|lXognalaw0YD8is^9#3PE<33hT-Gj}8*ZhoY?Wd0k)I(PaPg$3G zL=REV<;ozQ_?ZSoUFla}Xk<#Dk$f$B_Q2y#sC%2*-gB-_T*19Kbx@-~Q0S*8HP^yK zq{5QvHbnwP>Coa!9#g*gCQM_rPxS3$BwDtnKS|Z0n)rFVzJd&Sl;&-t^c%Zwse&ZD z4u&g|L>oo9#xm$Bpl^$%F1zVso%!pnSYKlJ3X%SO9iUVhfQj`wo&F7!`tX)gfosG! zZTAd+6a5;M1d_kPzAi9S&wFz>BeQ`WxZV-Inp0^%vqtviCmBJ~aUfF(0VY8(!K!JN z39TWmDXjtUo+Ijr+uD?yH;ocm<*mAo{E8Xn5|u<5r0im%_7vRB#J&H7KooLoVl{jt8g;k~(9>m&MlF{E3>C-B#Hz#hj3X)S;ek zgFQH9S+f&?rY;Eib^3r?W3NO(>(*71yiyr9pC|1$cA4ijHfFc_1~Aue1GAALGVZaV zk`*P9ujv`D#3>4TSbQ^exjMa5Kx%>$&#JH^b{Hr}E1lP6-qMpp1nu?s;`eLA9bpGu z_Q?BX_fmH3%d}~SK{- zjf+n|V@9$q44B&`<1J68aUR)Kz0WL0nFH4+-)@ZDP^o!j!GQkuel6=w*qVJ`Cnr5! zBrKRHy}@X)te=~{8S0R|7_!}Yd zTG%tayRhiQNA9%yX6xdOI z(|qT2^GTW`d7r7xe^-qvlkmNmHIX&`Xm%kx#AWBRNmySXNX0OxyYHFGSV0~f)n{?g z1%6Plk5OY=7_Ro5*t+|i**xAK{HvDoXI`R1uX&=uE%Dz3csa1uvhzonNd9R<{wquX z0C)kA1YQa1fJPavdQA$GJuZhVlt#G<&v;^91UqUZPs}1~!^UN_lo&QjDN=I-dm)Z` z%|=rQwDc{pTw$y_n!ATXM>PzXx_N~B5_cq9(DC~I78^ict7ku%8T(2Z=UXtd`ovW> zrJBL&JAEjvMrEubUJIs7v8{&cYVb0H@G2#%df|c_G@Qr7T-&?bU1M!8;$_eh!-sEI z=2*M?sXUw^GhhL%oVQ}9rUpfIl$jgsI}V-3@J>&w4@fEdvT|;kg%V{A6*%L8|NFfj zhiHpeXJOAV77y+#`lrHgqj~YC?l}__rHfx525eMhvZqo5WqCgIVe!VbrWC*D+rP)) z5W#4whOWMvpIVmd!6XREsPnbK2;08U&q*dcq7oA?gcXm)s!6{i(3DhMU?|F9rSAe^ zxXQfxZtg!^x3t&Ol|Dzfma+4V*CHG7!lFQzeui9n(f6bOPwv^;WjROSgc?6v23e*q z>8SPWpqxw3&|cT9-bKRuml5oaGiZ@IlNy(32oyUhgwEz9x&5hCH$%ru_N2G4&c0Xt zL`lcn@hv;;$xQc*Vqxv8C4qP1j<8BQ)H^~tzJm77)C%F>yUQ%Q^K&>`aBXb9Bsh@a zT2hpOfsgHQ&1}R4%QZSikiR4kD~_GevNre7s`l*_b30$)N}k}BWo=Fk{nT!CMy-Un zgJ?V9lWv@)gReTo+VqF+ArHLmB1(#?i&BGxji=W Date: Sat, 14 May 2016 17:57:41 +0100 Subject: [PATCH 06/10] Capture file moves to separate Node implementation code into its own gradle module and leave only demo code in top level src folders. I have to temporarily break\disable the IRS demo to which has a circular dependency. Will fix next. --- .idea/modules.xml | 3 + build.gradle | 61 +------- node/build.gradle | 132 ++++++++++++++++++ .../src}/main/kotlin/api/APIServer.kt | 0 .../src}/main/kotlin/api/APIServerImpl.kt | 0 {src => node/src}/main/kotlin/api/Config.kt | 0 {src => node/src}/main/kotlin/api/Query.kt | 0 .../src}/main/kotlin/api/ResponseFilter.kt | 0 .../core/messaging/StateMachineManager.kt | 0 .../main/kotlin/core/node/AbstractNode.kt | 0 .../kotlin/core/node/AcceptsFileUpload.kt | 0 .../src}/main/kotlin/core/node/Node.kt | 4 +- .../kotlin/core/node/NodeConfiguration.kt | 0 .../core/node/services/AbstractNodeService.kt | 0 .../services/InMemoryUniquenessProvider.kt | 0 .../core/node/services/NetworkMapService.kt | 0 .../node/services/NodeAttachmentService.kt | 0 .../core/node/services/NodeInterestRates.kt | 0 .../core/node/services/NotaryService.kt | 0 .../core/node/services/RegulatorService.kt | 0 .../core/node/services/TimestampChecker.kt | 0 .../servlets/AttachmentDownloadServlet.kt | 0 .../core/node/servlets/DataUploadServlet.kt | 0 .../node/storage/PerFileCheckpointStorage.kt | 0 .../subsystems/ArtemisMessagingService.kt | 0 .../node/subsystems/DataVendingService.kt | 0 .../subsystems/E2ETestKeyManagementService.kt | 0 .../subsystems/InMemoryIdentityService.kt | 0 .../subsystems/InMemoryNetworkMapCache.kt | 0 .../core/node/subsystems/NodeWalletService.kt | 0 .../node/subsystems/StorageServiceImpl.kt | 0 .../kotlin/core/node/subsystems/WalletImpl.kt | 0 .../protocols/ProtocolStateMachineImpl.kt | 0 .../main/kotlin/core/testing/IRSSimulation.kt | 0 .../core/testing/InMemoryMessagingNetwork.kt | 0 .../core/testing/MockIdentityService.kt | 0 .../core/testing/MockNetworkMapCache.kt | 0 .../src}/main/kotlin/core/testing/MockNode.kt | 0 .../main/kotlin/core/testing/Simulation.kt | 0 .../kotlin/core/testing/TradeSimulation.kt | 0 .../core/utilities/ANSIProgressRenderer.kt | 0 .../main/kotlin/core/utilities/AddOrRemove.kt | 0 .../kotlin/core/utilities/AffinityExecutor.kt | 0 .../main/kotlin/core/utilities/JsonSupport.kt | 0 .../kotlin/protocols/TwoPartyTradeProtocol.kt | 0 .../src}/main/resources/core/node/cities.txt | 0 .../resources/core/testing/example.rates.txt | 0 .../main/resources/core/testing/trade.json | 0 .../test/java/core/crypto/Base58Test.java | 0 .../src}/test/kotlin/contracts/CashTests.kt | 0 .../kotlin/contracts/CommercialPaperTests.kt | 0 .../test/kotlin/contracts/CrowdFundTests.kt | 0 .../src}/test/kotlin/contracts/IRSTests.kt | 0 .../src}/test/kotlin/core/MockServices.kt | 0 .../test/kotlin/core/TransactionGroupTests.kt | 0 .../kotlin/core/messaging/AttachmentTests.kt | 0 .../core/messaging/InMemoryMessagingTests.kt | 0 .../messaging/TwoPartyTradeProtocolTests.kt | 0 .../core/node/AttachmentClassLoaderTests.kt | 0 .../core/node/NodeAttachmentStorageTest.kt | 0 .../services/InMemoryNetworkMapServiceTest.kt | 0 .../node/services/NodeInterestRatesTest.kt | 0 .../core/node/services/NotaryServiceTests.kt | 0 .../node/services/TimestampCheckerTests.kt | 0 .../node/services/UniquenessProviderTests.kt | 0 .../storage/PerFileCheckpointStorageTests.kt | 0 .../ArtemisMessagingServiceTests.kt | 0 .../subsystems/InMemoryNetworkMapCacheTest.kt | 0 .../node/subsystems/NodeWalletServiceTest.kt | 0 .../kotlin/core/serialization/KryoTests.kt | 0 .../TransactionSerializationTests.kt | 0 .../test/kotlin/core/testutils/TestUtils.kt | 0 .../core/utilities/AffinityExecutorTests.kt | 0 .../utilities/CollectionExtensionTests.kt | 0 .../kotlin/core/visualiser/GraphStream.kt | 0 .../core/visualiser/GroupToGraphConversion.kt | 0 .../kotlin/core/visualiser/StateViewer.form | 0 .../kotlin/core/visualiser/StateViewer.java | 0 .../test/resources/core/node/isolated.jar | Bin .../test/resources/core/visualiser/graph.css | 0 settings.gradle | 3 +- .../{ => demos}/api/InterestRateSwapAPI.kt | 3 +- 82 files changed, 143 insertions(+), 63 deletions(-) create mode 100644 node/build.gradle rename {src => node/src}/main/kotlin/api/APIServer.kt (100%) rename {src => node/src}/main/kotlin/api/APIServerImpl.kt (100%) rename {src => node/src}/main/kotlin/api/Config.kt (100%) rename {src => node/src}/main/kotlin/api/Query.kt (100%) rename {src => node/src}/main/kotlin/api/ResponseFilter.kt (100%) rename {src => node/src}/main/kotlin/core/messaging/StateMachineManager.kt (100%) rename {src => node/src}/main/kotlin/core/node/AbstractNode.kt (100%) rename {src => node/src}/main/kotlin/core/node/AcceptsFileUpload.kt (100%) rename {src => node/src}/main/kotlin/core/node/Node.kt (98%) rename {src => node/src}/main/kotlin/core/node/NodeConfiguration.kt (100%) rename {src => node/src}/main/kotlin/core/node/services/AbstractNodeService.kt (100%) rename {src => node/src}/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt (100%) rename {src => node/src}/main/kotlin/core/node/services/NetworkMapService.kt (100%) rename {src => node/src}/main/kotlin/core/node/services/NodeAttachmentService.kt (100%) rename {src => node/src}/main/kotlin/core/node/services/NodeInterestRates.kt (100%) rename {src => node/src}/main/kotlin/core/node/services/NotaryService.kt (100%) rename {src => node/src}/main/kotlin/core/node/services/RegulatorService.kt (100%) rename {src => node/src}/main/kotlin/core/node/services/TimestampChecker.kt (100%) rename {src => node/src}/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt (100%) rename {src => node/src}/main/kotlin/core/node/servlets/DataUploadServlet.kt (100%) rename {src => node/src}/main/kotlin/core/node/storage/PerFileCheckpointStorage.kt (100%) rename {src => node/src}/main/kotlin/core/node/subsystems/ArtemisMessagingService.kt (100%) rename {src => node/src}/main/kotlin/core/node/subsystems/DataVendingService.kt (100%) rename {src => node/src}/main/kotlin/core/node/subsystems/E2ETestKeyManagementService.kt (100%) rename {src => node/src}/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt (100%) rename {src => node/src}/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt (100%) rename {src => node/src}/main/kotlin/core/node/subsystems/NodeWalletService.kt (100%) rename {src => node/src}/main/kotlin/core/node/subsystems/StorageServiceImpl.kt (100%) rename {src => node/src}/main/kotlin/core/node/subsystems/WalletImpl.kt (100%) rename {src => node/src}/main/kotlin/core/protocols/ProtocolStateMachineImpl.kt (100%) rename {src => node/src}/main/kotlin/core/testing/IRSSimulation.kt (100%) rename {src => node/src}/main/kotlin/core/testing/InMemoryMessagingNetwork.kt (100%) rename {src => node/src}/main/kotlin/core/testing/MockIdentityService.kt (100%) rename {src => node/src}/main/kotlin/core/testing/MockNetworkMapCache.kt (100%) rename {src => node/src}/main/kotlin/core/testing/MockNode.kt (100%) rename {src => node/src}/main/kotlin/core/testing/Simulation.kt (100%) rename {src => node/src}/main/kotlin/core/testing/TradeSimulation.kt (100%) rename {src => node/src}/main/kotlin/core/utilities/ANSIProgressRenderer.kt (100%) rename {src => node/src}/main/kotlin/core/utilities/AddOrRemove.kt (100%) rename {src => node/src}/main/kotlin/core/utilities/AffinityExecutor.kt (100%) rename {src => node/src}/main/kotlin/core/utilities/JsonSupport.kt (100%) rename {src => node/src}/main/kotlin/protocols/TwoPartyTradeProtocol.kt (100%) rename {src => node/src}/main/resources/core/node/cities.txt (100%) rename {src => node/src}/main/resources/core/testing/example.rates.txt (100%) rename {src => node/src}/main/resources/core/testing/trade.json (100%) rename {src => node/src}/test/java/core/crypto/Base58Test.java (100%) rename {src => node/src}/test/kotlin/contracts/CashTests.kt (100%) rename {src => node/src}/test/kotlin/contracts/CommercialPaperTests.kt (100%) rename {src => node/src}/test/kotlin/contracts/CrowdFundTests.kt (100%) rename {src => node/src}/test/kotlin/contracts/IRSTests.kt (100%) rename {src => node/src}/test/kotlin/core/MockServices.kt (100%) rename {src => node/src}/test/kotlin/core/TransactionGroupTests.kt (100%) rename {src => node/src}/test/kotlin/core/messaging/AttachmentTests.kt (100%) rename {src => node/src}/test/kotlin/core/messaging/InMemoryMessagingTests.kt (100%) rename {src => node/src}/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt (100%) rename {src => node/src}/test/kotlin/core/node/AttachmentClassLoaderTests.kt (100%) rename {src => node/src}/test/kotlin/core/node/NodeAttachmentStorageTest.kt (100%) rename {src => node/src}/test/kotlin/core/node/services/InMemoryNetworkMapServiceTest.kt (100%) rename {src => node/src}/test/kotlin/core/node/services/NodeInterestRatesTest.kt (100%) rename {src => node/src}/test/kotlin/core/node/services/NotaryServiceTests.kt (100%) rename {src => node/src}/test/kotlin/core/node/services/TimestampCheckerTests.kt (100%) rename {src => node/src}/test/kotlin/core/node/services/UniquenessProviderTests.kt (100%) rename {src => node/src}/test/kotlin/core/node/storage/PerFileCheckpointStorageTests.kt (100%) rename {src => node/src}/test/kotlin/core/node/subsystems/ArtemisMessagingServiceTests.kt (100%) rename {src => node/src}/test/kotlin/core/node/subsystems/InMemoryNetworkMapCacheTest.kt (100%) rename {src => node/src}/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt (100%) rename {src => node/src}/test/kotlin/core/serialization/KryoTests.kt (100%) rename {src => node/src}/test/kotlin/core/serialization/TransactionSerializationTests.kt (100%) rename {src => node/src}/test/kotlin/core/testutils/TestUtils.kt (100%) rename {src => node/src}/test/kotlin/core/utilities/AffinityExecutorTests.kt (100%) rename {src => node/src}/test/kotlin/core/utilities/CollectionExtensionTests.kt (100%) rename {src => node/src}/test/kotlin/core/visualiser/GraphStream.kt (100%) rename {src => node/src}/test/kotlin/core/visualiser/GroupToGraphConversion.kt (100%) rename {src => node/src}/test/kotlin/core/visualiser/StateViewer.form (100%) rename {src => node/src}/test/kotlin/core/visualiser/StateViewer.java (100%) rename {src => node/src}/test/resources/core/node/isolated.jar (100%) rename {src => node/src}/test/resources/core/visualiser/graph.css (100%) rename src/main/kotlin/{ => demos}/api/InterestRateSwapAPI.kt (99%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 7efdc3f6e2..3f38645c0c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -11,6 +11,9 @@ + + + diff --git a/build.gradle b/build.gradle index a6d23adc24..7bfeebd214 100644 --- a/build.gradle +++ b/build.gradle @@ -50,73 +50,16 @@ configurations { // build/reports/project/dependencies/index.html for green highlighted parts of the tree. dependencies { - compile project(':contracts') - - compile "com.google.code.findbugs:jsr305:3.0.1" - compile "org.slf4j:slf4j-jdk14:1.7.13" + compile project(':node') compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" compile "org.jetbrains.kotlinx:kotlinx-support-jdk8:0.1" - compile "com.google.guava:guava:19.0" - - // JOpt: for command line flags. - compile "net.sf.jopt-simple:jopt-simple:4.9" - // Quasar: for the bytecode rewriting for state machines. quasar "co.paralleluniverse:quasar-core:${quasar_version}:jdk8@jar" - // Artemis: for reliable p2p message queues. - compile "org.apache.activemq:artemis-server:${artemis_version}" - compile "org.apache.activemq:artemis-core-client:${artemis_version}" - - // JAnsi: for drawing things to the terminal in nicely coloured ways. - compile "org.fusesource.jansi:jansi:1.11" - - // GraphStream: For visualisation - compile "org.graphstream:gs-core:1.3" - compile "org.graphstream:gs-ui:1.3" - compile("com.intellij:forms_rt:7.0.3") { - exclude group: "asm" - } - - // Force commons logging to version 1.2 to override Artemis, which pulls in 1.1.3 (ARTEMIS-424) - compile "commons-logging:commons-logging:1.2" - - // Web stuff: for HTTP[S] servlets - compile "org.eclipse.jetty:jetty-servlet:${jetty_version}" - compile "org.eclipse.jetty:jetty-webapp:${jetty_version}" - compile "javax.servlet:javax.servlet-api:3.1.0" - compile "org.jolokia:jolokia-agent-war:2.0.0-M1" - compile "commons-fileupload:commons-fileupload:1.3.1" - - // Jersey for JAX-RS implementation for use in Jetty - compile "org.glassfish.jersey.core:jersey-server:${jersey_version}" - compile "org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey_version}" - compile "org.glassfish.jersey.containers:jersey-container-jetty-http:${jersey_version}" - // NOTE there is a Jackson version clash between jersey-media-json-jackson (v2.5.4) and jackson-module-kotlin (v.2.5.5) - // Have not found an Issue in the issue tracker for Jersey for this issue - compile ("org.glassfish.jersey.media:jersey-media-json-jackson:${jersey_version}") { - exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations' - exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind' - exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core' - } - compile ("com.fasterxml.jackson.module:jackson-module-kotlin:2.5.5-2") { - exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations' - } - compile "com.fasterxml.jackson.core:jackson-annotations:2.5.5" - - // Coda Hale's Metrics: for monitoring of key statistics - compile "io.dropwizard.metrics:metrics-core:3.1.2" - - // JimFS: in memory java.nio filesystem. Used for test and simulation utilities. - compile "com.google.jimfs:jimfs:1.1" - - // TypeSafe Config: for simple and human friendly config files. - compile "com.typesafe:config:1.3.0" - // Unit testing helpers. testCompile 'junit:junit:4.12' testCompile 'org.assertj:assertj-core:3.4.1' @@ -165,7 +108,7 @@ task getIRSDemo(type: CreateStartScripts) { // TODO: Make this task incremental, as it can be quite slow. //noinspection GroovyAssignabilityCheck -task quasarScan(dependsOn: ['classes', 'core:classes', 'contracts:classes']) << { +task quasarScan(dependsOn: ['classes', 'core:classes', 'contracts:classes', 'node:classes']) << { ant.taskdef(name:'scanSuspendables', classname:'co.paralleluniverse.fibers.instrument.SuspendablesScanner', classpath: "${sourceSets.main.output.classesDir}:${sourceSets.main.output.resourcesDir}:${configurations.runtime.asPath}") delete "$sourceSets.main.output.resourcesDir/META-INF/suspendables", "$sourceSets.main.output.resourcesDir/META-INF/suspendable-supers" diff --git a/node/build.gradle b/node/build.gradle new file mode 100644 index 0000000000..9255c0475e --- /dev/null +++ b/node/build.gradle @@ -0,0 +1,132 @@ +group 'com.r3cev.prototyping' +version '1.0-SNAPSHOT' + +apply plugin: 'java' +apply plugin: 'kotlin' + +repositories { + mavenLocal() + mavenCentral() + maven { + url 'http://oss.sonatype.org/content/repositories/snapshots' + } + jcenter() +} + + +//noinspection GroovyAssignabilityCheck +configurations { + quasar + + // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment + runtime.exclude module: 'isolated' +} + +// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in +// build/reports/project/dependencies/index.html for green highlighted parts of the tree. + +dependencies { + compile project(':contracts') + + compile "com.google.code.findbugs:jsr305:3.0.1" + compile "org.slf4j:slf4j-jdk14:1.7.13" + + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" + compile "org.jetbrains.kotlinx:kotlinx-support-jdk8:0.1" + + compile "com.google.guava:guava:19.0" + + // JOpt: for command line flags. + compile "net.sf.jopt-simple:jopt-simple:4.9" + + // Artemis: for reliable p2p message queues. + compile "org.apache.activemq:artemis-server:${artemis_version}" + compile "org.apache.activemq:artemis-core-client:${artemis_version}" + + // JAnsi: for drawing things to the terminal in nicely coloured ways. + compile "org.fusesource.jansi:jansi:1.11" + + // GraphStream: For visualisation + compile "org.graphstream:gs-core:1.3" + compile "org.graphstream:gs-ui:1.3" + compile("com.intellij:forms_rt:7.0.3") { + exclude group: "asm" + } + + // Force commons logging to version 1.2 to override Artemis, which pulls in 1.1.3 (ARTEMIS-424) + compile "commons-logging:commons-logging:1.2" + + // Web stuff: for HTTP[S] servlets + compile "org.eclipse.jetty:jetty-servlet:${jetty_version}" + compile "org.eclipse.jetty:jetty-webapp:${jetty_version}" + compile "javax.servlet:javax.servlet-api:3.1.0" + compile "org.jolokia:jolokia-agent-war:2.0.0-M1" + compile "commons-fileupload:commons-fileupload:1.3.1" + + // Jersey for JAX-RS implementation for use in Jetty + compile "org.glassfish.jersey.core:jersey-server:${jersey_version}" + compile "org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey_version}" + compile "org.glassfish.jersey.containers:jersey-container-jetty-http:${jersey_version}" + // NOTE there is a Jackson version clash between jersey-media-json-jackson (v2.5.4) and jackson-module-kotlin (v.2.5.5) + // Have not found an Issue in the issue tracker for Jersey for this issue + compile ("org.glassfish.jersey.media:jersey-media-json-jackson:${jersey_version}") { + exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations' + exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind' + exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core' + } + compile ("com.fasterxml.jackson.module:jackson-module-kotlin:2.5.5-2") { + exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations' + } + compile "com.fasterxml.jackson.core:jackson-annotations:2.5.5" + + // Coda Hale's Metrics: for monitoring of key statistics + compile "io.dropwizard.metrics:metrics-core:3.1.2" + + // JimFS: in memory java.nio filesystem. Used for test and simulation utilities. + compile "com.google.jimfs:jimfs:1.1" + + // TypeSafe Config: for simple and human friendly config files. + compile "com.typesafe:config:1.3.0" + + // Quasar: for the bytecode rewriting for state machines. + quasar "co.paralleluniverse:quasar-core:${quasar_version}:jdk8@jar" + + // Unit testing helpers. + testCompile 'junit:junit:4.12' + testCompile 'org.assertj:assertj-core:3.4.1' +} + +tasks.withType(Test) { + jvmArgs "-javaagent:${configurations.quasar.singleFile}" + jvmArgs "-Dco.paralleluniverse.fibers.verifyInstrumentation" +} +tasks.withType(JavaExec) { + jvmArgs "-javaagent:${configurations.quasar.singleFile}" + jvmArgs "-Dco.paralleluniverse.fibers.verifyInstrumentation" +} + + +// These lines tell gradle to run the Quasar suspendables scanner to look for unannotated super methods +// that have @Suspendable sub implementations. These tend to cause NPEs and are not caught by the verifier +// NOTE: need to make sure the output isn't on the classpath or every other run it generates empty results, so +// we explicitly delete to avoid that happening. We also need to turn off what seems to be a spurious warning in the IDE +// +// TODO: Make this task incremental, as it can be quite slow. + +//noinspection GroovyAssignabilityCheck +task quasarScan(dependsOn: ['classes', ':core:classes', ':contracts:classes']) << { + ant.taskdef(name:'scanSuspendables', classname:'co.paralleluniverse.fibers.instrument.SuspendablesScanner', + classpath: "${sourceSets.main.output.classesDir}:${sourceSets.main.output.resourcesDir}:${configurations.runtime.asPath}") + delete "$sourceSets.main.output.resourcesDir/META-INF/suspendables", "$sourceSets.main.output.resourcesDir/META-INF/suspendable-supers" + ant.scanSuspendables( + auto:false, + suspendablesFile: "$sourceSets.main.output.resourcesDir/META-INF/suspendables", + supersFile: "$sourceSets.main.output.resourcesDir/META-INF/suspendable-supers") { + fileset(dir: sourceSets.main.output.classesDir) + } +} + +jar.dependsOn quasarScan + diff --git a/src/main/kotlin/api/APIServer.kt b/node/src/main/kotlin/api/APIServer.kt similarity index 100% rename from src/main/kotlin/api/APIServer.kt rename to node/src/main/kotlin/api/APIServer.kt diff --git a/src/main/kotlin/api/APIServerImpl.kt b/node/src/main/kotlin/api/APIServerImpl.kt similarity index 100% rename from src/main/kotlin/api/APIServerImpl.kt rename to node/src/main/kotlin/api/APIServerImpl.kt diff --git a/src/main/kotlin/api/Config.kt b/node/src/main/kotlin/api/Config.kt similarity index 100% rename from src/main/kotlin/api/Config.kt rename to node/src/main/kotlin/api/Config.kt diff --git a/src/main/kotlin/api/Query.kt b/node/src/main/kotlin/api/Query.kt similarity index 100% rename from src/main/kotlin/api/Query.kt rename to node/src/main/kotlin/api/Query.kt diff --git a/src/main/kotlin/api/ResponseFilter.kt b/node/src/main/kotlin/api/ResponseFilter.kt similarity index 100% rename from src/main/kotlin/api/ResponseFilter.kt rename to node/src/main/kotlin/api/ResponseFilter.kt diff --git a/src/main/kotlin/core/messaging/StateMachineManager.kt b/node/src/main/kotlin/core/messaging/StateMachineManager.kt similarity index 100% rename from src/main/kotlin/core/messaging/StateMachineManager.kt rename to node/src/main/kotlin/core/messaging/StateMachineManager.kt diff --git a/src/main/kotlin/core/node/AbstractNode.kt b/node/src/main/kotlin/core/node/AbstractNode.kt similarity index 100% rename from src/main/kotlin/core/node/AbstractNode.kt rename to node/src/main/kotlin/core/node/AbstractNode.kt diff --git a/src/main/kotlin/core/node/AcceptsFileUpload.kt b/node/src/main/kotlin/core/node/AcceptsFileUpload.kt similarity index 100% rename from src/main/kotlin/core/node/AcceptsFileUpload.kt rename to node/src/main/kotlin/core/node/AcceptsFileUpload.kt diff --git a/src/main/kotlin/core/node/Node.kt b/node/src/main/kotlin/core/node/Node.kt similarity index 98% rename from src/main/kotlin/core/node/Node.kt rename to node/src/main/kotlin/core/node/Node.kt index 35780542a9..7e832baf29 100644 --- a/src/main/kotlin/core/node/Node.kt +++ b/node/src/main/kotlin/core/node/Node.kt @@ -1,7 +1,7 @@ package core.node import api.Config -import api.InterestRateSwapAPI +//import api.InterestRateSwapAPI import api.ResponseFilter import com.codahale.metrics.JmxReporter import com.google.common.net.HostAndPort @@ -103,7 +103,7 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration resourceConfig.register(Config(services)) resourceConfig.register(ResponseFilter()) resourceConfig.register(api) - resourceConfig.register(InterestRateSwapAPI(api)) + //resourceConfig.register(InterestRateSwapAPI(api)) // Give the app a slightly better name in JMX rather than a randomly generated one and enable JMX resourceConfig.addProperties(mapOf(ServerProperties.APPLICATION_NAME to "node.api", ServerProperties.MONITORING_STATISTICS_MBEANS_ENABLED to "true")) diff --git a/src/main/kotlin/core/node/NodeConfiguration.kt b/node/src/main/kotlin/core/node/NodeConfiguration.kt similarity index 100% rename from src/main/kotlin/core/node/NodeConfiguration.kt rename to node/src/main/kotlin/core/node/NodeConfiguration.kt diff --git a/src/main/kotlin/core/node/services/AbstractNodeService.kt b/node/src/main/kotlin/core/node/services/AbstractNodeService.kt similarity index 100% rename from src/main/kotlin/core/node/services/AbstractNodeService.kt rename to node/src/main/kotlin/core/node/services/AbstractNodeService.kt diff --git a/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt b/node/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt similarity index 100% rename from src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt rename to node/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt diff --git a/src/main/kotlin/core/node/services/NetworkMapService.kt b/node/src/main/kotlin/core/node/services/NetworkMapService.kt similarity index 100% rename from src/main/kotlin/core/node/services/NetworkMapService.kt rename to node/src/main/kotlin/core/node/services/NetworkMapService.kt diff --git a/src/main/kotlin/core/node/services/NodeAttachmentService.kt b/node/src/main/kotlin/core/node/services/NodeAttachmentService.kt similarity index 100% rename from src/main/kotlin/core/node/services/NodeAttachmentService.kt rename to node/src/main/kotlin/core/node/services/NodeAttachmentService.kt diff --git a/src/main/kotlin/core/node/services/NodeInterestRates.kt b/node/src/main/kotlin/core/node/services/NodeInterestRates.kt similarity index 100% rename from src/main/kotlin/core/node/services/NodeInterestRates.kt rename to node/src/main/kotlin/core/node/services/NodeInterestRates.kt diff --git a/src/main/kotlin/core/node/services/NotaryService.kt b/node/src/main/kotlin/core/node/services/NotaryService.kt similarity index 100% rename from src/main/kotlin/core/node/services/NotaryService.kt rename to node/src/main/kotlin/core/node/services/NotaryService.kt diff --git a/src/main/kotlin/core/node/services/RegulatorService.kt b/node/src/main/kotlin/core/node/services/RegulatorService.kt similarity index 100% rename from src/main/kotlin/core/node/services/RegulatorService.kt rename to node/src/main/kotlin/core/node/services/RegulatorService.kt diff --git a/src/main/kotlin/core/node/services/TimestampChecker.kt b/node/src/main/kotlin/core/node/services/TimestampChecker.kt similarity index 100% rename from src/main/kotlin/core/node/services/TimestampChecker.kt rename to node/src/main/kotlin/core/node/services/TimestampChecker.kt diff --git a/src/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt b/node/src/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt similarity index 100% rename from src/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt rename to node/src/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt diff --git a/src/main/kotlin/core/node/servlets/DataUploadServlet.kt b/node/src/main/kotlin/core/node/servlets/DataUploadServlet.kt similarity index 100% rename from src/main/kotlin/core/node/servlets/DataUploadServlet.kt rename to node/src/main/kotlin/core/node/servlets/DataUploadServlet.kt diff --git a/src/main/kotlin/core/node/storage/PerFileCheckpointStorage.kt b/node/src/main/kotlin/core/node/storage/PerFileCheckpointStorage.kt similarity index 100% rename from src/main/kotlin/core/node/storage/PerFileCheckpointStorage.kt rename to node/src/main/kotlin/core/node/storage/PerFileCheckpointStorage.kt diff --git a/src/main/kotlin/core/node/subsystems/ArtemisMessagingService.kt b/node/src/main/kotlin/core/node/subsystems/ArtemisMessagingService.kt similarity index 100% rename from src/main/kotlin/core/node/subsystems/ArtemisMessagingService.kt rename to node/src/main/kotlin/core/node/subsystems/ArtemisMessagingService.kt diff --git a/src/main/kotlin/core/node/subsystems/DataVendingService.kt b/node/src/main/kotlin/core/node/subsystems/DataVendingService.kt similarity index 100% rename from src/main/kotlin/core/node/subsystems/DataVendingService.kt rename to node/src/main/kotlin/core/node/subsystems/DataVendingService.kt diff --git a/src/main/kotlin/core/node/subsystems/E2ETestKeyManagementService.kt b/node/src/main/kotlin/core/node/subsystems/E2ETestKeyManagementService.kt similarity index 100% rename from src/main/kotlin/core/node/subsystems/E2ETestKeyManagementService.kt rename to node/src/main/kotlin/core/node/subsystems/E2ETestKeyManagementService.kt diff --git a/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt b/node/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt similarity index 100% rename from src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt rename to node/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt diff --git a/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt b/node/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt similarity index 100% rename from src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt rename to node/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt diff --git a/src/main/kotlin/core/node/subsystems/NodeWalletService.kt b/node/src/main/kotlin/core/node/subsystems/NodeWalletService.kt similarity index 100% rename from src/main/kotlin/core/node/subsystems/NodeWalletService.kt rename to node/src/main/kotlin/core/node/subsystems/NodeWalletService.kt diff --git a/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt b/node/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt similarity index 100% rename from src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt rename to node/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt diff --git a/src/main/kotlin/core/node/subsystems/WalletImpl.kt b/node/src/main/kotlin/core/node/subsystems/WalletImpl.kt similarity index 100% rename from src/main/kotlin/core/node/subsystems/WalletImpl.kt rename to node/src/main/kotlin/core/node/subsystems/WalletImpl.kt diff --git a/src/main/kotlin/core/protocols/ProtocolStateMachineImpl.kt b/node/src/main/kotlin/core/protocols/ProtocolStateMachineImpl.kt similarity index 100% rename from src/main/kotlin/core/protocols/ProtocolStateMachineImpl.kt rename to node/src/main/kotlin/core/protocols/ProtocolStateMachineImpl.kt diff --git a/src/main/kotlin/core/testing/IRSSimulation.kt b/node/src/main/kotlin/core/testing/IRSSimulation.kt similarity index 100% rename from src/main/kotlin/core/testing/IRSSimulation.kt rename to node/src/main/kotlin/core/testing/IRSSimulation.kt diff --git a/src/main/kotlin/core/testing/InMemoryMessagingNetwork.kt b/node/src/main/kotlin/core/testing/InMemoryMessagingNetwork.kt similarity index 100% rename from src/main/kotlin/core/testing/InMemoryMessagingNetwork.kt rename to node/src/main/kotlin/core/testing/InMemoryMessagingNetwork.kt diff --git a/src/main/kotlin/core/testing/MockIdentityService.kt b/node/src/main/kotlin/core/testing/MockIdentityService.kt similarity index 100% rename from src/main/kotlin/core/testing/MockIdentityService.kt rename to node/src/main/kotlin/core/testing/MockIdentityService.kt diff --git a/src/main/kotlin/core/testing/MockNetworkMapCache.kt b/node/src/main/kotlin/core/testing/MockNetworkMapCache.kt similarity index 100% rename from src/main/kotlin/core/testing/MockNetworkMapCache.kt rename to node/src/main/kotlin/core/testing/MockNetworkMapCache.kt diff --git a/src/main/kotlin/core/testing/MockNode.kt b/node/src/main/kotlin/core/testing/MockNode.kt similarity index 100% rename from src/main/kotlin/core/testing/MockNode.kt rename to node/src/main/kotlin/core/testing/MockNode.kt diff --git a/src/main/kotlin/core/testing/Simulation.kt b/node/src/main/kotlin/core/testing/Simulation.kt similarity index 100% rename from src/main/kotlin/core/testing/Simulation.kt rename to node/src/main/kotlin/core/testing/Simulation.kt diff --git a/src/main/kotlin/core/testing/TradeSimulation.kt b/node/src/main/kotlin/core/testing/TradeSimulation.kt similarity index 100% rename from src/main/kotlin/core/testing/TradeSimulation.kt rename to node/src/main/kotlin/core/testing/TradeSimulation.kt diff --git a/src/main/kotlin/core/utilities/ANSIProgressRenderer.kt b/node/src/main/kotlin/core/utilities/ANSIProgressRenderer.kt similarity index 100% rename from src/main/kotlin/core/utilities/ANSIProgressRenderer.kt rename to node/src/main/kotlin/core/utilities/ANSIProgressRenderer.kt diff --git a/src/main/kotlin/core/utilities/AddOrRemove.kt b/node/src/main/kotlin/core/utilities/AddOrRemove.kt similarity index 100% rename from src/main/kotlin/core/utilities/AddOrRemove.kt rename to node/src/main/kotlin/core/utilities/AddOrRemove.kt diff --git a/src/main/kotlin/core/utilities/AffinityExecutor.kt b/node/src/main/kotlin/core/utilities/AffinityExecutor.kt similarity index 100% rename from src/main/kotlin/core/utilities/AffinityExecutor.kt rename to node/src/main/kotlin/core/utilities/AffinityExecutor.kt diff --git a/src/main/kotlin/core/utilities/JsonSupport.kt b/node/src/main/kotlin/core/utilities/JsonSupport.kt similarity index 100% rename from src/main/kotlin/core/utilities/JsonSupport.kt rename to node/src/main/kotlin/core/utilities/JsonSupport.kt diff --git a/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt b/node/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt similarity index 100% rename from src/main/kotlin/protocols/TwoPartyTradeProtocol.kt rename to node/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt diff --git a/src/main/resources/core/node/cities.txt b/node/src/main/resources/core/node/cities.txt similarity index 100% rename from src/main/resources/core/node/cities.txt rename to node/src/main/resources/core/node/cities.txt diff --git a/src/main/resources/core/testing/example.rates.txt b/node/src/main/resources/core/testing/example.rates.txt similarity index 100% rename from src/main/resources/core/testing/example.rates.txt rename to node/src/main/resources/core/testing/example.rates.txt diff --git a/src/main/resources/core/testing/trade.json b/node/src/main/resources/core/testing/trade.json similarity index 100% rename from src/main/resources/core/testing/trade.json rename to node/src/main/resources/core/testing/trade.json diff --git a/src/test/java/core/crypto/Base58Test.java b/node/src/test/java/core/crypto/Base58Test.java similarity index 100% rename from src/test/java/core/crypto/Base58Test.java rename to node/src/test/java/core/crypto/Base58Test.java diff --git a/src/test/kotlin/contracts/CashTests.kt b/node/src/test/kotlin/contracts/CashTests.kt similarity index 100% rename from src/test/kotlin/contracts/CashTests.kt rename to node/src/test/kotlin/contracts/CashTests.kt diff --git a/src/test/kotlin/contracts/CommercialPaperTests.kt b/node/src/test/kotlin/contracts/CommercialPaperTests.kt similarity index 100% rename from src/test/kotlin/contracts/CommercialPaperTests.kt rename to node/src/test/kotlin/contracts/CommercialPaperTests.kt diff --git a/src/test/kotlin/contracts/CrowdFundTests.kt b/node/src/test/kotlin/contracts/CrowdFundTests.kt similarity index 100% rename from src/test/kotlin/contracts/CrowdFundTests.kt rename to node/src/test/kotlin/contracts/CrowdFundTests.kt diff --git a/src/test/kotlin/contracts/IRSTests.kt b/node/src/test/kotlin/contracts/IRSTests.kt similarity index 100% rename from src/test/kotlin/contracts/IRSTests.kt rename to node/src/test/kotlin/contracts/IRSTests.kt diff --git a/src/test/kotlin/core/MockServices.kt b/node/src/test/kotlin/core/MockServices.kt similarity index 100% rename from src/test/kotlin/core/MockServices.kt rename to node/src/test/kotlin/core/MockServices.kt diff --git a/src/test/kotlin/core/TransactionGroupTests.kt b/node/src/test/kotlin/core/TransactionGroupTests.kt similarity index 100% rename from src/test/kotlin/core/TransactionGroupTests.kt rename to node/src/test/kotlin/core/TransactionGroupTests.kt diff --git a/src/test/kotlin/core/messaging/AttachmentTests.kt b/node/src/test/kotlin/core/messaging/AttachmentTests.kt similarity index 100% rename from src/test/kotlin/core/messaging/AttachmentTests.kt rename to node/src/test/kotlin/core/messaging/AttachmentTests.kt diff --git a/src/test/kotlin/core/messaging/InMemoryMessagingTests.kt b/node/src/test/kotlin/core/messaging/InMemoryMessagingTests.kt similarity index 100% rename from src/test/kotlin/core/messaging/InMemoryMessagingTests.kt rename to node/src/test/kotlin/core/messaging/InMemoryMessagingTests.kt diff --git a/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt b/node/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt similarity index 100% rename from src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt rename to node/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt diff --git a/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt b/node/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt similarity index 100% rename from src/test/kotlin/core/node/AttachmentClassLoaderTests.kt rename to node/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt diff --git a/src/test/kotlin/core/node/NodeAttachmentStorageTest.kt b/node/src/test/kotlin/core/node/NodeAttachmentStorageTest.kt similarity index 100% rename from src/test/kotlin/core/node/NodeAttachmentStorageTest.kt rename to node/src/test/kotlin/core/node/NodeAttachmentStorageTest.kt diff --git a/src/test/kotlin/core/node/services/InMemoryNetworkMapServiceTest.kt b/node/src/test/kotlin/core/node/services/InMemoryNetworkMapServiceTest.kt similarity index 100% rename from src/test/kotlin/core/node/services/InMemoryNetworkMapServiceTest.kt rename to node/src/test/kotlin/core/node/services/InMemoryNetworkMapServiceTest.kt diff --git a/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt b/node/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt similarity index 100% rename from src/test/kotlin/core/node/services/NodeInterestRatesTest.kt rename to node/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt diff --git a/src/test/kotlin/core/node/services/NotaryServiceTests.kt b/node/src/test/kotlin/core/node/services/NotaryServiceTests.kt similarity index 100% rename from src/test/kotlin/core/node/services/NotaryServiceTests.kt rename to node/src/test/kotlin/core/node/services/NotaryServiceTests.kt diff --git a/src/test/kotlin/core/node/services/TimestampCheckerTests.kt b/node/src/test/kotlin/core/node/services/TimestampCheckerTests.kt similarity index 100% rename from src/test/kotlin/core/node/services/TimestampCheckerTests.kt rename to node/src/test/kotlin/core/node/services/TimestampCheckerTests.kt diff --git a/src/test/kotlin/core/node/services/UniquenessProviderTests.kt b/node/src/test/kotlin/core/node/services/UniquenessProviderTests.kt similarity index 100% rename from src/test/kotlin/core/node/services/UniquenessProviderTests.kt rename to node/src/test/kotlin/core/node/services/UniquenessProviderTests.kt diff --git a/src/test/kotlin/core/node/storage/PerFileCheckpointStorageTests.kt b/node/src/test/kotlin/core/node/storage/PerFileCheckpointStorageTests.kt similarity index 100% rename from src/test/kotlin/core/node/storage/PerFileCheckpointStorageTests.kt rename to node/src/test/kotlin/core/node/storage/PerFileCheckpointStorageTests.kt diff --git a/src/test/kotlin/core/node/subsystems/ArtemisMessagingServiceTests.kt b/node/src/test/kotlin/core/node/subsystems/ArtemisMessagingServiceTests.kt similarity index 100% rename from src/test/kotlin/core/node/subsystems/ArtemisMessagingServiceTests.kt rename to node/src/test/kotlin/core/node/subsystems/ArtemisMessagingServiceTests.kt diff --git a/src/test/kotlin/core/node/subsystems/InMemoryNetworkMapCacheTest.kt b/node/src/test/kotlin/core/node/subsystems/InMemoryNetworkMapCacheTest.kt similarity index 100% rename from src/test/kotlin/core/node/subsystems/InMemoryNetworkMapCacheTest.kt rename to node/src/test/kotlin/core/node/subsystems/InMemoryNetworkMapCacheTest.kt diff --git a/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt b/node/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt similarity index 100% rename from src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt rename to node/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt diff --git a/src/test/kotlin/core/serialization/KryoTests.kt b/node/src/test/kotlin/core/serialization/KryoTests.kt similarity index 100% rename from src/test/kotlin/core/serialization/KryoTests.kt rename to node/src/test/kotlin/core/serialization/KryoTests.kt diff --git a/src/test/kotlin/core/serialization/TransactionSerializationTests.kt b/node/src/test/kotlin/core/serialization/TransactionSerializationTests.kt similarity index 100% rename from src/test/kotlin/core/serialization/TransactionSerializationTests.kt rename to node/src/test/kotlin/core/serialization/TransactionSerializationTests.kt diff --git a/src/test/kotlin/core/testutils/TestUtils.kt b/node/src/test/kotlin/core/testutils/TestUtils.kt similarity index 100% rename from src/test/kotlin/core/testutils/TestUtils.kt rename to node/src/test/kotlin/core/testutils/TestUtils.kt diff --git a/src/test/kotlin/core/utilities/AffinityExecutorTests.kt b/node/src/test/kotlin/core/utilities/AffinityExecutorTests.kt similarity index 100% rename from src/test/kotlin/core/utilities/AffinityExecutorTests.kt rename to node/src/test/kotlin/core/utilities/AffinityExecutorTests.kt diff --git a/src/test/kotlin/core/utilities/CollectionExtensionTests.kt b/node/src/test/kotlin/core/utilities/CollectionExtensionTests.kt similarity index 100% rename from src/test/kotlin/core/utilities/CollectionExtensionTests.kt rename to node/src/test/kotlin/core/utilities/CollectionExtensionTests.kt diff --git a/src/test/kotlin/core/visualiser/GraphStream.kt b/node/src/test/kotlin/core/visualiser/GraphStream.kt similarity index 100% rename from src/test/kotlin/core/visualiser/GraphStream.kt rename to node/src/test/kotlin/core/visualiser/GraphStream.kt diff --git a/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt b/node/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt similarity index 100% rename from src/test/kotlin/core/visualiser/GroupToGraphConversion.kt rename to node/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt diff --git a/src/test/kotlin/core/visualiser/StateViewer.form b/node/src/test/kotlin/core/visualiser/StateViewer.form similarity index 100% rename from src/test/kotlin/core/visualiser/StateViewer.form rename to node/src/test/kotlin/core/visualiser/StateViewer.form diff --git a/src/test/kotlin/core/visualiser/StateViewer.java b/node/src/test/kotlin/core/visualiser/StateViewer.java similarity index 100% rename from src/test/kotlin/core/visualiser/StateViewer.java rename to node/src/test/kotlin/core/visualiser/StateViewer.java diff --git a/src/test/resources/core/node/isolated.jar b/node/src/test/resources/core/node/isolated.jar similarity index 100% rename from src/test/resources/core/node/isolated.jar rename to node/src/test/resources/core/node/isolated.jar diff --git a/src/test/resources/core/visualiser/graph.css b/node/src/test/resources/core/visualiser/graph.css similarity index 100% rename from src/test/resources/core/visualiser/graph.css rename to node/src/test/resources/core/visualiser/graph.css diff --git a/settings.gradle b/settings.gradle index 9b5ad5ced0..86ff81829c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,5 @@ rootProject.name = 'r3prototyping' include 'contracts' include 'contracts:isolated' -include 'core' \ No newline at end of file +include 'core' +include 'node' \ No newline at end of file diff --git a/src/main/kotlin/api/InterestRateSwapAPI.kt b/src/main/kotlin/demos/api/InterestRateSwapAPI.kt similarity index 99% rename from src/main/kotlin/api/InterestRateSwapAPI.kt rename to src/main/kotlin/demos/api/InterestRateSwapAPI.kt index 7475d98fd3..73d274775c 100644 --- a/src/main/kotlin/api/InterestRateSwapAPI.kt +++ b/src/main/kotlin/demos/api/InterestRateSwapAPI.kt @@ -1,5 +1,6 @@ -package api +package demo.api +import api.* import contracts.InterestRateSwap import core.utilities.loggerFor import demos.protocols.AutoOfferProtocol From 6bdbc7925bbf8d23ee5e17e86378e4e65fde5529 Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Sat, 14 May 2016 19:26:20 +0100 Subject: [PATCH 07/10] Fix IRS demo by allowing demos to optionally register JAX-RS classes on the node at construction time. --- node/src/main/kotlin/core/node/Node.kt | 19 +++++++++++++++---- src/main/kotlin/demos/IRSDemo.kt | 4 +++- src/main/kotlin/demos/RateFixDemo.kt | 4 +++- .../kotlin/demos/api/InterestRateSwapAPI.kt | 2 +- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/node/src/main/kotlin/core/node/Node.kt b/node/src/main/kotlin/core/node/Node.kt index 7e832baf29..56664e653e 100644 --- a/node/src/main/kotlin/core/node/Node.kt +++ b/node/src/main/kotlin/core/node/Node.kt @@ -1,7 +1,6 @@ package core.node import api.Config -//import api.InterestRateSwapAPI import api.ResponseFilter import com.codahale.metrics.JmxReporter import com.google.common.net.HostAndPort @@ -45,11 +44,15 @@ class ConfigurationException(message: String) : Exception(message) * network map service, while bootstrapping a network. * @param advertisedServices The services this node advertises. This must be a subset of the services it runs, * but nodes are not required to advertise services they run (hence subset). + * @param clientAPIs A list of JAX-RS annotated classes to register + * which will be used to register any extra client web interfaces the node requires for demos to use. + * Listed clientAPI classes are assumed to have to take a single APIServer constructor parameter * @param clock The clock used within the node and by all protocols etc */ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration, - networkMapAddress: NodeInfo?, advertisedServices: Set, - clock: Clock = Clock.systemUTC()) : AbstractNode(dir, configuration, networkMapAddress, advertisedServices, clock) { + networkMapAddress: NodeInfo?,advertisedServices: Set, + clock: Clock = Clock.systemUTC(), + val clientAPIs: List> = listOf()) : AbstractNode(dir, configuration, networkMapAddress, advertisedServices, clock) { companion object { /** The port that is used by default if none is specified. As you know, 31337 is the most elite number. */ val DEFAULT_PORT = 31337 @@ -103,7 +106,15 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration resourceConfig.register(Config(services)) resourceConfig.register(ResponseFilter()) resourceConfig.register(api) - //resourceConfig.register(InterestRateSwapAPI(api)) + + clientAPIs.forEach { + customAPI -> + val customAPI = customAPI.getConstructor(api.APIServer::class.java) + .newInstance(api) + resourceConfig.register(customAPI) + } + + // Give the app a slightly better name in JMX rather than a randomly generated one and enable JMX resourceConfig.addProperties(mapOf(ServerProperties.APPLICATION_NAME to "node.api", ServerProperties.MONITORING_STATISTICS_MBEANS_ENABLED to "true")) diff --git a/src/main/kotlin/demos/IRSDemo.kt b/src/main/kotlin/demos/IRSDemo.kt index 9ccf4c0883..838e7bef7f 100644 --- a/src/main/kotlin/demos/IRSDemo.kt +++ b/src/main/kotlin/demos/IRSDemo.kt @@ -75,7 +75,9 @@ fun main(args: Array) { } } - val node = logElapsedTime("Node startup") { Node(dir, myNetAddr, config, networkMapId, advertisedServices, DemoClock()).start() } + val node = logElapsedTime("Node startup") { Node(dir, myNetAddr, config, networkMapId, + advertisedServices, DemoClock(), + listOf(demos.api.InterestRateSwapAPI::class.java)).start() } // TODO: This should all be replaced by the identity service being updated // as the network map changes. diff --git a/src/main/kotlin/demos/RateFixDemo.kt b/src/main/kotlin/demos/RateFixDemo.kt index ee3d6ae4ed..6bb298f8b0 100644 --- a/src/main/kotlin/demos/RateFixDemo.kt +++ b/src/main/kotlin/demos/RateFixDemo.kt @@ -78,7 +78,9 @@ fun main(args: Array) { override val nearestCity: String = "Atlantis" } - val node = logElapsedTime("Node startup") { Node(dir, myNetAddr, config, networkMapAddress, advertisedServices).start() } + val node = logElapsedTime("Node startup") { Node(dir, myNetAddr, config, networkMapAddress, + advertisedServices, DemoClock(), + listOf(demos.api.InterestRateSwapAPI::class.java)).start() } val notary = node.services.networkMapCache.notaryNodes[0] diff --git a/src/main/kotlin/demos/api/InterestRateSwapAPI.kt b/src/main/kotlin/demos/api/InterestRateSwapAPI.kt index 73d274775c..3fc7e49c85 100644 --- a/src/main/kotlin/demos/api/InterestRateSwapAPI.kt +++ b/src/main/kotlin/demos/api/InterestRateSwapAPI.kt @@ -1,4 +1,4 @@ -package demo.api +package demos.api import api.* import contracts.InterestRateSwap From f26178f602778f3874ba290ce7bfe567c72ecba0 Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Mon, 16 May 2016 09:24:27 +0100 Subject: [PATCH 08/10] Fix variable shadowing --- node/src/main/kotlin/core/node/Node.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/src/main/kotlin/core/node/Node.kt b/node/src/main/kotlin/core/node/Node.kt index 56664e653e..9777404243 100644 --- a/node/src/main/kotlin/core/node/Node.kt +++ b/node/src/main/kotlin/core/node/Node.kt @@ -108,8 +108,8 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration resourceConfig.register(api) clientAPIs.forEach { - customAPI -> - val customAPI = customAPI.getConstructor(api.APIServer::class.java) + customAPIClass -> + val customAPI = customAPIClass.getConstructor(api.APIServer::class.java) .newInstance(api) resourceConfig.register(customAPI) } From e8e909a5ff61d88ea670e9c58590f812f437a691 Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Mon, 16 May 2016 14:42:04 +0100 Subject: [PATCH 09/10] Use simple for loop for api registration on node --- node/src/main/kotlin/core/node/Node.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/node/src/main/kotlin/core/node/Node.kt b/node/src/main/kotlin/core/node/Node.kt index 9777404243..3df741300c 100644 --- a/node/src/main/kotlin/core/node/Node.kt +++ b/node/src/main/kotlin/core/node/Node.kt @@ -107,10 +107,8 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration resourceConfig.register(ResponseFilter()) resourceConfig.register(api) - clientAPIs.forEach { - customAPIClass -> - val customAPI = customAPIClass.getConstructor(api.APIServer::class.java) - .newInstance(api) + for(customAPIClass in clientAPIs) { + val customAPI = customAPIClass.getConstructor(api.APIServer::class.java).newInstance(api) resourceConfig.register(customAPI) } From c30564d813b0e3db1fa4df8011763dc6ea551fe6 Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Mon, 16 May 2016 14:51:38 +0100 Subject: [PATCH 10/10] Remove my original project structure proposal, because it doesn't the actual state of refactoring. --- docs/source/index.rst | 1 - docs/source/project-structure-proposal.rst | 109 --------------------- 2 files changed, 110 deletions(-) delete mode 100644 docs/source/project-structure-proposal.rst diff --git a/docs/source/index.rst b/docs/source/index.rst index 43432854c4..d633ffb715 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -49,5 +49,4 @@ Read on to learn: visualiser codestyle building-the-docs - project-structure-proposal diff --git a/docs/source/project-structure-proposal.rst b/docs/source/project-structure-proposal.rst deleted file mode 100644 index 6ccb79d121..0000000000 --- a/docs/source/project-structure-proposal.rst +++ /dev/null @@ -1,109 +0,0 @@ -Proposed module structure -========================= - -``:r3prototyping`` - gradle top level module. No actual code, just resources for this project to make distributable artefacts, plus drives build of code modules. - -.. code-block:: none - - folders/namespaces under src/main/kotlin and src/test/kotlin - |--docs - docs for developers - |--scripts - scripts to start/stop nodes, run demos, etc - |--tools - utilities such as tools to create keys, etc - |--libs - external libs not available on maven, or signed specific versions - |--contracts - fully signed and versioned contract jars for approved contracts that other contracts might reference. - -``:utilities`` - gradle module for language helpers, pure algorithms, etc - -.. code-block:: none - - folders/namespaces under src/main/kotlin and src/test/kotlin - |--crypto - helpers for crypto - |--math - helpers for calculations e.g. financial rounding - |--utilities - stuff - -``:client-api`` - gradle module for a jar that can be embedded inside JVM compatible clients. Depends only on :core - -.. code-block:: none - - folders/namespaces under src/main/kotlin and src/test/kotlin - |--api - standard rpc services exposed on a node for supporting bank side interactions and node management - |--transport - support for concrete transport layers - | |--jaxrs - e.g. annotated api interface for rest-json - | |--mq - e.g. wrapper for using messaging to communicate to the node - |--serialization - abstraction/helpers for client side serialisation via JSON (e.g. pre-configured jackson mapper), Kryo, etc (doesn't have to line up with node to node communication formats) - -``:contract-api`` - Gradle module to make minimum jar library required to write a contract jar, but should not contain business logic. Depends only on :core - -.. code-block:: none - - folders/namespaces under src/main/kotlin and src/test/kotlin - |--financetypes - basic finance types and helpers - |--protocol - | |--api - node services available internally only to contracts. - | |--core - protocol support and implementation functions e.g. our TwoPartyDealProtocol - |--contract - base/abstract types for smart contracts e.g ContractState, Transaction, Command - |--extensionsapi - marker interfaces/annotations for contracts to extend a node's public network interface and allow clients to interact with a contract e.g. register a servlet - |--utilities - helpers/builders without any business logic - |--test - hooks to allow testability of contracts - |--serialization - helpers for state object storage and transport by nodes - -``:base-contract`` - Gradle module for important financial concepts modelled as smart contracts. R3 mjaintained reference implementations. Depends upon :core and :contract-api. - -.. code-block:: none - - - folders/namespaces under src/main/kotlin and src/test/kotlin - |--validators - helpers for standard business validations e.g. must be positive, net cash must be equal, etc - |--utilities - some common code for business day calculations and holiday oracle - |--cash - | |--states - | |--contract - | |--protocol - |--irs - | |--states - | |--contract - | |--protocol - |--dvp - | |--states - | |--contract - | |--protocol - -``:demos`` - Gradle module for external developers to play with and modify. Depends upon :core, :contract-api and :contract-core for complicated contracts - -.. code-block:: none - - folders/namespaces under src/main/kotlin and src/test/kotlin - |--minimum - hello world of smart contracts - | |--states - | |--contract - | |--protocol - |--demo1 - something for an external developer to start working on - | |--states - | |--contract - | |--protocol - |--webapp - some simple web content that calls against JAX-RS to exercise the demo contracts. Content registered via the extensions-api - | |--minimum - | |--demo1 - -``:node`` - Gradle module for the actual runtime implementation of node. Must NOT depend upon :contract-core, or :contract-demos, otherwise references :core, :client-api and :contract-api - -.. code-block:: none - - folders/namespaces under src/main/kotlin and src/test/kotlin - |--bootstrap - start/stop sequence, config loading, dependency injection, loading service plugins,etc - |--clientapi - implementation of the common public API entry point via JAX-RS, MQ, etc, perhaps does some security checking and then passes to actual services - |--recovery - code to carry out checking on startup and possibly recovery/undo/redo of the transactions - |--services - services listed below are only suggestions!! - | |--api - internal non-serialised service interfaces and data types. Used for decoupling - | |--messaging - | |--networkmapper - | |--persistence - | |--identity - | |--notary - | |--protocol - node side implementation of primitives exposed to contracts - | |--statemachine - | |--scheduler - | |--contractsandbox - | |--wallet - |--configuration - |--utilities