Mike Hearn
37c89d7cf6
Minor: add a TODO that the trader protocol should be recording the transaction itself instead of letting the caller do it.
2016-06-22 13:46:57 +02:00
Richard Green
6b80530ac6
Changed DateOffset to be an integer instead of enum. Usages and examples also changed. Also renamed to fixingPeriodOffset
...
Renamed fixingPeriod -> fixingPeriodOffset in the .json files
2016-06-21 18:17:39 +01:00
Clinton Alexander
3e82ee45f2
Merged in nodedircreate (pull request #139 )
...
Todo resolution: Moved node directory creation into the abstract node.
2016-06-21 11:02:29 +01:00
Andras Slemmer
b99ddfdb7d
demo: Suppress unused var warning
2016-06-20 14:16:13 +01:00
Andras Slemmer
780f2d7e82
demo: Remove warnings
2016-06-20 14:16:13 +01:00
Andras Slemmer
298b35ba4f
demo: Remove unnecessary 'participants' field from IRS demo fixture
2016-06-20 12:11:58 +01:00
Andras Slemmer
478fe6110b
test: Fix IRS demo JSON fixture
2016-06-20 11:49:15 +01:00
Andrius Dagys
0a5b7ace35
Made TransactionBuilder abstract. Every transaction type now needs to implement and provide its own Builder. This is required since for specific types we need to run different logic when adding new items to the transaction. For example, when adding a new input state to a transaction of type NotaryChange we need to add all of the states participants to the signers list.
2016-06-17 15:05:35 +01:00
Andrius Dagys
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
Ross Nicoll
a029e303a6
Switch trader demo to expect self-signed cash
2016-06-17 14:36:21 +01:00
Ross Nicoll
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
Shams Asari
aa153be6f0
moved methods in ChildrenProgressTrackers into ProgressTracker
2016-06-14 16:42:42 +01:00
Clinton Alexander
6b886bde4a
Nodes now need a setup step before running.
2016-06-14 16:07:29 +01:00
Clinton Alexander
86b5b7299a
Moved node directory creation into the abstract node.
2016-06-13 15:30:26 +01:00
rick.parker
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
rick.parker
82abc69046
Pull out StateMachineManager observable into it's own branch
...
Review feedback
Review feedback
Review feedback
2016-06-10 13:10:56 +01:00
Clinton Alexander
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
Clinton Alexander
2b64ba1cc6
Fixed IRS demo success case for PUT requests.
2016-06-08 16:45:19 +01:00
Clinton Alexander
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
Clinton Alexander
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
Clinton Alexander
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
Clinton Alexander
782d50958d
IRS demo endpoints are now parameterised for the Trade and Demo modes. Documentation fixes.
2016-06-08 16:30:40 +01:00
Clinton Alexander
6b62f33c46
Corrected the currency mismatch in the example trade.
2016-06-08 16:30:40 +01:00
Clinton Alexander
9e32d62d0f
Moved resource files for IRSDemo from scripts to resource directory. Removed errant semicolons.
2016-06-08 16:29:21 +01:00
Clinton Alexander
32a5d4173a
IRS demo now requires no manual configuration. All functions made private.
2016-06-08 16:29:21 +01:00
Clinton Alexander
626e8489e8
Non-options arguments are handled correctly in IRS Demo
2016-06-08 16:29:21 +01:00
Clinton Alexander
8e9fc2d4c0
Updated help text and corrected argument handling in IRS demo.
2016-06-08 16:29:21 +01:00
Clinton Alexander
fad45eaa91
Updated documentation for the IRS demo.
2016-06-08 16:29:21 +01:00
Clinton Alexander
389a470400
Moved IRS demo date setting functionality to Kotlin code. Removed now redundant demo script.
2016-06-08 16:29:21 +01:00
Clinton Alexander
3d556c614f
Moved IRS demo trade mode to the Kotlin demo code.
2016-06-08 16:29:21 +01:00
Clinton Alexander
639f97ff9c
Rate uploading moved to IRSDemo.kt from irs-demo.sh
2016-06-08 16:29:21 +01:00
Clinton Alexander
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
Andrius Dagys
21f53a7d3e
Revert "Revert "Merged in validating-notary (pull request #123 )""
...
This reverts commit e64145991e633185ce9381a89888f3f342dd6846.
2016-06-07 13:53:00 +01:00
Andrius Dagys
e64145991e
Revert "Merged in validating-notary (pull request #123 )"
...
This reverts commit d9f4e4da2e50016e07eaaf047b43b5819e23da80, reversing
changes made to 654dc3f60a4e9a0850b9575b8bf524edd36b7bd8.
2016-06-07 12:29:27 +01:00
Andrius Dagys
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
Shams Asari
654dc3f60a
Resuming from checkpoints now working - seller (but not buyer) in trader demo can be restarted
2016-06-06 17:49:40 +01:00
rick.parker
8122e35a8a
Have ServiceHub entries implement SerializeAsToken so they are not copied into protocol checkpoints.
2016-06-06 16:55:46 +01:00
Ross Nicoll
fc62010da6
Move cash contract into its own package
2016-05-31 17:07:36 +01:00
Andrius Dagys
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
rick.parker
0b2c16be67
Changes to packages after refactor
2016-05-24 11:48:04 +01:00
rick.parker
f8e610aa71
Re-apply changes
2016-05-24 09:41:00 +01:00
Matthew Nesbit
63a5fd1b9e
Add com.r3corda to all namespaces.
2016-05-23 14:53:56 +01:00
Matthew Nesbit
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
Matthew Nesbit
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
Mike Hearn
5e70646bd2
Refactor the trader demo and add comments to make it easier to customise.
2016-05-18 19:10:49 +02:00
Mike Hearn
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
Matthew Nesbit
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
Matthew Nesbit
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
Matthew Nesbit
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
Andrius Dagys
422d65cc54
Rearranging interfaces and implementations. Notary fix for the cash tests.
2016-05-13 16:34:25 +01:00
