Commit Graph

1109 Commits

Author SHA1 Message Date
103817ec57 Add signing of transaction merkle root hash. 2016-11-08 17:41:32 +00:00
71965b0792 Add serialization workaround for HashMaps inside states. Fix tests. 2016-11-04 17:21:11 +00:00
023ba380a0 Style changes. 2016-11-04 17:15:59 +00:00
a5dfaa255d Code cleanup, add comments and tests to reflect changes. 2016-11-04 17:15:59 +00:00
e7cb47ecd0 Add cached Merkle tree structure to wire transaction and root hash as transaction id. 2016-11-04 17:15:59 +00:00
6af7573955 Build Partial Merkle Tree as recursive data structure. 2016-11-04 17:15:59 +00:00
cd59dfd2af Build Merkle Tree as a recursive data structure instead of heap like structure. 2016-11-04 17:15:59 +00:00
6749555996 Change transaction filtering, remove sorting. 2016-11-04 17:15:59 +00:00
a38e7e54a0 Minor style changes in tests. 2016-11-04 17:15:59 +00:00
79fc47f0ec Add comments and minor changes. 2016-11-04 17:15:59 +00:00
b31598b801 Change tests to reflect changes in code structure. 2016-11-04 17:15:59 +00:00
e823e11e85 Change places in code where instead of transaction id hash is used. 2016-11-04 17:15:59 +00:00
6b5ad92f9b Substitute WireTransaction id property getter with calculated merkle root. 2016-11-04 17:15:59 +00:00
ea826988af Add leaves filtering and building trees with different leaves types. 2016-11-04 17:15:59 +00:00
2ce21842f8 Add simple filtering and ordering of command leaves. 2016-11-04 17:15:59 +00:00
7f6f1807b1 Code cleanup and add comments. 2016-11-04 17:15:59 +00:00
0c573c76e2 Add simple partial tree building and verification tests (also on transactions). 2016-11-04 17:15:59 +00:00
930f6bbb24 Add initial test for testing Partial Merkle Tree building. 2016-11-04 17:15:59 +00:00
b5fd359c0a Add Partial Merkle Tree verification.
Not tested.
2016-11-04 17:15:59 +00:00
e8bdfa5691 Build Partial Merkle Tree for filtered transactions. 2016-11-04 17:15:59 +00:00
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
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
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
cf4b91d7c7 Removed redundant file. 2016-11-03 11:03:54 +00:00
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
73a2215747 Added core changes and docs required for simm valuation demo. 2016-11-03 11:01:36 +00:00
6d39b71bf9 Simple RPC access control, with a demo control on the cash RPCs 2016-11-03 10:46:25 +00:00
1d25d23b73 Merge from master 2016-11-02 14:20:51 +00:00
012dc9ec10 Merge branch 'master' into colljos-vault-code-clean-up-refactor 2016-11-02 11:20:21 +00:00
a38b363e9d Fixed subtle bug in Cash Spending when processing for same Issuer with multiple refs. 2016-11-02 11:15:09 +00:00
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
f415c497d9 Minor changes to address PR feedback and comments 2016-11-01 16:47:50 +00:00
253a70f55e Fixed bug in generateSpending whereby Issuer Ref was not being checked. 2016-11-01 16:12:19 +00:00
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
d9f0a161e4 Addressed comments in PR review. 2016-11-01 12:05:48 +00:00
276683e053 Merged in clint-attachmentdemosample (pull request #421)
Moved attachment demo to another repo. Added ApiUtils.
2016-11-01 11:54:59 +00:00
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
c5500caf98 Minor changes to address PR feedback and comments 2016-11-01 11:39:11 +00:00
308d7c1df7 Added PluginServiceHub for use by Corda plugin service extensions. 2016-10-31 17:15:06 +00:00
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