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

13058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michele Sollecito
481f2c1b93 Fixed compilation error for case-insensitive operating systems. (#3896) 
(cherry picked from commit 2fbeab13659933b9537d88c0d73a73e1e0ab8060)
 2018-09-05 13:10:05 +01:00
Michele Sollecito
1032b44f18
Merge pull request #1370 from corda/fixes/certificateStoreStubs 
OS -> ENT merge: fixing a bug in certificate store stubs.
 2018-09-04 17:42:19 +01:00
Michele Sollecito
b36240a7e7 Merge remote-tracking branch 'remotes/open/master' into fixes/certificateStoreStubs 2018-09-04 17:33:29 +01:00
Michele Sollecito
0b495098a8 [CORDA-1937]: Fixes to enterprise float and bridge. 2018-09-04 17:33:05 +01:00
Michele Sollecito
a7f9320985
Fixedd a mistake in CertificateStoreStubs. (#3893) 2018-09-04 17:31:42 +01:00
Thomas Schroeter
4931b77dd4
Update labels of nightly performance test plan (#1366) 2018-09-04 16:24:43 +01:00
Michele Sollecito
b4a64625fc
Merge pull request #1368 from corda/os_ent_merges/CORDA-1937 
OS -> ENT merges: CORDA-1937
 2018-09-04 13:39:03 +01:00
Michele Sollecito
c77a75bc10 [CORDA-1937]: Fixes to enterprise float and bridge. 2018-09-04 11:28:21 +01:00
Michele Sollecito
31e58dd2e5 [CORDA-1937]: Fixes to enterprise float and bridge. 2018-09-04 11:20:34 +01:00
Clinton Alexander
a28fa69865 Updated repository lists to reduce dependency on Jitpack and removed unused repositories. 2018-09-04 11:19:03 +01:00
Michele Sollecito
fbaa31e9d2 Merge remote-tracking branch 'open/master' into os_ent_merges/CORDA-1937 
# Conflicts:
#	client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
#	core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
#	node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-09-04 11:07:50 +01:00
Michele Sollecito
487d227d71
Merge pull request #1365 from corda/mike-merge-f6ee263db10 
Merge to f6ee263db10
 2018-09-04 11:03:56 +01:00
Mike Hearn
5356eddcca Fix another case where platformVersion=1 2018-09-04 11:33:50 +02:00
Michele Sollecito
d01dd22419
[CORDA-1937]: Refactor NodeConfiguration hierarchy. (#3856) 2018-09-04 10:26:10 +01:00
Mike Hearn
97aef9c8a1 Merge remote-tracking branch 'open/master' into mike-merge-f6ee263db10 2018-09-03 20:13:38 +02:00
Mike Hearn
f6ee263db1 Minor: improve docs for CordaRPCClientConfiguration and deprecate a field that is no longer used. 2018-09-03 19:05:47 +02:00
Mike Hearn
33f5aa4190 RPC: make the client library require the platform version it is built for. 
Remove an unnecessary override on the CordaRPCOps interface.
 2018-09-03 19:05:47 +02:00
Mike Hearn
0f8a6e44ea RPC: allow trackRpcCallSites to be set from the command line. Add logging. 2018-09-03 19:05:47 +02:00
Anthony Keenan
f856a77c96 Fix demo bench issue stopping nodes starting up with max transaction size > max message size 2018-09-03 19:05:17 +02:00
Anthony Keenan
f6466cde41 Make UI better when labels overflow. 2018-09-03 19:05:17 +02:00
Clinton Alexander
ceb47c9938 RELEASE - Fixed build.gradle issues that break maven central publishing and standardised dependency specification. 2018-09-03 19:04:21 +02:00
Lamar Thomas
9eae4e5303 Clarify user to create the "corda" users 
root/sys admin should create the corda user
 2018-09-03 19:01:41 +02:00
LankyDan
c3c245e7ac Fix codestyle 2018-09-03 18:58:16 +02:00
LankyDan
643ad31736 Add tests to confirm that if a Hibernate error occurs the transaction will fail and no states will be persisted 
Add tests to NodeVaultServiceTest
Add VaultFlowTest
Add UniqueDummyFungibleContract and UniqueLinearContract to be used in the constraint tests
 2018-09-03 18:58:16 +02:00
Shams Asari
11e2bef240
ENT-2473: Removed copyright headers (#1364) 2018-09-03 16:38:52 +01:00
Michele Sollecito
793a52c57a
[CORDA-1542]: Exception error codes aren't stable (fixed). (#3887) 2018-09-03 14:27:24 +01:00
Michal Kit
91dfa277e3
CORDA-1938 adding VersionInfo to the node info submission (#3886) 2018-09-03 14:04:36 +01:00
Thomas Schroeter
112f78c012
Nightly test of the firewall (#1359) 2018-09-03 09:07:40 +01:00
Anthony Keenan
bdc67f453e Stop bootstrapper errors caused by maxTransactionSize > maxMessageSize 2018-09-01 13:15:27 +02:00
Shams Asari
9544fac2c0
Clean up of MerkleTransaction.kt (#3880) 
Primarily making the deserialiseComponentGroup method simpler.
 2018-08-31 12:44:53 +01:00
Michal Kit
8e6a9818b7
CORDA-1932 Fixing network map certificate path verification (#3843) 
* CORDA-1932 Fixing network map certificate path verification to be certificate hierarchy agnostic

* Addressing review comments
 2018-08-31 09:35:36 +01:00
Michal Kit
d7b85b4928
CORDA-1934 Renaming INTERMEDIATE_CA certificate role to DOORMAN_CA certificate role (#3844) 2018-08-31 09:35:06 +01:00
Michal Kit
f22d9ad411
CORDA-1938 Adding version info to the node info submission request (#3854) 2018-08-31 09:34:42 +01:00
szymonsztuka
06bc0048e1
Merge pull request #1362 from corda/szymonsztyka/os-merge-20180830 
OS -> ENT merge 20180830
 2018-08-30 17:21:51 +01:00
szymonsztuka
b98f91ee61 Merge remote-tracking branch 'remotes/origin/master' into feature/ENT-2253-NonStop-changes 
# Conflicts:
#	node/src/main/resources/migration/node-info.changelog-master.xml
#	node/src/main/resources/migration/node-info.changelog-v3.xml
 2018-08-30 15:51:38 +01:00
szymonsztuka
dbc1088417
CORDA-1939 Regression: Liquibase fails to migrate existing pre-liquibase database (#3855) 
* Bugfix for corda.jar manually deployed without coping the matching corda-finance-VERSION.jar.
If the older finance cordapp version is detected (which doesn't have Liquibase migration scripts) fail node at startup and print message: "Could not create the DataSource: Detected incompatible corda-finance cordapp without database migration scripts, replace the existing corda-finance-VERSION.jar with the latest one."
Since coda-finance is an optional cordapp,the presence of Liquibase scripts is only checked if corda-finance-VERSION.jar is present in cordapps folder.
*  Allow to start using Liquibase from any point of 4.0-SNAPSHOT before Liquibase was introduced (not only from 3.0/3.X versions) - 2 database changes introduced after 3.2 but before Liquibase are now conditional database changes.
 2018-08-30 13:40:02 +01:00
Dominic Fox
cc27463b25
Merge pull request #1360 from corda/dominic-merge-2018-08-30 
Dominic merge 2018 08 30
 2018-08-30 13:36:20 +01:00
Dominic Fox
bdc12341cb Restore ENT-only logic clobbered in merge 2018-08-30 11:45:57 +01:00
Dominic Fox
f061235cc8 Resolve merge conflict 2018-08-30 10:47:56 +01:00
Dominic Fox
b6bd923f3b Resolve merge conflicts 2018-08-30 10:31:38 +01:00
Dominic Fox
0f36e22314
Corda-1869 serialisation refactor (#3780) 
* Pull out and tidy type parameter inference

* Contain null proliferation

* Extract fingerprinter state

* SerializerFingerPrinter is always initialised with a SerializerFactory

* Move non-recursive state transition functions into state

* Move all state transition functions into state

* Simplify and optimise with mutable state

* Move TypeParameterUtils back into internal.amqp

* Clarify behaviour of constructorForDeserialisation

* constructorForDeserialization no longer returns null

* Capture field properties

* Narrow PropertyDescriptor

* Use map rather than apply on a mutable list

* Remove printStackTrace added for debugging

* CORDA-1869 minor tweaks

* Use groupingBy to avoid creating an intermediate map

* Convert some functional origami to plain old for-loops

* Eliminate nested lambda to unbreak pre-serialisation

* Use EnumMap for map of Enums
 2018-08-30 10:18:02 +01:00
Dominic Fox
4337537791
CORDA-1945: properly support double-width interp stack slots in superclasses when synthesising (#3859) 
* Fix for CORDA-1945

* Revert irrelevant style change
 2018-08-29 17:43:17 +01:00
PokeyBot
60d28b412f
Merge pull request #3861 from corda/mike-small-fixes-1 
Minor: fix changelog markup errors.
 2018-08-29 16:25:23 +01:00
Mike Hearn
12707c8df0 Signature constraints design doc: address review comments from Jose. 2018-08-29 16:32:06 +02:00
PokeyBot
7a4faceb2d
Merge pull request #3860 from corda/mike-small-fixes 
Update RxJava to the last 1.x release so we get JavaDocs back.
 2018-08-29 15:24:28 +01:00
Mike Hearn
c68134ad60 Minor: fix changelog markup errors. 2018-08-29 15:05:18 +02:00
Mike Hearn
2e943d089b Update RxJava to the last 1.x release so we get JavaDocs back. 2018-08-29 15:02:23 +02:00
Matthew Nesbit
7ead9e5698 ENT-2293 & ENT-2353: Basic implementation of an RPC worker and Flow Worker (#1308) 2018-08-29 13:45:27 +01:00
PokeyBot
9259f6c05e
Merge pull request #3858 from corda/bugs/CORDA-1940-remove-logback-dependency 
CORDA-1940 Liquibase imports logback which is redundant and conflicts with log4j2
 2018-08-29 11:51:32 +01:00
Clinton Alexander
e87b33d1e8 Added extra logging to build.gradle when maxParallelForks system property is set 2018-08-29 12:38:24 +02:00