13720 Commits

Author SHA1 Message Date
Christian Sailer
eda0867f3a
ENT-2572 Use quasar from Artifactory rather than a jitpacked version (#1594)
* Reference corda-dependencies version of quasar rather than jitpack

* quasar version changed
2018-11-23 21:22:09 +00:00
Thomas Schroeter
1aa1221a29
Fix typo in liquibase script (#1590) 2018-11-23 17:21:01 +00:00
Shams Asari
8eb89a3bbc
Merge pull request #1589 from corda/dominic-merge-22-11-2018
OS merge Dominic 2018-11-22
2018-11-23 16:10:01 +00:00
Dominic Fox
729469483f Resolve merge conflict 2018-11-23 14:35:47 +00:00
Roger Willis
9b15d4dafb CORDA-2232: external id to pubkey mapping (#4210)
* First pass
Update test.
Address review comments.
Added docs and kdocs.
Clean-up.

* Addressed review comments.

Changes to docsite.

* First pass at account service.
Added new hibernate schemas and liquibase scripts.
Added indexes to new tables.
Removed mock network.
Removed fresh key for external id from key management service.
Removed some redundant changes.
Rebase to master.

* Clean up.

* Added try/catch block as recommended by Andras.

* Removed accounts test to another branch.
Removed element collections from fungible states and linear states table.
Added a new state_parties table which stores x500 names and public key hashes.
Added a view which can be used to query by external ID.

* 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.

*  This is a combination of 10 commits.
 This is the 1st commit message:

Shortened table name.

 This is the commit message #2:

Minor changes.

 This is the commit message #3:

Common criteria parser now returns a predicate set which is concatenated to the predicate sets of sub-class criteria.

 This is the commit message #4:

Fixed api compatibility issue.
Reverted some changes to reduce size of PR.

 This is the commit message #5:

Multiple states can now be mapped to the same externalId.
Multiple externalIds can now be mapped to the same state.

 This is the commit message #6:

Relaxed upper bound type constraint in some of the vault types.

 This is the commit message #7:

Added comment to test.

 This is the commit message #8:

Changed name of external id to public key join table.
Removed some comments/TODOs.

 This is the commit message #9:

Added docs.
General clean up.

 This is the commit message #10:

Fixed participants query bug and updated unit test.

* Removed unused code.
2018-11-23 14:29:57 +00:00
Dominic Fox
d91b07907f CORDA-2099 serialisation rewrite (#4257)
* Type model first draft

* Introduce TypeIdentifier

* Attempting to retrofit fingerprinter with type model

* Complete retrofitting typemodel to fingerprinter

* Ensure component types are resolved correctly

* Fixes and tests

* Move resolveAgainst to TypeIdentifier

* Remote type modelling and reflection

* Convert TypeIdentifiers back into types

* Translate AMQP type strings to type identifiers

* Start replacing DeserializedParameterizedType

* Start roundtripping types through AMQP serialization

* Comments on type modelling fingerprinter

* kdocs and interface reorganisation

* Lots and lots of kdocs, bugfix for cyclic references

* Separate SerializerFactory construction from concrete implementation

* Fewer build methods

* Method naming that doesn't fatally confuse determinisation

* Extract SerializerFactory interface

* Reset to master's version of compiler.xml

* Un-ignore flickering test

* Enums don't have superclasses

* Break out custom serializer registry

* Refactor to separate remote and local serializer factories

* Shrink interfaces

* Further interface narrowing

* Fingerprinting local type model

* LocalSerializerFactory uses LocalTypeInformation

* Resolve wildcards to their upper bounds

* Actually cache custom serializers

* Fix various bugs

* Remove print statements

* There are no cycles in type identifiers

* Drive class carpentry from RemoteTypeInformation

* Refactor and comment

* Comments

* Comments and pretty-printer extraction

* Format long methods with braces

* Serialise composable types using LocalTypeInformation

* Warnings if a type is non-composable

* Rename lookup -> findOrBuild

* Evolution serialisation (no enums yet)

* Eliminate old ObjectSerializer and evolver

* Enum evolution

* Opacity claims types less greedily

* Fix type notation and type erasure bug

* Clean up unused code paths

* Delete unused codepaths

* Move whitelist based type model configuration to own file

* Move opaque type list

* Make all evolution serialisers in one go when schema received

* Minor tweaks

* Commenting and tidying

* Comments

* Rebase against master

* Make flag for controlling evolution behaviour visible

* propertiesOrEmptyMap

* Restore error messages

* Test for CORDA-4107

* PR fixes

* Patch cycles in remote type information after creation

* Fix line breaks in unit test on Windows

* This time for sure

* EvolutionSerializerFactoryTests

* Fix some pretty-printing issues, and a carpenter bug

* PR fixes

* Clarify evolution constructor ordering

* Remote TODO comment, which has been moved to a JIRA story
2018-11-23 14:27:28 +00:00
James Brown
4cd77dca3a CORDA-2199 NetworkParameters certificate role (#4278) 2018-11-23 14:27:28 +00:00
Tudor Malene
0a6c3822e5 ENT-2763 - Change packageOwnership type (#4273)
* ENT-2763 - Change packageOwnership type

* ENT-2763 - Address code review comment.

* ENT-2673 Address code review comments.

* ENT-2673 Address code review comments.

* ENT-2673 Fix test

* ENT-2673 Address code review comments.
2018-11-23 14:27:28 +00:00
szymonsztuka
d3b8497362 CORDA-2150 testing infrastructure for non downgrade contract version rule - TestDSL creates Jar with manifest file (#4274)
This is preliminary addition to test "Implementation-Version" entry from META-INF/MANIFEST.MF in TestDSL.kt. MockCordappProvider was creating JAR without manifest file. Added the manifest file with the obligatory (by JAR spec) attribute "Manifest-Version", other attributes can be added.
2018-11-23 14:27:28 +00:00
Thomas Schroeter
08ae58529a [CORDA-2243] Notary client should sign over NotarisationRequest serialised with object referencing turned off (#4264)
* Sign later to make sure the notary service constructs the same serialized bytes

* Add non validating notary tests

* Revert "Sign later to make sure the notary service constructs the same serialized bytes"

This reverts commit cefba5c350622df44227e89feacb12a7f12e1f7e.

* Dereference SecureHashes before creating the notarisation request signature

* Update comment

* Address comments

* Undo accidental renaming
2018-11-23 14:27:27 +00:00
Dominic Fox
a9dfb7828c Fix unit test failure due to Windows end-of-line characters (#4271) 2018-11-23 14:27:27 +00:00
Joel Dudley
1c59d321ee Update testnet-explorer-corda.rst (#4270) 2018-11-23 14:27:27 +00:00
Oliver Knowles
683e641a61 Fix node configuration doc for network parameter auto-acceptance settings (#4268) 2018-11-23 14:27:27 +00:00
Andrius Dagys
bc48f8112e Address util tests: remove invalid test case (#4269)
Local host address can also be public
2018-11-23 14:27:27 +00:00
Joel Dudley
3cc1c47cf0 Combines all contributing info in one place. Clean-up. (#4266) 2018-11-23 14:27:27 +00:00
Viktor Kolomeyko
035656bd89 ENT-2653: Introducing CommonCliConstants (#4265) 2018-11-23 14:26:01 +00:00
Tudor Malene
bda07561f7 ENT-2675 Improve error message (#4258)
* ENT-2675 Improve error message

* ENT-2675 Improve error message
2018-11-23 14:26:01 +00:00
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