szymonsztuka
cb43091ff8
Merge Open Source into Enterprise
...
# Resolved conflicts:
# core/src/main/kotlin/net/corda/core/node/services/TransactionStorage.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.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/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-12-05 17:35:54 +00:00
Andrzej Cichocki
b0ebf3d7e0
CORDA-654 Various MockServices refactorings ( #2167 )
...
* Remove MockServices.stateMachineRecordedTransactionMapping which does nothing
* Inline StateLoaderImpl
* Remove unused MockServices
* MockServices well-known identities not needed in a place
* A few things don't need a full-blown ServiceHub
2017-12-05 16:22:53 +00:00
Andras Slemmer
63027a077d
State machine rewrite
2017-12-05 11:36:20 +00:00
Katelyn Baker
ae3a3444f2
Merge pull request #2154 from corda/kat/feature/enumEvolution2
...
Kat/feature/enum evolution2
2017-12-04 17:07:01 +00:00
Katelyn Baker
1ff0d881b3
CORDA-553 - Better tests for rule breaking changes to enum constants
2017-12-04 15:46:32 +00:00
Katelyn Baker
e257872445
CORDA-553 - Review Comments
2017-12-04 09:39:16 +00:00
Shams Asari
5264072752
Renamed n.c.nodeapi.config to n.c.nodeapi.internal.config as that config code is not public API. For the same reason, also moved User into the same internal package.
2017-12-03 17:20:30 +00:00
Katelyn Baker
7e044e1124
CORDA-553 - Review comments
2017-12-01 19:15:14 +00:00
Katelyn Baker
32ebd2cc8b
CORDA-553 - Review comments
2017-12-01 16:59:19 +00:00
szymonsztuka
07e46ddb3c
Merge OS to Enterprise - fixes after merge: update SQL Server cash query, test in pertestcordapp module, platform version 1
2017-12-01 00:02:11 +00:00
szymonsztuka
2bdd8b681d
Merge OS to Enterprise.
...
Main differences preserved in Enterprise version:
* constants.properties: platform version 1 (OS has 2)
* gradle-wrapper.properties: higher Gradle version gradle-4.3.1 (OS has gradle-4.3)
* Driver.kt - setting system property "user.dir"
2017-11-30 23:54:12 +00:00
Katelyn Baker
541207738a
CORDA-553 - Documentation
2017-11-30 13:31:33 +00:00
Katelyn Baker
6fc736a5f5
CORDA-553 - Enable Enum Evolution
2017-11-30 13:14:07 +00:00
Katelyn Baker
e8822ce391
CORDA-553 - Plumb the transform schema into the AMQP serialisation framework
...
This change doesn't enable anything, it just changes the code to pass
around both relevant schemas instead of a single one from the AMQP
envelope. The actual evolver will build ontop of this
2017-11-30 13:10:48 +00:00
Shams Asari
b638b30d2a
Moved CordaPersistence and dependent classes into internal package in node-api. This is so that the doorman can make use of them without needing a compile dependency to node.
2017-11-29 17:14:05 +00:00
Katelyn Baker
c88c6202b9
CORDA-553 - Review comments
2017-11-28 17:27:53 +00:00
Katelyn Baker
4c2f0d7913
Fix broken unit test
...
At the moment the test just asserts we can't evolve enums, it's a
placeholder for the next phase of the changes
2017-11-28 10:03:01 +00:00
Katelyn Baker
f135d57820
CORDA-553 - Plumb the transform schema into the AMQP serialisation framework
...
This change doesn't enable anything, it just changes the code to pass
around both relevant schemas instead of a single one from the AMQP
envelope. The actual evolver will build ontop of this
2017-11-27 19:23:12 +00:00
Tudor Malene
e8d833c2fe
Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-11-27 16:52:29 +00:00
Shams Asari
2ceb6283af
Moved X509Utilities, and some other crypto utilities in node, into node-api so that they can be used by services outside of the node.
...
There's also some cleanup as well.
2017-11-27 15:49:33 +00:00
Shams Asari
1705df4d1f
Made the database config option typesafe, rather than relying on String properties
2017-11-27 13:51:53 +00:00
szymonsztuka
0f8baae962
Merge opensource into master
2017-11-21 18:53:14 +00:00
Shams Asari
f7e51a9ae1
Various cleanups to AMQP and Kryo serialisation:
...
* PartyAndCertificate serialiser has been converted to deal with just CertPath
* Removed X500Name serialiser as we no longer use the BC implementation and have our own CordaX500Name
* Converted X509 cert serialiser to use Java certs and not BC X509 cert holder
* Added to test to AMQP serialisation to make sure c'tor is invoked on deserialisation
2017-11-21 14:01:03 +00:00
Andrzej Cichocki
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
josecoll
7a9364c8d5
Merge remote-tracking branch 'open/master' into colljos-merge-171117
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt
# docs/source/changelog.rst
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
# samples/network-visualiser/build.gradle
# 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/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
2017-11-17 15:11:24 +00:00
Andrzej Cichocki
039cacae76
CORDA-787 Remove unused class ( #2049 )
...
* and refactor a superclass that isn't really one
* move it to internal
* misc refactorings
2017-11-17 12:24:55 +00:00
Michele Sollecito
92c8861802
[CORDA-760]: Propagate invocation context across the codebase. ( #2016 )
2017-11-15 14:58:43 +00:00
Chris Rankin
2a961b8e2c
Separate server contexts from shared contexts. ( #2044 )
2017-11-13 21:23:23 +00:00
Andrzej Cichocki
052124bbe0
CORDA-716 Make serialization init less static ( #1996 )
2017-11-10 15:44:43 +00:00
Chris Burlinchon
39e2f6ad99
ENT-1031 AMQP serializer for ContractAttachment, evaluate lazy attachment and write out in full
2017-11-10 14:42:18 +00:00
Christian Sailer
2a83167d3b
Merge pull request #2024 from corda/christians_public-key-caching-hooks
...
Public key customization hooks
2017-11-10 13:37:37 +00:00
Christian Sailer
5354c777ce
CORDA-781 code layout cleaned up
2017-11-10 11:54:03 +00:00
Christian Sailer
b0517954a0
CORDA-781 clean up imports
2017-11-10 11:10:06 +00:00
Christian Sailer
13001ee674
CORDA-781 code review: clean up AMQP scheme
2017-11-10 10:23:19 +00:00
cburlinchon
4c1d1733a5
Serialization of large contract attachments causes OOM exception ( #1991 )
...
* Don't serialize contract attachment, only hash and contract class name if we are checkpointing
2017-11-10 10:21:36 +00:00
Christian Sailer
26819bfd04
No public key serializer overriding for checkpointing
2017-11-09 15:23:12 +00:00
Christian Sailer
89b01ab342
Hooks for PublicKeySerializer customization
2017-11-09 15:12:52 +00:00
Christian Sailer
219433c3cd
Hooks for PublicKeySerializer
2017-11-09 14:49:23 +00:00
Andrzej Cichocki
a036a6300c
Enforce serialization API for Java. ( #2014 )
2017-11-08 11:49:52 +00:00
Katarzyna Streich
deaba2887d
Some cleanup after network map removal ( #2006 )
2017-11-07 12:16:49 +00:00
Konstantinos Chalkias
7944fcde5c
Supported TLS cipher suites ( #2005 )
2017-11-07 10:05:51 +00:00
Christian Sailer
7765de0bf9
Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106
2017-11-06 17:27:13 +00:00
Shams Asari
d04e48740b
Introducing network parameters.
...
network-parameters file read in by the node at startup, of which only the list of notaries is used. For now, the driver and MockNetwork have been updated to require notaries to be started first. This is so that the same set of network parameters can be defined for all the nodes.
CN in the legal name is not longer disallowed since it's no longer reserved for distributed notary names.
Single-node notaries now only have one identity, their main identity. Nodes part of a cluster continue to have two.
(Based off Kasia's work)
2017-11-03 09:46:10 +00:00
Christian Sailer
0f2a98af91
Merge remote-tracking branch 'corda/master' into christians_os_merge_20171031
2017-11-02 14:50:49 +00:00
Christian Sailer
3e61d13ffe
Merge remote-tracking branch 'corda/master' into christians_os_merge_20171031
2017-11-02 14:41:18 +00:00
Katelyn Baker
d6adb83cd0
CORDA-756 - Refactor Kryo into sub module as per AMQP
2017-10-31 15:45:58 +00:00
Andrzej Cichocki
4b0b13dad4
CORDA-716 Retire TestDependencyInjectionBase ( #1939 )
2017-10-31 10:21:38 +00:00
Katelyn Baker
a74154a126
Merge pull request #1904 from corda/kat/feature/enumEvolver
...
CORDA-553 - First steps towards evolvability
2017-10-30 14:08:09 +00:00
Alberto Arri
9176fcb8e6
Remove for good network map service node ( #1942 )
...
* [CORDA-446] Kill network map registration and fix NodeBasedTest
2017-10-30 11:45:52 +00:00
Katelyn Baker
ecbb4330da
CORDA-553 - Review comments
2017-10-30 11:15:05 +00:00
