Commit Graph

2911 Commits

Author SHA1 Message Date
kasiastreich
e0dd67cf14 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-20 08:29:13 +00:00
Clinton Alexander
c6c40f0c84 Cleaned up logging in the webdriver to remove log that fails to display correctly on Windows. 2017-02-20 08:29:13 +00:00
Joel Dudley
577d2c31c8 Addresses RGB feedback. 2017-02-20 08:29:13 +00:00
Patrick Kuo
638bfcd131 Merged in pat-doorman-jira (pull request #19)
Doorman-Jira integration

Approved-by: Shams Asari
2017-02-16 17:50:57 +00:00
Patrick Kuo
1611066c44 Addressed PR issues 2017-02-16 15:13:05 +00:00
Patrick Kuo
f999da3a4d Addressed PR issues 2017-02-16 15:11:25 +00:00
Patrick Kuo
5064cbb5c0 Addressed PR issues 2017-02-16 14:47:20 +00:00
Patrick Kuo
e2f93f64a9 Addressed PR issues 2017-02-16 14:45:36 +00:00
Patrick Kuo
d76db6d047 Addressed PR issues 2017-02-16 11:30:03 +00:00
Patrick Kuo
234863f88c Doorman-Jira integration 2017-02-15 15:42:41 +00:00
Patrick Kuo
7cd8d952a9 Merged in pat-add-keygen-option-to-doorman (pull request #18)
Add keygen option to doorman

Approved-by: Shams Asari
2017-02-14 09:48:22 +00:00
Patrick Kuo
1e8c80855c * Moved DoormanParameter to its own file
* throws ShowHelpException instead of exitProcess in the helper method.
2017-02-13 15:00:57 +00:00
Patrick Kuo
94bc130721 Addressed PR issues 2017-02-10 10:28:27 +00:00
Patrick Kuo
b651074523 some refactoring and more comments. 2017-02-09 10:41:27 +00:00
Patrick Kuo
011dee09d8 added keygen functionality to doorman 2017-02-08 17:26:33 +00:00
Patrick Kuo
f9a66622a4 Merged in pat-rename-netpermission-to-doorman (pull request #17)
Rename netpermission to doorman

Approved-by: Shams Asari
2017-02-06 16:21:33 +00:00
Patrick Kuo
6ff8d73402 Rename netpermission to doorman 2017-02-06 14:56:00 +00:00
Chris Rankin
0c1a6aad6b Include fix for NPEs with RPC exceptions. 2017-02-03 11:46:54 +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
Andrius Dagys
56dbf1e844 Prevent node from starting across upgrades (until we support it better) (#199)
* Prevent node from starting across upgrades (until we support it better).

On first run a version file is created in the node dir, and on subsequent runs the node version is matched against it.

* Move version check from caplet to node.
2017-02-02 18:21:00 +00:00
chalkido
087570e74d toStringWithSuffix decimal mark unit-test issue on non UK/US Locale (#209)
Make use of default Locale to temporarily bypass unit-testing of toStringWithSuffix failing due to different decimal marks on non anglo saxon Locales.
2017-02-02 18:06:48 +00:00
Ross Nicoll
bc9407d2c8 Correct network map cache tests
InMemoryNetworkMapCacheTest was not actually asserting that an expected exception was thrown, which
meant when earlier changes to the service changed the operation it wasn't caught. The service now
overwrites previous node if a new matching node is added, and this updates the test to follow that
design.
2017-02-02 16:01:10 +00:00
Ross Nicoll
3499e06e27 Correct typo - "countryparty" to "counterparty" 2017-02-02 14:08:38 +00:00
Chris Rankin
c7a045c82a Merge remote-tracking branch 'corda-public/master' 2017-02-02 14:00:32 +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
8b258b9415 Merge pull request #207 from corda/aslemmer-driver-poll-nms-registration
Add isRegisteredWithNetworkMap RPC, poll in Driver, expose RPC proxy
2017-02-02 13:14:44 +00:00
Andras Slemmer
4afd404db4 Address PR 207 comments 2017-02-02 11:44:18 +00:00
Andras Slemmer
de63f90745 Add isRegisteredWithNetworkMap RPC, poll in Driver, expose RPC proxy 2017-02-02 10:54:50 +00:00
Shams Asari
3f6c8ab1e2 Allow received FlowException to propagate further to initiating flow 2017-02-01 17:30:38 +00:00
Mike Hearn
f4b66536c2 Merge pull request #193 from corda/joel-rebuild-docs
Rebuilds docs.
2017-02-01 18:27:10 +01: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
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
Clinton Alexander
876bae67cb Added TODOs for future splitting of the web server from the node. 2017-01-31 16:03:34 +00:00
Shams Asari
646ce8afe0 FlowException thrown by a flow is propagated to all counterparties 2017-01-31 13:30:33 +00:00
Joel Dudley
a52a107767 Rebuilds docs. 2017-01-31 13:02:43 +00:00
Joel Dudley
cfcfb30beb Provides clearer instructions on the 'Getting set up' page. Expands 'Troubleshooting' page. 2017-01-31 12:59:24 +00:00
Patrick Kuo
e8015e689a Flows shouldn't have to suspend if just doing a send (#187)
* CORDA-45 Flows shouldn't have to suspend if just doing a send
2017-01-30 16:21:43 +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
Richard Green
e54d6388fd Adding optional delay to AMQ message sending via system properties (#185) 2017-01-30 14:39:40 +00:00
Joel Dudley
7b57cbe351 Adds signWithECDSA() to SignedTransaction for improved Java interop. 2017-01-30 14:27:27 +00:00
Clinton Alexander
a5f6fb9479 Querying of node and webserver now uses infinite retries to avoid any race conditions. 2017-01-30 12:08:41 +00:00
Clinton Alexander
d2ebcbfab0 Fixed whitespace and formatting with IntelliJ autoformat tool. 2017-01-30 12:05:22 +00:00
Clinton Alexander
9831926a9d Removed the now defunct r3 bintray from the repositories list. 2017-01-30 11:46:12 +00:00
Clinton Alexander
65b29a8379 Moved the transaction context into the RPC call site. 2017-01-30 11:21:01 +00:00
Clinton Alexander
65f5259ac9 Reverted docs change. 2017-01-30 11:15:23 +00:00
Clinton Alexander
3482452c8b Added webserver to runnodes. 2017-01-27 14:15:08 +00:00
Clinton Alexander
13551a6b23 Runnodes now works with the new separate webserver. 2017-01-27 14:14:38 +00:00