ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 13:08:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
1,446 Commits 91 Branches 405 Tags 354 MiB
21092e2bb6
Commit Graph

1446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Nesbit
21092e2bb6 Merged in mnesbit-cleanup-remove-clashingthreads (pull request #281) 
Mnesbit cleanup remove clashingthreads
 2016-08-19 16:05:50 +01:00
Matthew Nesbit
413060aa6d Don't use single line style for verify 2016-08-19 12:05:32 +01:00
Matthew Nesbit
696b9741dd Remove ClashingThreads exception by tightening up unique id on LinearState to be a secure random value, with constraints that it cannot be duplicated. Also, rename to linearId rather than the confusing thread. 
Try providing a helper interface to encourage enforcing LinearState rules

Fixup after rebase

Change to using Clauses for verifying LinearState standard properties

Fix whitespace change

Tidy up ClauseVerifier after PR comments

Change from SecureHash to a TradeIdentifier class

Change TradeIdentifier to UniqueIdentifier
 2016-08-19 11:52:16 +01:00
Mike Hearn
3f63aecf6c Merged in mike-upgrade-quasar (pull request #284) 
Upgrade Quasar to 0.7.6 and fix an exception handling bug in SMM that it revealed (if an exception was thrown immediately on protocol startup we let it leak instead of capturing it in the future.
 2016-08-18 18:26:39 +01:00
Mike Hearn
6adebd3fa8 Clarify exception handling in the SMM add method a bit. 2016-08-18 18:19:46 +01:00
Clinton Alexander
43625308fa Merged in clint-immutable-kryo-serialisers (pull request #274) 
Added immatuable serialisers to Kyro.
 2016-08-17 14:50:33 +01:00
Mike Hearn
db3aa1491c Upgrade Quasar to 0.7.6 and fix an exception handling bug in SMM that it revealed (if an exception was thrown immediately on protocol startup we let it leak instead of capturing it in the future. 2016-08-17 14:43:45 +01:00
Ross Nicoll
a9ec3c253e Merged in rnicoll-notify-tx (pull request #282) 
Add observable for transactions being stored
 2016-08-16 14:50:55 +01:00
Clinton Alexander
9496e18530 Merged in clint-driver-win-fix (pull request #285) 
Driver now correctly resolves quasar path on Windows.
 2016-08-16 14:27:18 +01:00
Clinton Alexander
77f5689468 Renamed variable for clarity. 2016-08-16 13:54:08 +01:00
Clinton Alexander
5d68210355 Driver now correctly resolves quasar path on Windows. 2016-08-16 13:26:38 +01:00
Andras Slemmer
9d9164980e Merged in andrius-driver-fix (pull request #280) 
DriverTest fix: get quasar.jar location from the classpath
 2016-08-15 17:31:02 +01:00
Clinton Alexander
c5a6d11976 Merged in clint-node-driver-conf-fix (pull request #275) 
Config will error earlier if the reference.conf file is missing.
 2016-08-15 15:53:50 +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
Mike Hearn
2bc757a8a7 Merged in mike-resolvetx-unit-tests (pull request #279) 
Add unit tests for the tx resolution protocol
 2016-08-12 17:18:57 +02:00
Mike Hearn
44aa32f70c Add some documentation on writing protocol unit tests. 2016-08-12 17:14:55 +02:00
Mike Hearn
3d391ec8c2 Add unit tests for the resolve transactions protocol 2016-08-12 17:14:54 +02:00
Mike Hearn
709fe096b3 Minor: add a rootCause property to Throwable 2016-08-12 17:13:41 +02:00
Mike Hearn
b8dc755926 Minor: a couple of small usability improvements to TransactionBuilder 2016-08-12 17:13:41 +02:00
Mike Hearn
c60c333ba9 Minor: add a utility to OpaqueBytes 2016-08-12 17:13:41 +02:00
Ross Nicoll
316917f271 Merged in rnicoll-tx-timestamp (pull request #271) 
Replace timestamp commands with a field on the transaction itself
 2016-08-12 15:59:49 +01:00
Ross Nicoll
8cfc88ed3a Remove unused timestamp from LCApplication 2016-08-12 15:51:04 +01:00
Ross Nicoll
a3d37a4d00 Require notary to be explicitely stated on each transaction 2016-08-12 15:51:04 +01:00
Ross Nicoll
a2dff5488f Add debugging information in case of missing signatures 2016-08-12 13:51:34 +01:00
Ross Nicoll
17ae349f4d Remove support for timestamp commands 2016-08-12 13:51:34 +01:00
Ross Nicoll
f0aa5a30d4 Deprecate existing timestamp infrastructure 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
Ross Nicoll
8346c58d4c Add observable for transactions being stored 
Add observable for transactions being stored, so the UI can show transactions as they're received, rather than being
limited to the summarised version available from the wallet service.
 2016-08-12 11:58:17 +01:00
Andrius Dagys
cd344058d2 Driver: get quasar.jar location from the classpath instead of a constructor parameter 2016-08-12 11:41:15 +01:00
Mike Hearn
8c7de8a69c Merged in corda-whitepaper (pull request #278) 
Add Corda Whitepaper to Documentation
 2016-08-11 18:01:12 +02:00
Ross Nicoll
84c6989b8b Merged in rnicoll-clause-cleanup (pull request #266) 
Clean up how clauses are implemented
 2016-08-11 15:51:02 +01:00
Ross Nicoll
162d19deeb Change how clause verification is called 
Change away from extending ClauseVerifier for contracts which support clauses, and explicitely call
clause verification code in the verify() function. This should make the flow of control easier to understand.
 2016-08-11 15:39:11 +01:00
richard
9e9f75b932 Added Corda Whitepaper 2016-08-11 13:57:41 +01:00
Mike Hearn
ac81d2aa32 Messaging layer improvements: 
- Fix thread safety issues in ArtemisMessagingClient. The Artemis API isn't thread safe, but that isn't well documented and it will happily invoke callbacks in parallel.
- Add discussion of how we tackle threading currently in the codebase and make a few other improvements.
- Add a shutdown hook so we stop properly when the user presses ctrl-c
 2016-08-11 14:16:05 +02:00
Clinton Alexander
475322b14f Config will error earlier if the reference.conf file is missing. 2016-08-10 17:22:20 +01: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
Clinton Alexander
10035860eb Added immatuable serialisers to Kyro. 2016-08-10 16:17:14 +01:00
Andras Slemmer
00b439802b node-driver: Write node.conf explicitly 2016-08-10 14:35:23 +01:00
Andras Slemmer
1b98c32579 Merged in node-driver (pull request #253) 
Node driver
 2016-08-10 14:21:16 +01:00
Clinton Alexander
ec693d37f6 Replaced remaining arrays with lists where possible. 2016-08-10 13:56:49 +01:00
Clinton Alexander
16182331f9 Replaced varargs with a list 2016-08-10 11:44:46 +01:00
Clinton Alexander
9fb8061ba4 Replaced array with list to fix comparisons. 2016-08-10 11:10:38 +01:00
sofusmortensen
2f7e05ee00 simpler syntax for rollout recursion parameters 2016-08-09 22:46:20 +02:00
Ross Nicoll
446e373722 Merged in rnicoll-wallet-monitor (pull request #254) 
Add WalletMonitorService
 2016-08-09 18:29:30 +01:00
Ross Nicoll
cf40e0db70 Add WalletMonitorService 2016-08-09 18:24:14 +01:00
Andrius Dagys
3e121f3930 Merged in andrius-cleanup (pull request #272) 
Clean up logging
 2016-08-09 17:36:38 +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
8bc3bdd430 Merged in cor-258-wallet-persistence (pull request #265) 
Basic wallet persistence to embedded H2 disk-backed database
 2016-08-09 16:48:03 +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