Commit Graph

3071 Commits

Author SHA1 Message Date
Ross Nicoll
998aa8e024 Remove use of names from contracts
Remove dependency on name data that cash/obligation state objects will not have access to party details (such as name)
once privacy is correctly enforced.
2017-02-13 17:50:03 +00:00
Ross Nicoll
8cb27f1052 Switch to using CompositeKey inside network map cache
Switch to using CompositeKey inside network map cache, so that look up of node info from keys
can be done in a more sensible manner.
2017-02-13 17:50:03 +00:00
Mike Hearn
12de4f46b1 Minor: suppress deprecation warning in CordaRPCOpsImpl 2017-02-13 17:50:03 +00:00
Mike Hearn
8627a7dbbe Work around change in how c'tors with optional arguments are handled via RPC in FixingRoleDecider. 2017-02-13 17:50:03 +00:00
Mike Hearn
3871dbbc1f Make FlowLogicRef able to handle multiple constructors more elegantly (e.g. when invoking FinalityFlow directly via RPC). 2017-02-13 17:50:03 +00:00
Mike Hearn
c1034f5214 Print out exceptions in the attachment demo test. 2017-02-13 17:50:03 +00:00
Mike Hearn
f3c9b458fd 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-13 17:50:03 +00:00
kasiastreich
383d794c28 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-13 17:50:03 +00:00
Clinton Alexander
4b96fe2502 Cleaned up logging in the webdriver to remove log that fails to display correctly on Windows. 2017-02-13 17:50:02 +00:00
Joel Dudley
b9a5f34371 Addresses RGB feedback. 2017-02-13 17:50:02 +00:00
Chris Rankin
8621d47e09 CORPRIV-660: Display Web server's port number on launch button. 2017-02-13 15:13:47 +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
Chris Rankin
94747dcddf Switch from Runtime.exec() to ProcessBuilder. 2017-02-13 12:27:06 +00:00
Chris Rankin
166cbbf2e5 Add utility function for creating SLF4J loggers, and close unused I/O streams from forked processes. 2017-02-13 10:39:11 +00:00
Chris Rankin
bb8aa50d68 CORPRIV-659: Basic shell script to package DemoBench as DMG. 2017-02-13 08:58:31 +00:00
Chris Rankin
4960a472ef CORPRIV-659: Add bin/java to minimal JRE. 2017-02-13 08:54:19 +00:00
Chris Rankin
3895d34080 Use "safe" casting operator. 2017-02-12 13:52:09 +00:00
Chris Rankin
e42613bffe Document provenance of jediterm-terminal-2.5.jar. 2017-02-11 23:39:26 +00:00
Chris Rankin
1187564835 Tidy up gradle usage. 2017-02-11 22:27:55 +00:00
Chris Rankin
28d7170aca CORPRIV-660: Allow user to launch Web server for each node. 2017-02-10 16:38:41 +00:00
Chris Rankin
655cdf5e96 Merge branch 'master' into demobench 2017-02-10 14:24:04 +00:00
Chris Rankin
f180ae96bd Merge remote-tracking branch 'corda-public/master' 2017-02-10 14:23:46 +00:00
Chris Rankin
6b86ee415b Improve packaging information. 2017-02-10 13:44:59 +00:00
Chris Rankin
0a1632a0d5 CORPRIV-659: Add icon file for DMG package. 2017-02-10 12:25:28 +00:00
Chris Rankin
cb74137641 CORPRIV-658: Add BAT file to create unsigned DemoBench.exe. 2017-02-10 11:41:52 +00:00
Chris Rankin
ab744f4159 CORPRIV-658: Add icon file for Windows installer. 2017-02-10 10:38:19 +00:00
Chris Rankin
dd8c1997a2 Replace R3 logo with Corda logo. 2017-02-10 10:37:35 +00:00
Patrick Kuo
94bc130721 Addressed PR issues 2017-02-10 10:28:27 +00:00
Chris Rankin
2aeac0df91 CORPRIV-658: Add gradle parameter "packageType" for javapackage task. 2017-02-10 09:45:33 +00:00
Chris Rankin
d6514f7524 Allow Node Explorer to be relaunched. 2017-02-10 09:27:38 +00:00
Chris Rankin
e966812105 Take java executable from JRE. 2017-02-09 23:26:47 +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
Chris Rankin
38fb84a96b Initial custom resource script for Windows bundle. 2017-02-09 18:22:32 +00:00
Andrius Dagys
288d709668 Include Merkle tree root hash in FilteredTransaction
Remove no longer needed test. Make FilteredTransaction constructor private
2017-02-09 17:57:31 +00:00
Chris Rankin
975bba0295 CORPRIV-665: Protect NodeTerminalView from being destroyed twice. 2017-02-09 17:14:49 +00:00
Patrick Kuo
c054ffe719 Add support for contract upgrades (#165)
* Add support for contract upgrades
* Add interface for the upgraded contract to implement, which provides functionality for upgrading legacy states.
* Add shared upgrade command and verification code for it.
* Add DummyContractV2 to illustrate what an upgraded contract looks like.
* Add new functions to vault service to support upgrading state objects.
* Add contract upgrade flow
2017-02-09 17:14:31 +00:00
Chris Rankin
ccfbfde830 CORPRIV-665: Protect harder against NPE 2017-02-09 17:11:26 +00:00
Chris Rankin
6fd9399b20 CORPRIV-665: Protect against NPE 2017-02-09 16:45:23 +00:00
Clinton
a61c767505 Merge pull request #232 from corda/clint-cddl
Capsule fat JAR now contains a CDDL notice.
2017-02-09 16:35:01 +00:00
David Lee
21c6c499fa Updated the notice
... to the last version reviewed & approved by legal counsel
2017-02-09 16:07:17 +00:00
Clinton Alexander
1b3bc2ec7d Capsule fat JAR now contains a CDDL notice. 2017-02-09 15:57:31 +00:00
Shams Asari
50e1eb7b21 End flow if waiting for ledger commit and committer flow errors 2017-02-09 15:57:13 +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
Chris Rankin
b29235e7cd CORPRIV-665: Ensure tab closes if the node exits. 2017-02-09 15:02:53 +00:00
Chris Rankin
6ae8a4da83 Display "0" balance for a node which has no cash balances at all. 2017-02-09 11:40:32 +00:00
Ross Nicoll
47d260625a Add AnonymousParty superclass of Party
Add AnonymousParty superclass of Party in preparation for anonymising parties stored in
contract states.

Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
2017-02-09 11:37:32 +00:00
Patrick Kuo
b651074523 some refactoring and more comments. 2017-02-09 10:41:27 +00:00
Chris Rankin
050b2f0151 Make the javapackage task "more gradle" and "less ant". 2017-02-09 01:03:12 +00:00
Chris Rankin
675fa6f2a0 Upgrade to Logback 1.1.10 2017-02-08 23:28:52 +00:00
Chris Rankin
f9ae8f7a19 Move demobench.log into the user's demobench directory. 2017-02-08 23:10:47 +00:00