Commit Graph

258 Commits

Author SHA1 Message Date
jamescarlyle
91a9b08e7d Updated close method 2015-11-30 19:16:25 +00:00
Mike Hearn
1f68727f31 Cash: add an onlyParties parameter to the spend crafting method. This allows you to restrict the wallet to only cash issued by particular parties. 2015-11-30 17:58:58 +00:00
Mike Hearn
513b2a0b8b README.md edited online with Bitbucket 2015-11-30 17:20:50 +00:00
Mike Hearn
c4d383bf67 Docs: rename institution to party 2015-11-30 17:07:09 +00:00
Mike Hearn
8ea4ac8b15 Rename 'playground' to 'R3 Prototyping' 2015-11-30 17:00:25 +00:00
Mike Hearn
50c3956988 Rename 'institution' to 'party'.
ADP-39 #resolve
2015-11-30 16:51:20 +00:00
Mike Hearn
52288bede1 Add copyright header (not open source for now) 2015-11-30 16:46:26 +00:00
Mike Hearn
9780f6254a Crowdfund contract: update to latest style for defining commands (singletons don't play nice with serialisation) 2015-11-30 16:39:03 +00:00
Mike Hearn
b3f7e307c7 Reformat the crowdfund contract 2015-11-30 16:36:12 +00:00
Mike Hearn
b8a50a65cf Merge branch 'finish-timestamping'
# Conflicts:
#	docs/build/html/searchindex.js
#	src/core/serialization/Kryo.kt
2015-11-30 16:35:10 +00:00
Mike Hearn
eb4670b536 Merged in crafting-docs (pull request #3)
Crafting docs
2015-11-30 16:27:01 +00:00
Mike Hearn
09ed50d1ab Docs: address review comments from Richard. 2015-11-30 16:26:09 +00:00
jamescarlyle
4e933f6d51 Added basic Crowdfunding contract. 2015-11-27 23:55:47 +00:00
Mike Hearn
42eed3e0a3 Flesh out timestamping logic and fix various serialisation related bugs that it exposes. Timestamps are optional, so update the CommercialPaper contract and tutorial to reflect that. 2015-11-27 18:33:17 +01:00
Mike Hearn
57118d46a8 Docs: Regen HTML 2015-11-27 16:23:32 +01:00
Mike Hearn
e9c60c2722 Docs: finish off the tutorial by adding a section on crafting functions. 2015-11-27 16:23:19 +01:00
Mike Hearn
dacfe299f8 Minor: improve realism of the CP tests by having Alice pay for the CP 2015-11-27 16:11:08 +01:00
Mike Hearn
1628c1e17a Implement and test crafting/generate methods for CommercialPaper.
Rename test keys and use real EC keys instead of dummies.
2015-11-27 15:44:43 +01:00
Mike Hearn
d3c15ab7de Minor: tighten generic bound on StateAndRef 2015-11-27 15:44:06 +01:00
Mike Hearn
a98bc241ae Early start on support for timestamping (incomplete) and addition of a helper method on LedgerTransaction 2015-11-27 15:43:48 +01:00
Mike Hearn
60f29339ee Minor: add a convenience extension function to convert from byte arrays to SHA256 hashes. 2015-11-27 15:42:55 +01:00
Mike Hearn
19cd2069c7 Minor: clarify the distinction between sighash and txid hash. Fix Cash contract to not expect keys to be sortable. 2015-11-27 14:56:36 +01:00
Mike Hearn
de40a2082d Minor: introduce Institution.ref() to get an InstitutionReference 2015-11-27 14:49:08 +01:00
Mike Hearn
88793644c8 Minor: move @Suppress("UNCHECKED_CAST") to file level to work around KT-10210 2015-11-27 14:04:38 +01:00
Mike Hearn
472d57e262 Testing: Allow "label".output inside typed TransactionGroupForTest 2015-11-27 13:50:44 +01:00
Mike Hearn
8f5170a8b2 Merged in initial-documentation (pull request #2)
Initial prototype documentation, with incomplete tutorial
2015-11-27 12:50:43 +01:00
Mike Hearn
85c4f9d514 Minor: provide the cause when an exception doesn't match expected in TestUtils 2015-11-26 19:10:40 +01:00
Mike Hearn
58ce060211 Regen the HTML 2015-11-25 19:04:35 +01:00
Mike Hearn
b4a3008302 Docs: tutorial typo fixes 2015-11-25 19:04:28 +01:00
Mike Hearn
b6b50f0e7b Docs: tutorial doesn't actually show you how to do a hello world contract, CP is enough 2015-11-25 18:51:37 +01:00
Mike Hearn
2f1a91c101 Docs: regenerate the HTML 2015-11-25 18:49:58 +01:00
Mike Hearn
1ce9bdeba0 Docs: add unit testing to the tutorial 2015-11-25 18:49:44 +01:00
Mike Hearn
ecf70efd2e Update tutorial to reflect code changes in CommercialPaper.kt 2015-11-25 18:17:51 +01:00
Mike Hearn
3172b0b86a Contracts: commercial paper issue command doesn't need a nonce, and fix a bug in the unit tests. 2015-11-25 18:14:33 +01:00
Mike Hearn
86a523dd59 Apply review changes suggested by Richard 2015-11-25 18:05:10 +01:00
Mike Hearn
766040da57 Documentation HTML build 2015-11-25 18:01:38 +01:00
Mike Hearn
3dd10714df Introduce documentation of the current prototype with a contract programming tutorial (incomplete), using the Sphinx docs engine.
Actual generated HTML will follow in the next commit.
2015-11-25 18:01:37 +01:00
Mike Hearn
ff05cb4a4c Contract: rewrite and finish off tests for commercial paper, using improved test DSL 2015-11-25 17:40:27 +01:00
Mike Hearn
c026e90067 Contracts: JavaCommercialPaper should implement equals/hashCode on its version of the state class and use the same grouping logic as the Kotlin version. 2015-11-25 14:26:17 +01:00
Mike Hearn
5285d3bb47 Minor: define contracts as regular classes instead of using the kotlin singleton syntax 2015-11-24 15:22:19 +01:00
Mike Hearn
af4aa3dedc Minor: remove funktionale from build.gradle, it's unused 2015-11-24 15:21:59 +01:00
Mike Hearn
564fce7e99 Minor: set Java 8 as a requirement in gradle build file 2015-11-23 13:13:46 +01:00
Mike Hearn
5c1e4a0e35 Minor: fix kdoc in Structures.kt, spotted by Richard 2015-11-23 11:53:31 +01:00
Richard G Brown
fa32935e77 legalContractRef changed String to SecureHash (of contract contents) 2015-11-23 10:59:28 +01:00
Mike Hearn
25a28a0a28 Minor: suppress unused parameter warnings in TestUtils 2015-11-21 13:17:05 +01:00
Mike Hearn
92c92db33d Minor: bump Dokka version to fix build 2015-11-21 13:14:53 +01:00
Mike Hearn
b0b8c74c25 Minor: move the groupBy method to TransactionForVerification where it belongs. 2015-11-20 19:36:20 +01:00
Mike Hearn
a8e34a2bb2 Contracts API: move the notion of grouping into a utility file, and modify the commercial paper contract (java+kotlin) to use it.
This resolves several open TODO list items around the composability of contracts.

The current CP tests pass, but they aren't complete, so this doesn't prove the changes are correct. That'll come soon.
2015-11-20 19:25:15 +01:00
Mike Hearn
d6cfa9b9ef Cash: refactor to allow multi-currency swaps by introducing a notion of grouping. 2015-11-20 18:19:24 +01:00
Mike Hearn
9681f97502 Minor: add a unit test to verify that duplicated inputs are forbidden (conflict) and delete the TODO for it. 2015-11-19 13:09:46 +01:00