00a80c3c65
Merge pull request #1356 from corda/szymonsztuka/os-merge-20180824
...
OS merge - In OS for H2 Liquibase is used to migrate only internal (required) schemas, this behaviour is preserved in ENT so enterprise needs to distinguish if it's running against H2 or other database (to use Liquibase for all MappedSchema not only internal ones) - this preserved existing compatibility that migration for H2 behaved exactly the same between OS and ENT, however in ENT H2 behaved differently then for other database vendors.
2018-08-24 16:30:18 +01:00
33e8e05a8d
Fixes after merge remote-tracking branch 'remotes/open/master' into szymonsztuka/os-merge-20180824
2018-08-24 13:24:43 +01:00
c7f666102f
Fixes after merge remote-tracking branch 'remotes/open/master' into szymonsztuka/os-merge-20180824
2018-08-24 12:27:47 +01:00
598e3a327a
Merge remote-tracking branch 'remotes/open/master' into szymonsztuka/os-merge-20180824
...
# Conflicts:
# build.gradle
# core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt
# finance/src/main/kotlin/net/corda/finance/schemas/CashSchemaV1.kt
# finance/src/main/kotlin/net/corda/finance/schemas/CommercialPaperSchemaV1.kt
# finance/src/main/resources/migration/cash.changelog-init.xml
# finance/src/main/resources/migration/cash.changelog-master.xml
# finance/src/main/resources/migration/commercial-paper.changelog-init.xml
# finance/src/main/resources/migration/commercial-paper.changelog-master.xml
# finance/src/main/resources/migration/commercial-paper.changelog-v1.xml
# node-api/src/main/kotlin/net/corda/nodeapi/internal/MigrationHelpers.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/schemas/NodeInfoSchema.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt
# node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
# node/src/main/resources/migration/common.changelog-init.xml
# node/src/main/resources/migration/common.changelog-master.xml
# node/src/main/resources/migration/node-core.changelog-init.xml
# node/src/main/resources/migration/node-core.changelog-master.xml
# node/src/main/resources/migration/node-core.changelog-pkey.xml
# node/src/main/resources/migration/node-core.changelog-postgres-blob.xml
# node/src/main/resources/migration/node-core.changelog-tx-mapping.xml
# node/src/main/resources/migration/node-core.changelog-v3.xml
# node/src/main/resources/migration/node-core.changelog-v4.xml
# node/src/main/resources/migration/node-info.changelog-init.xml
# node/src/main/resources/migration/node-info.changelog-master.xml
# node/src/main/resources/migration/node-info.changelog-v1.xml
# node/src/main/resources/migration/node-info.changelog-v2.xml
# node/src/main/resources/migration/node-notary.changelog-init.xml
# node/src/main/resources/migration/node-notary.changelog-master.xml
# node/src/main/resources/migration/node-notary.changelog-pkey.xml
# node/src/main/resources/migration/node-notary.changelog-v1.xml
# node/src/main/resources/migration/vault-schema.changelog-init.xml
# node/src/main/resources/migration/vault-schema.changelog-master.xml
# node/src/main/resources/migration/vault-schema.changelog-pkey.xml
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-08-24 12:23:30 +01:00
8b0fc8f29c
Merge pull request #3845 from corda/feature/ent-2253-rename-colun-name
...
Database column rename required by ENT-2253
2018-08-24 10:15:25 +01:00
793a937482
Merge pull request #1355 from corda/tlil/os-merge-20180823
...
OS->ENT merge 20180823
2018-08-23 17:49:50 +01:00
c4f33ef533
Rename column HOST to HOST_NAME in table NODE_INFO_HOSTS - required by ENT-2253
2018-08-23 17:08:05 +01:00
487cad7d06
CORDA-1471 Database schema setup for internal tables via Liquibase ( #3815 )
...
Internal tables (the tables from node and finance modules) are now tracked /created by Liquibase script.
Tables backing MappedSchemma in Cordapps are created by Hibernate (as before).
The PR scope added Liquibase library, setup code SchemaMigration and XML scripts and from Enterprise.
For existing database installation - the node will auto-upgrade to use Liquibase.
Method migrateOlderDatabaseToUseLiquibase checks for any 3.X existing Corda database to upgrade database to use Liquibase. When the existing database without Liquibase integral tables is detected, the node (at startup) will create Liquibase tracking tables and fill them with all migration scripts (marked as done), this ensure the database will look as it would use Liquibase from the beginning.
The database changes gradually introduced by the subsequent 3.X releases (3.1, 3.2) are conditionally run by Liquibase.
2018-08-23 16:30:02 +01:00
79909a5ea9
ENT-2430 Swap over output_index and transaction_id in database indexes ( #1354 )
...
(cherry picked from commit 2d33ba3)
2018-08-23 16:24:56 +01:00
acd3f44181
Merge remote-tracking branch 'open/master'
2018-08-23 13:55:11 +01:00
409b4e2a42
Minor: make the trace logging for the RPC server a bit more helpful.
2018-08-23 13:12:18 +02:00
785bae9e48
Minor: add a missing kdoc for InsufficientBalanceException
2018-08-23 13:12:18 +02:00
626b3e6bd3
Minor: make the :node:capsule:build task depend on buildCordaJAR
2018-08-23 13:12:18 +02:00
8ed600a2c3
Minor: fix visual regression during startup.
2018-08-23 13:12:18 +02:00
b3433c2a46
Minor: reformat SerializerFactory.kt
2018-08-23 13:12:18 +02:00
759419fcc1
ENT-2355 Insert transactions without checking for duplicates ( #1350 )
...
* ENT-2355 Make transactions storage optimistic if in a flow and the flow has never restored from a checkpoint.
(cherry picked from commit 9a2e9b0)
* ENT-2355 Insert transactions with optimism.
* Added some comments.
2018-08-23 11:06:14 +01:00
040de41e27
CORDA-1925: Include Requirements object in core-deterministic. ( #3841 )
2018-08-23 10:08:20 +01:00
57e188a5a8
Disabled allWarningsAsErrors for compilation and failFast for tests locally, after TC was updated to override them to enabled. ( #3838 )
2018-08-23 09:57:05 +01:00
bcfadfeebf
CORDA-1833: Create a picocli base class ( #3826 )
...
* Add shell extensions to CLI utils class and move into its own module
* Fix issue with completion script generation and slight refactor
* Fix autocompletion for logging level
* Delete uneeded comment
* More tidying up
* Make run function final
* Fixed an issue with the program being run twice.
* Address review comments
2018-08-22 21:51:25 +01:00
98eef2f960
Merge pull request #3840 from corda/feature/vkolomeyko/CORDA-1878
...
CORDA-1878: Improve exception handling when base directory is not readable or writable by the application user.
2018-08-22 17:31:52 +01:00
866e2a2a13
Makes it clear where to put the migration JAR. Bullet point fixes ( #1353 )
2018-08-22 17:18:08 +01:00
86d2d5aa00
Merge pull request #1351 from corda/parkri-os-merge-20180822-1
...
OS -> ENT merge of transaction mapping schema change
2018-08-22 17:01:36 +01:00
d9ab141c47
Merge pull request #3837 from corda/feature/fix-is-relevant-in-cash-selection
...
Fix "isRelevant" functionality - fix is_modifiable column condition in cash selection.
2018-08-22 16:30:50 +01:00
d2ef16cbfd
Deterministic JVM ( #3386 )
...
* CID-251 - Deterministic JVM
* CID-251 - Add DJVM documentation
* CID-251 - Address review comments from @chrisr3
* CID-251 - Address further review comments from @chrisr3
* CID-251 - Use shadowJar to generate fat JAR
* CID-251 - Address review comments from @exFalso
* CID-251 - Improve naming in ReferenceMap
* CID-251 - Add test for Kotlin meta-class behaviour
* CID-251 - Address review comments from @shamsasari
* CID-251 - Add description of high-level flow
* CID-251 - Refactoring
* CID-251 - Rename package to net.corda.djvm
* CID-251 - Include deterministic-rt.jar as runtime dependency
* CID-251 - Add Gradle task for generating whitelist from deterministic rt.jar
* CID-251 - Error messages for StackOverflow/OutOfMemory, update whitelist
* CID-251 - Reduce set definition of pinned classes
* CID-251 - Tidy up logic around pinned classes
* CID-251 - Shade ASM dependency and split out CLI tool
* CID-251 - Address review comments from @mikehearn (part 1)
* CID-251 - Address review comments from @mikehearn (part 2)
* CID-251 - Address review comments from @mikehearn (part 3)
* CID-251 - Address review comments from @exFalso
* CID-251 - Address review comments from @mikehearn (part 4)
* CID-251 - Address review comments from @exFalso and @mikehearn
* CID-251 - Address review comments from @mikehearn (part 5)
2018-08-22 16:01:39 +01:00
feaf6aa03c
CORDA-1878: Improve exception handling when base directory is not readable or writable by the application user.
2018-08-22 15:55:52 +01:00
217c3b1e3e
ENT-2202 Liquibase migration scripts for schema change coming from OS.
2018-08-22 15:13:50 +01:00
571eec5a72
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180822-1
2018-08-22 15:06:56 +01:00
153519e72e
Merge pull request #1349 from corda/mike-merge-2fae95c58f9
...
Merge to 2fae95c58f
2018-08-22 14:52:55 +01:00
30d07bc998
ENT-2202 Fold transaction mapping column into transactions table ( #3836 )
...
* ENT-2202 Fold transaction mapping column into transactions table
* Remove from node schema.
* Fix bug.
2018-08-22 14:14:55 +01:00
32a4a8712a
Fix "isRelevant" functionality - fix is_modifiable column condition in cash selection.
2018-08-22 13:38:17 +01:00
0a5dcc91ea
Merge remote-tracking branch 'open/master' into mike-merge-2fae95c58f9
2018-08-22 14:27:45 +02:00
2fae95c58f
[CORDA-1917] Fix smoke test ( #3823 )
2018-08-22 13:16:07 +01:00
79309ae94a
Liquibase: add column is_modifiable to vault_states table ( #1346 )
2018-08-22 13:13:42 +01:00
8b336d99a3
Fix "isRelevant" functionality - addes/fixed is_modifiable column in cash selection. ( #1348 )
2018-08-22 13:10:15 +01:00
004ea45a05
Ensure that every CheatingSecurityProvider has a unique name. ( #3835 )
2018-08-22 11:09:52 +01:00
1d05c16942
ENT-2439 Fix compression in serialization ( #3825 )
...
* ENT-2439 Fix compression in serialization
2018-08-22 10:37:18 +01:00
96d645c316
series0ne/corda-demobench-node-config-fix
...
Fixes an issue where profiles don't load because the node.conf format has changed between V1 and V3
2018-08-22 11:03:45 +02:00
f94abf726b
Fixing exception messages not showing up in the console because of log4j2.xml setup. ( #3830 )
2018-08-21 21:28:13 +01:00
41fc8d6c55
Remove BFTSMaRtTests. ( #3822 )
2018-08-21 13:02:18 +01:00
ffe77d223a
Merge pull request #1341 from corda/parkri-os-merge-20180821-1
...
OS -> ENT merge
2018-08-21 12:17:13 +02:00
524803bf76
ENT-2377 Unit test mocking fix.
...
(cherry picked from commit 746a182)
2018-08-21 09:43:01 +01:00
0045fe24fd
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180821-1
...
# Conflicts:
# docs/source/index.rst
2018-08-21 09:37:56 +01:00
a2182b8b1a
Merge pull request #1339 from corda/chrisr3-os-merge
...
Merge from OS up to ff62df8d
2018-08-20 22:05:08 +01:00
f299305e8d
Merge pull request #3809 from corda/mike-sig-constraints-dd
...
Add a design doc for signature constraints.
2018-08-20 17:13:17 +01:00
f55f1b65e6
Merge pull request #1332 from corda/features/ENT-2243-db-permissions-recomendations
...
ENT-2243 db permissions recomendations
2018-08-20 16:43:00 +01:00
c8a9395426
Merge pull request #3814 from corda/thomas/fix-jib-build
...
Cleanup Jib build task
2018-08-20 16:33:34 +01:00
a287673432
Merge commit 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge
...
Conflicts:
finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2018-08-20 15:46:20 +01:00
7082e68409
Cleanup the Jib build task
2018-08-20 15:13:55 +01:00
2f76651d00
ENT-2378 ENT-2377 Minimise database access during transaction creation and recording for public key handling ( #3812 )
...
* ENT-2378 ENT-2377 minimise database access by making more use of caches for filterMyKeys, and don't make a redundant database check for existence of new random keys.
* ENT-2378 Unit test for new method in PersistentIdentityService.
2018-08-20 15:01:51 +01:00
ff62df8d5a
CORDA-1907: Allow Corda's shell to deserialise using generic type information. ( #3810 )
2018-08-20 13:22:07 +01:00
