Commit Graph

4992 Commits

Author SHA1 Message Date
71763ff1d3 Merge branch 'master' into shams-master-merge-291117
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/network/PersistentNetworkMapCache.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTests.kt
#	samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
2017-11-29 18:00:16 +00:00
286ff65e60 Merge pull request #2147 from corda/shams-doorman-node-persistence-deps
Moved CordaPersistence and dependent classes into internal package in…
2017-11-29 17:51:35 +00:00
3c31fdf31d CORDA-806 Remove initialiseSerialization from rpcDriver (#2084)
and fix a leak or two
2017-11-29 17:42:39 +00:00
b638b30d2a Moved CordaPersistence and dependent classes into internal package in node-api. This is so that the doorman can make use of them without needing a compile dependency to node. 2017-11-29 17:14:05 +00:00
2525fb52be New docs on deploying a node. Makes it clear existing docs were only for local or dev deployments. 2017-11-29 17:07:13 +00:00
572c4af40c Use NetworkMap and SignedNetworkMap in NetworkMapClient, and enable signature verification. (#2054)
* new network map object for network map, and verify signature and root in Signed network map and node info

* fixup after rebase

* * added certificate and key to network map server
* move DigitalSignature.WithCert back to NetworkMap.kt, as its breaking API test, will raise another PR to move it back.
* Make DigitalSignature.WithCert not extend WithKey, as per PR discussion.
* various fixes after rebase.

* move Network map back to core/node, as its breaking API test

* revert unintended changes

* move network map objects to node-api
2017-11-29 15:55:13 +00:00
5c53a91785 Overhaul of the Bank of Corda demo to fix two problems it had:
1. The runRPCCashIssue and runWebCashIssue gradle tasks didn't work because they were using the wrong ports
2. Notary lookup was failing because the lookup name didn't include the correct CN for the notary name (this slipped through when reverting the network parameters)

The ports change occurred in #1922 which was attempting the fix the runIssuer gradle task. This is actually a misleading and redundant task as all it does is start up the nodes, which is what the documented deployNodes already does. The ports runIssuer allocated to the nodes were different to the ones specified in deployNodes.

To make sure we have integration tests which closely match deployNodes, the BoC demo has been updated to make use of CordformDefinition. This keeps the node definitions in one place, removing the need to have disparate files in sync. runIssuer has been removed.
2017-11-29 14:48:05 +00:00
b45d9e957b CORDA-654 Pass key constants into VaultFiller (#2118) 2017-11-29 12:51:01 +00:00
a81352acbb Merge pull request #2138 from corda/kat/feature/enumEvolution
CORDA-553 - Plumb the transform schema into the AMQP serialisation framework
2017-11-29 11:28:19 +00:00
dbe2dca7b9 CORDA-654 Make VaultFiller a class so I can change its hardcoded bits (#2141) 2017-11-29 09:49:34 +00:00
1b5eeaaad0 Create a dedicated Log4J2 file for NodeExplorer and output logging configuration used. (#2142) 2017-11-28 17:51:30 +00:00
cb1fa2e017 Corda now works with H2 without the need to allow Hibernate to create the database automatically. (#2124)
[CORDA-815]: Corda now instructs Hibernate to either adjust or validate the schema based on `devMode` property.

Also renamed property `database.initDatabase` to `database.createSchemaAutomatically`.

* [CORDA-815]: Renamed database.initDatabase to database.adjustSchemas.

* Code review changes: removed property `database.initDatabase` altogether.

* Code review changes: removed property `database.initDatabase` altogether.

* Code review changes: removed property `database.initDatabase` altogether.

* Code review changes: removed property `database.initDatabase` altogether.
2017-11-28 17:33:02 +00:00
c88c6202b9 CORDA-553 - Review comments 2017-11-28 17:27:53 +00:00
74bf00c155 Show origin test in ThreadLeakException. (#2143)
and downgrade an error to warn
2017-11-28 14:11:22 +00:00
cc1fba641e Integration test for http network map service (#2078)
* make node info file copying optional by setting "compatabilityZoneURL" in driver
integration test for node using http network map using driver
some bug fixes

* rebase to feature branch and fixup

* add initialRegistration flag to driver

* remove useFileBaseNetworkMap flag, add network map server to DriverTest

* remove useFileBaseNetworkMap flag, add network map server to DriverTest

* use PortAllocation.Incremental instead of random

* * use PortAllocation.Incremental instead of random
* fix NodeInfoWatcher thread leak issue

* reset scheduler before create notary

* move port allocation out of companion object

* move port allocation out of companion object

* make node info file copier lateinit to avoid observable thread pool get created on init
2017-11-28 13:58:48 +00:00
ff9e7474b1 CORDA-654 Make MOCK_IDENTITIES less special (#2114)
* Make rigorousMock usable from Java
* Show args in mock failure message
2017-11-28 11:35:59 +00:00
614779d4ec ENT-1128 fix node restarts when using AzureSQLServer (#2139) 2017-11-28 10:32:30 +00:00
4c2f0d7913 Fix broken unit test
At the moment the test just asserts we can't evolve enums, it's a
placeholder for the next phase of the changes
2017-11-28 10:03:01 +00:00
f135d57820 CORDA-553 - Plumb the transform schema into the AMQP serialisation framework
This change doesn't enable anything, it just changes the code to pass
around both relevant schemas instead of a single one from the AMQP
envelope. The actual evolver will build ontop of this
2017-11-27 19:23:12 +00:00
4bd6fef0f9 StateMachineManager is no longer lateinit. (#2123) 2017-11-27 17:55:08 +00:00
9fefabbb88 Merge branch 'master' into shams-master-merge-271117 2017-11-27 17:08:13 +00:00
4ca54b73fe Added tests to make sure the platform version is correctly available 2017-11-27 17:04:19 +00:00
2ceb6283af Moved X509Utilities, and some other crypto utilities in node, into node-api so that they can be used by services outside of the node.
There's also some cleanup as well.
2017-11-27 15:49:33 +00:00
0e3713237b rename table "link_nodeinfo_party" to "node_link_nodeinfo_party" (#2135) 2017-11-27 15:08:52 +00:00
1705df4d1f Made the database config option typesafe, rather than relying on String properties 2017-11-27 13:51:53 +00:00
c4b333c50c Updates permissioning docs to address RGB review comments. 2017-11-27 13:36:52 +00:00
449155cea3 IdentityService is no longer obtained lazily. (#2130) 2017-11-27 12:34:33 +00:00
20337aaa25 Network permissioning new doc 2017-11-24 18:06:01 +00:00
ffd693719a docs for additional-node-infos (#2107)
* docs for additional-node-infos
2017-11-24 13:27:30 +00:00
ce9b6c1f18 CORDA-311-post PR merged fixes (#2106)
* SSH server integration
2017-11-23 16:34:57 +00:00
502d0df630 Mutual TLS auth - mixed RSA and ECDSA keys (#2095) 2017-11-23 16:07:08 +00:00
026d88a2b9 Add X500 name constraints for non-organisation attributes (#2108)
Enforce X500 name constraints consistently across all attributes
2017-11-23 12:42:45 +00:00
228b29110e Adds upgrade notes for v1 to v2. Minor tweaks (e.g. ToC). 2017-11-23 12:42:45 +00:00
8bf6dae29d Re-introduce demo docs (#1981)
Document the included samples in the docs again so there's some continuity from v1 docs, while making it clear they're not best practice examples but instead illustrate solutions to various use-cases.
2017-11-23 12:42:45 +00:00
20b57a359f Removes outdated devmode cert info, links to existing docs to avoid duplication. 2017-11-23 12:42:45 +00:00
5c18c57417 Fixes an error in the contract testing tutorial. 2017-11-23 11:27:34 +00:00
22d29db54b Add X500 name constraints for non-organisation attributes (#2108)
Enforce X500 name constraints consistently across all attributes
2017-11-22 18:00:43 +00:00
7bde9ecefd Adds upgrade notes for v1 to v2. Minor tweaks (e.g. ToC). 2017-11-22 17:33:40 +00:00
f314bf4849 Re-introduce demo docs (#1981)
Document the included samples in the docs again so there's some continuity from v1 docs, while making it clear they're not best practice examples but instead illustrate solutions to various use-cases.
2017-11-22 15:39:48 +00:00
43a8d21977 Removes outdated devmode cert info, links to existing docs to avoid duplication. 2017-11-22 12:07:53 +00:00
eede51cf74 Update method added to MockNetwork since branching 2017-11-21 15:39:31 +00:00
9097107d2e Revert "Revert "Introducing network parameters.""
This reverts commit 953a4a3790.
2017-11-21 15:05:24 +00:00
5cf7ecd9ed Merge branch 'master' into feature-network-parameters
# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
2017-11-21 15:01:52 +00:00
f7e51a9ae1 Various cleanups to AMQP and Kryo serialisation:
* PartyAndCertificate serialiser has been converted to deal with just CertPath
* Removed X500Name serialiser as we no longer use the BC implementation and have our own CordaX500Name
* Converted X509 cert serialiser to use Java certs and not BC X509 cert holder
* Added to test to AMQP serialisation to make sure c'tor is invoked on deserialisation
2017-11-21 14:01:03 +00:00
288eb5fcc4 CORDA-716 Call stop on InMemoryMessagingNetwork (#2077)
* Inline code used by only 1 test
* Remove superfluous interface
* Warnings crusade
* Inline Builder, remove unused method
* Remove stop from interface
* Register stops up-front
2017-11-21 12:49:21 +00:00
15dbbb2de9 remove NodeState and nodeStateObservable remnants (#2102) 2017-11-21 12:03:51 +00:00
426a47ce36 Merge pull request #2073 from corda/releaseNotesMergeFromV2
RELEASE: Merge release notes for V2 back into master
2017-11-21 11:24:17 +00:00
37b4d0e939 Fixed some permission issues with demos. (#2099) 2017-11-21 11:20:17 +00:00
a13dbcaa5d ENT-1069 Allow for nodes to be started in registration mode (#2065)
* ENT-1069 Allow for nodes to be started in registration mode
2017-11-21 09:59:56 +00:00
ad9f335dde Consistent database columns naming convention. (#2097) 2017-11-21 09:57:38 +00:00