Commit Graph

2163 Commits

Author SHA1 Message Date
683e641a61 Fix node configuration doc for network parameter auto-acceptance settings (#4268) 2018-11-23 14:27:27 +00:00
3cc1c47cf0 Combines all contributing info in one place. Clean-up. (#4266) 2018-11-23 14:27:27 +00:00
e3ccf6a79f Add Docker image as output of build (#4223) 2018-11-23 14:25:40 +00:00
109bed8def ENT-2653: Split Artemis and Tunnel keys generation onto two separate sub-commands (#1584)
* ENT-2653: Introduce generation modes in InternalKeystoreGenerator

So that it would be possible to produce Artemis and Tunnel keystores independently.

* ENT-2653: Split Artemis certificates generation and Tunnel certificate generation onto two separate sub-commands.

* ENT-2653: Minor documentation update
2018-11-23 11:20:10 +00:00
b411ad6665 [ENT-2539] Implement support for holding node Legal Identity keys in Ultimaco HSM (#1571)
* Add dependencies for Utimaco HSM.

  The CryptoServerJCE.jar was added in node/lib.
  The node/capsule/build.gradle excludes this jar from
  the final corda.jar.

* Copy the HSM Simulator utility from Network Services.

  HsmSimulator.kt uses the spotify docker client to pull an
  image with a pre-configured hsm simulator from our docker
  registry and run it in integration tests.

* Implementation of the CryptoService interface for Utimaco HSM.

* Integration test for Utimaco CryptoService.

* Unit tests for UtimacoCryptoService (only config parsing).

* Integrate Utimaco CryptoService in AbstractNode and NodeConfiguration.

* Respond to Feedback: Remove copyright notice.

* Respond to PR Feedback: Improve integration test.

* Use custom overrides in DriverDSLImpl.startNodeRegistration

* Make Utimaco dependencies compileOnly and testCompile.

* Add integration test for registering a node that is backed by utimaco HSM.

* Respond to feedback: move HsmSimulator to different package.

* Make NodeConfiguration.cryptoServiceConf a Path instead of String.

* Add Keyfile-based login.

* Respond to feedback -- default signing algorithm.

* Respond to feedback: naming.

* UtimacoNodeRegistrationTest: explicitly verify that tx signature is valid.

* Respond to feedback: Static import assertThat.

* Rename key file for test login so it's not ignored.
2018-11-22 13:40:50 +00:00
1d511269f6 ENT-2653: Add more options for providing distinct passwords for store and private keys. (#1580)
* ENT-2653: Add more options for providing distinct passwords for store and private keys.

* ENT-2653: Documentation update.
2018-11-21 10:04:28 +00:00
01387d082a Rename fat jar in build and docs (#1578) 2018-11-21 09:35:38 +00:00
94dd223662 Merge pull request #1579 from corda/oknowles-os-merge-20-11
OS Merge 20/11/18
2018-11-21 09:07:34 +00:00
8ef4de9eaf ENT-2653: Minor command line tools changes (#1577)
* ENT-2653: Correcting "country" typo.

* ENT-2653: Introduce common constant for command line tools and use it.
2018-11-20 15:01:46 +00:00
b1982e5b55 Merge remote-tracking branch 'open/master' into oknowles-os-merge-20-11 2018-11-20 14:46:30 +00:00
8827801ae6 CORDA-1915 Release notes for build system signing CorDapp JARs. (#4185) 2018-11-20 13:53:11 +01:00
373d99435c CORDA-1965 Auto-accept network parameter changes (#4222)
* add auto acceptance of certain network parameters

* Remove incorrect nullification of newNetworkParameters object within NetworkMapUpdater

* Automatically update network parameters if update accepted and flag day occured

* Comment cleanup

* Add node configuration for auto accepting network parameter changes

* Remove hot swapping of network parameters

* Add docs for auto accept config flag

* Minor change to log line

* Remove unrelated fix that was corrected on master

* Minor name change within NetworkParameters class

* Minor doc rewording

* Fix typo in docs

* Address PR comments

* Add node config option to turn off network param auto-accept on a per param basis

* Address PR comments

* Fix failing Network Map update integration test
2018-11-20 09:50:42 +00:00
06e74c4442 Merge remote-tracking branch 'open/master' into tudor-os-merge-19-11
# Conflicts:
#	docs/source/cli-ux-guidelines.rst
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/core/TestUtils.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalTestUtils.kt
2018-11-19 17:40:34 +00:00
2d043828a0 CORDA-2083 verify transaction in AttachmentsClassloader (#4188)
CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 add support for explicit upgrade transactions

CORDA-2083 cleanup

CORDA-2083 cleanup

CORDA-2083 More cleanup

CORDA-2083 More cleanup

CORDA-2083 Clean up tests

CORDA-2083 Address code review comments

CORDA-2083 Fix merge

CORDA-2083 Fix merge

CORDA-2083 Address code review comments

revert file

CORDA-2083 Fix test

CORDA-2083 Add test

CORDA-2083 cleanup

CORDA-2083 Fix test

CORDA-2083 Address code review comments.

CORDA-2083 Remove unused functions.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.
2018-11-19 13:42:12 +00:00
1658cb0269 Updates running-a-cordapp to point to new samples page. (#4251) 2018-11-19 12:19:05 +00:00
0c323bce5c Documents Corda dependencies. Clean-up. (#4196)
* Documents Corda dependencies. Clean-up.

* Review feedback.

* Addresses review feedback.
2018-11-19 11:09:33 +00:00
8ea6f1c7c5 [CORDA-2004]: Update CLI UX guidelines for backwards compatibility (#4248)
* Update CLI UX guidelines for backwards compatibility

* De-lousing

* Spelling mistake
2018-11-18 12:36:21 +00:00
4c88e26a46 Fixed incorrect diagram. (#4212) 2018-11-18 11:35:56 +00:00
51e66af2fd CORDA-2201 add documentation for hiding passwords in node.conf (#4221) 2018-11-16 17:10:53 +00:00
134f6a016c Merge pull request #1568 from corda/os-merge-e8b6f5f
O/S merge e8b6f5f
2018-11-16 13:58:42 +00:00
5244d41384 ENT-2653 Standalone Keytool/Registration tool for HA deployment (#1558)
* Node registration tool for registering multiple nodes at the same time
* SSL key import tool for creating SSL keystore for the bridge or adding new key to existing bridge keystore
* Self signed SSL keystores generator for creating SSL keystores for firewall components' internal communication
2018-11-16 11:49:21 +00:00
15a6618223 Bunch of changes to get ENT working in light of the new FinalityFlow API
* Updated the performance cordapp tests to use target version 3 as it's not been updated and uses the old FinalityFlow API
* Updated the api-current.txt file as the API checker on TC is throwing a false-negative
* Deleted IntegrationTestingTutorial, rather than fixing its failure, as it's a leftover of KotlinIntegrationTestingTutorial
2018-11-16 10:19:41 +00:00
ac1d3d1fc7 Merge branch 'merge-point-e8b6f5f' into os-merge-e8b6f5f
# Conflicts:
#	docs/source/api-persistence.rst
#	docs/source/example-code/src/main/java/net/corda/docs/java/FlowCookbook.java
#	docs/source/upgrade-notes.rst
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
2018-11-15 13:09:06 +00:00
4984e92e31 Merge branch 'os-merge-point' into os-merge-shams
# Conflicts:
#	build.gradle
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	docs/source/api-persistence.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	settings.gradle
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt
2018-11-14 18:13:01 +00:00
e8b6f5f2f2 CORDA-2005: FinalityFlow has been made into an inlined flow to resolve issue with FinalityHandler (#4050)
FinalityHandler is insecure in that it is open to receive any transaction from any party.

Any CorDapp targeting platform version 4 or above is required use the new c'tors which take in FlowSession objects to the counterpart flow. This flow must subcall ReceiveFinalityFlow to receive and record the finalised transaction.

Old CorDapps (with target platform version < 4) will continue to work as previously. However if there are no old CorDapps loaded then the node will disable FinalityHandler.
2018-11-14 14:16:22 +00:00
6a4ef24f54 Merge commit '74c80aafd657e2718787f97932b89a069af7949f' into colljos-merge-141118 2018-11-14 13:52:56 +00:00
1e27f0cbe0 Merge remote-tracking branch 'private/master' into feature/tudor_constraints
# Conflicts:
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
2018-11-14 11:50:19 +00:00
482277bad1 ENT-2689: Change SSL config structure (#1551)
* ENT-2689: Intent of the changes to be made (doesn't compile)

* ENT-2689: Propagate renaming of `customSSLConfiguration`

* ENT-2689: Documentation update

* ENT-2689: More renaming

* ENT-2689: Add a test for SSL keystores location override

* ENT-2689: Add V3 configuration compatibility unit tests (failing for now)

* ENT-2689: Add ability to read V3 configs.

* ENT-2689: Reflect changes on Integration tests.

* ENT-2689: For BridgeControlListener use Artemis SSL configuration if specified, otherwise fall back onto main SSL configuration.

* Revert: ENT-2689: For BridgeControlListener use Artemis SSL configuration if specified, otherwise fall back onto main SSL configuration.

And rename `p2pSslOptions` to `publicSSLConfiguration`.

* ENT-2689: Move V3 config structures into a separate file.
2018-11-13 16:34:41 +00:00
f3b09988a9 Updates tutorial to reflect new template structure. Clean-up. (#4216)
* Initial improvements.

* Updates tutorials.

* Missing imports.

* Addresses review feedback.
2018-11-13 11:50:24 +00:00
fab0c5cd2c Merge pull request #1561 from corda/os-merge-99e9864
O/S merge 99e9864
2018-11-12 12:37:31 +00:00
d54e63e356 Merge pull request #1554 from corda/mnesbit-bully-leader
ENT-2705: A Bully Algorithm Leader Elector for the Bridge
2018-11-12 09:41:50 +00:00
4684259970 Expose JPA to flows (#4140)
* First pass
* Update test.
* Address review comments.
* Added docs and kdocs.
* Clean-up.
* Add extra test.
* Changes to docsite.
* Added try/catch block as recommended by Andras.
* Removed try catch block. It's not required as the checkpoint serialiser deals with this.
* Re-used existing DB session instead of creating a new session.
* Entity manager auto flushes.
* Added java friendly api.
* Addressed review comments.
2018-11-09 17:47:36 +00:00
7fbe8e7de7 renamed external artemis config properties for consistency (#1555) 2018-11-09 16:47:12 +00:00
4801942a87 Merge branch 'merge-99e9864' into os-merge-99e9864
# Conflicts:
#	.gitignore
#	.idea/codeStyles/Project.xml
2018-11-09 14:53:26 +00:00
74c80aafd6 CORDA-2178 Signature constraints minimum platform version checking (#4161)
* Minimum platform version checking for new signature constraints feature.

* Fix broken JUnit

* NP safety checking on network parameters.

* Warning and auto-downgrade of signed states that do not meet the minimum network platform version.
2018-11-09 12:27:28 +00:00
51e9ef0cc0 Initial stage of Bully Algorithm Leader election
Some artemis reconnect logic

Fix disconnect behaviour of BullyLeader code and improve Artemis shutdown behaviour when disconnected.

Integrate Bully Algorithm leader elector with the bridge

Fix docs

Remove pointless header change
2018-11-09 09:34:44 +00:00
8d794bd525 Update node.conf samples (#4189) 2018-11-09 08:04:38 +00:00
11c7c879eb Merge remote-tracking branch 'remotes/open/master' into merges/08_11_2018_16_05
# Conflicts:
#	docs/source/corda-configuration-file.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-11-08 16:39:09 +00:00
6c749889d0 [CORDA-1993]: Replace reflection-based NodeConfiguration parsing with versioned property-based parsing mechanism. (#4132) 2018-11-08 15:56:00 +00:00
bac265d418 Merge pull request #1548 from corda/merges/os-merge-to-ecbf23a
Merge OS ->ENT to ecbf23a.
2018-11-08 12:02:31 +00:00
99f6cc9e65 Updates tutorial to match template changes. (#4201) 2018-11-08 11:30:04 +00:00
9c508673cf Updates tutorial to match template changes. (#4170)
* Updates tutorial to match template changes.

* Updates hello, world tutorials to match new template structures.
2018-11-08 10:19:03 +00:00
400346fff0 ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity (#1537)
* ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity

One of our customers currently using HTTP proxy without which outbound connection from Corda Node cannot be established.
Also, propagate `trace` setting correctly down the Bridge stack.

* ENT-2669: Compilation fixes.

* ENT-2669: Revert deleted constructor back.

* ENT-2669: First stub on HTTP Proxy integration test.

* ENT-2669: Minor changes.

* ENT-2669: Reduce test to bare minimum.

* ENT-2669: Attempt to write own HttpProxy.

* ENT-2669: Another attempt to make programmatic HttpProxy work.

* ENT-2697: Disable DNS resolution before sending requests to proxies.

* ENT-2669: Switch to use Jetty HttpProxy for integration testing.

* Adds a pipeline logger ahead of the proxy stage if trace is set. The logging is removed once the proxy completes.

Define a constant for pipeline stage.
2018-11-08 09:04:36 +00:00
44dfa23ad5 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-ecbf23a 2018-11-07 18:17:29 +00:00
e956c0f5fe Docs - link from the page about signing Cordapp to the page about node configuration regarding enabling Cordapp signed by dev key to be run in production mode (related to CORDA-1915). (#4172) 2018-11-07 16:48:31 +00:00
ba9852bbe9 add documentation for initiating flow modification (#4180) 2018-11-07 11:40:10 +01:00
356941a733 Merge commit '015a36dad67998236eda7e45309e66e5d58b6374' 2018-11-06 16:29:24 +00:00
4d335843b2 Remove blank line and formatting 2018-11-06 11:27:18 +00:00
bbb26bc6ba Merge commit '3260d9f2c419463fb68178ce70633dd34079bd1e' into christians/merge_3260d9f 2018-11-06 11:20:55 +00:00
015a36dad6 CORDA 2131 - Extend Network Bootstrapper to enable registration of Java Package Namespaces. (#4116)
* Package Ownership Network Parameters: add register / unregister CLI options to network bootstrapper.

* Fix 2 failing unit tests.

* Fix failing unit tests.

* Added changelog, documentation and cosmetic changes.

* Fixed exception message.

* Address PR review feedback.

* Fix typo.

* Resolve conflicts.

* Rebase, resolve conflicts and remove PackageOwner class.

* Address latest PR review feedback.

* Fix incorrect imports.

* Fix broken JUnit

* Add support for key store passwords including delimiter characters.

* Updated and improved documentation.

* Minor doc update.

* Documentation changes following PR review feedback

* Replace Bank Of Corda with Example CorDapp.
Remove references to locally built network bootstrapper.
2018-11-06 09:28:55 +00:00