ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-21 13:57:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
743 Commits 91 Branches 405 Tags 354 MiB
8d1ac66787
Commit Graph

743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ross Nicoll
8d1ac66787 Remove Business Calendar header 2016-06-13 17:38:18 +01:00
Ross Nicoll
874892df93 Move fungible definition up the document 2016-06-13 17:38:18 +01:00
Ross Nicoll
fc3bc163aa Tweak wording (state -> states) 2016-06-13 17:38:18 +01:00
Ross Nicoll
9cdcaaa606 Add documentation of transaction data types 2016-06-13 17:38:18 +01:00
Rick Parker
58d5162782 Merged in cor-133-observable-wallet (pull request #135) 
Pull out Wallet observable into it's own branch
 2016-06-10 17:18:46 +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
d9ad1b78ef Merged in cor-133-observable-smm (pull request #134) 
Pull out StateMachineManager observable into it's own branch
 2016-06-10 13:11:47 +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
ff467beaec Merged in irsdemowindows (pull request #125) 
IRS Demo support on Windows - Replaced shell scripts with Kotlin demo runner.
 2016-06-09 09:59:53 +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
0c94637685 Documentation now has separate Windows instructions for running the demos. 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
Shams Asari
2365f9bca5 Persisting transactions to disk 2016-06-08 10:15:14 +01:00
Rick Parker
f6e577f672 Merged in cor-133-serialization-as-tokens-2 (pull request #129) 
Fix registration of services due to Kryo not following synthetic fields by default
 2016-06-07 16:31:39 +01:00
rick.parker
97e04ba7d0 Fix registration of services due to Kryo not following synthetic fields by default 
Review feedback
 2016-06-07 16:29:59 +01:00
Ross Nicoll
e887c0e7ef Merged in rnicoll-fix-json (pull request #127) 
Update trade JSON to reflect changes to Amount
 2016-06-07 16:06:22 +01:00
Ross Nicoll
280581450a Correct 'currency' -> 'token' in JSON 2016-06-07 16:05:49 +01:00
Andrius Dagys
49664b4b50 Assign platformClock in serviceHub directly to avoid serialization issues 2016-06-07 13:53:00 +01:00
Andrius Dagys
21f53a7d3e Revert "Revert "Merged in validating-notary (pull request #123)"" 
This reverts commit e64145991e.
 2016-06-07 13:53:00 +01:00
Ross Nicoll
ba1a6ab614 Merged in rnicoll-non-currency-cash (pull request #124) 
Genericise Cash contract to support non-Currency things
 2016-06-07 13:49:53 +01:00
Ross Nicoll
f4f0e160d2 Genericise Cash contract to support non-Currency things 
Split the verification and commands for the Cash contract into a new AbstractCashLike
class, and make Cash a concrete implementation of that class, specialised for dealing
with Currency as the underlying token.
 2016-06-07 13:49:26 +01:00
Andrius Dagys
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
Andrius Dagys
d9f4e4da2e Merged in validating-notary (pull request #123) 
Multiple notary support - implement a validating notary using extensible commit protocol
 2016-06-07 11:09:39 +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
1a1efd9523 Merged in cor-133-serialization-tokenization-of-services-1 (pull request #111) 
Have ServiceHub entries implement SerializeAsToken so they are not copied into protocol checkpoints.
 2016-06-06 17:00:09 +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
d8940ca88c Merged in rnicoll-generic-amount (pull request #122) 
Genericise Amount class
 2016-06-01 12:04:46 +01:00
Ross Nicoll
d7b367965f Genericise Amount class 
Make the Amount class generic so it doesn't have to represent a quantity of a
currency, but can handle other things such as assets as well, or extended detail
(for example a currency-issuer tuple).
 2016-06-01 11:58:13 +01:00
Ross Nicoll
fae934e7b0 Merged in rnicoll-cash-move (pull request #120) 
Move cash contract into its own package
 2016-05-31 17:15:12 +01:00
Ross Nicoll
fc62010da6 Move cash contract into its own package 2016-05-31 17:07:36 +01:00
Ross Nicoll
93832457e4 Merged in rnicoll-cash-sum-tests (pull request #118) 
Add unit tests covering cash sum methods
 2016-05-31 15:47:49 +01:00
Mike Hearn
1e0844ccb5 Merged in fix-affinityexecutor-test (pull request #117) 
Attempt to fix AffinityExecutorTest and fix an IDE hint.
 2016-05-31 15:56:10 +02:00
Mike Hearn
2fa939d50e Merged in docs-release-process (pull request #115) 
Docsite: more info on how to cut a release.
 2016-05-31 15:54:01 +02:00
Andrius Dagys
b4ee6a09da Merged in trader-demo-fix (pull request #121) 
Trader demo fix: buyer now records completed transactions and doesn't attempt to reuse the same spent cash states
 2016-05-31 14:36:34 +01:00
Ross Nicoll
ee5088066c Add unit tests covering cash sum methods 2016-05-31 14:21:29 +01:00