sollecitom
f31afd1520
Merge remote-tracking branch 'remotes/open/master' into merges/march-13-14-55
...
# Conflicts:
# build.gradle
# docs/source/_static/versions
# docs/source/running-a-node.rst
2018-03-13 15:02:58 +00:00
Katelyn Baker
6fbc6a55cf
CORDA-1186 - Actually move annotation into core module, not just core namespace ( #2789 )
2018-03-12 11:47:58 +00:00
Andrius Dagys
98ba212e00
Merge remote-tracking branch 'open/master' into andrius-merge-03-09
2018-03-09 16:09:59 +00:00
Andrius Dagys
a3bf4577f3
CORDA-696 - Ensure deterministic transaction id calculation for contra… ( #2676 )
...
The problem with the previous implementation is that the transaction would be deserialized with the schema specified
in the serialized form, but the calculation of the id would involve re-serializing properties using a local serialization context
which might produce a different result.
2018-03-09 14:39:31 +00:00
Katelyn Baker
198fb4f264
CORDA-1192 - Quieten message when reflecting on a builtin Kotlin type ( #2767 )
...
* CORDA-1192 - Quieten message when reflecting on a builtin Kotlin type
* review comments
2018-03-08 23:07:41 +00:00
Matthew Nesbit
b3203c9f3e
Remove a mistakenly duplicated constant defined on ArtemisMessagingComponent ( #2765 )
2018-03-08 12:44:05 +00:00
Konstantinos Chalkias
d70cd26a7c
Kdoc/comment updates ( #2626 )
2018-03-08 10:52:07 +00:00
szymonsztuka
3733e7d715
Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/shell/CordaAuthenticationPlugin.kt
# node/src/main/kotlin/net/corda/node/shell/CordaSSHAuthInfo.kt
# node/src/main/kotlin/net/corda/node/shell/RPCOpsWithContext.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# settings.gradle
# testing/test-common/src/main/kotlin/net/corda/testing/common/internal/UnsafeCertificatesFactory.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
# tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
# tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
# tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
# tools/shell/src/main/kotlin/net/corda/tools/shell/FlowWatchPrintingSubscriber.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShellCommand.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/utlities/ANSIProgressRenderer.kt
# tools/shell/src/main/resources/net/corda/tools/shell/base/login.groovy
# tools/shell/src/test/kotlin/net/corda/tools/shell/CustomTypeJsonParsingTests.kt
# tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt
2018-03-07 16:49:00 +00:00
Katelyn Baker
e6ed91df8b
CORDA-1186 - Move ConstructorForDeserialization out of internal ( #2759 )
...
Since it's a user facing object it shouldn't exist in an internal
package. Move to core to exist with the other serialization annotations
2018-03-07 16:02:01 +00:00
Matthew Nesbit
2653da9f12
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180307
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/messaging/Messaging.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
2018-03-07 11:02:32 +00:00
Matthew Nesbit
519644ce0d
CORDA-1170: Define and whitelist the Artemis/AMQP application headers that are accepted by Corda ( #2728 )
...
* Whitelist headers copied across bridges
* Address PR comments
2018-03-07 08:56:58 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
Tudor Malene
ad4bed779d
Merge pull request #515 from corda/merge/tudor_network_bootstrap
...
Merge/tudor network bootstrap
2018-03-06 15:15:00 +00:00
Andrzej Cichocki
00c171cd61
CORDA-973 Turn on compression for checkpoints and tx storage ( #490 )
2018-03-06 15:01:30 +00:00
tudor.malene@gmail.com
98a4fe1ce3
Merge remote-tracking branch 'open/master' into merge/tudor_network_bootstrap
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
2018-03-06 11:37:30 +00:00
Matthew Nesbit
81f4bbcaf3
Fix flaky bridge test and an associated deadlock during rollback in the BridgeManager code. ( #2739 )
2018-03-06 10:49:29 +00:00
Tudor Malene
5efea22a9b
Network Bootstrap changes to master ( #2736 )
...
* Added exclude whitelist to Network Bootstrapper to enable fine grained testing (#2666 )
* Added exclude whitelist to Network Bootstrapper to enable fine grained testing.
* code review change
(cherry picked from commit d4f9b10#2721 )
* CORDA-1150 better log messages
* CORDA-1150 better log messages
* CORDA-1150 better log messages
(cherry picked from commit 87c5ad8
2018-03-05 19:10:48 +00:00
Katelyn Baker
d116b5e9f4
CORDA-1140 - FOR RPC Client P2P context use AMQP ( #2716 )
...
* CORDA-1140 - FOR RPC Client P2P context use AMQP
* Review comments
* Review comments
* review comments
* review comments
2018-03-05 18:05:32 +00:00
Chris Rankin
04610b8545
Merge remote-tracking branch 'public/master' into chrisr3-merge-os
...
O/S merge up to ef703c50
2018-03-05 12:27:49 +00:00
Andrzej Cichocki
26fe90c8e9
CORDA-973 Allow deserialization of any checkpoint/storage encoding. ( #2693 )
2018-03-05 10:11:26 +00:00
Mike Hearn
abc281056f
Merge remote-tracking branch 'open/master' into mike-merge-80c00b920b
2018-03-02 15:17:32 +01:00
Katelyn Baker
799d90b350
CORDA-1134 - Don't use private serializes for all caps public properties ( #2692 )
...
* CORDA-1134 - Don't use private serializes for all caps public properties
* Small fix
* Review Comments
2018-03-02 13:21:27 +00:00
Katelyn Baker
06a6eace67
CORDA-1115 - Cannot serialize private nested objects ( #2665 )
...
* CORDA-1115 - Cannot serialize private nested objects
Shown up by the simm-valuation-demo the problem was where a private
object field of an object was being serialised within the outer objects
context (see tests added for example)
Fix is to switch from Kotlin reflection back to Java.
Additional fix to the test where it was comparing two lists of state
references in a flow and they weren't equal because they weren't in the
same order... This I assume is just an oversight (in that them being
in a different order but otherwise the same is actually fine) so
converting to set comparison
* Fix forward port issue where fingerprinting has moved
* Review Comments
* Review Comments
* Review Comments
* Gran -> Grab
2018-03-02 13:13:00 +00:00
Shams Asari
a59083ceb2
Merge remote-tracking branch 'open/master' into os-merge-020318
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
2018-03-02 10:42:03 +00:00
sollecitom
5e5cb1888b
Made strict behaviour optional default to true for conf parsing. HSM and Doorman can opt in for this functionality independently.
2018-03-02 09:19:47 +00:00
Shams Asari
8616f24523
CORDA-1048: Making it simpler to move an existing local deployment of nodes to across different machines. ( #2672 )
...
This was achieved by having the hash in the node-info file to be just of the node's X.500 name. This also solves existing duplicate node-info file issues that we've been having.
Also updated the docsite.
2018-03-01 21:24:10 +00:00
sollecitom
38208d9e44
Made strict behaviour optional default to true for conf parsing. HSM and Doorman can opt in for this functionality independently.
2018-03-01 18:08:22 +00:00
sollecitom
36cd34bff5
Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20
...
# Conflicts:
# docs/source/corda-configuration-file.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
# tools/explorer/README.md
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-03-01 15:36:40 +00:00
Michele Sollecito
b580a2ac30
[CORDA-926]: Parsing NodeConfiguration will now fail if unknown properties are present. ( #2484 )
2018-03-01 14:57:36 +00:00
Andrzej Cichocki
b578b934f7
Merge commit '4d4253a287c6ddccddeab8ed24f9e16da5e25bc2' into andr3ej-os-merge
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
2018-02-28 14:39:29 +00:00
Christian Sailer
0ff37c0437
CORDA-1122 Switch AMQP bridge to use auto-commit sends and acks ( #2661 )
...
* CORDA-1122 Switch AMQP bridge to use auto-commit sends and acks
* CORDA-1122 Codereview: Add comment for extra commit to rollback and add better message sequence logging to tricky test
2018-02-27 15:25:58 +00:00
Thomas Schroeter
c7e03633c7
Merge remote-tracking branch 'open-source/master' into thomas-merge
2018-02-27 12:01:49 +00:00
Maksymilian Pawlak
3066926f0f
Improved classloader closing ( #2650 )
...
* Better handling of classloader closing
2018-02-27 11:15:23 +00:00
Maksymilian Pawlak
cc84b34dca
Close classloader to release associated file ( #2635 )
...
[CORDA-1113] Close classloader to release associated file
2018-02-26 15:01:57 +00:00
Andrius Dagys
cc8e38922e
Merge remote-tracking branch 'open/master' into andrius-merge-02-26
2018-02-26 11:55:17 +00:00
Andrius Dagys
0edfef2409
CORDA-696 - Create separate transaction types for contract upgrade transactions ( #2589 )
...
* CORDA-986 and CORDA-985 CompositeKey and Signature verification performance fixes (#2467 )
* CORDA-696: Create separate transaction types for contract upgrade transactions.
Add rationale around upgrade transactions
Move contract upgrade transaction resolution logic into internal until it's stabilised.
Throw a better exception when contract attachment not found
Default legacy contract constraint to always accepting - needs to be changed to whitelist constraint before merging
Introduce a new upgraded contract interface that allows specifying the legacy constraint.
Remove StateLoader, make all tx resolution functions take in ServicesForResolution
Contract upgrade transactions can handle whitelist by zone constraints
When creating a contract upgrade transaction, make sure the attachment of the old cordapp gets attached when using hash constraints.
Attachment lookup for a given contract class name only scans currently loaded cordapps, and we don't load old versions of cordapps.
CORDA-696: Update upgrade docs
2018-02-26 11:29:25 +00:00
sollecitom
d41b9a0299
merged OS into master
2018-02-23 15:47:07 +00:00
Michele Sollecito
5be0e4b39e
[CORDA-941]: Add NetworkParameters contract implementation whitelist. ( #2580 )
2018-02-23 14:29:02 +00:00
Patrick Kuo
1552e992e7
ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role ( #2620 )
...
* ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role (#431 )
* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.
(cherry picked from commit 94f7392
2018-02-23 13:38:09 +00:00
Andrzej Cichocki
c8672d373f
CORDA-973 Compression support for serialization ( #2473 )
...
* Serialization magic is now 7 bytes
* Introduce encoding property and whitelist
2018-02-23 13:07:51 +00:00
Andras Slemmer
f5167e207f
Merge remote-tracking branch 'origin/master' into aslemmer-merge-19-Feb
2018-02-23 11:18:16 +00:00
Patrick Kuo
94f73920cc
ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role ( #431 )
...
* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.
2018-02-23 10:57:59 +00:00
Shams Asari
2af0feee04
Various cleanup of the network map code ( #2604 )
2018-02-23 09:13:00 +00:00
Andras Slemmer
6a2217ace6
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-21 18:10:37 +00:00
Katelyn Baker
a223fdb8d3
DOCS - Separate parameter names in exceptions in a clear fashion ( #2577 )
2018-02-20 16:38:47 +00:00
Andras Slemmer
a548942a0a
Merge remote-tracking branch 'origin/master' into aslemmer-merge-19-Feb
2018-02-20 16:12:37 +00:00
Andras Slemmer
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
Andras Slemmer
38d0ad30df
Merge commit 'da591363fdccd220455a92f083d2ad59ed0e2d12' into aslemmer-merge-19-Feb
2018-02-20 13:52:03 +00:00
Andras Slemmer
6b2b7b6a3c
Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb
2018-02-20 13:26:31 +00:00
bpaunescu
82df6b6896
ENT-1392: Zookeeper client library for prioritized master election ( #462 )
...
* initial zk leader election commit
* simplify latch states. now able to retry for leader
without creating a new latch
* finished zookeeper client wrapper, added unit tests, moved src files to
different module
* moved sources to node-api
* increase election wait time
* Remove sleep() causing tests to be flaky. Used countdownlatch to sync
* reworked election algorithm; path watcher is re-created right after it triggers
* moved kdocs from implementing class to interface
* remove whitespace
* added isStarted() method to ZkClient
* added a unit test that randomly executes actions on zk clients
2018-02-20 09:42:58 +00:00
