Mike Hearn
5f8dec4ff9
Minor: add an "until" infix function that applies to Temporal's ... the primary purpose of this beyond a trivial bit of extra readability, is null safety.
2016-01-07 15:58:26 +01:00
Mike Hearn
2190fbf2ee
Minor: reintroduce using Java serialisation for KeyPair as the JDK customises it and the Kryo serialisation is both bloated and (more problematically) non-deterministic!
2016-01-07 15:58:26 +01:00
Mike Hearn
0a9fffe8b7
Minor: remove unused import
2016-01-07 15:58:26 +01:00
Mike Hearn
0d0e75e6ff
Commands must have at least one pubkey.
2016-01-07 15:58:26 +01:00
Mike Hearn
5aeab5c933
Minor: move a bit of code around, add some javadocs
2016-01-04 11:24:14 +01:00
Mike Hearn
cd7d01917f
Kotlin 1.0.0-beta-4584
2015-12-24 17:21:10 +00:00
Mike Hearn
31fbf5e1eb
Improve the transactions API a small amount with lazily deserialized access to the WireTransaction inside a SignedTransaction, and id/hash fields (again lazily calculated).
...
This required bringing back the ImmutableClassSerializer and registration of classes that need it, to ensure the constructors run.
2015-12-22 16:41:25 +00:00
Mike Hearn
3c23c4f53d
Minor: move TransactionForVerification to be next to TransactionGroup and rename the file to be more descriptive.
2015-12-22 15:30:49 +00:00
Mike Hearn
049f0aa3b3
Rename PartialTransaction -> TransactionBuilder. The term "partial transaction" should be reserved to mean a transaction that is lacking some signatures as it's in the process of being built up by multiple parties.
2015-12-22 15:28:38 +00:00
Mike Hearn
bcc56859af
Add a unit test to check before/after processing by the dummy timestamper.
...
Tweak the timestamping API a bit.
2015-12-22 15:03:11 +00:00
Mike Hearn
784452ac50
Reorganise how time is handled: timestamping authorities are now oracles who sign the entire transaction.
...
As a result, TimestampedWireTransaction is gone. Timestamp fields are gone. Timestamp commands contain before/after fields. The notion of time tolerance is now a part of the timestamping interface and timestamp data.
TODO:
- Unit tests to verify the notBefore/notAfter logic
- Documentation update
2015-12-18 19:14:33 +01:00
Mike Hearn
6144ccc2c7
Small cleanup of commands.
...
1. Rename Command -> CommandData, WireCommand -> Command, PartialTransaction.addArg -> addCommand
2. Add some helper functions to PartialTransaction to make creation of transactions simpler.
2015-12-18 12:38:26 +01:00
Mike Hearn
4cec5dac02
Minor: remove ambiguous c'tor in PartialTransaction and rename addItems -> withItems
2015-12-16 16:25:58 +01:00
Mike Hearn
ab9e026053
Minor: some small serialisation type safety improvements
2015-12-16 15:24:52 +01:00
Mike Hearn
5863d489bc
Minor: misc comment/whitespace fixes.
2015-12-15 18:54:22 +01:00
Mike Hearn
06ee9db3f6
Minor: provide a random63BitValue() function and use it instead of the previously duplicated code. Update docs.
2015-12-15 13:16:13 +01:00
Mike Hearn
020a594a60
State machines: thread safety and a few more comments.
2015-12-15 13:01:57 +01:00
Mike Hearn
3c578550a9
State machines: don't leak references to completed state machines. Add an extension function for working with futures.
2015-12-14 21:41:57 +01:00
Mike Hearn
d43bbe8faa
Trading: move session ID into the initial args to avoid possible confusion at the start.
2015-12-14 18:22:00 +01:00
Mike Hearn
f15e24e7be
Messaging: Rename MessagingSystem to MessagingService for consistency with other interfaces.
2015-12-14 17:39:48 +01:00
Mike Hearn
3f19e68b3f
Messaging: another minor simplification to the state machines framework. This is not the end!
2015-12-14 17:35:20 +01:00
Mike Hearn
9720d4e404
Messaging: more huge simplifications to the state machine framework.
...
The usage now looks straightforward enough to document and put into a tutorial.
2015-12-11 20:21:22 +01:00
Mike Hearn
89ba996a3c
Two party trading: big changes to support and test serialisation, refactorings ...
2015-12-11 15:19:13 +01:00
Mike Hearn
65c5fa7502
Messaging: (mock) in memory network implementation improvements.
...
- Now supports simulated restart of nodes
- Messages sent to non-running nodes are queued for delivery
- Messages received by a node that don't match any topics are queued until handlers are registered
These improvements help us unit test various robustness features and ensure things work in truly concurrent context where there can be race conditions like receiving a message before the node had a chance to register the right handlers.
2015-12-11 15:19:13 +01:00
Mike Hearn
0ca47156bc
Trading protocol work in progress
2015-12-11 15:19:13 +01:00
Mike Hearn
fed0ae5629
Add placeholder interfaces for various service submodules.
2015-12-11 15:17:44 +01:00
Mike Hearn
2df8153cda
Minor: rename wallet -> cashStates in the Cash contract spending function.
2015-12-11 15:17:28 +01:00
Mike Hearn
f13b9b00e4
Minor: fix Arrays.asList serialisation by adding the extra serialisers lib as a dependency
2015-12-10 17:14:49 +01:00
Mike Hearn
4c87dc2981
First draft of a basic messaging module interface (VERY ROUGH). Ideally, is something that can have an e.g. Kafka backend, with a full P2P implementation later.
2015-12-10 15:08:11 +01:00
Mike Hearn
7881be07ed
Delete a lot of Kryo/serialisation related boilerplate.
...
This is/was an attempt to be secure against malicious streams, but as Kryo is just a temporary bit of scaffolding and isn't intended to be actually used in any real product, it was just a waste of time and the registration requirement was getting increasingly awkward.
2015-12-10 15:03:34 +01:00
Mike Hearn
951912f8e7
Minor: rename Kryo.registerDataClass to Kryo.registerImmutableClass
2015-12-10 14:27:53 +01:00
Mike Hearn
67c810e315
Make Amount use 64 bit precision and overflow checked operations.
2015-12-08 14:58:16 +01:00
Mike Hearn
73cbd41a09
Misc fixes:
...
- Use the OpaqueBytes wrapper (a box for byte[]) inside TimestampedWireTransaction to avoid array comparison issues.
- Introduce a few utility functions to make OpaqueBytes less painful.
- Make StateAndRef serialisable
- Introduce the notion of an OwnedState which abstracts out the owner field.
2015-12-07 17:53:01 +01:00
Mike Hearn
a656e210c4
Merged in crowdfund-tweaks (pull request #7 )
...
Crowdfunding contract: some cleanups and add some discussion at the top of the different possible models.
2015-12-04 12:34:03 +00:00
Mike Hearn
41f54b8555
Crowdfunding contract: some cleanups and add some discussion at the top of the different possible models.
2015-12-04 12:33:42 +00:00
Mike Hearn
ea4a6d8f06
Add logging utilities using slf4j
2015-12-03 18:24:26 +00:00
Mike Hearn
e5a36580da
Visualiser: reorganise, make it easier to invoke, document it.
2015-12-03 12:00:49 +00:00
Mike Hearn
58c526c68b
Visualiser: reorganise, make it easier to invoke, document it.
2015-12-03 11:54:49 +00:00
Mike Hearn
2193dced0a
Minor: add docs for the cash DSL extensions
2015-12-03 11:07:25 +00:00
Mike Hearn
0e34779fce
Merged in mod-crowdfund-close (pull request #5 )
...
Updated close method
2015-12-03 10:20:18 +00:00
Mike Hearn
f98ebce58b
Update copyrights
2015-12-02 18:53:16 +00:00
Mike Hearn
a95cd056ea
Implement a simple transaction graph visualiser tool.
2015-12-02 09:50:45 +00:00
Mike Hearn
1c1736ff9f
Minor: SecureHash.toString + SecureHash.prefixChars methods
2015-12-01 13:36:58 +00:00
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
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
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
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
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
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
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
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
Mike Hearn
7f13b8ab4a
Minor: a few misc cleanups
2015-11-19 11:56:07 +01:00
Mike Hearn
a4aef06e41
Major: introduce TransactionGroup for verifying subgraphs.
2015-11-18 19:22:31 +01:00
Mike Hearn
03ddf454c7
Minor: make LedgerTransaction keep track of the hash of the original serialised tx
2015-11-18 13:35:24 +01:00
Mike Hearn
508ce2819f
Minor: fix wording in Cash contract, suggestion from Richard.
2015-11-17 16:29:42 +01:00
Mike Hearn
fa1c6cb01b
Minor: Rename args to commands for consistency
2015-11-17 13:08:18 +01:00
Mike Hearn
5e604a5b0a
Minor: fix bug in JavaCommercialPaper
2015-11-16 21:01:38 +01:00
Mike Hearn
28bd2053cc
Contracts: add an issue crafting function to the cash contract.
2015-11-16 20:50:31 +01:00
Mike Hearn
aecc1de0cf
Contracts: make the Cash craftSpend/generate function update a mutable transaction instead of returning a unit test structure.
...
Tests: move TestUtils into the test package now the cash contract generate function works the right way.
Transactions: various refactorings to support partially signed transactions.
2015-11-16 20:36:27 +01:00
Mike Hearn
1f17053263
Introduce a PartialTransaction class to represent a mutable transaction that we're in the process of building/signing.
2015-11-16 20:08:45 +01:00
Mike Hearn
853b37a6e1
Cash: add a notion of state construction based on Richard's suggestion of a nonce+simply checking the output states are for deposits owned by the signer. No genesis tx is used.
2015-11-16 19:29:11 +01:00
Mike Hearn
5f30684805
Minor: add a kdoc to the select function.
2015-11-16 19:27:39 +01:00
Mike Hearn
0aa643d4c2
Minor: note to self, remember to check for duplicated inputs when converting LedgerTransaction into TransactionForVerification
2015-11-16 19:26:43 +01:00
Mike Hearn
2c27a07c8b
Minor: OpaqueBytes should never be empty. May catch certain types of simple mistake.
2015-11-16 19:23:50 +01:00
Mike Hearn
6c66eee712
Kotlin Beta 2
2015-11-16 19:23:50 +01:00
Mike Hearn
e3e674658d
Contracts: check in a demo of how to implement a simple contract in Java.
2015-11-16 13:30:53 +01:00
Mike Hearn
d1a605de6f
Contracts: Rename ComedyPaper to CommercialPaper and rewrite the comment at the top to flag its not-realistic status.
2015-11-16 12:42:16 +01:00
Mike Hearn
dad59d116c
Major: Integrate serialisation everywhere, implement basic signing/sig checking code.
...
Currently the serialised forms and the form fed into the contract aren't quite joined up, because on disk/network a transaction is serialised with input references i.e. (txhash, output index) pairs, but the contract wants to see all input states in fully loaded form. To do that, we need some notion of a database of transactions.
2015-11-13 23:12:39 +01:00
Mike Hearn
162b830bcd
Add some serialization utilities and tests, using Kryo.
2015-11-13 20:38:29 +01:00
Mike Hearn
5b4969d366
Minor: make commands singletons when they contain no data and are purely type system markers.
...
This may not be really compatible with sandboxing, later on. But we can always change it back if not.
2015-11-13 14:43:59 +01:00
Mike Hearn
1b44081880
Minor: tweak the cash/amount API
2015-11-12 23:38:02 +01:00
Mike Hearn
32143160c2
Minor: reformat code a bit, introduce TimestampedWireTransaction as a wrapper, fix ContractStateRef to be the same as a Bitcoin COutPoint structure.
2015-11-12 23:18:15 +01:00
Mike Hearn
0b02f64f3d
Contracts: a bit more work on the CP implementation, add a unit test for redemption at time.
2015-11-12 22:58:47 +01:00
Mike Hearn
a7bfff486a
Misc comments
2015-11-11 14:20:24 +00:00
Mike Hearn
3041ca73f2
Simply TransactionForLedger.verify
2015-11-10 11:51:26 +00:00
Mike Hearn
ac9a371179
Platform: commands can now have multiple signatures per command (i.e. you only have one command of any type per transaction even if there are multiple authorisations).
2015-11-09 19:27:53 +00:00
Mike Hearn
0dc92822b5
Remove the todo list in Main.kt, it just changes too fast to be worth keeping it up to date. TODOs in the code itself remain.
2015-11-09 18:27:10 +00:00
Mike Hearn
12b7c7c184
Platform: fix the ability to summon cash in uncontrolled ways.
...
Introduce three ways to represent transactions: wire, ledger and for-verification.
TransactionForVerification contains the arguments formally passed to verify(). Making Contract.verify() take only a single object as the argument makes it easier to evolve the Contract binary interface without breaking backwards compatibility with existing contracts that are uploaded to the ledger. The Kotlin "with" construct can be used to bring the members into scope, thus acting syntactically like function arguments.
Make the contracts to be run depend on both input AND output states: this approach seems simpler than trying to have some notion of marking outputs that are checked. The TransactionForVerification class implements this simple logic (it's all moved into Transactions.kt).
2015-11-09 18:18:03 +00:00
Mike Hearn
4b9536af04
Add some TODOs
2015-11-09 17:32:16 +00:00
Mike Hearn
b8c7f949f4
Misc changes from Monday meeting.
2015-11-09 17:23:05 +00:00
Mike Hearn
8a2b8072e6
Contracts: include a string reference to the legal contract that the code is supposed to implement. Suggestion from Richard.
2015-11-08 13:38:51 +01:00
Mike Hearn
03aaf07f70
Cash: alter description of the state to talk about cash claims. Suggestion from Richard.
2015-11-08 13:34:52 +01:00
Mike Hearn
5022f11d9e
More moving around and renaming, to have a consistent style between contracts.
2015-11-08 13:34:24 +01:00
Mike Hearn
83eb45732f
Some renaming and moving around (Children's Paper becomes Comedy Paper to make it clearer that it's sort of a joke implementation)
2015-11-08 12:30:02 +01:00
Mike Hearn
fa626fc5d7
Mark ChildrensPaper as really incomplete more visibly.
2015-11-06 19:00:44 +01:00
Mike Hearn
0131c2cc1d
CP: check in a "childrens paper" contract that is sort of like commercial paper, but not really. Tests are incomplete.
2015-11-06 17:55:20 +01:00
Mike Hearn
1298c4b8ed
Add a time parameter to the contract verify function.
2015-11-06 16:39:33 +01:00
Mike Hearn
163175860d
Improve the contracts DSL, make the Cash contract extend the DSL in a small way to make working with arrays of cash outputs easier.
2015-11-06 16:35:51 +01:00
Mike Hearn
f09c624c0f
Move DepositPointer into Structures
2015-11-06 14:57:16 +01:00
Mike Hearn
847770ed2e
Move Cash into new contracts subfolder, move base code into core
2015-11-06 14:56:00 +01:00
Mike Hearn
c0238b1f21
Cash: add a TODO comment
2015-11-06 13:01:22 +01:00
Mike Hearn
7e7d3ba3bf
Move contracts DSL related stuff into a dedicated ContractsDSL.kt file, to emphasise that there is one :)
2015-11-04 15:47:42 +01:00
Mike Hearn
2455776b43
Cash contract: Implement example of spend crafting.
2015-11-04 15:14:56 +01:00
Mike Hearn
a09120d445
Cash contract: Introduce a DepositPointer abstraction for easier grouping
...
In this current model, you cannot mix up money from different deposits: they must always be kept separate.
2015-11-03 18:05:21 +01:00
Mike Hearn
fd67a85c29
TDD: Cash contract: Some basic tests of spend crafting.
2015-11-03 17:54:18 +01:00
Mike Hearn
e012d2c2f5
TestUtils: add some formatting toString methods to make test failures easier to read.
2015-11-03 17:54:18 +01:00
Mike Hearn
0c6c2df483
Cash contract: don't allow merging of two different origin deposits together.
2015-11-03 17:54:18 +01:00
Mike Hearn
8f46fb4406
Introduce OpaqueBytes, a simple wrapper around the JVM level byte[] which fixes hashCode and equals to use value-type identity rather than instance identity. Allows for more natural code.
2015-11-03 17:54:18 +01:00
Mike Hearn
12f5ddb0aa
Cash contract: multi-issuer support
...
You can now take deposits from multiple different institutions and move/combine/split them appropriately. The issuers are kept separate, you cannot merge 3 different input states from 3 different institutions down to one, but you can merge/split within that specific issuer. Deposit refs are not currently being kept separate, but they should be also (this is coming next).
2015-11-03 17:54:18 +01:00
Mike Hearn
983003a562
Amount: split out of Structures.kt and into a separate file, add operator overloads.
2015-11-03 17:54:18 +01:00
Mike Hearn
c60db5544b
Initial import
2015-11-03 17:54:17 +01:00
