ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-17 17:45:17 +00:00
Code Issues Actions2 Packages Projects Releases Wiki Activity
13,153 Commits 99 Branches 407 Tags
dbee84c01d
Commit Graph

13153 Commits

Author SHA1 Message Date
Viktor Kolomeyko
dbee84c01d
ENT-2489: Perform cleaner shutdown of Rpc/Flow workers () 
* ENT-2489: Perform cleaner shutdown of P2P connections.

* ENT-2489: SessionFactory tidy-up

* ENT-2489: Tidy-up RpcFlowWorkerDriver shutdown sequence

* ENT-2489: Fix test compilation issue.

* ENT-2489: Introduce helper function following review from @mnesbit
 2018-09-18 17:54:08 +01:00
Viktor Kolomeyko
18d4013d0c
ENT-2489: Introduce NetworkMapUpdater into FlowWorkerServiceHub () 
Without this change RpcWorkerTest currently in `master` just hangs
as FlowWorker never deemed to be ready from NM point of view.
 2018-09-18 15:16:20 +01:00
Shams Asari
2f9763ed47
Merge pull request from corda/os-merge-c79dd80 
O/S merge c79dd80
 2018-09-17 19:54:39 +01:00
Shams Asari
df6903b52f Merge remote-tracking branch 'open/master' into os-merge-c79dd80 2018-09-17 17:39:03 +01:00
Shams Asari
1c4294f42d
CORDA-1982: Convert the --base-directory to an absolute path to avoid issues on start up () 
Also the --network-root-truststore default value has been corrected to be relative to the base dir.

The cliutils has been updated to always convert Path cmd line params to be absolute
 2018-09-17 17:38:28 +01:00
Shams Asari
e7d32055e5 OS sync 2018-09-17 17:37:14 +01:00
Shams Asari
d22bab98fa Merge remote-tracking branch 'open/master' into os-merge-c79dd80 
# Conflicts:
#	docs/source/changelog.rst
#	docs/source/clientrpc.rst
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt
#	node/src/main/kotlin/net/corda/node/internal/rpc/proxies/ExceptionMaskingRpcOpsProxy.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
 2018-09-17 17:12:50 +01:00
Chris Rankin
1bae06cbf3
Merge pull request from corda/chrisr3-os-merge 
Merge from Open Source up to df4699c6
 2018-09-17 15:54:33 +01:00
Shams Asari
c79dd8017d
CORDA-1264: Mask internal errors if devMode is false () 2018-09-17 15:44:51 +01:00
Chris Rankin
ea38c35792 CORDA-1985: Upgrade Enterprise modules to Capsule 1.0.3. 2018-09-17 14:08:48 +01:00
Chris Rankin
92c93630ad CORDA-1964: Fix publication of tools:dbmigration project. 2018-09-17 14:08:04 +01:00
Chris Rankin
a10323ed0f Merge commit 'df4699c69abc8aab7e1e44b602c762212cbf93f6' into chrisr3-os-merge 2018-09-17 14:01:09 +01:00
Chris Rankin
df4699c69a
CORDA-1985: Configure Gradle capsule plugin to use Capsule 1.0.3. () 2018-09-17 13:55:31 +01:00
Andrius Dagys
160bc147ed ENT-1245: Cleanup: remove unused node from notary demo 2018-09-17 10:29:02 +01:00
Konstantinos Chalkias
137f7664c1
CORDA-1986 Ensure key alias format is supported by the major HSM vendors () 2018-09-17 10:19:34 +01:00
Konstantinos Chalkias
0b2e0b04ec
CORDA-1979 Cleanup NodeStartup for better readability () 2018-09-15 23:17:10 +01:00
Chris Rankin
7e4c5d4bb0
CORDA-1983: Upgrade to Gradle 4.10.1. () 2018-09-15 14:23:16 +01:00
Anthony Keenan
6578c3831b
Merge pull request from corda/anthony-os-merge-20190914-2 
O/S merge 14/09/2018
 2018-09-14 18:37:52 +01:00
Anthony Keenan
925af20339 Merge remote-tracking branch 'open/master' into anthony-os-merge-20190914-2 
# Conflicts:
#	docs/source/index.rst
#	docs/source/running-a-node.rst
#	node/build.gradle
 2018-09-14 16:45:40 +01:00
Anthony Keenan
99dd2c5936
CORDA-1764: Make blobinspector use picocli base class () 
* Make blobinspector use picocli base class

* Updated Documentation

* Update and harmonise documentation

* Give the table a bit more padding to help with merge conflicts

* Correct capitalisation of short options

* Some grammar changes
 2018-09-14 16:37:58 +01:00
Konstantinos Chalkias
356bddb2d4
check for empty rpc keystore/trustore passwords + extract method refactoring. () docs-testing 2018-09-14 15:32:24 +01:00
Stefano Franz
5be7d5c4f1
CORDA-1959 - Enforce backwards compatibility of new CLI's () 
* enforce backwards compatibility of new CLI's

* move Shell yml
 2018-09-14 14:37:52 +01:00
Anthony Keenan
fa6827ceaa
Fix broken smoke test () 2018-09-14 14:17:15 +01:00
Anthony Keenan
9a33a7f51f
Merge pull request from corda/anthony-os-merge-20180914 
Anthony O/S Merge 14/9/2018
 2018-09-14 11:46:11 +01:00
Viktor Kolomeyko
271146dd4d
ENT-2489: Improve logging for MultiThreadedStateMachineManager. () 2018-09-14 11:02:04 +01:00
Anthony Keenan
bce4e54156 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180914 
# Conflicts:
#	build.gradle
#	node/capsule/build.gradle
 2018-09-14 10:16:48 +01:00
Viktor Kolomeyko
3c9619b169
ENT-2489: Minor logging improvement for SingleThreadedStateMachineManager. () 2018-09-13 15:35:22 +01:00
Chris Rankin
4602a21a35
Merge pull request from corda/chrisr3-os-merge 
Merge from Open Source
 2018-09-13 15:14:50 +01:00
Shams Asari
725441b39c
Minor changes to bring in-sync with OS () 2018-09-13 12:53:06 +01:00
Chris Rankin
fba96a53fa Update remaining shadow plugin usages, remove cordform-common from,node. 2018-09-13 11:42:58 +01:00
Anthony Keenan
046b104fee
CORDA-1764: Make shell use picocli for parsing command line options () 
* Fix link in shell documentation

* The TypeSafe config parser wants extensions.sshd to be present in the config even though extensions is nullable

* Temp commit

* Make Standalone Shell use picocli

* Simplify gradle config for bootstrapper

* Fix logging dependency issues

* Revert "Temp commit"

This reverts commit f4efafcc9dce3a8fa26a270e3d8f34b282c8d24b.

* Fix quasarExcludeExpression

* Correct bootstrapper configuration

* Correct CRaSH capitalisation in docs

* Fix unit tests

* Fix help text typo

* Make logging level case insensitive

* Fix CRaSH capitalisation in help text

* Fix unit tests
 2018-09-13 11:14:31 +01:00
Anthony Keenan
ec0fc849ed
Publish cliutils package () 2018-09-13 11:14:19 +01:00
Chris Rankin
96597ba084 Merge commit '1c7dfd4b7b310e86b8aa973b8350487ba63c08b1' into chrisr3-os-merge 2018-09-13 11:06:52 +01:00
Chris Rankin
1c7dfd4b7b
CORDA-1964: Unify versioning of the shadow plugin, and resolve more issues for Gradle 5.0. () 2018-09-13 10:55:52 +01:00
Viktor Kolomeyko
0c1910722b
ENT-2489: Gracefully handle session that might have already been closed. () 2018-09-13 09:16:24 +01:00
Thomas Schroeter
057ee74611
Single node notary thread safety () 2018-09-12 13:36:04 +01:00
Shams Asari
9255866f10
Merge pull request from corda/os-merge-90a7dd2 
O/S merge 90a7dd2
 2018-09-12 13:26:49 +01:00
Shams Asari
445ffc8404 Merge remote-tracking branch 'open/master' into os-merge-90a7dd2 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/crypto/internal/ProviderMap.kt
#	core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt
#	core/src/main/kotlin/net/corda/core/utilities/ByteArrays.kt
#	finance/src/main/resources/migration/cash.changelog-master.xml
#	finance/src/main/resources/migration/commercial-paper.changelog-master.xml
#	finance/src/test/kotlin/net/corda/finance/flows/CashIssueFlowTests.kt
#	node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/HardRestartTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
#	node/src/main/kotlin/net/corda/node/Corda.kt
#	node/src/main/kotlin/net/corda/node/services/keys/PersistentKeyManagementService.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt
 2018-09-12 11:37:11 +01:00
Viktor Kolomeyko
90a7dd2bf4
ENT-2489: Fix serialization for some of the CordaExceptions. () 
Also add a unit test that exposes the problem.

Without these changes AMQP serialization fails with the following:
```
 net.corda.serialization.internal.amqp.AMQPNotSerializableException: Constructor parameter - "reason" -  doesn't refer to a property of "class net.corda.node.services.statemachine.SessionRejectException"
	at net.corda.serialization.internal.amqp.SerializationHelperKt.toPropertyAccessorConstructor(SerializationHelper.kt:120) ~[corda-serialization-4.0-SNAPSHOT.jar:?]
	at net.corda.serialization.internal.amqp.SerializationHelperKt.propertiesForSerializationFromConstructor(SerializationHelper.kt:107) ~[corda-serialization-4.0-SNAPSHOT.jar:?]
	at net.corda.serialization.internal.amqp.custom.ThrowableSerializer.toProxy(ThrowableSerializer.kt:28) [corda-serialization-4.0-SNAPSHOT.jar:?]
	at net.corda.serialization.internal.amqp.custom.ThrowableSerializer.toProxy(ThrowableSerializer.kt:12) [corda-serialization-4.0-SNAPSHOT.jar:?]
	at net.corda.serialization.internal.amqp.CustomSerializer$Proxy.writeDescribedObject(CustomSerializer.kt:159) [corda-serialization-4.0-SNAPSHOT.jar:?]
```
 2018-09-12 11:29:36 +01:00
Viktor Kolomeyko
b491b9a872
OS->Ent merge pull request 
OS->Ent merge
 2018-09-12 11:28:52 +01:00
Shams Asari
ca5d88e65a
Minor changes made in ENT which should have been ported over () 2018-09-12 11:26:37 +01:00
Viktor Kolomeyko
6f3a6cb584 Merge remote-tracking branch 'open/master' into vkolomeyko/OS-merge 
# Conflicts:
#	build.gradle
 2018-09-12 09:54:58 +01:00
Konstantinos Chalkias
f5768348ee
More descriptive message on "latest" supported Java version. () 
Also a TODO to reconsider the auto-resume registration functionality.
 2018-09-11 17:39:19 +01:00
Viktor Kolomeyko
49adf55397
ENT-2489: Additional optional parameter to specify target for RPC invocation. () 
This is a split-out change from an enterprise feature, but since we do have: `RPCApi.RPC_TARGET_LEGAL_IDENTITY` header constant even in OS, it would make sense to extend RPC client API to populate this.
 2018-09-11 16:32:17 +01:00
Shams Asari
26af54412b
Merge pull request from corda/os-merge-7459115 
O/S merge 7459115
 2018-09-11 15:00:34 +01:00
Chris Rankin
ce5cdc03f3
Use standard Automatic-Module-Name for DemoBench. () 2018-09-11 13:44:22 +01:00
Anthony Keenan
97cd2fcd3a
Publish cliutils () 2018-09-11 13:36:38 +01:00
Shams Asari
45b2417910 Merge remote-tracking branch 'open/master' into os-merge-7459115 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
 2018-09-11 13:26:48 +01:00
Christian Sailer
7459115f54
CORDA-1969 Retire SECP256K1 for TLS () 
* Flag SECP256K1 as not supported for TLS

* Remove authentication tests using SECP256K1 for TLS

* Remove K1 leftover
 2018-09-11 13:04:29 +01:00
Shams Asari
8bc46d9f7d
Porting over missing CRL soft fail check unit test from ENT () 2018-09-11 13:02:02 +01:00