ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,525 Commits 91 Branches 405 Tags 354 MiB
f1fd1cefd8
Commit Graph

11525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
szymonsztuka
f433ec88fe
Add support for database integration tests to new tests created for ENT-1433 (#594) 2018-03-22 11:45:03 +00:00
Tudor Malene
72b97be42c
Merge pull request #587 from corda/feature/ENT-1637/migration-tool-changes 
ENT-1673 Update migration tool to use the drivers folder and created reusable "createDatasourceFromDriverJars" function
 2018-03-22 10:35:55 +00:00
Patrick Kuo
ff4bbaf63f ENT-1524 & ENT-1358: Cleaned up doorman db schema (#565) 
* Renamed tables and constraints to have name < 30 characters
* Using AttributeConverters were possible for custom types
* NodeInfoEntity has relationship to accepted NetworkParametersEntity, not the hash
* Improved logging in the node
 2018-03-22 06:39:02 +00:00
Andras Slemmer
34d5f72f51
Merge pull request #591 from corda/aslemmer-ENT-1647 
ENT-1647: Ack duplicate messages
 2018-03-21 18:45:09 +00:00
igor nitto
ca010f881d
Merge pull request #592 from corda/merges/march-21-16-24 
Merge from OS/master
 2018-03-21 18:00:55 +00:00
igor nitto
88d7f7f720 Fix 2018-03-21 16:35:34 +00:00
igor nitto
dc076f83ba Merge remote-tracking branch 'open/master' into merges/march-21-16-24 2018-03-21 16:30:31 +00:00
Joel Dudley
4d15e17027
Documents TestIdentity in the testing API docs. 2018-03-21 15:39:16 +00:00
Joel Dudley
9b981c2755
Corrects bootstrapper JAR name. 2018-03-21 15:35:55 +00:00
Andras Slemmer
051583b4f5 Remove spurious session rollback 2018-03-21 15:32:11 +00:00
Tudor Malene
8371a65ed8 ENT-1673 Created reusable "createDatasourceFromDriverJars" function 2018-03-21 15:32:07 +00:00
Andras Slemmer
9f0ef0157e ACK duplicate messages 2018-03-21 15:31:54 +00:00
Chris Rankin
db2cdda020
ENT-1439: Refactor DelegatingSercureRandomService for modularity. (#590) 
* Refactor DelegatingSercureRandomService so that it can be removed cleanly from the deterministic core module.
* Rename SecureRandom implementation class.
 2018-03-21 15:31:37 +00:00
Tudor Malene
50d9a7edb3
Merge pull request #589 from corda/merges/march-21-13-45 
Merges: March 21 13:45
 2018-03-21 15:01:11 +00:00
Clinton
a386e71cbd
Fixed a deadlock that occurs when running a split network map and doorman. (#470) 2018-03-21 15:00:46 +00:00
Andrius Dagys
3db40bb392 CORDA-1208: MySQL notary service - store request signature 2018-03-21 14:38:20 +00:00
igor nitto
91cda5f18a
Reintroduce accidentally removed RPC addresses print (#2857) [CORDA-1244] 2018-03-21 14:21:09 +00:00
sollecitom
3887838bc5 Merge remote-tracking branch 'remotes/open/master' into merges/march-21-13-45 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
 2018-03-21 13:51:07 +00:00
szymonsztuka
49146b1cb5
ENT-1634 Fix Primary Key generation for node_notary_request_log table - part 2 (#582) 
* Fix node_notary_request_log table - update Liquibase xml migration 
* (Unrelated to ENT-1634) Add database SQL setup for several tests to pass database integration tests, update SQL scripts for new  tables
 2018-03-21 13:49:25 +00:00
Katarzyna Streich
75b467e340 ENT-1433: Implementation of NetworkParameters updates (#477) 
* Implementation of NetworkParameters updates

Implementation of NetworkParameters updates for network-management
server side of the process.
Change the way network parameters are read up on network-management
startup. Introduced 3 flags to clearly communicate intentions:
initial-network-parameters, update-network-parameters and flag-day.

* Address Shams comments

* Address comments

* NetworkMapStorage refactor

getLatestNetworkParameters returns NetworkParametersEntity

* TODO Exit after parameters update

Started implementing feature requested by devops. TODO: Fix
NodeRegistrationTest

* Code cleanup

* Merged the two cmd line flags into one --set-network-parameters. The idea being to simply check if there are any active network parameters to determine if it's an update or not.

Applying network parameters causes the server to exit once done (ENT-1559).

* Merge fixes

* Minor cleanup

* Small fixes

* Merge fixes and cleanup

* TODO Implementation of cancelUpdate flag

Will slightly change after more manual testing

* Small cleanup

* Address comments

Add OneToOne relation between ParametersUpdate and NetworkParameters.

* Address comments fix tests
 2018-03-21 12:29:27 +00:00
Michele Sollecito
ce8771900e
[CORDA-1235]: Prevent out of order consumption of initiation vs subsequent messages (#2850) 2018-03-21 11:24:53 +00:00
szymonsztuka
785891515e
Merge pull request #588 from corda/merges/ENT-1634 
Merge OS -> ENT
 2018-03-21 11:04:40 +00:00
szymonsztuka
b81c005230 Merge OS -> ENT 2018-03-21 09:53:28 +00:00
Rick Parker
614d2049ec
ENT-1625 Fix overly large footprint of checkpoint bandwidth histogram (#580) 
* Upgrade metrics library and histogram implementation

* Only write to the "per second" checkpoint bandwidth histogram once per second, maximum.

* Bug fix

* Review feedback and fix unit test

* Fix IRS demo to use specific metrics version in spring boot
 2018-03-21 09:52:29 +00:00
szymonsztuka
f1ac3c39e9
ENT-1634 Fix Primary Key generation for node_notary_request_log table (#2855) 
Don't assign a value as it's auto generated, remove redundant default value for GeneratedValue strategy.
 2018-03-21 09:41:50 +00:00
Thomas Schroeter
5def901980
[ENT-1639] Add version column (#585) 
* Add `version` column

The equality check of the timestamp was tricky to get right. Better to
use a logical timestamp.
 2018-03-20 19:08:23 +00:00
Joel Dudley
d7147b7399
Adds JavaDocs for SoftLockingCondition. 2018-03-20 18:42:38 +00:00
bpaunescu
24366012e2
Merge pull request #586 from corda/bogdan-merge-20-03-18 
Bogdan merge 20 03 18
 2018-03-20 18:41:18 +00:00
Andrzej Cichocki
96d976d555
ENT-1439 Delegate SecureRandom to thread-local (#575) 
while minimising CryptoUtils diff
 2018-03-20 17:56:32 +00:00
Tudor Malene
882b18184f sqlserver 2018-03-20 17:29:14 +00:00
Andrzej Grzesik
bc172840a3
Ignore flaky SSHServerTest.ssh_run_flows 
Ignore flaky SSHServerTest.ssh_run_flows
 2018-03-20 17:26:28 +00:00
bpaunescu
79c7fd7c82 Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18 
# Conflicts:
#	docs/source/changelog.rst

added missing changelog line
 2018-03-20 17:13:30 +00:00
bpaunescu
aaa9e8c83f Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18 
# Conflicts:
#	docs/source/changelog.rst
 2018-03-20 16:54:56 +00:00
ags
946ec3c04e
ignored flaky test: 2018-03-20 16:26:34 +00:00
bpaunescu
ac9cb59a6e
Fix RPC flaky test (#2849) 
* fix rpc reconnect flaky test; remove obsolete rpcproxy log message

* rpc client proxy: replace lock with atomic variable

* rpc client proxy: removed volatile property

* RPCStabilityTests: used eventually() method to test async response

* RPCStabilityTests: remove unused import
 2018-03-20 16:23:29 +00:00
Michal Kit
144632818c
Adding the X509CRL custom serializer. (#2844) 
CORDA-1233

* Adding the X509CRL custom serializer.

* Addressing review comments
 2018-03-20 15:42:25 +00:00
szymonsztuka
182294913a
CORDA-2615: Added description for configFile option in deployNodes Cordform Gradle task. (#2825) 2018-03-20 12:53:41 +00:00
Shams Asari
cd038ea107
Fixed docsite on incorrect node config filename required for bootstrapping a local network. (#2848) 2018-03-20 11:42:48 +00:00
Tudor Malene
8a62af57e6
Merge pull request #583 from corda/corda/tudor-os-merge-1 2018-03-20 11:32:50 +00:00
Matthew Nesbit
4650d803d1
Merge pull request #555 from corda/mnesbit-add-copyright-to-bridge 
Add copyright to new bridge files
 2018-03-20 11:23:09 +00:00
tudor.malene@gmail.com
a80be413e0 Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1 2018-03-20 10:20:17 +00:00
Tudor Malene
1a1cd94161
ENT-1564 - add additional uploader check to the HashConstraint (#2845) 2018-03-20 10:17:44 +00:00
Matthew Nesbit
8ed6c556e4 Add copyright to new bridge files 2018-03-20 10:07:08 +00:00
Matthew Nesbit
9fff66257b
Merge pull request #569 from corda/mnesbit-socks-proxy-support 
ENT-1614: Add SOCKS proxy capability to the AMQP Bridges
 2018-03-20 09:06:06 +00:00
Chris Rankin
5abe672d1f
Merge pull request #581 from corda/chrisr3-os-merge 
Merge from OS up to a4242b58
 2018-03-20 08:32:31 +00:00
Joel Dudley
5a05704d7a
Expands shell limitations section. 2018-03-20 08:14:33 +00:00
Chris Rankin
b500371b4e Merge commit 'a4242b5805df362ac562d758f48ea11da18df89b' into chrisr3-os-merge 2018-03-19 20:22:55 +00:00
Chris Rankin
a4242b5805
CORDA-1224: Remove @JvmStatic annotations. (#2847) 2018-03-19 20:11:50 +00:00
Michele Sollecito
2905989d19
Merge pull request #578 from corda/merges/march-19-14-41 
Merges: March 19th at 14:41
 2018-03-19 16:34:20 +00:00
sollecitom
8a561cddbf Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41 
# Conflicts:
#	client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
 2018-03-19 15:17:49 +00:00