Commit Graph

10515 Commits

Author SHA1 Message Date
sofusmortensen
e5dbf5d2a8 WireTransaction deserialization using AttachmentStorage 2016-03-24 12:06:41 +00:00
sofusmortensen
1344bfd6bb Replaced programRef in ContractState with a simple reference to contract 2016-03-23 17:51:14 +00:00
Richard Green
c450c70f9a Merged in calendar-name-parameter (pull request #43)
Field name request from client
2016-03-23 17:08:30 +00:00
Mike Hearn
e21f61ff10 Minor: add toString methods to progress tracker objects 2016-03-23 16:53:29 +00:00
Mike Hearn
5b7fb86b6b Use TypeSafe Config library instead of Java properties files for the config file format. The default formats are compatible so this should not be disruptive. 2016-03-23 16:49:28 +00:00
rick.parker
a0780c84a7 Made calendars property a string array rather than just string 2016-03-23 13:42:52 +00:00
Richard Green
4167b044a1 Field name request from client 2016-03-23 12:17:30 +00:00
rick.parker
9f7ae4c61d Basic JSON API with servertime call exposed at GET /api/servertime
Global Clock as part of ServiceHub to offer source of time in transactions, protocols, time stamping service etc (can be replace for demos and testing with a Clock that can be externally manipulated)

Edited with Mike's feedback

Edited with Mike's feedback
2016-03-23 09:34:45 +00:00
sofusmortensen
e6ce1e5b76 Fixed unit test with contracts.isolated.jar in classpath when running from IDEA. 2016-03-22 14:48:59 +00:00
sofusmortensen
5d5bcbfb00 Merge branch 'master' into dynamic-loading 2016-03-22 13:37:33 +00:00
sofusmortensen
527b0f4817 Improved unit tests.
Cleaned up project structure a bit.
2016-03-22 12:15:47 +00:00
Richard Green
a0d474f270 Merged in tenor-fixes (pull request #41)
Updated Tenor class, Changed interest rate example to use this class.
2016-03-22 11:47:29 +00:00
Richard Green
6c0e696107 Updated with new Tenor class that verifies string during construction.
Now uses new Tenor class for Interest Rate Oracle
2016-03-22 11:46:06 +00:00
Richard Green
d7d05a2f70 Merged in PLT-15-b (pull request #36)
Neater branch with IRS code.
2016-03-22 11:42:08 +00:00
Richard Green
a78c5b11d1 IRS Contract example 2016-03-22 11:36:40 +00:00
Mike Hearn
b1694e2d0d Move MockNode/InMemoryNetwork to the main sourceset, as these are useful not only for unit testing, but also simulation tools. 2016-03-22 10:54:35 +00:00
Mike Hearn
621c88b93a IJ 2016.1 2016-03-22 10:54:35 +00:00
Mike Hearn
8305304b95 Regen docsite 2016-03-21 16:54:20 +00:00
Mike Hearn
a624ef7ff5 Merge branch 'master' of https://bitbucket.org/R3-CEV/r3prototyping 2016-03-21 16:35:46 +00:00
Mike Hearn
b309de8fb0 Mention the docs website from the README. 2016-03-21 16:35:35 +00:00
vibhu_r3cev
304e682aea Merged in traderdemo_fix3 (pull request #39)
Script now runs latest source code
2016-03-21 10:11:55 +00:00
sofusmortensen
3675675277 Custom ClassLoader created from collection of attachments 2016-03-20 20:41:46 +01:00
Sofus Mortensen
2a72f38076 Merged master into dynamic-loading 2016-03-19 19:08:49 +01:00
Vibhu Mohindra
8a60541ee3 Script now runs latest source code 2016-03-18 18:29:06 +00:00
Mike Hearn
23ba38afea Merged in setup_fix (pull request #38)
Fixed incorrect git repository URL.
2016-03-18 17:48:31 +01:00
Vibhu Mohindra
5fa1634175 Fixed incorrect git repository URL. 2016-03-18 15:46:54 +00:00
Richard Green
80af936a82 Merge branch 'master' of bitbucket.org:R3-CEV/r3prototyping 2016-03-18 13:45:38 +00:00
Richard Green
5e3ff4238f Cosmetic change to Amount to display decimal places 2016-03-18 13:45:22 +00:00
Mike Hearn
7ef8397920 Use new Quasar API to skip serialisation of TLS slots. 2016-03-17 16:53:01 +01:00
Mike Hearn
3c4ce0a8fe Minor: fix a regression introduced by a bad merge that broke the rate fix demo 2016-03-17 13:07:19 +01:00
Mike Hearn
9b102f3f17 Minor: .gitignore the rate-fix-demo-data directory 2016-03-17 13:05:24 +01:00
Mike Hearn
9dbb575b51 Kotlin 1.0.1 2016-03-17 13:04:54 +01:00
Mike Hearn
5161b2b085 Minor: style fixes 2016-03-15 19:43:37 +01:00
Richard Green
8ab5efe4a7 Quick fix for previous merge; missed fixing the tests for NodeInterestRates when the String.d function renamed to .bd 2016-03-15 18:42:59 +00:00
Richard Green
8bc137dbbc Merged in finance-utilities (pull request #33)
First checkin of some utility functions / classes / enums that will assist in the writing of some financial products
2016-03-15 18:24:27 +00:00
Richard Green
966724f941 Utility functions / classes / enums that will assist in the writing of some financial products 2016-03-15 18:22:36 +00:00
Mike Hearn
5bc50eecf9 Merged in persistence4 (pull request #35)
Unified the various StorageService implementations. Made getMap() private. Made the nested tables into instance variables. Moved StorageServiceImpl out into its own file to avoid merge conflicts in the future.
2016-03-15 18:10:25 +01:00
Vibhu Mohindra
11d14001cd Unified the various StorageService implementations. Made getMap() private. Made the nested tables into instance variables. Moved StorageServiceImpl out into its own file to avoid merge conflicts in the future. 2016-03-15 17:08:28 +00:00
Mike Hearn
473e4e527e Regen docs 2016-03-15 17:13:01 +01:00
Mike Hearn
bc5f29c5ee Regen docsite 2016-03-14 16:57:36 +01:00
Mike Hearn
d664ecf891 Merged in oracle-docs (pull request #31)
Docs: remove roadmap, add a new doc page on oracles.
2016-03-14 16:41:52 +01:00
Mike Hearn
77fd6071a1 Merged in jmx-mbeans (pull request #32)
Export various ledger stats via JMX
2016-03-11 18:27:12 +01:00
Mike Hearn
3533e87953 Take out the fake signing delay in the trader demo. 2016-03-11 18:12:18 +01:00
Mike Hearn
07eee0233f Export wallet balances via JMX. 2016-03-11 17:55:03 +01:00
Mike Hearn
28869ad85d Export attachment count via JMX 2016-03-11 17:26:17 +01:00
Mike Hearn
730b7949ea Export stats to JMX from the state machine manager. 2016-03-11 17:26:17 +01:00
Mike Hearn
139bf1e450 Minor: fix trader demo 2016-03-11 17:02:35 +01:00
Mike Hearn
07f925a9f7 Docs: remove roadmap, add a new doc page on oracles. 2016-03-11 13:42:11 +01:00
Mike Hearn
dd6208ef25 Docs: fix font size issue that's visible now I got myself a bigger monitor and changed the default font size in my browser 2016-03-11 13:41:42 +01:00
Sofus Mortensen
fb20250726 Merged master into dynamic-loading 2016-03-11 12:12:23 +01:00