92cf91c0b0
Merge pull request #159 from corda/aslemmer-multi-threaded-sm
...
Multi-threaded SMM
2018-02-01 14:24:17 +00:00
e1edce18f0
Refactor NotaryFlow.Client so it's easier to override its behaviour
2018-02-01 13:48:01 +00:00
b71f0c49fb
Multi threaded state machine
2018-01-31 18:13:25 +00:00
054c44d4bc
Merge from OS to ENT including Bridge manager work
2018-01-26 16:55:43 +00:00
336aeb96e5
Merge fixes
2018-01-26 13:45:03 +00:00
e357a88181
Deprecate TimeWindowChecker, make TimeWindowInvalid report exact current time and transaction time window ( #2280 )
...
* Make notary service return the current time and the transaction time window
along with the TimeWindowInvalid error.
Deprecate TimeWindowChecker.
Add a static method for validating transaction time window to reduce code duplication.
2018-01-26 09:32:11 +00:00
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
17a6f61eba
Simplify CashTests and add some comments/convenience APIs to MockServices ( #2241 )
2018-01-25 16:29:26 +01:00
242d9cf7ad
CORDA-692 Don't include internal packages in API documentation ( #2415 )
...
* Use G1 for gradle daemon
2018-01-25 15:26:13 +00:00
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00:00
1be4f0950d
Remove compile time dependency on JDBC drivers [ENT-1363] ( #387 )
...
* Change JDBC drivers dependencies to integrationTestRuntimeOnly
* Added smoke test validating JDBC driver registration located in "./plugins" directory
* Some docsite tweaks
2018-01-25 13:38:51 +00:00
0fa6969d5d
Added various X509 utilities to remove some of the existing boilerplate. ( #2416 )
2018-01-24 18:07:29 +00:00
d17670c747
Provide an API to register callback on app shutdown ( #2402 )
...
Provide an API to register callback on app shutdown.
2018-01-24 16:19:24 +01:00
cef1f9885c
ENT-1282: create standalone db migration tool ( #356 )
...
* ENT-1282: add standalone db migration tool that works with both the node and the doorman
* ENT-1282: remove cmd line args during node startup
* ENT-1282: more clear message
* ENT-1282: fix integration test
* ENT-1282: more fixes and cleanup code
* ENT-1282: address PR comments
* ENT-1282: more fixes and refactoring
* ENT-1282: more classloader fixes
* ENT-1282: changes after demo feedback
* ENT-1282: update API
* ENT-1282: update documentation
* ENT-1282: formatting
* ENT-1282: added CONSOLE option for dry-run and logging
* ENT-1282: documentation changes
* ENT-1282: remove getMigrationResource from the public API
* ENT-1282: removed dependency on network-manager, added release-lock
* ENT-1282: Update documentation
2018-01-24 11:55:43 +00:00
61c7de22d6
Replaced KeyStoreWrapper with X509KeyStore, which is still a wrapper but assumes only X509 certs and has better APIs ( #2411 )
2018-01-24 07:51:55 +00:00
1fc646cfa8
CORDA-716 Move test-utils and node-driver to stable API section in docs ( #2335 )
...
* Move test-utils and node-driver to stable section.
* Move FlowStackSnapshotFactory to testing.services package & update docs
* Move SerializationTestHelpers to testing.core package
* Move TestConstants.kt to core namespace
* Move Expect.kt to core namespace
* Move CoreTestUtils to core.TestUtils - rename class and update imports
* Added some clarification to documents after re-reading them
* Added static imports
* Removing unused import
* Fix merge conflict
* Fixing merge conflict
2018-01-22 11:28:41 +00:00
ac7637e2b4
Revert "CORDA-599 RPCSecurityManager is no longer lateinit ( #2347 )"
...
This reverts commit 75e74e67a1
2018-01-19 17:52:59 +01:00
7427d63bbc
Prevents checkSignatures from failing if tx also contains unrecognised sigs.
2018-01-18 18:08:22 +00:00
133cf13674
Remove primary key constraint on host and port ( #336 )
...
* Remove primary key constraint on DBHostAndPort
* Update migration file
2018-01-18 16:24:06 +00:00
af081a7170
Remove primary key constraint on DBHostAndPort ( #2318 )
...
Remove primary key constraint on DBHostAndPort
Return always first node if more are matching by address.
2018-01-18 16:23:41 +00:00
eb9a51af75
Merge branch 'master' into colljos-merge-release3-dp-master
2018-01-16 14:28:07 +00:00
eb3798da5e
Merge remote-tracking branch 'open/master' into colljos-merge-160118
2018-01-16 12:13:49 +00:00
24bf6df868
Merge branch 'master' into colljos-merge-release3-dp-master
2018-01-16 09:58:51 +00:00
55b7035a44
Don't propagate internal notary service errors to the client ( #2368 )
2018-01-16 09:58:23 +00:00
1367cd4adb
CORDA-912 Stop exposing internal node user, create user in testing infrastructu… ( #2361 )
...
* Stop exposing internal node user, create user in testing infrastructure instead
* Update kdocs
2018-01-15 19:30:33 +00:00
75e74e67a1
CORDA-599 RPCSecurityManager is no longer lateinit ( #2347 )
2018-01-15 19:11:00 +00:00
7cdacb0142
Merge branch 'master' into shams-os-merge-120118
2018-01-15 15:23:27 +00:00
729aa65e7f
Merge from R3 Corda 3.0 Dev Preview release branch to master
2018-01-13 11:00:01 +00:00
e7cc38cf1b
ENT-1330: Liquibase migration generation tool ( #339 )
...
* [ENT-1330]: Tool to generate migration files for CorDapps
* [ENT-1330]: cleanups
* [ENT-1330]: cleanups
* [ENT-1330]: added test to check if a migration file is properly generated and picked up
2018-01-12 09:53:42 +00:00
c71ef3139b
Merge remote-tracking branch 'open/master' into shams-os-merge-120118
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkMap.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/vault/DummyDealStateSchemaV1.kt
2018-01-12 08:06:44 +00:00
bbfbb08c43
CORDA-881: Signed network parameters has the network map cert attached to it instead of just the public key. ( #2346 )
...
Introduced DigitalSignatureWithCert and SignedDataWithCert as internal APIs, with the expectation that they will become public; renamed the network parameters end-point to network-parameters; updated the network-map.rst doc; and did some refactoring.
2018-01-12 07:59:08 +00:00
c2bd7403a8
hibernate mapping changes ( #2337 )
...
* add foreign key names and move the participants mapping to the subclass so that the table name can be configured
* update api-current file
* fix compilation errors
* PR changes
* PR changes
2018-01-10 11:42:08 +00:00
0c646ff662
[ENT-1339]: for h2, allow schemas without migrations to run ( #294 ) ( #305 )
...
* [ENT-1339]: for h2, allow schemas without migrations to run (#294 )
* [ENT-1339]: for h2, allow schemas without migrations to run
* [ENT-1339]: fix various migration issues and change author name
* [ENT-1339]: add naming convention for migrations
* [ENT-1339]: change naming convention to use hyphens
* [ENT-1339]: change mapping of participants to be able to control the table name
* [ENT-1339]: change FK names to <=30 for oracle 11g compatibility
* [ENT-1339]: cmd line argument for migrations made consistent
* [ENT-1339]: revert abstract state superclasses
* Update db integration test setup - new tables.
* Update db integration test setup - new tables.
* [ENT-1339]: remove final from participants to allow table name config
* [ENT-1339]: shortened pk
* [ENT-1339]: revert constructor
* [ENT-1339]: change getMigrationResource api to Nullable
2018-01-09 14:44:17 +00:00
38fd99792f
Minor: add some discussion to the JavaDocs about why attachments are zip files.
2018-01-08 17:36:47 +01:00
a94f99781a
Merge remote-tracking branch 'open/master' into shams-os-merge-080118
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-01-08 13:43:10 +00:00
c5149bab9f
Backport of ENT-1303 applied to 3.0-RC3 ( #2332 )
2018-01-08 12:11:55 +00:00
b577b680ff
Merge remote-tracking branch 'open/master' into shams-os-merge-040118
2018-01-04 18:32:15 +00:00
48be562a2a
ECDSA entropyToKeyPair + no idempotent signatures ( #2210 )
2018-01-04 17:52:31 +00:00
412fead02e
CORDA-785: Add functions for constructing FlowLogicRef without the class ( #2134 )
...
Add functions for constructing `FlowLogicRef` from class name, rather than requiring the class itself. This avoids requiring that schedulable states have access to the scheduled flow to instantiate, but instead can require it only actually scheduling the flow. This reduces the size of the JAR required to validate transactions containing these states.
2018-01-04 13:32:10 +00:00
13619df0b1
Merge remote-tracking branch 'open/master' into shams-os-merge-040118
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
2018-01-04 10:58:44 +00:00
d84105b60e
Using X509Certificate consistently throughout, rather than BC's X509CertificateHolder. ( #2305 )
...
The later is now only used where needed. This has reduced the amount of converting we have to do back and forth.
2018-01-03 22:00:39 +00:00
52173219c3
Merge remote-tracking branch 'open/master' into shams-os-merge-020118
...
# Conflicts:
# client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
2018-01-02 15:32:32 +00:00
fe3c2b3983
CORDA-891 Refactoring for #2273 ( #2306 )
...
* Make FlowLogicRefFactoryImpl a class.
* Replace instanceof with polymorphism.
* Fix out-of-scope spelling error.
2018-01-02 13:11:43 +00:00
f701bc1b9a
Merge commit 'ad23bb875482b7b8e17c64fb37342d0d6a5ce94d' into feature/test-merge-szymon
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
2018-01-02 11:54:29 +00:00
a9f9bf2c0b
Adding tests to check EdDSA compatibility with RFC8032 ( #2302 )
2018-01-02 10:47:57 +00:00
4a2f157118
Validating the entire cert path in node registration, rather just checking the root cert. ( #2298 )
...
Also reduced duplicate code when creating the node CA cert path for testing, and renamed IdentityGenerator to DevIdentityGenerator.
2017-12-29 14:38:30 +00:00
cb703476a0
CORDA-880 Make contractsdsl java interop functions behave same as inline functions ( #2275 )
...
* Make java interop functions same as inline functions and add tests
* Fixing docs
* Move unspecifiedCountry to internal. (#2274 )
* Review changes
* Call java interop functions from inline functions
* Use correct test assertion
2017-12-21 09:42:09 +00:00
0711ad34e3
[ENT-850]: RPC function to kill a flow ( #215 )
...
* Tentative API and implementation.
* Tests completed. API update needed.
* Updated api-current.txt. Some previous changes hadn't been reflected and now they are.
* Improved the tests.
* Some code review changes.
* Merge branch 'master' into features/ENT-850
# Conflicts:
# .ci/api-current.txt
* Code review changes.
* Code review changes.
2017-12-20 19:16:54 +00:00
3c64e9feec
Merge fixes, which includes fixing the doorman tests and updating the doorman to not set a CN in the CSR responses
2017-12-20 01:03:34 +00:00
de9565b96a
Merge remote-tracking branch 'open/master' into shams-os-merge-191217
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/node/services/NotaryService.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2017-12-19 23:44:07 +00:00
