ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-12 13:45:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,082 Commits 96 Branches 407 Tags
Commit Graph

12082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
szymonsztuka
ab97ae252d
Merge pull request #883 from corda/merges/os-2017-05-29 
OS merge up to 2017-05-28
 2018-05-29 12:53:56 +01:00
Christian Sailer
6791ea800d CORDA-1524 Fix NodeSchedulerService (#3238) 
* Simplify flow scheduler

* Fix mutex and count up on the unfinished flows latch

* Fix missing import

* Some code layout shifting

* Undo automated change

* minor format changes from code review.

* Fix up tests to work with changes to scheduler

* Formatting fixes

* Remove commented out line.

* Fix race condition.

* We were not waiting for the scheduler to stop, or indeed stopping it.
 2018-05-29 12:20:30 +01:00
Rick Parker
accb9eb5b3
Remove mutex and stop catching deadlock / SQLExceptions. (#3242) 
SQL Exceptions thrown with Cash Selection are now retried via Flow Hospital
 2018-05-29 12:15:06 +01:00
szymonsztuka
99d4d92ae2
Added Liquibase migration schema file for DummyTestSchemaV1 introduced by ENT-1932 to fix integration tests in database mode. (#878) 
Added Liquibase migration schema file for DummyTestSchemaV1 for IntegrationTest - when running integration tests against remote database schema migration is on and needs the missing file, a table renamed to avoid clash with another one from a dummy schema.
 2018-05-29 12:10:11 +01:00
szymonsztuka
c6168cb4e6 Resloved merge conflicts. 2018-05-29 11:32:43 +01:00
Chris Rankin
78c759e2e6
Resolve compiler warnings for Kotlin >= 1.2.40. (#3245) 2018-05-28 18:06:33 +01:00
Maksymilian Pawlak
7d69bc664a [CORDA-1297] Columns nullability (#3112) 
JPA/Hibernate entities need to impose the correct NULL/NOT NULL constraints on the database - whatever these correct values actually are.
API change: net.corda.core.schemas.PersistentStateRef fields (index and txId) are now non-nullable. Rationale: The fields were always effectively non-nullable - values were set from non-nullable fields of other objects. The class is used in context of database table Primary Key of for other entities and a database already imposes those columns as non-nullable (even if JPA annotation nullable=false was absent).
 2018-05-25 19:03:24 +02:00
guyho
380ab22917 Update contributors (#3241) 
changed Guy Hochstetler org from IBM to R3
 2018-05-25 17:48:56 +01:00
Rick Parker
687b6080af
Merge pull request #881 from corda/parkri-os-merge-20180525-1 
OS -> ENT merge
 2018-05-25 17:26:54 +01:00
Katarzyna Streich
8504b65e7b
ENT-1933: make NetworkParameters serialization compatible (#3234) 
* ENT-1933: make NetworkParameters serialization compatible
 2018-05-25 17:14:00 +01:00
Shams Asari
d772bc8b7f
Added back support for parsing OpaqueBytes as UTF-8 strings in JacksonSupport (#3240) 2018-05-25 17:07:19 +01:00
szymonsztuka
a63e08d94c
Add example in docs for node SSH server port configuration option. (#3236) 2018-05-25 17:38:34 +02:00
rick.parker
028b4f73d9 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1 2018-05-25 15:51:26 +01:00
rick.parker
c830d50647 Enterprise changes for OS merge. 2018-05-25 15:50:44 +01:00
Rick Parker
5e14277770
Add back import. (#3237) 2018-05-25 15:47:01 +01:00
rick.parker
033a5798a1 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1 
# Conflicts:
#	.idea/compiler.xml
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/transitions/DeliverSessionMessageTransition.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	settings.gradle
 2018-05-25 14:19:15 +01:00
Rick Parker
59fdb3df67
CORDA-1475 CORDA-1465 Allow flows to retry from last checkpoint (#3204) 2018-05-25 13:26:00 +01:00
Katelyn Baker
7cbc316b9d
CORDA-1521 - Fix rpc attachment smoke test / better AMQP logging (#3213) 
* CORDA-1521 - Fix rpc attachment smoke test / better AMQP logging

* Remove poor debug message

* Review comments

* reduce debug spam
 2018-05-25 13:00:04 +01:00
Katelyn Baker
a3d88f752d
CORDA-1510 - Allow Doorman and NetworkMap to be configured independently (#3220) 
* CORDA-1510 - Allow Doorman and NetworkMap to be configured independently

Currently only one compatabilityZoneURL can be specified, however the
two services can be run on as separate servers. Allow nodes to be
configured in this manner

* Partial review comments

* Review comments

* review comments
 2018-05-25 11:37:20 +01:00
bpaunescu
d13cca49ec
ENT-1959: add a default value for mutualExclusionConfiguration.machineName (#877) 
* ENT-1959: add a default value for mutualExclusionConfiguration.machineName

* ENT-1959: update docs

* ENT-1959: update docs, remove machineName from default conf, add unit test
 2018-05-25 11:13:53 +01:00
Katelyn Baker
ee0d580448
CORDA-1530 - Generics break default evolver (#3232) 
* CORDA-1530 - Generics break default  evolver

When selecting an annotated constructor for evolving a type make sure
we treat generics in the same manner we did when serialized. Effectively
throw away the template information and treat lists as lists and maps
as maps
 2018-05-24 18:30:45 +01:00
Shams Asari
4e0378de9c
CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport (#3224) 
The existing output format was not complete and so was deleted to avoid it becoming a tech debt. We can always resurrect it at a later point.
 2018-05-24 18:26:55 +01:00
Patrick Kuo
9155000407
remove network services from corda repo (#875) 
network services is in : https://github.com/corda/network-services
 2018-05-24 18:07:23 +01:00
Thomas Schroeter
15b262f25f
Remove default value for myLegalName (#3230) 2018-05-24 17:37:43 +01:00
Matthew Nesbit
2e72f784f1
Late start bridges (unless configured otherwise) if the queue is empty. (#3227) 2018-05-24 16:54:09 +01:00
Matthew Nesbit
7ff008d4e3
Prevent bridge reconnection attempts on targets that present invalid/misconfigured/different certificates to protect nodes from dead identities. (#3225) 2018-05-24 16:53:09 +01:00
Shams Asari
77ef131c0f
Merge pull request #876 from corda/os-merge-3136e97 
O/S merge from 3136e97
 2018-05-24 16:53:03 +01:00
Michele Sollecito
6ec394b6be
[ENT-1843]: Not properly caught exception when node starts first time without migration (fix). (#879) 2018-05-24 16:29:22 +01:00
Konstantinos Chalkias
52eef5da5b
Replace timestamp with time-window (#3211) 2018-05-24 16:06:33 +01:00
Michele Sollecito
d1e147b1c1
[CORDA-1638]: Audit log of failed transactions MVP. (#3231) 2018-05-24 16:06:14 +01:00
Anthony Keenan
4adc0380a2 CORDA-1496 Add api-scanner documentation (#3184) 
Add api-scanner documentation
 2018-05-24 15:43:58 +02:00
Viktor Kolomeyko
ee094ef129
ENT-1396: Further improvements to Node HA Testing script. (#873) 
* CORDA-1506: Cherry-pick fix from Corda OS.

* ENT-1396: Add verification logic to ensure that transaction reflected on both sides.

* ENT-1396: First stub on HA re-connect logic.

* ENT-1396: Ensure we re-connect correctly.

* ENT-1396: Improve the robustness of the scenario runner.

* ENT-1396: Perform Vault query in re-tryable fashion.

* ENT-1396: Larger iterations count.

* ENT-1396: Introduce "iterationsCount" as parameter.

* ENT-1396: ReadMe document.
 2018-05-24 14:31:38 +01:00
Konstantinos Chalkias
645163e9cc
Fixing node keys bullet points (#3207) 2018-05-24 14:30:36 +01:00
Shams Asari
62f12dde11 Merge fixes, including removing dependency to Kryo in the bridge and removing the kryo serialisation scheme for the enclave. 2018-05-24 13:32:09 +01:00
Shams Asari
c40e080dcc Merge remote-tracking branch 'open/master' into os-merge-3136e97 
# Conflicts:
#	.idea/compiler.xml
#	node/src/main/kotlin/net/corda/node/serialization/kryo/CordaClassResolver.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/CordaClosureSerializer.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/DefaultKryoCustomizer.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/SerializeAsTokenSerializer.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/test/kotlin/net/corda/node/serialization/kryo/KryoStreamsTest.kt
#	node/src/test/kotlin/net/corda/node/serialization/kryo/KryoTests.kt
#	serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
 2018-05-24 13:20:16 +01:00
Michele Sollecito
61fedb5fd2
[CORDA-1528]: Node configuration not containing property "rpcSettings.address" fails with error "No configuration setting found for key 'address'" (fix). (#3229) 2018-05-24 13:20:04 +01:00
Shams Asari
3136e973a7
CORDA-1511: Kryo only used for node checkpoints and so moved out of serialization module and into node (#3228) 2018-05-24 12:18:07 +01:00
bpaunescu
e0bb00eebb
Bogdan hotcold operational guide (#855) 
* ENT-1864: added docs for hot-cold deployment with AWS and Azure

* rename docs resource image

* reworded hot-cold deployment guide, added section on mutual exclusion,
removed old high-availability guide

* ENT-1864: Addressed PR comments

* ENT-1864: Addressed PR comments

* ENT-1864: Addressed PR comments

* ENT-1864: Addressed PR comments

* ENT-1864: Addressed PR comments

* ENT-1864: Addressed PR comments
 2018-05-24 11:42:02 +01:00
Chris Rankin
76918de656
ENT-1903: Isolate the WeakHashMap reference. (#3221) 2018-05-23 20:09:57 +01:00
Joel Dudley
356b22fa44
Expands contributing page to include guidelines. (#3218) 2018-05-23 17:10:23 +01:00
Katarzyna Streich
1083e28343
ENT-1882: Don't remove own node info - fix (#3219) 
* ENT-1882: Don't remove own node info

Don't remove own node info from cache on network map update.
 2018-05-23 16:33:08 +01:00
Joel Dudley
941adb0a75
Update CONTRIBUTORS.md 2018-05-23 15:39:36 +01:00
Michele Sollecito
1137a0cc8f
[CORDA-1458]: Prevent passwords from being logged as part of node's configuration. (#3223) 2018-05-23 13:51:40 +01:00
Joel Dudley
c3de65a545
Update tutorial-attachments.rst 2018-05-23 13:44:28 +01:00
Michele Sollecito
48f89e9ff8
[CORDA-1526]: Ensure MDC is printed in logs only if not empty. (#3222) 2018-05-23 13:23:02 +01:00
Joel Dudley
9b01ef77c6
Clarifies that only stable H2 releases should be used. 2018-05-23 11:21:58 +01:00
Michele Sollecito
957424ae0f
[ENT-1720]: DB Migration: tool prints {} characters at the end of every log line unnecessarily (fix). (#874) 2018-05-23 10:30:30 +01:00
Siddhartha Sengupta
093be1b88c Using a List for the identity certs in InMemoryIdentityService and PersistentIdentityService (#3210) 2018-05-23 10:14:13 +01:00
Michele Sollecito
cafcecec2b
[CORDA-1264]: Mask internal errors if devMode is false. (#871) 2018-05-23 09:55:24 +01:00
Andrius Dagys
57fce1dd16
Docs: Add a section on what data is visible to notaries (#3159) 2018-05-23 08:59:58 +01:00