Commit Graph

605 Commits

Author SHA1 Message Date
70495a021e Introduce TransactionState, which wraps ContractState and holds the notary pointer.
Remove notary from ContractState.
Introduce TransactionType, which specifies custom validation logic for a transaction.
2016-06-17 15:05:35 +01:00
a029e303a6 Switch trader demo to expect self-signed cash 2016-06-17 14:36:21 +01:00
ad72f3e48f Add issuer to cash amounts
Add issuer of a cash when referring to amounts of cash (except for the very few cases where
the issuer is not important, such as when referring to aggregated totals across a set of
issuers). Replaces CommonCashState with TokenDefinition, as a more accurate reflection of
what the class represents.
2016-06-16 15:05:49 +01:00
aa153be6f0 moved methods in ChildrenProgressTrackers into ProgressTracker 2016-06-14 16:42:42 +01:00
6b886bde4a Nodes now need a setup step before running. 2016-06-14 16:07:29 +01:00
86b5b7299a Moved node directory creation into the abstract node. 2016-06-13 15:30:26 +01:00
73cbab0084 Pull out Wallet observable into it's own branch
Review feedback

Review feedback

Apply feedback from previous PR

Apply feedback from previous PR

Apply feedback from previous PR

PR feedback

PR feedback

PR feedback
2016-06-10 17:16:56 +01:00
82abc69046 Pull out StateMachineManager observable into it's own branch
Review feedback

Review feedback

Review feedback
2016-06-10 13:10:56 +01:00
28c6df2440 IRSDemo is now fixed. Merge conflict caused notary types to become mismatched. Merged the new file upload code from the irsdemotest branch. 2016-06-08 18:45:34 +01:00
2b64ba1cc6 Fixed IRS demo success case for PUT requests. 2016-06-08 16:45:19 +01:00
146f274dd0 Demo now requires the setup steps if the configuration is not default. Documentation updated to reflect these changes. 2016-06-08 16:31:58 +01:00
7b2214e888 IRS Demo config is now able to be run in any order if default directory settings are present. 2016-06-08 16:31:58 +01:00
8010836f14 Added setup steps to the IRSDemo to make steps more explicit and tidied up the handling of args. 2016-06-08 16:31:58 +01:00
782d50958d IRS demo endpoints are now parameterised for the Trade and Demo modes. Documentation fixes. 2016-06-08 16:30:40 +01:00
6b62f33c46 Corrected the currency mismatch in the example trade. 2016-06-08 16:30:40 +01:00
9e32d62d0f Moved resource files for IRSDemo from scripts to resource directory. Removed errant semicolons. 2016-06-08 16:29:21 +01:00
32a5d4173a IRS demo now requires no manual configuration. All functions made private. 2016-06-08 16:29:21 +01:00
626e8489e8 Non-options arguments are handled correctly in IRS Demo 2016-06-08 16:29:21 +01:00
8e9fc2d4c0 Updated help text and corrected argument handling in IRS demo. 2016-06-08 16:29:21 +01:00
fad45eaa91 Updated documentation for the IRS demo. 2016-06-08 16:29:21 +01:00
389a470400 Moved IRS demo date setting functionality to Kotlin code. Removed now redundant demo script. 2016-06-08 16:29:21 +01:00
3d556c614f Moved IRS demo trade mode to the Kotlin demo code. 2016-06-08 16:29:21 +01:00
639f97ff9c Rate uploading moved to IRSDemo.kt from irs-demo.sh 2016-06-08 16:29:21 +01:00
9a619cc4ae IRS demo to now has roles for NodeA/NodeB and most options are now~ optional. NodeA can be run without the shell script. 2016-06-08 16:29:21 +01:00
21f53a7d3e Revert "Revert "Merged in validating-notary (pull request #123)""
This reverts commit e64145991e.
2016-06-07 13:53:00 +01:00
e64145991e Revert "Merged in validating-notary (pull request #123)"
This reverts commit d9f4e4da2e, reversing
changes made to 654dc3f60a.
2016-06-07 12:29:27 +01:00
c45bc0df20 Split up Notary protocol into Client and Service parts. The Service protocol can be extended to provide additional transaction processing logic, e.g. validation.
Implemented a Simple and Validating Notary services.
2016-06-07 10:58:34 +01:00
654dc3f60a Resuming from checkpoints now working - seller (but not buyer) in trader demo can be restarted 2016-06-06 17:49:40 +01:00
8122e35a8a Have ServiceHub entries implement SerializeAsToken so they are not copied into protocol checkpoints. 2016-06-06 16:55:46 +01:00
fc62010da6 Move cash contract into its own package 2016-05-31 17:07:36 +01:00
4a79600653 Trader demo fix: buyer now records completed transactions and doesn't attempt to reuse the same spent cash states. 2016-05-31 12:40:53 +01:00
0b2c16be67 Changes to packages after refactor 2016-05-24 11:48:04 +01:00
f8e610aa71 Re-apply changes 2016-05-24 09:41:00 +01:00
63a5fd1b9e Add com.r3corda to all namespaces. 2016-05-23 14:53:56 +01:00
a7c0296f6b Rename node.core to node.internal from Rick's suggestion not to use core outside of the core package. 2016-05-20 16:43:01 +01:00
f6f56797ce Refactor code into clear core, contracts and node namespaces. Move services into clear implementation and api sides. Push unit tests down to lowest level of dependency hierarchy possible. 2016-05-20 16:42:59 +01:00
5e70646bd2 Refactor the trader demo and add comments to make it easier to customise. 2016-05-18 19:10:49 +02:00
e8ae3be38d TwoPartyDealProtocol fix: don't check Notary identity if the transaction has no inputs 2016-05-18 10:06:30 +01:00
e1f899647a Modify the trader demo so it doesn't need a shell script to start it anymore. Now all configuration is in the driver program. 2016-05-17 18:13:24 +02:00
69eef9a947 Temporarily disable the IRS simulation test due to it revealing an issue with the new verifyCorrectNotary code. 2016-05-17 18:09:26 +02:00
e475b146d9 Testing: add a unit test that runs the IRS simulation through to completion, to ensure some test coverage of TwoPartyDealProtocol until it's merged with TPTP. Fix an issue that was breaking the simulation. 2016-05-17 17:57:41 +02:00
f9920cbc28 Testing: expose a future from the Simulation.start method to let you find out when the simulation has finished (if it finishes at all).
Add a simple test that just forces the IRS simulation through to completion (no real checks on the output).
2016-05-17 17:57:40 +02:00
6bdbc7925b Fix IRS demo by allowing demos to optionally register JAX-RS classes on the node at construction time. 2016-05-14 19:26:20 +01:00
988e00099d Capture file moves to separate Node implementation code into its own gradle module and leave only demo code in top level src folders.
I have to temporarily break\disable the IRS demo to which has a circular dependency. Will fix next.
2016-05-14 17:57:41 +01:00
058ac986bd Move contracts base files to namespace to make api aspect clearer in includes.
Move Party to core.crypto as Party is closely aligned with the signing and used in code areas unrelated to the contract code.
2016-05-14 13:47:07 +01:00
422d65cc54 Rearranging interfaces and implementations. Notary fix for the cash tests. 2016-05-13 16:34:25 +01:00
0da604e33b Added another chapter on implementation and usage.
Modified TODO comment.
2016-05-13 16:17:50 +01:00
324b2be06c Added a rendundant condition to a branch for readability 2016-05-13 16:17:50 +01:00
2c422bebd3 Added noneOrSingle extension method, which returns a single element, null if no elements found and throws if more than one element found 2016-05-13 16:17:50 +01:00
fa3f7e7fa6 Added a basic Notary service with protocol for signing transactions 2016-05-13 16:17:50 +01:00