Commit Graph

5407 Commits

Author SHA1 Message Date
Clinton Alexander
2303cdc39e RELEASE - Fixed build.gradle issues that break maven central publishing and standardised dependency specification. 2018-07-20 14:45:35 +01:00
Katelyn Baker
f44cec5321
CORDA-1789 - Split Doorman / NM config - fix for CORDA-1510 (#3605) 2018-07-17 15:11:31 +01:00
Katelyn Baker
729d1b29a6
CORDA-1790 - Roll back flow transaction on exception (#3597) (#3616)
* CORDA-1790 Roll back flow transaction on exception

* CORDA-1790 Roll back flow transaction on exception

* CORDA-1790 Roll back flow transaction on exception
2018-07-16 17:44:34 +01:00
Viktor Kolomeyko
ac6cbeca0c CORDA-1686 - Make "rpc-client-sender" daemon (#3455) (#3611)
Such that they do not prevent application that started them from exiting.

(cherry picked from commit 3492350)
2018-07-16 11:26:13 +01:00
Michele Sollecito
3da07a1105
Merge pull request #3613 from corda/kat/bakport/corda-1804
CORDA-1499, CORDA-1804  (#3607)
2018-07-16 10:39:30 +01:00
szymonsztuka
5f0c8e0707 Backport CORDA-1499 CORDA-1804 - remove unused code. 2018-07-16 10:35:53 +01:00
Katelyn Baker
9865170233 CORDA-1808 - Refactor serialization test infrastructure backport 2018-07-16 10:16:38 +01:00
Katelyn Baker
a47348d52a CORDA-1662 - Post backport fixes 2018-07-16 10:16:38 +01:00
Katelyn Baker
61b8bb4c6b CORDA-1662 - Corda Serialization Evolution breaksdown with Java classes (#3427)
Nullability logic was relying on annotations that Kotlin applies by
default but is left to the developer in Javaland. Change this around
so it works for both.

In Kotlin, the property must be nullable, in Java, it can't be a
primitive.
2018-07-16 10:16:38 +01:00
szymonsztuka
fad90eee8b CORDA-1499, CORDA-1804 (#3607)
* Fix a typo in node_attchments_contracts table name. (#3202)

(cherry picked from commit 57d379597b)

* CORDA-1804 Corda node stops when detecting not migrated node_attachments_contracts table name (#3593)

Database table NODE_ATTACHMENTS_CONTRACT_CLASS_NAME in v3.0 was changed to NODE_ATTCHMENTS_CONTRACTS in v3.1 and then finally NODE_ATTACHMENTS_CONTRACTS on current master. Users may omit the upgrade note and run into errors. After the change the node will not start if the new table name is not found and any other older ones is found.

(cherry picked from commit 208ac49da0)

* Fixes after cherry-pick of 208ac49da0.
2018-07-16 10:06:34 +01:00
Katelyn Baker
a7e1381086
CORDA-1634 - Destroy child processes when parent exits. (#3368) (#3604)
* [CORDA-1634] Destroy child processes when parent exits.

* Add comment.

* Register Shutdownhook for processes regardless of whether the Driver was initialized with

* Add comment.

* Revert "Add comment."

This reverts commit a5e78c379f.

* Add comment.

* Add shutdown hook in ShutdownManager.registerProcessShutdown.

* Initialize the ShutdownManager with a shutdown hook to ensure that  is called.

* Add comment.
2018-07-13 18:15:05 +01:00
Katelyn Baker
143379dad7
CORDA-1588 - Add an extra check in the attachment resolution flow to prevent duplicate attachment import if multiple transactions with the same attachment are being resolved at the same time. (#3599) 2018-07-13 18:14:34 +01:00
Katelyn Baker
c73647b4fe
CORDA-1628 - Increase max restart count for notary client flows. (#3357) (#3603)
This will ensure that the notary client flow will retry over a sufficient
period of time for the notary to update its network map.

With a backoff base of 1.8 and 5 retries the last retry will fire after
about 20 min 8 sec of the initial flow start:

0	30
1	54
2	97.2
3	174.96
4	314.928
5	566.8704

Total 1207.9584	= 20.13264 min
2018-07-13 18:13:41 +01:00
Katelyn Baker
5772208c7c
CORDA-1717 - backport bootstrapper to 3.2 (#3496) (#3602) 2018-07-13 18:13:24 +01:00
Katelyn Baker
9259c9ec45 Serialization documentation backport (#3594) 2018-07-13 14:44:03 +01:00
Katelyn Baker
b36cfab871
CORDA-1727 - Document more clearly the supported version of IntelliJ and the IntelliJ Kotlin Plugins. (#3550) (#3588) 2018-07-13 13:52:06 +01:00
James Brown
2b78b3f724 CORDA-1744 - update jolokia to latest version (#3564) 2018-07-13 13:33:54 +01:00
Michal Kit
3541a00343 remove CRL url from dev doorman cert (#3555) (#3560) 2018-07-13 12:38:23 +01:00
Shams Asari
9fc108aa1e CORDA-1709 - The MVP blob inspector, able to inspect network service blobs (#3503)
* Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) (#3102)

Also deprecated all the public members that shouldn't have leaked into the public API.

(cherry picked from commit 3bb95c3)

* CORDA-1238: Updated JacksonSupport to support SerializedBytes, CertPath, X509Certificate and the signature classes (#3145)

SerializedBytes are first converted to the object it represents before being serialised as a pojo.

These changes will be needed to support the the blob inspector when it will output to YAML/JSON.

(cherry picked from commit b031e66)

* Cherry picked part of commit 824adca to port over *only* the JackSupport refactoring.

* CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport (#3224)

The existing output format was not complete and so was deleted to avoid it becoming a tech debt. We can always resurrect it at a later point.

(cherry picked from commit 4e0378d)

* Added back support for parsing OpaqueBytes as UTF-8 strings in JacksonSupport (#3240)

(cherry picked from commit d772bc8)

* Cleaned up blob inspector doc (#3284)

(cherry picked from commit b7fbebb)

* Blobinspector: trace level logging with --verbose (#3313)

(cherry picked from commit 6a2e50b)

* Cherry picked part of commit 3046843 to fix issue with --version

* Fixes to the api file
2018-07-03 19:58:13 +01:00
Tommy Lillehagen
00c9b8ce49 CORDA-1711 - Remove dependency on PathUtilsKt in net.corda.core.internal (#3495) 2018-07-03 13:05:10 +01:00
Katelyn Baker
f86aaa2866
CORDA-1510 - Allow Doorman and NetworkMap to be configured independently (#3494)
* CORDA-1510 - Allow Doorman and NetworkMap to be configured independently  (#3485)

Currently only one compatabilityZoneURL can be specified, however the
two services can be run on as separate servers. Allow nodes to be
configured in this manner

* Fix cherry-pick
2018-07-03 12:57:03 +01:00
Michal Kit
d1409656bc CORDA-1661 - Reverting DEV certificates keys (#3466) 2018-06-29 13:41:03 +01:00
Anthony Keenan
5be8c9a102 CORDA-1498 - serialization multiple transform bug (#3391)
* CORDA-1498: serialization multiple transform bug (#3216)

* Fix issue when evolving enums with transformation chains

* Regenerate test data for deserializeWithRename test and unignore

* Further tweaks / remove debugging

* Formatting tweaks

* Address review comments

* Remove debug

* Add classname to serialization tranform exceptions

* Use direct node links instead of indexes to improve readability

* More readability tweaks

* More readability improvements

* rename require to requireThat to resolve conflict with kotlin libraries

* Add logging of error message

* Change requireThat helper to inline function

* remove unneeded toString

* Further tweaks

* Change NotSerializableException to more generic IOException

* Make exception context clearer

# Conflicts:
#	node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/EnumEvolvabilityTests.kt
#	serialization/src/test/resources/net/corda/serialization/internal/amqp/EnumEvolveTests.deserializeWithRename.1.C
#	serialization/src/test/resources/net/corda/serialization/internal/amqp/EnumEvolveTests.deserializeWithRename.2.C
#	serialization/src/test/resources/net/corda/serialization/internal/amqp/EnumEvolveTests.deserializeWithRename.3.C

* Fix merge conflicts

* Fix broken test

* Revert changes to serialized classes
2018-06-22 15:53:18 +01:00
Ivan Schasny
371031dd3b CORDA-1459 - Buggy CommodityContract issuance logic (#3338) 2018-06-12 17:24:03 +01:00
Michele Sollecito
b6339a7fc6 CORDA-1575, CORDA-1341 - Fix logfiles for out of process nodes, Ensure API can be called concurrently wrt transactions.(#3312)
* [CORDA-1575]: Out of process nodes started by the driver do not log to file (fix).

* [CORDA-1341]: Ensure API can be called concurrently wrt transactions.

* [CORDA-1575]: Fixed unstable test.
2018-06-07 11:26:19 +01:00
szymonsztuka
588c480bcd CORDA-1499 - Fix a typo in node_attchments_contracts table name. (#3310)
(cherry picked from commit fc54263)
2018-06-06 16:03:25 +01:00
szymonsztuka
cdce596acd CORDA-1266 - When a cash output is identical only the fist output is saved. (#3244) (#3311)
(cherry picked from commit 0a4d981)
2018-06-06 16:02:50 +01:00
Katelyn Baker
51bb6a8dfc
CORDA-1356 - OOM when using Demobench + Explorer (fix). (#3268) (#3300) 2018-06-05 17:38:44 +01:00
Maksymilian Pawlak
33e45eef4a CORDA-1297 - Columns nullability (#3112) -> V3 (#3303)
* [CORDA-1297] Columns nullability (#3112)

JPA/Hibernate entities need to impose the correct NULL/NOT NULL constraints on the database - whatever these correct values actually are.
API change: net.corda.core.schemas.PersistentStateRef fields (index and txId) are now non-nullable. Rationale: The fields were always effectively non-nullable - values were set from non-nullable fields of other objects. The class is used in context of database table Primary Key of for other entities and a database already imposes those columns as non-nullable (even if JPA annotation nullable=false was absent).

(cherry picked from commit 7d69bc6)

* Compilation fix
2018-06-05 15:55:20 +01:00
Joel Dudley
bbce1ed854
Update getting-set-up.rst 2018-06-05 09:00:51 +01:00
Katarzyna Streich
f132923b86 CORDA-866, ENT-1933 - Remove stale nodes from Network, Fix NetParam serialization (#3255) (#3128)
*  CORDA-866: Implement removal of stale nodes from network - backport (#3128)

* CORDA-866: Implement removal of stale nodes from network

Backported

* Implement removal of stale nodes from network

Add eventHorizon to NetworkParameters structure. Add republishing of
node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing.

* Add copy method to NetworkParameters data class

Add JvmOverloads annotation to the constructor, because it's data class
exposed in API

* Fix test

* ENT-1933: make NetworkParameters serialization compatible (#3234)

* ENT-1933: make NetworkParameters serialization compatible

* Fixes after cherry-pick
2018-05-31 10:03:51 +01:00
Joel Dudley
593708e885
Reflects master changes to set up and contrib instructions. (#3264) 2018-05-30 13:45:58 +01:00
Katelyn Baker
5ee91e6425
Merge pull request #3253 from corda/serializer-backports
Serializer backports
2018-05-30 09:20:30 +01:00
Katelyn Baker
aaa6eadadd RELEASE - Update api to match new annotation generation 2018-05-29 18:41:35 +01:00
Katelyn Baker
7d9199fd14 CORDA-1545 - Arrays of primitive byte arrays don't deserialize (#3249)
At serialization time we incorrectly encode the type as byte[p][] instead
of binary[]
2018-05-29 14:59:47 +01:00
Katelyn Baker
ba0a94d54d CORDA-1530 - Generics break default evolver (#3232)
* CORDA-1530 - Generics break default  evolver

When selecting an annotated constructor for evolving a type make sure
we treat generics in the same manner we did when serialized. Effectively
throw away the template information and treat lists as lists and maps
as maps
2018-05-29 14:52:23 +01:00
Michele Sollecito
76eaff6d88 Corda-1338 | Corda-1394 (#3205)
* [CORDA-1394]: Node can fail to fully start when a port conflict occurs, without a useful error message (fix).

* [CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState (fix).

* [CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState (fix).

* Attempting to fix weird recursive types problem.

* Attempting to fix weird recursive types problem.

* Attempting to fix weird recursive types problem.
2018-05-23 17:52:02 +01:00
Shams Asari
2729ada251 CORDA-1405 - Integration test for network parameter updates and improved logging (#2865)
(cherry picked from commit 620ba1e)

Also updated the toString() of NetworkParameters and NetworkMap to be better formatted.
2018-05-22 13:57:15 +01:00
Katelyn Baker
f9e0742d69
CORDA-1455 - Error in process-id deletion process allows multiple instances of same node to be run (fix). (#3118) (#3195) 2018-05-19 12:35:32 +01:00
Katelyn Baker
2d1ceb6cb0
CORDA-1342 - The shell doesn't print the return value of a started flow - fixed. (#3007) (#3197) 2018-05-19 12:35:12 +01:00
Katelyn Baker
540132174c
CORDA-1315 - small doc correction (#3079) (#3192)
* CORDA-1315 small doc correction

* CORDA-1315 address code review changes
2018-05-18 16:24:22 +01:00
Katelyn Baker
e39c7a222a
CORDA-1386 - Updates withoutIssuer to not strip display token size. (#3191) 2018-05-18 15:46:04 +01:00
Katelyn Baker
35246460e2
Merge pull request #3189 from corda/cherrypick-corda-1397
CORDA-1397 - Fixed incorrect exception handling in `NodeVaultService…
2018-05-18 14:29:02 +01:00
Katelyn Baker
839cd04fdc
Merge pull request #3114 from corda/cherrypick-corda-1317
CORDA-1317 - Add cert role to CSR and doorman issue cert according to the cert role
2018-05-18 14:28:41 +01:00
Michele Sollecito
1700d30bc7 [CORDA-1397]: Fixed incorrect exception handling in NodeVaultService._query(). (#3043) 2018-05-18 12:14:47 +01:00
josecoll
1b214e00c1
Reordering fix: move now works as depends on creation of html directory from previous step. (#3106) 2018-05-17 10:29:07 +01:00
Anthony Keenan
181829a325 CORDA-1280 - Update the api-scanner to the most recent version + regenerate api (#3154)
* Update v3 api scanner to most recent version

* Regenerate api-current.txt

* Fix bootstrapper classpath
2018-05-16 11:56:23 +01:00
Katelyn Baker
d63ee71564
CORDA-1344 Fix query paging in scheduled flow tests (#2970) (#3096)
* Fix paging tests, move out of scheduled flow tests and provide java example

* Fix a few issues with docs
2018-05-15 15:57:27 +01:00
Katelyn Baker
c2b733d64c merge failure fix 2018-05-11 18:08:33 +01:00
Joel Dudley
7a7599486b
Resolves conflicts. (#3089) 2018-05-11 10:06:49 +01:00