bc3605e8da
Merge remote-tracking branch 'open/master' into kat-merge-28-03-18
2018-03-28 09:47:49 +01:00
6c9a39ae44
DOCS: Serialization roundtrip removes mutability explanation ( #2888 )
2018-03-28 09:40:21 +01:00
1f2d9454ee
Merge remote-tracking branch 'open/master' into kat-merge-27-03-18
2018-03-27 10:22:42 +01:00
e43b12c203
CORDA-1236 - Don't let Carpenter exceptions escape the serializer ( #2852 )
...
* CORDA-1236 - Don't let Carpenter exceptions escape the serializer
* Review comments
* Merge branch 'kat/bug/master/nestedCArpenterException' of https://github.com/corda/corda into kat/bug/master/nestedCArpenterException
2018-03-27 10:11:39 +01:00
0f99efa768
CORDA-1213 - Explicitly disallow serialization of non static nested classes ( #2824 )
...
* CORDA-1213 - Explicitly disallow serialization of non static nested classes
WIP
* Review comments
2018-03-27 10:06:46 +01:00
91cdcc6752
CORDA-1258 - Only register custom serializers once ( #2862 )
...
* CORDA-1258 - Only register custom serializers once
* Review comments
* Fix test
2018-03-26 19:09:03 +01:00
c9caaf8be4
Adding sockets ( #570 )
...
* Adding sockets
* Addressing review comments
* Adding review comments
* Addressing review comments
2018-03-23 07:43:13 +00:00
620ba1e8a2
Integration test for network parameter updates and improved logging ( #2863 )
2018-03-22 14:08:07 +00:00
ff4bbaf63f
ENT-1524 & ENT-1358: Cleaned up doorman db schema ( #565 )
...
* Renamed tables and constraints to have name < 30 characters
* Using AttributeConverters were possible for custom types
* NodeInfoEntity has relationship to accepted NetworkParametersEntity, not the hash
* Improved logging in the node
2018-03-22 06:39:02 +00:00
aaa9e8c83f
Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18
...
# Conflicts:
# docs/source/changelog.rst
2018-03-20 16:54:56 +00:00
144632818c
Adding the X509CRL custom serializer. ( #2844 )
...
CORDA-1233
* Adding the X509CRL custom serializer.
* Addressing review comments
2018-03-20 15:42:25 +00:00
a80be413e0
Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1
2018-03-20 10:20:17 +00:00
1a1cd94161
ENT-1564 - add additional uploader check to the HashConstraint ( #2845 )
2018-03-20 10:17:44 +00:00
9fff66257b
Merge pull request #569 from corda/mnesbit-socks-proxy-support
...
ENT-1614: Add SOCKS proxy capability to the AMQP Bridges
2018-03-20 09:06:06 +00:00
8a561cddbf
Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
...
# Conflicts:
# client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
# node/src/main/java/CordaCaplet.java
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
8591ae2dc9
CordApps back in node classpath ( #2843 ) [CORDA-1232]
2018-03-19 14:34:02 +00:00
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects ( #2841 )
2018-03-19 12:47:23 +00:00
6885661b66
Initial cut of SOCKS proxy support
...
Correct the reconnect logic when SOCKS proxy is in the pipeline
Add integration tests and adjust handling of reconnect
Rename parameter
2018-03-19 11:37:46 +00:00
6d99f7e5d4
Adding CRL signing ( #528 )
...
* Adding CRL signing
* Adding CRL
* Addressing review comments
* Address review comments
2018-03-16 11:48:41 +00:00
78b2bc7549
network_map table references the network_parameters table (ENT-1524). ( #567 )
2018-03-16 10:57:30 +00:00
0d1e9694ae
Merge remote-tracking branch 'open/master' into andrius-merge-1503
2018-03-15 15:07:55 +00:00
15e4449b38
Adding BigInteger serialization support ( #2804 )
...
* Adding BigInteger serialization support
* Addressing review comments
2018-03-15 10:11:01 +00:00
27e45bc865
Adding public key verification to the X509Utilities.createCertificateSigningRequest ( #2784 )
2018-03-15 08:42:36 +00:00
0a0c8538c4
Merge from Corda/OS
2018-03-14 17:24:47 +00:00
2cff495553
Remove CordApps JARs from node classpath [CORDA-1135] ( #2691 )
2018-03-14 16:42:23 +00:00
1cf1e2d6f0
Merge pull request #553 from corda/bogdan-merge-14
...
Bogdan OS-ENT merge 14-03-18
2018-03-14 16:36:54 +00:00
a24a2105b1
CORDA-1217 Replace Guava caches with Caffeine ( #2818 )
2018-03-14 16:07:31 +00:00
0b12c5f602
Merge remote-tracking branch 'open/master' into bogdan-merge-14
2018-03-14 15:01:27 +00:00
d592fb5c49
Create basic bridge module and capsule build
...
Basic pieces of bridge, still very rough
Work in progress
Fixes after rebase
Primitive float tunnel implementation
Put explanatory comments on the interfaces. Add support for different SSL KeyStores for the different connections to/from the bridge and float.
Add a couple more comments
Cleanup
Fix some issues
Use a new custom header to relay the login identity from bridges. (Will add more security to this shortly)
Make key protection logic a bit clearer in the comments
Create some basic test and integrationTests
Add a couple of tests of the BridgeAMQPListenerService
Add some basic tests
Correct comment
Fixup after rebase
Fixup after rebase
Fixup after rebase
Explicit parameter types to work on build box.
Address PR comments
Address some of Mike's PR comments.
Re-enable test on enterprise.
Don't sweep up node default config
Remove obsolete config entry
Correct merge mistake
Configurable whitelist headers on bridge
Don't access primary artemis session from different threads used by inbound packet pathway.
Fix unit test
2018-03-14 11:08:09 +00:00
341e060424
Adding CSR signature verification ( #537 )
2018-03-14 09:17:09 +00:00
1a6f7bc2c0
Whitelisting CRLReason class ( #2803 )
2018-03-14 08:05:00 +00:00
9afcbb16a2
Unwrapping InvocationTargetException during config parsing ( #2811 )
2018-03-14 07:04:25 +00:00
34800ab527
Split up the parsing of the command line arguments from the parsing of the config files. ( #547 )
...
Also, the "config-file" command line argument for the doorman jar is required - it no longer defaults to network-management.conf
2018-03-14 07:01:53 +00:00
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
6fbc6a55cf
CORDA-1186 - Actually move annotation into core module, not just core namespace ( #2789 )
2018-03-12 11:47:58 +00:00
98ba212e00
Merge remote-tracking branch 'open/master' into andrius-merge-03-09
2018-03-09 16:09:59 +00:00
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
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
b3203c9f3e
Remove a mistakenly duplicated constant defined on ArtemisMessagingComponent ( #2765 )
2018-03-08 12:44:05 +00:00
d70cd26a7c
Kdoc/comment updates ( #2626 )
2018-03-08 10:52:07 +00:00
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
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
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
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
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
ad4bed779d
Merge pull request #515 from corda/merge/tudor_network_bootstrap
...
Merge/tudor network bootstrap
2018-03-06 15:15:00 +00:00
00c171cd61
CORDA-973 Turn on compression for checkpoints and tx storage ( #490 )
2018-03-06 15:01:30 +00:00
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
81f4bbcaf3
Fix flaky bridge test and an associated deadlock during rollback in the BridgeManager code. ( #2739 )
2018-03-06 10:49:29 +00:00
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
