2221 Commits

Author SHA1 Message Date
josecoll
356941a733 Merge commit '015a36dad67998236eda7e45309e66e5d58b6374' 2018-11-06 16:29:24 +00:00
Christian Sailer
4d335843b2 Remove blank line and formatting 2018-11-06 11:27:18 +00:00
Christian Sailer
bbb26bc6ba Merge commit '3260d9f2c419463fb68178ce70633dd34079bd1e' into christians/merge_3260d9f 2018-11-06 11:20:55 +00:00
josecoll
015a36dad6
CORDA 2131 - Extend Network Bootstrapper to enable registration of Java Package Namespaces. (#4116)
* Package Ownership Network Parameters: add register / unregister CLI options to network bootstrapper.

* Fix 2 failing unit tests.

* Fix failing unit tests.

* Added changelog, documentation and cosmetic changes.

* Fixed exception message.

* Address PR review feedback.

* Fix typo.

* Resolve conflicts.

* Rebase, resolve conflicts and remove PackageOwner class.

* Address latest PR review feedback.

* Fix incorrect imports.

* Fix broken JUnit

* Add support for key store passwords including delimiter characters.

* Updated and improved documentation.

* Minor doc update.

* Documentation changes following PR review feedback

* Replace Bank Of Corda with Example CorDapp.
Remove references to locally built network bootstrapper.
2018-11-06 09:28:55 +00:00
Anthony Keenan
e52f4bc2a7
Fixed a missing file error when building docs (#4167) 2018-11-06 09:12:13 +00:00
James Brown
035c84ce2a
CORDA-2169 Update requests dependency to latest/secure version (#4138)
Requests library in docs/requirements is vulnerable. Bump to latest version (2.20.0)
2018-11-06 08:58:22 +00:00
Joel Dudley
8b2ab41057
Updated network docs (#4154)
* Renaming and reordering to help users navigate the Networks section.

* Split of pages between bootstrapped, existing and dynamic compatibility zones. Reintegrates Mike H content about creating a dynamic zone.

* Address review feedback except BNO point.

* Documents BNO app.

* Better docs of networkServices config option. Better comments of NetworkParameters fields.

* Documents additional network map protocol endpoint.

* Address review feedback.

* Addresses Kostas review feedback.

* Update protocol due to bug.

* Addresses Kostas's review feedback.

* Addresses Kostas's review feedback.
2018-11-05 15:51:42 +00:00
Anthony Keenan
b07cd38186
ENT-2534: Seperate database manager into commands (#1527)
* Seperate database manager into commands

* Documentation update

* Slightly better naming

* Address review comments

* Review comments

* Address review comments
2018-11-05 14:32:51 +00:00
Joel Dudley
9fcf15e825
Fixes headers to correctly render in side-bar. (#4165) 2018-11-05 14:11:40 +00:00
Roger Willis
80591bc6fd
StatePointer (#4074)
* Introducing linear pointer.

* Added design document.
Added StatePointer interface.
Updated design document.
Updated StatePointer implementation.
Added doc section for state pointer.

* Updated design document.
Added API for StatePointer.

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update docs/source/design/linear-pointer/design.md

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update docs/source/design/linear-pointer/design.md

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Resolve pointers
Added test to check pointers are resolved.
Updated docs and kdocs.
Reverted changes to api-current.txt
Revert "Reverted changes to api-current.txt"
This reverts commit dc1cece91a595a4e772f63917b830c7e1fd0586d.
Fix CI bug.
Made StatePointers type safe.
Resolving StatePointers is now optionally recursive
Addressed review comments.

Fixed compile error.

Addressed review comments.

Fixed bug in state pointer search.
Improved efficiency of state pointer search.

Removed whitespace.

TxBuilder logs warning when no service hub is supplied for resolving pointers as opposed to throwing an exception.

* Addressed review comments.
2018-11-05 10:33:26 +00:00
Christian Sailer
3260d9f2c4
CORDA-1489 Exposure of node internals in mock network (#4130)
* Introduce public subset of config to tweak config via mock net work without exposing internal node config.

* Removal of functions exposing (internal) NodeConfiguration from the public test API

* Code review fixes

* Blank lines removed

* Documented mock network API change in upgrade notes.

* Updated documentation and API doc.

* More documentation/API doc
2018-11-05 09:29:05 +00:00
Viktor Kolomeyko
513305ee7d
ENT-2669: SocksProxy rename into Proxy (#1533)
* ENT-2669: Rename SocksProxyVersion into ProxyVersion

* ENT-2669: Rename SocksProxyConfig into ProxyConfig

Update documentation and make code changes such that old style configs are still parsed.

* ENT-2669: Changelog update
2018-11-02 16:07:41 +00:00
tudor.malene@gmail.com
d97d64d954 Merge remote-tracking branch 'open/master' into tudor-os-merge-1-11
# Conflicts:
#	core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
#	core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
#	docs/source/index.rst
#	node/src/integration-test/kotlin/net/corda/node/flows/FlowOverrideTests.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
2018-11-01 16:58:28 +00:00
Cais Manai
b0771d6f2b Fixing a single typo (#4152)
changing "areshared" to "are shared"
2018-11-01 16:53:47 +00:00
Joel Dudley
b444701d7e
Formatting issue (#4150) 2018-11-01 16:47:50 +00:00
Joel Dudley
722fa31fb6
Documents waitForLedgerCommit. Clean-up. (#4144) 2018-11-01 15:23:47 +00:00
James Carlyle
88782f7544
Merge pull request #4143 from corda/james-corda-network-1
James corda network 1
2018-10-31 21:17:53 +00:00
jamescarlyle
2cdcbc8ead Updated with governance-guidelines and minor edits to other governance documents. 2018-10-31 19:58:21 +00:00
szymonsztuka
353c96375d Merge remote-tracking branch 'remotes/open/master' into merges/os-mere-2018-10-31
# Conflicts:
#	README.md
#	docs/source/api-persistence.rst
#	docs/source/node-database.rst
2018-10-31 18:08:59 +00:00
szymonsztuka
7cb9e174a9
Documentation for CORDA-1915 Build system for jarsigner (#4006)
Documenting new cordapp and conformation plugins capabilities to sign CorDapp JAR, enabled by corda-gradle-plugins releases 4.0.32 and 4.0.33.
2018-10-31 16:20:11 +00:00
szymonsztuka
437a053037
Minor docs update - Persistence API and node database (#4061)
Note about database considerations regarding Cordapp compatibility between OS and ENT.
Remove database configuration "schema" as this is not implemented in OS, it was already mentioned as ignored for SQL server.
2018-10-31 14:39:22 +00:00
James Carlyle
62399d04c7 Removed personal tone ('we'/'R3') from docs, in keeping with rest of documentation. 2018-10-31 09:17:21 +00:00
James Carlyle
3a20e3f208 Updated with governance-guidelines and minor edits to other governance documents. 2018-10-30 19:27:40 +00:00
Joel Dudley
7eca7515d6
Clarifies that only one serialisation mechanism is required. Clarifies dependencies required for Client RPC. (#4135)
* Makes it clear that only one serialisation mechanism is required. Clarifies dependencies required for Client RPC.

* Addresses review feedback.
2018-10-30 18:06:01 +00:00
szymonsztuka
518577b479
ENT-2580 Database docs improvements - permission for Oracle, remove tables no longer in use (#1474)
Database documentation updates:
Unused tables or ones related to network-services were removed from scripts in docs.
Added quota/tablespace when creating users in Oracle - as reported in https://r3-cev.atlassian.net/browse/ENT-2580 UNLIMITED is not required.
List all tables for granting permissions when setting read only user in Oracle and fix typo
Fix typo for SQL Server.
Improve example of vendor specific DDL requirements.
2018-10-30 16:34:51 +00:00
Michele Sollecito
149ce925bb
Merge pull request #1515 from roastario/add_notes_about_openjdk
ENT-2656 add explicit warnings about openJDK being unsupported
2018-10-30 15:57:34 +00:00
Stefano Franz
4bfdcd5ae1 add explicit warnings about openJDK being unsupported 2018-10-30 15:03:01 +00:00
szymonsztuka
fcd822f176 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-2018-10-30
# Conflicts:
#	docs/source/corda-configuration-file.rst
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-10-30 14:10:01 +00:00
szymonsztuka
1de56550b0
Optionally allow the node in production mode to accept Cordapps signed by dev Key (CORDA-1915) (#4133)
By default Cordaps build by corda-gradle-plugins are signed by Corda development key.
In dev mode any key can be used to sign Cordapp JAR .
In production node Corda dev keys were forbidden. This code change allows to opt-out by setting node option cordappSignerKeyFingerprintBlacklist=[] or specify more public keys to blacklist.
The option is used in production only mode.
2018-10-30 13:53:01 +00:00
Christian Sailer
1a9e7ab1ef
ENT-2578 Initial documentation for performance test suite (#1489)
* Initial introduction for performance test documentation

* Describing tests

* Some more doc structure

* Correct protocoll (rmi) for remote jMeter

* Remote connection/ssh tunneling

* Corda wrapper and arguments

* jMeter GUI

* rmi -> RMI

* headless jmeter

* Sampler descriptions

* SamplerClient interface and CashPaySampler

* Testplans

* Minor changes/typos

* Installation page and moved to development for now.

* Some clarifications

* fixes

* reproducing r3 perf runs

* Add todos/tickets for missing bits in the documentation.

* Information on reproducing the test cluster

* Edit TODOs

* Small fix to server installation

* Spelling of JMeter

* Small Typos

* More minor review fixes

* More minor review fixes

* Capitalisation

* CorDapp spelling

* Review fixes

* typo

* Remove blank lines

* typo

* Describe r3 test set-up

* Performance network topology

* Describe included test plans

* Some lines on creating testplans

* Fix spelling of command line flags

* Minor review fixes

* typo

* Clarify server set-up

* typo
2018-10-30 09:14:05 +00:00
jamescarlyle
83d6cb8e09 Initial commit 2018-10-29 13:51:10 +00:00
Michele Sollecito
db36709eab Merge remote-tracking branch 'remotes/open/master' into merges/29_10_2018_13_40
# Conflicts:
#	.idea/compiler.xml
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
2018-10-29 13:45:47 +00:00
Michele Sollecito
6022cecca5
[CORDA-1763]: Add node CLI option for validating configuration. (#4121) 2018-10-29 13:33:43 +00:00
Anthony Keenan
2ef1f1c7c4
Merge pull request #1505 from corda/anthony-os-merge-2018-10-24
O/S Merge 24/10/2018
2018-10-28 21:43:52 +00:00
Anthony Keenan
06fcf24f87 Update enterprise testnet instructions 2018-10-26 13:46:03 +01:00
carolyne quinn
121a39f95b new section added 2018-10-26 13:21:16 +01:00
carolyne quinn
a34e62b27a Update docs/source/corda-network/index.md 2018-10-25 18:13:45 +01:00
Viktor Kolomeyko
63f80d1fb5
ENT-2636: Introduce healthCheckPhrase which can be used for TCP Echo check (#1504)
* ENT-2636: Introduce ModeSelectingChannel

Next step: Add an integration test.

* ENT-2636: Explicitly retain/release ByteBuf

* ENT-2636: Use ByteBuf API and stop using `java.nio.ByteBuffer`

* ENT-2636: Add new optional FirewallConfiguration parameter

* ENT-2636: Simplify implementation of ModeSelectingChannel

* ENT-2610: Create integration test to check response on TCP call and fixes to ModeSelectingChannel

* ENT-2610: Extend integration test fixes to ModeSelectingChannel

Doesn't currently work well for longer messages.

* ENT-2610: Extend integration test fixes to ModeSelectingChannel

Doesn't currently work well for longer messages.

* ENT-2610: Fixes to ModeSelectingChannel so it works well for longer messages.

* ENT-2610: Reflect `healthCheckPhrase` from `FirewallConfiguration` onto `AMQPConfiguration`

* ENT-2610: Incorporate review comments by @mnesbit

* ENT-2636: Extend the test to drip feed bytes one-by-one.

Also remove TRACE level packet logging for speed and log space reduction.

Logging-wise the following printed into the log every time TCP echo performed:
```
[INFO] 11:03:16,016 [nioEventLoopGroup-5-1] logging.LoggingHandler.info - [id: 0x202c2137, L:/0:0:0:0:0:0:0:0:10001] READ: [id: 0x073fda76, L:/10.18.1.203:10001 - R:/10.18.1.203:59274]
[INFO] 11:03:16,016 [nioEventLoopGroup-5-1] logging.LoggingHandler.info - [id: 0x202c2137, L:/0:0:0:0:0:0:0:0:10001] READ COMPLETE
[INFO] 11:03:16,018 [nioEventLoopGroup-6-4] netty.AMQPChannelHandler.invoke - New client connection 073fda76 from /10.18.1.203:59274 to /10.18.1.203:10001 {allowedRemoteLegalNames=null, localCert=null, remoteAddress=/10.18.1.203:59274, remoteCert=null, serverMode=true}
```
2018-10-25 12:33:30 +01:00
Anthony Keenan
35a2ee2c8f Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24 2018-10-25 11:31:15 +01:00
Anthony Keenan
08f32a9329 Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24
# Conflicts:
#	build.gradle
#	core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	docs/source/cli-ux-guidelines.rst
#	docs/source/testnet-explorer-corda.rst
#	finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
#	finance/src/main/kotlin/net/corda/finance/flows/CashConfigDataFlow.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
#	node/src/main/kotlin/net/corda/node/Corda.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-10-25 11:30:52 +01:00
carolyne quinn
d2dc0eefda Update docs/source/corda-network/index.md 2018-10-25 11:00:38 +01:00
Anthony Keenan
fb745f468e
Remove bootstrap-raft-cluster from node documentation (#4111) 2018-10-25 08:40:24 +01:00
Anthony Keenan
abfe538e6e
ENT-2611: Standardise CLI for corda firewall (#1503)
* Update firewall to use picocli

* Update documentation

* Remove joptsimple dependency

* Fix broken tests

* Grammar fix
2018-10-25 08:37:20 +01:00
Tudor Malene
9edc15d018
Merge pull request #1499 from corda/tudor_os_merge_23_10
Tudor os merge 23 10
2018-10-24 16:28:26 +01:00
Anthony Keenan
0ab644783e CORDA-1838: Add subcommands to node (#4091)
* Tidy up

* Add install-shell-extensions command

* Make cli tests use same version of picocli as everything else

* Remove initLogging from NodeStartup, it is ran earlier by CordaCLIWrapper

* Use picocli snapshot for testing

* Use RunLast() parser to invoke correct subcommands

* Deprecate old clear-network-map-cache parameter

* Restructure NodeStartup for commands

* Get rid of -c option since the flag method has been deprecated and that didn't exist in last release

* Update documentation

* Update backwards compatibility test

* Get all subcommands working

* Refactor sub commands into seperate classes

* Update docs and fix some tests

* Docs changes

* Fix merge conflicts with master

* Fix renamed parameters

* Fix test failure

* Fix compatibility tests

* Add missing compatibility test for blob inspector

* Remove blob inspector compatibility test as there are import conflicts

* Assorted doc fixes

* Addressing review comments

* More review comments

* Couple more bits

* Fix broken tests

* Fix compilation error

* More merge conflicts

* Make startup logging function a bit more sensible

* Fix broken shell extensions

* Make shell extensions work with subcommands

* Make sure parameters for deprecated options are carried through

* More review comments

* Adding some s's

* One last go

* Fix compilation error on Windows

* Revert logging changes

* Revert docs back to their original imperatively moody state
2018-10-24 13:58:19 +01:00
Stefano Franz
0919b01271
ENT-2509 - Make @InitiatedBy flows overridable via node config (#3960)
* first attempt at a flowManager

fix test breakages

add testing around registering subclasses

make flowManager a param of MockNode

extract interface
rename methods

more work around overriding flows

more test fixes

add sample project showing how to use flowOverrides

rebase

* make smallest possible changes to AttachmentSerializationTest and ReceiveAllFlowTests

* add some comments about how flow manager weights flows

* address review comments
add documentation

* address more review comments
2018-10-23 16:45:07 +01:00
Viktor Kolomeyko
19b4e68903
ENT-2610: Separate passwords for store and for private keys (#1483)
* ENT-2610: Documentation update to include optional `keyStorePrivateKeyPassword`.

* ENT-2610: Documentation update to include optional `keyStorePrivateKeyPassword`.

* ENT-2610: Disruptive change to `CertificateStore` (will cause compilation failures)

* ENT-2610: Address compilation failures caused by separation of `storePassword` and `keyPassword` e.g. in `X509KeyStore`

* ENT-2610: Docs update to flag that passwords have to be the same due to Artemis limitations.

* ENT-2610: Make changes to `bridge` module.

Make private key password optional in `BridgeSSLConfigurationImpl` and extend `ConfigTest`.
Also improve exception reporting when necessary option is missing.

* ENT-2610: Fixes to `bridge` integration tests.

* ENT-2610: Whenever it comes to Dev node certificates ensure that private key password is the same as store password
or else Artemis is not going to accept that, see comment in DevIdentityGenerator.

* ENT-2610: More unit test fixes

* ENT-2610: More integration tests fixes

* ENT-2610: Fix netty code to use `privateKeyPassword` where necessary

* ENT-2610: Remove the use of `keyPassword` for `trustStore`

* ENT-2610: Compilation fixes after merge from `master`

* ENT-2610: Add an integration test which proves that diff. passwords work
2018-10-23 16:05:08 +01:00
tudor.malene@gmail.com
3233d1d91f Merge branch 'master_partial' into tudor_os_merge_23_10
# Conflicts:
#	core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	core/src/test/kotlin/net/corda/core/contracts/PackageOwnershipVerificationTests.kt
#	core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TestDSL.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
2018-10-23 10:36:06 +01:00
tudor.malene@gmail.com
7b86c2c3a3 Merge remote-tracking branch 'private/master' into tudor_os_merge_23_10
# Conflicts:
#	core/src/main/kotlin/net/corda/core/contracts/BelongsToContract.kt
#	core/src/main/kotlin/net/corda/core/contracts/TransactionState.kt
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
#	core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
2018-10-23 10:29:43 +01:00
Lamar Thomas
268b544b4b fixed order of repudiation and information disclos 2018-10-22 22:17:23 +02:00