Commit Graph

13381 Commits

Author SHA1 Message Date
b8e88232b4 NOTICK Create semantic version numbers (#4045) 2018-10-08 14:19:56 +01:00
d987f18871 Gradle cache friendly Junit test fix. (#4044) 2018-10-08 13:56:02 +01:00
d9ea19855f CORDA-2006: Simplify checkpoint serialization (#4042)
* CORDA-2006: Simplify checkpoint serialization

* Supply rule to KryoTest
2018-10-08 13:39:28 +01:00
c88d3d8c1b CORDA-2030: Resolve build warnings about kotlin-stdlib-jre8 in unit tests too. (#4043) 2018-10-08 12:49:05 +01:00
5e0493d9ba Merge pull request #1462 from corda/chrisr3-os-merge
Merge from Open Source up to 39434dcbe
2018-10-08 12:12:52 +01:00
4cb31f4c8b Merge commit '39434dcbecdd2cd656e40622530e84d02443b8e2' into chrisr3-os-merge 2018-10-08 10:42:55 +01:00
48307e6844 make sure the doc saids TLS 1.2 whenever we mention it with AMQP1.0, to avoid confusion. (#1455)
* make sure the doc saids TLS 1.2 whenever we mention it with AMQP1.0, to avoid confussion.

* added missing changes
2018-10-08 09:48:05 +01:00
39434dcbec Assorted set of clean ups (#4039) 2018-10-05 18:05:10 +01:00
0621efe7c6 Do not remove entropyToKeyPair from DJVM (it is deterministic anyway and we might use it in tests) (#4036) 2018-10-05 14:11:56 +01:00
fa4c54a080 [CORDA-2063] Ensure signatures and BC operations always use newSecureRandom (#4020)
* special handling for Sphincs due a BC implementation issue

* delete all sign operations from DJVM and stub out BC's default RNG

* copy Crypto signing functions to deterministic.crypto.CryptoSignUtils as they are required for testing transaction signatures.
2018-10-05 12:01:16 +01:00
06002af81f ENT-2408 Jitpack version of Caffeine with 50% window size. (#1352)
(cherry picked from commit 722824d)
2018-10-05 11:20:10 +01:00
d75fd7bd8a CORDA-2030: Resolve build warnings created by adding kotlin-stdlib-jre8 to node. (#4033) 2018-10-05 11:01:27 +01:00
bffac331a3 Moved the PLATFORM_VERSION constant to core and added some missing usages (#4026) 2018-10-05 09:28:00 +01:00
962e111389 Make the reference states design doc render better and more consistently with the other design docs. 2018-10-04 18:33:32 +02:00
85d2a85e85 Safe parsing of min platform version and target version from CorDapp MANIFEST files (#4031)
Also includes some cleanup
2018-10-04 16:00:07 +01:00
95de18b1ca ENT-2500: Improve formatting when no traffic flown through Bridge. (#1447)
Without this change the following output can be observed:
```
...
Traffic breakdown:
	Successful connections in:

	Successful connections out:

	Failed connections in:

	Failed connections out:

	Accepted packets in:

	Accepted packets out:

	Dropped packets in:

	Dropped packets out:
```
2018-10-04 13:59:07 +01:00
f94aedec25 Merge pull request #1450 from corda/cburlinchon-os-merge-041018
Merges: 04/10/2018 at 13:22
2018-10-04 13:36:55 +01:00
6f9d4323ef Merge remote-tracking branch 'open/master' into cburlinchon-os-merge-041018 2018-10-04 12:02:20 +01:00
064c72dfb1 ENT-2554: Add back hibernate dependency as required by explorer runDemoNodes (#4029) 2018-10-04 11:55:18 +01:00
5d03a03ec4 CORDA-2030 - ensure the correct kotlin runtime library is used to resolve AutoCloseable (#4028)
Fixes compatibility issue surfaced as "java.lang.NoClassDefFoundError: kotlin/jdk7/AutoCloseableKt"
2018-10-04 11:48:24 +01:00
febe737a7a Updates homepage link. (#4027) 2018-10-04 10:45:55 +01:00
50a1819e47 ENT-2559: Gracefully handle Artemis connectivity loss during Bridge leader election (#1436)
* ENT-2559: KDocs update and change visibility identifiers.

* ENT-2559: Handle upstream dependencies going up and down.

* ENT-2500: Address code review comments by @mnesbit
2018-10-03 18:56:15 +01:00
a037c59e3a Merge pull request #1446 from corda/merges/sollecitom-03-10-17-26
Merges 03/10/2018 at 17:26
2018-10-03 18:34:27 +02:00
ba7b490a3a Merge pull request #1445 from corda/revert-1443-merges/sollecitom-03-10-17-26
Revert "Merges 03:10 at 17:26"
2018-10-03 18:32:23 +02:00
1f82929e34 Revert "Merges 03:10 at 17:26 (#1443)"
This reverts commit 018b00cdcc.
2018-10-03 17:32:04 +01:00
018b00cdcc Merges 03:10 at 17:26 (#1443) 2018-10-03 18:31:54 +02:00
aadbec09c2 Merge remote-tracking branch 'remotes/open/master' into merges/sollecitom-03-10-17-26 2018-10-03 17:26:29 +01:00
3cf1450fc1 [CORDA-2066]: setting-up-a-corda-network docs file is misleading (fixed). (#4025) 2018-10-03 18:16:07 +02:00
0a7b7f71ca Merge pull request #1441 from corda/colljos-merge-031018
OS -> Enterprise master merge
2018-10-03 16:37:35 +01:00
8629316dd1 [CORDA-2021]: Error message in log when keyStorePassword is incorrect is not accurately describing the problem (fixed). (#4022) 2018-10-03 17:27:04 +02:00
6f241b69fc [CORDA-2064]: Add "extraNetworkMapKeys" to node startup log. (#4021) 2018-10-03 17:24:03 +02:00
ec084cf8ef Merge remote-tracking branch 'open/master' into colljos-merge-031018 2018-10-03 15:07:48 +01:00
3110c75847 Network bootstrapper tool: optional configuration setting to specify the minimum plat… (#4005)
* Provide an optional configuration setting to specify the minimum platform version to use in the network params file.

* Leave Cordform signature intact.

* Leave previous Gradle Plugin called signature intact.

* Incorporating feedback from PR review.

* Added minimum platform version validation check.

* Removed final 2 references to "default"

* Added changelog entry.
2018-10-03 13:41:52 +01:00
7edc18f85d CORDA-1997 Added constraint type information to vault states table. (#3975)
* Added constraint type information to vault states table.

* Added Vault Query criteria support for constraint data.

* Added documentation and changelog entry.

* Added missing @CordaSerializable.

* Fix minor bug in test setup and parsing code.

* Use binary encoding data types instead of serialize/deserialize.

* Optimized storage of constraints data.
Additional assertions on Vault Query constraint data contents (to validate encoding/decoding).
Tested with CompositeKey containing 10 keys.

* Addressing PR review feedback.

* Query by constraints type and data.

* Revert back accidentally removed code for contractStateType filtering.

* Incorporating final PR review feedback. Use @JvmOverloads on constructor.

* Make sure constraintInfo is class evolution friendly.
2018-10-03 13:41:25 +01:00
a7ad5d0246 Merge pull request #1437 from corda/merges/sollecitom-03-10-2018-10-22
Merges: 03/10/2018 at 10:22
2018-10-03 12:32:39 +02:00
5bab0a7be2 Merge remote-tracking branch 'remotes/open/master' into merges/sollecitom-03-10-2018-10-22 2018-10-03 11:31:58 +01:00
beb4dc008f [ENT-2545]: Fixed broken unit test. (#4019) 2018-10-03 12:31:20 +02:00
a26e20a130 Merge remote-tracking branch 'remotes/open/master' into merges/sollecitom-03-10-2018-10-22
# Conflicts:
#	docs/source/index.rst
2018-10-03 10:25:51 +01:00
ff9bf68e37 [ENT-2545]: Failing flow sent to Hospital does not log any ERROR's (fixed). (#4015) 2018-10-03 11:18:28 +02:00
d83a8662c8 Removed unused enum type from CordaPersistence. (#1434) 2018-10-03 09:50:00 +01:00
149b6034e1 CORDA-2016 Add unit tests to ensure SNI header generation will not be changed by accident (#4014)
* Add test for SNI header to prevent changing it accidentally.

* added hardcoded values test to ensure hashing function and corda x500 name format can't be changed
2018-10-03 08:59:31 +01:00
1e72298a46 CORDA-1915 Update to Network Bootstrapper for signed JARs (#4008)
The cordapp and cordformation plugins (from v4.0.30) are going to have ability to sign JARs (in cordformation signing will be by default), to enable signature constraints to work out of box Network Bootstrapper will not whitelist contracts form signed JARs.
For unsigned JARs the Network Bootstrapper behaviour is unchanged.
2018-10-02 20:45:50 +01:00
fa8761793f NOTICK - Python script for creating test tickets in JIRA (#3979)
Python script for creating 'Platform Test' and 'Platform Test Run'
instances in JIRA for use in release testing.
2018-10-02 17:55:22 +01:00
bc6ef74c6a CordaPersistence class minor refactoring to align with Enterprise repo. (#4012) 2018-10-02 16:49:31 +01:00
6f05f639fb Added more docs for reference states to key concepts and api docs. (#4013)
* Added more docs for reference states to key concepts and api docs.

* Updated with requested changes
2018-10-02 16:29:19 +01:00
df4936c1fa [CORDA-1926] Make CordappInfoResolver.withCordappInfoResolution @VisibleForTesting. (#4011)
Make CordappInfoResolver.withCordappInfoResolution and CordappInfoResolver.clear @VisibleForTesting.
2018-10-02 15:48:22 +01:00
8c23abbd7a ENT-2500: Corda Firewall should log some packet statistics (#1426)
* ENT-2500: Refactoring to allow FirewallAuditService have inbound as well as outbound logging.

Change some visibility modifiers to `private`. Use in-place initialisation where possible.

* ENT-2500: Record accepted package coming into Float

* ENT-2500: Introduce optional BridgeAuditService in `nodeApi` module

* ENT-2500: Switch FirewallAuditService to use `ApplicationMessage` and bind outgoing message stats.

* ENT-2500: Introduce scheduled executor and audit service configuration.

* ENT-2500: Stats formatting.

* ENT-2500: Stats formatting unit test.

* ENT-2500: Minor changes to LoggingFirewallAuditService and its unit test.

* ENT-2500: Additional configuration parameter documentation update.

* ENT-2500: Supply optional parameter.

* ENT-2500: Address PR comments.

* ENT-2500: Make API more consistent by using `RoutingDirection`, re-jig `State` data structure, improve unit test.

* ENT-2500: Add breakdown by endpoint address.

* ENT-2500: Compilation fix after rebase in `master`.

* ENT-2500: Making `AuditServiceConfiguration` not optional and supplying default settings.
Also few minor changes.
2018-10-02 14:13:08 +01:00
ce9538f917 ENT-1565 Documentation and Bugfix for native SSL (#1432)
* Add documentation for the useOpenSsl flag

* Use delegation for wrapping unchanged methods (removing actual and potential bugs)

* Replace reflective shorthands with proper argument names in wrappers.

* Mention default for useOpenSsl in documentation
2018-10-02 13:41:15 +01:00
7b230de4d2 ENT-2492 - Test and document configuration for 'shareable' datacenter-wide Zookeeper deployment (#1429)
* zookeeper doc
* explicitly mention hot/hot is not supported
* change zookeeper to ZooKeeper
* change doc link to v3.5.3
* add note stating only zookeeper v3.5.3-beta is compatible
2018-10-02 13:22:38 +01:00
4dc3bb6107 Merge pull request #1433 from corda/christians/merge-92d2e4a
OS -> ENT merge up to 92d2e4a
2018-10-02 13:10:47 +01:00