3f36462053
core: Bind client socket to getLocalHost explicitly, fixes #6
2016-10-31 15:53:15 +00:00
2ce310050e
Revert incorrect merge commit.
2016-10-28 10:28:15 +01:00
b46de0b964
Merge remote-tracking branch 'origin/colljos-vault-transaction-notes' into colljos-vault-transaction-notes
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/node/services/Services.kt
# core/src/main/kotlin/com/r3corda/core/testing/InMemoryVaultService.kt
# node/src/main/kotlin/com/r3corda/node/services/vault/NodeVaultService.kt
2016-10-28 09:59:58 +01:00
369214a747
Additional method on VaultService to add notes to a transaction
...
Additional method on VaultService to retrieve notes for a transaction
2016-10-28 09:57:33 +01:00
504ec42720
Additional method on VaultService to retrieve notes for a transaction
2016-10-27 16:35:26 +01:00
bc525aabdf
FungibleAsset reverted back to original filename.
2016-10-27 16:21:05 +01:00
f2e98ffba5
Merge branches 'colljos-vault-transaction-notes' and 'master' of https://bitbucket.org/R3-CEV/r3prototyping into colljos-vault-transaction-notes
2016-10-27 14:59:37 +01:00
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
65a03efc55
Correct Comparable interface used for isOrderedAndUnique()
2016-10-25 14:31:37 +01:00
2f5efb34d6
Removed the RatesFixProtocol and dependent code and moved to the IRS repo.
2016-10-24 17:56:16 +01:00
2727d56b4a
Removed IRS specific code to new repo.
2016-10-24 17:56:16 +01:00
e2d6ace449
RPC client authentication using user/password from config file
2016-10-20 17:55:16 +01:00
75f671a446
Decommissioned InMemoryVaultService service (all dependent Tests updated to use NodeVaultService)
2016-10-20 13:10:00 +01:00
c7d98b8c6b
Fixed items raised by MH in CRD-CR-58 code review.
2016-10-20 10:52:51 +01:00
04920c9507
Additional method on VaultService to add notes to a transaction
2016-10-19 15:06:52 +01:00
62dfea2a1a
Re-factoring of OnLedgerAsset generateSpend code (moved to VaultService)
2016-10-17 17:58:26 +01:00
3403d50168
Merged pat-cash-creation-ui into master
2016-10-17 16:10:53 +01:00
962fdba0f8
Make transaction -> statemachine id mapping persistent.
2016-10-17 11:33:29 +01:00
d4362fbd78
New counterparty model and subscription mechanism to retrieve and track counterparty changes in network map
...
New transaction creation screen for creating new cash transactions, using party info source from the counterparty model.
2016-10-17 11:25:20 +01:00
67b2d91b33
Re-factoring of CashBalances code (moved to VaultService)
2016-10-17 11:16:53 +01:00
02a9f8fe67
Remove SAME_THREAD executor and it's use in MockNetwork etc.
...
Remove all traces of unused optional Executor in messaging.
2016-10-12 12:02:28 +01:00
1f3b1f4df9
Transactions in database
...
Include basic unit tests of Transaction storage
Use Rick's column storage code as suggested in PR comments
Remove blank line
2016-10-11 17:49:15 +01:00
d85c82d505
Replaced maven plugin with the newer, simpler, maven-publish plugin and added an alias.
2016-10-11 13:05:46 +01:00
1388454396
Never send transactions to the Notary that aren't signed by all parties. Toughen up to use validating Notary in general and put Client precheck into NotaryProtocol.
...
Rename method to better reflect its actions
Handle comments from PR
Correct indentation
2016-10-11 10:43:40 +01:00
ac01b67549
Using the protocol ID for the protocol logger name
2016-10-10 13:45:43 +01:00
1e836edd78
Change ServiceType to a sealed class from an abstract class
...
Allow AdvertisedServices to have their own identity and keys. Also, rationalise legalIdentity onto the local node's NodeInfo which is available on ServiceHub
Fixup after rebase
Remove legal identity that was on storage service. Now access via myInfo.legalIdentity and key via keyManagement lookup.
Enforce singleton notary per node for now
Tidy up based upon Rick's suggestions
Handle PR comments
clean up imports
Fix typo
Fixup rename
Capitalise comment
Eliminate unused variable warning
Make changes based upon PR comments
Cleanup whitespace changes
2016-10-07 13:44:51 +01:00
0bcecac7f6
Merge branch 'master' of https://bitbucket.org/R3-CEV/r3prototyping
2016-10-07 11:11:54 +02:00
604aa05859
Minor: suppress useless warnings
2016-10-06 18:36:33 +02:00
c3f824001d
Removed unused ServiceRequestMessage class hierarchy and added sendRequest method
2016-10-06 10:27:35 +01:00
f98abd4700
Simplify results from notary protocol
...
Restructure the Result class used in the notary protocol to use a sealed class, so that it's impossible for it
to be empty, removing that error case from the checks.
2016-10-05 14:33:02 +01:00
38ba8c8759
Merge branch 'clint-cordamaven'
2016-10-05 11:44:11 +01:00
ec975b0426
Hibernate ORM implementation for states.
2016-10-05 11:40:27 +01:00
4099034791
Add receivable contract for Trade Finance Registry
...
This introduces the core of a receivable contract for the second stage Trade Finance Registry project.
This is a subset of the cope of the initial Trade Finance project, which focuses on managing
invoices/receivables only, and does not deal with the contents of the invoice yet.
2016-10-04 15:47:38 +01:00
6b97fbb79f
Removed ValidatingClient as notary behaviour is not client configurable
2016-10-04 15:20:36 +01:00
5e6533eb8a
Better use of Futures
2016-10-04 14:11:43 +01:00
62a9dfe900
Added ServiceInfo unit tests
2016-10-04 11:36:26 +01:00
5efa0fd5b3
Advertised services now contain ServiceInfo which describes ServiceType and a service identifier. This will be used, e.g. for grouping distributed notary nodes into the same service cluster.
2016-10-04 11:36:26 +01:00
607ba634fe
Add filter composition for clauses
2016-10-04 10:32:13 +01:00
67fdf9b2ff
Automatic session management between two protocols, and removal of explict topics
2016-10-03 15:21:27 +01:00
b3f3ee0562
Added a json serializer for PublicKeyTree
...
Typo fixes, other minor refactorings
2016-10-03 11:09:36 +01:00
ecb1acdb8d
Add threshold signature support: introduce PublicKeyTree which allows composing public keys into a tree structure with nodes containing thresholds for how many child node signatures it requires.
2016-10-03 11:09:36 +01:00
3612bee6f7
Fixed a syntax error in gradle file.
2016-09-30 10:57:20 +01:00
6a669b6aad
Added a line that was accidentally removed.
2016-09-30 10:57:20 +01:00
9a4cc04eb5
Moved source and javadoc publish tasks into a default publish tasks plugin.
2016-09-30 10:57:20 +01:00
f13a21cc6c
Can now publish corda to local repo with gradle publishToMavenLocal
2016-09-30 10:57:20 +01:00
7afb034b8c
Merged in clint-vegacorechanges (pull request #380 )
...
Corda Changes required for Vega
2016-09-28 16:28:15 +01:00
43de27c4c1
Updated Corda in preparation for the merging of the Vega cordapp. Includes
...
some minor changes, including gitignore rule changes. The largest change
is replacing the current fresh key for each transaction with a single
static identity in preparation for aimproved and more fleshed out key
sharing infrastructure.
2016-09-28 14:39:41 +01:00
5b10c207e0
Add StateMachine -> Recorded TX mapping stream and emit events on transaction records
2016-09-28 11:46:37 +01:00
6c96517f6f
core, node: Add RPC calls, change RPC init order
2016-09-28 10:32:22 +01:00
7e7bf08062
Rename stateMachineRunId properties to id, remove unused fiberId
2016-09-26 10:40:18 +01:00
