2412 Commits

Author SHA1 Message Date
Viktor Kolomeyko
bf4d8ba08c
CORDA-1335: Scan attachment Jar only to speed-up the process. ()
* CORDA-1335: Scan attachment Jar only to speed-up the process.

* CORDA-1335: Explicitly mention other types of contracts to scan.

* CORDA-1335: Refactor to eliminate listing different subclasses of Contract in two separate places.
2018-04-23 09:17:43 +01:00
Anthony Keenan
af77c5a287 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418
# Conflicts:
#	constants.properties
#	docs/source/changelog.rst
2018-04-18 11:24:22 +01:00
Anthony Keenan
7db48de2b8
CORDA-1344 Fix query paging in scheduled flow tests ()
* Fix paging tests, move out of scheduled flow tests and provide java example

* Fix a few issues with docs
2018-04-18 11:10:21 +01:00
cburlinchon
7789d5475f
Revert node suspend and resume () 2018-04-17 15:14:58 +01:00
Shams Asari
b6d43c0204 Merge remote-tracking branch 'open/master' into os-merge-1288f63
# Conflicts:
#	constants.properties
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappConfigProvider.kt
#	samples/cordapp-configuration/src/main/kotlin/net/corda/configsample/ConfigSampleFlow.kt
2018-04-16 17:35:43 +01:00
Shams Asari
1288f63998
Fixed the CorDapp configuration demo () 2018-04-16 17:23:11 +01:00
Rick Parker
34f8719363
ENT-1766 Release soft locks inside the database transaction () 2018-04-16 13:51:50 +01:00
Christian Sailer
a0bf0261bb Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336 2018-04-13 16:39:00 +01:00
szymonsztuka
05ec885afd
Update integration test setup in database mode after OS->ENT merge ()
Added Notary schema for SQL setup to tests.
Added SQL setup/tearDown to a loop starting the same node few times in DriverTests.
2018-04-13 15:28:07 +01:00
Konstantinos Chalkias
6f69f0252d
CORDA-1337 Crypto.registerProviders ()
CORDA-1337 Crypto.registerProviders + add BCPQC as well
2018-04-13 12:40:15 +01:00
Katarzyna Streich
91c52af5ac
ENT-1584: Subscribe to private network maps using UUIDs ()
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
Shams Asari
45d6bca071 Merge branch 'master' into os-merge-f88542f 2018-04-12 15:14:28 +01:00
Patrick Kuo
b5f304a104 ENT-1323 Network map service to check all identities in submitted node info ()
* 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
Patrick Kuo
f9ed55b731
ENT-1323 Network map service to check all identities in submitted node info ()
* 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
Shams Asari
9b58114146 Merge remote-tracking branch 'open/master' into os-merge-f88542f
# Conflicts:
#	docs/source/changelog.rst
#	finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
2018-04-11 15:40:25 +01:00
Shams Asari
f88542faa2
CORDA-1095: Fixed rare race where the startNode future completes before the default notary is visible () 2018-04-11 15:33:55 +01:00
szymonsztuka
b46c3b89bd
CORDA-1326 Add default shell user only when local shell is started. ()
In productionMode ssh could login to a node using "shell/shell" which is supposed to be available only in dev mode (to enable embedded shell).
2018-04-11 14:06:13 +01:00
Matthew Nesbit
2b55a8f67e Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-04-11 14:00:56 +01:00
Matthew Nesbit
8c1e9c069e Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-04-11 14:00:36 +01:00
szymonsztuka
2dc2a8dc19
ENT-1727 Fix cash selection with PostgreSQL. ()
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
Shams Asari
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
Matthew Nesbit
70beffac48
Add support for different internal p2p artemis bind address/port ()
* 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
Shams Asari
ecce64ba03
HttpUrlConnection.getErrorStream() can be null, which if not handled can obscure the reporting of an HTTP error response, like in ENT-1744 () 2018-04-11 09:39:58 +01:00
igor nitto
2fc7e5e674
Classloader loading DataSource must stay open [ENT-1717] () 2018-04-10 16:02:03 +01:00
Tudor Malene
4ed917436a
CORDA-1309 Add support for jarDirs config () 2018-04-10 11:24:35 +01:00
Shams Asari
3fbfd0deeb Merge remote-tracking branch 'open/master' into os-merge-2792716 2018-04-07 18:23:14 +01:00
Viktor Kolomeyko
e48cd808b0
Try to improve stability of NodeRegistrationTest ()
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
Anthony Keenan
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
Rick Parker
130b1d9325
CORDA-1303 Regression: Recording a duplicate transaction attempts sec… ()
* 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
Shams Asari
a97abbc8c0 Merge remote-tracking branch 'open/master' into os-merge-1b37cef 2018-04-05 17:23:03 +01:00
Shams Asari
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash () 2018-04-05 17:18:27 +01:00
Michal Kit
c8b58a601f
Adding CRL support in the generated certificates. () 2018-04-05 16:39:41 +01:00
Shams Asari
53a0aae489
Introduced a few helper methods around InputStream.readBytes () 2018-04-05 14:27:42 +01:00
Viktor Kolomeyko
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
szymonsztuka
76c1b08b27 Merge remote-tracking branch 'remotes/open/master' attempt 2 2018-04-05 11:18:01 +01:00
Viktor Kolomeyko
9a1c27e3e0
Improve performance of NodeStatePersistenceTests ()
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
szymonsztuka
c1065c557f
Add support of db integration tests for tests introduced by CORDA-1264. () 2018-04-04 22:39:15 +01:00
szymonsztuka
ad5ceedbd9 Merge remote-tracking branch 'remotes/open/master'
# Conflicts:
#	docs/source/changelog.rst
2018-04-04 18:01:35 +01:00
Shams Asari
4c123643ac
Merge pull request from corda/shams-os-merge-0af42bd
O/S merge from 0af42bd
2018-04-04 17:38:18 +01:00
Rick Parker
23184b7495
ENT-1729 P2P message de-duplication performance optimisation has a flaw () 2018-04-04 15:49:00 +01:00
Shams Asari
7296369541 Merge fixes 2018-04-04 14:52:24 +01:00
szymonsztuka
c998968e58
Update RpcExceptionHandlingTest tests introduced by CORDA-1264 () 2018-04-04 14:35:51 +01:00
Shams Asari
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
Andras Slemmer
4334d38bf5
Merge pull request from corda/aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
Merge OS up to 2f1b8ff23e5a0400f72ff603da10b849604c6b04
2018-04-04 12:07:07 +01:00
Andrius Dagys
5909a49c30
ENT-1725: Introduce FlowAsyncOperation ()
* ENT-1725: Introduce FlowAsyncOperation, which allows suspending a flow on a custom operation, such as long running I/O requests, notary commit, etc.

* Move async execute to internal, add more tests.

* Add a 30s test timeout

* Update API doc
2018-04-04 09:52:49 +01:00
szymonsztuka
7ec65901b6 Corda-1286 Fix embedded shell when rpc users from remoted database () 2018-04-03 19:13:41 +01:00
Andras Slemmer
e9d2963912 Measure Action execution times, utilised flow threads 2018-04-03 18:54:48 +01:00
Viktor Kolomeyko
1f5559e3c4
Speed-up NodeRegistrationTest ()
* Improve logging for NetworkMap requests

* Allow interrupt in polling if the process started successfully

* Put `advertiseNewParameters` back

* Additional log line to indicate when all the nodes are started

* Improve logging and use concurrent map since it is updated from multiple threads

* Change NetworkMap response validity duration and rename parameter accordingly

* Changes following code review from @shamsasari
2018-04-03 17:33:42 +01:00
Shams Asari
65ff214130
CORDA-1276: Cleaned up creation of node-info object on node start and when using --just-generate-node-info () 2018-04-03 17:30:53 +01:00
Andras Slemmer
fbafe36643 Merge commit '2f1b8ff23e5a0400f72ff603da10b849604c6b04' into aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04 2018-04-03 17:10:33 +01:00