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
5d1cc0bd54
K1 is supported by TLS (permissioning.rst) and identify Sphincs as experimental due to a BC 1.58 issue which needs investigation. ( #3269 )
2018-05-30 17:38:33 +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
9418f9191e
Document notary.serviceLegalName ( #3265 )
2018-05-30 15:47:40 +01:00
26ef294d8d
[CORDA-1356]: OOM when using Demobench + Explorer (fix). ( #3268 )
2018-05-30 15:04:24 +01:00
1a82de8b53
Document ability to add custom dataSource properties - related to ENT-1428 ( #870 )
...
When specifying data source for NonStop database custom data source properties needs to be passed, which was always feasible but never documented (as there was no need for it).
2018-05-30 14:54:55 +01:00
9447398acb
Hot-cold operational guide fixes and improvements ( #884 )
...
* minor typos, improving the HA operational
* Hot-cold operational guide improvement(typos, styling, more specific settings)
* ENT-1959: address PR comments
* address pr comments
2018-05-30 14:12:47 +01:00
3535633d45
Add DCO requirement to contributing docs. ( #3263 )
2018-05-30 12:35:51 +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
1c7b44fb3d
Instructions for IntelliJ 2018.1 ( #3250 )
...
* Instructions for IntelliJ 2018.1
* Addresses review feedback
2018-05-29 16:51:28 +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
8504b65e7b
ENT-1933: make NetworkParameters serialization compatible ( #3234 )
...
* ENT-1933: make NetworkParameters serialization compatible
2018-05-25 17:14:00 +01:00
d772bc8b7f
Added back support for parsing OpaqueBytes as UTF-8 strings in JacksonSupport ( #3240 )
2018-05-25 17:07:19 +01:00
a63e08d94c
Add example in docs for node SSH server port configuration option. ( #3236 )
2018-05-25 17:38:34 +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
d13cca49ec
ENT-1959: add a default value for mutualExclusionConfiguration.machineName ( #877 )
...
* ENT-1959: add a default value for mutualExclusionConfiguration.machineName
* ENT-1959: update docs
* ENT-1959: update docs, remove machineName from default conf, add unit test
2018-05-25 11:13:53 +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
52eef5da5b
Replace timestamp with time-window ( #3211 )
2018-05-24 16:06:33 +01:00
d1e147b1c1
[CORDA-1638]: Audit log of failed transactions MVP. ( #3231 )
2018-05-24 16:06:14 +01:00
4adc0380a2
CORDA-1496 Add api-scanner documentation ( #3184 )
...
Add api-scanner documentation
2018-05-24 15:43:58 +02:00
645163e9cc
Fixing node keys bullet points ( #3207 )
2018-05-24 14:30:36 +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
e0bb00eebb
Bogdan hotcold operational guide ( #855 )
...
* ENT-1864: added docs for hot-cold deployment with AWS and Azure
* rename docs resource image
* reworded hot-cold deployment guide, added section on mutual exclusion,
removed old high-availability guide
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
2018-05-24 11:42:02 +01:00
356b22fa44
Expands contributing page to include guidelines. ( #3218 )
2018-05-23 17:10:23 +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
c3de65a545
Update tutorial-attachments.rst
2018-05-23 13:44:28 +01:00
48f89e9ff8
[CORDA-1526]: Ensure MDC is printed in logs only if not empty. ( #3222 )
2018-05-23 13:23:02 +01:00
9b01ef77c6
Clarifies that only stable H2 releases should be used.
2018-05-23 11:21:58 +01:00
cafcecec2b
[CORDA-1264]: Mask internal errors if devMode is false. ( #871 )
2018-05-23 09:55:24 +01:00
57fce1dd16
Docs: Add a section on what data is visible to notaries ( #3159 )
2018-05-23 08:59:58 +01:00
d9510d9a22
ENT-1883 Adding the CRL generator ( #857 )
...
* Adding the empty CRL generation functionality
* Addressing review comments
2018-05-23 07:48:53 +01:00
c4f9f1cb68
Small refactoring of the HSM certificate generator ( #869 )
...
* Small refactoring of the HSM certificate generator
* Updating docs
2018-05-22 16:27:51 +01:00
c943a4d46b
Moves whitepapers. ( #3217 )
2018-05-22 15:38:43 +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
4d715e4d5c
ENT-1940 Improve error checking for the db migration tool ( #868 )
...
* ENT-1940 Improve error checking for the db migration tool
2018-05-22 13:19:50 +01:00
fb70c4b69c
Marked createComponentGroups as @CordaInternal ( #3193 )
2018-05-22 11:38:56 +01:00
e3b2d3332d
Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24
...
# Conflicts:
# constants.properties
# node-api/src/main/kotlin/net/corda/nodeapi/exceptions/RejectedCommandException.kt
# node/src/main/kotlin/net/corda/node/internal/RpcAuthorisationProxy.kt
# node/src/main/kotlin/net/corda/node/internal/SecureCordaRPCOps.kt
2018-05-21 17:29:26 +01:00
83e99cd583
Merge pull request #865 from corda/tudor-merge-21-05-18
...
Tudor merge 21 05 18
2018-05-21 19:17:00 +03:00
519aa56947
Fixing docs indentation for CRL ( #864 )
2018-05-21 17:05:14 +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
