13764 Commits

Author SHA1 Message Date
Thomas Schroeter
85ebd57f90
ENT-2783 Implement ETA for backpressure in JPA and MySQL uniqueness providers (#1599)
* Implement ETA for backpressure in JPA uniqueness provider

* Pass eta threshold to validating notary flow

* Add ETA to MySQLUniquenessProvider

* Restore default eta message threshold in ValidatingNotaryFlow

Reducing the OS-ENT diff.

* Throughput var is private
2018-11-26 16:46:12 +00:00
Rick Parker
96205b26c4
Merge pull request #1598 from corda/parkri-os-merge-20181126-1 2018-11-26 13:03:51 +00:00
rick.parker
796082f75a Fix compilation error in test 2018-11-26 11:01:41 +00:00
Viktor Kolomeyko
2728ab9440
ENT-2689: New integration test for diff. SSL configurations (#1576)
* ENT-2689: Distinct SSL configurations integration tests.

* ENT-2689: Use distinct passwords for store, private keys and trust store

* ENT-2689: Make passwords for Artemis and Tunnel different.

* ENT-2689: Different value for public `trustStorePassword`
2018-11-26 10:01:12 +00:00
Thomas Schroeter
395c981af8
Fix jpa notary (#1596) 2018-11-26 09:46:34 +00:00
rick.parker
a21217ccc9 Add default value to NonValidatingNotaryFlow so other notaries compile by default. 2018-11-26 09:36:59 +00:00
rick.parker
30813e4497 Fix compilation issue in FlowStateMachineComparatorTest 2018-11-26 08:50:01 +00:00
rick.parker
aee0ebdc7b Apply notary back pressure code to MultiThreadedStateMachineManager to fix compilation 2018-11-26 08:48:00 +00:00
rick.parker
b6736cbaf9 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20181126-1 2018-11-26 08:44:08 +00:00
Michele Sollecito
cccdb2882a
Merge pull request #1595 from corda/shams-os-merge-231118
O/S merge until e14421b
2018-11-25 13:22:40 +00:00
Dominic Fox
81905c67ea CORDA-1825 user-friendly error when serializing non-composable types (#4290)
* CORDA-1825 user-friendly error when trying to serialize non-composable type

* Tests for @CordaSerializable
2018-11-25 11:25:31 +00:00
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
szymonsztuka
4ebca4846c
CORDA-2150 Contract version no downgrade check - add test infrastructure - internalDriver can sign CorDapp JAR, disabled by default (#4289) 2018-11-23 18:17:50 +00:00
Thomas Schroeter
4e55694216 ENT-2356 NotaryServiceFlow backpressure (#4242) 2018-11-23 17:45:36 +00:00
Shams Asari
04054f7c68 Merge branch 'merge-point-e14421b' into shams-os-merge-231118 2018-11-23 17:35:40 +00:00
Shams Asari
3e8c7ba9bc Merge fixes to make sure the crypto service config is intact 2018-11-23 17:31:22 +00:00
Thomas Schroeter
1aa1221a29
Fix typo in liquibase script (#1590) 2018-11-23 17:21:01 +00:00
Shams Asari
3af241c93d Merge branch 'merge-point-49d1cee' into shams-os-merge-231118
# Conflicts:
#	.idea/compiler.xml
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfigurationImpl.kt
#	node/src/main/kotlin/net/corda/node/services/config/schema/v1/V1NodeConfigurationSpec.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
2018-11-23 17:20:55 +00:00
Shams Asari
2dfb88ac14 Merge branch 'merge-point-4c8dabc' into shams-os-merge-231118 2018-11-23 17:14:45 +00:00
Shams Asari
fef2adac59 Merge fixes 2018-11-23 16:43:58 +00:00
Shams Asari
6f79e60a9d Merge branch 'merge-point-c419605' into shams-os-merge-231118
# Conflicts:
#	CONTRIBUTING.md
#	build.gradle
#	docs/source/api-scanner.rst
#	docs/source/building-corda.rst
#	docs/source/contributing-index.rst
#	docs/source/contributing.rst
#	docs/source/testing.rst
#	node/capsule/build.gradle
#	node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
#	node/src/main/resources/migration/vault-schema.changelog-master.xml
2018-11-23 16:34:49 +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
Konstantinos Chalkias
2c182dd158
Use a wrapper over StateRef for references (#4286) 2018-11-23 15:20:10 +00:00
Michele Sollecito
a5fb1a82f1
[CORDA-2244]: Allow map and mapValid on entire lists wrt configuration parsing (#4280) 2018-11-23 15:11:59 +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
Thomas Schroeter
8f15cfaa28
[ENT-2769] Handle reference states in the PersistentUniquenessProvider (#4275)
* Handle reference states in the PresistentUniquenessProvider

* Complete test

* Re-notarise outside time window without input states

* Address comments

* Add missing column name
2018-11-23 11:52:41 +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
Vardan Nadkarni
e14421b7b4 CORDA-1480: In Demobench, saving a profile, opening it, and adding a node skips next name (#4113)
* Fixes Github #3800 ,Jira Issue CORDA-1480

* did the requested changes

* does the requested changes

* Did requested changes

* Does the required changes
2018-11-23 10:18:02 +00:00
Shams Asari
51adf9b678
LedgerTransaction no longer a data class to prevent more copy methods and fixed serialisation issue (CORDA-2231) (#4287)
LedgerTransaction is not meant to be created directly from client code, but it being a data class means we will expose new copy methods as new properties are added. The existing copy methods that we've exposed since V3 are deprecated, and equals and hashCode have been updated to be based just on id.

The primary c'tor has been clearly marked as the class' wire format, and so the internal stuff has been moved out. The references property cannot be made nullable and so DeprecatedConstructorForDeserialization is used instead.
2018-11-22 22:53:24 +00:00
Shams Asari
49d1cee6d4
Removed crypto service config (#4284) 2018-11-22 20:30:37 +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
Tudor Malene
4c8dabc288
ENT-2506 restore the attachment party signers (#4255)
* ENT-2506 restore the attachment party signers

* ENT-2506 restore the attachment party signers

* ENT-2506 restore the attachment party signers

* ENT-2675 Address code review changes.

* ENT-2675 Address code review changes.
2018-11-22 18:35:30 +00:00
Roger Willis
c41960520c
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-22 14:31:34 +00:00