Commit Graph

614 Commits

Author SHA1 Message Date
Mike Hearn
cc20a10225 Improve the flow commit API.
Make FinalityFlow do more, and be used more consistently.

Add a new waitForLedgerCommit API that is intended to be used at the end of flows, or at any other point where a flow wants to wait for a transaction to finalise (but the finalisation flow is being done by someone else).

Update the docs a bit.
2017-02-06 12:29:34 +01:00
kasiastreich
45d8e0f76d Tearoff fixes (#78)
* Move merkle building extension functions on wire tx to WireTransaction class.

* Add timestamp, notary, transaction type and signers to wire transaction id calculation.

* Change construction of MerkleTree from duplicating last node on a given level to padding leaves' list with zero hash to size of the nearest power of 2 - so we always have a full binary tree.
The problem was that it was possible to construct 2 different transactions with the same ids. Trick worked for txs having number of leaves that were not power of 2.

* Update tear-offs documentation and diagrams to reflect changes in construction of Merkle trees - padding with zero hashes and including all WireTransaction fields in id computation.

* Change in filtering API of WireTransaction for partial Merkle trees calculation.
Instead of many filtering functions over a transaction only one needs to be provided.
Additional change to check and verification of FilteredTransaction.

* IRS demo change. Make filtering function a protected method of RatesFixFlow class.
Comment on situation when capturing too much scope and connected problems with checkpointing.
Change oracle and tear-offs documentation.
2017-02-03 14:02:51 +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
3499e06e27 Correct typo - "countryparty" to "counterparty" 2017-02-02 14:08:38 +00:00
Ross Nicoll
2f9af7d7dc Revert Party.Full in preference for a less invasive change 2017-02-02 13:47:32 +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
Ross Nicoll
3572b78372 Use signing key instead of name to identify parties in IRS
The IRS demo uses names of parties to identify them in flows, which introduces problems when a node may not
know who a party is, as well as being a poor choice of key generally. This switches to use the owning key
instead.
2017-02-01 15:18:12 +00:00
Clinton
d376a902ad Merge pull request #180 from corda/clint-webserversplit
Split webserver from node
2017-02-01 12:13:31 +00:00
Andrius Dagys
6aa7e7a324 Update Network Simulator with new branding 2017-02-01 10:59:36 +00:00
Shams Asari
646ce8afe0 FlowException thrown by a flow is propagated to all counterparties 2017-01-31 13:30:33 +00:00
Ross Nicoll
e383752995 Adapt Party comparison to use owningKey
Change Party instances to be uniquely identified by the owning key, without taking into account name.
This requires that mock node key generation is reworked so that keys for services and the node itself
are distinct, otherwise the network map service cannot differentiate them.

Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
2017-01-30 15:46:51 +00:00
Clinton Alexander
d2ebcbfab0 Fixed whitespace and formatting with IntelliJ autoformat tool. 2017-01-30 12:05:22 +00:00
Clinton Alexander
65b29a8379 Moved the transaction context into the RPC call site. 2017-01-30 11:21:01 +00:00
Clinton Alexander
537ffae113 Moved file uploading to RPC interface. 2017-01-27 14:13:58 +00:00
Clinton Alexander
d4b6e32682 t # This is a combination of 5 commits.
Driver now queries webserver to ensure it has started.
2017-01-27 14:13:29 +00:00
Clinton Alexander
5f4d4c1da3 Moved the webserver code into the main node module. Driver can now start webserver for nodes. 2017-01-27 14:12:54 +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
Clinton
f30c6950f4 Merge pull request #163 from corda/clint-notarydemorpc
Notary demo now uses RPC directly instead of using an intermediate webserver.
2017-01-19 14:35:45 +00:00
Clinton Alexander
d73eb11245 Fixed documentation of notarise transactions. 2017-01-18 13:49:26 +00:00
Clinton Alexander
61b25a4abd Notary demo now uses RPC directly instead of using an intermediate webserver. 2017-01-18 12:05:01 +00:00
Clinton Alexander
0ec27fe11a Driver parameter cleanup in trader demo Main. 2017-01-17 14:52:15 +00:00
Clinton Alexander
082fec1362 Trader demo now works from the command line in new RPC only mode. 2017-01-17 14:17:31 +00:00
Clinton Alexander
e6da4909d3 Trader demo IntelliJ configurations and driver updated to work with the new RPC style demo. 2017-01-17 14:17:31 +00:00
Clinton Alexander
f512bd2e71 Trader demo now uses RPC to node rather than via a HTTP server. 2017-01-17 14:17:31 +00:00
Ross Nicoll
2efd44d46b Clean up semantics of composite clauses
This deprecates the existing composition clauses and adds new better named versions,
as well as changing 'AnyOf' to require at least one matching subclase (better matching
the name of the clause).
2017-01-17 11:34:21 +00:00
Andrius Dagys
e467b3513e Fix raft notary demo identity generation paths 2017-01-16 14:01:38 +00:00
Andrius Dagys
d757429043 Update the demo date in order: first notary, then party nodes ordered by name. 2017-01-13 12:09:35 +00:00
Andrius Dagys
078a9e2b70 IRSDemoTest: wait until transactions have finished before completing the test.
The date to set the demo date to is now + 6 months.
2017-01-13 12:09:35 +00:00
Mike Hearn
d26c44d08c Configure Capsule/Driver to give Corda a relatively poxy 200mb heap by default: we don't seem to need more for development purposes. Switch to G1GC by default as well. 2017-01-12 11:37:10 +01:00
Shams Asari
e589031d4b Some clean up of the flow code 2017-01-11 16:33:59 +00:00
josecoll
4d0fef4701 Colljos m7 minor config fix boc (#137)
* Fixed incorrect configuration of Issuer node.

* Fixed incorrect configuration of Bank of Corda gradle node config.
2017-01-11 11:01:16 +00:00
josecoll
172be1301d Fixed incorrect configuration of Issuer node. (#136) 2017-01-10 17:07:09 +00:00
Shams Asari
7cd281364f Removed basedir from the config file as it's always overwritten by the --base-directory cmd line arg 2017-01-10 10:49:28 +00:00
Mike Hearn
b3fa9d62c1 Make the attachments demo IntelliJ run configs work again. 2017-01-09 15:55:02 +01:00
Katarzyna Streich
17beab06c2 Fix docs to reflect future date change. Add Kryo registration of PaymentEvent classes. 2017-01-06 16:22:27 +00:00
Mike Hearn
9a75adb0ab Simplify the attachments demo by getting rid of the web API and just using the RPC interface directly. The web API in this case wasn't actually adding anything that had to be server side. 2017-01-06 16:58:34 +01:00
Shams Asari
59456cb6b1 Added a method to NodeHandle to simplify using RPC in the Driver 2017-01-06 14:14:32 +00:00
kasiastreich
ee99d7e9d0 Simm demo fix (#122)
* Update main to match nodes in deployNodes configuration (no Bank C).

* Update simm-valuation-demo documentation and comments.
2017-01-06 13:50:18 +00:00
josecoll
08047e7d72 Fixed gradle runnode config for Bank of Corda (RPC Client was failing). (#115)
Fixed doc mistake.
2017-01-05 18:37:54 +00:00
Shams Asari
08e391579c Node verifies the peer it connects to by checking its TLS common name 2017-01-05 14:22:11 +00:00
Clinton
f74fc67737 Merge branch 'master' into clint-irsdemowindowsfix 2017-01-05 09:51:02 +00:00
Clinton Alexander
3151586d54 Spelling fix. 2017-01-04 16:58:32 +00:00
Clinton Alexander
0fb77f9fa2 Added comment explaining fix to IRS demo on windows. 2017-01-04 16:57:47 +00:00
Clinton
d9663f1698 Merge pull request #72 from corda/clint-simmdemointegrationtest
Add SIMM valuation demo integration test
2017-01-04 15:32:44 +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
Andrius Dagys
53903c6521 Update IRS demo test date to a future date. Will follow up with a proper fix. 2017-01-04 13:24:19 +00:00
Clinton Alexander
26217e5cd8 Added a fix for the windows specific command line too long error when running the IRS demo. 2017-01-04 11:44:24 +00: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
Clinton Alexander
3c2610613f Integration test uses better naming sceme. Json support module cleaned up to use Kotlin features. 2016-12-19 16:26:54 +00:00
Clinton Alexander
00a44c5fbd SIMM valuation test now verifies the trade more robustly by checking trade ID. 2016-12-19 16:13:37 +00:00
Clinton Alexander
7d591e9cba Improved readability of the simm integration test 2016-12-19 15:25:13 +00:00
Clinton Alexander
9f9fa1de1c Removed the JSON closure and replaced with a more Kotlin native solution to generating arbitrary JSON with Jackson. 2016-12-19 14:35:47 +00:00
Clinton Alexander
008fcf50fd Added more type information to various API endpoints to make it possible to test. Integration test passes. 2016-12-16 14:47:29 +00:00
Clinton Alexander
d1c9cabd18 Added a trade to the test. 2016-12-16 12:11:26 +00:00
Clinton Alexander
6be21c7da4 Added test contents with a couple of todos. 2016-12-16 12:11:26 +00:00
Clinton Alexander
2334824a73 Added skeleton for the SIMM integration test. 2016-12-16 12:11:26 +00:00
Andras Slemmer
7ee88b6ec8 Add SMM test for round robin node picking 2016-12-15 11:36:06 +00:00
Andras Slemmer
0e54766b87 Fix simm-valuation-demo's kryo 2016-12-14 17:58:23 +00:00
Andras Slemmer
a7c079967c Fix simm-valuation-demo's kryo 2016-12-14 16:28:55 +00:00
Clinton Alexander
40bddd6403 Fix: Samples could not be deployed due to an incorrect build.gradle task target. 2016-12-09 17:45:21 +00:00
Clinton Alexander
57975c6e91 Bank of corda demo now uses the correct runtime artifacts dependency. 2016-12-09 15:17:07 +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
Jose Coll
453f7cd223 Bank of Corda demo - Issuer of Cash
Resolve BankOfCorda through NMS in protocol

Fixes following Integration testing.

Register custom RPC Kryo classes.

Protocol -> Flow renaming

Bank of Corda demo - Issuer of Cash

Resolve BankOfCorda through NMS in protocol

Fixes following Integration testing.

Protocol -> Flow renaming

Addressed all comments in PR review.

Removed bank lines.

Updated minor inconsistency in README.md

All protocol references changed to flow.

changed protocol -> flow in TODO comment.

changed startProtocolPermission -> startFlowPermission in README.md

Added transaction id to IssuerFlow Success response.
Removed explicit call to record Cash Move transaction (as already recorded in subflow)

Removed quasar dependency.

Addressed comment in PR.

Updated to use CompositeKey.

Added arguments to pass in Currency and Amount.

Updated run configurations to pass in Currency and Amount values

Added additional parameter to IssuerFlow request: issueToPartyReference

Added Vault updates verification in RPC Integration test.

Fixed RPC Integration test (Vault assertions)

Updated run-time dependencies in line with other demos.

Applied changes following PR review (exception handling, party resolution handling, docs)

Updated gradle client run configs with new parameters.

Main driver app now uses standard out for display (was using logger info() but nothing was being displayed because of restrictive config)

Fixed formatting display problems.

Updated Web Api code to use new CordaRPCOps interface (and new partyFromName() exposed method)

Removed unused import.
2016-12-08 17:38:21 +00:00
Andras Slemmer
4fe1d48e4a demos: Fix demo RPC serialisation after rebase 2016-12-08 11:58:31 +00:00
Andras Slemmer
a601f0abf5 Local RPC, demos use RPC, NODE has special privileges 2016-12-08 11:58:31 +00:00
Clinton Alexander
a0d5426ced Due to insurmountable issues with publishing the JARs when the project is called Corda it has been renamed back to capsule. 2016-12-06 16:06:16 +00:00
Clinton Alexander
1463cd2b37 Renamec capsule module to corda. 2016-12-06 16:06:16 +00:00
Clinton Alexander
810596927e Added a new capsule build.gradle to allow multiple bintray uploads from one build.gradle. 2016-12-06 16:06:16 +00:00
Shams Asari
4addb91f80 Added security to RPC and P2P systems. 2016-12-02 18:11:08 +00:00
Shams Asari
5432905b4a Clean up NetworkMapCache and InMemoryNetworkMapCache 2016-12-02 14:45:54 +00:00
Matthew Nesbit
e54a304e2e Depend upon an internal artifact, rather than a maven local published artifact when building the corda fatjar. 2016-11-30 16:16:51 +00:00
Mike Hearn
d500bf8f50 Address review comments. 2016-11-30 15:11:35 +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
Clinton Alexander
82745bbbc9 Merged in clint-demofixes (pull request #577)
Improvements to SIMM demo
2016-11-29 19:07:18 +00:00
Richard Green
34ea7f09af Starting new pull request - previous one had conflict errors 2016-11-29 16:52:07 +00:00
Rick Parker
55b10644dd Merged in parkri-oracle-docs (pull request #559)
Update and add oracles documentation
2016-11-29 15:12:09 +00:00
rick.parker
c3e8a9eb19 Doc updates for oracles 2016-11-29 15:09:38 +00:00
Clinton Alexander
531e04235b Disabled options that do not have a valid curve against them to avoid demo entering an invalid state. 2016-11-29 10:15:59 +00:00
Clinton Alexander
c0a2f0a81f Improved SIMM demo readme and removed references to Vega. 2016-11-29 10:01:36 +00:00
Shams Asari
38876e3984 Introducing Future.getOrThrow() which throws the cause of the ExecutionException 2016-11-28 15:21:22 +00:00
Mike Hearn
7b2eb651be Suppress or fix the few remaining compiler warnings 2016-11-28 14:04:30 +00:00
Andrius Dagys
946cfda03e Added a distributed notary demo that runs a notary cluster and gets several transactions notarised 2016-11-25 17:09:57 +00:00
rick.parker
8ec21eedb3 quasarScan removal. 2016-11-24 16:27:51 +00:00
rick.parker
b6a0fd2e2f Replace protocol with flow in readme files. 2016-11-23 14:48:50 +00:00
Mike Hearn
1cc688561d Minor: fix running-the-demos port numbers. 2016-11-23 13:07:49 +01:00
Mike Hearn
17e4950fe7 Minor: make IRS demo print things as expected, small comment and formatting tweaks. 2016-11-23 13:07:49 +01:00
Richard Green
1f148cfc95 Merged in rg_fix_simmm_crash_in_valuation (pull request #530)
Fixes bug when valuation run on only one trade in the portfolio
2016-11-22 17:25:20 +00:00
rick.parker
f68529d1fd Rename protocol to flow. 2016-11-22 17:17:14 +00:00
Shams Asari
d8e09f7174 Minor cleanup of attachment demo 2016-11-22 17:06:18 +00:00
Richard Green
a4771687aa Fixes bug when valuation run on only one trade in the portfolio 2016-11-22 16:52:11 +00:00
Richard Green
1c4dfbe6dc Fixes bug when valuation run on only one trade in the portfolio 2016-11-22 16:41:30 +00:00
Mike Hearn
a70136f775 Minor: fix startup time calculation, fix demos to print things to stdout instead of log.info 2016-11-22 12:41:05 +01: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
Clinton Alexander
2e73b16454 Removed redundant configuration in samples that misled developers. Fixed the dependency on Cordformation plugin. 2016-11-21 13:46:30 +00:00
Andrius Dagys
635ee8df79 Rename bits -> bytes, as it normally indicates a byte array 2016-11-21 13:02:27 +00:00
Richard Green
a1b381eefa Change moved over from samples repo; three nodes for SIMM demo 2016-11-20 14:16:50 +00:00
Richard Green
50415d2afa Merged in rg_doc_changes_2 (pull request #500)
Changes from a doc review that were omitted in first PR, also changes from corda=samples repo
2016-11-20 13:39:10 +00:00
Richard Green
d665347aa0 From doc review 2016-11-20 12:13:09 +00:00
Richard Green
c7fedb95f8 Fixing test clock cordformation dsl 2016-11-18 18:17:02 +00:00
Richard Green
2ec18d322f Changes from a doc review that were omitted in first PR, also changes from corda=samples repo 2016-11-18 17:58:52 +00:00
Clinton Alexander
48c0f75349 Fixed deploynodes not producing any artifacts for cordformation. 2016-11-18 17:15:55 +00:00
Mike Hearn
859542b2df Samples: make the IRS demo usable from the command line again 2016-11-18 13:02:12 +01:00
Mike Hearn
b3a70c7acb Samples: make the attachment demo runnable from the command line again. 2016-11-18 13:02:11 +01:00
Mike Hearn
7265614d5c Samples: trader-demo can now be run from the command line with gradle 2016-11-18 13:02:11 +01:00
rick.parker
cd98b559bf Move jolokia access config to the config directories, alongside log4j2.xml file. Point samples at top level dev and test config. 2016-11-18 11:11:54 +00:00
Clinton Alexander
92a2ffedd2 Updated documentation regarding the running of nodes on Windows to reflect the new runnodes.bat file. 2016-11-17 18:25:49 +00:00
Mike Hearn
0a6cdb77c3 Fix a bug in the trader-demo gradle that prevented the sample from working when run from the command line. 2016-11-17 18:04:12 +01:00
Mike Hearn
29ace9123f Minor: remove incorrect copyright header 2016-11-17 18:01:04 +01:00
Mike Hearn
6240ba48e1 Fix up the visualiser tool after the net.corda move and broken instructions from the repo moves 2016-11-17 17:29:58 +01:00
Mike Hearn
f247bc5647 Fixes to the deployNodes tasks for the samples. Improve the error message in the cordformation plugin. 2016-11-17 17:29:58 +01:00
Mike Hearn
f630e15528 Fix build 2016-11-17 16:33:06 +01:00
Mike Hearn
8654ad72bd Carry across a couple of changes from corda-samples that missed the cutover 2016-11-17 15:56:11 +01:00
Mike Hearn
90b083926f Reimport samples to main repo 2016-11-17 15:51:28 +01:00