13805 Commits

Author SHA1 Message Date
Shams Asari
73ca1601fb Merge remote-tracking branch 'open/master' into os-merge-68145e1
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/flows/FlowOverrideTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-11-28 17:10:09 +00:00
Anthony Keenan
26ee004656
Merge pull request #1613 from corda/anthony-os-merge-20181128
O/S Merge 20181128
2018-11-28 17:00:59 +00:00
Dominic Fox
68145e16de
CORDA-2255 suppress warnings on read-only properties (#4307)
* CORDA-2255 suppress warnings on read-only properties

* Avoid creating copies of LocalTypeInformationBuilder

* Disambiguate complex elvis expression
2018-11-28 16:39:54 +00:00
Dominic Fox
2818737f12 Fix comment (#4308) 2018-11-28 15:21:43 +00:00
Anthony Keenan
4391bb8dfe Merge remote-tracking branch 'open/master' into anthony-os-merge-20181128
# Conflicts:
#	docs/source/upgrading-cordapps.rst
#	testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
2018-11-28 14:38:08 +00:00
Shams Asari
36fdb858c6 CORDA-2239: DriverDSL.startNode overload cleanup (#4252)
The overload that takes in a bunch of the node parameters with default values has been fixed to the V3 version. New node parameters since V3 now only exist in NodeParameters.

The reason for this is otherwise each new release of Corda that introduces new node parameters will force a new startNode overload to be added to DriverDSL to preserve backwards compatibility.

NodeParameters has been moved to its own file and logLevel is removed as it doesn't do anything.
2018-11-28 14:36:26 +00:00
Florian Friemel
9c59295250
Hsm simulator: Clean up existing docker images before running. 2018-11-28 14:16:04 +00:00
Michele Sollecito
ef7af7fc7d
Merge pull request #1607 from corda/merges/27_11_2018_16_42 2018-11-28 13:30:27 +00:00
Anthony Keenan
994afcfef7 [CORDA-2055] [CORDA-2236]: Bootstrapper cordapp copying (#4309) 2018-11-28 13:28:56 +00:00
szymonsztuka
9d748e7b0c
Document standalone signJar task (related to CORDA-1915). (#4171) 2018-11-28 12:48:50 +00:00
Christian Sailer
7fc8b38545 ENT-2356 backpressure in notary health check (#1603)
* Make notary healthcheck flows backpressure aware and add metric to report on wait times.

* Add basic test that backpressure handling works for notary healthcheck flows

* Add check on reported wait time metric

* report wait time for the notary node instance checked, not the service

* Code review feedback
2018-11-28 12:25:13 +00:00
Katarzyna Streich
8c5a60d98c Fix RpcWorkerServiceHub and FlowWorkerServiceHub 2018-11-28 11:25:40 +00:00
szymonsztuka
c319b190c8
CORDA-2232 external id to pub key mapping - additional setup for integration tests in database mode (#1597)
* Added new tables and view (from commit c41960520c2854c4b05a2eee78a90c55209d8995) to setup for integration tests in database mode.
2018-11-28 10:49:18 +00:00
Shams Asari
fd60c82134
CORDA-2254: JmxPolicy fixed so that it turns on monitoring via the jmxMonitoringHttpPort config (#4298)
* CORDA-2254: JmxPolicy fixed so that it turns on monitoring via the jmxMonitoringHttpPort config

To make the API easier to use, httpPort was introduced and both startJmxHttpServer and jmxHttpServerPortAllocation deprecated.
2018-11-28 09:50:29 +00:00
Michele Sollecito
8c02714b16 Not easy to fix these issues from home. 2018-11-27 23:56:16 +00:00
Florian Friemel
95694a2c99
[ENT-2540] Azure Key Vault Integration for holding Legal Identity for nodes. (#1572)
* Add dependencies for Azure KeyVault.

* CryptoService implementation for Azure KeyVault.

* Exclude transitive dependencies from azure keyvault client in other modules.

* Integrate Azure KeyVault CryptoService into NodeConfiguration and AbstractNode.

* Improve ContentSigner for Azure KeyVault CryptoService.

* Fix missing import.

* Improve tests.

* Fix rebase error.

* Respond to feedback: Remove duplicate entry.

* Respond to feedback.

* Add better explanation for hard vs. soft keys.

* az keyvault alias validation.

* Respond to feedback.
2018-11-27 18:53:38 +00:00
Joel Dudley
95cf4d9310
Remove incorrect info that enums could not be evolved. (#4304) 2018-11-27 17:25:23 +00:00
Michele Sollecito
501929e91c Merge remote-tracking branch 'remotes/open/master' into merges/27_11_2018_16_42
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/AddressBindingFailureTests.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/RpcFlowsDrainingModeTest.kt
#	node/src/integration-test/kotlin/net/corda/node/persistence/H2SecurityTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/AdditionP2PAddressModeTest.kt
#	node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-11-27 16:55:40 +00:00
Michele Sollecito
dc1f5f0ccd
[CORDA-2257]: Enabling optional global test port allocation (#4310) 2018-11-27 16:40:30 +00:00
Tudor Malene
06ebb97a31
Fix cache races. (#4311) 2018-11-27 16:36:02 +00:00
Katarzyna Streich
5d2ad46553
CORDA-2089 - network parameters tags - part (#4228)
* CORDA-2089 - network parameters tags - part

Data structures changes, storage and notarisation.

Tag transactions with network parameters hash that was in force when tx
was created. Add component group on all core transactions and resolved
parameters on full transactions. The hash should be always visible on
the filtered versions of transactions. Add
notarisation check that the parameters are current.
Implement network parameters storage on services for resolution.

This is only part of the work, next PR will include changes to
ResolveTransactionsFlow to make sure that parameters in the transaction
graph are ordered (this is to prevent the downgrade attack, when the
malicious notary and participants sign transaction that shouldn't be
notarised otherwise).
Probably on network services side we need the default parameters
endpoint for the
transactions that were created before this change - for now it's default
to the current ones.

* Make parameters storage agnostic to cert hierarchy

Test fixes

* Address most PR comments

* Fixes after rebase

* Fixes. Add epoch column to parameters storage.

* Address part of review comments

* Some more comments

* Hopefully fixing what I broke doing rebse

* Address Kostas comments

* Further fixes

* Save all parameters from updates to storage

* Fix integration test

* Address comments

* Fixes after rebase

* Fix test

* Fixes

* Add wrapper for filtering around parameters hash

* API stability fixes

* Add NetworkParametersStorageInternal

* Rename
2018-11-27 15:48:32 +00:00
szymonsztuka
d1e8725cfb
Merge pull request #1605 from corda/merges/os-merge-2018-11-27
OS -> ENT merge on 2018-11-27 up to 759fd9b
Conflicts (resolved): node-database doc, core-deterministic/build.gradle
2018-11-27 15:47:57 +00:00
Tudor Malene
e4c1db4db6
CORDA-2248 Remove spring boot hack. (#4305)
* CORDA-2248 Remove spring boot hack.
2018-11-27 13:39:54 +00:00
szymonsztuka
50c2112a2b Merge OS to Enterprise 2018-11-27 12:53:31 +00:00
szymonsztuka
759fd9b5bb
Update to corda-gradle-plugins v4.0.36 (#4292)
* Update to corda-gradle-plugins v4.0.36 (new development key for JAR signing).
* Changed maven repo from https://dl.bintray.com/kotlin/kotlin-eap/   to https://kotlin.bintray.com/kotlinx.
2018-11-27 11:41:05 +00:00
Tudor Malene
8784e51a8f
CORDA-2248 fix rpc classloader issue (#4288) 2018-11-27 09:53:44 +00:00
Florian Friemel
ca1ff6663f
Fix problems with hsm simulator (#1587)
* Fix problems with hsm simulator

  - run on different port (was starting at 10000, conflictiong with
    other tests
  - make the hsm simulator a @ClassRule instead of a @Rule in the
    UtimacoCryptoServiceIntegrationTest so it's only started once
    and not for every test.

* Use different port for hsm simulator.

* Fixed UtimacoNodeRegistrationTest so that it shares the same PortAllocation between the test, doorman and hsm
2018-11-27 05:54:51 +00:00
Dominic Fox
c533e0ab0c CORDA-2255 reduce noise from serialisation warnings (#4299)
Suppress warnings when constructing NonConstructible types that are wrapped by Opaque, and reduce warning level to info. Construct wrapped LocalTypeInformation for Opaque types immediately, rather than deferring with a thunk.
2018-11-26 20:28:18 +00:00
Thomas Schroeter
b881fbd330
Throughput is private in PersistentUniquenessProvider (#4302) 2018-11-26 19:15:06 +00:00
Shams Asari
152975d044
Merge pull request #1600 from corda/os-merge-5d43f31
O/S merge 5d43f31
2018-11-26 18:44:16 +00:00
Milen Dobrinov
88ee343e95 [CORDA-2189] Fix non deterministic manifest file timestamp (#4301) 2018-11-26 17:31:31 +00:00
Anthony Keenan
b7d04b1c6e
[CORDA-2235]: Add overrides for network parameters via command line and file (#4279)
* Temp commit

* Print the error message first by default, makes error output more natural.

* Polishing

* Further modifications after testing

* Documentation updates

* Couple of fixes after review

* Removing unnecessary tests

* Fix broken test

* Add interface to bootstrapper for testign

* Added unit tests

* Remove unused class

* Fix up bootstrapper unit tests and add a couple more

* Refactor the tests slightly

* Review comments

* Couple of minor tweaks
2018-11-26 17:11:05 +00:00
Thomas Schroeter
85ebd57f90
ENT-2783 Implement ETA for backpressure in JPA and MySQL uniqueness providers (#1599)
* Implement ETA for backpressure in JPA uniqueness provider

* Pass eta threshold to validating notary flow

* Add ETA to MySQLUniquenessProvider

* Restore default eta message threshold in ValidatingNotaryFlow

Reducing the OS-ENT diff.

* Throughput var is private
2018-11-26 16:46:12 +00:00
szymonsztuka
d399e3c242
CORDA-2232 external id to pub key mapping - fixes
Fixes in PersistentKeyManagementService.kt, VaultSchema.kt, and vault-schema.changelog-v8.xml. (#4295)
2018-11-26 16:03:06 +00:00
Dominic Fox
88fbb47f67
ENT-2320 state contract identification (#4285)
* Enforce state/contract agreement validation

* Fix some broken tests

* Ascertain targetVersion by inspecting the jar source of the ContractState

* Docs added and rebased against master

* contextLogger doesn't work here

* Java examples in docs

* Label IRSState with owning contract

* Fix rst formatting

* Add @BelongsToContract annotation to PortfolioState
2018-11-26 16:02:32 +00:00
Shams Asari
0876411642 Updated performance test CorDapp to use the new inlined SwapIdentitiesFlow 2018-11-26 15:58:01 +00:00
Shams Asari
61f2183328 Merge remote-tracking branch 'open/master' into os-merge-5d43f31 2018-11-26 15:28:19 +00:00
Shams Asari
5d43f3139e
Finance CorDapp jar includes confidential-identities (#4296)
https://github.com/corda/corda/pull/4260 removed the dependency that node had to confidential-identities which means CorDapps using it must now use compile and not cordaCompile. This resolves the failing smoke test.
2018-11-26 14:59:24 +00:00
Dominic Fox
766681c0e7
Avoid constructing a lookup/builder if the type is already cached (#4294) 2018-11-26 13:48:32 +00:00
Rick Parker
96205b26c4
Merge pull request #1598 from corda/parkri-os-merge-20181126-1 2018-11-26 13:03:51 +00:00
Tudor Malene
a4fd7d2356
Fix Attachment overlap check (#4272)
* Fix Attachment overlap check

* Address code review comments.
2018-11-26 11:04:16 +00:00
rick.parker
796082f75a Fix compilation error in test 2018-11-26 11:01:41 +00:00
Viktor Kolomeyko
2728ab9440
ENT-2689: New integration test for diff. SSL configurations (#1576)
* ENT-2689: Distinct SSL configurations integration tests.

* ENT-2689: Use distinct passwords for store, private keys and trust store

* ENT-2689: Make passwords for Artemis and Tunnel different.

* ENT-2689: Different value for public `trustStorePassword`
2018-11-26 10:01:12 +00:00
Thomas Schroeter
395c981af8
Fix jpa notary (#1596) 2018-11-26 09:46:34 +00:00
Shams Asari
3b8a74fe44
CORDA-2114: SwapIdentitiesFlow is now inlined (#4260)
This is to fix the security issue whereby any counterparty is able to generate anonymous identities with a node at will without checks.
2018-11-26 09:41:14 +00:00
Florian Friemel
b01f278eb3 Use custom overrides in DriverDSLImpl.startNodeRegistration (#4282) 2018-11-26 09:40:45 +00:00
rick.parker
a21217ccc9 Add default value to NonValidatingNotaryFlow so other notaries compile by default. 2018-11-26 09:36:59 +00:00
rick.parker
30813e4497 Fix compilation issue in FlowStateMachineComparatorTest 2018-11-26 08:50:01 +00:00
rick.parker
aee0ebdc7b Apply notary back pressure code to MultiThreadedStateMachineManager to fix compilation 2018-11-26 08:48:00 +00:00
rick.parker
b6736cbaf9 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20181126-1 2018-11-26 08:44:08 +00:00