Commit Graph

8041 Commits

Author SHA1 Message Date
Shams Asari
eece19cce0
Merge pull request #5450 from corda/tudor_merge_4.1_to_4.3
Tudor merge 4.1 to 4.3
2019-09-09 15:51:15 +01:00
tudor.malene@gmail.com
ea73dcfb22 Merge branch 'release/os/4.1' into tudor_merge_4.1_to_4.3
# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt
2019-09-09 16:04:39 +03:00
Stefano Franz
3476a47378
move irs-demo to slowIntegrationTest (#5447) 2019-09-09 10:49:44 +00:00
Tudor Malene
80d64a9574 ENT-3916 - document testing CorDapp upgrades. (#5421) 2019-09-09 10:26:37 +01:00
Tudor Malene
9b04f73ee8 ENT-3924 - more evident error message when multiple versions of the same CorDapp installed (#5431) 2019-09-09 09:46:57 +01:00
Stefano Franz
d5400e514e
add exception handling to handle situation where builds are tidying up same pods (#5440)
* add asterix to test name

* fix usages of System.hasProperty

* add exception handling to handle condition when Build2 is deleting pods that are being tidied up by Build1

* attempt to fix namespace issues

* add pull task to pull latest base image

* add logic to download dependencies in parallel before running tests
2019-09-06 16:48:49 +00:00
Denis Rekalov
a4650b2bb3 CORDA-3187: Add -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError to default JVM args for node (#5432) 2019-09-06 13:49:52 +01:00
Shams Asari
cedb290bc9
CORDA-3188: Ignore synthetic and static fields when searching for state pointers (#5439) 2019-09-06 10:25:00 +01:00
edward-prosser
7ef9a8d2c9
Merge pull request #5438 from corda/CORDA-3054-EdP
Update dockerform task steps
2019-09-05 15:33:40 +01:00
Nick Dunstone
9d6922d11e CORDA-3177 Additional Back Chain Resolution performance enhancements (#5415)
* Applied backchain fetch optimisations

* Removed test for bulk fetch

* Removed import

* Removed extraneous import

* Review comment
2019-09-05 14:27:42 +01:00
Stefano Franz
14b2882bd7
Improve docker image building to use a stable working directory (#5433)
* add docker working directory parameters to image building
remove gitSha from "stable" buildId, to allow updates to a PR to kill pods

* split up chained null checks  onto separate lines

* fail build if docker image fails to build
force reporting task to run regardless of previous inputs

* add asterix to test name

* fix usages of System.hasProperty
2019-09-05 13:23:41 +00:00
Stefano Franz
d10c74cbd0
reapply docker plugin for building corda docker images (#5437) 2019-09-05 12:02:51 +00:00
Istvan Farmosi
74e44eb1ee DOCS - Updated documentation for Testnet to reflect UI changes. (#5409) 2019-09-05 11:54:37 +01:00
Ed Prosser
5ff0986216 Update dockerform task steps
Signed-off-by: Ed Prosser <edward.prosser@r3.com>
2019-09-05 11:05:34 +01:00
Dimos Raptis
1ac7715e28 [CORDA-2890] - Close security manager after broker is shut down (#5425) 2019-09-04 14:06:46 +01:00
Stefano Franz
a842740c9e
WIP Kubenetes parallel build (#5396)
* Split integration tests

* add simple example of printing all methods annotated with @Test

* add docker plugin to root project
remove docker plugin from child projects
add Dockerfile for image to use when testing
add task to build testing image to root project

* add comment describing proposed testing workflow

* simple attempt at running tests in docker container

* add my first k8s interaction script

* add fabric8 as dependnency to buildSrc

* before adding classpath

* collect reports from containers and run through testReports

* re-enable kubes backed testing

* for each project
1. add a list tests task
2. use this list tests task to modify the included tests
3. add a parallel version of the test task

* tweak logic for downloading test report XML files

* use output of parallel testing tasks in report tasks to determine build resultCode

* prepare for jenkins test

* prepare for jenkins test

* make docker reg password system property

* add logging to print out docker reg creds

* enable docker build

* fix gradle build file

* gather xml files into root project

* change log level for gradle modification

* stop printing gradle docker push passwd

* tidy up report generation

* fix compilation errors

* split signature constraints test into two

* change Sig constraint tests type hierarchy

* tidy up build.gradle

* try method based test includes

* add unit test for test listing

* fix  bug with test slicing

* stop filtering ignored tests to make the numbers match existing runs

* change log level to ensure print out

* move all plugin logic to buildSrc files

* tidy up test modification
add comments to explain what DistributedTesting plugin does

* move new plugins into properly named packages

* tidy up runConfigs

* fix compile errors due to merge with slow-integration-test work

* add system parameter to enable / disable build modification

* add -Dkubenetise to build command

* address review comments

* type safe declaration of parameters in KubesTest
2019-09-03 15:40:08 +00:00
Roger Willis
99f4e4aac2
CORDA-3182: Added additional property on VaultQueryCriteria for querying by account (#5423)
* Added an additional property on VaultQueryCriteria to specify an externalId/accountId when performing a vault query.
Added logic in hibernate query criteria parser to handle the exernalId join and lookup.
Added a test.

* Fixed error in test.
Fixed backwards incompatible changes.

* Updated changelog.

* Updated docs to remove incorrect instructions for querying by external ID.
2019-09-03 11:55:26 +01:00
Stefano Franz
c2057e0893 CORDA-3180: Added ability to lookup the associated UUID for a public key to KeyManagementService (#5411)
* expose identity cache to KMSinternal

* apply shams comments

* Addressed review comments.
2019-09-01 07:57:46 +01:00
Stefano Franz
cd0d5c7724 Ensure that ServiceHub.WithEntityManager has a database transaction available (#5413)
* tidy up withEntityManager

* address rick review comment

* api break
2019-08-30 15:58:50 +01:00
josecoll
136600c91a
CORDA-3175 Remove dependency on 3rd party javax.xml.bind library for simple hex parsing/printing. (#5412)
* Remove dependency on 2rd party javax.xml.bind library for simple hex parsing/printing.

* Added unit test.
2019-08-30 15:24:01 +01:00
Roger Willis
6202165957
Fix for CORDA-3178. FilterMyKeys now uses the key store as opposed to the cert store. (#5418) 2019-08-30 10:55:31 +01:00
Dimos Raptis
4b5a38796f [CORDA-3106] - Refine documentation around rpc reconnection (#5405) 2019-08-30 09:24:58 +01:00
Dimos Raptis
3023e3ab87 [NOTICK] Expose type in CryptoService (#5416) 2019-08-30 09:22:15 +01:00
willhr3
07b96aea18 CORDA-2925 Rebase identity service changes onto 4.3 (#5407)
* CORDA-2925 Rebase identity service changes onto 4.3

* CORDA-2925 Move migration to after v13

* CORDA-2925 Update schema list

* Change corda-version
2019-08-29 11:57:07 +01:00
josecoll
f09bff9c0f
Make concurrent updates to contractStateTypeMappings thread safe. (#5410) 2019-08-29 09:55:21 +01:00
Dimos Raptis
b97062bacc [CORDA-3098] - Close previous connection after reconnection (#5339) 2019-08-28 16:44:57 +01:00
Ake Gaviar
11d107dcb1
Fix typo
Added the colon. A tiny typo fix.
2019-08-28 18:35:59 +03:00
Jonathan Locke
20585266a5
[NOTICK]: Change Corda version
Change Corda version
2019-08-28 15:38:36 +01:00
Stefan Iliev
3a6787437d CORDA-3022 Add wildcard RPC permissions (#5174)
* Added small poc changes to accommodate requested permissions.

* Added node user that can only start flows and has the neccessary permissions.

* Fixed type in the rpc unit tests.

* Finaliase wildcard RPC permissions, remove builtin maintainer/nodeuser roles

* Tidy up
2019-08-28 15:29:06 +01:00
Stefano Franz
e35c0c1df7
CORDA-3009 - Migrate identity service to use to string short (#5217)
* migrate PersistentIdentityService to use key.toShortString()
update definition of PublicKeyToExternalId mapping to allow fast lookup by externalId/publicKey

* fix misspelled table name

* add test of migration script

* add design document for proposal to move IdentityService to using the correct PK.toStringShort() method for hashing a publickey

* add enterprise testing considerations to design

* address review comments

* fix compilation errors

* modify PublicKeyToOwningIdentityCache to use toStringShort() as it's lookup key

* address syzmon's code review comments
2019-08-28 14:16:18 +00:00
Jonathan Locke
5ede8b5761 [NOTICK]: Change Corda version
Removed unnecessary comment which will just get outdated.
2019-08-28 14:35:06 +01:00
Jonathan Locke
c525f77ae9 [NOTICK]: Change Corda version
Changed Corda version in places where it was missed.
2019-08-28 14:14:39 +01:00
Jonathan Locke
7f89577f83
[NOTICK]: Update to Contract Extension Error Message
Update to Contract Extension Error Message
2019-08-28 13:16:58 +01:00
Jonathan Locke
bbadec70ba [NOTICK]: Change Corda version
Change Corda version from 5.0-SNAPSHOT to 4.3-SNAPSHOT to reflect the next version of Corda to be released.

Multi-line description of commit,
feel free to be detailed.
2019-08-28 12:59:18 +01:00
Jonathan Locke
bbf1d6351e
Merge OS 4.1 into OS 4.3
Merge OS 4.1 into OS 4.3
2019-08-28 07:06:08 +01:00
Jonathan Locke
122bf3b3e0 Merge OS 4.1 into OS 4.3
Corrected changelog
Corrected irs-demo cordapp build.gradle file - removed unnecessary dependency

feel free to be detailed.
2019-08-27 16:21:47 +01:00
Jonathan Locke
35d0170b0a Merge branch 'master' into jlocke/merge_4.1_20190827 2019-08-27 15:21:21 +01:00
Jonathan Locke
f96105a014
CORDA-3157: Modify Corda's custom serialiser support for the DJVM.
Modify Corda's custom serialiser support for the DJVM.
2019-08-27 15:20:38 +01:00
Jonathan Locke
9661f8d4e4 Merge OS 4.1 into OS 4.3
Fixed missed conflict in conf.py
2019-08-27 14:56:08 +01:00
Jonathan Locke
e5f314ffbf Merge branch 'release/4' into jlocke/merge_4.1_20190827
Merged release/4 (Corda OS version 4.1) into a branch created from master (Corda OS version 4.3)

Conflicts:
	build.gradle
	client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
	common/logging/build.gradle
	common/logging/src/main/kotlin/net/corda/common/logging/CordaVersion.kt
	constants.properties
	core-tests/src/test/kotlin/net/corda/coretests/utilities/ProgressTrackerTest.kt
	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
	docs/source/api-contract-constraints.rst
	docs/source/api-stability-guarantees.rst
	docs/source/app-upgrade-notes.rst
	docs/source/changelog.rst
	docs/source/clientrpc.rst
	docs/source/conf.py
	docs/source/corda-network/UAT.md
	docs/source/getting-set-up.rst
	docs/source/network-builder.rst
	docs/source/upgrading-cordapps.rst
	docs/source/versioning.rst
	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt
	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertyDescriptor.kt
	serialization/src/main/kotlin/net/corda/serialization/internal/model/LocalTypeInformationBuilder.kt
	tools/network-builder/src/main/resources/node-Dockerfile
	tools/network-builder/src/main/resources/notary-Dockerfile
2019-08-27 14:51:22 +01:00
Shams Asari
90284a6143
CORDA-2919: JacksonSupport, for CordaSerializable classes, improved to only uses those properties that are part of Corda serialisation (#5397) 2019-08-27 13:06:28 +01:00
Chris Rankin
e25d9a1d4e Update KDocs. 2019-08-27 11:24:41 +01:00
Jonathan Locke
a4f8448398
CORDA-3073: Code block links 404
Fixes: https://r3-cev.atlassian.net/browse/CORDA-3073

Running the provided code returned a 404, now it returns the files as expected. :)
2019-08-27 09:52:09 +01:00
edward-prosser
fc5cd62e20
Merge pull request #5374 from corda/edp-update-qs-bug
CORDA-3150 Docs command fix
2019-08-27 09:20:36 +01:00
Katelyn Baker
7b308eb45f
NOTICK: Add BlobWriter and Schema Dumper
The Blob Writer is a small kotlin app that allows arbitrary things to be serialized and then those bytes written to a file, quite useful for working on non JVM parsing of such things.

Along a similar vein, add a schema dumper alongside the blob-inspector to highlight the contents of the header
2019-08-26 20:59:56 +01:00
Chris Rankin
92ae45a949 Fix typo decimal62 -> decimal64. 2019-08-26 15:26:36 +01:00
Mike Hearn
dbce25b575 Put missing content back into the toctree after a bad merge.
Fix a bunch of ReST markup errors.
2019-08-23 14:41:32 +02:00
Mike Hearn
43c61bfea1
Use full Apache 2.0 license so GitHub recognizes it 2019-08-23 12:24:37 +02:00
Chris Rankin
4ebd02bc04 Tidy up changes for review. 2019-08-23 11:11:11 +01:00
Chris Rankin
b2d335c518 Make the choice of AMQP serializer for primitive types configurable. 2019-08-23 08:52:16 +01:00