Viktor Kolomeyko
6413c66798
Change default driver permissions such that NodeExplorer works. ( #2086 )
...
Also fix-up Kotlin doc.
2017-11-20 12:33:21 +00:00
josecoll
7786913cd8
Merge pull request #114 from corda/colljos-merge-171117
...
Merge Open Source to Enterprise
2017-11-20 12:10:46 +00:00
Katelyn Baker
943fbd220b
RELEASE: Merge release notes for V2 back into master
2017-11-20 11:56:01 +00:00
Andrzej Cichocki
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
Alberto Arri
273965f17a
remove cordacon code ( #2082 )
2017-11-20 11:24:19 +00:00
Mike Hearn
49cdad58c7
Minor: Add a brief comment to the RPC role setup code that explains the security justification for it.
2017-11-20 11:54:23 +01:00
Mike Hearn
adacbfc7d1
Upgrade to Kotlin 1.1.60
2017-11-20 11:54:23 +01:00
Chris Rankin
9403e231cc
Register Kryo and AMQP serialisation schemes for the SGX enclave.
2017-11-20 10:49:02 +00:00
josecoll
b685537c52
Reverse types for Issuer attributes. ( #2083 )
2017-11-20 10:36:37 +00:00
Andrzej Cichocki
55e4688cc5
CORDA-787 Split NodeMessagingClient into 3 ( #2063 )
2017-11-20 10:33:13 +00:00
josecoll
cca532b5c0
Fixed incorrect imports.
2017-11-19 23:15:41 +00:00
josecoll
0a62fd8a7a
Fixed incorrect imports.
2017-11-19 23:10:02 +00:00
josecoll
730aed6cf2
Updated and fixed all failing Unit tests from perftestcordapp
module (temporarily set to @Ignore).
2017-11-19 19:48:29 +00:00
josecoll
738067f673
Initialize serialization to fix failing test after merge from Open Source.
2017-11-19 19:09:14 +00:00
josecoll
960d9010f6
Fix cash spending tests in perftestcordapp
module.
2017-11-19 11:28:23 +00:00
josecoll
b71c1a8744
@Ignore duplicate failing tests (after merge from OS).
2017-11-19 10:59:45 +00:00
josecoll
e579abd274
@Ignore duplicate tests with incorrect setup.
2017-11-19 10:11:13 +00:00
josecoll
70681cdcc7
Comment out unused code for now (uncompilable due to breaking open source code change)
2017-11-18 11:43:26 +00:00
josecoll
ea1cd0035a
Merge remote-tracking branch 'open/master' into colljos-merge-171117
2017-11-18 11:03:36 +00:00
Shams Asari
332915f08b
Bug fix for cash selection on H2 where the accumulated pennies amount is larger than max int
2017-11-17 18:50:12 +00:00
Ross Nicoll
8e7165db41
CORDA-759: Enforce key checks on identity de-anonymisation ( #1993 )
...
Previously when de-anonymising a Party instance, the name of the Party was used rather than
the key, meaning a Party could be constructed with a random nonsense key and any name, and be treated as corresponding to the well known identity. This is not a security hole in itself as
in any real scenario a party shouldn't be trusted without having been registered, it creates
a significant risk of a security hole depending on how trusted the anonymous identity is, and
the returned identity is considered.
2017-11-17 18:13:35 +00:00
Ross Nicoll
1f98293377
Stabilise NodeStatePersistenceTests ( #2079 )
...
Pass notary identity into flow in `NodeStatePersistenceTests` rather than resolving it from the network map cache, which avoids a race condition between the flow starting and the notary registration being sent to the cache.
2017-11-17 18:13:10 +00:00
josecoll
c817252e7a
Fix compilation errors in perftestcordapp
module.
2017-11-17 17:36:00 +00:00
josecoll
fe34a4e7bc
Merge remote-tracking branch 'open/master' into colljos-merge-171117
2017-11-17 15:38:25 +00:00
Tudor Malene
817748c87e
Performance improvement: cache app classloaders ( #2060 )
...
Cache results of the classpath scanning for cordapps
2017-11-17 15:35:05 +00:00
Ross Nicoll
857e395439
Change how mock notary identity is extracted ( #2075 )
...
Change how mock notary identity is extracted, to match reversion in commit 3bb018a5
2017-11-17 15:31:59 +00:00
josecoll
86cc21a473
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:48 +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
Molina Atienza, Rose
128d5cad0a
Fixed typo in KotlinUtils.kt seperate -> separate
2017-11-17 16:04:59 +01:00
josecoll
f5c9fd8f44
Cross provider Issuer Reference database storage ( #2032 )
...
* consistent storage of Issuer Reference using `ByteArray` Kotlin type in Schema definition and a custom Hibernate Type to map this to a VARBINARY database type.
Creation of a new Issued type now also validates maximum size permissible (512).
2017-11-17 14:18:16 +00:00
Ross Nicoll
19aba62fc6
Move tests to using named identities ( #1879 )
...
Move tests to using named identities in preparation for multiple identities work. Includes:
* NetworkMapCacheTest
* NodeInterestRatesTest
* NodeVaultServiceTest
* ContractUpgradeFlowTest
* Cash tests
* AttachmentSerializationTest
* CordaRPCOpsImplTest
* VaultWithCashTest
* ScheduledFlowTests
2017-11-17 14:16:17 +00:00
Thomas Schroeter
9d6d027523
Merge pull request #2056 from thschroeter/raft-cluster-monitor-available-members
...
Raft notary cluster: metrics for available members
2017-11-17 13:14:25 +00:00
Andrzej Cichocki
aabc3c5b02
NodeInfo is no longer lateinit. ( #2068 )
2017-11-17 13:07:18 +00:00
Andrzej Cichocki
787de9d956
CORDA-716 Fix last of the test thread leaks ( #2069 )
...
* copycat servers/clients
* an SMM CheckpointChecker
* and log error rather than fail on propagation of stale inheritable thread local
2017-11-17 12:28:34 +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
Thomas Schroeter
3d87a1a735
RaftCluster metrics for available members
2017-11-17 12:00:19 +00:00
Shams Asari
953a4a3790
Revert "Introducing network parameters."
...
This reverts commit d04e487
2017-11-17 10:04:38 +00:00
Ross Nicoll
e4f5e16bf4
Clean up identities in tests, stage 1 ( #2059 )
...
* Clean up identities in CashTests so that the mini/mega corp keys and identities are correctly
paired together throughout. Previously `miniCorpServices` presented the same key as the
MegaCorp identity, but with the name Mini Corp attached.
* Correct key/name matches in VaultWithCashTest
* Split services in CashTests to not have multiple identities per service hub
2017-11-16 17:17:45 +00:00
Andrzej Cichocki
37b34c6fc1
Remove unused code. ( #2071 )
2017-11-16 17:01:46 +00:00
Joel Dudley
85071f227a
Reflects tutorial changes and CorDapp build docs changes from release-V1.
2017-11-16 15:31:52 +00:00
Andrzej Cichocki
55bcf295ee
Move class to the only place that uses it. ( #2067 )
2017-11-16 14:40:39 +00:00
josecoll
5bdbd2457a
Removal of transaction contract state as BLOB in VaultStates table. ( #2034 )
...
* Removal of transaction contract state as BLOB in VaultStates table.
Transaction contract state now resolved using StateLoader (from DBTransactionStorage).
Fixed broken JUnits.
* Changes to address review comments by RP
Address logic error.
* Fixed failing JUnit (CashExitFlowTests.exit zero cash).
* Fix VaultQueryTests to respect transaction visibility boundaries.
* Adopt consistent use of "session" using DatabaseTransactionManager.
* Removed redundant transaction demarcation boundaries in Vault Query tests.
2017-11-15 19:28:04 +00:00
szymonsztuka
b423fea537
Consistent database tables naming convention. ( #2064 )
...
* Added explicit table names (mostly for join tables).
* Shorten or alter name of 2 tables backing notaries.
* Change a compound index declaration to one column index.
2017-11-15 18:35:26 +00:00
Joel Dudley
8e18e1ba2a
Updates flow cookbook to use freshKeyAndCert not freshKey.
2017-11-15 16:49:06 +00:00
Ross Nicoll
d78308f510
Detangle issuers in NodeVaultServiceTest ( #2057 )
...
Detangle issuers in NodeVaultServiceTest, which has been using two keys on a single node, for different
issuing identities, which doesn't work right now because we don't actually have multiple identity support.
Also remove duplicate data in parameters to fillWithSomeTestCash().
2017-11-15 15:26:17 +00:00
Rick Parker
7337996e08
Add config library and default config to webserver JAR ( #2047 )
...
* Add config library and default config to webserver JAR
* Applied Clinton's feedback to create a config rather than do filtering.
2017-11-15 15:03:15 +00:00
Michele Sollecito
92c8861802
[CORDA-760]: Propagate invocation context across the codebase. ( #2016 )
2017-11-15 14:58:43 +00:00
szymonsztuka
4f2d8d058e
Ability to run integration tests against standalone databases (part 2) ( #109 )
...
Commit 359610ff14
didn't fully covered:
* Integration tests extends IntegrationTest class which can run SQL scripts before and after a test and before and after test class.
*Driver.kt creates notaries without a table name prefixes (separation is achieved by using different user/schema).
*Revert wrongly altered H2 JDBC connection string for tests.
2017-11-15 14:04:48 +00:00
szymonsztuka
f0a5ea96e7
Consistent database columns naming convention. ( #2043 )
...
* Consistent database column naming convention.
* Remove a column length constraint in NodeAttachmentService.
2017-11-15 13:09:25 +00:00
Alberto Arri
233f1fb8e2
Move all the configuration for running doorman in its configuration f… ( #104 )
...
* Move all the configuration for running doorman in its configuration files
2017-11-15 13:04:16 +00:00