Andrius Dagys
0adc203d7a
CORDA-696: Fix conflict resolution error, fix filename type
2018-02-27 09:48:39 +00:00
Andrius Dagys
d425a10c2b
Merge pull request #486 from corda/andrius-merge-02-26
...
Merge CORDA-1096, CORDA-696, CORDA-877
2018-02-27 09:22:16 +00:00
Andrius Dagys
59a6ced423
CORDA-696: Fix incorrect merge conflict resolution, fix filename typo
2018-02-26 18:48:20 +00:00
Andrius Dagys
9814ea6f34
Merge branch 'master' into andrius-merge-02-26
2018-02-26 18:41:20 +00:00
Joel Dudley
3c8db47b5a
Updates shell example of starting flow to reflect cash API change.
2018-02-26 18:16:25 +00:00
Chris Rankin
9da3a8ee05
[ENT-1552] Delete temporary truststore once the test is complete. ( #484 ) ( #2634 )
2018-02-26 17:11:10 +00:00
Joel Dudley
f1c3f584ac
Showcase link in Quickstart guide. Remove Utilities link (merged with Samples).
2018-02-26 16:47:53 +00:00
Rick Parker
2da28c574e
CORDA-1040 docs for FlowLogic.sleep ( #2625 )
2018-02-26 16:07:40 +00:00
Maksymilian Pawlak
b91ef43e0f
Remove the debug helper which should never make it into master ( #2633 )
...
* Remove IRS Docker demo helpers
2018-02-26 15:47:04 +00:00
Maksymilian Pawlak
cc84b34dca
Close classloader to release associated file ( #2635 )
...
[CORDA-1113] Close classloader to release associated file
2018-02-26 15:01:57 +00:00
Joel Dudley
7517270dde
Improves node.conf page. Shows the defaults used.
2018-02-26 14:53:13 +00:00
Chris Rankin
26c388003c
[ENT-1552] Delete temporary truststore once the test is complete. ( #484 )
2018-02-26 12:46:47 +00:00
cburlinchon
60c44a0358
CORDA-998 Add suspend and resume functionality to Node ( #461 )
...
* Add suspend and resume functionality to Node to stop minimum number of services(P2PMessaging, RPCMessaging, NodeScheduler, StateMachine and BridgeManager)
2018-02-26 11:56:02 +00:00
Andrius Dagys
cc8e38922e
Merge remote-tracking branch 'open/master' into andrius-merge-02-26
2018-02-26 11:55:17 +00:00
Andrius Dagys
0edfef2409
CORDA-696 - Create separate transaction types for contract upgrade transactions ( #2589 )
...
* CORDA-986 and CORDA-985 CompositeKey and Signature verification performance fixes (#2467 )
* CORDA-696: Create separate transaction types for contract upgrade transactions.
Add rationale around upgrade transactions
Move contract upgrade transaction resolution logic into internal until it's stabilised.
Throw a better exception when contract attachment not found
Default legacy contract constraint to always accepting - needs to be changed to whitelist constraint before merging
Introduce a new upgraded contract interface that allows specifying the legacy constraint.
Remove StateLoader, make all tx resolution functions take in ServicesForResolution
Contract upgrade transactions can handle whitelist by zone constraints
When creating a contract upgrade transaction, make sure the attachment of the old cordapp gets attached when using hash constraints.
Attachment lookup for a given contract class name only scans currently loaded cordapps, and we don't load old versions of cordapps.
CORDA-696: Update upgrade docs
2018-02-26 11:29:25 +00:00
Christian Sailer
a483e7e8ce
CORDA-1096 - Performance when loading multiple states from the vault ( #2614 )
...
* CORDA-1096 - Performance when loading multiple states from the vault (#2609 )
* Provide efficient `loadStates()` implementation
* Replace loops using `loadState` with calls to `loadStates`
* Replace `map`/`flatMap` with just a single `flatMap`
2018-02-26 09:37:32 +00:00
Ben Abineri
908a614888
Merge pull request #483 from corda/merges/february-23-15-30
...
Merges/february 23 15 30
2018-02-26 09:33:16 +00:00
sollecitom
d7b7dc4925
Merge branch 'master' into merges/february-23-15-30
2018-02-26 09:30:43 +00:00
Michele Sollecito
7828e658ac
Revert "Merges - 23rd February 2018 at 15:30 ( #479 )" ( #482 )
...
This reverts commit 2f60ff44a6
2018-02-26 09:28:56 +00:00
Joel Dudley
50ccb32700
Adds a 'provision the certificates' step to the Windows deployment instructions.
2018-02-26 09:21:27 +00:00
Maksymilian Pawlak
1bca591dd1
Disable unit test for experimental projects ( #2627 )
...
* Disable unit test for experimental projects
2018-02-23 20:48:39 +00:00
igor nitto
fd491d91ff
WebServer init failure on config produced by plugins >= 4.0.2 [CORDA-877] ( #2624 )
2018-02-23 18:29:49 +00:00
Michele Sollecito
2f60ff44a6
Merges - 23rd February 2018 at 15:30 ( #479 )
2018-02-23 17:53:15 +00:00
Thomas Schroeter
d3dcbfb6c3
Fix path of main class ( #478 )
2018-02-23 17:05:05 +00:00
sollecitom
11a484eb03
Fixed notary healthchecker cordformation.
2018-02-23 16:39:36 +00:00
sollecitom
e78e65bd01
refreshed api-current.txt
2018-02-23 16:19:13 +00:00
sollecitom
3d4e24a364
Patched doorman network parameters with empty list for now, and added a TODO.
2018-02-23 16:01:49 +00:00
sollecitom
d41b9a0299
merged OS into master
2018-02-23 15:47:07 +00:00
Michele Sollecito
191f412aba
Fixed flows draining mode after regression introduced by OS -> ENT merge ( #474 )
2018-02-23 15:19:37 +00:00
Michele Sollecito
5be0e4b39e
[CORDA-941]: Add NetworkParameters contract implementation whitelist. ( #2580 )
2018-02-23 14:29:02 +00:00
Shams Asari
977836f4eb
Enable tests which were ignored due to recent flakiness on TC and issue with maxTransactionSize which should now be resolved. ( #2621 )
2018-02-23 13:45:18 +00:00
Patrick Kuo
1552e992e7
ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role ( #2620 )
...
* ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role (#431 )
* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.
(cherry picked from commit 94f7392
2018-02-23 13:38:09 +00:00
Andras Slemmer
089916d350
Merge pull request #466 from corda/aslemmer-merge-19-Feb
...
Aslemmer merge 19 feb
2018-02-23 13:20:07 +00:00
Andrzej Cichocki
c8672d373f
CORDA-973 Compression support for serialization ( #2473 )
...
* Serialization magic is now 7 bytes
* Introduce encoding property and whitelist
2018-02-23 13:07:51 +00:00
Andras Slemmer
f5167e207f
Merge remote-tracking branch 'origin/master' into aslemmer-merge-19-Feb
2018-02-23 11:18:16 +00:00
Patrick Kuo
94f73920cc
ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role ( #431 )
...
* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.
2018-02-23 10:57:59 +00:00
Shams Asari
2af0feee04
Various cleanup of the network map code ( #2604 )
2018-02-23 09:13:00 +00:00
Michele Sollecito
e91b74962b
[CORDA-1098]: Fixed Artemis filters for flows draining mode. ( #2613 )
2018-02-22 20:45:56 +00:00
Andras Slemmer
cf459dd823
Fix VerifierDriver
2018-02-22 17:16:43 +00:00
Andras Slemmer
dd8a709971
Ignore P2PFlowsDrainingModeTest
2018-02-22 15:32:47 +00:00
Andras Slemmer
67f9266b24
Merge pull request #2597 from corda/aslemmer-CORDA-1043
...
CORDA-1043
2018-02-22 14:56:20 +00:00
Joel Dudley
904f706e10
[CORDA-1035] Flow test API docs
2018-02-22 14:38:02 +00:00
Joel Dudley
c94b606cf0
Fixes a typo in the node deployment docs.
2018-02-22 14:15:25 +00:00
Andras Slemmer
33b24cb27e
Temporrary fix for transaction size check
2018-02-22 12:36:35 +00:00
Andras Slemmer
dbe02ced99
Fix up compiler.xml. I think
2018-02-22 10:45:00 +00:00
Andras Slemmer
1722ec5e69
Remove stringy check from test
2018-02-22 10:12:58 +00:00
Michele Sollecito
5db4882668
[CORDA-1089]: Ensure graceful error message is shown on node startup if RPC settings are invalid. ( #2595 )
2018-02-22 09:47:56 +00:00
igor nitto
731cb1b67e
Remove unused occurrences of 'exportJMXto' ( #2588 )
2018-02-21 19:05:55 +00:00
Andras Slemmer
6a2217ace6
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-21 18:10:37 +00:00
Andras Slemmer
51704cd7a4
Merge pull request #2591 from corda/aslemmer-fix-mocknetwork-networkparams
...
Pass network params to InternalMockNetwork
2018-02-21 18:00:02 +00:00
