Commit Graph

686 Commits

Author SHA1 Message Date
Andras Slemmer
c8b13b257f Remove Any constraint from Generator type param 2017-03-09 17:48:53 +00:00
Mike Hearn
ce0dcafb95 Document JSON/Jackson support 2017-03-08 12:31:22 +01:00
Mike Hearn
2628a10c51 Refactor the JSON support out into a separate module, :corda:jackson, as Jackson/JSON configuration is generally useful outside the context of web servers. 2017-03-08 12:31:22 +01:00
Andras Slemmer
f4f83325a7 client: Address PR 290 comments 2017-03-07 16:38:40 +00:00
Ross Nicoll
b5ba070301 Revert "Non-ssl artemis acceptor for RPC connection. (#271)"
This reverts commit f0d82e4918.
2017-03-06 14:03:23 +00:00
Patrick Kuo
dab80510f4 Fix not displaying Anonymous issuer name correctly in Explorer 2017-03-02 12:07:12 +00:00
Andras Slemmer
1532318ae7 client: Fix wrong pickN generator 2017-02-27 11:36:01 +00:00
Patrick Kuo
f0d82e4918 Non-ssl artemis acceptor for RPC connection. (#271)
* New non-ssl acceptor in artemis server for RPC connection.
2017-02-24 15:36:36 +00:00
Chris Rankin
221278197a Implement RPCOp getCashBalances(). 2017-02-22 13:57:15 +00:00
Ross Nicoll
98c30f6432 Remove CashFlow
Remove the CashFlow flow, replacing it with CashFlowCommand which can be used for the use-cases
with instructions passed around as an object.
2017-02-09 18:22:58 +00:00
Ross Nicoll
9055c9d9b0 Split CashFlow into three flows
Split CashFlow into independent CashIssueFlow, CashExitFlow and CashPaymentFlow,
so that users can be given access to one but not the other(s).

Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
2017-02-09 15:43:48 +00:00
Shams Asari
b86c80691e FlowException serialised over RPC (subtypes are flattened), and improvement to startFlow RPC for correct exception handling 2017-02-03 11:21:10 +00:00
Ross Nicoll
2f9af7d7dc Revert Party.Full in preference for a less invasive change 2017-02-02 13:47:32 +00:00
Andras Slemmer
de63f90745 Add isRegisteredWithNetworkMap RPC, poll in Driver, expose RPC proxy 2017-02-02 10:54:50 +00:00
Ross Nicoll
1b86ddfd6e Replace Party with Party.Full
Replace Party with Party.Full as an interim step to introducing the Party.Anonymised class.

Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
2017-02-01 15:18:12 +00:00
Patrick Kuo
7f96b752d1 Added reconnect capability to RPC (#192)
* Added reconnect capability to RPC
* Issue - https://github.com/corda/corda/issues/184
* JIRA - https://r3-cev.atlassian.net/browse/CORDA-189
2017-01-31 17:04:05 +00:00
Shams Asari
20fe0f32f2 Removed "Node" prefix from NodeSSLConfiguration and renamed two file properties to end in "File" 2017-01-23 15:46:36 +00:00
Shams Asari
59456cb6b1 Added a method to NodeHandle to simplify using RPC in the Driver 2017-01-06 14:14:32 +00:00
Mike Hearn
119d00c384 Upgrade dependencies and centralise some more version numbers in the root gradle file 2017-01-04 15:44:56 +01:00
josecoll
eac2cb1cc6 Bank of Corda integration with Trader Demo and Explorer
Initial conversion of Explorer to use IssuerFlow (from BankOfCorda)

Initial conversion of TraderDemo to use IssuerFlow (from BankOfCorda)

Updated TraderDemo to use IssuerFlow (from BankOfCorda)

Fixed TraderDemo integration text (added new BankOfCorda node)

Updated Explorer with changes IssuerRequest params

Explorer now correctly displaying transaction id upon Issue.

Moved IssuerFlow into finance package so can be reused across multiple demos (TraderDemo) and applications (eg Explorer)

Refactored BankOfCorda demo to use Finance package and TestUtil constants

Updated TraderDemo to use IssuerFlow

Updated Explorer to use finance package IssuerFlow.

Advertised BankOfCorda as Issuer for usage by Explorer.

Explorer no longer depends on BankOfCorda demo since IssuerFlow promoted to Finance module

Added IssuerFlow to AbstractNode whitelist.
Explicit declarations of IssuerFlow no longer required.

Added plugin registration of IssuerFlow at bootstrap.

Revert whitelisting of IssuerFlow (plugin configured)

Refactored to use constant BOC definition.

Added gradle RPC security config.

Updated documentation

Fixed incorrect references.

Renamed Issuer banks.
Added new permission set (for Issuer nodes)
Added node nearestCity info
Added new Issuer Event Generator for Issuer nodes only

Associated currency with issuer using ServiceType naming structure.

Added argument flag (-S) to trigger event generator simulation node.

Fixed problem with issuers not resolving from network map.

Updated perms on Issuer rpc proxy nodes.

Fixed minor in cash generateExit identified by Explorer.

Changes applied in prep for AWG demo.

Added IntelliJ run-configurations for launching Explorer demo nodes (with and without simulation)

Updated documentation (and added additional gradle task to launch Explorer nodes in simulation mode).

Fix following rebase.

Addressed review items from PR.

Updated TraderDemo readme.

Updated TraderDemo gradle file to launch Bank of Corda node.

Updated JRE properties.

Updated IssuerModel to incorporate correct JFX Observable handling.
Fixed bug with Exit command not displaying any currency.

Added TODO's for revisiting correct Exception handling strategy.

Optimization for when issuing cash to self.

Minor updates following PR review.

Remove old refs to Royal Mint and Federal Reserve
2016-12-22 15:55:50 +00:00
Mike Hearn
eec16a41cf Minor: fix some compiler warnings and update some universal contract DSL code to use may as an infix function 2016-12-20 15:18:25 +01:00
Andras Slemmer
2f12f79f19 CashFlow progress tracking, remove unused clientToService stream 2016-12-20 10:20:37 +00:00
Andrius Dagys
7cb4cbcad4 Made vault updates contain full StateAndRef in the consumed set (instead of just StateRef). This allows subscribers to check whether the update contains relevant states.
Cash balances are now calculated by keeping only the aggregate values (it no longer needs to iterate through all states in the vault).
2016-12-15 16:27:39 +00:00
Andras Slemmer
66477a0955 Merge pull request #57 from corda/aslemmer-service-identity-sessions
Service identity sessions
2016-12-15 13:29:50 +00:00
Patrick Kuo
64732f8701 Client observable improvement (#56)
* merge foldToObservableList and foldToObservableMap to fold
* added a 1 second buffer to the rx observable subscription to batch up the incoming updates, to avoid flooding FX UI thread with runnable
* renamed GatheredTransactionDataModel to TransactionDataModel
2016-12-15 12:48:27 +00:00
exfalso
53bbb57345 Add ReceivedSessionMessage, DriverBasedTest re #57 2016-12-15 11:37:15 +00:00
Andras Slemmer
a3138ab0dc Address PR comments 2016-12-15 11:37:15 +00:00
Andras Slemmer
6a796cef35 Add raft notary integration tests, testing service addressing 2016-12-15 11:36:06 +00:00
Clinton
b43d940297 Merge pull request #35 from corda/clint-M6publishing
Corda can be published to bintray and reduced publishing boilerplate in build.gradle.
2016-12-09 15:07:46 +00:00
Andras Slemmer
a601f0abf5 Local RPC, demos use RPC, NODE has special privileges 2016-12-08 11:58:31 +00:00
Clinton Alexander
b24c628e34 Publications now publish JARs again. Install task now publishes again. 2016-12-06 16:06:16 +00:00
Clinton Alexander
bf49dda731 Corda now publishes with updated publish utils. 2016-12-06 16:06:16 +00:00
Clinton Alexander
dec9cfc5a4 Added client and node publishing. 2016-12-06 16:06:16 +00:00
Matthew Nesbit
99219c6a5f Allow cordapp types to be used in parameters to cordapp startFlowDynamic RPC calls.
Add missing registration.
2016-12-05 16:57:22 +00:00
Shams Asari
10360ae8cf Converted MapChange into a sealed data structure so that only Modified has the previous node property 2016-12-05 10:04:31 +00:00
Shams Asari
4addb91f80 Added security to RPC and P2P systems. 2016-12-02 18:11:08 +00:00
Mike Hearn
7b40be8361 Run the IntelliJ reformatter across the Kotlin code. Did not reformat JS/web code. 2016-11-30 14:40:34 +00:00
Shams Asari
38876e3984 Introducing Future.getOrThrow() which throws the cause of the ExecutionException 2016-11-28 15:21:22 +00:00
Patrick Kuo
cd34f3ae16 Merged in pat-explorer-more-changes (pull request #505)
Pat explorer more changes
2016-11-24 17:47:01 +00:00
rick.parker
8ec21eedb3 quasarScan removal. 2016-11-24 16:27:51 +00:00
Patrick Kuo
fbf952a1ab Explorer corda branding 2016-11-24 15:46:50 +00:00
Mike Hearn
ff75cb444e Explain the design of the RPC protocol around observables more. 2016-11-23 12:43:14 +01:00
rick.parker
bf88dc4826 Missed some protocol mentions 2016-11-23 08:55:21 +00:00
Shams Asari
8e6ae061bf Fix incorrect protocol references 2016-11-22 18:18:06 +00:00
Andras Slemmer
88ca56341b Merged in aslemmer-fix-rpc-bugs (pull request #529)
rpc: Fix close/send deadlock and premature shutdown on empty observable, add test
2016-11-22 17:19:33 +00:00
rick.parker
f68529d1fd Rename protocol to flow. 2016-11-22 17:17:14 +00:00
Andras Slemmer
cb67fd504b rpc: Fix close/send deadlock and premature shutdown on empty observable, add test 2016-11-22 15:31:42 +00:00
Andrius Dagys
93505d5e2e Merged in andrius-rename-bits (pull request #508) 2016-11-22 08:26:37 +00:00
Andrius Dagys
64299591c3 Rename PublicKeyTree -> CompositeKey and unify terminology across documentation. 2016-11-21 14:47:19 +00:00
Andrius Dagys
635ee8df79 Rename bits -> bytes, as it normally indicates a byte array 2016-11-21 13:02:27 +00:00
Clinton Alexander
bf70091172 Now depending on the plugins in jcenter and not buildsrc. 2016-11-18 14:41:06 +00:00
Patrick Kuo
af899a98f4 Explorer corda branding 2016-11-16 13:26:05 +00:00
Andras Slemmer
07df9f17b3 loadtest: Add loadtest code 2016-11-15 17:21:26 +00:00
Andras Slemmer
7f0dd1ab5b Generic startProtocol and typesafe wrappers, per-protocol permissions, CashProtocol, remove executeCommand, move almost all Cash-related things to :finance 2016-11-15 16:46:37 +00:00
Andrius Dagys
c33c55eb20 Replace PublicKey with PublicKeyTree in Party. A single entity can now be identified by more than one key. 2016-11-14 14:57:16 +00:00
Mike Hearn
ce99f354cb Rename com.r3corda -> net.corda 2016-11-10 17:14:24 +01:00
Clinton Alexander
8882b77b1b Fixed quasar scanning. 2016-11-04 13:35:25 +00:00
Patrick Kuo
7f8608c981 Changing UI layout 2016-11-03 11:39:24 +00:00
Shams Asari
6d39b71bf9 Simple RPC access control, with a demo control on the cash RPCs 2016-11-03 10:46:25 +00:00
RogerWillis
b3dc24d8b3 Fixed typo in 'client/build.gradle' 2016-10-28 13:33:36 +01:00
Clinton Alexander
8f326824f3 Test fix and review fix. 2016-10-21 12:09:21 +01:00
Clinton Alexander
6cd692776f Compile error fix. 2016-10-21 11:32:29 +01:00
Clinton Alexander
aad75c5152 Fixed code that no longer compiled correctly. 2016-10-21 11:32:29 +01:00
Shams Asari
e2d6ace449 RPC client authentication using user/password from config file 2016-10-20 17:55:16 +01:00
Matthew Nesbit
4db1836996 Unify messaging services to have a database and not support client type connections when they should use the RPC connections. Also, push NodeInfo across to the driver via the web interface to remove that use of startClient.
Fix typo
2016-10-18 17:48:52 +01:00
Patrick Kuo
d4362fbd78 New counterparty model and subscription mechanism to retrieve and track counterparty changes in network map
New transaction creation screen for creating new cash transactions, using party info source from the counterparty model.
2016-10-17 11:25:20 +01:00
Jose Coll
b4dc5e48d5 Publication of client jars for usage by cordapp_template 2016-10-13 12:52:08 +01:00
Matthew Nesbit
1e836edd78 Change ServiceType to a sealed class from an abstract class
Allow AdvertisedServices to have their own identity and keys. Also, rationalise legalIdentity onto the local node's NodeInfo which is available on ServiceHub

Fixup after rebase

Remove legal identity that was on storage service. Now access via myInfo.legalIdentity and key via keyManagement lookup.

Enforce singleton notary per node for now

Tidy up based upon Rick's suggestions

Handle PR comments

clean up imports

Fix typo

Fixup rename

Capitalise comment

Eliminate unused variable warning

Make changes based upon PR comments

Cleanup whitespace changes
2016-10-07 13:44:51 +01:00
Andras Slemmer
3bb96f3f3e node: Fix after rebase 2016-10-05 10:40:18 +01:00
Andras Slemmer
5af0e97444 Refactor explorer and friends to use RPC, remove NodeMonitor* 2016-10-05 10:40:18 +01:00
Shams Asari
5e6533eb8a Better use of Futures 2016-10-04 14:11:43 +01:00
Andrius Dagys
5efa0fd5b3 Advertised services now contain ServiceInfo which describes ServiceType and a service identifier. This will be used, e.g. for grouping distributed notary nodes into the same service cluster. 2016-10-04 11:36:26 +01:00
Andras Slemmer
4da73e28c7 client, explorer: Address review comments 2016-10-03 11:26:30 +01:00
Andras Slemmer
9a212a8714 client: Add ConcatenatedList, LeftOuterJoinedMap, tests and utilities, fix some bugs 2016-10-03 11:26:30 +01:00
Andras Slemmer
99e758e021 client: Add ObservableMap utilities and tests 2016-10-03 11:26:29 +01:00
Andras Slemmer
43d18d46bb Add PartiallyResolvedTransaction to client 2016-10-03 10:17:41 +01:00
Andras Slemmer
7e7bf08062 Rename stateMachineRunId properties to id, remove unused fiberId 2016-09-26 10:40:18 +01:00
Andras Slemmer
cfa5878ea2 Add StateMachineRunId, type for SMM Changes 2016-09-26 10:40:18 +01:00
Matthew Nesbit
a964073c2f Track message id's to deduplicate replays. Widen the auto-acknowledgement window of Artemis back to the default.
Use synchronized wrapper over set.

Drop discard message to trace level logging.

Fix code layout

Use lazy trace extension method

Track message id's to deduplicate replays. Widen the auto-acknowledgement window of Artemis back to the default.

Use synchronized wrapper over set.

Include tx message unique id in checkpointed data.

Add test for checkpointed resend

Fix bug in not getting UUID off message.

Tidy formatting

Add explanation comments to test asserts

Put unique id even on Client messages.

Tidy formatting
2016-09-26 10:12:50 +01:00
Patrick Kuo
eee18b55f5 Moved certificates path to node configuration 2016-09-22 14:28:12 +01:00
Ross Nicoll
d38392093f Rename wallet monitor service to node monitor service 2016-09-21 10:26:20 +01:00
Ross Nicoll
ebda724f14 Change references to 'wallet' with 'vault' 2016-09-20 18:14:53 +01:00
Andras Slemmer
f6d4d91f36 client: Add example code to ObservableUtilities 2016-09-20 10:23:46 +01:00
Andras Slemmer
75ee91fe4e client: Use ReplayList to test AggregatedList as well 2016-09-19 15:05:23 +01:00
Andras Slemmer
118d5c485e client: Fix FlattenedList, add ReplayedList for testing ObservableList Changes 2016-09-19 15:05:23 +01:00
Andras Slemmer
7d290b38b1 client: Add utility javafx observable extension methods 2016-09-19 15:05:23 +01:00
Andras Slemmer
80a058760f client: Relax ChosenList variance 2016-09-19 15:05:23 +01:00
Andras Slemmer
f1f8b3180c client: Add FlattenedList 2016-09-19 15:05:23 +01:00
Andras Slemmer
21a7707825 explorer: Map transactions by tx id as well 2016-09-19 15:05:23 +01:00
Andras Slemmer
01d879772d client, explorer: Rearrange/add tx screen columns 2016-09-19 15:05:23 +01:00
Andras Slemmer
041c33a167 client, node: Handle snapshot in explorer 2016-09-19 15:05:23 +01:00
Andras Slemmer
c04a3401c3 client, node: Fix compile error after rebase 2016-09-19 15:05:22 +01:00
Andras Slemmer
fcb16dc353 client: Add cash Exit generation 2016-09-19 15:05:22 +01:00
Andras Slemmer
26aed70e24 explorer: Add input/output states and signers to tx screen 2016-09-19 15:05:22 +01:00
Andras Slemmer
767077c764 explorer: Add Low level events viewer for tx screen
asd
2016-09-19 15:05:22 +01:00
Andras Slemmer
0dae8e9f68 client: Small tweaks 2016-09-19 15:05:22 +01:00
Andras Slemmer
5af593cae4 client: reactfx->rx 2016-09-19 15:05:22 +01:00
Andras Slemmer
91508efbd4 client: Add javafx utilities and basic WalletMonitor models 2016-09-19 15:05:22 +01:00
Andras Slemmer
f673d18fb8 client, explorer: Fix compile after rebase 2016-09-19 15:05:22 +01:00
Mike Hearn
4d83f1489f Add a client library that provides an RPC mechanism for talking to the Corda node.
The RPC mechanism uses message queues and is essentially conventional except for the fact that it supports marshalling observables. An observable encapsulates a stream of ongoing events, and server-side observables sent to the client are automatically bound to message queues and managed by Artemis.
2016-09-16 10:13:21 +01:00
Mike Hearn
5f048889f0 Merged in mike-tweak-erroror (pull request #343)
Minor: move ErrorOr into the core module and tweak its API a bit. Add a Path div operator.
2016-09-09 11:29:22 +02:00
Matthew Nesbit
9518c38f29 Ensure integration tests in modules are in separate configurations and not directly called from build or installDist. 2016-09-08 15:28:04 +01:00
Mike Hearn
af72978ace Remove redundant import. 2016-09-08 14:41:17 +02:00
Mike Hearn
34ee44b532 Minor: move ErrorOr into the core module and tweak its API a bit. Add a Path div operator. 2016-09-08 13:12:15 +02:00
Andras Slemmer
0412a70301 client: Rename TransactionCreateState -> GatheredTransactionData, fix compile error after rebase 2016-09-08 11:25:26 +01:00
Andras Slemmer
e235375a89 client: Add stubs/todo for handling state snapshots 2016-09-08 11:25:26 +01:00
Andras Slemmer
3acbda53e4 client: AmountBindings class->object 2016-09-08 11:25:26 +01:00
Andras Slemmer
2869889769 client: Add lengthier explanation of Models 2016-09-08 11:25:26 +01:00
Andras Slemmer
6b6c51b8d4 client: Elaborate on why we need two IDs in TransactionCreateStateModel 2016-09-08 11:25:26 +01:00
Andras Slemmer
d5c4202162 client: Fix when (this) to use virtual dispatch instead 2016-09-08 11:25:26 +01:00
Andras Slemmer
3a5247f016 client: Small tweaks 2016-09-08 11:25:26 +01:00
Andras Slemmer
7eb4f1fb33 client: Clarify keyHashCode var name, add unit tests for AggregatedList 2016-09-08 11:25:26 +01:00
Andras Slemmer
435754a043 client: reactfx->rx 2016-09-08 11:25:26 +01:00
Andras Slemmer
4c36072849 client: Document fx utilities 2016-09-08 11:25:26 +01:00
Andras Slemmer
0c8f58b2ac client: Document models 2016-09-08 11:25:26 +01:00
Andras Slemmer
cb956e0979 client: Some refactor of Expect dsl, docs 2016-09-08 11:25:26 +01:00
Andras Slemmer
bdb22e1b74 client: Add javafx utilities and basic WalletMonitor models 2016-09-08 11:25:26 +01:00
Andras Slemmer
a845cf6bdf client: Fix compile after rebase 2016-09-08 11:05:53 +01:00
Andras Slemmer
e97cbec755 client: Fix compile error after rebase 2016-09-08 10:59:19 +01:00
Andras Slemmer
8b6b9977ec client: ErrorOrs use nullable values and Exception 2016-09-08 10:59:19 +01:00
Andras Slemmer
69fecf94d1 client: Add varargs convenience sampleBernoulli 2016-09-08 10:59:19 +01:00
Andras Slemmer
6f8d92d368 client: Remove test-utils dep from compile 2016-09-08 10:59:19 +01:00
Andras Slemmer
2a7115318d client: Fix compile error after rebase 2016-09-08 10:59:19 +01:00
Andras Slemmer
598809559d client: Add Generator lib, and generators for client<->service events 2016-09-08 10:59:19 +01:00
Ross Nicoll
32d96b78a8 Add missing dependency on test-utils 2016-09-01 18:36:19 +01:00
Andras Slemmer
0298ccf0d6 test-utils: Rename repeat to replicate due to name clashes 2016-09-01 18:15:47 +01:00
Andras Slemmer
5b2157cdc8 client, test-utils: Move Expect dsl to test-utils 2016-09-01 18:15:47 +01:00
Andras Slemmer
1f095533be client: Remove when (this) 2016-09-01 10:14:37 +01:00
Andras Slemmer
5d04bd2cad client: Small comment correction 2016-09-01 09:38:04 +01:00
Andras Slemmer
0f54aec6ac client: Add repeat\(n\) to Expect dsl 2016-09-01 09:36:06 +01:00
Andras Slemmer
af641ab977 client: Small cosmetics 2016-09-01 09:36:06 +01:00
Andras Slemmer
20ed97ff96 client: Port Expect reactfx->rx 2016-09-01 09:36:06 +01:00
Andras Slemmer
f682d7f173 client: Hide public Expect.kt types 2016-09-01 09:36:06 +01:00
Andras Slemmer
a2ace973ff client: reactfx->rx 2016-09-01 09:36:06 +01:00
Andras Slemmer
2f7b022c8e client: Add WalletMonitorClient, Expect DSL and some tests for the client 2016-09-01 09:36:06 +01:00
Andras Slemmer
9cda99bbcc client: Add client submodule 2016-09-01 09:36:05 +01:00