ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-22 06:17:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
2,597 Commits 91 Branches 405 Tags 354 MiB
a601f0abf5
Commit Graph

567 Commits

Author SHA1 Message Date
Andrius Dagys
f4925c0fa9 Remove unnecessary TODO 2016-11-15 11:52:58 +00:00
Ross Nicoll
cf6a3050c3 Add sanity check on SignedTransaction.id 
Add sanity check on SignedTransaction.id when deserializing the wrapped transaction. This
check is already done when verifying signatures, this moves it up to an earlier step and
adds a more specific error message to aid diagnosis.
 2016-11-14 16:25:41 +00:00
Andrius Dagys
d00163e29d Stop using "legally-Identifiable" signatures for the notary protocol, as notary nodes will use their service identity to sign (and not the legal one). It also doesn't make sense to attach an identity on the signature if it's a group identity and the signer holds only 1 out of many keys. 2016-11-14 16:02:20 +00:00
Andrius Dagys
d855b10817 Nodes part of a group identity (e.g. notary) now advertise the whole group Party on the network. When sending a message to a group, a representative node advertising the group identity is first chosen (at random), and its legal identity is used for communication. Currently we assume that a single legal identity can't be advertised by more than one node (the PublicKeyTree of an identity is used for Artemis queue names and we need to do more work to properly map a single queue to multiple nodes) 2016-11-14 14:57:16 +00:00
Andrius Dagys
c33c55eb20 Replace PublicKey with PublicKeyTree in Party. A single entity can now be identified by more than one key. 2016-11-14 14:57:16 +00:00
Katarzyna Streich
79ecd03413 Add serialization without refrences to all leaves of transaction (for Merkle tree calculation). 2016-11-11 13:34:09 +00:00
Mike Hearn
0c7662d53a Fix up a move problem 2016-11-11 11:45:40 +01:00
Mike Hearn
ce99f354cb Rename com.r3corda -> net.corda 2016-11-10 17:14:24 +01:00
Katarzyna Streich
103817ec57 Add signing of transaction merkle root hash. 2016-11-08 17:41:32 +00:00
Katarzyna Streich
71965b0792 Add serialization workaround for HashMaps inside states. Fix tests. 2016-11-04 17:21:11 +00:00
Katarzyna Streich
023ba380a0 Style changes. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
a5dfaa255d Code cleanup, add comments and tests to reflect changes. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
e7cb47ecd0 Add cached Merkle tree structure to wire transaction and root hash as transaction id. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
6af7573955 Build Partial Merkle Tree as recursive data structure. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
cd59dfd2af Build Merkle Tree as a recursive data structure instead of heap like structure. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
6749555996 Change transaction filtering, remove sorting. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
a38e7e54a0 Minor style changes in tests. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
79fc47f0ec Add comments and minor changes. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
b31598b801 Change tests to reflect changes in code structure. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
e823e11e85 Change places in code where instead of transaction id hash is used. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
6b5ad92f9b Substitute WireTransaction id property getter with calculated merkle root. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
ea826988af Add leaves filtering and building trees with different leaves types. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
2ce21842f8 Add simple filtering and ordering of command leaves. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
7f6f1807b1 Code cleanup and add comments. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
0c573c76e2 Add simple partial tree building and verification tests (also on transactions). 2016-11-04 17:15:59 +00:00
Katarzyna Streich
930f6bbb24 Add initial test for testing Partial Merkle Tree building. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
b5fd359c0a Add Partial Merkle Tree verification. 
Not tested.
 2016-11-04 17:15:59 +00:00
Katarzyna Streich
e8bdfa5691 Build Partial Merkle Tree for filtered transactions. 2016-11-04 17:15:59 +00:00
Katarzyna Streich
1a8e47fcaa Filter, build and verify merklized transaction from a wire transaction. 
Initial structure for a merkleized transaction, with full Merkle tree building.
 2016-11-04 17:15:59 +00:00
Ross Nicoll
9d254bd924 Use UUID only for UniqueIdentifier equality 
The UniqueIdentifier class exists to ensure any external ID for a state is kept coupled to a
proper unique ID, however in doing so it requires both UUID and external ID to find linear head
states in the vault. This modifies the equality and hashing algorithms to use the UUID only,
so that lookup can be done without knowing the external ID.
 2016-11-04 16:16:43 +00:00
Shams Asari
bd89da458b Added nice extension methods for Path, which are more readable than the static methods from Files 2016-11-04 15:36:14 +00:00
Clinton Alexander
cf4b91d7c7 Removed redundant file. 2016-11-03 11:03:54 +00:00
Clinton Alexander
acaa9f82a5 Rewrote some documentation about the simm demo. Moved a util function to the main utils file. 2016-11-03 11:03:54 +00:00
Clinton Alexander
73a2215747 Added core changes and docs required for simm valuation demo. 2016-11-03 11:01:36 +00:00
Shams Asari
6d39b71bf9 Simple RPC access control, with a demo control on the cash RPCs 2016-11-03 10:46:25 +00:00
Jose Coll
1d25d23b73 Merge from master 2016-11-02 14:20:51 +00:00
Jose Coll
012dc9ec10 Merge branch 'master' into colljos-vault-code-clean-up-refactor 2016-11-02 11:20:21 +00:00
Jose Coll
a38b363e9d Fixed subtle bug in Cash Spending when processing for same Issuer with multiple refs. 2016-11-02 11:15:09 +00:00
Jose Coll
7e3c00c1ff Merged in colljos-pluginservicehub (pull request #427) 
Added PluginServiceHub for use by Corda plugin service extensions.
 2016-11-01 17:12:52 +00:00
Jose Coll
f415c497d9 Minor changes to address PR feedback and comments 2016-11-01 16:47:50 +00:00
Jose Coll
253a70f55e Fixed bug in generateSpending whereby Issuer Ref was not being checked. 2016-11-01 16:12:19 +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
Jose Coll
d9f0a161e4 Addressed comments in PR review. 2016-11-01 12:05:48 +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
Jose Coll
c5500caf98 Minor changes to address PR feedback and comments 2016-11-01 11:39:11 +00:00
Jose Coll
308d7c1df7 Added PluginServiceHub for use by Corda plugin service extensions. 2016-10-31 17:15:06 +00:00
Andras Slemmer
3f36462053 core: Bind client socket to getLocalHost explicitly, fixes #6 2016-10-31 15:53:15 +00:00
Jose Coll
2ce310050e Revert incorrect merge commit. 2016-10-28 10:28:15 +01:00
Jose Coll
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
Jose Coll
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
Jose Coll
504ec42720 Additional method on VaultService to retrieve notes for a transaction 2016-10-27 16:35:26 +01:00
Jose Coll
bc525aabdf FungibleAsset reverted back to original filename. 2016-10-27 16:21:05 +01:00
Jose Coll
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
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
65a03efc55 Correct Comparable interface used for isOrderedAndUnique() 2016-10-25 14:31:37 +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
Shams Asari
e2d6ace449 RPC client authentication using user/password from config file 2016-10-20 17:55:16 +01:00
Jose Coll
75f671a446 Decommissioned InMemoryVaultService service (all dependent Tests updated to use NodeVaultService) 2016-10-20 13:10:00 +01:00
Jose Coll
c7d98b8c6b Fixed items raised by MH in CRD-CR-58 code review. 2016-10-20 10:52:51 +01:00
Jose Coll
04920c9507 Additional method on VaultService to add notes to a transaction 2016-10-19 15:06:52 +01:00
Jose Coll
62dfea2a1a Re-factoring of OnLedgerAsset generateSpend code (moved to VaultService) 2016-10-17 17:58:26 +01:00
Patrick Kuo
3403d50168 Merged pat-cash-creation-ui into master 2016-10-17 16:10:53 +01:00
rick.parker
962fdba0f8 Make transaction -> statemachine id mapping persistent. 2016-10-17 11:33:29 +01:00
Patrick Kuo
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
Jose Coll
67b2d91b33 Re-factoring of CashBalances code (moved to VaultService) 2016-10-17 11:16:53 +01:00
rick.parker
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
Matthew Nesbit
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
Clinton Alexander
d85c82d505 Replaced maven plugin with the newer, simpler, maven-publish plugin and added an alias. 2016-10-11 13:05:46 +01:00
Matthew Nesbit
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
Shams Asari
ac01b67549 Using the protocol ID for the protocol logger name 2016-10-10 13:45:43 +01:00
Matthew Nesbit
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
Mike Hearn
0bcecac7f6 Merge branch 'master' of https://bitbucket.org/R3-CEV/r3prototyping 2016-10-07 11:11:54 +02:00
Mike Hearn
604aa05859 Minor: suppress useless warnings 2016-10-06 18:36:33 +02:00
Shams Asari
c3f824001d Removed unused ServiceRequestMessage class hierarchy and added sendRequest method 2016-10-06 10:27:35 +01:00
Ross Nicoll
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
Clinton Alexander
38ba8c8759 Merge branch 'clint-cordamaven' 2016-10-05 11:44:11 +01:00
rick.parker
ec975b0426 Hibernate ORM implementation for states. 2016-10-05 11:40:27 +01:00
Ross Nicoll
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
Shams Asari
6b97fbb79f Removed ValidatingClient as notary behaviour is not client configurable 2016-10-04 15:20:36 +01:00
Shams Asari
5e6533eb8a Better use of Futures 2016-10-04 14:11:43 +01:00
Andrius Dagys
62a9dfe900 Added ServiceInfo unit tests 2016-10-04 11:36:26 +01:00
Andrius Dagys
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
Ross Nicoll
607ba634fe Add filter composition for clauses 2016-10-04 10:32:13 +01:00
Shams Asari
67fdf9b2ff Automatic session management between two protocols, and removal of explict topics 2016-10-03 15:21:27 +01:00
Andrius Dagys
b3f3ee0562 Added a json serializer for PublicKeyTree 
Typo fixes, other minor refactorings
 2016-10-03 11:09:36 +01:00
Andrius Dagys
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
Clinton Alexander
3612bee6f7 Fixed a syntax error in gradle file. 2016-09-30 10:57:20 +01:00
Clinton Alexander
6a669b6aad Added a line that was accidentally removed. 2016-09-30 10:57:20 +01:00
Clinton Alexander
9a4cc04eb5 Moved source and javadoc publish tasks into a default publish tasks plugin. 2016-09-30 10:57:20 +01:00
Clinton Alexander
f13a21cc6c Can now publish corda to local repo with gradle publishToMavenLocal 2016-09-30 10:57:20 +01:00
Clinton Alexander
7afb034b8c Merged in clint-vegacorechanges (pull request #380) 
Corda Changes required for Vega
 2016-09-28 16:28:15 +01:00
Clinton Alexander
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
Andras Slemmer
5b10c207e0 Add StateMachine -> Recorded TX mapping stream and emit events on transaction records 2016-09-28 11:46:37 +01:00
Andras Slemmer
6c96517f6f core, node: Add RPC calls, change RPC init order 2016-09-28 10:32:22 +01:00
Andras Slemmer
7e7bf08062 Rename stateMachineRunId properties to id, remove unused fiberId 2016-09-26 10:40:18 +01:00
Andras Slemmer
cfa5878ea2 Add StateMachineRunId, type for SMM Changes 2016-09-26 10:40:18 +01:00
Matthew Nesbit
a964073c2f Track message id's to deduplicate replays. Widen the auto-acknowledgement window of Artemis back to the default. 
Use synchronized wrapper over set.

Drop discard message to trace level logging.

Fix code layout

Use lazy trace extension method

Track message id's to deduplicate replays. Widen the auto-acknowledgement window of Artemis back to the default.

Use synchronized wrapper over set.

Include tx message unique id in checkpointed data.

Add test for checkpointed resend

Fix bug in not getting UUID off message.

Tidy formatting

Add explanation comments to test asserts

Put unique id even on Client messages.

Tidy formatting
 2016-09-26 10:12:50 +01:00
Andrius Dagys
ac57c5cf86 Merged andrius-crypto-refactor into master 2016-09-22 18:07:31 +01:00