13703 Commits

Author SHA1 Message Date
Michele Sollecito
c2364f4431 [CORDA-2211]: Added error for older bash versions when attempting to install shell extensions. (#4263) 2018-11-23 14:26:01 +00:00
Konstantinos Chalkias
7e9ee19789 [CORDA-2218] CryptoService signingCertificateStore alias match (#4227) 2018-11-23 14:25:41 +00:00
Stefano Franz
e3ccf6a79f Add Docker image as output of build (#4223) 2018-11-23 14:25:40 +00:00
Florian Friemel
4f9efdda2e Disable utimaco integration tests. (#1593) 2018-11-23 14:16:29 +00:00
Viktor Kolomeyko
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
Thomas Schroeter
df2c313f23
ENT-2769 Handle reference states in the JPAUniquenessProvider (#1586)
* Handle reference states in the JPAUniquenessProvider

* Remove unused import
2018-11-22 19:25:13 +00:00
Michele Sollecito
89ea638d05
[CORDA-2249]: Specified unique applicationId in Capsule manifest. (#1585) 2018-11-22 13:53:29 +00:00
Florian Friemel
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
Thomas Schroeter
e486c8b392
ENT-2358 Handle reference states in the MySQLUniquenessProvider (#1516)
* Handle reference states in the MySQLUniquenessProvider

* fix test
2018-11-21 17:58:57 +00:00
Viktor Kolomeyko
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
szymonsztuka
58056d4ea9
Improve integration tests to run in database mode - Sql setup for new test, cleanup of new test table. (#1582) 2018-11-21 09:47:29 +00:00
Christian Sailer
01387d082a
Rename fat jar in build and docs (#1578) 2018-11-21 09:35:38 +00:00
Oliver Knowles
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
szymonsztuka
17d6634761
Expose JPA to flows (#4140) - add Liquibase script for test to run in database mode (#1581) 2018-11-20 21:21:16 +00:00
Oliver Knowles
aa27a51069 Fix merge 2018-11-20 18:31:47 +00:00
Viktor Kolomeyko
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
Oliver Knowles
b1982e5b55 Merge remote-tracking branch 'open/master' into oknowles-os-merge-20-11 2018-11-20 14:46:30 +00:00
Tudor Malene
a3a9be6594
Merge pull request #1575 from corda/tudor-os-merge-19-11
Tudor os merge 19 11
2018-11-20 12:57:23 +00:00
szymonsztuka
8827801ae6
CORDA-1915 Release notes for build system signing CorDapp JARs. (#4185) 2018-11-20 13:53:11 +01:00
Tudor Malene
c35dde5e7a Revert api-current 2018-11-20 10:30:20 +00:00
cburlinchon
b6f6775cab
Fix bridge smoke test, add commons-lang dependency (#1574)
* Add commons-lang dependency now pulled in

* Pull out commons lang version
2018-11-20 09:50:48 +00:00
Oliver Knowles
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
Tudor Malene
1d35c322c9 Fix merge 2018-11-19 18:30:29 +00:00
Christian Sailer
ba743985ad
Switch perf test CorDapp to the new finality flow API. (#1570)
ENT-2754 Switch perf test CorDapp to the new finality flow API.
2018-11-19 18:25:05 +00:00
Tudor Malene
12b79fc40b Fix merge 2018-11-19 18:13:07 +00:00
Michele Sollecito
2762c34ebe
[CORDA-1877]: Ensured Driver fails to start when Notary tried to bind an already bound port. (#4246) 2018-11-19 18:06:27 +00:00
tudor.malene@gmail.com
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
Chris Burlinchon
cb0091f097 Pull out commons lang version 2018-11-19 17:19:44 +00:00
Chris Burlinchon
f676941dbf Add commons-lang dependency now pulled in 2018-11-19 17:12:44 +00:00
Michele Sollecito
cb9fc3391f
Merge pull request #4256 from corda/hide_error_codes_for_config_parsing_issues 2018-11-19 16:51:21 +00:00
Michele Sollecito
b9f2401123 Removed errorCode for raw configuration parsing errors. 2018-11-19 16:47:57 +00:00
Dominic Fox
ddf45f4e07
CORDA-2099: define local type model (#4118)
* CORDA-2099 define LocalTypeInformation and related data types and functions

* Enums don't have superclasses

* Separate ACollection from AMap

* Remove spurious import

* Small fixes, slightly improved testing

* Log warnings if types that we expect to be able to serialise are non-composable

* Rename lookup -> findOrBuild

* Pull changes from working branch

* Missing files needed for unit test

* Pull in whitelist-based type model configuration

* Move opaque type list across

* Remote duplicate declaration

* Restore fixes from other PR
2018-11-19 16:07:01 +00:00
Michele Sollecito
a22344b330
[ENT-2722]: Make support tool usable with installations where config and Corda JAR are separated (#1573) 2018-11-19 15:22:23 +00:00
Mike Hearn
349d9a5ffe Expose SerializedBytes.from in the API 2018-11-19 14:25:39 +00:00
Tudor Malene
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
Mike Hearn
38a4737764 Small tweaks useful for the experimental C++ support. 2018-11-19 12:37:31 +00:00
Mike Hearn
a867e7cb8b Bugfix: make decimal64 amqp type work (nothing uses it today) 2018-11-19 12:37:31 +00:00
Joel Dudley
1658cb0269
Updates running-a-cordapp to point to new samples page. (#4251) 2018-11-19 12:19:05 +00:00
Stefano Franz
828892a3d9
write nodeInfo to additional-node-info folder as well as baseDirectory (#4247)
* write nodeInfo to additional-node-info folder as well as baseDirectory

* fix broken network map tests
2018-11-19 11:26:42 +00:00
Joel Dudley
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
Dominic Fox
f66944cac5
CORDA-2099 remote type model (#4179)
* CORDA-2099 create remote type model

* Comments

* Test the class-carpenting type loader

* Comment on cache usage

* Pull changes from main serialisation branch

* Add missing file

* Minor tweaks
2018-11-19 11:03:32 +00:00
Anthony Keenan
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
Roger Willis
4c88e26a46
Fixed incorrect diagram. (#4212) 2018-11-18 11:35:56 +00:00
Mike Hearn
3e396ff41f
Merge pull request #1569 from corda/mike-merge-4d2d9b83
Merge OS to 4d2d9b83
2018-11-17 15:20:55 +00:00
Stefano Franz
8f463c46a9 Add message to uses of require(...) (#4192) 2018-11-16 17:13:55 +00:00
Stefano Franz
51e66af2fd CORDA-2201 add documentation for hiding passwords in node.conf (#4221) 2018-11-16 17:10:53 +00:00
Mike Hearn
9594aea9f7 Merge remote-tracking branch 'open/master' into mike-merge-4d2d9b83 2018-11-16 16:43:20 +00:00
Mike Hearn
4d2d9b8304 Fix a regression in the shell that was preventing it from fuzzy matching against notary names. 2018-11-16 14:37:43 +00:00
Shams Asari
134f6a016c
Merge pull request #1568 from corda/os-merge-e8b6f5f
O/S merge e8b6f5f
2018-11-16 13:58:42 +00:00
Shams Asari
d138914640
Using epoch for the entries in the test CorDapp jars to remove that non-determinism (#4243) 2018-11-16 12:19:29 +00:00