ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 08:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,528 Commits 91 Branches 405 Tags 354 MiB
51df3872b2
Commit Graph

11528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Viktor Kolomeyko
d5317e074c
Remove errorLogPath parameter which is not used anyway. (#2934) 
StdErr is always written to working directory if such path specified.
 2018-04-05 18:10:47 +01:00
Shams Asari
a97abbc8c0 Merge remote-tracking branch 'open/master' into os-merge-1b37cef 2018-04-05 17:23:03 +01:00
Shams Asari
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash (#2931) 2018-04-05 17:18:27 +01:00
Michal Kit
c8b58a601f
Adding CRL support in the generated certificates. (#2932) 2018-04-05 16:39:41 +01:00
Viktor Kolomeyko
b5324b0b2d
Merge pull request #690 from corda/feature/vkolomeyko/ent-master-merge 
OS->Ent merge
 2018-04-05 15:43:41 +01:00
Shams Asari
53a0aae489
Introduced a few helper methods around InputStream.readBytes (#2928) 2018-04-05 14:27:42 +01:00
Michal Kit
84398362ab
ENT-1626 Validating cert path on node info submission (#650) 
* Validating cert path on node info submission

* Addressing review comments

* Refactoring user exceptions

* Changing response message.
 2018-04-05 14:21:54 +01:00
Viktor Kolomeyko
375b4638ba Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
#	node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt
 2018-04-05 13:12:13 +01:00
szymonsztuka
2543bb356e
Merge pull request #689 from corda/merges/os-merge-22391c2-attempt2 
Merges/os merge 22391c2 attempt 2 - the former merge (PR #686) didn't carry commits from OS
 2018-04-05 12:44:01 +01:00
Michele Sollecito
54db391e3c
[CORDA-1294]: Fix corda-shell publication. (#2926) 2018-04-05 11:53:12 +01:00
Michal Kit
71fa61020e
Adding a unit test for SignedNodeInfo verification (#2925) 2018-04-05 11:25:41 +01:00
szymonsztuka
76c1b08b27 Merge remote-tracking branch 'remotes/open/master' attempt 2 2018-04-05 11:18:01 +01:00
Viktor Kolomeyko
9a1c27e3e0
Improve performance of NodeStatePersistenceTests (#2921) 
Packages re-jig was meant to reduce the size of the jars that are being produced by the
node driver. E.g. previously `MessageState` was in package `net.corda` which resulted in jar file
of around 2MB to be created. Same for `NodeStatePersistenceTests` which was in `net.corda.node`
 2018-04-05 09:33:03 +01:00
Joel Dudley
e5b54a07c4
Adds a missing import. 2018-04-05 09:15:05 +01:00
szymonsztuka
c1065c557f
Add support of db integration tests for tests introduced by CORDA-1264. (#674) 2018-04-04 22:39:15 +01:00
szymonsztuka
3aeb35d940
Merge pull request #686 from corda/merges/os-merge-22391c2 2018-04-04 20:16:34 +01:00
szymonsztuka
ad5ceedbd9 Merge remote-tracking branch 'remotes/open/master' 
# Conflicts:
#	docs/source/changelog.rst
 2018-04-04 18:01:35 +01:00
Shams Asari
4c123643ac
Merge pull request #680 from corda/shams-os-merge-0af42bd 
O/S merge from 0af42bd
 2018-04-04 17:38:18 +01:00
szymonsztuka
22391c21c5
Change log and upgrade notes for Shell changes in CORDA-792. (#2919) 2018-04-04 15:59:05 +01:00
Rick Parker
23184b7495
ENT-1729 P2P message de-duplication performance optimisation has a flaw (#675) 2018-04-04 15:49:00 +01:00
Joel Dudley
6572939e6e
Link to X509Utils. Makes it clear they are only an example. 2018-04-04 15:45:49 +01:00
Shams Asari
adac476dba Merge remote-tracking branch 'origin/master' into shams-os-merge-0af42bd 2018-04-04 14:52:59 +01:00
Shams Asari
7296369541 Merge fixes 2018-04-04 14:52:24 +01:00
szymonsztuka
c998968e58
Update RpcExceptionHandlingTest tests introduced by CORDA-1264 (#2916) 2018-04-04 14:35:51 +01:00
Michal Kit
6c2cfc3880
ENT-1732 Preventing non-notaries composite keys being submitted in node info (#676) 
* Preventing non-notaries composite keys being submitted in node info

* Addressing review comments
 2018-04-04 14:33:40 +01:00
Shams Asari
6283462548 Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
 2018-04-04 14:18:24 +01:00
Andras Slemmer
4334d38bf5
Merge pull request #672 from corda/aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04 
Merge OS up to 2f1b8ff23e
 2018-04-04 12:07:07 +01:00
Matthew Nesbit
0af42bda44
Fix a bug in the AMQP protocol wrapper code which gives incorrect reply address information on received packets. (#2914) 2018-04-04 11:23:09 +01:00
Andrius Dagys
5909a49c30
ENT-1725: Introduce FlowAsyncOperation (#658) 
* ENT-1725: Introduce FlowAsyncOperation, which allows suspending a flow on a custom operation, such as long running I/O requests, notary commit, etc.

* Move async execute to internal, add more tests.

* Add a 30s test timeout

* Update API doc
 2018-04-04 09:52:49 +01:00
Andras Slemmer
ff3d497d15
Merge pull request #447 from corda/aslemmer-more-flow-metrics 
Measure Action execution times, utilised flow threads
 2018-04-04 09:47:53 +01:00
Matthew Nesbit
91e556c793
Merge pull request #668 from corda/mnesbit-bridgeperf-env 
Add jmeter files required for testing bridge environment.
 2018-04-04 09:21:43 +01:00