a612ca234a
Merge remote-tracking branch 'open/master' into tlil-os-merge-20180613
2018-06-13 21:45:00 +01:00
026a4864b1
ENT-1387 h2port config changes with new h2Settings block
...
* Introduce new h2Settings config block which overrides h2Port
* H2 server listens on localhost by default
* Change is backward compatible and old h2Port option can still be used but that always listens on localhost now
* Update changelog and docs with H2 changes
2018-06-13 16:23:39 +01:00
86b34b1227
Merge remote-tracking branch 'remotes/open/master' into merges/june-13-13-27
...
# Conflicts:
# docs/source/changelog.rst
# docs/source/index.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
2018-06-13 13:36:31 +01:00
cb810f0660
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180613-1
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# docs/source/changelog.rst
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-06-13 11:13:43 +01:00
e2701e69d6
[CORDA-1612]: Fix truncated code snippets in docs PDF ( #3347 )
2018-06-13 09:43:16 +01:00
319953ba41
Merge commit '8087f3c5d3c823a5fbda9a728f129b0925c1fddb' into chrisr3-os-merge
2018-06-12 14:11:27 +01:00
0f3453d1c7
add configuration option to enable compatibility zone whilst running devMode
...
* add configuration option to enable compatibility zone whilst running devMode
* add documentation about allowCompatibilityZone
* address review comments
* remove extra doc lines
* add changelog entry
* Update changelog.rst
2018-06-12 11:03:32 +01:00
8087f3c5d3
CORDA-1494: Update changelog ( #3344 )
2018-06-12 08:50:26 +01:00
5ceb61606a
VaultTrack returns undesired states #3276 ( #3336 )
...
* filter by contract state in _trackBy
* write tests to check that _trackBy is filtering the states correct and tidy up filtering functions
* remove un needed function
* add change log message for filtering unrelated ContractStates from trackBy
2018-06-11 17:53:31 +01:00
d4d459cf22
Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-08-szymon
2018-06-08 10:57:50 +01:00
baa6479575
ENT-1712 Warning on cross-reference between JPA entities from different mapped schemas ( #3282 )
...
At startup node warns about any MappedSchema containing a JPA entity referencing to another JPA entity from a different MappedSchema. Cross reference between JPA entities across different MappedSchema objects can cause operational issues while evolving one MappedSchema object or migrating it's data. Doc API: Persistence documentation no longer suggests mapping between different schemas.
2018-06-08 10:25:50 +01:00
7886ef9450
Merge remote-tracking branch 'open/master' into os-merge-21280c0
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowHospital.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/PropagatingFlowHospital.kt
2018-06-07 18:08:37 +01:00
f6a23a0216
CORDA-1546: Updated the flow hospital to suspend FinalityHandler if it errors ( #3304 )
...
It will re-run automatically from last checkpoint on node restart, allowing the opportunity to resolve the issue, something required when dealing with contract constraint failures.
2018-06-07 16:18:00 +01:00
f5c9a398ad
Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-04-szymon
...
# Conflicts:
# docs/source/upgrade-notes.rst
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
2018-06-04 17:35:19 +01:00
fc020bca4b
[CORDA-1575]: Out of process nodes started by the driver do not log to file (fix). ( #3286 )
2018-06-01 16:16:23 +01:00
57d379597b
Fix a typo in node_attchments_contracts table name. ( #3202 )
2018-06-01 16:08:19 +01:00
eb801d40b8
Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt
# core/src/main/kotlin/net/corda/core/internal/cordapp/CordappImpl.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
2018-06-01 13:56:43 +01:00
9efb1ecfe0
CORDA-1477 add check for code version in checkpoints ( #3256 )
...
* CORDA-1477 add check for code version in checkpoints
* CORDA-1477 Comment style
* CORDA-1477 address code review comments
* CORDA-1477 add changelog entry
* CORDA-1477 attempt to fix tests
* CORDA-1477 attempt to fix tests and address code review comments
* CORDA-1477 attempt to fix tests
2018-06-01 13:37:39 +01:00
27e688e2c8
Merge pull request #895 from corda/os-merge-5d1cc0b
...
O/S merge from 5d1cc0b
2018-05-31 11:14:15 +01:00
fd2f2eb14a
ENT-1871 Rebrand R3Corda to Corda Enterprise ( #838 )
...
* ENT-1871 Rebrand R3Corda to Corda Enterprise
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
2018-05-31 08:59:05 +01:00
03fae9bd7d
Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b
...
# Conflicts:
# .idea/compiler.xml
# node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt
2018-05-30 21:47:48 +01:00
e44b6c6f4a
[CORDA-1356]: CashException is unable to derisalize with AMQP through RPC. (fix). ( #3274 )
2018-05-30 17:15:50 +01:00
7b09795795
CORDA-1383: Cleaned up the JSON format of WireTransaction and SignedTransaction ( #3248 )
...
In particular correctly outputs the custom state and command objects in the txs. Also fixed up deserialisation back into the transaction objects.
2018-05-30 16:37:41 +01:00
37cadbce69
Resolved merge conflicts.
2018-05-30 16:36:06 +01:00
26ef294d8d
[CORDA-1356]: OOM when using Demobench + Explorer (fix). ( #3268 )
2018-05-30 15:04:24 +01:00
a3c6ef351d
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180530
...
# Conflicts:
# docs/source/changelog.rst
2018-05-30 11:12:25 +01:00
1c1b492532
[CORDA-1542]: Ctrl-C in the shell no longer aborts the flow (fix). ( #3260 )
2018-05-30 10:29:10 +01:00
de0c69a888
Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt
# node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt
# node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLogTests.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt
# samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/api/NodeInterestRatesTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-05-29 17:17:08 +01:00
ac212972ea
[CORDA-1539] Minimum RSA key of 2048 bits on validatePublicKey ( #3239 )
2018-05-29 17:11:00 +01:00
f68cf6f712
[CORDA-1341]: Ensure API can be called concurrently wrt transactions. ( #3235 )
2018-05-29 15:25:34 +01:00
c6168cb4e6
Resloved merge conflicts.
2018-05-29 11:32:43 +01:00
7d69bc664a
[CORDA-1297] Columns nullability ( #3112 )
...
JPA/Hibernate entities need to impose the correct NULL/NOT NULL constraints on the database - whatever these correct values actually are.
API change: net.corda.core.schemas.PersistentStateRef fields (index and txId) are now non-nullable. Rationale: The fields were always effectively non-nullable - values were set from non-nullable fields of other objects. The class is used in context of database table Primary Key of for other entities and a database already imposes those columns as non-nullable (even if JPA annotation nullable=false was absent).
2018-05-25 19:03:24 +02:00
033a5798a1
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1
...
# Conflicts:
# .idea/compiler.xml
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/DeliverSessionMessageTransition.kt
# node/src/main/resources/reference.conf
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# settings.gradle
2018-05-25 14:19:15 +01:00
a3d88f752d
CORDA-1510 - Allow Doorman and NetworkMap to be configured independently ( #3220 )
...
* CORDA-1510 - Allow Doorman and NetworkMap to be configured independently
Currently only one compatabilityZoneURL can be specified, however the
two services can be run on as separate servers. Allow nodes to be
configured in this manner
* Partial review comments
* Review comments
* review comments
2018-05-25 11:37:20 +01:00
4e0378de9c
CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport ( #3224 )
...
The existing output format was not complete and so was deleted to avoid it becoming a tech debt. We can always resurrect it at a later point.
2018-05-24 18:26:55 +01:00
77ef131c0f
Merge pull request #876 from corda/os-merge-3136e97
...
O/S merge from 3136e97
2018-05-24 16:53:03 +01:00
6ec394b6be
[ENT-1843]: Not properly caught exception when node starts first time without migration (fix). ( #879 )
2018-05-24 16:29:22 +01:00
d1e147b1c1
[CORDA-1638]: Audit log of failed transactions MVP. ( #3231 )
2018-05-24 16:06:14 +01:00
c40e080dcc
Merge remote-tracking branch 'open/master' into os-merge-3136e97
...
# Conflicts:
# .idea/compiler.xml
# node/src/main/kotlin/net/corda/node/serialization/kryo/CordaClassResolver.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/CordaClosureSerializer.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/DefaultKryoCustomizer.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/SerializeAsTokenSerializer.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/serialization/kryo/KryoStreamsTest.kt
# node/src/test/kotlin/net/corda/node/serialization/kryo/KryoTests.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
2018-05-24 13:20:16 +01:00
1137a0cc8f
[CORDA-1458]: Prevent passwords from being logged as part of node's configuration. ( #3223 )
2018-05-23 13:51:40 +01:00
48f89e9ff8
[CORDA-1526]: Ensure MDC is printed in logs only if not empty. ( #3222 )
2018-05-23 13:23:02 +01:00
cafcecec2b
[CORDA-1264]: Mask internal errors if devMode is false. ( #871 )
2018-05-23 09:55:24 +01:00
766093c1aa
Merge remote-tracking branch 'remotes/open/master' into merges/may-22-14-56
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-05-22 14:57:59 +01:00
fb70c4b69c
Marked createComponentGroups as @CordaInternal ( #3193 )
2018-05-22 11:38:56 +01:00
2ca11d7996
Merge remote-tracking branch 'open/master' into tudor-merge-21-05-18
...
# Conflicts:
# .idea/compiler.xml
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
# docs/source/generating-a-node.rst
# finance/src/main/kotlin/net/corda/finance/contracts/asset/CommodityContract.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.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/rpc/RpcSslTest.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/kotlin/net/corda/node/services/config/SslOptions.kt
# node/src/main/kotlin/net/corda/node/services/messaging/RPCMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/rpc/NodeLoginModule.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
2018-05-21 13:49:59 +01:00
455221629b
CORDA-1343 Make the RPCClient ssl constructors public. Clean up broke… ( #3039 )
...
* CORDA-1343 Make the RPCClient ssl constructors public. Clean up broker authentication logic
* CORDA-1343 small fix
* CORDA-1343 cleanup
* CORDA-1343 fixed api changes script
* CORDA-1343 fixed merge
* CORDA-1343 removed unused property
* CORDA-1343 add separate p2p and rpc node users
* CORDA-1343 remove test configuration
* CORDA-1343 fix tests
* CORDA-1343 address core review comments
* CORDA-1343 some documentation and adding createWithSsl method for a haAddressPool
* CORDA-1343 clean up the CordaRPCClient interface
* CORDA-1343 add internal shell test
* CORDA-1343 address code review comments
* CORDA-1343 split the internalShell user from the System Rpc user
* CORDA-1343 fix test
* CORDA-1343 Add warning when certificateChainCheckPolicies is being configured
* CORDA-1343 Address code review changes
* CORDA-1343 fix merge
* CORDA-1343 added test, docs, clarify comments
* CORDA-1343 clean up docs
* CORDA-1343 fix api
* CORDA-1343 fix merge
* CORDA-1343 fix merge
* CORDA-1343 fix merge
* CORDA-1343 fix merge
2018-05-21 13:05:08 +03:00
74c5cffd38
Merge remote-tracking branch 'open/master' into kat-merge-20180517
2018-05-17 15:04:51 +01:00
0c3a30edc8
Corda-847 - Remove Kryo for RPC
...
It's no longer used as we've switched over to AMQP for RPC calls so
remove it from everywhere and only use it for checkpointing
* Wire up demo bench post Kryo removal
* Test Fixes
* rebase and fix tests
* Test Fix
* wip
* revert changes to api now we don't need to add annotations
2018-05-17 12:55:45 +01:00
46eda8edd9
Merge commit '3f2e653f0' into mike-merge-413f476a3
2018-05-15 19:00:05 +02:00
b031e66ab9
CORDA-1238: Updated JacksonSupport to support SerializedBytes, CertPath, X509Certificate and the signature classes ( #3145 )
...
SerializedBytes are first converted to the object it represents before being serialised as a pojo.
These changes will be needed to support the the blob inspector when it will output to YAML/JSON.
2018-05-15 17:02:43 +01:00
