Andras Slemmer
9930e8d5c7
core: add net.i2p.crypto:eddsa dependency
2016-06-16 17:03:44 +01:00
Rick Parker
512e304bf1
Merged in remove-commented-out-resolve-tx-proto (pull request #156 )
...
Remove commented out ResolveTransactionsProtocol call as it is not required
2016-06-16 16:19:03 +01:00
Ross Nicoll
b689f2a139
Merged in rnicoll-amount-issuer (pull request #126 )
...
Add issuer to cash amounts
2016-06-16 15:47:56 +01:00
Ross Nicoll
ad72f3e48f
Add issuer to cash amounts
...
Add issuer of a cash when referring to amounts of cash (except for the very few cases where
the issuer is not important, such as when referring to aggregated totals across a set of
issuers). Replaces CommonCashState with TokenDefinition, as a more accurate reflection of
what the class represents.
2016-06-16 15:05:49 +01:00
Ross Nicoll
d6a79b7bae
Minor: Pass reference into fillWithSomeTestCash()
...
Reference is now a parameter to fillWithSomeTestCash() so that the caller can be
clear on the reference to use.
2016-06-16 15:04:33 +01:00
Ross Nicoll
eae3efdf02
Minor: Edit reference after copying amount
...
Edit reference after copying amount in cash tests, so that when the amount includes
a reference, the copying doesn't replace the changed reference.
2016-06-16 15:04:33 +01:00
Mike Hearn
77b3f3968e
Merged in mike-kms-has-identity-key (pull request #155 )
...
Place the long term identity key into the KMS for now. This will all change later.
2016-06-16 14:33:39 +02:00
rick.parker
cae39332bf
Remove commented out ResolveTransactionsProtocol call as it is not required
2016-06-16 13:15:37 +01:00
Mike Hearn
aa0a68ba36
Merged in rnicoll-docs-rebuild (pull request #153 )
...
Rebuild documentation
2016-06-16 13:14:50 +02:00
Mike Hearn
7d09a09070
Place the long term identity key into the KMS for now. This will all change later.
2016-06-16 13:01:53 +02:00
Shams Asari
860353c4d4
Initial checkpoint when protocol is first added
2016-06-16 09:54:49 +01:00
Rick Parker
eb4c24abcb
Merged in kotlin-codestyle-properties (pull request #146 )
...
Code style changes for properties
2016-06-16 09:44:27 +01:00
rick.parker
72842eaaf4
Code style changes for properties
2016-06-16 09:43:33 +01:00
Ross Nicoll
2fed96cad0
Rebuild documentation
2016-06-15 17:10:43 +01:00
Ross Nicoll
f9c1f31730
Merged in rnicoll-transaction-graph-search (pull request #149 )
...
Add tests for TransactionGraphSearch
2016-06-15 16:22:23 +01:00
Ross Nicoll
f831ffdf3d
Add tests for TransactionGraphSearch
2016-06-15 16:21:53 +01:00
Rick Parker
07153578f0
Merged in fix-clockutils-suspendable (pull request #150 )
...
node: add missing @Suspendable
2016-06-15 16:05:10 +01:00
Andras Slemmer
3d109252f5
node: add missing @Suspendable
2016-06-15 15:16:08 +01:00
Clinton Alexander
8aa6fa156a
Merged in removecrowdfundcontract (pull request #147 )
...
Removed the CrowdFund contract since it is written in a style that is not typical of Corda contracts.
2016-06-15 14:53:47 +01:00
Rick Parker
cba76bb0f4
Merged in quasarScan-warning-fix (pull request #143 )
...
Remove quasar scan related warnings of suspendable supers outside our project (in kotlin stdlib).
2016-06-15 14:31:43 +01:00
rick.parker
b595b23ed7
Remove quasar scan related warnings of suspendable supers outside our project (in kotlin stdlib).
...
Suppressed two compiler warnings related to unused variables (seems to be compiler bug)
2016-06-15 14:30:00 +01:00
Clinton Alexander
7e15445ee9
Removed the CrowdFund contract since it is written in a style that is not typical of Corda contracts.
2016-06-15 12:32:36 +01:00
Shams Asari
853bc683f8
Simplify last checkpoint removal race condition fix
2016-06-15 10:01:33 +01:00
Shams Asari
aa153be6f0
moved methods in ChildrenProgressTrackers into ProgressTracker
2016-06-14 16:42:42 +01:00
Richard Green
fdd8446b29
Merged in rg_todo_irs_676 (pull request #140 )
...
Two TODOs in IRS - about calculating the actual payment date as an offset
2016-06-14 16:37:06 +01:00
Richard Green
3ab3955213
.
2016-06-14 11:57:55 +01:00
Richard Green
2ce0dce0aa
.
2016-06-14 11:28:58 +01:00
Richard Green
86203709c0
Payment dates now are calculated as an offset to the period end date
2016-06-13 19:00:27 +01:00
Ross Nicoll
a25b69aa8e
Merged in rnicoll-library-docs (pull request #130 )
...
Add documentation of transaction data types
2016-06-13 18:22:39 +01:00
Andras Slemmer
71cbea46e3
Merged in R3-CEV/internal/simulation-changes (pull request #137 )
...
Simulation changes
2016-06-13 18:10:01 +01:00
Andras Slemmer
56821c3a24
node: rename _networkMapRegistrationSettableFuture to _networkMapRegistrationFuture
2016-06-13 18:09:38 +01:00
Andras Slemmer
16465ba475
node: prefix private field with '_', use get() =
2016-06-13 18:09:38 +01:00
Andras Slemmer
50cd3c938a
node: hide writable networkMapRegistrationSettableFuture
2016-06-13 18:09:38 +01:00
Andras Slemmer
0dda3b2473
node: wait for last checkpoint remove before completing state machine future, fixes race in TwoPartyTradeProtocolTests
2016-06-13 18:09:38 +01:00
Andras Slemmer
fe83e41f52
node: use star projection instead of useless transform to hide type param
2016-06-13 18:09:38 +01:00
Andras Slemmer
5525487169
node: remove debug println
2016-06-13 18:09:38 +01:00
Andras Slemmer
3bf95429e9
node: change InMemoryMessagingNetwork so that the exposed allMessages stream is in sync with iterate()
2016-06-13 18:09:38 +01:00
Andras Slemmer
53bd5c2287
node: make AbstractNode's networkMapRegistrationFuture non-nullable
2016-06-13 18:09:38 +01:00
Ross Nicoll
76a5328e4b
Replace TokenDefinition with Issued
2016-06-13 17:39:42 +01:00
Ross Nicoll
a96a05d857
Add note about party type being likely to change
2016-06-13 17:38:18 +01:00
Ross Nicoll
92b25af092
Clarified contents of WireTransaction
2016-06-13 17:38:18 +01:00
Ross Nicoll
14463266db
Add definition of state interfaces
2016-06-13 17:38:18 +01:00
Ross Nicoll
4b39ab0357
Clear up wording around how the FungibleAsset superclass is used
...
Clear up wording around how the FungibleAsset superclass is used, and in particular
that it contains contract code, but provides an interface that should be extended by
subclass state objects.
2016-06-13 17:38:18 +01:00
Ross Nicoll
8d1ac66787
Remove Business Calendar header
2016-06-13 17:38:18 +01:00
Ross Nicoll
874892df93
Move fungible definition up the document
2016-06-13 17:38:18 +01:00
Ross Nicoll
fc3bc163aa
Tweak wording (state -> states)
2016-06-13 17:38:18 +01:00
Ross Nicoll
9cdcaaa606
Add documentation of transaction data types
2016-06-13 17:38:18 +01:00
Richard Green
8ea8ec435e
Merged in rg_todo_irs_utils_41 (pull request #138 )
...
Change to the comments that we have discussed the possibility of allowing code such as 0.1.percent
2016-06-13 16:25:43 +01:00
Richard Green
12f3e4802c
Change to the comments that we have discussed the possibility of allowing code such as 0.1.percent
2016-06-13 16:24:49 +01:00
Rick Parker
58d5162782
Merged in cor-133-observable-wallet (pull request #135 )
...
Pull out Wallet observable into it's own branch
2016-06-10 17:18:46 +01:00
