2dc2a8dc19
ENT-1727 Fix cash selection with PostgreSQL. ( #2949 )
...
Change conversion to toStringShort() instead of toBase58String() - as done for H2 Cash Selection.
Fix withIssuerRefs case - iterate via list of IssuerRefs and setBytes instead of setArray of BYTEA.
Add test for Cash Selection with issuerRef.
2018-04-11 13:36:29 +01:00
973f6c0c08
Merge pull request #717 from corda/os-merge-ecce64b
...
O/S merge from ecce64b
2018-04-11 13:25:54 +01:00
c7ad2ca391
Merge fixes
2018-04-11 11:16:31 +01:00
4a77712978
Merge remote-tracking branch 'open/master' into os-merge-ecce64b
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
2018-04-11 11:15:17 +01:00
54a6fd0e06
CORDA-1201 Remove duplicated doc section. ( #2924 )
2018-04-11 11:08:20 +01:00
aaf3bdacd5
ENT-1698 - transform baseDirectory to an absolute path ( #714 )
2018-04-11 10:41:31 +01:00
70beffac48
Add support for different internal p2p artemis bind address/port ( #2951 )
...
* Add support for different internal p2p artemis bind address/port and externally advertised p2pAddress and port.
* Fix formatting
2018-04-11 10:33:17 +01:00
ecce64ba03
HttpUrlConnection.getErrorStream() can be null, which if not handled can obscure the reporting of an HTTP error response, like in ENT-1744 ( #2948 )
2018-04-11 09:39:58 +01:00
2ba00780c3
Merge pull request #712 from corda/kostas-registerProvider
...
ENT-1756 register providers first thing on doorman boot
2018-04-10 17:47:59 +01:00
f1ddd2b747
ENT-1756 register providers first thing on doorman boot.
2018-04-10 16:27:01 +01:00
2fc7e5e674
Classloader loading DataSource must stay open [ENT-1717] ( #709 )
2018-04-10 16:02:03 +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
4ed917436a
CORDA-1309 Add support for jarDirs config ( #705 )
2018-04-10 11:24:35 +01:00
6761824ba7
Update database integration tests setup for the test related to ENT-1684 ( #703 )
2018-04-09 12:36:22 +01:00
712bf6b43d
Merge pull request #701 from corda/os-merge-2792716
...
O/S merge from 2792716
2018-04-09 09:51:59 +01:00
3fbfd0deeb
Merge remote-tracking branch 'open/master' into os-merge-2792716
2018-04-07 18:23:14 +01:00
11af3992db
Doorman db entity attributes which are hashes are of type SecureHash where possible. ( #695 )
...
Also made use of InputStream.readObject extension method.
2018-04-07 17:26:09 +01:00
00a22c91df
ENT-1684: Remove nodes that didn't accept update from network map ( #692 )
...
On flag day all nodes that didn't accept new parameters update will be kicked out of the network map.
2018-04-07 15:28:57 +01:00
2792716157
CORDA-1181: Add back information on initial registration ( #2943 )
2018-04-07 15:18:05 +01:00
c7826bd1eb
Merge pull request #699 from corda/chrisr3-os-merge
...
CORDA-1301: Upgrade to corda-gradle-plugins 4.0.11.
2018-04-07 00:11:35 +01:00
e48cd808b0
Try to improve stability of NodeRegistrationTest ( #2942 )
...
Since we are running web-server and different handling methods will be called from
different threads, it is more appropriate to use concurrent data structures
for exchanging information between threads.
Prior to this change I observed the following exception which is likely to be due `certPaths` not synchronized between threads:
```
Caused by: kotlin.KotlinNullPointerException
at net.corda.node.utilities.registration.RegistrationHandler$reply$1.invoke(NodeRegistrationTest.kt:151) ~[integrationTest/:?]
at net.corda.node.utilities.registration.RegistrationHandler$reply$1.invoke(NodeRegistrationTest.kt:122) ~[integrationTest/:?]
at net.corda.core.internal.InternalUtils.logElapsedTime(InternalUtils.kt:221) ~[corda-core-corda-4.0-snapshot.jar:?]
at net.corda.core.internal.InternalUtils.logElapsedTime(InternalUtils.kt:213) ~[corda-core-corda-4.0-snapshot.jar:?]
at net.corda.node.utilities.registration.RegistrationHandler.reply(NodeRegistrationTest.kt:149) ~[integrationTest/:?]
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_161]
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_161]
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_161]
at java.lang.reflect.Method.invoke(Method.java:498) ~[?:1.8.0_161]
```
2018-04-06 17:11:03 +01:00
c4df6b0c85
Fixing CRR signing execution mode ( #677 )
...
* Fixing CRR signing execution mode
* Addressing review comments
2018-04-06 17:00:47 +01:00
06ff6f02f4
Merge commit 'f3f7cfddd6281cea00483b17ce7c6118b645c5e2' into chrisr3-os-merge
2018-04-06 16:44:48 +01:00
480b48a050
Adds a table of contents. Readds Dockerform instructions.
2018-04-06 14:42:04 +01:00
f3f7cfddd6
Upgrade to corda-gradle-plugins 4.0.11 ( #2936 )
2018-04-06 14:05:31 +01:00
ed7e9e64cf
Merge pull request #697 from corda/anthony-os-merge-20180406
...
OS Merge 20180406
2018-04-06 13:30:56 +01:00
f798c58c36
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180406
...
# Conflicts:
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-04-06 11:43:34 +01:00
2999f0eba2
Merge branch 'ak' into anthony-os-merge-20180406
...
# Conflicts:
# docs/source/api-persistence.rst
2018-04-06 11:01:34 +01:00
31e773876c
Merge pull request #696 from corda/feature/vkolomeyko/os-merge
...
OS->Ent merge
2018-04-06 10:40:43 +01:00
130b1d9325
CORDA-1303 Regression: Recording a duplicate transaction attempts sec… ( #2935 )
...
* CORDA-1303 Regression: Recording a duplicate transaction attempts second insert to vault.
Added unit test, and merged mock and real logic.
2018-04-06 10:28:51 +01:00
ec09188559
[CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo ( #2929 )
...
* Add CordaService testing documentation and improve tests in irs-demo
* Addressed review comments
2018-04-06 09:22:58 +01:00
df6c6b99cd
Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge
...
# Conflicts:
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
2018-04-06 09:19:34 +01:00
fb4f99d590
Merge pull request #693 from corda/os-merge-1b37cef
...
O/S merge from 1b37cef
2018-04-06 08:59:10 +01:00
d5317e074c
Remove errorLogPath parameter which is not used anyway. ( #2934 )
...
StdErr is always written to working directory if such path specified.
2018-04-05 18:10:47 +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
b5324b0b2d
Merge pull request #690 from corda/feature/vkolomeyko/ent-master-merge
...
OS->Ent merge
2018-04-05 15:43:41 +01:00
53a0aae489
Introduced a few helper methods around InputStream.readBytes ( #2928 )
2018-04-05 14:27:42 +01:00
84398362ab
ENT-1626 Validating cert path on node info submission ( #650 )
...
* Validating cert path on node info submission
* Addressing review comments
* Refactoring user exceptions
* Changing response message.
2018-04-05 14:21:54 +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
2543bb356e
Merge pull request #689 from corda/merges/os-merge-22391c2-attempt2
...
Merges/os merge 22391c2#686 ) didn't carry commits from OS
2018-04-05 12:44:01 +01:00
54db391e3c
[CORDA-1294]: Fix corda-shell publication. ( #2926 )
2018-04-05 11:53:12 +01:00
71fa61020e
Adding a unit test for SignedNodeInfo verification ( #2925 )
2018-04-05 11:25:41 +01:00
76c1b08b27
Merge remote-tracking branch 'remotes/open/master' attempt 2
2018-04-05 11:18:01 +01:00
9a1c27e3e0
Improve performance of NodeStatePersistenceTests ( #2921 )
...
Packages re-jig was meant to reduce the size of the jars that are being produced by the
node driver. E.g. previously `MessageState` was in package `net.corda` which resulted in jar file
of around 2MB to be created. Same for `NodeStatePersistenceTests` which was in `net.corda.node`
2018-04-05 09:33:03 +01:00
e5b54a07c4
Adds a missing import.
2018-04-05 09:15:05 +01:00
c1065c557f
Add support of db integration tests for tests introduced by CORDA-1264. ( #674 )
2018-04-04 22:39:15 +01:00
3aeb35d940
Merge pull request #686 from corda/merges/os-merge-22391c2
2018-04-04 20:16:34 +01:00
ad5ceedbd9
Merge remote-tracking branch 'remotes/open/master'
...
# Conflicts:
# docs/source/changelog.rst
2018-04-04 18:01:35 +01:00
