Commit Graph

7370 Commits

Author SHA1 Message Date
Katelyn Baker
9840d9d5a0 RELEASE - 4.1 RC02 2019-05-09 18:55:26 +01:00
Stefan Iliev
ba28e05beb CORDA-2888 change default dataSource.url to match the docker container structure. (#5098)
* If there is no dataSourceProperties in the node.conf, the default value is modified to match the docker structure and documentation of having a persistence folder.

* chagnes according to pr review.
2019-05-09 18:53:05 +01:00
Stefan Iliev
9259089071 CORDA-2641 - change documentation. (#5094)
* Changed documentation to prevent future issues.

* Changed according to code review.
2019-05-09 18:53:05 +01:00
Stefan Iliev
814ca9c980 CORDA-2888 Allow bring-your-own-config to docker image (#5095)
* CORDA-2888 Allow bring-your-own-config to docker image (#2035)

modify run logic so that if node config is present, do not generate a new one

* Change according to PR review.

* Removed whitespace from generate-config in the argument list.

* Changed state of initial registration part of the script to pre cherry-pick to preserve changes that arent into enterprise.
2019-05-09 18:53:05 +01:00
Richard Crook
f5dfc59886 CORDA-2929 : Improvements to docker image : compatible with v3.3; image size; truststore (#4965)
* CORDA-2929

* test-docker

* test fix
2019-05-09 18:53:05 +01:00
Matthew Nesbit
3083d6e4dc CORDA-2856 - Update the proton-j library to latest version (#5105) (#5109) 2019-05-09 15:23:28 +01:00
Tudor Malene
67808d985e CORDA-2363 - Fix ClassNotFound handling (#5078) (#5107)
(cherry picked from commit 25f335861b)
2019-05-09 15:23:21 +01:00
Rick Parker
95b6cd1c6d CORDA-2817 - Changelog for bug fix to stop commands being combined. (#5021) 2019-05-03 14:37:22 +01:00
Stefan Iliev
239376f699 CORDA-2519 - Changed crash version to our latest. (#4976)
* Changed crash version to our latest.

* Changed short revision to long revision on the crash dependency from jitpack.
2019-05-03 13:50:04 +01:00
Dan Newton
5a0b2b6f48 CORDA-2528 - Update contract testing documentation (#4977) 2019-05-03 13:49:13 +01:00
Dan Newton
750033540a CORDA-2535 - Fixes to IRS demo (#4995)
* CORDA-2535 Move classes from test src to main

For some reason a load of classes were in the test src rather than the
main src even though they were needed during runtime. These have been
moved back into main so they are compiled for use in the demo app.

* CORDA-2535 Fix missing trade id irs-demo home page

Change `deal.ref` to `deal.common.tradeID`

* CORDA-2535 Highlight in irs-demo that `node` module should not be depended on

The demo relies on `node` unless some larger refactoring is made. This
is being kept as it is, but to discourage developers from doing the
same in their CorDapps, a comment has been added to `build.gradle`
explaining why it is there and that developers should not do the same.
2019-05-03 13:47:42 +01:00
Dan Newton
fe41d9b4bb DOCS - Add documentation on Corda Services / Service classes (#5079) (#5096)
(cherry picked from commit a9a0f422af)
2019-05-03 13:45:47 +01:00
Stefan Iliev
97f31ef0f3 CORDA-2884 - Docker build tasks will pull the corda jar from artifactory. (#5067) (#5071)
* Changed corda jar to be pulled from artifactory.

* Changes according to PR review.
2019-05-01 17:09:26 +01:00
Dan Newton
fa38012339 CORDA-2572 - Add peer information to stacktrace of received FlowException (#4998)
When a `UnexpectedFlowEndException` or a `FlowException` is received the
peer that the exception was thrown from will be added to the stacktrace.
This is due to it being easier to see and a field that developers
are much less likely to override.

A nullable field `peer` has been added to `FlowException` and
`UnexpectedFlowEndException`. This is read later on (when peer info
is not available) to append the peer info to the stacktrace.
2019-05-01 13:51:44 +01:00
Stefan Iliev
1802e48963 CORDA-2586 - explorer exception handling (#4957)
* Initial version of new(old) dialog that won't print a stacktrace for rpc exceptions.

* Decoupled CordaVersionProvider. Moved common files to common-logging to lower dependencies on the node explorer.

* Removed unused import and duplicate documentation comment.

* Moved error code rewrite policy in the new common/logging module according to PR review.

* Removed extra line.

* Updated log4j configurations with new package name where logging policies will be contained.

* Included common-logging module with cliutils.
2019-05-01 13:50:50 +01:00
Dan Newton
2f7a2babb4 CORDA-2602 - Update getting setup guide java details (#5019)
Remove some information that is way to specific for installing the
oracle jdk.

Add mention of zulu openjdk to the docs.

Specify that the docs will go through how to install the oracle jdk
only but provide links to amazon corretto, openjdk and zulu.

Also say that we support intellij 2019 which has been released now.
2019-05-01 13:43:59 +01:00
Stefan Iliev
d67968fa88 CORDA-2632 - Handle exceptions when file does not exist. (#4967)
* corda-2632 Added catch clause to handle argument exceptions and display the proper error.

* Created specific exception for when the file is missing instead of the general catch all exception.

* Changes according to code review.
2019-05-01 12:18:40 +01:00
rui-r3
6b3998c7ae CORDA-2651 - Remove null values from changelog list (#5022)
* CORDA-2651 Check if resources are in classpath before passing them to Liquibase

* CORDA-2651 Add missing stop

* CORDA-2651 Change exception type. Improve exception log message.

* CORDA-2651 Add null check when getting resources from class loader

* CORDA-2651 Do not include null values in the changelog list
2019-05-01 12:17:25 +01:00
Dan Newton
8eca590e36 CORDA-2710 - Add Java samples to upgrading to Corda 4 documentation (#4979) 2019-05-01 12:15:40 +01:00
ben
19b076e96d CORDA-2777 - changing substitution mechanism so that it can work with code blocks 2019-05-01 12:05:34 +01:00
Ben Wyeth
08c4f1a2fb CORDA-2781 - Replace manual versions with substitutions (#4927)
* been through the docs manually and picked out substitutions

* hopefully addressing the url inconsistencies
2019-05-01 12:02:25 +01:00
Stefan Iliev
1128156153 CORDA-2821 Fix issue with Quasar errors redirecting to useless page (#4982)
* Changed dead url to the new location.

* Modified documentation. Linked new place for intelliJ guide.

* Changed url to the new link.
2019-05-01 11:21:13 +01:00
Bartman250
b4ba2ca4c1 CORDA-2834 Clarify error message when base directory doesn't exist (#4992)
* setting non existant base directory now yields suitable error message

* corrections to missing base directory message and comments added for clarity

* added check for valid base directory before node loggin and bootstrapping

* removed uneeded import

* quantum computer joke back by popular demand and not back at the same time
2019-05-01 11:20:33 +01:00
Dan Newton
cdc29dd4ca CORDA-2477 - Improve Signature Constraints documentation
* CORDA-2477 Improve Signature Constraints documentation (#5041)

The Signature Constraint documentation in `api-contract-constraints`
was very limited and referred to the design doc for most information.
Information was extracted from the design doc and added to the main
documentation.

(cherry picked from commit cb85dd1e92)

* CORDA-2477 Add codesets so backported docs show properly
2019-05-01 11:15:50 +01:00
Tudor Malene
bb41d2941d CORDA-2847 -Support custom serialisers when attaching missing attachments to txs (#5046) (#5062)
(cherry picked from commit 2e4c5d79f6)
2019-05-01 11:13:31 +01:00
Dominic Fox
a29f417a67 CORDA-2860 relax property type checking (#5028) (#5038)
* CORDA-2860 relax property type checking

* Remove redundant check

* Unit test

* Comment linking ticket to test

* More descriptive comment

* Fix test that was broken by jacocoData field being silently added to class

* Revert to previous behaviour around opaques, suppress validation
2019-04-18 14:20:00 +01:00
bpaunescu
95a3631628 CORDA-2861 - give the message executor its own Artemis session and producer (#5036) 2019-04-17 19:05:06 +01:00
Dan Newton
4e10f09016 DOCS - Fix tut-two-party-flow kotlin docs + make both versions easier to read (#5024) (#5032)
- `DOCSTART`s were not in sync
- Incorrect indentation
- Documentation not very clear

(cherry picked from commit 360660e4d7)
2019-04-16 17:23:19 +01:00
Dominic Fox
4e29d024e6 CORDA-2696 backport change from #4848 to release/4 (#5017) 2019-04-16 17:11:03 +01:00
JamesHR3
4afbf78c79 CORDA-2633 - Restructure evolution serialization errors to print reason first (#4978) (#5014)
(cherry picked from commit 9963a6609f)
2019-04-15 10:27:39 +01:00
Tudor Malene
21adcffd31 CORDA-2743 - utilities and test to show rpc operations that support disconnects (#5009) (#5015)
(cherry picked from commit 6771386b4b)
2019-04-15 10:25:55 +01:00
JamesHR3
ee884a92de CORDA-2522 - Improve error reporting around failed flows (#5016)
* [CORDA-2522] Improve error reporting around failed flows (#5000)

* Improve error reporting around failed flows

* Fix an index to start from 1 when printed

* Address first set of review comments

(cherry picked from commit 24699cd7f4)

* [CORDA-2522] Follow up changes to error reporting around failed flows (#5006)

* Follow up changes to error reporting around failed flows

* Have FinalityDoctor report stack trace

* Revert changes to the DumpHistoryOnErrorInterceptor

(cherry picked from commit 2da597a5b7)
2019-04-15 10:25:18 +01:00
Tudor Malene
0ba7b65ee8 CORDA-2456 - Documentation around explicit upgrades (#4783) (#5018)
* Documentation around explicit upgrades

Small changes

Fix merge

* Address review comments

(cherry picked from commit 09ba5c2652)
2019-04-15 10:24:40 +01:00
Tudor Malene
43e3755c6f CORDA-2621 - change message when rpc/p2p login fails (#4994) (#5020)
(cherry picked from commit d15699289c)
2019-04-15 10:23:30 +01:00
Dominic Fox
13f6bc0c4d CORDA-2848 - relax fingerprinter strictness (#5001 (#5007)) 2019-04-12 11:54:47 +01:00
Tudor Malene
358d984829 CORDA-2825 - Fix Progress Tracker bug (#4986) (#4989)
* CORDA-2825 Fix Progress Tracker bug

CORDA-2825 Add discriminator

CORDA-2825 Fix hashcode

CORDA-2825 remove todo

CORDA-2825 more tests

* CORDA-2825 Address code review comments

(cherry picked from commit 685f94bf66)
2019-04-09 10:10:18 +01:00
Katelyn Baker
8f81b770e0 RELEASE - 4.1-RC01 2019-04-03 16:03:29 +01:00
Katelyn Baker
71114cd412 Merge branch 'master' into release/4 2019-04-03 16:01:54 +01:00
Rick Parker
2685596798
CORDA-2817 Revert CORDA-2162 but modify Cash move to allow multiple m… (#4971)
* CORDA-2817 Revert CORDA-2162 but modify Cash move to allow multiple move commands and thus multiple generateSpends in the same transaction.

* CORDA-2817 Remove API changes and internalise into Cash.
2019-04-02 18:23:43 +01:00
Cais Manai
f4d7bc9a18 Cais r3 doc fixes (#4974)
* StatesAndContract.kt to TemplateContract.kt

* Updating to reflect new template structure

* Update tut-two-party-contract.rst
2019-04-02 11:20:12 +01:00
Tudor Malene
24f63b2e64 CORDA-2689 Remove annoying ProgressTracker warning. (#4970) 2019-04-01 17:20:39 +01:00
Thomas Schroeter
e0f19ca70b CORDA-2647 ROLLBACK (#4964)
* Revert "Address comments"

This reverts commit f884d112c3.

* Revert "CORDA-2647 - Prevent registration when previous state exists"

This reverts commit 4e9d1f1924.
2019-03-29 18:06:12 +00:00
josecoll
add380b135
Merge pull request #4963 from corda/colljos-backport-secfix-serializer
(BACKPORT) ENT-3121 restrict custom serializers
2019-03-29 16:51:44 +00:00
Christian Sailer
9668b8530a CORDA-2813 Handle loss of database (#4962)
* CORDA-2813 Add DbException handler to terminate process when the DB goes away or gives up.
Also add a helper to terminate the node and use it instead of calling Runtime.halt() in random places.

* CORDA-2813 Address threading/blocking concerns raised during review
2019-03-29 16:47:38 +00:00
Ben Wyeth
a012b75c31 turned of latex warnings so that we can see the warnings wood for the trees (#4956) 2019-03-29 15:43:01 +00:00
Dominic Fox
c04a448bf3 CORDA-2782 allow un-whitelisted Comparable (#4940) 2019-03-29 15:24:08 +00:00
josecoll
864efe38d1 ENT-3440 Allow custom serializers that extend CordaThrowable. 2019-03-29 14:50:31 +00:00
Dominic Fox
17e7cd3abc ENT-3121 - restrict custom serializers (#1852)
* Tests for custom registry restrictions

* ENT-3121 restrict custom serialisation

* Remove redundant code

* Only count declared annotations

* Check annotation on superclasses, remove annotation from ByteArray

* Forbid custom serialization of primitive types

* Remove @CordaSerializable from another class that is always handled by custom serialisation

* Add log warnings to aid diagnosis of custom serialization issues

* Remove another annotation

* Remove another annotation

* Remove another annotation

* Remove another annotation

* Fixup api-current

* Fixup api-current

* KDocs on exceptions
2019-03-29 14:48:07 +00:00
Thomas Schroeter
dc46446432 [CORDA-2807] Don't retry db transaction in AbstactNode start (#4942)
Retries can lead to confusing error messages in case the CFT notary is
misconfigured and throws a SQLException causing a retry.
2019-03-29 09:41:39 +00:00
JamesHR3
d9e11b21ae Remove targetPlatformVersion check from FinalityFlow and update docs (#4955)
In Corda 4, FinalityFlow was updated to become an initiated flow, in order to ensure a node does not have to accept any signed transaction it receives without being able to check it first. The old behaviour of FinalityFlow was gated behind a targetPlatformVersion check, to prevent apps targeting V4 from using the old behaviour.

This is problematic for a few reasons. For an app wishing to be backwards compatible with a version running on V3, this forces the app to set targetPlatformVersion = 3, even if the app is thoroughly tested against V4. This goes against the purpose of the targetPlatformVersion. Another consequence is that an app remains pinned to targetPlatformVersion = 3 until it is sure that there are no other apps running at a lower version in the network, which would prevent newer versions of the app from taking advantage of features gated behind targetPlatformVersion checks. (Note that the restriction only prevents a new version of the app from initiating FinalityFlow with the old version - the old version is able to initiate a FinalityFlow and the new version will handle it, assuming the app has been written correctly.)

This fix removes the targetPlatformVersion check from FinalityFlow, and also provides a few documentation updates to clarify what level of testing would be expected to set a targetPlatformVersion.
2019-03-28 14:21:59 +00:00