Commit Graph

11045 Commits

Author SHA1 Message Date
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
c40e8e4518 Overriding network parameters if they are specified in the deployment… (#136)
* Overriding network parameters if they are specified in the deployment configuration

* Addressing review comments

* Addressing review comments

* Changing the getCurrentNetworkMap return type to be nullable
2017-11-29 16:46:36 +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
f264b62823 ENT-1144 - rename "link_nodeinfo_party" table to "node_link_nodeinfo_… (#135)
* ENT-1144 - rename "link_nodeinfo_party" table to "node_link_nodeinfo_party"
2017-11-29 13:23:53 +00:00
b45d9e957b CORDA-654 Pass key constants into VaultFiller (#2118) 2017-11-29 12:51:01 +00:00
e922741b00 Merge pull request #137 from corda/features/ENT-1153/merge_OS2ENT
[ENT-1153]: merge OS -> ENT
2017-11-29 12:14:09 +00:00
5e901d4950 [ENT-1153] fix merge - database description was duplicated, adhere to OS version 2017-11-29 11:37:48 +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
c32c21bc48 [ENT-1153] fix merge - revert feature for database integration test (Enterprise feature) 2017-11-29 10:51:49 +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
f84be2a86b Put in correct notary name 2017-11-28 16:50:39 +00:00
c82d167296 Order of parameters 2017-11-28 16:49:16 +00:00
d9e0aa9068 Add missing constructor parameter 2017-11-28 16:37:14 +00:00
277d528849 Fix names in jmx request 2017-11-28 16:33:40 +00:00
91c9dad6cc Make doorman print the help if commands are missing from the command line (#139) 2017-11-28 14:20:14 +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
7d75d95dc2 [ENT-1153]: fix merge 2017-11-28 10:42:40 +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
a982bb2ae6 [ENT-1153]: fix merge 2017-11-27 16:55:06 +00:00
e8d833c2fe Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT
# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-11-27 16:52:29 +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
8240f7ba2f Add second request type 2017-11-27 11:09:51 +00:00
20337aaa25 Network permissioning new doc 2017-11-24 18:06:01 +00:00
aab2ad58d9 Hook up anonymised payment and add test for that + some code reformatting 2017-11-24 14:54:57 +00:00
0b7678b8ec Flow to issue cash and pay using the returned tx id rather than a vault
query to find the new state
2017-11-24 14:25:56 +00:00
792089e179 Unit test for CashIssueAndPaymentFlow 2017-11-24 14:23:37 +00:00
71681e0e0a Merge pull request #106 from corda/dl-float-design-doc
Current design doc baselined - please raise future updates via a separate PR
2017-11-24 14:02:05 +00:00
1befa35055 Design Review Process (#94)
Design Review Process V1.0
2017-11-24 13:39:13 +00:00
ffd693719a docs for additional-node-infos (#2107)
* docs for additional-node-infos
2017-11-24 13:27:30 +00:00
c5e17d90f2 Adding HSM signing service docs (#122)
* Adding HSM signing service docs

* Addressing review comments

* Addressing review comments - round 2

* Addressing review comments - round 3

* Fixing method comment
2017-11-24 11:32:12 +00:00
2fa39dc7d3 Merge branch 'master' of https://github.com/corda/enterprise into christians-jmeter-flows 2017-11-24 10:05:35 +00:00
c516a4b028 R3NET-546: Business Network PoC work (#101) 2017-11-24 09:59:35 +00:00