ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-22 20:15:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,356 Commits 100 Branches 407 Tags
Commit Graph

1888 Commits

Author SHA1 Message Date
Andras Slemmer
67f5bcc38e Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8 2018-04-24 11:01:21 +01:00
Chris Burlinchon
b0d2a258c0 cherry-pick 7759fdbb71ea9b2021afd8af0ac05447c5305b3a 2018-04-24 09:36:57 +01:00
Shams Asari
8689d022ca Merge fixes 2018-04-23 15:52:37 +01:00
Shams Asari
5f781193b6 Merge remote-tracking branch 'open/master' into os-merge-d3446e2 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
#	testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
#	tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
 2018-04-23 15:50:24 +01:00
Andras Slemmer
5e0202acd0 Add killFlow 2018-04-23 15:36:35 +01:00
Andras Slemmer
6bf34ed5c7 Fix bugs 2018-04-23 15:36:16 +01:00
Andras Slemmer
5b4fd6fe64 Address comments 2018-04-23 15:36:16 +01:00
Rick Parker
57caf9af28 Cherry pick 34f871936315097fd54c440912c51ce62b4f922a 2018-04-23 15:36:16 +01:00
Andras Slemmer
19dad6da96 Add back deprecated functions 2018-04-23 15:36:16 +01:00
Andras Slemmer
ce5fb66260 StateMachine rewrite 2018-04-23 15:36:16 +01:00
Shams Asari
d3446e213c
Introduced a few more extension methods to Path, which are clearer than the static methods in Files. (#2985) 
Also migrated code away from the old File API.
 2018-04-23 14:31:49 +01:00
josecoll
15c015e0d6 Merge branch 'master' into colljos-merge-230418 2018-04-23 12:12:16 +01:00
Viktor Kolomeyko
bf4d8ba08c
CORDA-1335: Scan attachment Jar only to speed-up the process. (#2982) 
* CORDA-1335: Scan attachment Jar only to speed-up the process.

* CORDA-1335: Explicitly mention other types of contracts to scan.

* CORDA-1335: Refactor to eliminate listing different subclasses of Contract in two separate places.
 2018-04-23 09:17:43 +01:00
cburlinchon
7789d5475f
Revert node suspend and resume (#744) 2018-04-17 15:14:58 +01:00
Shams Asari
b6d43c0204 Merge remote-tracking branch 'open/master' into os-merge-1288f63 
# Conflicts:
#	constants.properties
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappConfigProvider.kt
#	samples/cordapp-configuration/src/main/kotlin/net/corda/configsample/ConfigSampleFlow.kt
 2018-04-16 17:35:43 +01:00
Shams Asari
1288f63998
Fixed the CorDapp configuration demo (#2967) 2018-04-16 17:23:11 +01:00
Rick Parker
34f8719363
ENT-1766 Release soft locks inside the database transaction (#737) 2018-04-16 13:51:50 +01:00
Christian Sailer
a0bf0261bb Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336 2018-04-13 16:39:00 +01:00
Konstantinos Chalkias
6f69f0252d
CORDA-1337 Crypto.registerProviders (#2962) 
CORDA-1337 Crypto.registerProviders + add BCPQC as well
 2018-04-13 12:40:15 +01:00
Katarzyna Streich
91c52af5ac
ENT-1584: Subscribe to private network maps using UUIDs (#2922) 
Client private network map implementation

Add private network maps UUIDs to config as extraNetworkMapKeys. Adjust NetworkMapServer implementation accordingly.
Change NetworkMapUpdaterTest to use NetworkMapServer instead of mock
 2018-04-13 10:52:45 +01:00
Shams Asari
9b58114146 Merge remote-tracking branch 'open/master' into os-merge-f88542f 
# Conflicts:
#	docs/source/changelog.rst
#	finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
 2018-04-11 15:40:25 +01:00
szymonsztuka
b46c3b89bd
CORDA-1326 Add default shell user only when local shell is started. (#2953) 
In productionMode ssh could login to a node using "shell/shell" which is supposed to be available only in dev mode (to enable embedded shell).
 2018-04-11 14:06:13 +01:00
Matthew Nesbit
8c1e9c069e Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-04-11 14:00:36 +01:00
Shams Asari
4a77712978 Merge remote-tracking branch 'open/master' into os-merge-ecce64b 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
 2018-04-11 11:15:17 +01:00
Matthew Nesbit
70beffac48
Add support for different internal p2p artemis bind address/port (#2951) 
* Add support for different internal p2p artemis bind address/port and externally advertised p2pAddress and port.

* Fix formatting
 2018-04-11 10:33:17 +01:00
Shams Asari
ecce64ba03
HttpUrlConnection.getErrorStream() can be null, which if not handled can obscure the reporting of an HTTP error response, like in ENT-1744 (#2948) 2018-04-11 09:39:58 +01:00
igor nitto
2fc7e5e674
Classloader loading DataSource must stay open [ENT-1717] (#709) 2018-04-10 16:02:03 +01:00
Tudor Malene
4ed917436a
CORDA-1309 Add support for jarDirs config (#705) 2018-04-10 11:24:35 +01:00
Anthony Keenan
f798c58c36 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180406 
# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
 2018-04-06 11:43:34 +01:00
Rick Parker
130b1d9325
CORDA-1303 Regression: Recording a duplicate transaction attempts sec… (#2935) 
* CORDA-1303 Regression: Recording a duplicate transaction attempts second insert to vault.

Added unit test, and merged mock and real logic.
 2018-04-06 10:28:51 +01:00
Shams Asari
a97abbc8c0 Merge remote-tracking branch 'open/master' into os-merge-1b37cef 2018-04-05 17:23:03 +01:00
Shams Asari
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash (#2931) 2018-04-05 17:18:27 +01:00
Michal Kit
c8b58a601f
Adding CRL support in the generated certificates. (#2932) 2018-04-05 16:39:41 +01:00
Shams Asari
53a0aae489
Introduced a few helper methods around InputStream.readBytes (#2928) 2018-04-05 14:27:42 +01:00
Viktor Kolomeyko
375b4638ba Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
#	node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt
 2018-04-05 13:12:13 +01:00
Viktor Kolomeyko
9a1c27e3e0
Improve performance of NodeStatePersistenceTests (#2921) 
Packages re-jig was meant to reduce the size of the jars that are being produced by the
node driver. E.g. previously `MessageState` was in package `net.corda` which resulted in jar file
of around 2MB to be created. Same for `NodeStatePersistenceTests` which was in `net.corda.node`
 2018-04-05 09:33:03 +01:00
Shams Asari
4c123643ac
Merge pull request #680 from corda/shams-os-merge-0af42bd 
O/S merge from 0af42bd
 2018-04-04 17:38:18 +01:00
Rick Parker
23184b7495
ENT-1729 P2P message de-duplication performance optimisation has a flaw (#675) 2018-04-04 15:49:00 +01:00
Shams Asari
7296369541 Merge fixes 2018-04-04 14:52:24 +01:00
Shams Asari
6283462548 Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
 2018-04-04 14:18:24 +01:00
Andras Slemmer
4334d38bf5
Merge pull request #672 from corda/aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04 
Merge OS up to 2f1b8ff23e5a0400f72ff603da10b849604c6b04
 2018-04-04 12:07:07 +01:00
Andrius Dagys
5909a49c30
ENT-1725: Introduce FlowAsyncOperation (#658) 
* ENT-1725: Introduce FlowAsyncOperation, which allows suspending a flow on a custom operation, such as long running I/O requests, notary commit, etc.

* Move async execute to internal, add more tests.

* Add a 30s test timeout

* Update API doc
 2018-04-04 09:52:49 +01:00
szymonsztuka
7ec65901b6 Corda-1286 Fix embedded shell when rpc users from remoted database (#2910) 2018-04-03 19:13:41 +01:00
Andras Slemmer
e9d2963912 Measure Action execution times, utilised flow threads 2018-04-03 18:54:48 +01:00
Shams Asari
65ff214130
CORDA-1276: Cleaned up creation of node-info object on node start and when using --just-generate-node-info (#2909) 2018-04-03 17:30:53 +01:00
Andras Slemmer
fbafe36643 Merge commit '2f1b8ff23e5a0400f72ff603da10b849604c6b04' into aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04 2018-04-03 17:10:33 +01:00
Andras Slemmer
ef723b1b68 CORDA-1295: Use ConcurrentHashMap instead of synchronised multimap 2018-04-03 12:06:59 +01:00
Andras Slemmer
6d5e08b44e CORDA-1295: Clean up client->observable association on observable finish 2018-04-03 11:43:17 +01:00
sollecitom
558f5cddce Porting change to make JPA entities non-final and serializable. 2018-03-29 13:17:22 +01:00
sollecitom
89ecfb96c5 Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11 2018-03-29 13:12:00 +01:00