Commit Graph

2692 Commits

Author SHA1 Message Date
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
Clinton Alexander
a4a48d06f3 Corda JAR now contains required files. 2016-11-04 17:15:06 +00:00
Clinton Alexander
9fcdf70b33 Fixed putJson actually posting Json. 2016-11-04 16:23:56 +00:00
Ross Nicoll
de511e41b1 Merged in rnicoll-unique-identifier-equals (pull request #444)
Use UUID only for UniqueIdentifier equality
2016-11-04 16:20:02 +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
Clinton Alexander
0ea6a88682 Merged in clint-docscriptfix (pull request #438)
Merged the two docsite generation scripts.
2016-11-04 16:00:50 +00:00
Clinton Alexander
5ac679dd0e String payloads to the HttpApi are assumed to be valid JSON and sent as is, previous behaviour would escape the string. 2016-11-04 15:59:56 +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
2bc8f8414d Merged in clint-contractsrename (pull request #446)
Renamed contracts project to finance to better reflect the purpose of the project.
2016-11-04 15:18:19 +00:00
Patrick Kuo
ddf27efc86 remove version, group and quasar plugin from build.gradle 2016-11-04 14:10:48 +00:00
Patrick Kuo
9a4dcd9b58 Merged in pat-explorer-doc (pull request #440)
Explorer Doc
2016-11-04 13:45:15 +00:00
Patrick Kuo
6525de7e17 Explorer Doc 2016-11-04 13:41:21 +00:00
Clinton Alexander
70cf57f736 Added correct modules.xml for the finance project. 2016-11-04 13:38:46 +00:00
Clinton Alexander
8882b77b1b Fixed quasar scanning. 2016-11-04 13:35:25 +00:00
Clinton Alexander
7e198e7cf3 Renamed contracts project to finance to better reflect the purpose of the project. 2016-11-04 13:35:25 +00:00
Patrick Kuo
7d465999d6 Merged in pat-explorer-move (pull request #443)
move explorer to tools folder
2016-11-04 11:44:16 +00:00
Clinton Alexander
d937a5805e Merged in clint-gradleinstallfix (pull request #439)
Gradle install now installs all packages to maven local
2016-11-04 11:39:28 +00:00
Andras Slemmer
8ee07e229f Merged in aslemmer-gitignore-cleanup (pull request #445)
.gitignore: Use negative pattern for build/, remove some unused lines
2016-11-04 11:25:52 +00:00
Patrick Kuo
e29f281cfd Changed / to : to align with gradle include directive. 2016-11-04 11:20:02 +00:00
Andras Slemmer
14304d098f .gitignore: Use negative pattern for build/, remove some unused lines 2016-11-04 11:13:57 +00:00
Clinton Alexander
02bbcd307d Fixing build by removing dependency on quasar scan. 2016-11-04 11:01:02 +00:00
Clinton Alexander
3c5cece3ea Fixed publishToMavenLocal that was broken by a removed plugin include. 2016-11-04 10:51:54 +00:00
Clinton Alexander
04ad438a51 Merged in clint-quasarfix (pull request #436)
Fixed an error message when running gradle build.
2016-11-04 10:42:04 +00:00
Clinton Alexander
02fa457156 Added another rule to the gitignore to ignore the distributions folder. 2016-11-04 10:41:19 +00:00
Clinton Alexander
d899e0a3fc Removed redundant configurations in light of the demos being split out. 2016-11-04 10:41:19 +00:00
Clinton Alexander
30f7eadcd1 Renamed publishToMavenLocal to install in run configs. 2016-11-04 10:37:38 +00:00
Rick Parker
4b1d971137 Merged in parkri-fix-pending-messages-table-name (pull request #426)
Pending redelivery table name prefix added in line with other tables.
2016-11-04 10:34:17 +00:00
rick.parker
143e3a063f Pending redelivery table name prefix added in line with other tables.
No longer delete all pending messages from the database and move into memory before putting back into the database again, which is vulnerable to failure.  Now we delete individual pending messages on successful redelivery.
2016-11-04 10:22:14 +00:00
Mike Hearn
226b624004 Tech white paper: Oracles and tearoffs, encumbrances, contract constraints, assets and obligations, deterministic JVM 2016-11-04 11:07:47 +01:00
Patrick Kuo
3cd8562b3b move explorer to tools folder 2016-11-03 17:28:38 +00:00
Patrick Kuo
0e59ac4581 Merged pat-explorer-ui-work into master 2016-11-03 16:17:23 +00:00
Clinton Alexander
59a86c364b Documentation now refers devs to use install over publishToMavenLocal 2016-11-03 15:58:46 +00:00
Clinton Alexander
55e3dceb8f gradle install now works for corda. 2016-11-03 15:57:50 +00:00