Jose Coll
253a70f55e
Fixed bug in generateSpending whereby Issuer Ref was not being checked.
2016-11-01 16:12:19 +00:00
Mike Hearn
2744d8abaa
Tech white paper: new sections on the data model, identity lookups, attachments, dispute resolution, compound keys, timestamps.
2016-11-01 16:40:59 +01:00
Roger Willis
f7c3b95928
Merged in clint-cordform-nodeconf-fix (pull request #429 )
...
Fixed node config file being written to the wrong place in Cordformation templates.
2016-11-01 15:24:37 +00:00
Ross Nicoll
b4affcbc63
Merged in rnicoll-remove-fungible-asset-properties (pull request #408 )
...
Remove deposit and issuanceDef fields
2016-11-01 14:52:12 +00:00
Ross Nicoll
613a86c5d9
Remove deposit and issuanceDef fields
...
Remove deposit field from the FungibleAsset interface, and moved it into a fixed reference to
amount.token.issuer.
Remove issuanceDef field and replace it with amount.token.
2016-11-01 14:49:57 +00:00
Clinton Alexander
dea9d663ff
Fixed node config file being written to the wrong place in Cordformation templates.
2016-11-01 14:11:42 +00:00
Clinton Alexander
276683e053
Merged in clint-attachmentdemosample (pull request #421 )
...
Moved attachment demo to another repo. Added ApiUtils.
2016-11-01 11:54:59 +00:00
Clinton Alexander
7d08c0b068
Removed attachment demo.
...
Added ApiUtils - a library for managing api lifecycles with less boilerplate.
Added default values to http api and improved the api utils.
Fixed spacing and comments.
Removed withName and added a bad request response to handle error cases.
Replaced use of 400 error with a 404 and error message as per HTTP spec.
2016-11-01 11:53:49 +00:00
Roger Willis
1b2c1bd7c4
Merged in rg_permission_changes (pull request #428 )
...
Changing permission on scripts runnodes to uog+rx
2016-11-01 11:51:25 +00:00
Richard Green
c4ce05cc1c
Changing permission on scripts runnodes to uog+rx
2016-11-01 11:47:53 +00:00
Andras Slemmer
e5d210492b
Merged in aslemmer-fix-debian-localhost-bind (pull request #423 )
...
core: Bind client socket to getLocalHost explicitly, fixes #6
2016-11-01 10:04:28 +00:00
Andras Slemmer
3f36462053
core: Bind client socket to getLocalHost explicitly, fixes #6
2016-10-31 15:53:15 +00:00
Rick Parker
cd8abffafe
Merged in upgrade-h2-to-1.4 (pull request #422 )
...
Upgrade H2 to 1.4 to fix curious file corruption issue encountered by Patrick.
2016-10-31 11:27:40 +00:00
rick.parker
5898a15579
Upgrade H2 to 1.4 to fix curious file corruption issue encountered by Patrick.
2016-10-28 17:39:10 +01:00
Clinton Alexander
572249be17
Merged in clint-traderdemocordapp (pull request #418 )
...
Removed trader demo from Corda and added some HTTP utilities.
2016-10-28 12:47:51 +00:00
Clinton Alexander
c3533bac7d
Improved error reporting.
2016-10-28 13:46:43 +01:00
Clinton Alexander
c42983fcfc
Removed now unused resource file.
2016-10-28 13:46:43 +01:00
Clinton Alexander
fdbd67db5c
Added some more error logging to Node.
2016-10-28 13:46:43 +01:00
Clinton Alexander
7eeea97653
Added new test utilities for HTTP requests.
2016-10-28 13:46:43 +01:00
Clinton Alexander
39cbab9ce1
Removed trader demo integration test. Fixed the AttachmentDemo which had unnecessary coupling to the traderdemo. Added new test util func.
2016-10-28 13:46:43 +01:00
Clinton Alexander
c3ac4efa70
Removed trader demo.
2016-10-28 13:46:43 +01:00
Roger Willis
e9461cbd4d
Merged in rog-quickfix (pull request #420 )
...
Fixed typo in 'client/build.gradle'
2016-10-28 12:40:37 +00:00
RogerWillis
b3dc24d8b3
Fixed typo in 'client/build.gradle'
2016-10-28 13:33:36 +01:00
Jose Coll
bc525aabdf
FungibleAsset reverted back to original filename.
2016-10-27 16:21:05 +01:00
Jose Coll
f94c9f8239
Fixed failing Commercial Paper test.
2016-10-27 12:58:13 +01:00
Jose Coll
74e89181da
Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt
# node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt
Fixed conflict.
2016-10-27 12:57:37 +01:00
Jose Coll
7d080c39df
Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt
# node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt
Fixed failing CommercialPaper test
(caused by re-use of same database transaction context for vault across two different transaction participants)
2016-10-27 12:56:08 +01:00
Ross Nicoll
63b1e356ad
Merged in rnicoll-unique-identifier-comparable (pull request #414 )
...
Correct Comparable interface used for isOrderedAndUnique()
2016-10-25 13:32:15 +00:00
Ross Nicoll
65a03efc55
Correct Comparable interface used for isOrderedAndUnique()
2016-10-25 14:31:37 +01:00
Clinton Alexander
8f1329b03f
Merged in clint-capletnode (pull request #413 )
...
Moved the Corda Caplet to Node to clear out root src dir.
2016-10-25 09:37:32 +00:00
Clinton Alexander
e5db17b029
Rewrote comment to improve readability.
2016-10-25 10:01:52 +01:00
Clinton Alexander
ecd63500aa
Merged in clint-irscoresplit (pull request #415 )
...
Removed IRS Core code.
2016-10-24 17:38:49 +00:00
Clinton Alexander
af902ee4df
Removed redundant whitespace.
2016-10-24 18:36:19 +01:00
Clinton Alexander
0877c60c00
Reverted main file.
2016-10-24 17:58:49 +01:00
Clinton Alexander
c18ed4b402
ProtocolLogicFactory now initiated before it is used.
2016-10-24 17:56:16 +01:00
Clinton Alexander
f92f7d8d56
NodeSchedulerService no longer takes a default protocol logic ref factory (because otherwise no protocols are whitelisted) and instead now uses the one constructed in the node.
2016-10-24 17:56:16 +01:00
Clinton Alexander
546f3e2bbf
Removed dead plugin reference.
2016-10-24 17:56:16 +01:00
Clinton Alexander
2f5efb34d6
Removed the RatesFixProtocol and dependent code and moved to the IRS repo.
2016-10-24 17:56:16 +01:00
Clinton Alexander
2727d56b4a
Removed IRS specific code to new repo.
2016-10-24 17:56:16 +01:00
Clinton Alexander
a66d6b974e
Removed IRS contract.
2016-10-24 17:56:16 +01:00
Clinton Alexander
e3f5a96696
Fixed code that no longer compiled correctly.
2016-10-24 17:56:16 +01:00
Clinton Alexander
3ec6490d0a
Merged in clint-irsintegrationfix (pull request #412 )
...
Fixes the IRS integration tests in the IRS repo.
2016-10-24 16:53:46 +00:00
Clinton Alexander
b197a8fa66
Fixed comment on function definition.
2016-10-24 17:41:21 +01:00
Clinton Alexander
19a53ea12d
Added prerequisite for using the test clock.
2016-10-21 17:29:59 +01:00
Clinton Alexander
71e1c39622
Fixed type of useTestClock.
2016-10-21 16:42:00 +01:00
Clinton Alexander
8631a64c66
Moved capsule to node to remove it from src.
2016-10-21 14:17:05 +01:00
Clinton Alexander
8f326824f3
Test fix and review fix.
2016-10-21 12:09:21 +01:00
Clinton Alexander
6cd692776f
Compile error fix.
2016-10-21 11:32:29 +01:00
Clinton Alexander
cbb8aa74f9
Replaced clock object with clock class and added documentation.
2016-10-21 11:32:29 +01:00
Clinton Alexander
54e002f654
Clock now instantiates via reflection to allow demo clocks to be passed in.
2016-10-21 11:32:29 +01:00
