Commit Graph

644 Commits

Author SHA1 Message Date
Clinton Alexander
a8d73fb73f Caplet now filters for JAR files. 2016-08-24 16:40:43 +01:00
RogerWillis
dc60db5f69 waitForNodeStartup should now throw after 2 minutes rather than 20 seconds.
Some bank devs were finding integration tests failing as nodes had still not started.
2016-08-23 13:39:23 +01:00
Clinton Alexander
f6407b9e95 Caplet now loads plugins from plugins dir. 2016-08-22 16:22:37 +01:00
Clinton Alexander
c45aa9ffb1 Started capsule work. 2016-08-22 16:22:37 +01:00
Mike Hearn
a451000623 Merged in mike-fix-artemis-threading (pull request #276)
Messaging layer improvements
2016-08-12 19:07:54 +02:00
Ross Nicoll
a3d37a4d00 Require notary to be explicitely stated on each transaction 2016-08-12 15:51:04 +01:00
Ross Nicoll
17ae349f4d Remove support for timestamp commands 2016-08-12 13:51:34 +01:00
Mike Hearn
cba0427e01 Make ArtemisMessagingClient blocking and require the user to directly enter a message loop. This cleans up a few things and ensures we can't get caught out by messages being arbitrarily re-ordered as they pass through any Artemis thread pools. 2016-08-12 14:06:03 +02:00
Clinton Alexander
493f7f1fd1 Merged in clint-array-removal (pull request #273)
Replaced array with list where possible.
2016-08-10 16:17:38 +01:00
Andras Slemmer
1b98c32579 Merged in node-driver (pull request #253)
Node driver
2016-08-10 14:21:16 +01:00
Clinton Alexander
16182331f9 Replaced varargs with a list 2016-08-10 11:44:46 +01:00
Andrius Dagys
8386100677 Remove BriefLogFormatter as the formatting is now handled by Log4j configuration. Introduce LogHelpers which now handles the custom log level setting for specific loggers. 2016-08-09 17:31:27 +01:00
rick.parker
d883b3f134 First working hand-rolled persistent wallet
First working Exposed-assisted persistent wallet

Cleaned up Exposed-based persistent wallet

Cleaned up warnings

Fixed up some generic types

Improved comments

Fix up TODO comment

Hikari and config integration

Fix existing tests

Clean up after looking at PR

Clean up commented out lines

Fix initialisation of IRS demo leaving database open

Fix up after rebase

Review feedback.  Main change is lazy wallet iteration.

Rebased and incorporated config changes.

Use standardised config loading.  Make wallet cash test use persistent wallet.

Added test to ensure wallet retains state in database across instance creation.

Tidy up whitespace and fix bug in test.
2016-08-09 16:41:32 +01:00
Andras Slemmer
f20322136f Revert "Merged in node-driver (pull request #253)"
This reverts commit af893e0af5, reversing
changes made to 7357597501.
2016-08-09 16:19:18 +01:00
Andras Slemmer
303858c3e4 node: Use proper logging in Driver 2016-08-09 15:27:27 +01:00
Mike Hearn
87047c8996 Minor: fix various inspector warnings and delete some dead code. 2016-08-09 11:55:40 +02:00
Andrius Dagys
8d3a3197b9 Split up ArtemisMessagingService into ArtemisMessagingClient & ArtemisMessagingServer. If a Node is given a messagingServerAddress, it will only run a client and attempt to connect to the server at the provided address. By default, it will run both client & server locally 2016-08-05 14:02:32 +01:00
Clinton Alexander
b640524bf3 Merged in clint-auto-identity (pull request #261)
Identity service now updates with the network map.
2016-08-04 13:29:54 +01:00
Mike Hearn
ba05b90b8f Testing: change fillWithTestCash to issue cash under the DUMMY_CASH_ISSUER identity and adjust code that uses it. Introduce some code that'll prove useful later in WalletWithCashTest.
This change reduces the  testing confusion that can occur when cash is issued by one of the parties in a transaction rather than e.g. a neutral third party like a central bank.
2016-08-04 12:52:01 +02:00
Clinton Alexander
9ef1bf0355 Identity service now updates with the network map. 2016-08-02 17:08:46 +01:00
Mike Hearn
b40fee1512 Allow for easier conversion from Amount<Issued<T>> to Amount<T> and de-issuerify a few places. 2016-08-01 16:42:56 +02:00
Mike Hearn
0da057dbd8 Address review comments 2016-08-01 14:01:58 +02:00
Mike Hearn
97ad07be89 Fix progress rendering after the switch to log4j, as ANSIProgressRenderer had assumed JDK logging.
Also, start using colours and a more compact logging format in the default log4j config.
2016-08-01 13:07:48 +02:00
Ross Nicoll
cf4bb0c9af Break down topic into component parts
Break down what is referred to as "topic" of a message into its component parts. This splits the
general topic from the session ID, so it's clear where a session ID is provided, and whether any
given topic string includes a session ID or not.
2016-07-29 14:24:46 +01:00
Matthew Nesbit
a462bb1d6a Incorporate comments from PR 2016-07-28 16:30:53 +01:00
Matthew Nesbit
c57f265cce Fixup plugins to include static content property after rebase inclusive of that work 2016-07-28 13:55:06 +01:00
Matthew Nesbit
235497e0f4 Convert long lived services supporting protocol listeners to plugins 2016-07-28 13:39:12 +01:00
Clinton Alexander
5410f8b228 Merged in demowebui (pull request #230)
Added an IRS demo web interface
2016-07-28 13:19:32 +01:00
Clinton Alexander
bcbac345e8 Fixed display issue when using double digit months and days. 2016-07-28 11:37:10 +01:00
Clinton Alexander
250dbaa45d Renamed notional amount to notional. 2016-07-26 10:40:42 +01:00
Matthew Nesbit
e5777fd999 Fetch KeyStore passwords from NodeConfiguration 2016-07-26 10:35:57 +01:00
Clinton Alexander
d5ca4590d8 Improved styling. 2016-07-25 17:32:33 +01:00
Clinton Alexander
6aabdc49eb Removed rounded borders on top menu 2016-07-25 11:35:37 +01:00
Clinton Alexander
e7f4997b1b Improved styling further on all pages. 2016-07-25 11:32:35 +01:00
Clinton Alexander
df5dcc34f6 Improved homepage theming. 2016-07-25 11:23:43 +01:00
Clinton Alexander
fda2079611 Removed dead code. 2016-07-25 10:31:55 +01:00
Clinton Alexander
6505923a78 Merge branch 'demowebui' of https://bitbucket.org/R3-CEV/r3prototyping into demowebui 2016-07-25 10:30:49 +01:00
Clinton Alexander
93f4440c14 Moved IRS web folder up a level. Added support for static serving plugins. 2016-07-25 10:30:30 +01:00
Clinton Alexander
11afce9bbf Review fixes. 2016-07-22 12:44:42 +01:00
Clinton Alexander
88f4317606 Removed dead links 2016-07-20 11:51:00 +01:00
Clinton Alexander
3975ba7308 Correctly handling exceptions during future resolution in PUT deal endpoint. 2016-07-20 11:50:49 +01:00
Clinton Alexander
97c001dc61 Removed party view until some content is available for it. 2016-07-19 16:23:42 +01:00
Clinton Alexander
1f556839bd Fixed review issues and added a link to the official R3 favicon 2016-07-19 13:20:02 +01:00
Clinton Alexander
46b63fd967 Removed pointless conversion between timeunit and int. 2016-07-19 09:39:43 +01:00
Clinton Alexander
f167708af5 Review fixes. 2016-07-19 09:34:26 +01:00
Clinton Alexander
1e21dca4fc Review fix. 2016-07-19 09:31:04 +01:00
Clinton Alexander
969ec62858 Fixed review comments 2016-07-19 09:26:16 +01:00
Clinton Alexander
474e4be4ee Switched base currency to default to USD 2016-07-18 20:12:30 +01:00
Clinton Alexander
9d1d1b4f2c Defaults for models now more sensible. 2016-07-18 17:34:40 +01:00
Clinton Alexander
71d9709662 Added logging to static web server. 2016-07-18 16:43:09 +01:00
Clinton Alexander
912cccc5a4 Fixed case issues. 2016-07-18 16:36:46 +01:00
Clinton Alexander
55a8d776f6 Removed semantic UI library (added to bower instead) and added cache control. 2016-07-13 17:01:52 +01:00
Clinton Alexander
1155c1d8ad JSON can now be served by static server. 2016-07-13 15:16:35 +01:00
Clinton Alexander
4a1521f0e2 Demo content now served up by static service on the node. 2016-07-13 15:15:41 +01:00
Clinton Alexander
2a4136366a Moved files to the correct location for serving 2016-07-13 13:42:51 +01:00
Clinton Alexander
7633b904ec Continued to add static serving endpoint 2016-07-13 12:58:56 +01:00
Clinton Alexander
d41ae4528e Static endpoint 2016-07-13 11:44:21 +01:00
Matthew Nesbit
d07db80461 Repair broken RateFixDemo code and script 2016-07-13 11:28:54 +01:00
Matthew Nesbit
9d18234383 Consistently use an sl4j logger with timestamp, rather than console println within the node. Note that the current protocol events published via the ProgressTracker are sent to the console without a timestamp. 2016-07-13 11:28:52 +01:00
Mike Hearn
ead19c619a Merged in mike-cp-issuance-fix (pull request #224)
Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract.
2016-07-13 11:13:23 +02:00
Clinton Alexander
ea9d33d3e2 Moved the web demo into the resources directory in preparation for creating an endpoint. 2016-07-12 18:11:42 +01:00
Clinton Alexander
7765b04f0b Fixed index. 2016-07-12 18:08:25 +01:00
Clinton Alexander
bbfbce6656 Calendars now linked to currency. 2016-07-12 16:31:56 +01:00
Clinton Alexander
7e247a5fff Index is now tied to currency. 2016-07-12 16:28:38 +01:00
Clinton Alexander
b78995a8e4 Deals are now ordered by most recent first. 2016-07-12 16:21:54 +01:00
Clinton Alexander
20f5467e91 All fields now submit correctly. 2016-07-12 16:20:13 +01:00
Clinton Alexander
4628fe426c Moved viewmodels to viewmodel directory. Moved day count basis lookup to a directory and began using the lookup to generate view. 2016-07-12 16:03:54 +01:00
Andras Slemmer
53725af318 irsdemo: Add spaces in closure 2016-07-12 15:42:28 +01:00
Andras Slemmer
38af91dc48 irsdemo: add --help 2016-07-12 15:42:28 +01:00
Andras Slemmer
6da1a702bf irsdemo: Give descriptions of cli arguments 2016-07-12 15:42:28 +01:00
Andras Slemmer
144f88e0d0 irsdemo: Print more helpful error message when no role is specified (was NPE) 2016-07-12 15:42:28 +01:00
Andras Slemmer
4b962eeb1f irsdemo: Remove unused --fake-trade-with-address 2016-07-12 15:42:28 +01:00
Clinton Alexander
a8051e9413 Quick fix for dropdowns and moved deal into requirejs func. Moved day count lookup to a util. 2016-07-12 15:02:41 +01:00
Mike Hearn
f6789c93dd Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract.
This confusion was introduced by a previous refactoring.
2016-07-12 16:01:50 +02:00
Clinton Alexander
5d5d88e909 Payers now swap correctly. 2016-07-12 14:24:11 +01:00
Clinton Alexander
6de6696783 Replaced dimmers with modal to correct the submission loading visuals. 2016-07-12 12:43:37 +01:00
Clinton Alexander
65fac338ca Can now flip columns in deal creator. 2016-07-12 11:54:41 +01:00
Clinton Alexander
1f5da32458 Changed default day count basis. 2016-07-12 11:13:25 +01:00
Clinton Alexander
28c083c5f8 Added colours to the fixed and floating leg in create deal. 2016-07-12 11:12:01 +01:00
Clinton Alexander
b2d7630021 Improved and simplified UI further. 2016-07-12 11:07:25 +01:00
Clinton Alexander
1458c3ac1f Finished implementing view for create deal. 2016-07-12 10:27:36 +01:00
Andras Slemmer
d7cc34c9a5 all: Full stops in comments! 2016-07-11 17:58:53 +01:00
Mike Hearn
0a2f313d40 Minor: run IntelliJ 'code cleanup' 2016-07-11 18:15:28 +02:00
Clinton Alexander
6b165c562e Further simplified interface by removing the multi currency support. 2016-07-11 15:34:18 +01:00
Clinton Alexander
304b5ae40c Added colours to deals. Removed generated and derived fields from the create deal page. 2016-07-11 15:00:17 +01:00
Andras Slemmer
c3060c11c0 testdsl: Use and expose TransactionBuilder in TestTransactionDSLInterpreter 2016-07-11 14:25:27 +01:00
Clinton Alexander
5e47ba88d1 Removed more fields. Selects reintroduced. 2016-07-11 11:50:31 +01:00
Clinton Alexander
89e8708e76 Date change now works first time for changing a single day. 2016-07-11 10:19:40 +01:00
Clinton Alexander
914e6cf52c Fixed minor bug in the date changer. 2016-07-08 16:41:23 +01:00
Clinton Alexander
230e230448 Removed debugging code. 2016-07-08 16:41:23 +01:00
Clinton Alexander
a147385255 Refactored project to use require.js to separate out modules more cleanly. 2016-07-08 16:41:23 +01:00
Clinton Alexander
3a614478ba App now loads reliably. 2016-07-08 16:41:23 +01:00
Clinton Alexander
dc0658f56e App now loaded via requirejs. 2016-07-08 16:41:23 +01:00
Clinton Alexander
ef4273e0d0 Fixed rate now submitted correctly. 2016-07-08 16:41:23 +01:00
Clinton Alexander
742200d781 Fixed issues arising from API changes. 2016-07-08 16:41:23 +01:00
Clinton Alexander
f3e0a0c0be Fixed error in submitting the a new deal via web form. 2016-07-08 16:41:23 +01:00
Clinton Alexander
4c8045d4da Moved webdemo into more appropriate folder. 2016-07-08 16:41:23 +01:00
Clinton Alexander
7f8c3738b4 Improved the presentation of several fields. 2016-07-08 16:41:23 +01:00
Clinton Alexander
3172b19b68 Continued developing the view for the web demo. 2016-07-08 16:41:23 +01:00
Clinton Alexander
c1619c4b6c Fleshed out the create deal page. 2016-07-08 16:41:23 +01:00