Shams Asari
246142173d
Shams os merge 191217 ( #223 )
...
* CORDA-876 MockNetwork no longer leaks serialization env if init fails (#2272 )
* Removed all remaining special treatment of the X500 common name.
* Move unspecifiedCountry to internal. (#2274 )
* Merge fixes, which includes fixing the doorman tests and updating the doorman to not set a CN in the CSR responses
2017-12-20 10:32:42 +00:00
Andrzej Cichocki
a652c8b19f
Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge
...
# Conflicts:
# docs/source/changelog.rst
2017-12-19 17:07:17 +00:00
Tudor Malene
dd59b06c62
Fix null migration resource ( #210 )
...
throw exception when migration not set for MappedSchema
2017-12-19 14:06:55 +00:00
Ross Nicoll
21f0892deb
CORDA-831: Add roles to X509 certificates ( #2180 )
...
* Add roles to X509 certificates so that the identity service can always determine which certificate in a hierarchy is the well known identity
* Rename CLIENT_CA certificate type to NODE_CA
* Rename DOORMAN role to INTERMEDIATE_CA
* Correct issue in CashTests where instead of providing a well known identity to generateSpend(), a confidential identity was passed in and a confidential identity generated from it.
* Enforce role hierarchy in PKI
* Enforce that party certificates must be well known or confidential identities
* Add network map certificate role
2017-12-18 16:23:34 +00:00
josecoll
da1b0b1f7b
Merge branch 'master' into colljos-os-merge-rc01
2017-12-18 15:38:09 +00:00
josecoll
e9fc6f7c8d
Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01
2017-12-18 10:24:38 +00:00
Andrius Dagys
e57dab6fcc
ENT-1232: Add MySQL notary service ( #187 )
...
* Add MySQL notary service. This is the first iteration of a HA notary service,
and is intended to replace the Raft notary. The backing database should
be a replicated MySQL implementation such as Percona XtraDB Cluster.
Handle MySQLTransactionRollbackException
Add the `mysql-connector-java` to the build file of the node package.
Add Hikari connection pool
* Store requesting party name & key in separate columns (for consistency
with existing uniqueness providers)
* Add idempotency test and additional counters
2017-12-18 09:47:07 +00:00
Shams Asari
e9cead9055
CORDA-833: SignedNodeInfo object for holding a list of signatures, one for each identity in the NodeInfo. This forms part of the network map.
2017-12-17 19:45:58 +00:00
Andrzej Cichocki
8114a20abd
CORDA-716 Move non-API things to internal ( #2256 )
2017-12-17 18:44:35 +00:00
Tudor Malene
f2194fcfd4
Integrate db migration tool - liquibase ( #150 )
...
[ENT-996]: integrate Liquibase for data migration
2017-12-16 15:58:12 +00:00
Andrzej Cichocki
2652ae111a
CORDA-716 Devrel feedback ( #2266 )
...
* * Document TestIdentity entropy and enforce that it actually works
* Ledger/transaction DSL default notary with fresh key
* MockServices default identity with fresh key
* makeTestIdentityService now takes vararg
* Require cordappPackages for MockServices
* DSL automatic serialization init
* Improve error when two MockNetworks used
* * Make cordappPackages required by MockNetwork
* Default identity service in MockServices
* Make notarySpecs Java-friendly
2017-12-15 19:18:31 +00:00
Andrzej Cichocki
479a656484
CORDA-716 Consistent MockServices API ( #2247 )
...
* Consistent MockServices API.
* Fix compile error.
2017-12-15 13:15:05 +00:00
Andrzej Cichocki
21e1118ea0
Make test constants Java-visible fields. ( #2258 )
2017-12-14 16:30:18 +00:00
Joel Dudley
dbf6862f32
Adds debugging info for contract constraints, and links to it from error message.
2017-12-14 14:01:21 +00:00
Andrzej Cichocki
05bc05a936
CORDA-716 Retire withTestSerialization ( #2240 )
2017-12-14 12:42:18 +00:00
Konstantinos Chalkias
5b33db93fc
Add doc comments on supported TLS schemes and scheme hash functions ( #2161 )
2017-12-14 12:30:07 +00:00
Shams Asari
2319bf396c
Renamed TestIdentity.key to keyPair and pubkey to publicKey ( #2249 )
2017-12-14 11:30:55 +00:00
josecoll
4e42fff7d4
Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming)
2017-12-13 12:34:06 +00:00
josecoll
d1998b2c94
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-13 11:02:58 +00:00
Andrzej Cichocki
d6df251e36
Bypass needless lookup. ( #2236 )
2017-12-12 21:51:32 +00:00
Andrzej Cichocki
c3b9955344
CORDA-716 Fix split packages in testing ( #2232 )
2017-12-12 19:37:01 +00:00
Andrzej Cichocki
905c8252a6
CORDA-654 Remaining key constants ( #2226 )
2017-12-12 18:03:06 +00:00
Ross Nicoll
42782f8890
ENT-1151: Rework unicode block validation rules ( #2125 )
...
* Redo legal name validation rules so that direction change chars are rejected
* Split name validation into minimal rules that all nodes can require, plus extended rules that the Doorman will apply (and we may need to change, without updating the entire network).
* Break down name validation rule sets to better match expectations
* Add test for nulls in Corda names
2017-12-12 16:52:14 +00:00
josecoll
499de12620
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-12 11:22:57 +00:00
Shams Asari
6d6393d984
Merge branch 'feature-network-parameters' into shams-merge-feature-network-parameters
2017-12-11 21:10:34 +00:00
Andrzej Cichocki
d8c7f0ae23
Inline DUMMY_CASH/OBLIGATION_ISSUER. ( #2214 )
2017-12-11 16:17:20 +00:00
Andrzej Cichocki
544e19e277
CORDA-654 Remove key constants from NodeTestUtils ( #2205 )
...
* DUMMY_NOTARY was hiding in a couple more places
2017-12-11 11:44:01 +00:00
Katelyn Baker
4b5c60637c
Merge pull request #2017 from corda/kat/feature/enableAMQP
...
CORDA-780 - Enable AMQP for P2P and Storage Contexts
2017-12-11 11:37:16 +00:00
Shams Asari
e25158301f
Merge branch 'master' into shams-master-merge-081217
2017-12-11 10:49:11 +00:00
josecoll
8a6e9c52f3
Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217
2017-12-11 09:21:52 +00:00
Katelyn Baker
2329254390
Additional comment corrections
2017-12-08 17:30:32 +00:00
Katelyn Baker
c66026e54b
Code Cleanup
2017-12-08 17:30:32 +00:00
Shams Asari
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
Katelyn Baker
c396842b0e
CORDA-553 - Review comments
2017-12-08 14:37:41 +00:00
Ross Nicoll
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
Andrzej Cichocki
32ea59d085
Inline some DUMMY constants. ( #2200 )
2017-12-08 10:45:22 +00:00
Katelyn Baker
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
Katelyn Baker
1f7083cd61
CORDA-553 - Review comments
2017-12-07 21:15:33 +00:00
Katelyn Baker
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
Katelyn Baker
d25b7f560c
CORDA-786 - Genericise the CorDapp Proxy
2017-12-07 21:15:14 +00:00
Katelyn Baker
f931b74aec
CORDA-780 / CORDA-786 - Doc updates
2017-12-07 21:13:59 +00:00
Katelyn Baker
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
Andrzej Cichocki
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
Shams Asari
cb11379d98
Addressing some of the technical debt
2017-12-06 22:01:41 +00:00
Shams Asari
8461837f1a
Cleaned up Driver.kt so that only the relevant bits are exposed as public API
2017-12-05 23:52:15 +00:00
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
Shams Asari
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
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
