Commit Graph

1932 Commits

Author SHA1 Message Date
e5e98f3540 Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise 2018-05-03 10:55:40 +01:00
3bf1e803d9 Move notary service related classes and interfaces in core to interna… (#2827)
* Move notary service related classes and interfaces in core to internal, since we won't be able to stabilise the APIs for writing custom notary services any time soon (the docs already mention it). I left out the wire protocol related classes so we don't accidentally break it.
2018-05-02 12:21:38 +01:00
b25892e45b resolved conflicts 2018-05-01 21:32:11 +01:00
5565b3e80d [CORDA-1411]: Prevent MappedSchema caching from leaking memory. (#3042) 2018-05-01 19:32:29 +07:00
72ba01669a Move platformSecureRandom property into a separate class. (#790)
This allows it to be deleted completely from core-deterministic.
2018-04-30 13:45:46 +01:00
ab80df342a CORDA-1319 Adding CRL checking for nodes (#2987)
* Adding CRL support for nodes

* Addressing review comments
2018-04-30 09:26:26 +01:00
efd203e5f3 ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly (#3004)
* ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly.

Currently the time window is checked before states are being passed to a uniqueness provider. If the time window is
invalid, the transaction will be rejected even if it has already been notarised, which violated idempotency.

For this reason the time window verification was moved alongside state conflict checks.

* Update API - this only affects custom notary interfaces
2018-04-27 15:02:09 +01:00
0f310dd966 Updates withoutIssuer to not strip display token size. 2018-04-27 10:26:47 +01:00
61d2212840 Merge remote-tracking branch 'open-source/master' into thomas-merge
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
2018-04-26 14:47:29 +01:00
5dc71fc350 Behave: use existing Core common utility functions for Logger creation and Ti… (#2990)
* Use existing Core common utility functions for Logger creation and Time durations.

* Updated JUnit tests.
2018-04-26 13:40:37 +01:00
7ad19af93f CORDA-1353: Notaries should reject transactions that contain too… (#2986)
CORDA-1353: Notaries should reject transactions that contain too many inputs. Otherwise, it may cause a slowdown or make the service hang.
2018-04-25 17:29:19 +01:00
486441c383 Changes flow tests used in flow testing tutorial to use MockNetwork instead of InternalMockNetwork. 2018-04-25 13:53:22 +01:00
e135cf062c Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge 2018-04-24 18:09:41 +01:00
67f5bcc38e Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8 2018-04-24 11:01:21 +01:00
65525d74e7 CORDA-1325: Bootstrapper unable to whitelist two versions of the same contract simultaneously (#2980)
Also added unit tests
2018-04-24 10:51:24 +01:00
5f781193b6 Merge remote-tracking branch 'open/master' into os-merge-d3446e2
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
#	testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
#	tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
2018-04-23 15:50:24 +01:00
5e0202acd0 Add killFlow 2018-04-23 15:36:35 +01:00
6bf34ed5c7 Fix bugs 2018-04-23 15:36:16 +01:00
5b4fd6fe64 Address comments 2018-04-23 15:36:16 +01:00
19dad6da96 Add back deprecated functions 2018-04-23 15:36:16 +01:00
ce5fb66260 StateMachine rewrite 2018-04-23 15:36:16 +01:00
d3446e213c Introduced a few more extension methods to Path, which are clearer than the static methods in Files. (#2985)
Also migrated code away from the old File API.
2018-04-23 14:31:49 +01:00
15c015e0d6 Merge branch 'master' into colljos-merge-230418 2018-04-23 12:12:16 +01:00
247a97f1a5 Remove superfluous registerInitiatedFlow calls from tutorial and example tests (#2944) 2018-04-20 16:56:27 +01:00
ca55c80bfc Move kotlin utility helper out of public into internals. (#2979) 2018-04-19 13:48:13 +01:00
b3a4e3907f OS -> ENT Merge (#757)
* Better cert path validation exception message for PartyAndCertificate.verify (#2976)

* Corda Behave extensions for CTS (#2968)

* Updated to Corda 3.0, added support for PostgreSQL, added STAGING_ROOT environment variable, incorporating Watch improvements (Maks), Steps Provider interface for auto-scanning of 3rd party steps providers, re-implemented StepBlocks, new ScenarioRunner executable tool, additional Steps definitions (Vault, issue/transfer cash, cordapps), other minor bug fixes and logging improvements.

* Updates incorporating PR review feedback.

* Reverted back to original - will re-test in ENT.

* Removed all SQL Server code (to be included in ENT only)

* Minor updates following second PR review.

* Fixed broken scenario tests.

* Final fix for PostgreSQL scenario test.
2018-04-19 11:49:17 +01:00
ec70478d70 Corda Behave extensions for CTS (#2968)
* Updated to Corda 3.0, added support for PostgreSQL, added STAGING_ROOT environment variable, incorporating Watch improvements (Maks), Steps Provider interface for auto-scanning of 3rd party steps providers, re-implemented StepBlocks, new ScenarioRunner executable tool, additional Steps definitions (Vault, issue/transfer cash, cordapps), other minor bug fixes and logging improvements.

* Updates incorporating PR review feedback.

* Reverted back to original - will re-test in ENT.

* Removed all SQL Server code (to be included in ENT only)

* Minor updates following second PR review.

* Fixed broken scenario tests.

* Final fix for PostgreSQL scenario test.
2018-04-19 09:56:16 +01:00
a684507553 Better cert path validation exception message for PartyAndCertificate.verify (#2976) 2018-04-18 17:27:03 +01:00
a0bf0261bb Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336 2018-04-13 16:39:00 +01:00
6f69f0252d CORDA-1337 Crypto.registerProviders (#2962)
CORDA-1337 Crypto.registerProviders + add BCPQC as well
2018-04-13 12:40:15 +01:00
5bb9514582 Merge remote-tracking branch 'open/master' into kat-merge-180412 2018-04-12 20:34:28 +01:00
02913b284e CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. (#2954)
Instead the current whitelist is read in from the existing network parameters file.
2018-04-12 17:03:06 +01:00
4a77712978 Merge remote-tracking branch 'open/master' into os-merge-ecce64b
# Conflicts:
#	node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
2018-04-11 11:15:17 +01:00
ecce64ba03 HttpUrlConnection.getErrorStream() can be null, which if not handled can obscure the reporting of an HTTP error response, like in ENT-1744 (#2948) 2018-04-11 09:39:58 +01:00
a97abbc8c0 Merge remote-tracking branch 'open/master' into os-merge-1b37cef 2018-04-05 17:23:03 +01:00
1b37cef822 Minor: use of ByteArray.inputStream() and introduced PublicKey.hash (#2931) 2018-04-05 17:18:27 +01:00
53a0aae489 Introduced a few helper methods around InputStream.readBytes (#2928) 2018-04-05 14:27:42 +01:00
5909a49c30 ENT-1725: Introduce FlowAsyncOperation (#658)
* ENT-1725: Introduce FlowAsyncOperation, which allows suspending a flow on a custom operation, such as long running I/O requests, notary commit, etc.

* Move async execute to internal, add more tests.

* Add a 30s test timeout

* Update API doc
2018-04-04 09:52:49 +01:00
5c32f34838 Merge commit 'cb670dcb6255aa07c2b06fe1e381d0c4d032634c' into chrisr3-merge-os 2018-04-03 13:21:01 +01:00
cb670dcb62 ENT-1463: Instantiate all contract classes before verifying any of them. (#2906) 2018-04-03 12:14:53 +01:00
b9b4415d10 ENT-1463: Instantiate the contract class as part of contract verification. (#660)
* Instantiating the contract class should be part of contract verification. We should not instantiate it while building LedgerTransaction.
* Also catch any exceptions from instantiating the contract.
2018-03-31 14:53:12 +01:00
9c07e67100 ENT-1463: Instantiate the contract class as part of contract verification. (#660)
* Instantiating the contract class should be part of contract verification. We should not instantiate it while building LedgerTransaction.
* Also catch any exceptions from instantiating the contract.
2018-03-31 14:52:08 +01:00
89ecfb96c5 Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11 2018-03-29 13:12:00 +01:00
0d1d7daedc [CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2892) 2018-03-29 13:01:41 +01:00
bc3605e8da Merge remote-tracking branch 'open/master' into kat-merge-28-03-18 2018-03-28 09:47:49 +01:00
36f02ff4b4 [CORDA-1267]: Making Corda's JPA classes non-final and Serializable. (#2882)
* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.
2018-03-28 08:40:28 +01:00
1f2d9454ee Merge remote-tracking branch 'open/master' into kat-merge-27-03-18 2018-03-27 10:22:42 +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
ca3ecb97cb Merge remote-tracking branch 'remotes/open/master' into merges/march-23-11-47
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/NodeStartAndStopTest.kt
#	node/src/integration-test/kotlin/net/corda/node/NodeStatePersistenceTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
2018-03-23 12:17:00 +00:00
975b81c2c4 [CORDA-1243]: Avoid drain-related deadlocks between 2 nodes. (#2866) 2018-03-23 11:45:19 +00:00