ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-25 07:31:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,799 Commits 91 Branches 405 Tags 354 MiB
ba977d8a5a
Commit Graph

421 Commits

Author SHA1 Message Date
Ross Nicoll
3e83093987 Add webserver Capsule configuration 
Add Capsule configuration for the webserver JAR, so that the classes-only `webserver.jar` is published as well
as the full fat `corda-webserver.jar`. This is required for running the tutorial/template from IntelliJ.
 2017-03-13 15:01:11 +00:00
Mike Hearn
2628a10c51 Refactor the JSON support out into a separate module, :corda:jackson, as Jackson/JSON configuration is generally useful outside the context of web servers. 2017-03-08 12:31:22 +01:00
Katarzyna Streich
97f2f4a8e0 Correct ports in demos broken after RPC port revert. 2017-03-08 09:58:31 +00:00
Katarzyna Streich
4d10682f62 Override party keys from example-irs-trade.json file, so demos run correctly. Add api call to query for 
Bank A and Bank B keys. Change port numbers, which are hardcoded in 2 places and were different when run through IntelliJ and through CLI.
 2017-03-07 10:51:47 +00:00
Ross Nicoll
b5ba070301 Revert "Non-ssl artemis acceptor for RPC connection. (#271)" 
This reverts commit f0d82e4918.
 2017-03-06 14:03:23 +00:00
Clinton
df6b9add6e Merge pull request #285 from corda/clint-samplesfilecleanup 
Removed redundant gradle.properties in samples projects.
 2017-02-28 15:22:42 +00:00
Rick Parker
6d375351bd Add a header to all serialised data & switch to compatibility serializer. (#294) 
Add a header to all serialised data & switch to compatibility serializer
 2017-02-28 11:17:57 +00:00
Rick Parker
c4c4c51d7d Kryo serialisation whitelisting and misc enhancements. (#267) 
Kryo serialisation whitelisting and misc enhancements
 2017-02-28 08:12:18 +00:00
Clinton Alexander
8414c97a61 Moved JsonSupport to new webserver module. Fixed a few compile errors. 
Fixed compile issues caused by webserver being split to a separate project.
WebServer now starts and stops correctly as a separate module.
 2017-02-27 16:41:48 +00:00
Patrick Kuo
f0d82e4918 Non-ssl artemis acceptor for RPC connection. (#271) 
* New non-ssl acceptor in artemis server for RPC connection.
 2017-02-24 15:36:36 +00:00
Clinton Alexander
bfa50e802f Removed redundant gradle.properties in samples projects. 2017-02-24 13:04:43 +00:00
Ross Nicoll
ed093cdb9d Enforce separation of Party and AnonymousParty 2017-02-16 11:50:33 +00:00
Ross Nicoll
71babc7019 Remove use of full parties from contract states 2017-02-15 11:43:13 +00:00
Andrius Dagys
288d709668 Include Merkle tree root hash in FilteredTransaction 
Remove no longer needed test. Make FilteredTransaction constructor private
 2017-02-09 17:57:31 +00:00
Andrius Dagys
bbcaf5d98c Demo bug fixes (#217) 
* Add webAddress back to NMS as it shifts the port allocation for all subsequent nodes and causes all demos to break.

* Attachment demo: fix node names

* Notary demo: fix certificate paths & ports

* IRS demo: role decider fixed to allocate roles properly. Previously it used to pick current node as the Fixer, causing both nodes to initiate the trade flow, resulting in double spend exceptions..
 2017-02-07 17:18:21 +00:00
Shams Asari
657cfa5d96 FlowException can be thrown from within UntrustworthyData.unwrap for better Java interop, and more checked exception annotations relating to flows 2017-02-06 16:00:52 +00:00
Mike Hearn
879ee9d897 Work around change in how c'tors with optional arguments are handled via RPC in FixingRoleDecider. 2017-02-06 12:29:34 +01:00
kasiastreich
45d8e0f76d Tearoff fixes (#78) 
* Move merkle building extension functions on wire tx to WireTransaction class.

* Add timestamp, notary, transaction type and signers to wire transaction id calculation.

* Change construction of MerkleTree from duplicating last node on a given level to padding leaves' list with zero hash to size of the nearest power of 2 - so we always have a full binary tree.
The problem was that it was possible to construct 2 different transactions with the same ids. Trick worked for txs having number of leaves that were not power of 2.

* Update tear-offs documentation and diagrams to reflect changes in construction of Merkle trees - padding with zero hashes and including all WireTransaction fields in id computation.

* Change in filtering API of WireTransaction for partial Merkle trees calculation.
Instead of many filtering functions over a transaction only one needs to be provided.
Additional change to check and verification of FilteredTransaction.

* IRS demo change. Make filtering function a protected method of RatesFixFlow class.
Comment on situation when capturing too much scope and connected problems with checkpointing.
Change oracle and tear-offs documentation.
 2017-02-03 14:02:51 +00:00
Shams Asari
b86c80691e FlowException serialised over RPC (subtypes are flattened), and improvement to startFlow RPC for correct exception handling 2017-02-03 11:21:10 +00:00
Ross Nicoll
2f9af7d7dc Revert Party.Full in preference for a less invasive change 2017-02-02 13:47:32 +00:00
Ross Nicoll
1b86ddfd6e Replace Party with Party.Full 
Replace Party with Party.Full as an interim step to introducing the Party.Anonymised class.

Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
 2017-02-01 15:18:12 +00:00
Ross Nicoll
3572b78372 Use signing key instead of name to identify parties in IRS 
The IRS demo uses names of parties to identify them in flows, which introduces problems when a node may not
know who a party is, as well as being a poor choice of key generally. This switches to use the owning key
instead.
 2017-02-01 15:18:12 +00:00
Clinton
d376a902ad Merge pull request #180 from corda/clint-webserversplit 
Split webserver from node
 2017-02-01 12:13:31 +00:00
Ross Nicoll
e383752995 Adapt Party comparison to use owningKey 
Change Party instances to be uniquely identified by the owning key, without taking into account name.
This requires that mock node key generation is reworked so that keys for services and the node itself
are distinct, otherwise the network map service cannot differentiate them.

Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
 2017-01-30 15:46:51 +00:00
Clinton Alexander
d2ebcbfab0 Fixed whitespace and formatting with IntelliJ autoformat tool. 2017-01-30 12:05:22 +00:00
Clinton Alexander
65b29a8379 Moved the transaction context into the RPC call site. 2017-01-30 11:21:01 +00:00
Clinton Alexander
537ffae113 Moved file uploading to RPC interface. 2017-01-27 14:13:58 +00:00
Clinton Alexander
d4b6e32682 t # This is a combination of 5 commits. 
Driver now queries webserver to ensure it has started.
 2017-01-27 14:13:29 +00:00
Andrius Dagys
d757429043 Update the demo date in order: first notary, then party nodes ordered by name. 2017-01-13 12:09:35 +00:00
Andrius Dagys
078a9e2b70 IRSDemoTest: wait until transactions have finished before completing the test. 
The date to set the demo date to is now + 6 months.
 2017-01-13 12:09:35 +00:00
Shams Asari
e589031d4b Some clean up of the flow code 2017-01-11 16:33:59 +00:00
Shams Asari
7cd281364f Removed basedir from the config file as it's always overwritten by the --base-directory cmd line arg 2017-01-10 10:49:28 +00:00
Katarzyna Streich
17beab06c2 Fix docs to reflect future date change. Add Kryo registration of PaymentEvent classes. 2017-01-06 16:22:27 +00:00
Shams Asari
59456cb6b1 Added a method to NodeHandle to simplify using RPC in the Driver 2017-01-06 14:14:32 +00:00
Shams Asari
08e391579c Node verifies the peer it connects to by checking its TLS common name 2017-01-05 14:22:11 +00:00
Clinton
f74fc67737 Merge branch 'master' into clint-irsdemowindowsfix 2017-01-05 09:51:02 +00:00
Clinton Alexander
3151586d54 Spelling fix. 2017-01-04 16:58:32 +00:00
Clinton Alexander
0fb77f9fa2 Added comment explaining fix to IRS demo on windows. 2017-01-04 16:57:47 +00:00
Mike Hearn
119d00c384 Upgrade dependencies and centralise some more version numbers in the root gradle file 2017-01-04 15:44:56 +01:00
Andrius Dagys
53903c6521 Update IRS demo test date to a future date. Will follow up with a proper fix. 2017-01-04 13:24:19 +00:00
Clinton Alexander
26217e5cd8 Added a fix for the windows specific command line too long error when running the IRS demo. 2017-01-04 11:44:24 +00:00
Clinton
b43d940297 Merge pull request #35 from corda/clint-M6publishing 
Corda can be published to bintray and reduced publishing boilerplate in build.gradle.
 2016-12-09 15:07:46 +00:00
Andras Slemmer
4fe1d48e4a demos: Fix demo RPC serialisation after rebase 2016-12-08 11:58:31 +00:00
Andras Slemmer
a601f0abf5 Local RPC, demos use RPC, NODE has special privileges 2016-12-08 11:58:31 +00:00
Clinton Alexander
a0d5426ced Due to insurmountable issues with publishing the JARs when the project is called Corda it has been renamed back to capsule. 2016-12-06 16:06:16 +00:00
Clinton Alexander
1463cd2b37 Renamec capsule module to corda. 2016-12-06 16:06:16 +00:00
Clinton Alexander
810596927e Added a new capsule build.gradle to allow multiple bintray uploads from one build.gradle. 2016-12-06 16:06:16 +00:00
Shams Asari
5432905b4a Clean up NetworkMapCache and InMemoryNetworkMapCache 2016-12-02 14:45:54 +00:00
Matthew Nesbit
e54a304e2e Depend upon an internal artifact, rather than a maven local published artifact when building the corda fatjar. 2016-11-30 16:16:51 +00:00
Mike Hearn
d500bf8f50 Address review comments. 2016-11-30 15:11:35 +00:00
Mike Hearn
7b40be8361 Run the IntelliJ reformatter across the Kotlin code. Did not reformat JS/web code. 2016-11-30 14:40:34 +00:00
Richard Green
34ea7f09af Starting new pull request - previous one had conflict errors 2016-11-29 16:52:07 +00:00
Rick Parker
55b10644dd Merged in parkri-oracle-docs (pull request #559) 
Update and add oracles documentation
 2016-11-29 15:12:09 +00:00
rick.parker
c3e8a9eb19 Doc updates for oracles 2016-11-29 15:09:38 +00:00
Shams Asari
38876e3984 Introducing Future.getOrThrow() which throws the cause of the ExecutionException 2016-11-28 15:21:22 +00:00
Mike Hearn
7b2eb651be Suppress or fix the few remaining compiler warnings 2016-11-28 14:04:30 +00:00
rick.parker
8ec21eedb3 quasarScan removal. 2016-11-24 16:27:51 +00:00
Mike Hearn
17e4950fe7 Minor: make IRS demo print things as expected, small comment and formatting tweaks. 2016-11-23 13:07:49 +01:00
rick.parker
f68529d1fd Rename protocol to flow. 2016-11-22 17:17:14 +00:00
Andrius Dagys
93505d5e2e Merged in andrius-rename-bits (pull request #508) 2016-11-22 08:26:37 +00:00
Andrius Dagys
64299591c3 Rename PublicKeyTree -> CompositeKey and unify terminology across documentation. 2016-11-21 14:47:19 +00:00
Clinton Alexander
2e73b16454 Removed redundant configuration in samples that misled developers. Fixed the dependency on Cordformation plugin. 2016-11-21 13:46:30 +00:00
Andrius Dagys
635ee8df79 Rename bits -> bytes, as it normally indicates a byte array 2016-11-21 13:02:27 +00:00
Richard Green
c7fedb95f8 Fixing test clock cordformation dsl 2016-11-18 18:17:02 +00:00
Clinton Alexander
48c0f75349 Fixed deploynodes not producing any artifacts for cordformation. 2016-11-18 17:15:55 +00:00
Mike Hearn
859542b2df Samples: make the IRS demo usable from the command line again 2016-11-18 13:02:12 +01:00
rick.parker
cd98b559bf Move jolokia access config to the config directories, alongside log4j2.xml file. Point samples at top level dev and test config. 2016-11-18 11:11:54 +00:00
Clinton Alexander
92a2ffedd2 Updated documentation regarding the running of nodes on Windows to reflect the new runnodes.bat file. 2016-11-17 18:25:49 +00:00
Mike Hearn
f247bc5647 Fixes to the deployNodes tasks for the samples. Improve the error message in the cordformation plugin. 2016-11-17 17:29:58 +01:00
Mike Hearn
f630e15528 Fix build 2016-11-17 16:33:06 +01:00
Mike Hearn
90b083926f Reimport samples to main repo 2016-11-17 15:51:28 +01:00