65ff931f53
Merge branch 'master' into shams-master-merge-081217
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/KeyStoreWrapper.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/identity/InMemoryIdentityServiceTests.kt
# node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.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/driver/DriverDSL.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/DriverDSLImpl.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/RPCDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-08 16:03:16 +00:00
75ea23d193
Merge pull request #2212 from corda/smallFixs
...
Code tidy up, auto reformat, IntelliJ suggestions
2017-12-08 15:44:06 +00:00
c396842b0e
CORDA-553 - Review comments
2017-12-08 14:37:41 +00:00
afdf5fb717
Code tidy up, auto reformat, IntelliJ suggestions
2017-12-08 14:21:30 +00:00
e6adbe7137
CORDA-831: Add confidential identity certificate type ( #2198 )
...
* Rename certificate types
* Create separate certificate type for confidential identities
* Add name constraints to dev node CA
* Move dev node CA into getTestPartyAndCertificate()
2017-12-08 13:17:29 +00:00
8878fa99a0
CORDA-553 - Remove CordaCustomSerializer annotation
...
It isn't actually needed as we can scan the jar for classes implementing
the interface.
2017-12-07 21:15:33 +00:00
fcec60e232
CORDA-786 - Use reflection to infer proxy and proxied types in CorDapp custom serializers
...
This removes any need for the user implement and override types from the
super class
* CORDA-786 - Docs update
* CORDA-786 - Remove unneeded second annotation on the proxy objects
* Fix merge conflicts
2017-12-07 21:15:14 +00:00
d25b7f560c
CORDA-786 - Genericise the CorDapp Proxy
2017-12-07 21:15:14 +00:00
6881350493
CORDA-786 - Add whitelist testing for external custom serializers
...
Update Docs
2017-12-07 21:14:45 +00:00
81eb0c1898
CORDA-780 / CORDA-786 - Enable AMQP for P2P and Storage Contexts
...
Add plugable mechanism for CorDapps such that they can add their own
custom serializers
2017-12-07 21:13:59 +00:00
c36bea3af5
CORDA-654 MockServices no longer has hard-coded identities ( #2192 )
...
* Resurrect a test
* Fix a broken test
* Pass in the initial identity
* Make IdentityService easier to mock
2017-12-07 11:55:18 +00:00
4a677815ef
Removing NetworkParametersGenerator as an interface
2017-12-07 10:42:52 +00:00
cb11379d98
Addressing some of the technical debt
2017-12-06 22:01:41 +00:00
89256a7f16
Moved the CZ URL and node registration logic of the driver to be more internal, not available through the standard driver call, as these are not testing features for an app dev.
...
Also cleanup up some of the related tests.
2017-12-06 12:32:41 +00:00
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
ae3a3444f2
Merge pull request #2154 from corda/kat/feature/enumEvolution2
...
Kat/feature/enum evolution2
2017-12-04 17:07:01 +00:00
1ff0d881b3
CORDA-553 - Better tests for rule breaking changes to enum constants
2017-12-04 15:46:32 +00:00
6a1aa59e3e
Merge branch 'master' into shams-merge-master-041217
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
# samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/BankOfCordaCordform.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NotarySpec.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-04 13:39:32 +00:00
acd2281b20
ENT-1125 bootstrap root certificate ( #2151 )
...
* ENT-1125 make nodes check that the returned signed certificate from Doorman has the expected root
2017-12-04 12:53:22 +00:00
e257872445
CORDA-553 - Review Comments
2017-12-04 09:39:16 +00:00
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
7e044e1124
CORDA-553 - Review comments
2017-12-01 19:15:14 +00:00
32ebd2cc8b
CORDA-553 - Review comments
2017-12-01 16:59:19 +00:00
6958cbbc44
Fix demobench as part of network parameters work ( #2148 )
...
* Fix demobench - network parameters
Demobench uses ServiceIdentityGenerator to pregenerate notary identity
for network parameters.
2017-12-01 16:14:03 +00:00
c2731c6797
More merge fixes and moved NodesInfoFilesCopier into internal package
2017-11-30 16:46:32 +00:00
541207738a
CORDA-553 - Documentation
2017-11-30 13:31:33 +00:00
6fc736a5f5
CORDA-553 - Enable Enum Evolution
2017-11-30 13:14:07 +00:00
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
fdc31091a6
Merge branch 'feature-network-parameters' into shams-master-merge-291117
...
# Conflicts:
# constants.properties
# gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt
# gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt
2017-11-30 12:05:42 +00:00
c9f3e98795
Another approach to fixing deployNodes task and network parameters generation ( #2066 )
...
* Generate networkParameteres for Cordformation.
Fix deployNodes task in Cordformation to generate NetworkParameters before running the nodes.
Add TestNetworkParametersGenerator utility loaded after node infos generation step.
* Get rid of bouncy castle provider dependency
For cordform-common. It caused problems with loading our custom
X509EdDSAEngine for generation of network parameters in deployNodes
task.
2017-11-30 10:39:29 +00:00
71763ff1d3
Merge branch 'master' into shams-master-merge-291117
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/network/PersistentNetworkMapCache.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTests.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
2017-11-29 18:00:16 +00:00
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
572c4af40c
Use NetworkMap and SignedNetworkMap in NetworkMapClient, and enable signature verification. ( #2054 )
...
* new network map object for network map, and verify signature and root in Signed network map and node info
* fixup after rebase
* * added certificate and key to network map server
* move DigitalSignature.WithCert back to NetworkMap.kt, as its breaking API test, will raise another PR to move it back.
* Make DigitalSignature.WithCert not extend WithKey, as per PR discussion.
* various fixes after rebase.
* move Network map back to core/node, as its breaking API test
* revert unintended changes
* move network map objects to node-api
2017-11-29 15:55:13 +00:00
c88c6202b9
CORDA-553 - Review comments
2017-11-28 17:27:53 +00:00
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
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
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
1705df4d1f
Made the database config option typesafe, rather than relying on String properties
2017-11-27 13:51:53 +00:00
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
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
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
92c8861802
[CORDA-760]: Propagate invocation context across the codebase. ( #2016 )
2017-11-15 14:58:43 +00:00
2a961b8e2c
Separate server contexts from shared contexts. ( #2044 )
2017-11-13 21:23:23 +00:00
052124bbe0
CORDA-716 Make serialization init less static ( #1996 )
2017-11-10 15:44:43 +00:00
39e2f6ad99
ENT-1031 AMQP serializer for ContractAttachment, evaluate lazy attachment and write out in full
2017-11-10 14:42:18 +00:00
2a83167d3b
Merge pull request #2024 from corda/christians_public-key-caching-hooks
...
Public key customization hooks
2017-11-10 13:37:37 +00:00
5354c777ce
CORDA-781 code layout cleaned up
2017-11-10 11:54:03 +00:00
b0517954a0
CORDA-781 clean up imports
2017-11-10 11:10:06 +00:00
13001ee674
CORDA-781 code review: clean up AMQP scheme
2017-11-10 10:23:19 +00:00
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
