ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-15 00:36:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,805 Commits 99 Branches 407 Tags
Commit Graph

875 Commits

Author SHA1 Message Date
rick.parker
49d99f00fc Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180802-1 2018-08-02 10:34:34 +01:00
Rick Parker
ff298e17e1
CORDA-1866 Avoid circular flushing in our hibernate column converters. (#3737) 2018-08-02 10:08:12 +01:00
Dominic Fox
9c89e3babd Merge commit '121dbec87700856679baab3995352448e8214b4e' into df-merge-2018-07-25 2018-07-25 18:00:24 +01:00
Tudor Malene
3259c4b64a
Tudor merge os 25 jul (#1299) 
* Feature/corda 1813/change postgres column type (#3631)

* CORDA-1813 fix Postgres db bloat issue

* CORDA-1813 merge fixes

* CORDA-1813 change column type and size to a standard corda type

* CORDA-1813 docs

* CORDA-1813 create custom hibernate type for the checkpoint blob and align with enterprise

* CORDA-1813 Remove max col size

* CORDA-1813 Remove max col size

* CORDA-1813 Fix merge

* CORDA-1813 Remove buggy :serverNameTablePrefix: configuration

* CORDA-1813 fix merge
 2018-07-25 15:21:51 +01:00
Tudor Malene
40fc56f2ea
Feature/corda 1813/change postgres column type (#3631) 
* CORDA-1813 fix Postgres db bloat issue

* CORDA-1813 merge fixes

* CORDA-1813 change column type and size to a standard corda type

* CORDA-1813 docs

* CORDA-1813 create custom hibernate type for the checkpoint blob and align with enterprise

* CORDA-1813 Remove max col size

* CORDA-1813 Remove max col size

* CORDA-1813 Fix merge

* CORDA-1813 Remove buggy :serverNameTablePrefix: configuration
 2018-07-25 09:52:57 +01:00
Shams Asari
d040945b0e Merge fixes 2018-07-24 18:37:04 +01:00
Shams Asari
02fae5f385 Merge remote-tracking branch 'open/master' into os-merge-757181e 
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
 2018-07-24 17:04:51 +01:00
Shams Asari
d4f0e0f8e0
Ordered starting of node components and clear dependencies between them (#3664) 
Moved start up logic of the various node components out of their c’tors and into “start” methods, which are called from Node.start(). The components themselves are created in the Node’s c’tor with minimal initialisation logic.

Certain things are not immediately available at construction time, which are instead given to the components at start time in an orderly fashion:

* Certs from the node’s key store and trust store
* The network parameters, and thus access to things like maxMessageSize and the contracts whitelist
* A running database - several components were doing database stuff their c’tors
* The node’s NodeInfo, and thus access to things like identities and addresses

The messaging service couldn’t be created in the Node’s c’tor due to initialisation issues with MockNode. This should be fixed in a later commit.
 2018-07-24 16:13:21 +01:00
Michele Sollecito
a4d65dae22 Merge remote-tracking branch 'remotes/open/master' into merges/july-23-11-26 
# Conflicts:
#	confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
#	docs/source/changelog.rst
#	node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTSMaRtTests.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/ManifestUtils.kt
#	node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
#	node/src/test/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoaderTest.kt
#	node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt
#	node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
#	settings.gradle
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
 2018-07-23 15:22:39 +01:00
Michele Sollecito
abc1d99eaa
[CORDA-1799]: Avoid generating test CorDapp JARs from each out of process node started by the driver (#3641) 2018-07-23 11:18:11 +01:00
Anthony Keenan
168664f7a8 Merge remote-tracking branch 'open/master' into os-merge-20180722 
# Conflicts:
#	CONTRIBUTORS.md
#	constants.properties
#	docs/source/aws-vm-explore.rst
#	docs/source/azure-vm-explore.rst
#	docs/source/corda-networks-index.rst
#	docs/source/gcp-vm.rst
#	docs/source/getting-set-up.rst
#	docs/source/node-database.rst
#	finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
#	finance/src/main/resources/META-INF/services/net.corda.finance.contracts.asset.cash.selection.AbstractCashSelection
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-07-22 23:06:43 +01:00
Anthony Keenan
7853cfe003
[CORDA-1482] Make boolean config variables case insensitive (#3622) 
* Make boolean config variables case insensitive

* Address review comments
 2018-07-21 11:54:02 +01:00
Dominic Fox
62c2e1c892 OS merge 2018-07-19 2018-07-19 16:43:46 +01:00
bpaunescu
53b398a460
ENT-2116: handle amqp client remote error, added test (#3636) 
* ENT-2116: handle amqp client remote error, added test

* ENT: 2116 rename test, added logging

* ENT-2116: rename test to indicate its purpose
 2018-07-18 16:07:42 +01:00
Michal Kit
c0207b2219
CORDA-1815 adding maxTransactionSize validation (#3635) 
* CORDA-1815 adding maxTransactionSize validation

* Fixing failing tests

* Fixing failing test
 2018-07-18 10:34:41 +01:00
Chris Rankin
d54bf2f761 Remove Guava shading from node-api because Curator already shades its own. 2018-07-18 09:29:56 +01:00
szymonsztuka
3d20a15180 Revert "CORDA-1804 Corda node stops when detecting not migrated node_attachments_contracts table name (#3593)" 
This reverts commit 208ac49
Reverting because it's OS specific and tables are managed by Liquibase in ENT.
 2018-07-16 10:24:31 +01:00
bpaunescu
33ce848e0c OS-ENT merge 2018-07-16 10:00:16 +01:00
Konstantinos Chalkias
bf4f30fd39
Use newSecureRandom instead of SecureRandom (#3606) 2018-07-14 05:21:02 +01:00
szymonsztuka
208ac49da0
CORDA-1804 Corda node stops when detecting not migrated node_attachments_contracts table name (#3593) 
Database table NODE_ATTACHMENTS_CONTRACT_CLASS_NAME in v3.0 was changed to NODE_ATTCHMENTS_CONTRACTS in v3.1 and then finally NODE_ATTACHMENTS_CONTRACTS on current master. Users may omit the upgrade note and run into errors. After the change the node will not start if the new table name is not found and any other older ones is found.
 2018-07-13 16:23:20 +01:00
rick.parker
21a7b56161 Fix up compilation errors. 2018-07-13 14:33:13 +01:00
Katarzyna Streich
4fb7f7d3d0
CORDA-1733 X500Principal configuration parsing (#3580) 
CORDA-1733 X500Principal configuration parsing

Change the NodeConfiguration.tlsCertCrlIssuer type from String to X500Principal
 2018-07-13 13:44:29 +01:00
rick.parker
4e81d26985 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1 2018-07-13 13:15:53 +01:00
Michal Kit
5dd85e08bf
CORDA-1805 Fixing the NPE with path parent (#3591) 2018-07-13 12:46:50 +01:00
Rick Parker
ed25d8f1be
ENT-1565 Upgrade Artemis version to latest. (#3557) 
* ENT-1565 Upgrade Artemis version to latest.

* Fix compiler errors.

* Add to changelog

* Additional commentary on Proton-J version
 2018-07-13 10:10:26 +01:00
Patrick Kuo
0fee4aa1d3
remove CRL url from dev doorman cert (#3555) (#1260) 
(cherry picked from commit 26d44ee)
 2018-07-11 11:33:34 +01:00
Patrick Kuo
26d44eedf5
remove CRL url from dev doorman cert (#3555) 2018-07-10 19:07:29 +01:00
Viktor Kolomeyko
61a8bd0a5a Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge 
# Conflicts:
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
 2018-07-09 16:45:20 +01:00
Michal Kit
408cc68c65
CORDA-1715 Ordering the X500 name for the CRL extension of the TLS certificates (#3515) 
* CORDA-1715 Ordering the X500 name for the CRL extension of the TLS certificate

* Addressing review comments

* Addressing review comments - round 2

* Throwing an exception on incorrect TLS CRL issuer configuration

* Changes after the redesign decisions

* Small refactoring
 2018-07-09 13:45:38 +01:00
Shams Asari
c4d0a62ceb Merge branch 'master' into os-merge-244167d 2018-07-05 15:47:09 +01:00
bpaunescu
06ca40c168
ENT-2204: fixed zookeeper client flaky test (#1198) 
* ENT-2204: fixed zookeeper client flaky test

* ENT-2204: use size of list as count for the countdown latch in zk test

* ENT-2204: store timeout value into a variable

* ENT-2204: tidy up, use lambda outside of parenthesis
 2018-07-05 12:59:46 +01:00
Shams Asari
20a589d66d Merge remote-tracking branch 'open/master' into os-merge-244167d 
# Conflicts:
#	docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
#	docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
#	docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/tearoffs/TutorialTearOffs.kt
#	docs/source/running-a-node.rst
#	experimental/behave/build.gradle
#	experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
#	experimental/kryo-hook/build.gradle
#	experimental/quasar-hook/build.gradle
#	node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
#	samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
 2018-07-04 18:38:34 +01:00
Patrick Kuo
68d0826563
Custom config parser for more complex config structure (#3513) 
* custom config parser for more complex config structure

* address PR issues
 2018-07-04 16:51:54 +01:00
Matthew Nesbit
0d18bf8e33 Merge up of cleanup of AMQP protocol code 2018-07-03 17:05:05 +01:00
Matthew Nesbit
15d868b113 Merge up of cleanup of AMQP protocol code 2018-07-03 17:04:42 +01:00
Matthew Nesbit
d0568121b7
Some code tidy up ahead of post-GA development. (#3500) 
Handle SSL Handshake timeouts properly
 2018-07-03 14:16:31 +01:00
Thomas Schroeter
c32b7b1331 Node API: relocate licence file (#1100) 2018-06-28 10:11:41 +01:00
Thomas Schroeter
eb698160fa Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-06-27 2018-06-27 13:00:37 +01:00
Thomas Schroeter
66cb0e389b
Warning timer thread should run as a daemon (#3450) 2018-06-27 12:57:37 +01:00
Michal Kit
d060e95834 Merge OS -> ENT up to e00c7706c3f52d0e338f83d169e60c99d623f1c5 2018-06-26 10:02:33 +01:00
Michal Kit
e00c7706c3
CORDA-1661 Reverting DEV certificates (#3422) 
* CORDA-1661 Reverting DEV certificates

* Addressing review comments

* Removed the intermediate certificate from the trust store and added some test cases for the revocation check
 2018-06-25 16:40:51 +01:00
Tudor Malene
9be4c5dca4
CORDA-1567 Remove all traces of the out-of-process verifier (#3424) 2018-06-25 13:01:33 +01:00
Shams Asari
98cd8be160 Merge remote-tracking branch 'open/master' into os-merge-b97af47 
# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	docs/source/release-notes.rst
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
#	tools/bootstrapper/build.gradle
 2018-06-25 11:38:30 +01:00
Shams Asari
3046843d40
CORDA-1602: Added cmd line flags to the network bootstrapper (#3419) 
The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.

Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.
 2018-06-23 11:36:10 +01:00
tudor.malene@gmail.com
fb3e216318 Merge remote-tracking branch 'open/master' into tudor-merge-21-06 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
 2018-06-21 16:51:19 +01:00
Tudor Malene
381aadc78f
ENT-1796 RPC SSL (#3401) 
* ENT-1796 add just-generate-rpc-ssl-settings command line flag. Fix ssl configuration and documentation

* ENT-1796 small fix. change alias

* ENT-1796 address code review changes

* ENT-1796 revert file

* ENT-1796 Added check to display better error message

* ENT-1796 Doc fixes
 2018-06-21 16:46:05 +01:00
Andrius Dagys
a9cdb576e6 Merge remote-tracking branch 'open/master' into andrius/merge-06-21-2 2018-06-21 14:02:37 +01:00
Katelyn Baker
bafe387e93 Revert "Change to use MDC logic in bridge/AMQP protocol logging (#3398) (#1034)" 
This reverts commit dd74fd2e2832a525a5aaa1976d7cc84c1ba7f361.
 2018-06-21 13:57:44 +01:00
bpaunescu
dd74fd2e28
Change to use MDC logic in bridge/AMQP protocol logging (#3398) (#1034) 2018-06-21 09:37:48 +01:00
gaugfather
2f34b16b07 Fix to allow equality of hostname (#3381) 
* Fix to allow equality of hostname

* Remove unreliable require test per pull 3381

* Remove unreliable require test per pull 3381
 2018-06-21 09:03:32 +01:00