Anthony Keenan
b260f8a60a
Another slight change needed here
2018-10-09 16:32:51 +01:00
Anthony Keenan
25ad5d411d
Fix merge conflict
2018-10-09 16:28:49 +01:00
Anthony Keenan
a6fd2ba903
Merge remote-tracking branch 'open/master' into anthonyk-os-merge-20181009
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/utilities/ByteArrays.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/KryoCheckpointSerializer.kt
2018-10-09 16:15:59 +01:00
Dominic Fox
b6f2532ce6
Corda 1922 serialize states with calculated values ( #3938 )
...
* Introduce SerializeForCarpenter annotation
* Apply SerializableComputedProperty annotation to Cash.exitKeys, fix bugs
* info -> trace
* Remove annotation from FungibleAsset, as we do not know whether all implementing classes will provide the property as a calculated value
* Remove redundant import
* Explicit lambda params
* Restore explicit import for Enum valueOf
* Moving and rescoping
* More meaningful error message
* Add java test and documentation
* Fix accidentally broken unit test
* Ignore superclass annotation if property not calculated in implementing class
* Exclude calculated properties from Jackson serialisation
* Fix broken test
2018-10-09 14:54:31 +01:00
Anthony Keenan
9c8a1cd14a
CORDA-2028 - Fix use of required paramers/options on command line ( #4040 )
...
* Make required parameters work with --install-shell-extensions and make errors look a bit more errorey
* Make blobinspector required parameter work the way it used to
* Fix compilation Error
2018-10-09 15:49:24 +02:00
Christian Sailer
d8ebde07d4
New jitpacked version of quasar ( #1452 )
2018-10-09 11:34:29 +01:00
Konstantinos Chalkias
5d84640d1f
Add missing validation in the OpaqueBytesSubSequence.init ( #4047 )
2018-10-09 09:48:54 +01:00
Chris Rankin
efa990728e
ENT-2576: Fix building Enterprise Corda on Windows. ( #1460 )
2018-10-08 16:42:59 +01:00
Tommy Lillehagen
d1adb09ca9
NOTICK Python 3 compat, ENM version name, skip closed tests ( #4046 )
2018-10-08 15:26:44 +01:00
Tommy Lillehagen
b8e88232b4
NOTICK Create semantic version numbers ( #4045 )
2018-10-08 14:19:56 +01:00
josecoll
d987f18871
Gradle cache friendly Junit test fix. ( #4044 )
2018-10-08 13:56:02 +01:00
Dominic Fox
d9ea19855f
CORDA-2006: Simplify checkpoint serialization ( #4042 )
...
* CORDA-2006: Simplify checkpoint serialization
* Supply rule to KryoTest
2018-10-08 13:39:28 +01:00
Chris Rankin
c88d3d8c1b
CORDA-2030: Resolve build warnings about kotlin-stdlib-jre8 in unit tests too. ( #4043 )
2018-10-08 12:49:05 +01:00
Chris Rankin
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
Chris Rankin
4cb31f4c8b
Merge commit '39434dcbecdd2cd656e40622530e84d02443b8e2' into chrisr3-os-merge
2018-10-08 10:42:55 +01:00
Patrick Kuo
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
Shams Asari
39434dcbec
Assorted set of clean ups ( #4039 )
2018-10-05 18:05:10 +01:00
Konstantinos Chalkias
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
Konstantinos Chalkias
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
Rick Parker
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
Chris Rankin
d75fd7bd8a
CORDA-2030: Resolve build warnings created by adding kotlin-stdlib-jre8 to node. ( #4033 )
2018-10-05 11:01:27 +01:00
Shams Asari
bffac331a3
Moved the PLATFORM_VERSION constant to core and added some missing usages ( #4026 )
2018-10-05 09:28:00 +01:00
Mike Hearn
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
Shams Asari
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
Viktor Kolomeyko
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
cburlinchon
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
Chris Burlinchon
6f9d4323ef
Merge remote-tracking branch 'open/master' into cburlinchon-os-merge-041018
2018-10-04 12:02:20 +01:00
cburlinchon
064c72dfb1
ENT-2554: Add back hibernate dependency as required by explorer runDemoNodes ( #4029 )
2018-10-04 11:55:18 +01:00
josecoll
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
Joel Dudley
febe737a7a
Updates homepage link. ( #4027 )
2018-10-04 10:45:55 +01:00
Viktor Kolomeyko
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
Michele Sollecito
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
Michele Sollecito
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
Michele Sollecito
1f82929e34
Revert "Merges 03:10 at 17:26 ( #1443 )"
...
This reverts commit 018b00cdcc5d87a26cd26f8eff00ab973f7e7285.
2018-10-03 17:32:04 +01:00
Michele Sollecito
018b00cdcc
Merges 03:10 at 17:26 ( #1443 )
2018-10-03 18:31:54 +02:00
Michele Sollecito
aadbec09c2
Merge remote-tracking branch 'remotes/open/master' into merges/sollecitom-03-10-17-26
2018-10-03 17:26:29 +01:00
Michele Sollecito
3cf1450fc1
[CORDA-2066]: setting-up-a-corda-network
docs file is misleading (fixed). ( #4025 )
2018-10-03 18:16:07 +02:00
josecoll
0a7b7f71ca
Merge pull request #1441 from corda/colljos-merge-031018
...
OS -> Enterprise master merge
2018-10-03 16:37:35 +01:00
Michele Sollecito
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
Michele Sollecito
6f241b69fc
[CORDA-2064]: Add "extraNetworkMapKeys" to node startup log. ( #4021 )
2018-10-03 17:24:03 +02:00
josecoll
ec084cf8ef
Merge remote-tracking branch 'open/master' into colljos-merge-031018
2018-10-03 15:07:48 +01:00
josecoll
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
josecoll
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
Michele Sollecito
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
Michele Sollecito
5bab0a7be2
Merge remote-tracking branch 'remotes/open/master' into merges/sollecitom-03-10-2018-10-22
2018-10-03 11:31:58 +01:00
Michele Sollecito
beb4dc008f
[ENT-2545]: Fixed broken unit test. ( #4019 )
2018-10-03 12:31:20 +02:00
Michele Sollecito
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
Michele Sollecito
ff9bf68e37
[ENT-2545]: Failing flow sent to Hospital does not log any ERROR's (fixed). ( #4015 )
2018-10-03 11:18:28 +02:00
szymonsztuka
d83a8662c8
Removed unused enum type from CordaPersistence. ( #1434 )
2018-10-03 09:50:00 +01:00
Patrick Kuo
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