diff --git a/.gitignore b/.gitignore
index 0672057c36..ba6dd8df33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ tags
.gradle
local.properties
-/docs/build/doctrees
# General build files
**/build/*
@@ -34,7 +33,6 @@ lib/dokka.jar
.idea/libraries
.idea/shelf
.idea/dataSources
-.idea/modules.xml
# if you remove the above rule, at least ignore the following:
diff --git a/.idea/runConfigurations/Raft_Notary_Demo__Run_Notarisation.xml b/.idea/runConfigurations/Raft_Notary_Demo__Run_Notarisation.xml
index 0cf5567128..23512d7425 100644
--- a/.idea/runConfigurations/Raft_Notary_Demo__Run_Notarisation.xml
+++ b/.idea/runConfigurations/Raft_Notary_Demo__Run_Notarisation.xml
@@ -3,7 +3,7 @@
,
- val modification: T,
- override val progressTracker: ProgressTracker = tracker()) : FlowLogic {
+ override fun call(): StateAndRef>() {
+ constructor(transaction: SignedTransaction, extraParticipants: Set
Modifier and Type | +Method and Description | +
---|---|
SecureHash |
+getLegalContractReference()
+Unparsed reference to the natural language contract that this code is supposed to express (usually a hash of
+the contract's contents).
+ |
+
void |
+verify(TransactionForContract tx)
+Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense.
+Must throw an exception if there's 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.
+ |
+
getLegalContractReference, verify
public SecureHash getLegalContractReference()+
Unparsed reference to the natural language contract that this code is supposed to express (usually a hash of +the contract's contents).
public void verify(TransactionForContract tx)+
Takes an object that represents a state transition, and ensures the inputs/outputs/commands make sense. +Must throw an exception if there's 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.
public class TGenesisFlow
+extends FlowLogic
+Constructor and Description | +
---|
TGenesisFlow(java.util.Set<net.corda.core.crypto.Party> participants) |
+
Modifier and Type | +Method and Description | +
---|---|
SignedTransaction |
+call()
+This is where you fill out your business logic. The returned object will usually be ignored, but can be
+helpful if this flow is meant to be used as a subflow.
+ |
+
java.util.Set<net.corda.core.crypto.Party> |
+getParticipants() |
+
call, getCounterpartyMarker, getLogger, getProgressTracker, getRunId, getServiceHub, getStateMachine, receive, send, sendAndReceive, setStateMachine, subFlow, subFlow, track
public TGenesisFlow(java.util.Set<net.corda.core.crypto.Party> participants)+
public SignedTransaction call()+
This is where you fill out your business logic. The returned object will usually be ignored, but can be +helpful if this flow is meant to be used as a subflow.
public java.util.Set<net.corda.core.crypto.Party> getParticipants()+
public class TTxCommand +implements CommandData+
Constructor and Description | +
---|
TTxCommand() |
+
public class TTxFlow
+extends FlowLogic
+Constructor and Description | +
---|
TTxFlow(byte[] txContent,
+ java.util.Set<net.corda.core.crypto.Party> participants) |
+
Modifier and Type | +Method and Description | +
---|---|
SecureHash |
+call()
+This is where you fill out your business logic. The returned object will usually be ignored, but can be
+helpful if this flow is meant to be used as a subflow.
+ |
+
java.util.Set<net.corda.core.crypto.Party> |
+getParticipants() |
+
byte[] |
+getTxContent() |
+
call, getCounterpartyMarker, getLogger, getProgressTracker, getRunId, getServiceHub, getStateMachine, receive, send, sendAndReceive, setStateMachine, subFlow, subFlow, track
public TTxFlow(byte[] txContent, + java.util.Set<net.corda.core.crypto.Party> participants)+
public SecureHash call()+
This is where you fill out your business logic. The returned object will usually be ignored, but can be +helpful if this flow is meant to be used as a subflow.
public byte[] getTxContent()+
public java.util.Set<net.corda.core.crypto.Party> getParticipants()+
public class TTxState +implements ContractState+
Constructor and Description | +
---|
TTxState(CompositeKey owner,
+ byte[] txContent) |
+
Modifier and Type | +Method and Description | +
---|---|
Contract |
+getContract()
+An instance of the contract class that will verify this state.
+ |
+
CompositeKey |
+getOwner() |
+
java.util.List<net.corda.core.crypto.CompositeKey> |
+getParticipants()
+A participant is any party that is able to consume this state in a valid transaction.
+ |
+
byte[] |
+getTxContent() |
+
getContract, getParticipants
public TTxState(CompositeKey owner, + byte[] txContent)+
public java.util.List<net.corda.core.crypto.CompositeKey> getParticipants()+
A participant is any party that is able to consume this state in a valid transaction.
The list of participants is required for certain types of transactions. For example, when changing the notary +for this state (TransactionType.NotaryChange), every participant has to be involved and approve the transaction +so that they receive the updated state, and don't end up in a situation where they can no longer use a state +they possess, since someone consumed that state during the notary change process.
The participants list should normally be derived from the contents of the state. E.g. for Cash the participants +list should just contain the owner.
public Contract getContract()+
An instance of the contract class that will verify this state.
This field is not the final design, it's just a piece of temporary scaffolding. Once the contract sandbox is +further along, this field will become a description of which attachments are acceptable for defining the +contract.
Recall that an attachment is a zip file that can be referenced from any transaction. The contents of the +attachments are merged together and cannot define any overlapping files, thus for any given transaction there +is a miniature file system in which each file can be precisely mapped to the defining attachment.
Attachments may contain many things (data files, legal documents, etc) but mostly they contain JVM bytecode.
+The class files inside define not only interface Contract
implementations but also the classes that define the states.
+Within the rest of a transaction, user-providable components are referenced by name only.
This means that a smart contract in Corda does two things:
Define the data structures that compose the ledger (the states)
Define the rules for updating those structures
The first is merely a utility role ... in theory contract code could manually parse byte streams by hand. +The second is vital to the integrity of the ledger. So this field needs to be able to express constraints like:
Only attachment 733c350f396a727655be1363c06635ba355036bd54a5ed6e594fd0b5d05f42f6 may be used with this state.
Any attachment signed by public key 2d1ce0e330c52b8055258d776c40 may be used with this state.
Attachments (1, 2, 3) may all be used with this state.
and so on. In this way it becomes possible for the business logic governing a state to be evolved, if the +constraints are flexible enough.
Because contract classes often also define utilities that generate relevant transactions, and because attachments +cannot know their own hashes, we will have to provide various utilities to assist with obtaining the right +code constraints from within the contract code itself.
TODO: Implement the above description. See COR-226
interface Contract
public CompositeKey getOwner()+
public byte[] getTxContent()+
Class | +Description | +
---|---|
TContract | ++ |
TGenesisCommand | ++ |
TGenesisFlow | ++ |
TTxCommand | ++ |
TTxFlow | ++ |
TTxState | ++ |
class ConcatenatedList
takes a list of lists and concatenates them. Any change to the underlying lists or the outer list
is propagated as expected.class Party
class represents an entity on the network, which is typically identified by a legal name and public key
-that it can sign transactions under. As parties may use multiple keys for signing and, for example, have offline backup
-keys, the "public key" of a party is represented by a composite construct – a class CompositeKey
, which combines multiple
-cryptographic public key primitives into a tree structure.interface AcceptsFileUpload
implementor and hands the stream off to it.interface AcceptsFileUpload
implementor and hands the stream off to it.class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).class FlowHandle
is a serialisable handle for the started flow, parameterised by the type of the flow's return value.class FlowHandle
is a serialisable handle for the started flow, parameterised by the type of the flow's return value.class Generator
library for composing random generators of objects.class Party
s to their associated public keys and thus supports
@@ -8317,19 +8215,15 @@ operation due to the need to copy the bytes to disk and hash them along the way.
class CashSchema
family name (i.e. independent of version).interface FungibleAsset
with the given details.
+interface FungibleAsset
with the given details.
Returns the transaction created by the Issuer to move the cash to the Requester.interface FungibleAsset
with the given details.
+interface FungibleAsset
with the given details.
Returns the transaction created by the Issuer to move the cash to the Requester.exception StateReplacementException
is thrown.
toString()
NonExistentClass
net.corda.contracts.ICommercialPaperState
withFaceValue(Amount<net.corda.core.contracts.Issued> newFaceValue)
NonExistentClass
net.corda.contracts.ICommercialPaperState
withIssuance(PartyAndReference newIssuance)
NonExistentClass
net.corda.contracts.ICommercialPaperState
withMaturityDate(java.time.Instant newMaturityDate)
NonExistentClass
net.corda.contracts.ICommercialPaperState
withOwner(CompositeKey newOwner)
public NonExistentClass withOwner(CompositeKey newOwner)+
public net.corda.contracts.ICommercialPaperState withOwner(CompositeKey newOwner)
public NonExistentClass withIssuance(PartyAndReference newIssuance)+
public net.corda.contracts.ICommercialPaperState withIssuance(PartyAndReference newIssuance)
public NonExistentClass withFaceValue(Amount<net.corda.core.contracts.Issued> newFaceValue)+
public net.corda.contracts.ICommercialPaperState withFaceValue(Amount<net.corda.core.contracts.Issued> newFaceValue)
public NonExistentClass withMaturityDate(java.time.Instant newMaturityDate)+
public net.corda.contracts.ICommercialPaperState withMaturityDate(java.time.Instant newMaturityDate)
static NonExistentClass
owned by(NonExistentClass $receiver,
+static net.corda.contracts.ICommercialPaperState
+owned by(net.corda.contracts.ICommercialPaperState $receiver,
CompositeKey newOwner)
Open issues:
public static NonExistentClass owned by(NonExistentClass $receiver, - CompositeKey newOwner)+
public static net.corda.contracts.ICommercialPaperState owned by(net.corda.contracts.ICommercialPaperState $receiver, + CompositeKey newOwner)
toString()
NonExistentClass
net.corda.contracts.ICommercialPaperState
withFaceValue(Amount<net.corda.core.contracts.Issued> newFaceValue)
NonExistentClass
net.corda.contracts.ICommercialPaperState
withIssuance(PartyAndReference newIssuance)
NonExistentClass
net.corda.contracts.ICommercialPaperState
withMaturityDate(java.time.Instant newMaturityDate)
NonExistentClass
net.corda.contracts.ICommercialPaperState
withOwner(CompositeKey newOwner)
public NonExistentClass withOwner(CompositeKey newOwner)+
public net.corda.contracts.ICommercialPaperState withOwner(CompositeKey newOwner)
public NonExistentClass withIssuance(PartyAndReference newIssuance)+
public net.corda.contracts.ICommercialPaperState withIssuance(PartyAndReference newIssuance)
public NonExistentClass withFaceValue(Amount<net.corda.core.contracts.Issued> newFaceValue)+
public net.corda.contracts.ICommercialPaperState withFaceValue(Amount<net.corda.core.contracts.Issued> newFaceValue)
public NonExistentClass withMaturityDate(java.time.Instant newMaturityDate)+
public net.corda.contracts.ICommercialPaperState withMaturityDate(java.time.Instant newMaturityDate)
static <T> com.google.common.util.concurrent.ListenableFuture<T>
toFuture(rx.Observable<T> $receiver)
static <A> rx.Observable<A>
toObservable(com.google.common.util.concurrent.ListenableFuture<A> $receiver)
toObservable(com.google.common.util.concurrent.ListenableFuture<? extends A> $receiver)
static java.time.Duration
public static <A> rx.Observable<A> toObservable(com.google.common.util.concurrent.ListenableFuture<A> $receiver)+
public static <A> rx.Observable<A> toObservable(com.google.common.util.concurrent.ListenableFuture<? extends A> $receiver)
public static <T> com.google.common.util.concurrent.ListenableFuture<T> toFuture(rx.Observable<T> $receiver)
Returns a ListenableFuture bound to the first item emitted by this Observable. The future will complete with a -NoSuchElementException if no items are emitted or any other error thrown by the Observable.
NonExistentClass
CompositeKey
parseFromBase58(java.lang.String encoded)
public NonExistentClass parseFromBase58(java.lang.String encoded)+
public CompositeKey parseFromBase58(java.lang.String encoded)
newSecureRandom()
static NonExistentClass
static net.i2p.crypto.eddsa.EdDSAPublicKey
parsePublicKeyBase58(java.lang.String base58String)
static NonExistentClass
static java.lang.String
toBase58String(java.security.PublicKey $receiver)
public static NonExistentClass parsePublicKeyBase58(java.lang.String base58String)+
public static net.i2p.crypto.eddsa.EdDSAPublicKey parsePublicKeyBase58(java.lang.String base58String)
public static NonExistentClass toBase58String(java.security.PublicKey $receiver)+
public static java.lang.String toBase58String(java.security.PublicKey $receiver)
For e
Her advertised class Party
then has a legal name "Alice" and an owingKey "pub1 or pub2".
class Party
is also used for service identities. E.g. Alice may also be running an interest rate oracle on her Corda node,
which requires a separate signing key (and an identifying name). Services can also be distributed – run by a coordinated
cluster of Corda nodes. A class Party
representing a distributed service will use a composite key containing all
-individual cluster nodes' public keys. Each of the nodes in the cluster will advertise the same group class Party
.
class Party
.Note that equality is based solely on the owning key.
class Party
,
@@ -182,48 +179,32 @@ cryptographic public key primitives into a tree structure.
java.lang.String
component1()
CompositeKey
component2()
Party
copy(java.lang.String name,
- CompositeKey owningKey)
-class Party
class represents an entity on the network, which is typically identified by a legal name and public key
-that it can sign transactions under. As parties may use multiple keys for signing and, for example, have offline backup
-keys, the "public key" of a party is represented by a composite construct – a class CompositeKey
, which combines multiple
-cryptographic public key primitives into a tree structure.boolean
equals(java.lang.Object other)
+boolean
equals(java.lang.Object p)
java.lang.String
getName()
CompositeKey
getOwningKey()
int
hashCode()
PartyAndReference
ref(OpaqueBytes bytes)
PartyAndReference
ref(byte bytes)
java.lang.String
toString()
For e
Her advertised class Party
then has a legal name "Alice" and an owingKey "pub1 or pub2".
class Party
is also used for service identities. E.g. Alice may also be running an interest rate oracle on her Corda node,
which requires a separate signing key (and an identifying name). Services can also be distributed – run by a coordinated
cluster of Corda nodes. A class Party
representing a distributed service will use a composite key containing all
-individual cluster nodes' public keys. Each of the nodes in the cluster will advertise the same group class Party
.
class Party
.Note that equality is based solely on the owning key.
class Party
,
@@ -295,6 +276,25 @@ individual cluster nodes' public keys. Each of the nodes in the cluster will adv
public boolean equals(java.lang.Object other)+
Anonymised parties do not include any detail apart from owning key, so equality is dependent solely on the key
public int hashCode()+
public CompositeKey getOwningKey()
public java.lang.String component1()-
public CompositeKey component2()-
public Party copy(java.lang.String name, - CompositeKey owningKey)-
The class Party
class represents an entity on the network, which is typically identified by a legal name and public key
-that it can sign transactions under. As parties may use multiple keys for signing and, for example, have offline backup
-keys, the "public key" of a party is represented by a composite construct – a class CompositeKey
, which combines multiple
-cryptographic public key primitives into a tree structure.
For example: Alice has two key pairs (pub1/priv1 and pub2/priv2), and wants to be able to sign transactions with either of them.
-Her advertised class Party
then has a legal name "Alice" and an owingKey "pub1 or pub2".
class Party
is also used for service identities. E.g. Alice may also be running an interest rate oracle on her Corda node,
-which requires a separate signing key (and an identifying name). Services can also be distributed – run by a coordinated
-cluster of Corda nodes. A class Party
representing a distributed service will use a composite key containing all
-individual cluster nodes' public keys. Each of the nodes in the cluster will advertise the same group class Party
.
class Party
,
-class CompositeKey
,
-class Party
,
-owingKey,
-class Party
,
-class Party
,
-class Party
,
-class CompositeKey
public int hashCode()-
public boolean equals(java.lang.Object p)-
public class FlowException
+Exception which can be thrown by a class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).
exception FlowException
(or a subclass) can be a valid expected response from a flow, particularly ones which act as a service.
+It is recommended a class FlowLogic
document the exception FlowException
types it can throw.
class FlowLogic
,
+exception FlowException
,
+class FlowLogic
,
+exception FlowException
FlowException(java.lang.String message)
FlowException(java.lang.String message,
+ java.lang.Throwable cause)
+class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).FlowException(java.lang.String message)
+class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).FlowException()
+class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).public FlowException(java.lang.String message, + java.lang.Throwable cause)+
Exception which can be thrown by a class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).
exception FlowException
(or a subclass) can be a valid expected response from a flow, particularly ones which act as a service.
+It is recommended a class FlowLogic
document the exception FlowException
types it can throw.
class FlowLogic
,
+exception FlowException
,
+class FlowLogic
,
+exception FlowException
public FlowException(java.lang.String message)+
Exception which can be thrown by a class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).
exception FlowException
(or a subclass) can be a valid expected response from a flow, particularly ones which act as a service.
+It is recommended a class FlowLogic
document the exception FlowException
types it can throw.
class FlowLogic
,
+exception FlowException
,
+class FlowLogic
,
+exception FlowException
public FlowException(java.lang.String message)+
public FlowException()+
Exception which can be thrown by a class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).
exception FlowException
(or a subclass) can be a valid expected response from a flow, particularly ones which act as a service.
+It is recommended a class FlowLogic
document the exception FlowException
types it can throw.
class FlowLogic
,
+exception FlowException
,
+class FlowLogic
,
+exception FlowException
<T> UntrustworthyData<T>
receive(java.lang.Class<T> receiveType,
+<R> UntrustworthyData<R>
+receive(java.lang.Class<R> receiveType,
Party otherParty)
Suspends until the specified otherParty sends us a message of type receiveType.
@@ -243,8 +243,8 @@ across module boundaries.
<T> UntrustworthyData<T>
sendAndReceive(java.lang.Class<T> receiveType,
+<R> UntrustworthyData<R>
+sendAndReceive(java.lang.Class<R> receiveType,
Party otherParty,
java.lang.Object payload)
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response
@@ -394,7 +394,7 @@ will do as long as the other side registers with it.
-
sendAndReceive
-public <T> UntrustworthyData<T> sendAndReceive(java.lang.Class<T> receiveType,
+public <R> UntrustworthyData<R> sendAndReceive(java.lang.Class<R> receiveType,
Party otherParty,
java.lang.Object payload)
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response
@@ -410,7 +410,7 @@ use this when you expect to do a message swap than do use send and then receive
-
receive
-public <T> UntrustworthyData<T> receive(java.lang.Class<T> receiveType,
+public <R> UntrustworthyData<R> receive(java.lang.Class<R> receiveType,
Party otherParty)
Suspends until the specified otherParty sends us a message of type receiveType.
Remember that when receiving data from other parties the data should not be trusted until it's been thoroughly
verified for consistency and that all expectations are satisfied, as a malicious peer may send you subtly
@@ -446,6 +446,9 @@ current step in this flow's progress tracker.
shareParentSessions
- In certain situations the need arises to use the same sessions the parent flow has
already established. However this also prevents the subflow from creating new sessions with those parties.
For this reason the default value is false.
+- Throws:
+- - This is either thrown by subLogic itself or propagated from any of the remote
+
class FlowLogic
s it communicated with. A subflow retry can be done by catching this exception.
- See Also:
FlowLogic.call
@@ -462,6 +465,9 @@ For this reason the default value is false.
returned by that subflows FlowLogic.call
method. If the subflow has a progress tracker, it is attached to the
current step in this flow's progress tracker.
+- Throws:
+- - This is either thrown by subLogic itself or propagated from any of the remote
+
class FlowLogic
s it communicated with. A subflow retry can be done by catching this exception.
- See Also:
FlowLogic.call
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/FlowLogicRef.html b/docs/build/html/api/javadoc/net/corda/core/flows/FlowLogicRef.html
index 97b08a6b58..cb9b6c27ac 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/FlowLogicRef.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/FlowLogicRef.html
@@ -2,10 +2,10 @@
-
+
FlowLogicRef
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/FlowLogicRefFactory.html b/docs/build/html/api/javadoc/net/corda/core/flows/FlowLogicRefFactory.html
index f40123479f..fbca9a19e7 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/FlowLogicRefFactory.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/FlowLogicRefFactory.html
@@ -2,10 +2,10 @@
-
+
FlowLogicRefFactory
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/FlowStateMachine.html b/docs/build/html/api/javadoc/net/corda/core/flows/FlowStateMachine.html
index 0f2846eb8a..4daf5534b5 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/FlowStateMachine.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/FlowStateMachine.html
@@ -2,10 +2,10 @@
-
+
FlowStateMachine
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/IllegalFlowLogicException.html b/docs/build/html/api/javadoc/net/corda/core/flows/IllegalFlowLogicException.html
index 18c69a5ceb..a5523e31e3 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/IllegalFlowLogicException.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/IllegalFlowLogicException.html
@@ -2,10 +2,10 @@
-
+
IllegalFlowLogicException
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/StateMachineRunId.Companion.html b/docs/build/html/api/javadoc/net/corda/core/flows/StateMachineRunId.Companion.html
index af82b053cb..56ae8b7eb2 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/StateMachineRunId.Companion.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/StateMachineRunId.Companion.html
@@ -2,10 +2,10 @@
-
+
StateMachineRunId.Companion
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/StateMachineRunId.html b/docs/build/html/api/javadoc/net/corda/core/flows/StateMachineRunId.html
index a896c5d5a3..cddb53dd24 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/StateMachineRunId.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/StateMachineRunId.html
@@ -2,10 +2,10 @@
-
+
StateMachineRunId
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/package-frame.html b/docs/build/html/api/javadoc/net/corda/core/flows/package-frame.html
index f280c3d747..b57bc6e854 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/package-frame.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/package-frame.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.flows
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/package-summary.html b/docs/build/html/api/javadoc/net/corda/core/flows/package-summary.html
index b9545e7ba1..e838fbd90f 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/package-summary.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/package-summary.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.flows
-
+
@@ -147,7 +147,12 @@ has at least one flow, but that flow may also invoke sub-flows: they all share t
FlowException
-
+
+Exception which can be thrown by a class FlowLogic
at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).
+
IllegalFlowLogicException
diff --git a/docs/build/html/api/javadoc/net/corda/core/flows/package-tree.html b/docs/build/html/api/javadoc/net/corda/core/flows/package-tree.html
index 345663e5db..e50c83b0ca 100644
--- a/docs/build/html/api/javadoc/net/corda/core/flows/package-tree.html
+++ b/docs/build/html/api/javadoc/net/corda/core/flows/package-tree.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.flows Class Hierarchy
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/CubicSplineInterpolator.Factory.html b/docs/build/html/api/javadoc/net/corda/core/math/CubicSplineInterpolator.Factory.html
index fcef976977..6dbf4c863c 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/CubicSplineInterpolator.Factory.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/CubicSplineInterpolator.Factory.html
@@ -2,10 +2,10 @@
-
+
CubicSplineInterpolator.Factory
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/CubicSplineInterpolator.html b/docs/build/html/api/javadoc/net/corda/core/math/CubicSplineInterpolator.html
index 953d4fd2f3..14bdf375ff 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/CubicSplineInterpolator.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/CubicSplineInterpolator.html
@@ -2,10 +2,10 @@
-
+
CubicSplineInterpolator
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/Interpolator.html b/docs/build/html/api/javadoc/net/corda/core/math/Interpolator.html
index 027d314fb8..e1ab8b9ba8 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/Interpolator.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/Interpolator.html
@@ -2,10 +2,10 @@
-
+
Interpolator
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/InterpolatorFactory.html b/docs/build/html/api/javadoc/net/corda/core/math/InterpolatorFactory.html
index d338d39dbb..5c0a67e216 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/InterpolatorFactory.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/InterpolatorFactory.html
@@ -2,10 +2,10 @@
-
+
InterpolatorFactory
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/LinearInterpolator.Factory.html b/docs/build/html/api/javadoc/net/corda/core/math/LinearInterpolator.Factory.html
index 5873795116..d6d5960822 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/LinearInterpolator.Factory.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/LinearInterpolator.Factory.html
@@ -2,10 +2,10 @@
-
+
LinearInterpolator.Factory
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/LinearInterpolator.html b/docs/build/html/api/javadoc/net/corda/core/math/LinearInterpolator.html
index d6b2c56024..57159af7cb 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/LinearInterpolator.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/LinearInterpolator.html
@@ -2,10 +2,10 @@
-
+
LinearInterpolator
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/Polynomial.html b/docs/build/html/api/javadoc/net/corda/core/math/Polynomial.html
index 74a2baec53..4ef6497e52 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/Polynomial.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/Polynomial.html
@@ -2,10 +2,10 @@
-
+
Polynomial
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/SplineFunction.html b/docs/build/html/api/javadoc/net/corda/core/math/SplineFunction.html
index 235888b406..caecbc1a28 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/SplineFunction.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/SplineFunction.html
@@ -2,10 +2,10 @@
-
+
SplineFunction
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/package-frame.html b/docs/build/html/api/javadoc/net/corda/core/math/package-frame.html
index 28164f4aea..ae8291d4c1 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/package-frame.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/package-frame.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.math
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/package-summary.html b/docs/build/html/api/javadoc/net/corda/core/math/package-summary.html
index 466f986f69..7f00631f6f 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/package-summary.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/package-summary.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.math
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/math/package-tree.html b/docs/build/html/api/javadoc/net/corda/core/math/package-tree.html
index 8cf8583ae4..e630900c15 100644
--- a/docs/build/html/api/javadoc/net/corda/core/math/package-tree.html
+++ b/docs/build/html/api/javadoc/net/corda/core/math/package-tree.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.math Class Hierarchy
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/Ack.html b/docs/build/html/api/javadoc/net/corda/core/messaging/Ack.html
index 4ac03ae9ab..ca1b234536 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/Ack.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/Ack.html
@@ -2,10 +2,10 @@
-
+
Ack
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/AllPossibleRecipients.html b/docs/build/html/api/javadoc/net/corda/core/messaging/AllPossibleRecipients.html
index 1710ea624e..7754c2b971 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/AllPossibleRecipients.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/AllPossibleRecipients.html
@@ -2,10 +2,10 @@
-
+
AllPossibleRecipients
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/CordaRPCOps.html b/docs/build/html/api/javadoc/net/corda/core/messaging/CordaRPCOps.html
index 8f76c67ea9..d30f054a68 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/CordaRPCOps.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/CordaRPCOps.html
@@ -2,10 +2,10 @@
-
+
CordaRPCOps
-
+
@@ -18,7 +18,9 @@
+
+
@@ -34,8 +36,8 @@
catch(err) {
}
//-->
-var methods = {"i0":18,"i1":18,"i2":18,"i3":18,"i4":18,"i5":18,"i6":18,"i7":18,"i8":18,"i9":18,"i10":18,"i11":18,"i12":18,"i13":18};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],16:["t5","Default Methods"]};
+var methods = {"i0":18,"i1":18,"i2":18,"i3":18,"i4":18,"i5":18,"i6":18,"i7":18,"i8":18,"i9":18,"i10":18,"i11":18,"i12":50,"i13":18,"i14":18,"i15":18};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],16:["t5","Default Methods"],32:["t6","Deprecated Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
var tableTab = "tableTab";
@@ -145,7 +147,7 @@ client apps and are implemented by the node in the CordaRPCOpsImpl
Method Summary
+
+
+
+-
+
uploadFile
+java.lang.String uploadFile(java.lang.String dataType,
+ java.lang.String name,
+ java.io.InputStream file)
+Deprecated.
+
+
@@ -375,7 +404,18 @@ result of running the flow.
-
currentNodeTime
java.time.Instant currentNodeTime()
-Returns the node-local current time.
+Returns the node's current time.
+
+
+
+
+
+
+-
+
waitUntilRegisteredWithNetworkMap
+com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> waitUntilRegisteredWithNetworkMap()
+Returns a ListenableFuture which completes when the node has registered wih the network map service. It can also
+complete with an exception if it is unable to.
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/CordaRPCOpsKt.html b/docs/build/html/api/javadoc/net/corda/core/messaging/CordaRPCOpsKt.html
index c3e484210c..408d4bcee5 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/CordaRPCOpsKt.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/CordaRPCOpsKt.html
@@ -2,10 +2,10 @@
-
+
CordaRPCOpsKt
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/FlowHandle.html b/docs/build/html/api/javadoc/net/corda/core/messaging/FlowHandle.html
index efcc715d93..57a6828327 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/FlowHandle.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/FlowHandle.html
@@ -2,10 +2,10 @@
-
+
FlowHandle
-
+
@@ -141,7 +141,7 @@ var activeTableTab = "activeTableTab";
FlowHandle(StateMachineRunId id,
rx.Observable<java.lang.String> progress,
- rx.Observable<A> returnValue)
+ com.google.common.util.concurrent.ListenableFuture<A> returnValue)
class FlowHandle
is a serialisable handle for the started flow, parameterised by the type of the flow's return value.
@@ -169,14 +169,14 @@ var activeTableTab = "activeTableTab";
component2()
-rx.Observable<A>
+com.google.common.util.concurrent.ListenableFuture<A>
component3()
FlowHandle<A>
copy(StateMachineRunId id,
rx.Observable<java.lang.String> progress,
- rx.Observable<A> returnValue)
+ com.google.common.util.concurrent.ListenableFuture<A> returnValue)
class FlowHandle
is a serialisable handle for the started flow, parameterised by the type of the flow's return value.
@@ -193,7 +193,7 @@ var activeTableTab = "activeTableTab";
getProgress()
-rx.Observable<A>
+com.google.common.util.concurrent.ListenableFuture<A>
getReturnValue()
@@ -227,15 +227,13 @@ var activeTableTab = "activeTableTab";
FlowHandle
public FlowHandle(StateMachineRunId id,
rx.Observable<java.lang.String> progress,
- rx.Observable<A> returnValue)
+ com.google.common.util.concurrent.ListenableFuture<A> returnValue)
class FlowHandle
is a serialisable handle for the started flow, parameterised by the type of the flow's return value.
- Parameters:
id
- The started state machine's ID.
progress
- The stream of progress tracker events.
-returnValue
- An Observable emitting a single event containing the flow's return value.
- To block on this value:
- val returnValue = rpc.startFlow(::MyFlow).returnValue.toBlocking().first()
+returnValue
- A ListenableFuture of the flow's return value.
- See Also:
class FlowHandle
@@ -273,7 +271,7 @@ var activeTableTab = "activeTableTab";
-
getReturnValue
-public rx.Observable<A> getReturnValue()
+public com.google.common.util.concurrent.ListenableFuture<A> getReturnValue()
@@ -300,7 +298,7 @@ var activeTableTab = "activeTableTab";
-
component3
-public rx.Observable<A> component3()
+public com.google.common.util.concurrent.ListenableFuture<A> component3()
@@ -311,15 +309,13 @@ var activeTableTab = "activeTableTab";
copy
public FlowHandle<A> copy(StateMachineRunId id,
rx.Observable<java.lang.String> progress,
- rx.Observable<A> returnValue)
+ com.google.common.util.concurrent.ListenableFuture<A> returnValue)
class FlowHandle
is a serialisable handle for the started flow, parameterised by the type of the flow's return value.
- Parameters:
id
- The started state machine's ID.
progress
- The stream of progress tracker events.
-returnValue
- An Observable emitting a single event containing the flow's return value.
- To block on this value:
- val returnValue = rpc.startFlow(::MyFlow).returnValue.toBlocking().first()
+returnValue
- A ListenableFuture of the flow's return value.
- See Also:
class FlowHandle
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/Message.html b/docs/build/html/api/javadoc/net/corda/core/messaging/Message.html
index 4a291de3dc..c14aa13d07 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/Message.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/Message.html
@@ -2,10 +2,10 @@
-
+
Message
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/MessageHandlerRegistration.html b/docs/build/html/api/javadoc/net/corda/core/messaging/MessageHandlerRegistration.html
index 71efc088bb..29b61092d0 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/MessageHandlerRegistration.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/MessageHandlerRegistration.html
@@ -2,10 +2,10 @@
-
+
MessageHandlerRegistration
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/MessageRecipientGroup.html b/docs/build/html/api/javadoc/net/corda/core/messaging/MessageRecipientGroup.html
index bfef12d032..20193e1bda 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/MessageRecipientGroup.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/MessageRecipientGroup.html
@@ -2,10 +2,10 @@
-
+
MessageRecipientGroup
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/MessageRecipients.html b/docs/build/html/api/javadoc/net/corda/core/messaging/MessageRecipients.html
index b482fc7441..c7c4cf1a51 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/MessageRecipients.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/MessageRecipients.html
@@ -2,10 +2,10 @@
-
+
MessageRecipients
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/MessagingKt.html b/docs/build/html/api/javadoc/net/corda/core/messaging/MessagingKt.html
index eff119fee3..e2aa1006e1 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/MessagingKt.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/MessagingKt.html
@@ -2,10 +2,10 @@
-
+
MessagingKt
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/MessagingService.html b/docs/build/html/api/javadoc/net/corda/core/messaging/MessagingService.html
index b5940655c6..c6c03a0498 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/MessagingService.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/MessagingService.html
@@ -2,10 +2,10 @@
-
+
MessagingService
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/RPCOps.html b/docs/build/html/api/javadoc/net/corda/core/messaging/RPCOps.html
index 1170d579c6..0e24113733 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/RPCOps.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/RPCOps.html
@@ -2,10 +2,10 @@
-
+
RPCOps
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/RPCReturnsObservables.html b/docs/build/html/api/javadoc/net/corda/core/messaging/RPCReturnsObservables.html
index 8484031a48..2f4df73f01 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/RPCReturnsObservables.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/RPCReturnsObservables.html
@@ -2,10 +2,10 @@
-
+
RPCReturnsObservables
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/ReceivedMessage.html b/docs/build/html/api/javadoc/net/corda/core/messaging/ReceivedMessage.html
index 33cadc600a..e4e9a72d38 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/ReceivedMessage.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/ReceivedMessage.html
@@ -2,10 +2,10 @@
-
+
ReceivedMessage
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/SingleMessageRecipient.html b/docs/build/html/api/javadoc/net/corda/core/messaging/SingleMessageRecipient.html
index 0a0c8c320e..00bf8152dd 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/SingleMessageRecipient.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/SingleMessageRecipient.html
@@ -2,10 +2,10 @@
-
+
SingleMessageRecipient
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineInfo.html b/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineInfo.html
index 8d396a6021..3f59620cd8 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineInfo.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineInfo.html
@@ -2,10 +2,10 @@
-
+
StateMachineInfo
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.Added.html b/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.Added.html
index 786a11eb27..4bdd3722f1 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.Added.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.Added.html
@@ -2,10 +2,10 @@
-
+
StateMachineUpdate.Added
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.Removed.html b/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.Removed.html
index 185ae01982..3ef866ec83 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.Removed.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.Removed.html
@@ -2,10 +2,10 @@
-
+
StateMachineUpdate.Removed
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.html b/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.html
index eefdccd8a9..78e2d16765 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/StateMachineUpdate.html
@@ -2,10 +2,10 @@
-
+
StateMachineUpdate
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/TopicSession.html b/docs/build/html/api/javadoc/net/corda/core/messaging/TopicSession.html
index 16722722c3..9dcb041fb8 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/TopicSession.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/TopicSession.html
@@ -2,10 +2,10 @@
-
+
TopicSession
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/TopicStringValidator.html b/docs/build/html/api/javadoc/net/corda/core/messaging/TopicStringValidator.html
index 58c0fa19df..baa4910c5d 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/TopicStringValidator.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/TopicStringValidator.html
@@ -2,10 +2,10 @@
-
+
TopicStringValidator
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/package-frame.html b/docs/build/html/api/javadoc/net/corda/core/messaging/package-frame.html
index dff69c274c..658a53ec1e 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/package-frame.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/package-frame.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.messaging
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/package-summary.html b/docs/build/html/api/javadoc/net/corda/core/messaging/package-summary.html
index 04561d630d..ad91b1f8fe 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/package-summary.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/package-summary.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.messaging
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/messaging/package-tree.html b/docs/build/html/api/javadoc/net/corda/core/messaging/package-tree.html
index cd6697f45c..351430ebfa 100644
--- a/docs/build/html/api/javadoc/net/corda/core/messaging/package-tree.html
+++ b/docs/build/html/api/javadoc/net/corda/core/messaging/package-tree.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.messaging Class Hierarchy
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/AttachmentsClassLoader.OverlappingAttachments.html b/docs/build/html/api/javadoc/net/corda/core/node/AttachmentsClassLoader.OverlappingAttachments.html
index cdeed51cb7..1637d30ed8 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/AttachmentsClassLoader.OverlappingAttachments.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/AttachmentsClassLoader.OverlappingAttachments.html
@@ -2,10 +2,10 @@
-
+
AttachmentsClassLoader.OverlappingAttachments
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/AttachmentsClassLoader.html b/docs/build/html/api/javadoc/net/corda/core/node/AttachmentsClassLoader.html
index 05e080523c..e9727952b2 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/AttachmentsClassLoader.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/AttachmentsClassLoader.html
@@ -2,10 +2,10 @@
-
+
AttachmentsClassLoader
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/CityDatabase.html b/docs/build/html/api/javadoc/net/corda/core/node/CityDatabase.html
index 4efd44302e..4f850e5ff7 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/CityDatabase.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/CityDatabase.html
@@ -2,10 +2,10 @@
-
+
CityDatabase
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/CordaPluginRegistry.html b/docs/build/html/api/javadoc/net/corda/core/node/CordaPluginRegistry.html
index 05f4bdbc36..b546572566 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/CordaPluginRegistry.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/CordaPluginRegistry.html
@@ -2,10 +2,10 @@
-
+
CordaPluginRegistry
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/NodeInfo.html b/docs/build/html/api/javadoc/net/corda/core/node/NodeInfo.html
index cf37ca9934..74358c3422 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/NodeInfo.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/NodeInfo.html
@@ -2,10 +2,10 @@
-
+
NodeInfo
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/PhysicalLocation.html b/docs/build/html/api/javadoc/net/corda/core/node/PhysicalLocation.html
index fbe616f1df..20c9f919a3 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/PhysicalLocation.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/PhysicalLocation.html
@@ -2,10 +2,10 @@
-
+
PhysicalLocation
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/PluginServiceHub.html b/docs/build/html/api/javadoc/net/corda/core/node/PluginServiceHub.html
index 975a59ae66..538c7ce57c 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/PluginServiceHub.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/PluginServiceHub.html
@@ -2,10 +2,10 @@
-
+
PluginServiceHub
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/ServiceEntry.html b/docs/build/html/api/javadoc/net/corda/core/node/ServiceEntry.html
index 591f7caf36..a282bf1193 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/ServiceEntry.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/ServiceEntry.html
@@ -2,10 +2,10 @@
-
+
ServiceEntry
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/ServiceHub.DefaultImpls.html b/docs/build/html/api/javadoc/net/corda/core/node/ServiceHub.DefaultImpls.html
index 23df3ae648..96079bf202 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/ServiceHub.DefaultImpls.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/ServiceHub.DefaultImpls.html
@@ -2,10 +2,10 @@
-
+
ServiceHub.DefaultImpls
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/ServiceHub.html b/docs/build/html/api/javadoc/net/corda/core/node/ServiceHub.html
index abbcc0603f..437741b0b0 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/ServiceHub.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/ServiceHub.html
@@ -2,10 +2,10 @@
-
+
ServiceHub
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/ServiceHubKt.html b/docs/build/html/api/javadoc/net/corda/core/node/ServiceHubKt.html
index 15a7b0cc01..1c89fd9b8a 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/ServiceHubKt.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/ServiceHubKt.html
@@ -2,10 +2,10 @@
-
+
ServiceHubKt
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/WorldCoordinate.html b/docs/build/html/api/javadoc/net/corda/core/node/WorldCoordinate.html
index 3cf95bce71..3dbf7dc653 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/WorldCoordinate.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/WorldCoordinate.html
@@ -2,10 +2,10 @@
-
+
WorldCoordinate
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/package-frame.html b/docs/build/html/api/javadoc/net/corda/core/node/package-frame.html
index 50362a2c71..0db42b2eea 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/package-frame.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/package-frame.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.node
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/package-summary.html b/docs/build/html/api/javadoc/net/corda/core/node/package-summary.html
index c6af74e8da..78d025043a 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/package-summary.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/package-summary.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.node
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/package-tree.html b/docs/build/html/api/javadoc/net/corda/core/node/package-tree.html
index 26561e1764..193613fd19 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/package-tree.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/package-tree.html
@@ -2,10 +2,10 @@
-
+
net.corda.core.node Class Hierarchy
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/services/AttachmentStorage.html b/docs/build/html/api/javadoc/net/corda/core/node/services/AttachmentStorage.html
index 9fa18fbaeb..b9aae4b14f 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/services/AttachmentStorage.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/services/AttachmentStorage.html
@@ -2,10 +2,10 @@
-
+
AttachmentStorage
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/services/FileUploader.html b/docs/build/html/api/javadoc/net/corda/core/node/services/FileUploader.html
new file mode 100644
index 0000000000..bd3b589df0
--- /dev/null
+++ b/docs/build/html/api/javadoc/net/corda/core/node/services/FileUploader.html
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+FileUploader
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+net.corda.core.node.services
+Interface FileUploader
+
+
+
+
+-
+
+- All Known Subinterfaces:
+- AcceptsFileUpload
+
+
+- All Known Implementing Classes:
+- NodeAttachmentService
+
+
+
+public FileUploader
+An interface that denotes a service that can accept file uploads.
+
+
+
+
+
+-
+
+
+-
+
+
+
Method Summary
+
+All Methods Instance Methods Default Methods
+
+Modifier and Type
+Method and Description
+
+
+boolean
+accepts(java.lang.String type)
+Check if this service accepts this type of upload. For example if you are uploading interest rates this could
+be "my-service-interest-rates". Type here does not refer to file extentions or MIME types.
+
+
+
+java.lang.String
+upload(java.io.InputStream file)
+Accepts the data in the given input stream, and returns some sort of useful return message that will be sent
+back to the user in the response.
+
+
+
+
+
+
+
+
+
+
+-
+
+
+-
+
+
+
Method Detail
+
+
+
+
+-
+
upload
+java.lang.String upload(java.io.InputStream file)
+Accepts the data in the given input stream, and returns some sort of useful return message that will be sent
+back to the user in the response.
+
+
+
+
+
+
+-
+
accepts
+boolean accepts(java.lang.String type)
+Check if this service accepts this type of upload. For example if you are uploading interest rates this could
+be "my-service-interest-rates". Type here does not refer to file extentions or MIME types.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/build/html/api/javadoc/net/corda/core/node/services/IdentityService.html b/docs/build/html/api/javadoc/net/corda/core/node/services/IdentityService.html
index ce62db6265..537505fc04 100644
--- a/docs/build/html/api/javadoc/net/corda/core/node/services/IdentityService.html
+++ b/docs/build/html/api/javadoc/net/corda/core/node/services/IdentityService.html
@@ -2,10 +2,10 @@
-
+
+
+
+IdentityService
-
+
@@ -54,7 +54,7 @@ var activeTableTab = "activeTableTab";
static NodeInfo
-getNodeByLegalIdentityKey(NetworkMapCache $this,
- CompositeKey compositeKey)
-Look up the node info for a specific peer key.
-
-
-
-static NodeInfo
getNodeByLegalName(NetworkMapCache $this,
java.lang.String name)
Look up the node info for a legal name.
-
+
static java.util.List<net.corda.core.node.NodeInfo>
getNodesByAdvertisedServiceIdentityKey(NetworkMapCache $this,
CompositeKey compositeKey)
Look up all nodes advertising the service owned by compositeKey
-
+
static java.util.List<net.corda.core.node.NodeInfo>
getNodesWithService(NetworkMapCache $this,
ServiceType serviceType)
Get the collection of nodes which advertise a specific service.
-
+
static Party
getNotary(NetworkMapCache $this,
java.lang.String name)
Gets a notary identity by the given name.
-
+
static java.util.List<net.corda.core.node.NodeInfo>
getNotaryNodes(NetworkMapCache $this)
A list of nodes that advertise a notary service
-
+
static NodeInfo
getRecommended(NetworkMapCache $this,
ServiceType type,
@@ -201,7 +193,7 @@ Implementations might understand, for example, the correct regulator to use for
or the appropriate oracle for a contract.
-
+
static java.util.List<net.corda.core.node.NodeInfo>
getRegulatorNodes(NetworkMapCache $this)
A list of nodes that advertise a regulatory service. Identifying the correct regulator for a trade is outside
@@ -209,7 +201,7 @@ the scope of the network map service, and this is intended solely as a sanity ch
elsewhere.
-
+
static boolean
isNotary(NetworkMapCache $this,
Party party)
@@ -290,17 +282,6 @@ or the appropriate oracle for a contract.
Look up the node info for a legal name.
-
-
-
-
--
-
getNodeByLegalIdentityKey
-public static NodeInfo getNodeByLegalIdentityKey(NetworkMapCache $this,
- CompositeKey compositeKey)
-Look up the node info for a specific peer key.
-
-
@@ -376,8 +357,8 @@ or the appropriate oracle for a contract.
-
+
-
verifyProposal
-public AbstractStateReplacementFlow.Proposal<T> verifyProposal(UntrustworthyData<? extends net.corda.flows.AbstractStateReplacementFlow.Proposal<? extends T>> maybeProposal)
+public void verifyProposal(AbstractStateReplacementFlow.Proposal<? extends T> proposal)
Check the state change proposal to confirm that it's acceptable to this node. Rules for verification depend
on the change proposed, and may further depend on the node itself (for example configuration). The
-proposal is returned if acceptable, otherwise an exception is thrown.
+proposal is returned if acceptable, otherwise a exception StateReplacementException
is thrown.
+
+- See Also:
+exception StateReplacementException
+
diff --git a/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Instigator.html b/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Instigator.html
index 4296e03d16..3f24b0f811 100644
--- a/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Instigator.html
+++ b/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Instigator.html
@@ -2,14 +2,13 @@
-
+
AbstractStateReplacementFlow.Instigator
-
+
-
@@ -27,7 +26,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -121,7 +120,7 @@ var activeTableTab = "activeTableTab";
- Enclosing class:
-- AbstractStateReplacementFlow<T>
+- AbstractStateReplacementFlow
@@ -203,31 +202,25 @@ extends FlowLogic
Method and Description
-AbstractStateReplacementFlow.Proposal<T>
-assembleProposal(StateRef stateRef,
- T modification,
- SignedTransaction stx)
-
-
kotlin.Pair<net.corda.core.transactions.SignedTransaction,java.lang.Iterable>
assembleTx()
-
+
StateAndRef<S>
call()
This is where you fill out your business logic. The returned object will usually be ignored, but can be
helpful if this flow is meant to be used as a subflow.
-
+
T
getModification()
-
+
StateAndRef<S>
getOriginalState()
-
+
ProgressTracker
getProgressTracker()
Override this to provide a class ProgressTracker
. If one is provided and stepped, the framework will do something
@@ -313,17 +306,6 @@ through.
helpful if this flow is meant to be used as a subflow.
-
-
-
-
--
-
assembleProposal
-public AbstractStateReplacementFlow.Proposal<T> assembleProposal(StateRef stateRef,
- T modification,
- SignedTransaction stx)
-
-
diff --git a/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Proposal.html b/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Proposal.html
index e387230d99..0cc9b7f5c8 100644
--- a/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Proposal.html
+++ b/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Proposal.html
@@ -2,14 +2,21 @@
-
+
AbstractStateReplacementFlow.Proposal
-
-
+
+
+
+
+
+
+
+
+
@@ -23,8 +30,8 @@
catch(err) {
}
//-->
-var methods = {"i0":18,"i1":18,"i2":18};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],16:["t5","Default Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
var tableTab = "tableTab";
@@ -53,7 +60,7 @@ var activeTableTab = "activeTableTab";
@@ -97,29 +104,47 @@ var activeTableTab = "activeTableTab";
net.corda.flows
-Interface AbstractStateReplacementFlow.Proposal<T>
+Class AbstractStateReplacementFlow.Proposal<T>
+
+- net.corda.flows.AbstractStateReplacementFlow.Proposal<T>
+
-
-- All Known Implementing Classes:
-- NotaryChangeFlow.Proposal
-
-
- Enclosing class:
-- AbstractStateReplacementFlow<T>
+- AbstractStateReplacementFlow
-public static AbstractStateReplacementFlow.Proposal<T>
+public static class AbstractStateReplacementFlow.Proposal<T>
-
+
+
+-
+
+
+
Constructor Summary
+
+Constructors
+
+Constructor and Description
+
+
+Proposal(StateRef stateRef,
+ T modification,
+ SignedTransaction stx)
+
+
+
+
-
@@ -127,23 +152,53 @@ var activeTableTab = "activeTableTab";
Method Summary
-All Methods Instance Methods Default Methods
+All Methods Instance Methods Concrete Methods
Modifier and Type
Method and Description
-T
-getModification()
+StateRef
+component1()
-StateRef
-getStateRef()
+T
+component2()
SignedTransaction
+component3()
+
+
+AbstractStateReplacementFlow.Proposal<T>
+copy(StateRef stateRef,
+ T modification,
+ SignedTransaction stx)
+
+
+boolean
+equals(java.lang.Object p)
+
+
+T
+getModification()
+
+
+StateRef
+getStateRef()
+
+
+SignedTransaction
getStx()
+
+int
+hashCode()
+
+
+java.lang.String
+toString()
+
@@ -153,6 +208,25 @@ var activeTableTab = "activeTableTab";
-
+
+
+-
+
+
+
Constructor Detail
+
+
+
+
+-
+
Proposal
+public Proposal(StateRef stateRef,
+ T modification,
+ SignedTransaction stx)
+
+
+
+
-
@@ -165,7 +239,7 @@ var activeTableTab = "activeTableTab";
@@ -174,16 +248,81 @@ var activeTableTab = "activeTableTab";
-
getModification
-T getModification()
+public T getModification()
-
+
-
getStx
-SignedTransaction getStx()
+public SignedTransaction getStx()
+
+
+
+
+
+
+-
+
component1
+public StateRef component1()
+
+
+
+
+
+
+-
+
component2
+public T component2()
+
+
+
+
+
+
+-
+
component3
+public SignedTransaction component3()
+
+
+
+
+
+
+-
+
copy
+public AbstractStateReplacementFlow.Proposal<T> copy(StateRef stateRef,
+ T modification,
+ SignedTransaction stx)
+
+
+
+
+
+
+-
+
toString
+public java.lang.String toString()
+
+
+
+
+
+
+-
+
hashCode
+public int hashCode()
+
+
+
+
+
+
+-
+
equals
+public boolean equals(java.lang.Object p)
@@ -213,7 +352,7 @@ var activeTableTab = "activeTableTab";
diff --git a/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Result.html b/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Result.html
deleted file mode 100644
index e4ae653a26..0000000000
--- a/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.Result.html
+++ /dev/null
@@ -1,385 +0,0 @@
-
-
-
-
-
-
-
AbstractStateReplacementFlow.Result
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-net.corda.flows
-Class AbstractStateReplacementFlow.Result
-
-
-
-- net.corda.flows.AbstractStateReplacementFlow.Result
-
-
-
--
-
-- Enclosing class:
-- AbstractStateReplacementFlow<T>
-
-
-
-public static class AbstractStateReplacementFlow.Result
-
-
-
-
-
--
-
-
--
-
-
-
Nested Class Summary
-
-Nested Classes
-
-Modifier and Type
-Class and Description
-
-
-static class
-Result.Companion
-
-
-
-
-
-
--
-
-
-
Field Summary
-
-Fields
-
-Modifier and Type
-Field and Description
-
-
-static Result.Companion
-Companion
-
-
-
-
-
-
--
-
-
-
Method Summary
-
-All Methods Instance Methods Concrete Methods
-
-Modifier and Type
-Method and Description
-
-
-DigitalSignature.WithKey
-component1()
-
-
-StateReplacementRefused
-component2()
-
-
-AbstractStateReplacementFlow.Result
-copy(DigitalSignature.WithKey sig,
- StateReplacementRefused error)
-
-
-boolean
-equals(java.lang.Object p)
-
-
-StateReplacementRefused
-getError()
-
-
-DigitalSignature.WithKey
-getSig()
-
-
-int
-hashCode()
-
-
-java.lang.String
-toString()
-
-
-
-
-
-
-
-
-
--
-
-
--
-
-
-
Field Detail
-
-
-
-
--
-
Companion
-public static Result.Companion Companion
-
-
-
-
-
-
--
-
-
-
Method Detail
-
-
-
-
--
-
getSig
-public DigitalSignature.WithKey getSig()
-
-
-
-
-
-
--
-
getError
-public StateReplacementRefused getError()
-
-
-
-
-
-
--
-
component1
-public DigitalSignature.WithKey component1()
-
-
-
-
-
-
--
-
component2
-public StateReplacementRefused component2()
-
-
-
-
-
-
--
-
copy
-public AbstractStateReplacementFlow.Result copy(DigitalSignature.WithKey sig,
- StateReplacementRefused error)
-
-
-
-
-
-
--
-
toString
-public java.lang.String toString()
-
-
-
-
-
-
--
-
hashCode
-public int hashCode()
-
-
-
-
-
-
--
-
equals
-public boolean equals(java.lang.Object p)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.html b/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.html
index 26e17dc313..68ec7e2734 100644
--- a/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.html
+++ b/docs/build/html/api/javadoc/net/corda/flows/AbstractStateReplacementFlow.html
@@ -2,10 +2,10 @@
-
+
-
-
-AbstractStateReplacementFlow
-
+
@@ -88,11 +88,11 @@
net.corda.flows
-Class AbstractStateReplacementFlow<T>
+Class AbstractStateReplacementFlow
-- net.corda.flows.AbstractStateReplacementFlow<T>
+- net.corda.flows.AbstractStateReplacementFlow
@@ -103,7 +103,7 @@
-
public class AbstractStateReplacementFlow<T>
+public class AbstractStateReplacementFlow
Abstract flow to be used for replacing one state with another, for example when changing the notary of a state.
Notably this requires a one to one replacement of states, states cannot be split, merged or issued as part of these
flows.
The class AbstractStateReplacementFlow.Instigator
assembles the transaction for state replacement and sends out change proposals to all participants
@@ -144,7 +144,7 @@ use the new updated state for future transactions.
static class
-AbstractStateReplacementFlow.Result
+AbstractStateReplacementFlow.Proposal<T>
diff --git a/docs/build/html/api/javadoc/net/corda/flows/Acceptor.Companion.html b/docs/build/html/api/javadoc/net/corda/flows/Acceptor.Companion.html
index e67e9c0388..57dcdc55ae 100644
--- a/docs/build/html/api/javadoc/net/corda/flows/Acceptor.Companion.html
+++ b/docs/build/html/api/javadoc/net/corda/flows/Acceptor.Companion.html
@@ -2,10 +2,10 @@
-
+
Acceptor.Companion
-
+
@@ -135,10 +135,6 @@ var activeTableTab = "activeTableTab";
static class
-Companion.REJECTING
-
-
-static class
Companion.VERIFYING
diff --git a/docs/build/html/api/javadoc/net/corda/flows/BroadcastTransactionFlow.NotifyTxRequest.html b/docs/build/html/api/javadoc/net/corda/flows/BroadcastTransactionFlow.NotifyTxRequest.html
index c594dc45e7..6faf0aa2fd 100644
--- a/docs/build/html/api/javadoc/net/corda/flows/BroadcastTransactionFlow.NotifyTxRequest.html
+++ b/docs/build/html/api/javadoc/net/corda/flows/BroadcastTransactionFlow.NotifyTxRequest.html
@@ -2,10 +2,10 @@
-
+
BroadcastTransactionFlow.NotifyTxRequest
-
+
diff --git a/docs/build/html/api/javadoc/net/corda/flows/BroadcastTransactionFlow.html b/docs/build/html/api/javadoc/net/corda/flows/BroadcastTransactionFlow.html
index d9d7c463ce..ceb757b119 100644
--- a/docs/build/html/api/javadoc/net/corda/flows/BroadcastTransactionFlow.html
+++ b/docs/build/html/api/javadoc/net/corda/flows/BroadcastTransactionFlow.html
@@ -2,10 +2,10 @@
-
+
BroadcastTransactionFlow
-
+
@@ -53,7 +53,7 @@ var activeTableTab = "activeTableTab";
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.flows/index.html b/docs/build/html/api/kotlin/corda/net.corda.core.flows/index.html
index 25c47cc069..720af44327 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.core.flows/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.core.flows/index.html
@@ -72,7 +72,12 @@ has at least one flow, but that flow may also invoke sub-flows: they all share t
FlowException
-class FlowException : RuntimeException
+open class FlowException : Exception
+Exception which can be thrown by a FlowLogic at any point in its logic to unexpectedly bring it to a permanent end.
+The exception will propagate to all counterparty flows and will be thrown on their end the next time they wait on a
+FlowLogic.receive or FlowLogic.sendAndReceive. Any flow which no longer needs to do a receive, or has already ended,
+will not receive the exception (if this is required then have them wait for a confirmation message).
+
abstract fun currentNodeTime(): Instant
-Returns the node-local current time.
+Returns the node's current time.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-corda-r-p-c-ops/index.html b/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-corda-r-p-c-ops/index.html index 8a92378360..3087fb0558 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-corda-r-p-c-ops/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-corda-r-p-c-ops/index.html @@ -46,7 +46,7 @@ client apps and are implemented by the node in the CordaRPCOpsImpl currentNodeTimeabstract fun currentNodeTime(): Instant
-Returns the node-local current time.
+Returns the node's current time.
abstract fun uploadFile(dataType: String, name: String?, file: InputStream): String
abstract fun vaultAndUpdates(): Pair<List<StateAndRef<ContractState>>, Observable<Update>>
@@ -137,6 +143,15 @@ such mappings as well.
Returns a pair of all recorded transactions and an observable of future recorded ones.
abstract fun waitUntilRegisteredWithNetworkMap(): ListenableFuture<Unit>
+Returns a ListenableFuture which completes when the node has registered wih the network map service. It can also +complete with an exception if it is unable to.
+abstract fun uploadFile(dataType: String, name: String?, file: InputStream): String
@RPCReturnsObservables abstract fun waitUntilRegisteredWithNetworkMap(): ListenableFuture<Unit>
+Returns a ListenableFuture which completes when the node has registered wih the network map service. It can also +complete with an exception if it is unable to.
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-flow-handle/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-flow-handle/-init-.html index 306b134e29..d8d75a3403 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-flow-handle/-init-.html +++ b/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-flow-handle/-init-.html @@ -8,7 +8,7 @@ corda / net.corda.core.messaging / FlowHandle / <init>FlowHandle(id: StateMachineRunId, progress: Observable<String>, returnValue: Observable<A>)
+FlowHandle(id: StateMachineRunId, progress: Observable<String>, returnValue: ListenableFuture<A>)
FlowHandle is a serialisable handle for the started flow, parameterised by the type of the flow's return value.
progress
- The stream of progress tracker events.
-returnValue
- An Observable emitting a single event containing the flow's return value.
- To block on this value:
- val returnValue = rpc.startFlow(::MyFlow).returnValue.toBlocking().first()
+returnValue
- A ListenableFuture of the flow's return value.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-flow-handle/index.html b/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-flow-handle/index.html
index 20a5b7f9bf..a18bb754ab 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-flow-handle/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.core.messaging/-flow-handle/index.html
@@ -17,9 +17,7 @@
progress
- The stream of progress tracker events.
-returnValue
- An Observable emitting a single event containing the flow's return value.
- To block on this value:
- val returnValue = rpc.startFlow(::MyFlow).returnValue.toBlocking().first()
+returnValue
- A ListenableFuture of the flow's return value.
<init> |
-FlowHandle(id: StateMachineRunId, progress: Observable<String>, returnValue: Observable<A>)
+FlowHandle(id: StateMachineRunId, progress: Observable<String>, returnValue: ListenableFuture<A>)
FlowHandle is a serialisable handle for the started flow, parameterised by the type of the flow's return value. |
@@ -52,7 +50,7 @@
returnValue |
-val returnValue: Observable<A> |
+
val returnValue: Observable<A>
+val returnValue: ListenableFuture<A>
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-file-uploader/accepts.html b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-file-uploader/accepts.html
new file mode 100644
index 0000000000..97ffb114a7
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-file-uploader/accepts.html
@@ -0,0 +1,16 @@
+
+
+
+abstract fun accepts(type: String): Boolean
+Check if this service accepts this type of upload. For example if you are uploading interest rates this could +be "my-service-interest-rates". Type here does not refer to file extentions or MIME types.
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-file-uploader/index.html b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-file-uploader/index.html new file mode 100644 index 0000000000..eefd3f8ff7 --- /dev/null +++ b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-file-uploader/index.html @@ -0,0 +1,50 @@ + + + +interface FileUploader
+An interface that denotes a service that can accept file uploads.
++accepts | +
+abstract fun accepts(type: String): Boolean
+Check if this service accepts this type of upload. For example if you are uploading interest rates this could +be "my-service-interest-rates". Type here does not refer to file extentions or MIME types. + |
+
+upload | +
+abstract fun upload(file: InputStream): String
+Accepts the data in the given input stream, and returns some sort of useful return message that will be sent +back to the user in the response. + |
+
+AcceptsFileUpload | +
+interface AcceptsFileUpload : FileUploader
+A service that implements AcceptsFileUpload can have new binary data provided to it via an HTTP upload. + |
+
abstract fun upload(file: InputStream): String
+Accepts the data in the given input stream, and returns some sort of useful return message that will be sent +back to the user in the response.
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-network-map-cache/get-node-by-legal-identity-key.html b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-network-map-cache/get-node-by-legal-identity-key.html index 89298039cf..3eed0ee7bb 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-network-map-cache/get-node-by-legal-identity-key.html +++ b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-network-map-cache/get-node-by-legal-identity-key.html @@ -9,7 +9,7 @@open fun getNodeByLegalIdentityKey(compositeKey: CompositeKey): NodeInfo?
+abstract fun getNodeByLegalIdentityKey(compositeKey: CompositeKey): NodeInfo?
Look up the node info for a specific peer key.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-network-map-cache/index.html b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-network-map-cache/index.html index 0c7ffcd0ec..576114ef4b 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-network-map-cache/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-network-map-cache/index.html @@ -119,7 +119,7 @@ updates.open fun getNodeByLegalIdentityKey(compositeKey: CompositeKey): NodeInfo?
+abstract fun getNodeByLegalIdentityKey(compositeKey: CompositeKey): NodeInfo?
Look up the node info for a specific peer key.
abstract val uploaders: List<FileUploader>
abstract val validatedTransactions: ReadOnlyTransactionStorage
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-storage-service/uploaders.html b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-storage-service/uploaders.html
new file mode 100644
index 0000000000..1915f9949f
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.core.node.services/-storage-service/uploaders.html
@@ -0,0 +1,16 @@
+
+
+
+abstract val uploaders: List<FileUploader>
abstract val stateMachineRecordedTransactionMapping: StateMachineRecordedTransactionMappingStorage
abstract val uploaders: List<FileUploader>
interface FileUploader
+An interface that denotes a service that can accept file uploads.
+interface IdentityService
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.schemas/-queryable-state/index.html b/docs/build/html/api/kotlin/corda/net.corda.core.schemas/-queryable-state/index.html
index ed34dec65f..ac34fbc847 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.core.schemas/-queryable-state/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.core.schemas/-queryable-state/index.html
@@ -81,7 +81,7 @@ or filtering of, states.
data class State : OwnableState, QueryableState
data class State : OwnableState, QueryableState, ICommercialPaperState
fun <T : Any> Kryo.register(type: KClass<T>, read: (Kryo, Input) -> T, write: (Kryo, Output, T) -> Unit): Registration
fun <T> Kryo.useClassLoader(cl: ClassLoader, body: () -> T): T
inline fun <T : Any> Kryo.register(type: KClass<T>, crossinline read: (Kryo, Input) -> T, crossinline write: (Kryo, Output, T) -> Unit): Registration
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.transactions/-signed-transaction/index.html b/docs/build/html/api/kotlin/corda/net.corda.core.transactions/-signed-transaction/index.html
index d61a74c892..1def3eb406 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.core.transactions/-signed-transaction/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.core.transactions/-signed-transaction/index.html
@@ -103,6 +103,14 @@ want verifySignatures instead.
fun signWithECDSA(keyPair: KeyPair): WithKey
+Utility to simplify the act of signing the transaction.
+fun toLedgerTransaction(services: ServiceHub): LedgerTransaction
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core.transactions/-signed-transaction/sign-with-e-c-d-s-a.html b/docs/build/html/api/kotlin/corda/net.corda.core.transactions/-signed-transaction/sign-with-e-c-d-s-a.html
new file mode 100644
index 0000000000..5edba62ae5
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.core.transactions/-signed-transaction/sign-with-e-c-d-s-a.html
@@ -0,0 +1,21 @@
+
+
+
+fun signWithECDSA(keyPair: KeyPair): WithKey
+Utility to simplify the act of signing the transaction.
+
+keyPair
- the signer's public/private key pair.
+
Return
+a digital signature of the transaction.
object REJECTING : Step
object REQUESTING : Step
fun <A> ListenableFuture<A>.toObservable(): Observable<A>
fun <A> ListenableFuture<out A>.toObservable(): Observable<A>
fun <A> ListenableFuture<A>.toObservable(): Observable<A>
+fun <A> ListenableFuture<out A>.toObservable(): Observable<A>
diff --git a/docs/build/html/api/kotlin/corda/net.corda.core/rx.-observable/index.html b/docs/build/html/api/kotlin/corda/net.corda.core/rx.-observable/index.html
index 7d58a22cf5..1b9e2e5770 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.core/rx.-observable/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.core/rx.-observable/index.html
@@ -24,7 +24,8 @@
fun <T> Observable<T>.toFuture(): ListenableFuture<T>
Returns a ListenableFuture bound to the
fun <T> Observable<T>.toFuture(): ListenableFuture<T>
Returns a ListenableFuture bound to the
object REJECTING : Step
--changes | -
-open val changes: Observable<Change> |
-
-label | -
-open val label: String |
-
-childProgressTracker | -
-open fun childProgressTracker(): ProgressTracker? |
-
abstract class Acceptor<T> : FlowLogic<Unit>
+abstract class Acceptor<in T> : FlowLogic<Unit>
-REJECTING | -
-object REJECTING : Step |
-|||||||||||||||||||||||||||
VERIFYING |
object VERIFYING : Step |
@@ -122,10 +116,10 @@ helpful if this flow is meant to be used as a subflow.
verifyProposal |
-abstract fun verifyProposal(maybeProposal: UntrustworthyData<Proposal<T>>): Proposal<T>
+abstract fun verifyProposal(proposal: Proposal<T>): Unit
Check the state change proposal to confirm that it's acceptable to this node. Rules for verification depend on the change proposed, and may further depend on the node itself (for example configuration). The -proposal is returned if acceptable, otherwise an exception is thrown. +proposal is returned if acceptable, otherwise a StateReplacementException is thrown. |
receive |
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType. fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R. -open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType. |
|||||||||||||||||||||||
-assembleProposal | -
-abstract fun assembleProposal(stateRef: StateRef, modification: T, stx: SignedTransaction): Proposal<T> |
-|
assembleTx |
abstract fun assembleTx(): Pair<SignedTransaction, Iterable<CompositeKey>> |
@@ -151,8 +145,8 @@ will do as long as the other side registers with it.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R. -open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType. +open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType. |
sendAndReceive |
+open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type. -open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. |
|
Instigator |
-class Instigator<T : ContractState> : Instigator<T, Party> |
+
Proposal(stateRef: StateRef, modification: T, stx: SignedTransaction)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/index.html
index fa8e2d4c11..8723df1848 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/index.html
@@ -8,7 +8,18 @@
corda / net.corda.flows / AbstractStateReplacementFlow / Proposalinterface Proposal<out T>
+data class Proposal<out T>
++<init> | +
+Proposal(stateRef: StateRef, modification: T, stx: SignedTransaction) |
+
modification |
-abstract val modification: T |
+
stateRef |
-abstract val stateRef: StateRef |
+
stx |
-abstract val stx: SignedTransaction |
-
-Proposal | -
-data class Proposal : Proposal<Party> |
+
abstract val modification: T
+val modification: T
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/state-ref.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/state-ref.html
index 72f03fe3ce..53fc4c6e34 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/state-ref.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/state-ref.html
@@ -9,6 +9,6 @@
abstract val stateRef: StateRef
+val stateRef: StateRef
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/stx.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/stx.html
index 685f628963..079f6497d9 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/stx.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-proposal/stx.html
@@ -9,6 +9,6 @@
abstract val stx: SignedTransaction
+val stx: SignedTransaction
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/error.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/error.html
deleted file mode 100644
index 31c52e4f91..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/error.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val error: StateReplacementRefused?
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/index.html
deleted file mode 100644
index 1f63a4555b..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-data class Result
--error | -
-val error: StateReplacementRefused? |
-
-sig | -
-val sig: WithKey? |
-
-noError | -
-fun noError(sig: WithKey): Result |
-
-withError | -
-fun withError(error: StateReplacementRefused): Result |
-
fun noError(sig: WithKey): Result
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/sig.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/sig.html
deleted file mode 100644
index 783cb00bef..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/sig.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val sig: WithKey?
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/with-error.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/with-error.html
deleted file mode 100644
index 631278464f..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/-result/with-error.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-fun withError(error: StateReplacementRefused): Result
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/index.html
index d8183b7ac2..eff402adfb 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-abstract-state-replacement-flow/index.html
@@ -8,7 +8,7 @@
corda / net.corda.flows / AbstractStateReplacementFlowabstract class AbstractStateReplacementFlow<T>
+abstract class AbstractStateReplacementFlow
Abstract flow to be used for replacing one state with another, for example when changing the notary of a state. Notably this requires a one to one replacement of states, states cannot be split, merged or issued as part of these flows.
@@ -23,25 +23,19 @@ use the new updated state for future transactions.abstract class Acceptor<T> : FlowLogic<Unit>
abstract class Acceptor<in T> : FlowLogic<Unit>
abstract class Instigator<out S : ContractState, T> : FlowLogic<StateAndRef<S>>
abstract class Instigator<out S : ContractState, out T> : FlowLogic<StateAndRef<S>>
interface Proposal<out T>
data class Result
data class Proposal<out T>
object NotaryChangeFlow : AbstractStateReplacementFlow<Party>
+object NotaryChangeFlow : AbstractStateReplacementFlow
A flow to be used for changing a state's Notary. This is required since all input states to a transaction must point to the same notary.
open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type.
+open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
CashException(message: String, cause: Throwable)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-exception/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-exception/index.html
new file mode 100644
index 0000000000..f70ee2a7c6
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-exception/index.html
@@ -0,0 +1,35 @@
+
+
+
+class CashException : FlowException
++<init> | +
+CashException(message: String, cause: Throwable) |
+
+rootCause | +
+val Throwable.rootCause: Throwable |
+
Failed(message: String?)
-State indicating the action undertaken failed, either directly (it is not something which requires a -state machine), or before a state machine was started.
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-failed/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-failed/index.html deleted file mode 100644 index daa6ec097c..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-failed/index.html +++ /dev/null @@ -1,51 +0,0 @@ - - - -class Failed : CashFlowResult
-State indicating the action undertaken failed, either directly (it is not something which requires a -state machine), or before a state machine was started.
--<init> | -
-Failed(message: String?)
-State indicating the action undertaken failed, either directly (it is not something which requires a -state machine), or before a state machine was started. - |
-
-message | -
-val message: String? |
-
-toString | -
-fun toString(): String |
-
val message: String?
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-failed/to-string.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-failed/to-string.html
deleted file mode 100644
index 027ed71d0c..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-failed/to-string.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-fun toString(): String
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/-init-.html
deleted file mode 100644
index ffa2d90b37..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/-init-.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-Success(id: StateMachineRunId, transaction: SignedTransaction?, message: String?)
-
-transaction
- the transaction created as a result, in the case where the flow completed successfully.
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/id.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/id.html
deleted file mode 100644
index 699d6b7743..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/id.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
val id: StateMachineRunId
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/index.html
deleted file mode 100644
index f47bb73522..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-class Success : CashFlowResult
-
-transaction
- the transaction created as a result, in the case where the flow completed successfully.
-
-<init> | -
-Success(id: StateMachineRunId, transaction: SignedTransaction?, message: String?) |
-
-id | -
-val id: StateMachineRunId |
-
-message | -
-val message: String? |
-
-transaction | -
-val transaction: SignedTransaction? |
-
-toString | -
-fun toString(): String |
-
val message: String?
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/to-string.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/to-string.html
deleted file mode 100644
index 6500ef26df..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/to-string.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-fun toString(): String
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/transaction.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/transaction.html
deleted file mode 100644
index 67ac38ba36..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/-success/transaction.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val transaction: SignedTransaction?
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/index.html
deleted file mode 100644
index 71e054ba92..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow-result/index.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-sealed class CashFlowResult
--Failed | -
-class Failed : CashFlowResult
-State indicating the action undertaken failed, either directly (it is not something which requires a -state machine), or before a state machine was started. - |
-
-Success | -
-class Success : CashFlowResult |
-
-Failed | -
-class Failed : CashFlowResult
-State indicating the action undertaken failed, either directly (it is not something which requires a -state machine), or before a state machine was started. - |
-
-Success | -
-class Success : CashFlowResult |
-
@Suspendable fun call(): CashFlowResult
+@Suspendable fun call(): SignedTransaction
Overrides FlowLogic.call
This is where you fill out your business logic. The returned object will usually be ignored, but can be helpful if this flow is meant to be used as a subflow.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow/index.html index cf9af58c98..770321a384 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-cash-flow/index.html @@ -8,7 +8,7 @@ corda / net.corda.flows / CashFlowclass CashFlow : FlowLogic<CashFlowResult>
+class CashFlow : FlowLogic<SignedTransaction>
Initiates a flow that produces an Issue/Move or Exit Cash transaction.
fun call(): CashFlowResult
+fun call(): SignedTransaction
This is where you fill out your business logic. The returned object will usually be ignored, but can be helpful if this flow is meant to be used as a subflow.
open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
-open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response
-is received, which must be of the given receiveType. Remember that when receiving data from other parties the data
+open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data should not be trusted until it's been thoroughly verified for consistency and that all expectations are satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-bad-answer/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-bad-answer/-init-.html
deleted file mode 100644
index ff281a5fdc..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-bad-answer/-init-.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-BadAnswer()
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-bad-answer/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-bad-answer/index.html
deleted file mode 100644
index e1233acdd6..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-bad-answer/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-open class BadAnswer : Exception
--<init> | -
-BadAnswer() |
-
-DownloadedVsRequestedDataMismatch | -
-class DownloadedVsRequestedDataMismatch : BadAnswer |
-
-HashNotFound | -
-class HashNotFound : BadAnswer |
-
class DownloadedVsRequestedDataMismatch : BadAnswer
+class DownloadedVsRequestedDataMismatch : IllegalArgumentException
+<init> | +
+DownloadedVsRequestedSizeMismatch(requested: Int, got: Int) |
+
+got | +
+val got: Int |
+
+requested | +
+val requested: Int |
+
val requested: Int
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-hash-not-found/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-hash-not-found/index.html
index c74c8125a5..94750329d9 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-hash-not-found/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-fetch-data-flow/-hash-not-found/index.html
@@ -8,7 +8,7 @@
corda / net.corda.flows / FetchDataFlow / HashNotFoundclass HashNotFound : BadAnswer
+class HashNotFound : FlowException
-BadAnswer | +DownloadedVsRequestedDataMismatch
-open class BadAnswer : Exception |
+
-DownloadedVsRequestedDataMismatch | +DownloadedVsRequestedSizeMismatch
-class DownloadedVsRequestedDataMismatch : BadAnswer |
+
HashNotFound |
-class HashNotFound : BadAnswer |
+
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
-open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type.
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
-open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type.
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response
-is received, which must be of the given receiveType. Remember that when receiving data from other parties the data
+open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data should not be trusted until it's been thoroughly verified for consistency and that all expectations are satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-input-state-ref-resolve-failed/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-input-state-ref-resolve-failed/-init-.html deleted file mode 100644 index bc854193b1..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-input-state-ref-resolve-failed/-init-.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -InputStateRefResolveFailed(stateRefs: List<StateRef>)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-input-state-ref-resolve-failed/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-input-state-ref-resolve-failed/index.html
deleted file mode 100644
index 8b9272b7ca..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-input-state-ref-resolve-failed/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-class InputStateRefResolveFailed : Exception
--<init> | -
-InputStateRefResolveFailed(stateRefs: List<StateRef>) |
-
-rootCause | -
-val Throwable.rootCause: Throwable |
-
IssuanceRequester(amount: Amount<Currency>, issueToParty: Party, issueToPartyRef: OpaqueBytes, issuerBankParty: Party)
-IssuanceRequester should be used by a client to ask a remote note to issue some FungibleAsset with the given details. +
IssuanceRequester should be used by a client to ask a remote node to issue some FungibleAsset with the given details. Returns the transaction created by the Issuer to move the cash to the Requester.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-issuer-flow/-issuance-requester/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-issuer-flow/-issuance-requester/index.html index 215448349d..5729af8b6c 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-issuer-flow/-issuance-requester/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-issuer-flow/-issuance-requester/index.html @@ -9,7 +9,7 @@class IssuanceRequester : FlowLogic<SignedTransaction>
-IssuanceRequester should be used by a client to ask a remote note to issue some FungibleAsset with the given details. +
IssuanceRequester should be used by a client to ask a remote node to issue some FungibleAsset with the given details. Returns the transaction created by the Issuer to move the cash to the Requester.
IssuanceRequester(amount: Amount<Currency>, issueToParty: Party, issueToPartyRef: OpaqueBytes, issuerBankParty: Party)
-IssuanceRequester should be used by a client to ask a remote note to issue some FungibleAsset with the given details. + IssuanceRequester should be used by a client to ask a remote node to issue some FungibleAsset with the given details. Returns the transaction created by the Issuer to move the cash to the Requester. |
@@ -139,8 +139,8 @@ will do as long as the other side registers with it.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R. -open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType. +open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType. |
||||||||||||||||||
sendAndReceive |
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type. +open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. |
||||||||||||||||||
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R. -open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType. +open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType. |
|||||||||||||||||||
class IssuanceRequester : FlowLogic<SignedTransaction>
-IssuanceRequester should be used by a client to ask a remote note to issue some FungibleAsset with the given details. + IssuanceRequester should be used by a client to ask a remote node to issue some FungibleAsset with the given details. Returns the transaction created by the Issuer to move the cash to the Requester. |
verifyProposal |
-fun verifyProposal(maybeProposal: UntrustworthyData<Proposal<Party>>): Proposal<Party>
+fun verifyProposal(proposal: Proposal<Party>): Unit
Check the notary change proposal. |
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-acceptor/verify-proposal.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-acceptor/verify-proposal.html
index bbf8659db8..78869780b5 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-acceptor/verify-proposal.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-acceptor/verify-proposal.html
@@ -8,8 +8,8 @@
corda / net.corda.flows / NotaryChangeFlow / Acceptor / verifyProposal
-assembleProposal | -
-fun assembleProposal(stateRef: StateRef, modification: Party, stx: SignedTransaction): Proposal<Party> |
-||||||||||
assembleTx |
fun assembleTx(): Pair<SignedTransaction, Iterable<CompositeKey>> |
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/-init-.html
deleted file mode 100644
index 7d74b8414b..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/-init-.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-<init> | -
-Proposal(stateRef: StateRef, modification: Party, stx: SignedTransaction) |
-
-modification | -
-val modification: Party |
-
-stateRef | -
-val stateRef: StateRef |
-
-stx | -
-val stx: SignedTransaction |
-
val modification: Party
-Overrides Proposal.modification
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/state-ref.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/state-ref.html deleted file mode 100644 index a15282c48b..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/state-ref.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -val stateRef: StateRef
-Overrides Proposal.stateRef
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/stx.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/stx.html deleted file mode 100644 index bbca83fe6a..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/-proposal/stx.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -val stx: SignedTransaction
-Overrides Proposal.stx
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/index.html index fd95128137..39f14e512c 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-change-flow/index.html @@ -8,7 +8,7 @@ corda / net.corda.flows / NotaryChangeFlowobject NotaryChangeFlow : AbstractStateReplacementFlow<Party>
+object NotaryChangeFlow : AbstractStateReplacementFlow
A flow to be used for changing a state's Notary. This is required since all input states to a transaction must point to the same notary.
The Instigator assembles the transaction for notary replacement and sends out change proposals to all participants @@ -28,13 +28,7 @@ use the new updated state for future transactions.
class Instigator<T : ContractState> : Instigator<T, Party>
data class Proposal : Proposal<Party>
class Instigator<out T : ContractState> : Instigator<T, Party>
class NotaryException : Exception
+class NotaryException : FlowException
receive |
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType. fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R. -open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType. |
||||||||||||||||||
sendAndReceive |
+open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type. -open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. |
||||||||||||||||||
-<init> | -
-Error(error: NotaryError) |
-
-error | -
-val error: NotaryError |
-
Success(sig: WithKey)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-flow/-result/-success/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-flow/-result/-success/index.html
deleted file mode 100644
index 31c0d2158e..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-flow/-result/-success/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-class Success : Result
--<init> | -
-Success(sig: WithKey) |
-
-sig | -
-val sig: WithKey |
-
val sig: WithKey
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-flow/-result/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-flow/-result/index.html
deleted file mode 100644
index 39284aad5c..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-notary-flow/-result/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-sealed class Result
--Error | -
-class Error : Result |
-
-Success | -
-class Success : Result |
-
-Error | -
-class Error : Result |
-
-Success | -
-class Success : Result |
-
open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type.
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
sealed class Result
class Service : FlowLogic<Unit>
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-resolve-transactions-flow/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-resolve-transactions-flow/index.html
index 442dfe93b2..0f50efc386 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-resolve-transactions-flow/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-resolve-transactions-flow/index.html
@@ -145,8 +145,8 @@ will do as long as the other side registers with it.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
-open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type.
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
StateReplacementException(error: StateReplacementRefused)
+StateReplacementException(message: String? = null, cause: Throwable? = null)
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-exception/error.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-exception/error.html
deleted file mode 100644
index c8fdf6f1d3..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-exception/error.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val error: StateReplacementRefused
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-exception/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-exception/index.html
index a94336be22..8005978b1b 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-exception/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-exception/index.html
@@ -8,7 +8,7 @@
corda / net.corda.flows / StateReplacementExceptionclass StateReplacementException : Exception
+open class StateReplacementException : FlowException
<init> |
-StateReplacementException(error: StateReplacementRefused) |
-
-
-
-error | -
-val error: StateReplacementRefused |
+
StateReplacementRefused(identity: Party, state: StateRef, detail: String?)
-Thrown when a participant refuses the proposed state replacement
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/detail.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/detail.html deleted file mode 100644 index 70b8e03a9a..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/detail.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -val detail: String?
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/identity.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/identity.html
deleted file mode 100644
index 984d8349f9..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/identity.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val identity: Party
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/index.html
deleted file mode 100644
index e14f9ba8e3..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-class StateReplacementRefused
-Thrown when a participant refuses the proposed state replacement
--<init> | -
-StateReplacementRefused(identity: Party, state: StateRef, detail: String?)
-Thrown when a participant refuses the proposed state replacement - |
-
-detail | -
-val detail: String? |
-
-identity | -
-val identity: Party |
-
-state | -
-val state: StateRef |
-
-toString | -
-fun toString(): String |
-
val state: StateRef
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/to-string.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/to-string.html
deleted file mode 100644
index 3c10e5e63c..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-state-replacement-refused/to-string.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-fun toString(): String
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-two-party-deal-flow/-primary/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-two-party-deal-flow/-primary/index.html
index 2249da3ada..ab9442a7cd 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.flows/-two-party-deal-flow/-primary/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-two-party-deal-flow/-primary/index.html
@@ -202,10 +202,10 @@ will do as long as the other side registers with it.
open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
-open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type.
+open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
-open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type.
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response
-is received, which must be of the given receiveType. Remember that when receiving data from other parties the data
+open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data should not be trusted until it's been thoroughly verified for consistency and that all expectations are satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.flows/-two-party-trade-flow/-asset-mismatch-exception/index.html b/docs/build/html/api/kotlin/corda/net.corda.flows/-two-party-trade-flow/-asset-mismatch-exception/index.html index 35402f7fa7..024caf934e 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.flows/-two-party-trade-flow/-asset-mismatch-exception/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.flows/-two-party-trade-flow/-asset-mismatch-exception/index.html @@ -8,7 +8,7 @@ corda / net.corda.flows / TwoPartyTradeFlow / AssetMismatchExceptionclass AssetMismatchException : Exception
+class AssetMismatchException : FlowException
receive |
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType. fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R. -open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType. |
||
sendAndReceive |
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type. +open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. |
||
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R. -open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType. +open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType. |
|||
sendAndReceive |
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response -is received, which must be of the given receiveType. Remember that when receiving data from other parties the data -should not be trusted until it's been thoroughly verified for consistency and that all expectations are -satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type. +open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data +should not be trusted until it's been thoroughly verified for consistency and that all expectations are +satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. |
||
-givenPrice | -
-val givenPrice: Amount<Currency> |
-
class AssetMismatchException : Exception
class AssetMismatchException : FlowException
class UnacceptablePriceException : Exception
class UnacceptablePriceException : FlowException
abstract class AbstractStateReplacementFlow<T>
+abstract class AbstractStateReplacementFlow
Abstract flow to be used for replacing one state with another, for example when changing the notary of a state. Notably this requires a one to one replacement of states, states cannot be split, merged or issued as part of these flows.
@@ -42,18 +42,12 @@ flows.class CashFlow : FlowLogic<CashFlowResult>
+class CashFlow : FlowLogic<SignedTransaction>
Initiates a flow that produces an Issue/Move or Exit Cash transaction.
sealed class CashFlowResult
class FetchAttachmentsFlow : FetchDataFlow<Attachment, ByteArray>
@@ -98,7 +92,7 @@ server acting as an issuer (see NotaryChangeFlowobject NotaryChangeFlow : AbstractStateReplacementFlow<Party>
+object NotaryChangeFlow : AbstractStateReplacementFlow
A flow to be used for changing a state's Notary. This is required since all input states to a transaction must point to the same notary.
class StateReplacementRefused
-Thrown when a participant refuses the proposed state replacement
-object TwoPartyDealFlow
@@ -176,21 +162,21 @@ indeed valid.
class InputStateRefResolveFailed : Exception
class CashException : FlowException
class NotaryException : Exception
class NotaryException : FlowException
class StateReplacementException : Exception
open class StateReplacementException : FlowException
abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder -and a common contract type (e.g. Cash or CommercialPaper) -which would automatically be passed as the first argument (we'd need that to be a criteria/pattern of the generateXXX methods).
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/commit-transaction.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/commit-transaction.html deleted file mode 100644 index 49ade22113..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/commit-transaction.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -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/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-flows-requiring-attention.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-flows-requiring-attention.html deleted file mode 100644 index 0e096b6863..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-flows-requiring-attention.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -abstract fun fetchFlowsRequiringAttention(query: StatesQuery): Map<StateRef, FlowRequiringAttention>
-Fetch flows that require a response to some prompt/question by a human (on the "bank" side).
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-states.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-states.html deleted file mode 100644 index f5923227ca..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-states.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -abstract fun fetchStates(states: List<StateRef>): Map<StateRef, TransactionState<ContractState>?>
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-transactions.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-transactions.html
deleted file mode 100644
index 8d4862767b..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/fetch-transactions.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-Query for immutable transactions (results can be cached indefinitely by their id/hash).
-
-txs
- The hashes (from StateRef.txhash returned from queryStates) you would like full transactions for.
-
Return
-null values indicate missing transactions from the requested list.
abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
-Generate a signature for this transaction signed by us.
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/index.html deleted file mode 100644 index 763f984ec4..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/index.html +++ /dev/null @@ -1,133 +0,0 @@ - - - -@Path("") interface APIServer
-Top level interface to external interaction with the distributed ledger.
-Wherever a list is returned by a fetchXXX method that corresponds with an input list, that output list will have optional elements -where a null indicates "missing" and the elements returned will be in the order corresponding with the input list.
--buildTransaction | -
-abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder -and a common contract type (e.g. Cash or CommercialPaper) -which would automatically be passed as the first argument (we'd need that to be a criteria/pattern of the generateXXX methods). - |
-
-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 -successful, otherwise exception is thrown. - |
-
-fetchFlowsRequiringAttention | -
-abstract fun fetchFlowsRequiringAttention(query: StatesQuery): Map<StateRef, FlowRequiringAttention>
-Fetch flows that require a response to some prompt/question by a human (on the "bank" side). - |
-
-fetchStates | -
-abstract fun fetchStates(states: List<StateRef>): Map<StateRef, TransactionState<ContractState>?> |
-
-fetchTransactions | -
-abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-Query for immutable transactions (results can be cached indefinitely by their id/hash). - |
-
-generateTransactionSignature | -
-abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
-Generate a signature for this transaction signed by us. - |
-
-info | -
-abstract fun info(): NodeInfo
-Report this node's configuration and identities. -Currently tunnels the NodeInfo as an encoding of the Kryo serialised form. -TODO this functionality should be available via the RPC - |
-
-invokeFlowSync | -
-abstract fun invokeFlowSync(type: FlowRef, args: Map<String, Any?>): Any?
-This method would not return until the flow is finished (hence the "Sync"). - |
-
-provideFlowResponse | -
-abstract fun provideFlowResponse(flow: FlowInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
-Provide the response that a flow is waiting for. - |
-
-queryStates | -
-abstract fun queryStates(query: StatesQuery): List<StateRef>
-Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them -to probably be later inflated by fetchLedgerTransactions() or fetchStates() although because immutable you can cache them -to avoid calling fetchLedgerTransactions() many times. - |
-
-serverTime | -
-abstract fun serverTime(): LocalDateTime
-Report current UTC time as understood by the platform. - |
-
-status | -
-abstract fun status(): Response
-Report whether this node is started up or not. - |
-
-APIServerImpl | -
-class APIServerImpl : APIServer |
-
abstract fun invokeFlowSync(type: FlowRef, args: Map<String, Any?>): Any?
-This method would not return until the flow is finished (hence the "Sync").
-Longer term we'd add an Async version that returns some kind of FlowInvocationRef that could be queried and -would appear on some kind of event message that is broadcast informing of progress.
-Will throw exception if flow fails.
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/provide-flow-response.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/provide-flow-response.html deleted file mode 100644 index 578778d197..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/provide-flow-response.html +++ /dev/null @@ -1,25 +0,0 @@ - - - -abstract fun provideFlowResponse(flow: FlowInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
-Provide the response that a flow is waiting for.
-
-flow
- Should refer to a previously supplied FlowRequiringAttention.
-
-stepId
- Which step of the flow are we referring too.
-
-choice
- Should be one of the choices presented in the FlowRequiringAttention.
-
-args
- Any arguments required.
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/query-states.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/query-states.html
deleted file mode 100644
index 21725d46f9..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/query-states.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
abstract fun queryStates(query: StatesQuery): List<StateRef>
-Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them -to probably be later inflated by fetchLedgerTransactions() or fetchStates() although because immutable you can cache them -to avoid calling fetchLedgerTransactions() many times.
-
-query
- Some "where clause" like expression.
-
Return
-Zero or more matching States.
ContractClassRef(className: String)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-class-ref/class-name.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-class-ref/class-name.html
deleted file mode 100644
index 7999bd5dd4..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-class-ref/class-name.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val className: String
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-class-ref/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-class-ref/index.html
deleted file mode 100644
index d0a47a6c07..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-class-ref/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-data class ContractClassRef : ContractDefRef
--<init> | -
-ContractClassRef(className: String) |
-
-className | -
-val className: String |
-
interface ContractDefRef
-Encapsulates the contract type. e.g. Cash or CommercialPaper etc.
--ContractClassRef | -
-data class ContractClassRef : ContractDefRef |
-
-ContractLedgerRef | -
-data class ContractLedgerRef : ContractDefRef |
-
ContractLedgerRef(hash: SecureHash)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-ledger-ref/hash.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-ledger-ref/hash.html
deleted file mode 100644
index 3517fed76e..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-ledger-ref/hash.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val hash: SecureHash
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-ledger-ref/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-ledger-ref/index.html
deleted file mode 100644
index 0a96c336a3..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-contract-ledger-ref/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-data class ContractLedgerRef : ContractDefRef
--<init> | -
-ContractLedgerRef(hash: SecureHash) |
-
-hash | -
-val hash: SecureHash |
-
FlowClassRef(className: String)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-class-ref/class-name.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-class-ref/class-name.html
deleted file mode 100644
index b250aa8074..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-class-ref/class-name.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val className: String
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-class-ref/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-class-ref/index.html
deleted file mode 100644
index 65b69c9518..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-class-ref/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-data class FlowClassRef : FlowRef
--<init> | -
-FlowClassRef(className: String) |
-
-className | -
-val className: String |
-
FlowInstanceRef(flowInstance: SecureHash, flowClass: FlowClassRef, flowStepId: String)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-class.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-class.html
deleted file mode 100644
index 1eb85f9706..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-class.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val flowClass: FlowClassRef
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-instance.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-instance.html
deleted file mode 100644
index 5ae11270ba..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-instance.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val flowInstance: SecureHash
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-step-id.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-step-id.html
deleted file mode 100644
index 50da86b263..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/flow-step-id.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val flowStepId: String
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/index.html
deleted file mode 100644
index 78e95483b5..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-instance-ref/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-data class FlowInstanceRef
--<init> | -
-FlowInstanceRef(flowInstance: SecureHash, flowClass: FlowClassRef, flowStepId: String) |
-
-flowClass | -
-val flowClass: FlowClassRef |
-
-flowInstance | -
-val flowInstance: SecureHash |
-
-flowStepId | -
-val flowStepId: String |
-
interface FlowRef
-Encapsulates the flow to be instantiated. e.g. TwoPartyTradeFlow.Buyer.
--FlowClassRef | -
-data class FlowClassRef : FlowRef |
-
FlowRequiringAttention(ref: FlowInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)
-Thinking that Instant is OK for short lived flow deadlines.
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/choice-ids-to-messages.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/choice-ids-to-messages.html deleted file mode 100644 index 837a51f817..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/choice-ids-to-messages.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -val choiceIdsToMessages: Map<SecureHash, String>
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/due-by.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/due-by.html
deleted file mode 100644
index 6164de2bf3..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/due-by.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val dueBy: Instant
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/index.html
deleted file mode 100644
index 4ee782a460..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/index.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-data class FlowRequiringAttention
-Thinking that Instant is OK for short lived flow deadlines.
--<init> | -
-FlowRequiringAttention(ref: FlowInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)
-Thinking that Instant is OK for short lived flow deadlines. - |
-
-choiceIdsToMessages | -
-val choiceIdsToMessages: Map<SecureHash, String> |
-
-dueBy | -
-val dueBy: Instant |
-
-prompt | -
-val prompt: String |
-
-ref | -
-val ref: FlowInstanceRef |
-
val prompt: String
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/ref.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/ref.html
deleted file mode 100644
index ec5d7ae765..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-flow-requiring-attention/ref.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val ref: FlowInstanceRef
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/-init-.html
deleted file mode 100644
index 2e16179c3d..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/-init-.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-Deal(ref: String)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/-init-.html
deleted file mode 100644
index f100f3d524..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/-init-.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-Selection(criteria: Criteria)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/select.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/select.html
deleted file mode 100644
index ea78efd856..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/select.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-fun select(criteria: Criteria): Selection
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/-init-.html
deleted file mode 100644
index b457cd2cdf..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/-init-.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)
-Encapsulate a generateXXX method call on a contract.
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/args.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/args.html deleted file mode 100644 index 7a3c6688d0..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/args.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -val args: Map<String, Any?>
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/generate-method-name.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/generate-method-name.html
deleted file mode 100644
index 12d8c5c833..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/generate-method-name.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val generateMethodName: String
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/index.html
deleted file mode 100644
index a114bc553d..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-transaction-build-step/index.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-data class TransactionBuildStep
-Encapsulate a generateXXX method call on a contract.
--<init> | -
-TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)
-Encapsulate a generateXXX method call on a contract. - |
-
-args | -
-val args: Map<String, Any?> |
-
-generateMethodName | -
-val generateMethodName: String |
-
-APIServer | -
-interface APIServer
-Top level interface to external interaction with the distributed ledger. - |
-
-ContractClassRef | -
-data class ContractClassRef : ContractDefRef |
-
-ContractDefRef | -
-interface ContractDefRef
-Encapsulates the contract type. e.g. Cash or CommercialPaper etc. - |
-
-ContractLedgerRef | -
-data class ContractLedgerRef : ContractDefRef |
-
-FlowClassRef | -
-data class FlowClassRef : FlowRef |
-
-FlowInstanceRef | -
-data class FlowInstanceRef |
-
-FlowRef | -
-interface FlowRef
-Encapsulates the flow to be instantiated. e.g. TwoPartyTradeFlow.Buyer. - |
-
-FlowRequiringAttention | -
-data class FlowRequiringAttention
-Thinking that Instant is OK for short lived flow deadlines. - |
-
-StatesQuery | -
-interface StatesQuery
-Extremely rudimentary query language which should most likely be replaced with a product. - |
-
-TransactionBuildStep | -
-data class TransactionBuildStep
-Encapsulate a generateXXX method call on a contract. - |
-
abstract fun startWebserver(handle: NodeHandle): ListenableFuture<HostAndPort>
+Starts a web server for a node
+abstract fun waitForAllNodesToFinish(): Unit
abstract fun startWebserver(handle: NodeHandle): ListenableFuture<HostAndPort>
+Starts a web server for a node
+
+handle
- The handle for the node that this webserver connects to via RPC.
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.driver/-driver-d-s-l-internal-interface/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.driver/-driver-d-s-l-internal-interface/index.html
index 738855d73b..405be092c5 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.driver/-driver-d-s-l-internal-interface/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.driver/-driver-d-s-l-internal-interface/index.html
@@ -47,6 +47,14 @@
abstract fun startWebserver(handle: NodeHandle): ListenableFuture<HostAndPort>
+Starts a web server for a node
+abstract fun waitForAllNodesToFinish(): Unit
open fun startWebserver(handle: NodeHandle): ListenableFuture<HostAndPort>
+Starts a web server for a node
+open fun waitForAllNodesToFinish(): Unit
open fun startWebserver(handle: NodeHandle): ListenableFuture<HostAndPort>
+Overrides DriverDSLExposedInterface.startWebserver
+Starts a web server for a node
+
+handle
- The handle for the node that this webserver connects to via RPC.
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.driver/-node-handle/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.driver/-node-handle/-init-.html
index a106457c31..6993f7af9e 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.driver/-node-handle/-init-.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.driver/-node-handle/-init-.html
@@ -8,6 +8,6 @@
corda / net.corda.node.driver / NodeHandle / <init>
NodeHandle(nodeInfo: NodeInfo, configuration: FullNodeConfiguration, process: Process)
+NodeHandle(nodeInfo: NodeInfo, rpc: CordaRPCOps, configuration: FullNodeConfiguration, process: Process)
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.driver/-node-handle/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.driver/-node-handle/index.html
index c362848880..570943e644 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.driver/-node-handle/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.driver/-node-handle/index.html
@@ -16,7 +16,7 @@
NodeHandle(nodeInfo: NodeInfo, configuration: FullNodeConfiguration, process: Process)
NodeHandle(nodeInfo: NodeInfo, rpc: CordaRPCOps, configuration: FullNodeConfiguration, process: Process)
val process: Process
val rpc: CordaRPCOps
val rpc: CordaRPCOps
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/-init-.html
deleted file mode 100644
index 7efcb0d527..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/-init-.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-APIServerImpl(node: AbstractNode)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/build-transaction.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/build-transaction.html
deleted file mode 100644
index 077dd4cbb8..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/build-transaction.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-Overrides APIServer.buildTransaction
-TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder -and a common contract type (e.g. Cash or CommercialPaper) -which would automatically be passed as the first argument (we'd need that to be a criteria/pattern of the generateXXX methods).
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/commit-transaction.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/commit-transaction.html deleted file mode 100644 index c49efd749f..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/commit-transaction.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -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/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-flows-requiring-attention.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-flows-requiring-attention.html deleted file mode 100644 index 538092e50f..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-flows-requiring-attention.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -fun fetchFlowsRequiringAttention(query: StatesQuery): Map<StateRef, FlowRequiringAttention>
-Overrides APIServer.fetchFlowsRequiringAttention
-Fetch flows that require a response to some prompt/question by a human (on the "bank" side).
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-states.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-states.html deleted file mode 100644 index 2185d37014..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-states.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -fun fetchStates(states: List<StateRef>): Map<StateRef, TransactionState<ContractState>?>
-Overrides APIServer.fetchStates
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-transactions.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-transactions.html deleted file mode 100644 index 83db2d92ca..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/fetch-transactions.html +++ /dev/null @@ -1,22 +0,0 @@ - - - -fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-Overrides APIServer.fetchTransactions
-Query for immutable transactions (results can be cached indefinitely by their id/hash).
-
-txs
- The hashes (from StateRef.txhash returned from queryStates) you would like full transactions for.
-
Return
-null values indicate missing transactions from the requested list.
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/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/index.html deleted file mode 100644 index 1933ba5a96..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/index.html +++ /dev/null @@ -1,141 +0,0 @@ - - - -class APIServerImpl : APIServer
--<init> | -
-APIServerImpl(node: AbstractNode) |
-
-node | -
-val node: AbstractNode |
-
-buildTransaction | -
-fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder -and a common contract type (e.g. Cash or CommercialPaper) -which would automatically be passed as the first argument (we'd need that to be a criteria/pattern of the generateXXX methods). - |
-
-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 -successful, otherwise exception is thrown. - |
-
-fetchFlowsRequiringAttention | -
-fun fetchFlowsRequiringAttention(query: StatesQuery): Map<StateRef, FlowRequiringAttention>
-Fetch flows that require a response to some prompt/question by a human (on the "bank" side). - |
-
-fetchStates | -
-fun fetchStates(states: List<StateRef>): Map<StateRef, TransactionState<ContractState>?> |
-
-fetchTransactions | -
-fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-Query for immutable transactions (results can be cached indefinitely by their id/hash). - |
-
-generateTransactionSignature | -
-fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
-Generate a signature for this transaction signed by us. - |
-
-info | -
-fun info(): NodeInfo
-Report this node's configuration and identities. -Currently tunnels the NodeInfo as an encoding of the Kryo serialised form. -TODO this functionality should be available via the RPC - |
-
-invokeFlowSync | -
-fun invokeFlowSync(type: FlowRef, args: Map<String, Any?>): Any?
-This method would not return until the flow is finished (hence the "Sync"). - |
-
-provideFlowResponse | -
-fun provideFlowResponse(flow: FlowInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
-Provide the response that a flow is waiting for. - |
-
-queryStates | -
-fun queryStates(query: StatesQuery): List<StateRef>
-Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them -to probably be later inflated by fetchLedgerTransactions() or fetchStates() although because immutable you can cache them -to avoid calling fetchLedgerTransactions() many times. - |
-
-serverTime | -
-fun serverTime(): LocalDateTime
-Report current UTC time as understood by the platform. - |
-
-status | -
-fun status(): Response
-Report whether this node is started up or not. - |
-
fun invokeFlowSync(type: FlowRef, args: Map<String, Any?>): Any?
-Overrides APIServer.invokeFlowSync
-This method would not return until the flow is finished (hence the "Sync").
-Longer term we'd add an Async version that returns some kind of FlowInvocationRef that could be queried and -would appear on some kind of event message that is broadcast informing of progress.
-Will throw exception if flow fails.
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/node.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/node.html deleted file mode 100644 index 8ab67a5ca7..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/node.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -val node: AbstractNode
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/provide-flow-response.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/provide-flow-response.html
deleted file mode 100644
index cb3a6f8755..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/provide-flow-response.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-fun provideFlowResponse(flow: FlowInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
-Overrides APIServer.provideFlowResponse
-Provide the response that a flow is waiting for.
-
-flow
- Should refer to a previously supplied FlowRequiringAttention.
-
-stepId
- Which step of the flow are we referring too.
-
-choice
- Should be one of the choices presented in the FlowRequiringAttention.
-
-args
- Any arguments required.
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/query-states.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/query-states.html
deleted file mode 100644
index e76df7186a..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/query-states.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
fun queryStates(query: StatesQuery): List<StateRef>
-Overrides APIServer.queryStates
-Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them -to probably be later inflated by fetchLedgerTransactions() or fetchStates() although because immutable you can cache them -to avoid calling fetchLedgerTransactions() many times.
-
-query
- Some "where clause" like expression.
-
Return
-Zero or more matching States.
protected val _servicesThatAcceptUploads: ArrayList<AcceptsFileUpload>
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-abstract-node/api.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-abstract-node/api.html
deleted file mode 100644
index 433b94f30d..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-abstract-node/api.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-lateinit var api: APIServer
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-abstract-node/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-abstract-node/index.html
index 2e02e98011..48eaf1576c 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-abstract-node/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-abstract-node/index.html
@@ -49,24 +49,12 @@ I/O), or a mock implementation suitable for unit test environments.
val _servicesThatAcceptUploads: ArrayList<AcceptsFileUpload>
val advertisedServices: Set<ServiceInfo>
lateinit var api: APIServer
val busyNodeLatch: ReusableLatch
val servicesThatAcceptUploads: List<AcceptsFileUpload>
lateinit var smm: StateMachineManager
fun makeServiceEntries(): List<ServiceEntry>
+open fun makeServiceEntries(): List<ServiceEntry>
A service entry contains the advertised ServiceInfo along with the service identity. The identity
protected fun makeServiceEntries(): List<ServiceEntry>
+protected open fun makeServiceEntries(): List<ServiceEntry>
A service entry contains the advertised ServiceInfo along with the service identity. The identity
val servicesThatAcceptUploads: List<AcceptsFileUpload>
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/current-node-time.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/current-node-time.html
index a3ae838133..6b7c15a9bc 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/current-node-time.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/current-node-time.html
@@ -11,6 +11,6 @@
fun currentNodeTime(): Instant
Overrides CordaRPCOps.currentNodeTime
-Returns the node-local current time.
+Returns the node's current time.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/index.html index 4f6eab4669..6bd72af7bf 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/index.html @@ -78,7 +78,7 @@ thread (i.e. serially). Arguments are serialised and deserialised automatically. currentNodeTimefun currentNodeTime(): Instant
-Returns the node-local current time.
+Returns the node's current time.
fun uploadFile(dataType: String, name: String?, file: InputStream): String
fun vaultAndUpdates(): Pair<List<StateAndRef<ContractState>>, Observable<Update>>
@@ -169,6 +175,15 @@ such mappings as well.
Returns a pair of all recorded transactions and an observable of future recorded ones.
fun waitUntilRegisteredWithNetworkMap(): ListenableFuture<Unit>
+Returns a ListenableFuture which completes when the node has registered wih the network map service. It can also +complete with an exception if it is unable to.
+fun uploadFile(dataType: String, name: String?, file: InputStream): String
+Overrides CordaRPCOps.uploadFile
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/wait-until-registered-with-network-map.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/wait-until-registered-with-network-map.html new file mode 100644 index 0000000000..712475bd8a --- /dev/null +++ b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-corda-r-p-c-ops-impl/wait-until-registered-with-network-map.html @@ -0,0 +1,17 @@ + + + +fun waitUntilRegisteredWithNetworkMap(): ListenableFuture<Unit>
+Overrides CordaRPCOps.waitUntilRegisteredWithNetworkMap
+Returns a ListenableFuture which completes when the node has registered wih the network map service. It can also +complete with an exception if it is unable to.
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-node/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-node/index.html index a641a72fbc..2607ac0a42 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-node/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.internal/-node/index.html @@ -67,12 +67,6 @@ loads important data off disk and starts listening for connections.val serverThread: ServiceAffinityExecutor
lateinit var webServer: Server
val _servicesThatAcceptUploads: ArrayList<AcceptsFileUpload>
val advertisedServices: Set<ServiceInfo>
lateinit var api: APIServer
val busyNodeLatch: ReusableLatch
val servicesThatAcceptUploads: List<AcceptsFileUpload>
lateinit var smm: StateMachineManager
fun makeServiceEntries(): List<ServiceEntry>
+open fun makeServiceEntries(): List<ServiceEntry>
A service entry contains the advertised ServiceInfo along with the service identity. The identity
lateinit var webServer: Server
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.internal/index.html
index 576d34a96c..a3c31ca539 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.internal/index.html
@@ -13,12 +13,6 @@
class APIServerImpl : APIServer
abstract class AbstractNode : SingletonSerializeAsToken
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/accepts.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/accepts.html
new file mode 100644
index 0000000000..126325507f
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/accepts.html
@@ -0,0 +1,17 @@
+
+
+
+open fun accepts(prefix: String): Boolean
+Overrides FileUploader.accepts
+Check if this service accepts this type of upload. For example if you are uploading interest rates this could +be "my-service-interest-rates". Type here does not refer to file extentions or MIME types.
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/index.html index 3e08517eae..fedca30705 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/index.html @@ -8,7 +8,7 @@ corda / net.corda.node.services.api / AcceptsFileUploadinterface AcceptsFileUpload
+interface AcceptsFileUpload : FileUploader
A service that implements AcceptsFileUpload can have new binary data provided to it via an HTTP upload.
TODO: In future, also accept uploads over the MQ interface too.
abstract fun upload(data: InputStream): String
+open fun accepts(prefix: String): Boolean
+Check if this service accepts this type of upload. For example if you are uploading interest rates this could +be "my-service-interest-rates". Type here does not refer to file extentions or MIME types.
++upload | +
+abstract fun upload(file: InputStream): String
Accepts the data in the given input stream, and returns some sort of useful return message that will be sent back to the user in the response. |
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/upload.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/upload.html
deleted file mode 100644
index de383ed665..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.api/-accepts-file-upload/upload.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-AcceptsFileUpload |
-interface AcceptsFileUpload
+interface AcceptsFileUpload : FileUploader
A service that implements AcceptsFileUpload can have new binary data provided to it via an HTTP upload. |
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R. -open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType. +open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType. |
sendAndReceive |
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response
-is received, which must be of the given receiveType. Remember that when receiving data from other parties the data
+ Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data should not be trusted until it's been thoroughly verified for consistency and that all expectations are satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code. fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-corda-r-p-c-client/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-corda-r-p-c-client/-init-.html
index 097af2fbaa..318cf61537 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-corda-r-p-c-client/-init-.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-corda-r-p-c-client/-init-.html
@@ -8,7 +8,7 @@
corda / net.corda.node.services.messaging / CordaRPCClient / <init><init>-CordaRPCClient(host: HostAndPort, config: SSLConfiguration?)
+CordaRPCClient(host: HostAndPort, config: SSLConfiguration?, serviceConfigurationOverride: ServerLocator.() -> Unit = null)
An RPC client connects to the specified server and allows you to make calls to the server that perform various useful tasks. See the documentation for proxy or review the docsite to learn more about how this API works. Parametersdiff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-corda-r-p-c-client/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-corda-r-p-c-client/index.html index aa8ca43dde..c4509676f9 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-corda-r-p-c-client/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-corda-r-p-c-client/index.html @@ -24,7 +24,7 @@ useful tasks. See the documentation for proxy or review | <init> |
-CordaRPCClient(host: HostAndPort, config: SSLConfiguration?)
+CordaRPCClient(host: HostAndPort, config: SSLConfiguration?, serviceConfigurationOverride: ServerLocator.() -> Unit = null)
An RPC client connects to the specified server and allows you to make calls to the server that perform various useful tasks. See the documentation for proxy or review the docsite to learn more about how this API works. |
@@ -48,6 +48,12 @@ useful tasks. See the documentation for proxy or review
val host: HostAndPort |
+serviceConfigurationOverride | +
+val serviceConfigurationOverride: ServerLocator.() -> Unit |
+
val serviceConfigurationOverride: ServerLocator.() -> Unit
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-node-messaging-client/-a-m-q_-d-e-l-a-y.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-node-messaging-client/-a-m-q_-d-e-l-a-y.html
new file mode 100644
index 0000000000..2e3718da15
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-node-messaging-client/-a-m-q_-d-e-l-a-y.html
@@ -0,0 +1,14 @@
+
+
+
+val AMQ_DELAY: Int
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-node-messaging-client/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-node-messaging-client/index.html
index 62987b3a2e..74d0d0dbae 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-node-messaging-client/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.messaging/-node-messaging-client/index.html
@@ -215,6 +215,12 @@ unfortunately Artemis tends to bury the exception when the password is wrong.
val AMQ_DELAY: Int
const val SESSION_ID_PROPERTY: String
open fun getNodeByLegalIdentityKey(compositeKey: CompositeKey): NodeInfo?
+Overrides NetworkMapCache.getNodeByLegalIdentityKey
+Look up the node info for a specific peer key.
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.network/-in-memory-network-map-cache/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.network/-in-memory-network-map-cache/index.html index 97f22f177b..6449d5a760 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.services.network/-in-memory-network-map-cache/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.network/-in-memory-network-map-cache/index.html @@ -119,6 +119,14 @@ updates.open fun getNodeByLegalIdentityKey(compositeKey: CompositeKey): NodeInfo?
+Look up the node info for a specific peer key.
+open fun getPartyInfo(party: Party): PartyInfo?
@@ -171,14 +179,6 @@ first subscriber is registered so as to avoid racing with early updates.
open fun getNodeByLegalIdentityKey(compositeKey: CompositeKey): NodeInfo?
-Look up the node info for a specific peer key.
-open fun getNodeByLegalName(name: String): NodeInfo?
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-data-vending/-service/-notify-transaction-handler/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-data-vending/-service/-notify-transaction-handler/index.html
index ab5d977ce2..c8a4dc15d3 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-data-vending/-service/-notify-transaction-handler/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-data-vending/-service/-notify-transaction-handler/index.html
@@ -116,8 +116,8 @@ will do as long as the other side registers with it.
fun <R : Any> receive(otherParty: Party): UntrustworthyData<R>
Suspends until the specified otherParty sends us a message of type R.
-open fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T>
-Suspends until the specified otherParty sends us a message of type receiveType.
+open fun <R : Any> receive(receiveType: Class<R>, otherParty: Party): UntrustworthyData<R>
+Suspends until the specified otherParty sends us a message of type receiveType.
fun <R : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<R>
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response is received, which must be of the given R type.
-open fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T>
-Serializes and queues the given payload object for sending to the otherParty. Suspends until a response
-is received, which must be of the given receiveType. Remember that when receiving data from other parties the data
+open fun <R : Any> sendAndReceive(receiveType: Class<R>, otherParty: Party, payload: Any): UntrustworthyData<R>
+
Serializes and queues the given payload object for sending to the otherParty. Suspends until a response +is received, which must be of the given receiveType. Remember that when receiving data from other parties the data should not be trusted until it's been thoroughly verified for consistency and that all expectations are satisfied, as a malicious peer may send you subtly corrupted data in order to exploit your code.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-data-vending/-service/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-data-vending/-service/index.html index 691383b96a..1a04d7dab6 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-data-vending/-service/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-data-vending/-service/index.html @@ -53,16 +53,5 @@ glue that sits between the network layer and the database layer.-logger | -
-val logger: Logger |
-
val logger: Logger
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-node-attachment-service/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-node-attachment-service/index.html
index 31d334c923..3a021c0145 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-node-attachment-service/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-node-attachment-service/index.html
@@ -109,5 +109,19 @@ back to the user in the response.
++accepts | +
+open fun accepts(prefix: String): Boolean
+Check if this service accepts this type of upload. For example if you are uploading interest rates this could +be "my-service-interest-rates". Type here does not refer to file extentions or MIME types. + |
+
fun upload(data: InputStream): String
-Overrides AcceptsFileUpload.upload
+Overrides FileUploader.upload
Accepts the data in the given input stream, and returns some sort of useful return message that will be sent back to the user in the response.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-storage-service-impl/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-storage-service-impl/index.html index 790ae15cb1..37da32af4b 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-storage-service-impl/index.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.persistence/-storage-service-impl/index.html @@ -39,6 +39,12 @@open lateinit var uploaders: List<FileUploader>
open val validatedTransactions: TransactionStorage
@@ -49,6 +55,17 @@ the transaction data to other nodes that need it.
+initUploaders | +
+fun initUploaders(uploadersList: List<FileUploader>): Unit |
+
+<init> | +
+FlowSessionException(message: String) |
+
+rootCause | +
+val Throwable.rootCause: Throwable |
+
class FlowStateMachineImpl<R> : Fiber<R>, FlowStateMachine<R>
+class FlowStateMachineImpl<R> : Fiber<Unit>, FlowStateMachine<R>
run |
-fun run(): R |
+|
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-flow-state-machine-impl/run.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-flow-state-machine-impl/run.html
index d4d4ab58aa..65c1a87fb2 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-flow-state-machine-impl/run.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-flow-state-machine-impl/run.html
@@ -9,6 +9,6 @@
run-@Suspendable protected fun run(): R
+@Suspendable protected fun run(): Unit
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/-init-.html
index cd53f94cbb..11f2e890bd 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/-init-.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/-init-.html
@@ -8,6 +8,6 @@
corda / net.corda.node.services.statemachine / SessionEnd / <init><init>-SessionEnd(recipientSessionId: Long)
+SessionEnd(recipientSessionId: Long, errorResponse: FlowException?)
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/error-response.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/error-response.html
new file mode 100644
index 0000000000..9ee82427a8
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/error-response.html
@@ -0,0 +1,14 @@
+
+
+
++ + errorResponse+ +val errorResponse: FlowException?
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/index.html
index 98fc324e28..371c066896 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-session-end/index.html
@@ -16,7 +16,7 @@
| <init> |
-SessionEnd(recipientSessionId: Long) |
+
val errorResponse: FlowException?
val recipientSessionId: Long
FlowSession(flow: FlowLogic<*>, ourSessionId: Long, state: FlowSessionState, waitingForResponse: Boolean = false)
+FlowSession(flow: FlowLogic<*>, ourSessionId: Long, initiatingParty: Party?, state: FlowSessionState, waitingForResponse: Boolean = false)
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-state-machine-manager/-flow-session/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-state-machine-manager/-flow-session/index.html
index 6d7242d24d..12458c2dfe 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-state-machine-manager/-flow-session/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/-state-machine-manager/-flow-session/index.html
@@ -16,7 +16,7 @@
FlowSession(flow: FlowLogic<*>, ourSessionId: Long, state: FlowSessionState, waitingForResponse: Boolean = false)
FlowSession(flow: FlowLogic<*>, ourSessionId: Long, initiatingParty: Party?, state: FlowSessionState, waitingForResponse: Boolean = false)
val initiatingParty: Party?
val ourSessionId: Long
val initiatingParty: Party?
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/index.html
index 1f5989008f..ed60cdeec0 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.services.statemachine/index.html
@@ -27,7 +27,7 @@
class FlowStateMachineImpl<R> : Fiber<R>, FlowStateMachine<R>
class FlowStateMachineImpl<R> : Fiber<Unit>, FlowStateMachine<R>
class FlowSessionException : RuntimeException
class StackSnapshot : Throwable
protected fun doGet(req: HttpServletRequest, resp: HttpServletResponse): Unit
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/-init-.html
deleted file mode 100644
index fdc7ba05d5..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/-init-.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-Config(services: ServiceHub)
-Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work -and to organise serializers / deserializers for java.time.* classes as necessary.
- - diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/get-context.html b/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/get-context.html deleted file mode 100644 index 9970e4d4a3..0000000000 --- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/get-context.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -fun getContext(type: Class<*>): ObjectMapper
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/index.html
deleted file mode 100644
index bd1c9eba2b..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-@Provider class Config : ContextResolver<ObjectMapper>
-Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work -and to organise serializers / deserializers for java.time.* classes as necessary.
--<init> | -
-Config(services: ServiceHub)
-Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work -and to organise serializers / deserializers for java.time.* classes as necessary. - |
-
-defaultObjectMapper | -
-val defaultObjectMapper: ObjectMapper |
-
-services | -
-val services: ServiceHub |
-
-getContext | -
-fun getContext(type: Class<*>): ObjectMapper |
-
val services: ServiceHub
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/do-post.html b/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/do-post.html
deleted file mode 100644
index bf77d9e710..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/do-post.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-protected fun doPost(req: HttpServletRequest, resp: HttpServletResponse): Unit
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-response-filter/filter.html b/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-response-filter/filter.html
deleted file mode 100644
index 4510006bc8..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-response-filter/filter.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-fun filter(requestContext: ContainerRequestContext, responseContext: ContainerResponseContext): Unit
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/-init-.html
new file mode 100644
index 0000000000..b6e2a78b2c
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/-init-.html
@@ -0,0 +1,13 @@
+
+
+
+IdentityObjectMapper(identityService: IdentityService)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/identity-service.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/identity-service.html
new file mode 100644
index 0000000000..0c9820173b
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/identity-service.html
@@ -0,0 +1,14 @@
+
+
+
+val identityService: IdentityService
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/index.html
new file mode 100644
index 0000000000..20dc83924c
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-identity-object-mapper/index.html
@@ -0,0 +1,46 @@
+
+
+
+class IdentityObjectMapper : PartyObjectMapper, ObjectMapper
++<init> | +
+IdentityObjectMapper(identityService: IdentityService) |
+
+identityService | +
+val identityService: IdentityService |
+
+partyFromName | +
+fun partyFromName(partyName: String): Party? |
+
fun partyFromName(partyName: String): Party?
+Overrides PartyObjectMapper.partyFromName
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-no-party-object-mapper/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-no-party-object-mapper/-init-.html new file mode 100644 index 0000000000..4b8654eab4 --- /dev/null +++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-no-party-object-mapper/-init-.html @@ -0,0 +1,13 @@ + + + +NoPartyObjectMapper()
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-no-party-object-mapper/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-no-party-object-mapper/index.html
new file mode 100644
index 0000000000..14609a0d78
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-no-party-object-mapper/index.html
@@ -0,0 +1,35 @@
+
+
+
+class NoPartyObjectMapper : PartyObjectMapper, ObjectMapper
++<init> | +
+NoPartyObjectMapper() |
+
+partyFromName | +
+fun partyFromName(partyName: String): Nothing |
+
fun partyFromName(partyName: String): Nothing
+Overrides PartyObjectMapper.partyFromName
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-party-object-mapper/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-party-object-mapper/index.html new file mode 100644 index 0000000000..d808837fa5 --- /dev/null +++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-party-object-mapper/index.html @@ -0,0 +1,47 @@ + + + +interface PartyObjectMapper
++partyFromName | +
+abstract fun partyFromName(partyName: String): Party? |
+
+IdentityObjectMapper | +
+class IdentityObjectMapper : PartyObjectMapper, ObjectMapper |
+
+NoPartyObjectMapper | +
+class NoPartyObjectMapper : PartyObjectMapper, ObjectMapper |
+
+RpcObjectMapper | +
+class RpcObjectMapper : PartyObjectMapper, ObjectMapper |
+
abstract fun partyFromName(partyName: String): Party?
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/-init-.html
new file mode 100644
index 0000000000..88a8e3d329
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/-init-.html
@@ -0,0 +1,13 @@
+
+
+
+RpcObjectMapper(rpc: CordaRPCOps)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/index.html
new file mode 100644
index 0000000000..8ff190c50a
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/index.html
@@ -0,0 +1,46 @@
+
+
+
+class RpcObjectMapper : PartyObjectMapper, ObjectMapper
++<init> | +
+RpcObjectMapper(rpc: CordaRPCOps) |
+
+rpc | +
+val rpc: CordaRPCOps |
+
+partyFromName | +
+fun partyFromName(partyName: String): Party? |
+
fun partyFromName(partyName: String): Party?
+Overrides PartyObjectMapper.partyFromName
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/rpc.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/rpc.html new file mode 100644 index 0000000000..886744f008 --- /dev/null +++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-rpc-object-mapper/rpc.html @@ -0,0 +1,14 @@ + + + +val rpc: CordaRPCOps
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/-init-.html
deleted file mode 100644
index c65bb3018f..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/-init-.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-ServiceHubObjectMapper(identities: IdentityService)
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/identities.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/identities.html
deleted file mode 100644
index 73713acd02..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/identities.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-val identities: IdentityService
-
-
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/index.html
deleted file mode 100644
index b56276a223..0000000000
--- a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/-service-hub-object-mapper/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-class ServiceHubObjectMapper : ObjectMapper
--<init> | -
-ServiceHubObjectMapper(identities: IdentityService) |
-
-identities | -
-val identities: IdentityService |
-
fun createDefaultMapper(identities: IdentityService): ObjectMapper
+
+fun createDefaultMapper(rpc: CordaRPCOps): ObjectMapper
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/create-in-memory-mapper.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/create-in-memory-mapper.html
new file mode 100644
index 0000000000..754762c5c7
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/create-in-memory-mapper.html
@@ -0,0 +1,14 @@
+
+
+
+fun createInMemoryMapper(identityService: IdentityService): ObjectMapper
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/create-non-rpc-mapper.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/create-non-rpc-mapper.html
new file mode 100644
index 0000000000..b6bc79ce0e
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/create-non-rpc-mapper.html
@@ -0,0 +1,14 @@
+
+
+
+fun createNonRpcMapper(): ObjectMapper
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/index.html
index 53776cf7bf..aa8ca54125 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/-json-support/index.html
@@ -11,6 +11,7 @@
object JsonSupport
Utilities and serialisers for working with JSON representations of basic types. This adds Jackson support for the java.time API, some core types, and Kotlin data classes.
+TODO: This does not belong in node. It should be moved to the client module or a dedicated webserver module.
+IdentityObjectMapper | +
+class IdentityObjectMapper : PartyObjectMapper, ObjectMapper |
+||
LocalDateDeserializer |
object LocalDateDeserializer : JsonDeserializer<LocalDate> |
@@ -46,6 +53,12 @@ the java.time API, some core types, and Kotlin data classes.
||
+NoPartyObjectMapper | +
+class NoPartyObjectMapper : PartyObjectMapper, ObjectMapper |
+||
NodeInfoDeserializer |
object NodeInfoDeserializer : JsonDeserializer<NodeInfo> |
@@ -64,6 +77,12 @@ the java.time API, some core types, and Kotlin data classes.
||
+PartyObjectMapper | +
+interface PartyObjectMapper |
+||
PartySerializer |
object PartySerializer : JsonSerializer<Party> |
@@ -82,6 +101,12 @@ the java.time API, some core types, and Kotlin data classes.
||
+RpcObjectMapper | +
+class RpcObjectMapper : PartyObjectMapper, ObjectMapper |
+||
SecureHashDeserializer |
class SecureHashDeserializer<T : SecureHash> : JsonDeserializer<T>
@@ -96,12 +121,6 @@ the java.time API, some core types, and Kotlin data classes.
| ||
-ServiceHubObjectMapper | -
-class ServiceHubObjectMapper : ObjectMapper |
-||
ToStringSerializer |
object ToStringSerializer : JsonSerializer<Any> |
@@ -132,7 +151,19 @@ the java.time API, some core types, and Kotlin data classes.
createDefaultMapper |
-fun createDefaultMapper(identities: IdentityService): ObjectMapper |
+
+createInMemoryMapper | +
+fun createInMemoryMapper(identityService: IdentityService): ObjectMapper |
+||
+createNonRpcMapper | +
+fun createNonRpcMapper(): ObjectMapper |
fun Config.getHostAndPort(name: String): HostAndPort
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/com.typesafe.config.-config/get-path.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/com.typesafe.config.-config/get-path.html
new file mode 100644
index 0000000000..7d607ff8d5
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/com.typesafe.config.-config/get-path.html
@@ -0,0 +1,14 @@
+
+
+
+fun Config.getPath(name: String): Path
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.utilities/com.typesafe.config.-config/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/com.typesafe.config.-config/index.html
new file mode 100644
index 0000000000..414484849d
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.utilities/com.typesafe.config.-config/index.html
@@ -0,0 +1,28 @@
+
+
+
++getHostAndPort | +
+fun Config.getHostAndPort(name: String): HostAndPort |
+
+getPath | +
+fun Config.getPath(name: String): Path |
+
fun serializeToBlob(value: Any, finalizables: MutableList<() -> Unit>): Blob
fun <R> timed(action: () -> R): Pair<R, Double>
fun <R> timed(action: () -> R): Pair<R, Double>
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/index.html
new file mode 100644
index 0000000000..cce6f1e605
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/index.html
@@ -0,0 +1,56 @@
+
+
+
+@Path("") interface APIServer
+Top level interface to external interaction with the distributed ledger.
+Wherever a list is returned by a fetchXXX method that corresponds with an input list, that output list will have optional elements +where a null indicates "missing" and the elements returned will be in the order corresponding with the input list.
++info | +
+abstract fun info(): NodeInfo
+Report this node's configuration and identities. + |
+
+serverTime | +
+abstract fun serverTime(): LocalDateTime
+Report current UTC time as understood by the platform. + |
+
+status | +
+abstract fun status(): Response
+Report whether this node is started up or not. + |
+
+APIServerImpl | +
+class APIServerImpl : APIServer |
+
@GET @Path("info") @Produces(["application/json"]) abstract fun info(): NodeInfo
-Report this node's configuration and identities. -Currently tunnels the NodeInfo as an encoding of the Kryo serialised form. -TODO this functionality should be available via the RPC
+Report this node's configuration and identities.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/server-time.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/server-time.html similarity index 82% rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/server-time.html rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/server-time.html index e1e9cf0315..6ca0f3a070 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/server-time.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/server-time.html @@ -5,10 +5,10 @@ -corda / net.corda.node.api / APIServer / serverTime@GET @Path("servertime") @Produces(["application/json"]) abstract fun serverTime(): LocalDateTime
Report current UTC time as understood by the platform.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/status.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/status.html similarity index 82% rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/status.html rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/status.html index f07565b0c2..6fbfac0711 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-a-p-i-server/status.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-a-p-i-server/status.html @@ -5,10 +5,10 @@ -corda / net.corda.node.api / APIServer / status@GET @Path("status") @Produces(["text/plain"]) abstract fun status(): Response
Report whether this node is started up or not.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-all-deals.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-all-deals.html similarity index 70% rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-all-deals.html rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-all-deals.html index 53a434bdf7..e1107cb332 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-all-deals.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-all-deals.html @@ -5,7 +5,7 @@ -corda / net.corda.node.api / StatesQuery / Criteria / AllDealsobject AllDeals : Criteria
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/-init-.html
new file mode 100644
index 0000000000..4bbefc4e2a
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/-init-.html
@@ -0,0 +1,13 @@
+
+
+
+Deal(ref: String)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/index.html
similarity index 67%
rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/index.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/index.html
index 51a0edd5fd..cb67794904 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/index.html
@@ -5,7 +5,7 @@
-corda / net.corda.node.api / StatesQuery / Criteria / Dealdata class Deal : Criteria
@@ -16,7 +16,7 @@
Deal(ref: String)
Deal(ref: String)
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/ref.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/ref.html
similarity index 56%
rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/ref.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/ref.html
index 4f5949efda..b0dc63c7bd 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/-deal/ref.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/-deal/ref.html
@@ -5,10 +5,10 @@
-corda / net.corda.node.api / StatesQuery / Criteria / Deal / refval ref: String
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/index.html
similarity index 91%
rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/index.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/index.html
index 5cda20a12a..81a7d3f7c1 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-criteria/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-criteria/index.html
@@ -5,7 +5,7 @@
-corda / net.corda.node.api / StatesQuery / Criteriainterface Criteria
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/-init-.html
new file mode 100644
index 0000000000..fd13cbb65b
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/-init-.html
@@ -0,0 +1,13 @@
+
+
+
+Selection(criteria: Criteria)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/criteria.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/criteria.html
similarity index 63%
rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/criteria.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/criteria.html
index 88be3c71ac..cca2ad372b 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/criteria.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/criteria.html
@@ -5,10 +5,10 @@
-corda / net.corda.node.api / StatesQuery / Selection / criteriaval criteria: Criteria
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/index.html
similarity index 67%
rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/index.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/index.html
index 56bc0d8ce0..937d1e5489 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/-selection/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/-selection/index.html
@@ -5,7 +5,7 @@
-corda / net.corda.node.api / StatesQuery / Selectiondata class Selection : StatesQuery
@@ -16,7 +16,7 @@
Selection(criteria: Criteria)
Selection(criteria: Criteria)
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/index.html
similarity index 75%
rename from docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/index.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/index.html
index 3145b32524..163e557a9b 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.api/-states-query/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/index.html
@@ -5,7 +5,7 @@
-corda / net.corda.node.api / StatesQueryinterface StatesQuery
@@ -34,7 +34,7 @@
fun select(criteria: Criteria): Selection
fun select(criteria: Criteria): Selection
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/select.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/select.html
new file mode 100644
index 0000000000..5694197e28
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/-states-query/select.html
@@ -0,0 +1,14 @@
+
+
+
+fun select(criteria: Criteria): Selection
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/index.html
new file mode 100644
index 0000000000..d84bb88843
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.api/index.html
@@ -0,0 +1,33 @@
+
+
+
++APIServer | +
+interface APIServer
+Top level interface to external interaction with the distributed ledger. + |
+
+StatesQuery | +
+interface StatesQuery
+Extremely rudimentary query language which should most likely be replaced with a product. + |
+
APIServerImpl(rpcOps: CordaRPCOps)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/index.html
new file mode 100644
index 0000000000..2d896a13a2
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/index.html
@@ -0,0 +1,64 @@
+
+
+
+class APIServerImpl : APIServer
++<init> | +
+APIServerImpl(rpcOps: CordaRPCOps) |
+
+rpcOps | +
+val rpcOps: CordaRPCOps |
+
+info | +
+fun info(): NodeInfo
+Report this node's configuration and identities. + |
+
+serverTime | +
+fun serverTime(): LocalDateTime
+Report current UTC time as understood by the platform. + |
+
+status | +
+fun status(): Response
+This endpoint is for polling if the webserver is serving. It will always return 200. + |
+
fun info(): NodeInfo
-Overrides APIServer.info
-Report this node's configuration and identities. -Currently tunnels the NodeInfo as an encoding of the Kryo serialised form. -TODO this functionality should be available via the RPC
+Overrides APIServer.info
+Report this node's configuration and identities.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/rpc-ops.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/rpc-ops.html new file mode 100644 index 0000000000..2d59c4636a --- /dev/null +++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/rpc-ops.html @@ -0,0 +1,14 @@ + + + +val rpcOps: CordaRPCOps
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/server-time.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/server-time.html
similarity index 65%
rename from docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/server-time.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/server-time.html
index 414f3c5668..2db73f6204 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/server-time.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/server-time.html
@@ -5,12 +5,12 @@
-corda / net.corda.node.internal / APIServerImpl / serverTimefun serverTime(): LocalDateTime
-Overrides APIServer.serverTime
+Overrides APIServer.serverTime
Report current UTC time as understood by the platform.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/status.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/status.html similarity index 57% rename from docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/status.html rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/status.html index 2fd2e47106..c1699cc895 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.internal/-a-p-i-server-impl/status.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/-a-p-i-server-impl/status.html @@ -5,12 +5,12 @@ -corda / net.corda.node.internal / APIServerImpl / statusfun status(): Response
-Overrides APIServer.status
-Report whether this node is started up or not.
+Overrides APIServer.status
+This endpoint is for polling if the webserver is serving. It will always return 200.
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/index.html new file mode 100644 index 0000000000..0a1453c094 --- /dev/null +++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.internal/index.html @@ -0,0 +1,23 @@ + + + ++APIServerImpl | +
+class APIServerImpl : APIServer |
+
AttachmentDownloadServlet()
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-attachment-download-servlet/do-get.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-attachment-download-servlet/do-get.html
new file mode 100644
index 0000000000..031d9df99f
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-attachment-download-servlet/do-get.html
@@ -0,0 +1,14 @@
+
+
+
+protected fun doGet(req: HttpServletRequest, resp: HttpServletResponse): Unit
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-attachment-download-servlet/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-attachment-download-servlet/index.html
similarity index 66%
rename from docs/build/html/api/kotlin/corda/net.corda.node.servlets/-attachment-download-servlet/index.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-attachment-download-servlet/index.html
index feb532f609..dcbbed5c7a 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-attachment-download-servlet/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-attachment-download-servlet/index.html
@@ -5,7 +5,7 @@
-corda / net.corda.node.servlets / AttachmentDownloadServletclass AttachmentDownloadServlet : HttpServlet
@@ -35,7 +35,7 @@ TODO: Provide an endpoint that exposes attachment file listings, to make attachm
fun doGet(req: HttpServletRequest, resp: HttpServletResponse): Unit
fun doGet(req: HttpServletRequest, resp: HttpServletResponse): Unit
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/-init-.html
similarity index 79%
rename from docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/-init-.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/-init-.html
index 53607fba91..d3cdfcb340 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/-init-.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/-init-.html
@@ -5,7 +5,7 @@
-corda / net.corda.node.servlets / DataUploadServlet / <init>DataUploadServlet()
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/do-post.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/do-post.html
new file mode 100644
index 0000000000..31f450179d
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/do-post.html
@@ -0,0 +1,14 @@
+
+
+
+protected fun doPost(req: HttpServletRequest, resp: HttpServletResponse): Unit
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/index.html
similarity index 59%
rename from docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/index.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/index.html
index d2022d72ac..3a9c9a28c7 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-data-upload-servlet/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-data-upload-servlet/index.html
@@ -5,7 +5,7 @@
-corda / net.corda.node.servlets / DataUploadServletclass DataUploadServlet : HttpServlet
@@ -30,7 +30,7 @@
fun doPost(req: HttpServletRequest, resp: HttpServletResponse): Unit
fun doPost(req: HttpServletRequest, resp: HttpServletResponse): Unit
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/-init-.html
new file mode 100644
index 0000000000..586de63253
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/-init-.html
@@ -0,0 +1,15 @@
+
+
+
+ObjectMapperConfig(rpc: CordaRPCOps)
+Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work +and to organise serializers / deserializers for java.time.* classes as necessary.
+ + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/default-object-mapper.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/default-object-mapper.html similarity index 55% rename from docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/default-object-mapper.html rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/default-object-mapper.html index cfcd56091f..3e31801d2c 100644 --- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-config/default-object-mapper.html +++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/default-object-mapper.html @@ -1,14 +1,14 @@ -val defaultObjectMapper: ObjectMapper
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/get-context.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/get-context.html
new file mode 100644
index 0000000000..30c6966bea
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/get-context.html
@@ -0,0 +1,14 @@
+
+
+
+fun getContext(type: Class<*>): ObjectMapper
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/index.html
new file mode 100644
index 0000000000..d83db205b5
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-object-mapper-config/index.html
@@ -0,0 +1,51 @@
+
+
+
+@Provider class ObjectMapperConfig : ContextResolver<ObjectMapper>
+Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work +and to organise serializers / deserializers for java.time.* classes as necessary.
++<init> | +
+ObjectMapperConfig(rpc: CordaRPCOps)
+Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work +and to organise serializers / deserializers for java.time.* classes as necessary. + |
+
+defaultObjectMapper | +
+val defaultObjectMapper: ObjectMapper |
+
+getContext | +
+fun getContext(type: Class<*>): ObjectMapper |
+
ResponseFilter()
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-response-filter/filter.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-response-filter/filter.html
new file mode 100644
index 0000000000..dfd9c17eba
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-response-filter/filter.html
@@ -0,0 +1,14 @@
+
+
+
+fun filter(requestContext: ContainerRequestContext, responseContext: ContainerResponseContext): Unit
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-response-filter/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-response-filter/index.html
similarity index 53%
rename from docs/build/html/api/kotlin/corda/net.corda.node.servlets/-response-filter/index.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-response-filter/index.html
index 08fe83d773..1d6a341e47 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/-response-filter/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/-response-filter/index.html
@@ -5,7 +5,7 @@
-corda / net.corda.node.servlets / ResponseFilter@Provider class ResponseFilter : ContainerResponseFilter
@@ -30,7 +30,7 @@
fun filter(requestContext: ContainerRequestContext, responseContext: ContainerResponseContext): Unit
fun filter(requestContext: ContainerRequestContext, responseContext: ContainerResponseContext): Unit
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/index.html
similarity index 79%
rename from docs/build/html/api/kotlin/corda/net.corda.node.servlets/index.html
rename to docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/index.html
index fd4eaa5219..25d3ccbe88 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node.servlets/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver.servlets/index.html
@@ -1,13 +1,13 @@
--Config | -
-class Config : ContextResolver<ObjectMapper>
-Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work -and to organise serializers / deserializers for java.time.* classes as necessary. - |
-||||||||||||||||||||||||||||||||
DataUploadServlet |
class DataUploadServlet : HttpServlet
@@ -38,6 +29,15 @@ and to organise serializers / deserializers for java.time.* classes as necessary
| ||||||||||||||||||||||||||||||||
+ObjectMapperConfig | +
+class ObjectMapperConfig : ContextResolver<ObjectMapper>
+Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work +and to organise serializers / deserializers for java.time.* classes as necessary. + |
+||||||||||||||||||||||||||||||||
ResponseFilter |
class ResponseFilter : ContainerResponseFilter
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/-init-.html
new file mode 100644
index 0000000000..b10fad8e68
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/-init-.html
@@ -0,0 +1,13 @@
+
+
+
++ + <init>+WebServer(config: FullNodeConfiguration)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/address.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/address.html
new file mode 100644
index 0000000000..f43958d455
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/address.html
@@ -0,0 +1,14 @@
+
+
+
++ + address+ +val address: HostAndPort
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/config.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/config.html
new file mode 100644
index 0000000000..6a9161576a
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/config.html
@@ -0,0 +1,14 @@
+
+
+
++ + config+ +val config: FullNodeConfiguration
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/index.html
new file mode 100644
index 0000000000..428eeb03b9
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/index.html
@@ -0,0 +1,83 @@
+
+
+
++ + WebServer+class WebServer
+Constructors+
Properties+
Functions+
Companion Object Properties+
+ + log+ +val log: Logger
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/plugin-registries.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/plugin-registries.html
new file mode 100644
index 0000000000..b5bced7fce
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/plugin-registries.html
@@ -0,0 +1,18 @@
+
+
+
++ + pluginRegistries+ +val pluginRegistries: List<CordaPluginRegistry>
+Fetch CordaPluginRegistry classes registered in META-INF/services/net.corda.core.node.CordaPluginRegistry files that exist in the classpath +Getter Fetch CordaPluginRegistry classes registered in META-INF/services/net.corda.core.node.CordaPluginRegistry files that exist in the classpath + + + diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/retry-delay.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/retry-delay.html new file mode 100644 index 0000000000..9231ff9a55 --- /dev/null +++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/retry-delay.html @@ -0,0 +1,14 @@ + + + ++ + retryDelay+ +val retryDelay: Long
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/run.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/run.html
new file mode 100644
index 0000000000..9f87c90e01
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/run.html
@@ -0,0 +1,14 @@
+
+
+
++ + run+ +fun run(): Unit
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/start.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/start.html
new file mode 100644
index 0000000000..6807b23d2a
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/-web-server/start.html
@@ -0,0 +1,14 @@
+
+
+
++ + start+ +fun start(): Unit
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node.webserver/index.html b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/index.html
new file mode 100644
index 0000000000..b8a200058e
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node.webserver/index.html
@@ -0,0 +1,23 @@
+
+
+
++ + Package net.corda.node.webserver+Types+
+ + <init>+Client(serverHostAndPort: HostAndPort)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-client/consumer.html b/docs/build/html/api/kotlin/corda/net.corda.node/-client/consumer.html
new file mode 100644
index 0000000000..e7c04fded6
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-client/consumer.html
@@ -0,0 +1,14 @@
+
+
+
++ + consumer+ +var consumer: ClientConsumer
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-client/index.html b/docs/build/html/api/kotlin/corda/net.corda.node/-client/index.html
new file mode 100644
index 0000000000..6b48fa29f9
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-client/index.html
@@ -0,0 +1,64 @@
+
+
+
++ + Client+class Client
+Constructors+
Properties+
Functions+
+ + producer+ +var producer: ClientProducer
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-client/run.html b/docs/build/html/api/kotlin/corda/net.corda.node/-client/run.html
new file mode 100644
index 0000000000..b201a36d2a
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-client/run.html
@@ -0,0 +1,14 @@
+
+
+
++ + run+ +fun run(): Unit
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-client/send.html b/docs/build/html/api/kotlin/corda/net.corda.node/-client/send.html
new file mode 100644
index 0000000000..a5dd6db4ab
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-client/send.html
@@ -0,0 +1,14 @@
+
+
+
++ + send+ +fun send(message: String, queueName: String): Unit
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-client/session.html b/docs/build/html/api/kotlin/corda/net.corda.node/-client/session.html
new file mode 100644
index 0000000000..49c9f119c9
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-client/session.html
@@ -0,0 +1,14 @@
+
+
+
++ + session+ +var session: ClientSession
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-cmd-line-options/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node/-cmd-line-options/-init-.html
index d2285be0d6..ecaa27f801 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node/-cmd-line-options/-init-.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-cmd-line-options/-init-.html
@@ -8,6 +8,6 @@
corda / net.corda.node / CmdLineOptions / <init><init>-CmdLineOptions(baseDirectory: Path, configFile: Path?, help: Boolean, logToConsole: Boolean)
+CmdLineOptions(baseDirectory: Path, configFile: Path?, help: Boolean, logToConsole: Boolean, isWebserver: Boolean)
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-cmd-line-options/index.html b/docs/build/html/api/kotlin/corda/net.corda.node/-cmd-line-options/index.html
index a5891195d4..4988b017d1 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node/-cmd-line-options/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-cmd-line-options/index.html
@@ -16,7 +16,7 @@
| <init> |
-CmdLineOptions(baseDirectory: Path, configFile: Path?, help: Boolean, logToConsole: Boolean) |
+
val isWebserver: Boolean
val logToConsole: Boolean
val isWebserver: Boolean
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-inbound.html b/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-inbound.html
new file mode 100644
index 0000000000..5feb1af58d
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-inbound.html
@@ -0,0 +1,13 @@
+
+
+
+object Inbound : ConnectionDirection
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/-init-.html
new file mode 100644
index 0000000000..deb10f2b5b
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/-init-.html
@@ -0,0 +1,13 @@
+
+
+
+Outbound(expectedCommonName: String? = null)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/expected-common-name.html b/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/expected-common-name.html
new file mode 100644
index 0000000000..b64350072d
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/expected-common-name.html
@@ -0,0 +1,14 @@
+
+
+
+val expectedCommonName: String?
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/index.html b/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/index.html
new file mode 100644
index 0000000000..7f7362a321
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-connection-direction/-outbound/index.html
@@ -0,0 +1,35 @@
+
+
+
+class Outbound : ConnectionDirection
++<init> | +
+Outbound(expectedCommonName: String? = null) |
+
+expectedCommonName | +
+val expectedCommonName: String? |
+
sealed class ConnectionDirection
++Inbound | +
+object Inbound : ConnectionDirection |
+
+Outbound | +
+class Outbound : ConnectionDirection |
+
+Inbound | +
+object Inbound : ConnectionDirection |
+
+Outbound | +
+class Outbound : ConnectionDirection |
+
const val P2P_QUEUE: String
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-server/-init-.html b/docs/build/html/api/kotlin/corda/net.corda.node/-server/-init-.html
new file mode 100644
index 0000000000..21cb6661c1
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-server/-init-.html
@@ -0,0 +1,13 @@
+
+
+
+Server(baseDir: String, myHostPort: HostAndPort)
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-server/base-dir.html b/docs/build/html/api/kotlin/corda/net.corda.node/-server/base-dir.html
new file mode 100644
index 0000000000..8740e586fc
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-server/base-dir.html
@@ -0,0 +1,14 @@
+
+
+
+val baseDir: String
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-server/index.html b/docs/build/html/api/kotlin/corda/net.corda.node/-server/index.html
new file mode 100644
index 0000000000..680279ca32
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-server/index.html
@@ -0,0 +1,47 @@
+
+
+
+class Server
++<init> | +
+Server(baseDir: String, myHostPort: HostAndPort) |
+
+baseDir | +
+val baseDir: String |
+
+log | +
+val log: Logger |
+
+myHostPort | +
+val myHostPort: HostAndPort |
+
val log: Logger
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/-server/my-host-port.html b/docs/build/html/api/kotlin/corda/net.corda.node/-server/my-host-port.html
new file mode 100644
index 0000000000..d8bce64b1e
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/-server/my-host-port.html
@@ -0,0 +1,14 @@
+
+
+
+val myHostPort: HostAndPort
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/index.html b/docs/build/html/api/kotlin/corda/net.corda.node/index.html
index d2a4c96aac..8f83cc9f90 100644
--- a/docs/build/html/api/kotlin/corda/net.corda.node/index.html
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/index.html
@@ -19,10 +19,45 @@
class Client
data class CmdLineOptions
sealed class ConnectionDirection
class Server
+P2P_QUEUE | +
+const val P2P_QUEUE: String |
+
+nameToAddress | +
+val nameToAddress: Map<String, String> |
+
fun main(args: Array<String>): Unit
fun main(args: Array<String>): Unit
Used for useful info that we always want to show, even when not logging to the console
fun tcpTransport(direction: ConnectionDirection, host: String, port: Int): TransportConfiguration
fun main(args: Array<String>): Unit
fun main(args: Array<String>): Unit
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/name-to-address.html b/docs/build/html/api/kotlin/corda/net.corda.node/name-to-address.html
new file mode 100644
index 0000000000..eba57fed03
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/name-to-address.html
@@ -0,0 +1,14 @@
+
+
+
+val nameToAddress: Map<String, String>
+
+
diff --git a/docs/build/html/api/kotlin/corda/net.corda.node/tcp-transport.html b/docs/build/html/api/kotlin/corda/net.corda.node/tcp-transport.html
new file mode 100644
index 0000000000..1cb8a4ce66
--- /dev/null
+++ b/docs/build/html/api/kotlin/corda/net.corda.node/tcp-transport.html
@@ -0,0 +1,14 @@
+
+
+
+fun tcpTransport(direction: ConnectionDirection, host: String, port: Int): TransportConfiguration
+
+
diff --git a/docs/build/html/azure-vm.html b/docs/build/html/azure-vm.html
index 0aab6096d4..e6559c48fc 100644
--- a/docs/build/html/azure-vm.html
+++ b/docs/build/html/azure-vm.html
@@ -120,7 +120,7 @@ API reference: Kotlin/
A method can also return a ListenableFuture
in its object graph and it will be treated in a similar manner to
+observables, including needing to mark the RPC with the @RPCReturnsObservables
annotation. Unlike for an observable,
+once the single value (or an exception) has been received all server-side resources will be released automatically. Calling
+the cancel
method on the future will unsubscribe it from any future value and release any resources.
The client RPC protocol is versioned with a simple incrementing integer. When a proxy is created the server is @@ -328,7 +336,7 @@ customisation point will either go away completely or change.
Next - Previous + PreviousThe address of the ArtemisMQ broker instance. If not provided the node will run one locally.
The host and port on which the node is available for web operations.
+The host and port on which the bundled webserver will listen if it is started.
Note
If HTTPS is enabled then the browser security checks will require that the accessing url host name is one
@@ -354,6 +354,11 @@ of either the machine name, fully qualified machine name, or server IP address t
Names contained within the development certificates. This is addition to requiring the /config/dev/corda_dev_ca.cer
root certificate be installed as a Trusted CA.
Note
+The driver will not automatically create a webserver instance, but the Cordformation will. If this field +is present the web server will start.
+@@ -415,7 +415,7 @@ experimenting, debugging, and testing node configurations and setups but not int deployment.a. The
+classes. These classes will be constructed by the bundled web server +and must have a single argument constructor taking awebApis
property is a list of JAX-RS annotated REST access -classes. These classes will be constructed by the embedded web server -and must have a single argument constructor taking aServiceHub
-reference. This reference provides access to functions such as querying -for states through theVaultService
interface, or access to the -NetworkMapCache
to identify services on remote nodes. The framework will -provide a database transaction in scope during the lifetime of the web -call, so full access to database data is valid. Unlike -servicePlugins
thewebApis
cannot register new protocols, or -initiate threads. (N.B. The intent is to move the Web support into a -separate helper process using the RPC mechanism to control access.)CordaRPCOps
+reference. This will allow it to communicate with the node process +via the RPC interface. These web APIs will not be available if the +bundled web server is not started.b. The
+jars. These static serving directories will not be available if the +bundled web server is not started.staticServeDirs
property maps static web content to virtual paths and allows simple web demos to be distributed within the CorDapp -jars. (N.B. The intent is to move the Web support into a separate helper -process using the RPC mechanism to control access.)c. The
requiredFlows
property is used to declare new protocols in the plugin jar. Specifically the property must return a map with a key naming each exposed top level flow class and a value which is a set diff --git a/docs/build/html/creating-a-cordapp.html b/docs/build/html/creating-a-cordapp.html index 78de10bc35..c21bf7357e 100644 --- a/docs/build/html/creating-a-cordapp.html +++ b/docs/build/html/creating-a-cordapp.html @@ -38,7 +38,7 @@ href="genindex.html"/> - + @@ -137,7 +137,7 @@ API reference: Kotlin/ The CorDapp template +- The example CorDapp
@@ -251,10 +251,10 @@ contained in separate JARs from the node server JAR that are created and distrib
To create an app plugin you must you must extend from CordaPluginRegistry. The JavaDoc contains specific details of the implementation, but you can extend the server in the following ways:
-
- Required flows: Specify which flows will be whitelisted for use in your web APIs.
+- Required flows: Specify which flows will be whitelisted for use in your RPC calls.
- Service plugins: Register your services (see below).
-- Web APIs: You may register your own endpoints under /api/ of the built-in web server.
-- Static web endpoints: You may register your own static serving directories for serving web content.
+- Web APIs: You may register your own endpoints under /api/ of the bundled web server.
+- Static web endpoints: You may register your own static serving directories for serving web content from the web server.
- Registering your additional classes used in RPC.
To use this gradle plugin you must add a new task that is of the type
net.corda.plugins.Cordform
to your build.gradle and then configure the nodes you wish to deploy with the Node and nodes configuration DSL. -This DSL is specified in the JavaDoc. An example of this is in the template-cordapp and below +This DSL is specified in the JavaDoc. An example of this is in the CorDapp template and below is a three node example;task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { directory "./build/nodes" // The output directory @@ -466,7 +466,7 @@ one node per window.