ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8,507 Commits 91 Branches 405 Tags 354 MiB
376a9d399f
Commit Graph

233 Commits

Author SHA1 Message Date
Chris Rankin
396fc43f11 Fixes from code review. 2017-02-23 15:47:46 +00:00
Chris Rankin
a2bf7d4d84 Break textfield definitions out into separate functions. 2017-02-23 10:39:31 +00:00
Chris Rankin
5a13d0355d CORPRIV-661: Ensure that nodes loaded from a profile have the correct network map service. 2017-02-22 17:04:42 +00:00
Chris Rankin
963d015c4d Fixes from code review. 2017-02-22 16:30:25 +00:00
Chris Rankin
1a78ca240a Comment file copying vs file filtering during packaging. 2017-02-22 08:45:35 +00:00
Chris Rankin
9b2b3a31a0 Comment how JediTerm is not available via Maven. 2017-02-21 17:45:45 +00:00
Chris Rankin
f20cb1e74d Downgrade JDK requirement to 8u102, for consistency with capsules. 2017-02-21 16:43:58 +00:00
Chris Rankin
22d2244ce7 CORPRIV-659: Fix DMG installer. 2017-02-21 15:38:22 +00:00
Chris Rankin
faefae01e2 Fix terminal resizing. 2017-02-21 12:32:47 +00:00
Chris Rankin
d69d9c6fde CORPRIV-661: Ensure that we can rewrite saved profiles correctly. 2017-02-21 11:10:27 +00:00
Chris Rankin
8624537d34 CORPRIV-658: Add external manifest for DemoBench.exe that declares it incapable of native HiDPI support. 2017-02-21 10:40:32 +00:00
Chris Rankin
9023778b07 CORPRIV-658: I've wasted enough time on this - Windows rejects this BMP 
as invalid, and I have no idea why!?
 2017-02-21 09:40:06 +00:00
Chris Rankin
d3e46d97b9 CORPRIV-659: Tweak post-image script for DMG. 2017-02-20 21:49:06 +00:00
Chris Rankin
09d3fb423d CORPRIV-659: Update installer script and icons for DMG. 2017-02-20 17:52:17 +00:00
Chris Rankin
a695ff0140 CORRIV-658: Add icon for Windows installer. 2017-02-20 17:37:06 +00:00
Chris Rankin
31843bbac8 CORPRIV-661: Refactor code for guaranteeing a .zip extension. 2017-02-20 15:49:13 +00:00
Chris Rankin
0f73b68d39 CORPRIV-661: Implement saving profiles. 2017-02-20 15:25:02 +00:00
Chris Rankin
ddd8d6a513 Upgrade to TornadoFX 1.6.2. 2017-02-20 09:13:02 +00:00
Ross Nicoll
ed093cdb9d Enforce separation of Party and AnonymousParty 2017-02-16 11:50:33 +00:00
Ross Nicoll
71babc7019 Remove use of full parties from contract states 2017-02-15 11:43:13 +00:00
Chris Rankin
38e57d6342 CORPRIV-661: Allow profiles to be loaded into DemoBench. 2017-02-14 17:14:54 +00:00
Chris Rankin
8621d47e09 CORPRIV-660: Display Web server's port number on launch button. 2017-02-13 15:13:47 +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
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
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
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
Chris Rankin
975bba0295 CORPRIV-665: Protect NodeTerminalView from being destroyed twice. 2017-02-09 17:14:49 +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
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
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
Chris Rankin
8946ef830e Ensure JavaPackager task finds custom resources on the classpath. 2017-02-08 23:09:48 +00:00
Chris Rankin
8b77068eb0 Initial javapackager task: currently builds RPMs. 2017-02-08 16:40:06 +00:00
Chris Rankin
d3cdb2af67 Force all chosen port numbers to be different. 2017-02-08 14:24:13 +00:00
Chris Rankin
f95b743426 Only allow the first node to run notary services. And validate port numbers more strongly. 2017-02-08 14:04:23 +00:00
Chris Rankin
c734fbf8bb Disable Node Explorer and Database Viewer buttons until the node has launched and is responding to RPC. 2017-02-08 12:16:35 +00:00
Chris Rankin
37aa486bd7 Ensure that Node Explorer can write into its working directory. 2017-02-07 20:18:56 +00:00
Chris Rankin
006fd98a51 Ensure a DemoBench installation is relocatable. 2017-02-07 19:38:25 +00:00
Chris Rankin
d57f7cd557 Simplify the configuration object. 2017-02-07 10:48:01 +00:00
Chris Rankin
7ea2dbdd77 Better usage of Paths vs File API. 2017-02-06 18:13:58 +00:00
Chris Rankin
455cdba5d9 Remove superfluous lamba parameter names. 2017-02-06 17:44:12 +00:00
Chris Rankin
ba5f4add18 Remove ".exe" from Java executable path, because Windows doesn't need it. 2017-02-06 17:10:52 +00:00
Gary Rowe
b1c5de1112 Fix the port numbers in the documentation to match actual values 2017-02-06 16:22:15 +00:00
Chris Rankin
4e7c12453c More changes from review. 2017-02-06 15:25:28 +00:00
Chris Rankin
62d911a478 First batch of code review changes. 2017-02-06 14:54:48 +00:00
Chris Rankin
297a7e6208 Add SLF4J binding for Log4J 2.x 2017-02-04 22:36:42 +00:00
Chris Rankin
8b5fe3bbf0 Fix DemoBench distribution target. 2017-02-04 16:23:51 +00:00
Chris Rankin
a0749e29ef Initial inclusion of Corda and BankOfCorda JARs in distribution. 2017-02-03 17:30:30 +00:00
Chris Rankin
6985ade241 Merge branch 'master' into demobench 2017-02-03 12:04:35 +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
Chris Rankin
534e8a01a2 Grant permissions to the Node's user, and install BanfOfCorda plugin for cash issuers. 2017-02-03 10:04:44 +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
Chris Rankin
8792e5e268 Merge branch 'master' into demobench 2017-02-02 14:16:20 +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
Chris Rankin
cd5dde70e0 Display simple statistics about the node on each tab. 2017-02-02 12:03:12 +00:00
Chris Rankin
51d02e1e45 Allow SLL configuration via command line parameters too. 2017-02-02 11:00:14 +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
Chris Rankin
6705c614a8 Fix SLF4J logging. 2017-02-01 10:21:04 +00:00
Chris Rankin
e99f21b78a Include issuer for CHF (Swiss Francs) 2017-02-01 10:03:01 +00:00
Chris Rankin
8c478ff7cc Simplify Kotlin objects. 2017-02-01 09:30:42 +00:00
Chris Rankin
f9ac03287c Create a capsule for Node Explorer, and allow login via command line parameters to bypass login screen. 2017-01-31 17:54:26 +00:00
Chris Rankin
30f9cc8fcd Implement launching "Node Explorer" for each node. 2017-01-31 17:36:15 +00:00
Shams Asari
646ce8afe0 FlowException thrown by a flow is propagated to all counterparties 2017-01-31 13:30:33 +00:00
Chris Rankin
c787561141 Configure Node and DemoBench to use same version of H2 database. 2017-01-31 11:42:58 +00:00
Chris Rankin
fc300130de Add cash and issuer services to DemoBench. 2017-01-31 11:10:56 +00:00
Chris Rankin
d43cf05d0b Include native artifacts in distribution. 2017-01-31 10:20:16 +00:00
Chris Rankin
0bdd8c23b6 Allow services to be loaded as a resources as well as a file. 2017-01-31 09:47:54 +00:00
Chris Rankin
10061107df Small tidy-up. 2017-01-30 14:17:58 +00:00
Chris Rankin
02323e8207 Launch DB viewer for node. 2017-01-30 13:57:43 +00:00
Chris Rankin
5ee7930a16 Allow configuration of extra network services. 2017-01-27 16:25:49 +00:00
Chris Rankin
118d5eb48f legalName field can be val. 2017-01-27 12:03:25 +00:00
Chris Rankin
c65b1a4363 Fix logging location of corda.jar 2017-01-27 12:01:34 +00:00
Chris Rankin
73e8a73714 Trim node name and nearest city values. 2017-01-27 11:55:34 +00:00
Chris Rankin
c670ed6bdd The first node now becomes the session's Network Map service used by all other nodes. Force nodes to be created one-by-one. 2017-01-27 11:36:46 +00:00
Chris Rankin
6e38c4a95d Write configuration parameters into node.conf, and then run corda.jar in its own directory. 2017-01-26 18:02:53 +00:00
Chris Rankin
0b40d732d4 Patch JediTerm to allow the application to shutdown cleanly. 2017-01-26 13:24:46 +00:00
Chris Rankin
0cd2bddff2 Update to Corda 0.8-SNAPSHOT 2017-01-26 10:45:48 +00:00
Chris Rankin
e452675c09 Merge branch 'master' into demobench 2017-01-26 10:42:50 +00:00
Chris Rankin
f2df9d36fa Merge remote-tracking branch 'corda-public/master' 2017-01-26 10:16:47 +00:00
Chris Rankin
cc1d3e0ccf Add initial form for configuring new nodes. 2017-01-26 09:55:45 +00:00
Chris Rankin
1bef874e27 Remove duplicate libpty native objects. 2017-01-24 14:25:04 +00:00
Chris Rankin
f2dd59ebd3 Refactor shutdown code, although AWT is still misbehaving. 2017-01-24 13:58:27 +00:00
Chris Rankin
55b5a5a393 Initial commit: Creating new tabs whenever the "Add Node" button is pressed. These tabs currently contain the bash shell only. 2017-01-24 09:42:13 +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
Patrick Kuo
9f5e6d3921 Added Certificate setting to the login screen (#172) 
* Added Certificate setting to the login screen, user can now specify certificates path and keystore/truststore password in the certificate setting screen.
 2017-01-20 17:16:55 +00:00
Mike Hearn
906dff1a35 Add basic spec for the demobench tool. 2017-01-18 15:14:02 +01: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
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
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
Andras Slemmer
a601f0abf5 Local RPC, demos use RPC, NODE has special privileges 2016-12-08 11:58:31 +00:00
Patrick Kuo
fbcbf3e1d7 Network view improvement (#19) 
Changes :
*Show other nodes on network map.
*Enabled zooming and panning on the map.
*Scroll the node label to the centre of the screen when clicking on the node info list on the right hand-side of the screen.
*Draw line and fire bullets between nodes according to incoming transactions.
*Higher resolution map.
 2016-12-07 09:55:16 +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
Patrick Kuo
fbf952a1ab Explorer corda branding 2016-11-24 15:46:50 +00:00
Patrick Kuo
c6cec0aa3d address PR comments 2016-11-23 13:36:55 +00:00
Patrick Kuo
80ce506b8a Readme.md, description for new screens, and updated screenshots 2016-11-23 13:36:38 +00:00
rick.parker
f68529d1fd Rename protocol to flow. 2016-11-22 17:17:14 +00:00
Andrius Dagys
64299591c3 Rename PublicKeyTree -> CompositeKey and unify terminology across documentation. 2016-11-21 14:47:19 +00:00
Patrick Kuo
af899a98f4 Explorer corda branding 2016-11-16 13:26:05 +00:00
Andras Slemmer
37ca651ace loadtest: Fix gradle com.r3corda -> net.corda 2016-11-16 11:16:42 +00:00
Andras Slemmer
07df9f17b3 loadtest: Add loadtest code 2016-11-15 17:21:26 +00:00
Andras Slemmer
dcd7a8a08a Address PR 465 comments 2016-11-15 16:51:07 +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
Patrick Kuo
86ea9f0082 Merged in pat-remove-explorer-version (pull request #448) 
remove version, group and quasar plugin from build.gradle
 2016-11-04 17:32:22 +00:00
Patrick Kuo
ddf27efc86 remove version, group and quasar plugin from build.gradle 2016-11-04 14:10:48 +00:00
Clinton Alexander
7e198e7cf3 Renamed contracts project to finance to better reflect the purpose of the project. 2016-11-04 13:35:25 +00:00
Patrick Kuo
7d465999d6 Merged in pat-explorer-move (pull request #443) 
move explorer to tools folder
 2016-11-04 11:44:16 +00:00
Patrick Kuo
3cd8562b3b move explorer to tools folder 2016-11-03 17:28:38 +00:00