1c169d035a
Shade the zookeeper libraries to avoid version conflicts
...
Add comment to explain gradle logic
2018-04-17 12:07:09 +01:00
47cc2f0bb1
Merge remote-tracking branch 'open/master' into merge/tudor_16_04_18
2018-04-16 13:32:01 +01:00
9d2b7f0b7b
CORDA-1313 RPC whitelist TransactionVerificationException ( #2965 )
2018-04-16 13:29:36 +01:00
408582cd05
OS -> R3 Corda up to CORDA-1336
...
OS -> R3 Corda up to d8bf1019b6
2018-04-13 18:09:30 +01:00
d34d599baf
fix url ( #735 )
2018-04-13 16:58:19 +01:00
a0bf0261bb
Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336
2018-04-13 16:39:00 +01:00
d8bf1019b6
CORDA-1336: Turn off direct delivery in Artemis via config ( #2961 )
...
* CORDA-1336: Turn off direct delivery in Artemis via config - this can
deadlock when the server gets busy and switches back and forth between
direct and async delivery if it can't keep up.
* CORDA-1336: put in a comment explaining the config setting.
2018-04-13 16:17:24 +01:00
91c52af5ac
ENT-1584: Subscribe to private network maps using UUIDs ( #2922 )
...
Client private network map implementation
Add private network maps UUIDs to config as extraNetworkMapKeys. Adjust NetworkMapServer implementation accordingly.
Change NetworkMapUpdaterTest to use NetworkMapServer instead of mock
2018-04-13 10:52:45 +01:00
5bb9514582
Merge remote-tracking branch 'open/master' into kat-merge-180412
2018-04-12 20:34:28 +01:00
02913b284e
CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. ( #2954 )
...
Instead the current whitelist is read in from the existing network parameters file.
2018-04-12 17:03:06 +01:00
80c075b19e
Merge pull request #2958 from corda/pat/ent-1323-cherrypick
...
ENT-1323 Network map service to check all identities in submitted node info
2018-04-12 14:04:47 +01:00
b5f304a104
ENT-1323 Network map service to check all identities in submitted node info ( #499 )
...
* ENT-1323 Network map service to check all identities in submitted node info
* fixup after rebase
* address PR issues, refactored createValidNodeInfo
* address PR issues
(cherry picked from commit f9ed55b
2018-04-12 13:11:30 +01:00
f9ed55b731
ENT-1323 Network map service to check all identities in submitted node info ( #499 )
...
* ENT-1323 Network map service to check all identities in submitted node info
* fixup after rebase
* address PR issues, refactored createValidNodeInfo
* address PR issues
2018-04-12 13:05:15 +01:00
e6d352e446
Review comments
2018-04-12 12:09:17 +01:00
03850dabc2
Review comments
2018-04-12 11:58:56 +01:00
c783c431b1
Fix broken comment
2018-04-12 11:23:13 +01:00
84914aa5c8
Remove commented out code
2018-04-12 11:18:39 +01:00
f19bcea82f
CORDA-1229 - Setter serialization fails with lists
...
Looks like the super / sub type inference of setter param vs
getter param is the wrong way around. Also, Setter Type should
be the generic type, not just the type
the property must be a supertype of the setter parameter
the getter must be a supertype of the setter parameter
2018-04-12 11:17:26 +01:00
241f7738e4
ENT-1704 restructure db migration documentation ( #636 )
2018-04-11 16:48:25 +01:00
e51de2739c
When discarding invalid messages we should consume them. When starting up wait for node bridge registration before activating the float, otherwise we have a race condition.
...
Reduce excessive logging
Address PR comments
Address PR comments
2018-04-11 15:26:27 +01:00
f022c67689
ENT-1618: added support for RPC client in HA mode(automatic failover) ( #706 )
...
* ENT-1618: added support for RPC client in HA mode(automatic failover)
* RPCClient: renamed variables to avoid confusion about clustering
2018-04-10 12:38:37 +01:00
a97abbc8c0
Merge remote-tracking branch 'open/master' into os-merge-1b37cef
2018-04-05 17:23:03 +01:00
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash ( #2931 )
2018-04-05 17:18:27 +01:00
c8b58a601f
Adding CRL support in the generated certificates. ( #2932 )
2018-04-05 16:39:41 +01:00
53a0aae489
Introduced a few helper methods around InputStream.readBytes ( #2928 )
2018-04-05 14:27:42 +01:00
375b4638ba
Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
# node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt
2018-04-05 13:12:13 +01:00
71fa61020e
Adding a unit test for SignedNodeInfo verification ( #2925 )
2018-04-05 11:25:41 +01:00
6283462548
Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-04-04 14:18:24 +01:00
0af42bda44
Fix a bug in the AMQP protocol wrapper code which gives incorrect reply address information on received packets. ( #2914 )
2018-04-04 11:23:09 +01:00
fbafe36643
Merge commit '2f1b8ff23e5a0400f72ff603da10b849604c6b04' into aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
2018-04-03 17:10:33 +01:00
2f1b8ff23e
Fixing SignedNodeInfoe security issue ( #2908 )
2018-04-03 15:49:06 +01:00
625d0447aa
ENT-992: Introducing the CRR submission tool ( #633 )
...
* Introducing the CRR submission tool
* Addressing review comments
* Addressing review comments - round 2 - Redesign of the tool.
* Fixing messages
2018-04-03 08:33:22 +01:00
89ecfb96c5
Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11
2018-03-29 13:12:00 +01:00
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. ( #2892 )
2018-03-29 13:01:41 +01:00
71baccf167
Merge remote-tracking branch 'open/master' into os-merge-d2b7f8b
2018-03-28 17:06:15 +01:00
768dd32417
ENT-1663 - Inclusion of the cert path and root cert in the exception message when cert path validation fails. ( #2890 )
...
Also, added check to node startup that --initial-registration cannot occur in devMode
2018-03-28 15:18:50 +01:00
bc3605e8da
Merge remote-tracking branch 'open/master' into kat-merge-28-03-18
2018-03-28 09:47:49 +01:00
6c9a39ae44
DOCS: Serialization roundtrip removes mutability explanation ( #2888 )
2018-03-28 09:40:21 +01:00
1f2d9454ee
Merge remote-tracking branch 'open/master' into kat-merge-27-03-18
2018-03-27 10:22:42 +01:00
e43b12c203
CORDA-1236 - Don't let Carpenter exceptions escape the serializer ( #2852 )
...
* CORDA-1236 - Don't let Carpenter exceptions escape the serializer
* Review comments
* Merge branch 'kat/bug/master/nestedCArpenterException' of https://github.com/corda/corda into kat/bug/master/nestedCArpenterException
2018-03-27 10:11:39 +01:00
0f99efa768
CORDA-1213 - Explicitly disallow serialization of non static nested classes ( #2824 )
...
* CORDA-1213 - Explicitly disallow serialization of non static nested classes
WIP
* Review comments
2018-03-27 10:06:46 +01:00
91cdcc6752
CORDA-1258 - Only register custom serializers once ( #2862 )
...
* CORDA-1258 - Only register custom serializers once
* Review comments
* Fix test
2018-03-26 19:09:03 +01:00
7dbceaadcb
Merge remote-tracking branch 'open/master'
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-03-26 15:46:26 +01:00
c3031b182b
ENT-1665 - Update fast-classpath-scanner version to 2.12.3 (was 2.0.21) ( #2877 )
...
Problem manifests now that the classpath scanner is used by the
serialisation framework in factory initialization to locate pluggable
serializers. The actual thrown error is
java.lang.RuntimeException: Unknown constant pool tag
Given this is a known issue and a fixed bug it makes sense to move the
version forward. Unfortunately at this time we cannot move beyond
2.12.3 as 2.12.4 and later versions (up to the latest 2.18.1) exhibit
some other error that needs investigating. Thus, move to the latest
version that is stable for our current set of use cases.
More information on the nature of the problem exhibited by moving beyond
2.12.3 can be found on the linked Jira (ENT-1665) as well as details on
reproducing the issue moving forward to 2.12.3 fixes.
2018-03-26 14:24:43 +01:00
c9caaf8be4
Adding sockets ( #570 )
...
* Adding sockets
* Addressing review comments
* Adding review comments
* Addressing review comments
2018-03-23 07:43:13 +00:00
620ba1e8a2
Integration test for network parameter updates and improved logging ( #2863 )
2018-03-22 14:08:07 +00:00
ff4bbaf63f
ENT-1524 & ENT-1358: Cleaned up doorman db schema ( #565 )
...
* Renamed tables and constraints to have name < 30 characters
* Using AttributeConverters were possible for custom types
* NodeInfoEntity has relationship to accepted NetworkParametersEntity, not the hash
* Improved logging in the node
2018-03-22 06:39:02 +00:00
aaa9e8c83f
Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18
...
# Conflicts:
# docs/source/changelog.rst
2018-03-20 16:54:56 +00:00
ac9cb59a6e
Fix RPC flaky test ( #2849 )
...
* fix rpc reconnect flaky test; remove obsolete rpcproxy log message
* rpc client proxy: replace lock with atomic variable
* rpc client proxy: removed volatile property
* RPCStabilityTests: used eventually() method to test async response
* RPCStabilityTests: remove unused import
2018-03-20 16:23:29 +00:00
144632818c
Adding the X509CRL custom serializer. ( #2844 )
...
CORDA-1233
* Adding the X509CRL custom serializer.
* Addressing review comments
2018-03-20 15:42:25 +00:00
