13751 Commits

Author SHA1 Message Date
Andrius Dagys
c2ff705861
Merge pull request #1496 from corda/andrius/merge-10-22
Andrius/merge 10 22
2018-10-22 18:22:01 +01:00
Matthew Nesbit
c15b693f06
Early Discussion Of 'Maximus' Scope and Provisional High Level Design (#4055)
* Move Lightning DRB to Markdown and PR.

* Wrap text in raw source
2018-10-22 17:17:41 +01:00
Andrius Dagys
29443bf7fe CORDA-535: Move MySQL & JPA notary configurations out of node 2018-10-22 16:52:04 +01:00
Chris Rankin
6c315d6adf
CORDA-2111: Upgrade to Kotlin 1.2.71. (#4083) 2018-10-22 15:53:09 +01:00
Andrius Dagys
75c9c50abe Merge branch 'open/master-ba7727a4e1' into andrius/merge-10-22 2018-10-22 15:38:28 +01:00
Viktor Kolomeyko
51e0822d59
Merge pull request #1495 from corda/vkolomeyko/os-ent-merge
OS->Ent merge
2018-10-22 15:15:02 +01:00
Tudor Malene
391c6bf66f
Feature/corda 1947/add package ownership (#4097)
* Upgrade hibernate and fix tests

CORDA-1947 Address code review changes

CORDA-1947 Address code review changes

(cherry picked from commit ab98c03d1ab15479c106b89f8b85bec185a7f9fa)

* ENT-2506 Changes signers field type

ENT-2506 Clean up some docs

ENT-2506 Fix tests and api

ENT-2506 Fix compilation error

ENT-2506 Fix compilation error

(cherry picked from commit 32f279a24372e31b07cfddac53edf805175fc971)

* CORDA-1947 added packageOwnership parameter

CORDA-1947 add signers field to DbAttachment. Add check when importing attachments

CORDA-1947 add signers field to DbAttachment. Add check when importing attachments

CORDA-1947 add tests

CORDA-1947 fix comment

CORDA-1947 Fix test

CORDA-1947 fix serialiser

CORDA-1947 fix tests

CORDA-1947 fix tests

CORDA-1947 fix serialiser

CORDA-1947 Address code review changes

CORDA-1947 Address code review changes

CORDA-1947 Revert test fixes

CORDA-1947 address code review comments

CORDA-1947 move verification logic to LedgerTransaction.verify

CORDA-1947 fix test

CORDA-1947 fix tests

CORDA-1947 fix tests

CORDA-1947 address code review comments

CORDA-1947 address code review comments

(cherry picked from commit 86bc0d9606922d48a30d395af2a21d6ce7dfc03b)

CORDA-1947 fix merge
2018-10-22 15:00:08 +01:00
Viktor Kolomeyko
23732ece4e More compilation fixes after OS merge 2018-10-22 13:19:30 +01:00
Rick Parker
929b6b0360
ENT-2647 Fix up deployment of notaries in perf cluster (#1491)
* Fix changelog file

* Fix file path to changelog

* Standardise the naming scheme for notary cordapps.

* Revert "Standardise the naming scheme for notary cordapps."

This reverts commit 7cd42f6

* Standardise the naming scheme for notary cordapps in a better way.

* Publish to artifactory
2018-10-22 13:09:21 +01:00
Viktor Kolomeyko
440c8d2da2 Compilation fixes after OS merge + quasar.jar upgrade 2018-10-22 13:07:43 +01:00
Viktor Kolomeyko
b05a985d99 OS->Ent merge 2018-10-22 12:57:37 +01:00
szymonsztuka
bc50e5f5b0
Merge pull request #1494 from corda/merges/os-merge-20181021
OS -> ENT merge 20181021
2018-10-22 12:37:19 +01:00
Viktor Kolomeyko
ba7727a4e1
ENT-2610: Resolve conflicted changes (#4102) 2018-10-22 12:24:05 +01:00
Andrius Dagys
e0d8ea8a58
CORDA-535: Move implementation specific configuration values out of n… (#4058)
The configuration objects for specific notary implementations have been replaced
by a single untyped "extraConfig" Config object that is left to the notary service
itself to parse.

* Remove the raft bootstrapping command from node, we'll need a different
mechanism for that.

* Remove pre-generated identity config value.

* Split up obtainIdentity() in AbstractNode to make it easier to read.

* A temporary workaround for the bootstrapper tool to support BFT notaries.

* Update docs

* Add upgrade notes

* Fix rebase issue

* Add a config diff for the bft notary as well
2018-10-22 10:26:10 +01:00
szymonsztuka
a0b632f964 Merge OS -> ENT: added deduplicationId to execute method in classes overriding FlowAsyncOperation 2018-10-22 09:19:28 +01:00
Viktor Kolomeyko
88f368134f
ENT-2610: Separate passwords for store and for private keys in Corda OS. (#4090)
* ENT-2610: Separate passwords for store and for private keys in Corda OS.

When it comes to KeyStores there are *2* passwords: 1 for the keyStore as a whole and separately there is one private keys within this keyStore.
Unfortunately, those 2 passwords have to be the same due to Artemis limitation, for more details please see:
`org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport.loadKeyManagerFactory`
where it is calling `KeyManagerFactory.init()` with store password.

Before change in this PR, throughout our codebase there are multiple places where we assume that storePassword is the same as keyPassword, even in the classes that have nothing to do with Artemis.
This is of course less than ideal as TLS communication may be used not only for Artemis connectivity (e.g. Bridge/Float interaction in Ent) and it is unfair to impose same passwords constraint on that communication channel.
Therefore this PR is removing this limitation and properly separating storePassword from keyPassword.

Linked Jira(https://r3-cev.atlassian.net/browse/ENT-2610) has for more background info.

Suggest to start review from `net.corda.core.crypto.X509NameConstraintsTest` to get an idea about the nature of the changes made.

* ENT-2610: Address PR input from @kchalkias

* ENT-2610: Address PR input from @kchalkias, s/privateKeyPassword/entryPassword/

* ENT-2610: Address PR input from @kchalkias, s/keyPassword/entryPassword/

In the implementation of `CertificateStoreSupplier`
2018-10-22 07:11:27 +01:00
szymonsztuka
fd19338f62 Merge OS -> ENT:
NodeStartup - added back Enterprise only serialization case for Oracle database in NodeStartup,
added deduplicationId to execute method in classes overriding FlowAsyncOperation
2018-10-21 22:05:12 +01:00
szymonsztuka
e56d84fd5d Merge OS -> ENT 2018-10-21 21:57:37 +01:00
Roger Willis
dd60ae27f2
FungibleState and design document for tokens (#4049) 2018-10-20 10:52:24 +01:00
szymonsztuka
3a8fd51a08
ENT-2608 - Fix deserialization of evolution (#4096)
Fix deserialization could mix together the object trees of two threads when passing through evolution (ENT-2608).
2018-10-19 20:30:08 +01:00
Konstantinos Chalkias
72cab90577
[CORDA-738] Ensure encumbrances are bi-directional (#4089) 2018-10-19 18:34:32 +01:00
Rick Parker
41d6a8ccd8
Merge pull request #1488 from corda/parkri-os-merge-20181018-1
OS -> ENT merge
2018-10-19 17:29:44 +01:00
Chris Rankin
e10119031c
ENT-1906: Allow DJVM code to throw and catch sandbox exceptions. (#4088)
* First phase of supporting exceptions within the DJVM.
* Suppress unwanted inspection warnings about Kotlin/Java Map.
* Add support for exception stack traces within the sandbox.
* Simple review fixes.
* Extra fixes after review.
* Add DJVM support for String.intern().
* Partially restore implementation of SandboxClassLoader.loadClass().
* More review fixes.
2018-10-19 17:23:14 +01:00
josecoll
ac939427e3
Separate out Release Notes and Changelog entries between ENT and OS (to avoid merge conflicts and provide clearer separation of content) (#1490) 2018-10-19 16:44:57 +01:00
josecoll
e62a3edcd1
Explicitly disable remote gradle build cache when building locally. (#4095) 2018-10-19 16:40:06 +01:00
Dominic Fox
73a4953ae9
CORDA-2099: Define TypeIdentifier (#4081)
* Corda-2099: Define TypeIdentifier

* Comments, naming and formatting tweaks
2018-10-19 15:53:47 +01:00
rick.parker
3dcd8bc84c Fix TODO 2018-10-19 15:27:35 +01:00
Tudor Malene
0234c1fcf8
Merge pull request #2 from corda/feature/CORDA-1947/package_ownership
CORDA-1947 added packageOwnership
2018-10-19 15:24:13 +01:00
rick.parker
eef4c5792b Compilation error fix. 2018-10-19 14:19:50 +01:00
Tudor Malene
86bc0d9606 CORDA-1947 added packageOwnership parameter
CORDA-1947 add signers field to DbAttachment. Add check when importing attachments

CORDA-1947 add signers field to DbAttachment. Add check when importing attachments

CORDA-1947 add tests

CORDA-1947 fix comment

CORDA-1947 Fix test

CORDA-1947 fix serialiser

CORDA-1947 fix tests

CORDA-1947 fix tests

CORDA-1947 fix serialiser

CORDA-1947 Address code review changes

CORDA-1947 Address code review changes

CORDA-1947 Revert test fixes

CORDA-1947 address code review comments

CORDA-1947 move verification logic to LedgerTransaction.verify

CORDA-1947 fix test

CORDA-1947 fix tests

CORDA-1947 fix tests

CORDA-1947 address code review comments

CORDA-1947 address code review comments
2018-10-19 12:12:34 +01:00
rick.parker
c16dbfd82b Compilation error fix. 2018-10-19 11:47:52 +01:00
Thomas Schroeter
f685df46b5
[ENT-1774] FlowAsyncOperation deduplication ID (#4068) 2018-10-19 11:40:59 +01:00
Andrius Dagys
e99fa975f7
CORDA-535: Allow notary implementations to specify a serialization filter (#4054)
Only allow custom serialization filters in dev mode.
2018-10-19 11:17:20 +01:00
rick.parker
3092dd64b4 Accidental change whilst trying to get tests to pass locally. 2018-10-19 11:08:30 +01:00
carolyne quinn
efeadd7e25 Update docs/source/corda-network/index.md 2018-10-19 10:57:48 +01:00
carolyne quinn
55f352c802 Update docs/source/corda-network/index.md 2018-10-19 10:48:20 +01:00
rick.parker
dcf2e7b7ea Fix up errors and revert changelog.rst 2018-10-19 10:39:40 +01:00
rick.parker
e1b86d0422 Fix up errors 2018-10-19 08:05:15 +01:00
rick.parker
b571e16d0d Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20181018-1 2018-10-19 08:02:59 +01:00
carolyne quinn
a8b32689c3 Update docs/source/corda-network/index.md
Added a comma as practice
2018-10-18 18:26:51 +01:00
jamescarlyle
8b5faa107e Initial commit 2018-10-18 18:19:14 +01:00
Katelyn Baker
7cfd44e383
CORDA-2113 - Include PNM ID in CSR (#4086)
* CORDA-2113 - Include PNM ID in CSR

If Compatibility Zone operator is using private networks and the node
should be joining one, optionally the ID (a UUID) of that network can be
included as part of the node's CSR to to the Doorman.

* fix broken test
2018-10-18 15:39:42 +01:00
Mike Hearn
8af404427f Address review comments 2018-10-18 15:13:55 +01:00
Mike Hearn
07c28c1fbf Docs: improve organisation of the networks section. 2018-10-18 15:13:55 +01:00
Andrius Dagys
4c3b9a067c CORDA-535: Make notary implementations publishable 2018-10-18 11:07:31 +01:00
Rick Parker
55731ef816
ENT-2431 Tidy up buildNamed and CacheFactory 2018-10-18 10:38:43 +01:00
Stefano Franz
fe5d0da6e8
Merge pull request #1485 from corda/stefano-merge-201810171215
Merge OS - ENT 201810171230
2018-10-17 15:28:27 +01:00
Katelyn Baker
cc75a65f92
RELEASE - Merge 3.3 upgrade / notes / changelog backto master (#4085) 2018-10-17 15:09:48 +01:00
Stefano Franz
5ca26b1345 Merge remote-tracking branch 'open/master' into stefano-merge-201810171215
# Conflicts:
#	docs/source/node-database.rst
2018-10-17 13:49:00 +01:00
Stefano Franz
456c9a85e1
remove requirement to override default progress tracker for interacti… (#3985)
* remove requirement to override default progress tracker for interactive shell - this is no longer needed

* fix failing tests
2018-10-17 11:27:14 +01:00