Commit Graph

11254 Commits

Author SHA1 Message Date
Katarzyna Streich
75b467e340 ENT-1433: Implementation of NetworkParameters updates (#477)
* Implementation of NetworkParameters updates

Implementation of NetworkParameters updates for network-management
server side of the process.
Change the way network parameters are read up on network-management
startup. Introduced 3 flags to clearly communicate intentions:
initial-network-parameters, update-network-parameters and flag-day.

* Address Shams comments

* Address comments

* NetworkMapStorage refactor

getLatestNetworkParameters returns NetworkParametersEntity

* TODO Exit after parameters update

Started implementing feature requested by devops. TODO: Fix
NodeRegistrationTest

* Code cleanup

* Merged the two cmd line flags into one --set-network-parameters. The idea being to simply check if there are any active network parameters to determine if it's an update or not.

Applying network parameters causes the server to exit once done (ENT-1559).

* Merge fixes

* Minor cleanup

* Small fixes

* Merge fixes and cleanup

* TODO Implementation of cancelUpdate flag

Will slightly change after more manual testing

* Small cleanup

* Address comments

Add OneToOne relation between ParametersUpdate and NetworkParameters.

* Address comments fix tests
2018-03-21 12:29:27 +00:00
szymonsztuka
785891515e
Merge pull request #588 from corda/merges/ENT-1634
Merge OS -> ENT
2018-03-21 11:04:40 +00:00
szymonsztuka
b81c005230 Merge OS -> ENT 2018-03-21 09:53:28 +00:00
Rick Parker
614d2049ec
ENT-1625 Fix overly large footprint of checkpoint bandwidth histogram (#580)
* Upgrade metrics library and histogram implementation

* Only write to the "per second" checkpoint bandwidth histogram once per second, maximum.

* Bug fix

* Review feedback and fix unit test

* Fix IRS demo to use specific metrics version in spring boot
2018-03-21 09:52:29 +00:00
szymonsztuka
f1ac3c39e9
ENT-1634 Fix Primary Key generation for node_notary_request_log table (#2855)
Don't assign a value as it's auto generated, remove redundant default value for GeneratedValue strategy.
2018-03-21 09:41:50 +00:00
Thomas Schroeter
5def901980
[ENT-1639] Add version column (#585)
* Add `version` column

The equality check of the timestamp was tricky to get right. Better to
use a logical timestamp.
2018-03-20 19:08:23 +00:00
Joel Dudley
d7147b7399
Adds JavaDocs for SoftLockingCondition. 2018-03-20 18:42:38 +00:00
bpaunescu
24366012e2
Merge pull request #586 from corda/bogdan-merge-20-03-18
Bogdan merge 20 03 18
2018-03-20 18:41:18 +00:00
Andrzej Cichocki
96d976d555
ENT-1439 Delegate SecureRandom to thread-local (#575)
while minimising CryptoUtils diff
2018-03-20 17:56:32 +00:00
Andrzej Grzesik
bc172840a3
Ignore flaky SSHServerTest.ssh_run_flows
Ignore flaky SSHServerTest.ssh_run_flows
2018-03-20 17:26:28 +00:00
bpaunescu
79c7fd7c82 Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18
# Conflicts:
#	docs/source/changelog.rst

added missing changelog line
2018-03-20 17:13:30 +00:00
bpaunescu
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
ags
946ec3c04e
ignored flaky test: 2018-03-20 16:26:34 +00:00
bpaunescu
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
Michal Kit
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
szymonsztuka
182294913a
CORDA-2615: Added description for configFile option in deployNodes Cordform Gradle task. (#2825) 2018-03-20 12:53:41 +00:00
Shams Asari
cd038ea107
Fixed docsite on incorrect node config filename required for bootstrapping a local network. (#2848) 2018-03-20 11:42:48 +00:00
Tudor Malene
8a62af57e6
Merge pull request #583 from corda/corda/tudor-os-merge-1 2018-03-20 11:32:50 +00:00
Matthew Nesbit
4650d803d1
Merge pull request #555 from corda/mnesbit-add-copyright-to-bridge
Add copyright to new bridge files
2018-03-20 11:23:09 +00:00
tudor.malene@gmail.com
a80be413e0 Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1 2018-03-20 10:20:17 +00:00
Tudor Malene
1a1cd94161
ENT-1564 - add additional uploader check to the HashConstraint (#2845) 2018-03-20 10:17:44 +00:00
Matthew Nesbit
8ed6c556e4 Add copyright to new bridge files 2018-03-20 10:07:08 +00:00
Matthew Nesbit
9fff66257b
Merge pull request #569 from corda/mnesbit-socks-proxy-support
ENT-1614: Add SOCKS proxy capability to the AMQP Bridges
2018-03-20 09:06:06 +00:00
Chris Rankin
5abe672d1f
Merge pull request #581 from corda/chrisr3-os-merge
Merge from OS up to a4242b58
2018-03-20 08:32:31 +00:00
Joel Dudley
5a05704d7a
Expands shell limitations section. 2018-03-20 08:14:33 +00:00
Chris Rankin
b500371b4e Merge commit 'a4242b5805df362ac562d758f48ea11da18df89b' into chrisr3-os-merge 2018-03-19 20:22:55 +00:00
Chris Rankin
a4242b5805
CORDA-1224: Remove @JvmStatic annotations. (#2847) 2018-03-19 20:11:50 +00:00
Michele Sollecito
2905989d19
Merge pull request #578 from corda/merges/march-19-14-41
Merges: March 19th at 14:41
2018-03-19 16:34:20 +00:00
sollecitom
8a561cddbf Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
# Conflicts:
#	client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
Shams Asari
24c0588a92
Key store passwords not required in the command line for the private key copying tool. (#577)
If not provided they will be asked for via the command line.
2018-03-19 15:06:23 +00:00
igor nitto
8591ae2dc9
CordApps back in node classpath (#2843) [CORDA-1232] 2018-03-19 14:34:02 +00:00
Michele Sollecito
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell (#2831) 2018-03-19 14:20:10 +00:00
Viktor Kolomeyko
c964e50696
Trying to improve stability of RPCStabilityTests.client reconnects to rebooted server (#2842)
Prior to this change it was intermittently failing with:
```
net.corda.client.rpc.RPCException: RPC server is not available.
    at net.corda.client.rpc.internal.RPCClientProxyHandler.invoke(RPCClientProxyHandler.kt:222)
    at com.sun.proxy.$Proxy79.ping(Unknown Source)
    at net.corda.client.rpc.RPCStabilityTests$client reconnects to rebooted server$1$pingFuture$1.invoke(RPCStabilityTests.kt:251)
    at net.corda.client.rpc.RPCStabilityTests$client reconnects to rebooted server$1$pingFuture$1.invoke(RPCStabilityTests.kt:36)
    at net.corda.core.internal.concurrent.ValueOrException$DefaultImpls.capture(CordaFutureImpl.kt:107)
    at net.corda.core.internal.concurrent.OpenFuture$DefaultImpls.capture(CordaFutureImpl.kt:65535)
    at net.corda.core.internal.concurrent.CordaFutureImpl.capture(CordaFutureImpl.kt:119)
    at net.corda.core.internal.concurrent.CordaFutureImplKt$fork$$inlined$also$lambda$1.run(CordaFutureImpl.kt:22)
    at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
    at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
    at java.lang.Thread.run(Thread.java:748)
```
2018-03-19 13:19:40 +00:00
Shams Asari
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects (#2841) 2018-03-19 12:47:23 +00:00
Matthew Nesbit
6885661b66 Initial cut of SOCKS proxy support
Correct the reconnect logic when SOCKS proxy is in the pipeline

Add integration tests and adjust handling of reconnect

Rename parameter
2018-03-19 11:37:46 +00:00
Michal Kit
a26c5c1483
Fixing exception logging for the HSM cert generator (#561) 2018-03-19 08:26:27 +00:00
szymonsztuka
fef30e49a8
Merge pull request #576 from corda/merges/1 2018-03-16
Merge OS to Enterprise.
2018-03-19 08:18:40 +00:00
Shams Asari
060f7cc3cb
Using CordaX500Name in the doorman database entity objects (ENT-1524) (#573)
certificate_signing_request.legal_name is nullable - invalid names from CSRs are not stored in the db.
2018-03-16 18:45:28 +00:00
Andras Slemmer
908a3badf1
Merge pull request #572 from corda/aslemmer-merge-DP3-bla
Squash of changes on DP3
2018-03-16 17:57:26 +00:00
szymonsztuka
c4dc8accde Merge remote-tracking branch 'remotes/opensource/master' into merges/1 2018-03-16 17:52:01 +00:00
Andrzej Cichocki
48ab7193f4
Revert "ENT-1439 Delegate SecureRandom to thread-local (#551)" (#574)
This reverts commit 58e0e8c1f5.
2018-03-16 17:48:27 +00:00
bpaunescu
dc595792e7
github issue #2630: missing rpc info at node startup (#2839) 2018-03-16 17:14:25 +00:00
szymonsztuka
fb37a5bcf1
CORDA-792 Fix local shell in trader demo and SIMM valuation demo. (#2837)
Added rpcSettings to start RPC so the local shell can connect to the node.
2018-03-16 16:41:34 +00:00
Andrzej Cichocki
58e0e8c1f5
ENT-1439 Delegate SecureRandom to thread-local (#551)
* Use SHA1PRNG only
* Minimise CryptoUtils diff
2018-03-16 16:26:14 +00:00
Joel Dudley
5b7f06a39d
Direct bootstrapper link instead of manual build. 2018-03-16 16:07:39 +00:00
Andras Slemmer
bb2643cf2e Add hard restart test
Remove default async db flush

Add in-memory P2P deduplication until we commit the ID persisting tx

Add some explaining comments

Make scheduled state kickoffs atomic with flow starts
2018-03-16 15:43:20 +00:00
Joel Dudley
d60e0098f2
Removes the glossary and FAQ. Points people to StackOverflow for troubleshooting. 2018-03-16 13:41:38 +00:00
igor nitto
286d1e5add
Propagate cordApp classloader to shell [CORDA-1228] (#2833) 2018-03-16 13:28:04 +00:00
Michal Kit
6d99f7e5d4
Adding CRL signing (#528)
* Adding CRL signing

* Adding CRL

* Addressing review comments

* Address review comments
2018-03-16 11:48:41 +00:00
Joel Dudley
06ec20379c
Clarifies that shell doesn't require RPC permissions. 2018-03-16 11:37:23 +00:00