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,265 Commits 100 Branches 407 Tags
Commit Graph

1857 Commits

Author SHA1 Message Date
Konstantinos Chalkias
5bbfde3d35
Run filterMyKeys only when required (in NodeVaultService) (#3014) 2018-05-01 13:24:06 +01:00
Shams Asari
42edf58b92
Introducing AbstractArgsParser which removes the boilerplate of printing help and exiting the process on cmd line errors. (#3040) 2018-04-30 22:22:51 +01:00
jamesbr3
32b57feaa0 Update jolokia to 1.5.0 (#2617) 
* Update jolokia to 1.5.0

* adding jolokia update to changelog
 2018-04-30 10:24:08 +01:00
szymonsztuka
416d4ecaeb
ENT-1428 Vault queries - change SQL generation for aggregate function in 'group by' clause. (#426) 
Vault queries: 'order by' function aggregation e.g. 'order by sum(col)' is replaced by the position of the selected column (e.g. 'order by 1').
Rationale: NonStop database doesn't support aggregation function in order by clause e.g. 'order by (sum col_x)'. I couldn't find a way to force Hibernate to produce alias e.g. ' select sum(col_x) as alias_x... order by also_x ...',   and the only solution supported by all db an HPE NonStop is to use positional parameter e.g. 'select sum(col_x) as alias_x... order by 1 ...'
 2018-04-30 09:45:15 +01:00
Michal Kit
ab80df342a
CORDA-1319 Adding CRL checking for nodes (#2987) 
* Adding CRL support for nodes

* Addressing review comments
 2018-04-30 09:26:26 +01:00
Andrius Dagys
efd203e5f3
ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly (#3004) 
* ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly.

Currently the time window is checked before states are being passed to a uniqueness provider. If the time window is
invalid, the transaction will be rejected even if it has already been notarised, which violated idempotency.

For this reason the time window verification was moved alongside state conflict checks.

* Update API - this only affects custom notary interfaces
 2018-04-27 15:02:09 +01:00
sollecitom
70b32636b5 Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38 
# Conflicts:
#	docs/source/changelog.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-04-27 10:12:15 +01:00
Michele Sollecito
235df69efe
[CORDA-1379]: Allow soft trapping of unknown config keys. (#3011) 2018-04-27 15:33:13 +07:00
Anthony Keenan
aecde00365
CORDA-1001 Remove unused bits of PersistentMap (#3001) 
* Remove unused bits of PersistentMap

* Add persistent map tests

* Reivew comments
 2018-04-26 21:58:01 +01:00
Thomas Schroeter
61d2212840 Merge remote-tracking branch 'open-source/master' into thomas-merge 
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
 2018-04-26 14:47:29 +01:00
Thomas Schroeter
2ff3939e2e
Add exponential backoff to P2P messaging retry (#2975) 2018-04-26 13:58:41 +01:00
Andras Slemmer
266b96f99c Merge commit '88c12791a81a49bdaab93e6bda4d070d7bf1ac5c' into aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c 2018-04-26 10:01:30 +01:00
Andrius Dagys
7ad19af93f
CORDA-1353: Notaries should reject transactions that contain too… (#2986) 
CORDA-1353: Notaries should reject transactions that contain too many inputs. Otherwise, it may cause a slowdown or make the service hang.
 2018-04-25 17:29:19 +01:00
Shams Asari
e09fc60294
Improved error message on net parameters mismatch during node startup (#3003) 2018-04-25 14:33:07 +01:00
Andras Slemmer
29dbe6ab53 Add flow-id to MDC 2018-04-25 10:36:50 +01:00
Andras Slemmer
f1da044c86 Remove double wrap 2018-04-25 10:36:40 +01:00
Mike Hearn
f99d16eebb Merge remote-tracking branch 'open/master' into mike-merge-4cfb1606da 2018-04-25 10:43:23 +02:00
Konstantinos Chalkias
03fb9d4be2
CORDA-1354 Check for jars in nested folders (to add in classpath) (#2981) 
+ edge cases (logging if we don't have permission to jar folders)
 2018-04-24 18:43:07 +01:00
Andras Slemmer
f7e068b842 Merge commit '10c559a3f3dc1cc8055e3204cd289468fbf3e644' into aslemmer-merge-10c559a3f3dc1cc8055e3204cd289468fbf3e644 2018-04-24 11:19:01 +01:00
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