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

11509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kat Baker
84914aa5c8 Remove commented out code 2018-04-12 11:18:39 +01:00
Katelyn Baker
f19bcea82f CORDA-1229 - Setter serialization fails with lists 
Looks like the super / sub type inference of setter param vs
getter param is the wrong way around. Also, Setter Type should
be the generic type, not just the type

the property must be a supertype of the setter parameter

the getter must be a supertype of the setter parameter
 2018-04-12 11:17:26 +01:00
Matthew Nesbit
7bee15374b Changes as suggested by Clinton 2018-04-12 10:55:08 +01:00
Matthew Nesbit
478e714936 Include artifactory plugin 2018-04-12 10:25:08 +01:00
Katelyn Baker
72bd530b11
Merge pull request #2955 from corda/kat/release/merge-3.1-releasenotes 
Kat/release/merge 3.1 releasenotes
 2018-04-11 16:50:19 +01:00
Tudor Malene
241f7738e4 ENT-1704 restructure db migration documentation (#636) 2018-04-11 16:48:25 +01:00
Matthew Nesbit
c7937fa6f9
Merge pull request #704 from corda/mnesbit-consume-filtered-messages 
When discarding invalid messages we should consume them.
 2018-04-11 16:38:27 +01:00
Shams Asari
9b58114146 Merge remote-tracking branch 'open/master' into os-merge-f88542f 
# Conflicts:
#	docs/source/changelog.rst
#	finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
 2018-04-11 15:40:25 +01:00
Katelyn Baker
91fd40c806 RELEASE: Merge V3.0 upgrade notes to master 
This should've been done at release... I clearly missed back-merging
this file
 2018-04-11 15:37:47 +01:00
Shams Asari
f88542faa2
CORDA-1095: Fixed rare race where the startNode future completes before the default notary is visible (#2947) 2018-04-11 15:33:55 +01:00
Matthew Nesbit
e51de2739c When discarding invalid messages we should consume them. When starting up wait for node bridge registration before activating the float, otherwise we have a race condition. 
Reduce excessive logging

Address PR comments

Address PR comments
 2018-04-11 15:26:27 +01:00
Matthew Nesbit
a4a6eedbf0
Merge pull request #721 from corda/mnesbit-merge-20180411 
Merge up from OS
 2018-04-11 15:25:12 +01:00
szymonsztuka
b46c3b89bd
CORDA-1326 Add default shell user only when local shell is started. (#2953) 
In productionMode ssh could login to a node using "shell/shell" which is supposed to be available only in dev mode (to enable embedded shell).
 2018-04-11 14:06:13 +01:00
Matthew Nesbit
2b55a8f67e Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-04-11 14:00:56 +01:00
Matthew Nesbit
8c1e9c069e Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-04-11 14:00:36 +01:00
Katelyn Baker
760cc1ec48 RELEASE - merge v3.1 release notes / upgrade notes / changelog to master (#2937) 
* RELEASE - 3.1 upgrade and release notes

* Update docs for change to vno

* address vno change in release notes

* Update release-notes.rst

* make corda links

* Review comments

* Review comments

* review comments

* remove ref to reverted bugfix

* Review comments
 2018-04-11 13:57:29 +01:00
Chris Rankin
f6e79cdbea
Upgrade to H2 1.4.197. (#2918) 2018-04-11 13:38:06 +01:00
szymonsztuka
2dc2a8dc19
ENT-1727 Fix cash selection with PostgreSQL. (#2949) 
Change conversion to toStringShort() instead of toBase58String() - as done for H2 Cash Selection.
Fix withIssuerRefs case - iterate via list of IssuerRefs and setBytes instead of setArray of BYTEA.
Add test for Cash Selection with issuerRef.
 2018-04-11 13:36:29 +01:00
Shams Asari
973f6c0c08
Merge pull request #717 from corda/os-merge-ecce64b 
O/S merge from ecce64b
 2018-04-11 13:25:54 +01:00
Shams Asari
c7ad2ca391 Merge fixes 2018-04-11 11:16:31 +01:00
Shams Asari
4a77712978 Merge remote-tracking branch 'open/master' into os-merge-ecce64b 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
 2018-04-11 11:15:17 +01:00
Jiachuan
54a6fd0e06 CORDA-1201 Remove duplicated doc section. (#2924) 2018-04-11 11:08:20 +01:00
Tudor Malene
aaf3bdacd5
ENT-1698 - transform baseDirectory to an absolute path (#714) 2018-04-11 10:41:31 +01:00
Matthew Nesbit
70beffac48
Add support for different internal p2p artemis bind address/port (#2951) 
* Add support for different internal p2p artemis bind address/port and externally advertised p2pAddress and port.

* Fix formatting
 2018-04-11 10:33:17 +01:00
Shams Asari
ecce64ba03
HttpUrlConnection.getErrorStream() can be null, which if not handled can obscure the reporting of an HTTP error response, like in ENT-1744 (#2948) 2018-04-11 09:39:58 +01:00
Konstantinos Chalkias
2ba00780c3
Merge pull request #712 from corda/kostas-registerProvider 
ENT-1756 register providers first thing on doorman boot
 2018-04-10 17:47:59 +01:00
Konstantinos Chalkias
f1ddd2b747 ENT-1756 register providers first thing on doorman boot. 2018-04-10 16:27:01 +01:00
igor nitto
2fc7e5e674
Classloader loading DataSource must stay open [ENT-1717] (#709) 2018-04-10 16:02:03 +01:00
bpaunescu
f022c67689
ENT-1618: added support for RPC client in HA mode(automatic failover) (#706) 
* ENT-1618: added support for RPC client in HA mode(automatic failover)

* RPCClient: renamed variables to avoid confusion about clustering
 2018-04-10 12:38:37 +01:00
Tudor Malene
4ed917436a
CORDA-1309 Add support for jarDirs config (#705) 2018-04-10 11:24:35 +01:00
szymonsztuka
6761824ba7
Update database integration tests setup for the test related to ENT-1684 (#703) 2018-04-09 12:36:22 +01:00
Shams Asari
712bf6b43d
Merge pull request #701 from corda/os-merge-2792716 
O/S merge from 2792716
 2018-04-09 09:51:59 +01:00
Shams Asari
3fbfd0deeb Merge remote-tracking branch 'open/master' into os-merge-2792716 2018-04-07 18:23:14 +01:00
Shams Asari
11af3992db
Doorman db entity attributes which are hashes are of type SecureHash where possible. (#695) 
Also made use of InputStream.readObject extension method.
 2018-04-07 17:26:09 +01:00
Katarzyna Streich
00a22c91df ENT-1684: Remove nodes that didn't accept update from network map (#692) 
On flag day all nodes that didn't accept new parameters update will be kicked out of the network map.
 2018-04-07 15:28:57 +01:00
Katarzyna Streich
2792716157 CORDA-1181: Add back information on initial registration (#2943) 2018-04-07 15:18:05 +01:00
Chris Rankin
c7826bd1eb
Merge pull request #699 from corda/chrisr3-os-merge 
CORDA-1301: Upgrade to corda-gradle-plugins 4.0.11.
 2018-04-07 00:11:35 +01:00
Viktor Kolomeyko
e48cd808b0
Try to improve stability of NodeRegistrationTest (#2942) 
Since we are running web-server and different handling methods will be called from
different threads, it is more appropriate to use concurrent data structures
for exchanging information between threads.

Prior to this change I observed the following exception which is likely to be due `certPaths` not synchronized between threads:
```
Caused by: kotlin.KotlinNullPointerException
    at net.corda.node.utilities.registration.RegistrationHandler$reply$1.invoke(NodeRegistrationTest.kt:151) ~[integrationTest/:?]
    at net.corda.node.utilities.registration.RegistrationHandler$reply$1.invoke(NodeRegistrationTest.kt:122) ~[integrationTest/:?]
    at net.corda.core.internal.InternalUtils.logElapsedTime(InternalUtils.kt:221) ~[corda-core-corda-4.0-snapshot.jar:?]
    at net.corda.core.internal.InternalUtils.logElapsedTime(InternalUtils.kt:213) ~[corda-core-corda-4.0-snapshot.jar:?]
    at net.corda.node.utilities.registration.RegistrationHandler.reply(NodeRegistrationTest.kt:149) ~[integrationTest/:?]
    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_161]
    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_161]
    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_161]
    at java.lang.reflect.Method.invoke(Method.java:498) ~[?:1.8.0_161]
 ```
 2018-04-06 17:11:03 +01:00
Michal Kit
c4df6b0c85
Fixing CRR signing execution mode (#677) 
* Fixing CRR signing execution mode

* Addressing review comments
 2018-04-06 17:00:47 +01:00
Chris Rankin
06ff6f02f4 Merge commit 'f3f7cfddd6281cea00483b17ce7c6118b645c5e2' into chrisr3-os-merge 2018-04-06 16:44:48 +01:00
Joel Dudley
480b48a050
Adds a table of contents. Readds Dockerform instructions. 2018-04-06 14:42:04 +01:00
Chris Rankin
f3f7cfddd6
Upgrade to corda-gradle-plugins 4.0.11 (#2936) 2018-04-06 14:05:31 +01:00
Anthony Keenan
ed7e9e64cf
Merge pull request #697 from corda/anthony-os-merge-20180406 
OS Merge 20180406
 2018-04-06 13:30:56 +01:00
Anthony Keenan
f798c58c36 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180406 
# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
 2018-04-06 11:43:34 +01:00
Anthony Keenan
2999f0eba2 Merge branch 'ak' into anthony-os-merge-20180406 
# Conflicts:
#	docs/source/api-persistence.rst
 2018-04-06 11:01:34 +01:00
Viktor Kolomeyko
31e773876c
Merge pull request #696 from corda/feature/vkolomeyko/os-merge 
OS->Ent merge
 2018-04-06 10:40:43 +01:00
Rick Parker
130b1d9325
CORDA-1303 Regression: Recording a duplicate transaction attempts sec… (#2935) 
* CORDA-1303 Regression: Recording a duplicate transaction attempts second insert to vault.

Added unit test, and merged mock and real logic.
 2018-04-06 10:28:51 +01:00
Anthony Keenan
ec09188559
[CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo (#2929) 
* Add CordaService testing documentation and improve tests in irs-demo

* Addressed review comments
 2018-04-06 09:22:58 +01:00
Viktor Kolomeyko
df6c6b99cd Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge 
# Conflicts:
#	samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
 2018-04-06 09:19:34 +01:00
Shams Asari
fb4f99d590
Merge pull request #693 from corda/os-merge-1b37cef 
O/S merge from 1b37cef
 2018-04-06 08:59:10 +01:00