Commit Graph

1361 Commits

Author SHA1 Message Date
Andras Slemmer
25263c20c7 Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb 2018-02-20 15:52:09 +00:00
Andras Slemmer
d28c781597 Missing diff from merge 2018-02-20 13:54:11 +00:00
Andras Slemmer
38d0ad30df Merge commit 'da591363fdccd220455a92f083d2ad59ed0e2d12' into aslemmer-merge-19-Feb 2018-02-20 13:52:03 +00:00
Andras Slemmer
6b2b7b6a3c Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb 2018-02-20 13:26:31 +00:00
Andras Slemmer
1d7b0fc499 Merge commit '86fb1ed852c69121f989c9eeea92cfb4c27f9d13' into aslemmer-merge-19-Feb 2018-02-19 16:14:43 +00:00
Joel Dudley
65681e8e9d
plugins folder renamed to cordapps 2018-02-19 14:22:20 +00:00
Shams Asari
71c94f8a9d
Reversing the introduction of GlobalProperties (by CORDA-961), and added NetworkParameters to ServicesForResolution instead. (#2563)
Also, replaced the maxTransactionSize parameter of the driver and MockNetwork with NetworkParameters.
2018-02-19 12:23:59 +00:00
Konstantinos Chalkias
fe7c129ae7
CORDA-1038 Update verifySignaturesExcept in api-transactions.rst (#2546) 2018-02-16 12:32:53 +00:00
Katelyn Baker
307e2988c9
DOCS: update AMQP serialization (#2543)
* DOCS: update AMQP serialization

* Update serialization.rst
2018-02-16 12:14:31 +00:00
Anthony Keenan
c2485858f5
CORDA-1011 Add powershell script to update testing package imports (#2528)
* Add powershell script to update testing package imports

* Make sure script works with java files

* Address review comments
2018-02-16 10:22:41 +00:00
igor nitto
ed0cf91946
Start Jolokia agents if configured without modifying JVM options [CORDA-1042] (#2541)
* Jolokia agents are loaded dynamically if configured
* Renamed exportJmxTo (never used) to jmxMonitoringHttpPort and take it from config
* Updated documentation and tests
2018-02-15 17:10:07 +00:00
Shams Asari
2864ce1384
ENT-1519: Ensure NodeInfo always has at least one address by checking in the c'tor (#2538)
Further, the look up of the node's own node-info from its database has been tightened to ensure there isn't more than one.

Also fixed some brittle code which was assuming exactly one address rather than at least one.
2018-02-15 14:06:41 +00:00
Clinton
eeb96535ee
Re-added missing changelog entries 2018-02-14 17:04:08 +00:00
Anthony Keenan
3e8d76334e
CORDA-939 Modify Api Scanner to check api for internal exposures (#2510)
* Update check api changes to look for internals

* Update several more uses of internal

* Make check-api-changes script filter out internal class usages

* Make CordaClock part of API

* Update api-current.txt

* Remove exclusion of nodeapi.internal

* Remove access to CordaPersistence from public api

* Don't expose DB Connection from StartedMockNode and remove unnecessary transaction from CustomVaultQueryTest

* Make internal tests that use need db access use InternalMockNetwork

* Make test certificates internal

* Address further review comments

* Revert some accidental changes to api-current.txt

* Address Shams' review comments

* Update Api Scanner to filter out CordaInternal attribute

* Update api-current.txt

* Remove superfluous brackets

* Add transaction to StartedMockNode

* More leaky transaction fixes
2018-02-14 16:42:56 +00:00
Clinton
174ed3c64b
CORDA-556: Added Cordapp Config and a sample (#2469)
* Added per-cordapp configuration 
* Added new API for Cordformation cordapp declarations to support per-cordapp configuration
* Added a cordapp configuration sample
2018-02-14 14:49:59 +00:00
Maksymilian Pawlak
b91dd43a83
Test driver default parameters removal (#2519)
* Removed long parameter list in test driver, replaced with DriverParameters object
2018-02-13 13:15:05 +00:00
CaisR3
949d4fd7fb Fixing a small mistake added/uploaded, only one required. 2018-02-13 10:24:06 +00:00
Joel Dudley
ad1be79900
Reorders params to put non-default args first. Creates simpler default constructors. 2018-02-12 17:02:34 +00:00
Michele Sollecito
da591363fd
CORDA-990: Flows Draining Mode (#2483)
[CORDA-990]: Flows draining mode.
2018-02-12 16:13:43 +00:00
Anthony Keenan
1487c411b4
CORDA-716 - Update changelog for test package changes and provide upgrade script (#2434)
* Update changelog for test package changes and provide upgrade script

* Upgrade kotlin and java scripts
2018-02-12 15:53:29 +00:00
Joel Dudley
3f3e0e9973
Allows the webserver JAR used by each node in deployNodes to be configured. 2018-02-12 14:00:25 +00:00
Joel Dudley
ad7b84b5a8
Removes IdentityServiceInternal as a public parameter to MockServices. 2018-02-12 13:30:47 +00:00
Anthony Keenan
7b65b7971a
CORDA-939 - Don't expose StartedNode and AbstractNode as part of public test api (#2472)
* Don't expose StartedNode via Node Driver

* Dont expose StartedNode/Abstract Node via MockNetwork

* Remove internal var from constructor as it doesn't hide from public api and change to internal initialisation method

* Update api

* Rename MockNode to StartedMockNode to avoid confusion
Update documentation
Update api-current.txt

* Fix typo

* Fix test failure

* Modify flow tests to use internal mock network and remove additional internal exposures from StartedMockNode

* Fix api-current

* Change InProcess and OutOfProcess to interfaces

* Explicitly declare MockNetwork parameters
Dont expose StateMachineManager
Move affected tests to use internal mock network

* Fix api-current

* Changes requested via review

* Fix IRS Demo address

* Fix api

* Remove internal attribute from classes in internal package

* Remove accidentally added code

* Move useHttps into NodeHandleInternal

* Remove duplicated code

* Update api-current

* Make webAddress internal on NodeHandle

* Make sure parameters in public api are explicitly specified

* Use correct address in IRS Demo

* Get webaddress from webserver handle

* Update api-current
2018-02-12 10:09:59 +00:00
Katelyn Baker
3c4212a3d6
CORDA-992 - Make the finger printer pluggable for serialization factory (#2479)
Facilitates easier testing
2018-02-12 10:07:25 +00:00
Andras Slemmer
d072f6c275
Merge pull request #2490 from corda/aslemmer-r3corda-compatibility
CORDA-995: r3corda wire compatibility
2018-02-09 17:12:18 +00:00
Andras Slemmer
0a88b76e46 r3corda wire compatibility 2018-02-09 14:50:20 +00:00
Patrick Kuo
c8cf46c657
CORDA-961 Wire up and enforce max transaction size (#2465)
* wire up and enforce max transaction size

* fixup after rebase
moved network parameter from AbstractNode to NodeProperties

* removed TODO

* fix broken import

* address PR issues

* remove API breaking change
address PR issue

* added max transaction size to driver and mock network.
address PR issues

* fix failing test

* added TODO

* fix verifier test

* fix spring driver build error
2018-02-09 14:48:45 +00:00
Michal Kit
e6e2836119
Implementing dual execution mode of the HSM signing service (#380)
* Implementing dual execution mode for the hsm signing service

* mend

* Addressing review comments

* Extracting processor classes
2018-02-08 16:54:07 +00:00
Joel Dudley
2986e2f5a9
Provides more information about the default initiating subflows. Minor tweaks. 2018-02-08 16:50:28 +00:00
Anthony Keenan
4a68145f23
CORDA-939 Adding documentation changes requested from v3 release branch PR (#2480)
* Adding documentation changes requested from v3 release branch PR

* Further doc changes as requested
2018-02-08 14:38:15 +00:00
Katarzyna Streich
6acff3a7df
First approach to network parameters updates (#2412)
* Network parameters updates

Add two RPC methods networkParametersFeed and
acceptNewNetworkParameters. Implementation of client handling of network
parameters update event. Partial implementation of accepting new
parameters and installing them on the node as well as node startup with
updated parameters.

Move reading of network parameters on startup to separate
NetworkParametersReader class. Add tests.

Move NetworkParameters and NotaryInfo classes to core.

* Ignore evolvability test - to be fixed later

* Add documentation on update process
2018-02-08 14:31:43 +00:00
Michal Kit
8c5f0ac0ca
Making BasicConstraints a critical extension (#420)
Path length will be decided in another ticket - https://r3-cev.atlassian.net/browse/ENT-1508
2018-02-08 14:30:20 +00:00
Michal Kit
453029e548 Mkit ent 1133 certificate hierarchy (#131)
* Introducing new certificate hierarchy

* Updated Option 3 - CRL URL inclusion in a correct certificate. Typos fixing.

* Adding Option 4 being the latest iteration after internal discussions and research

* Addressing review comments - round 2

* Move design options into the design document

* Start considering a third option

* Address typos

* Clarify why the hierarchy is important to CRL

* Rework decision to match Mike's suggestions

* Move options back into decision.md

* Refactored documentation in line with design doc standards (#212)
2018-02-07 12:59:07 +00:00
Anthony Keenan
8081ee42ad
CORDA-939 - Dont expose FlowStateMachine via public API (#2438)
* Create CordaInternal attribute for properties on public classes that are not part of the api and apply to FlowLogic.stateMachine

* Remove startFlow from public test api and replace with startFlowAndReturnFuture

* Update api-current with changed signature

* Change test used in documentation to use public test methods

* Remove the rest of the unneccessary usages of the startFlow test utility

* Remove extra whitespace

* Rename startFlowAndReturnFuture back to startFlow

* Update api

* The annotation doesn't appear unless its marked as on the actual getter and setter

* Updated docs and removed pointless attribute

* Deleted whitespace
2018-02-07 11:55:06 +00:00
Michal Kit
3baa15960f
Switching to reading the root certificate from the truststore (#449)
* Switching to reading the root certificate from the truststore

* Addressing review comments
2018-02-05 12:39:57 +00:00
bpaunescu
b092b6b547 Bogdan hot warm doc 2018-02-05 10:14:42 +00:00
Joel Dudley
2a3c4eb3cd
Documents test frameworks in quickstart guide for visibility. Small tweaks. 2018-02-02 17:26:54 +00:00
Joel Dudley
4ac2c59623
Adds links to referenced code files. 2018-02-01 18:34:44 +00:00
Andras Slemmer
92cf91c0b0
Merge pull request #159 from corda/aslemmer-multi-threaded-sm
Multi-threaded SMM
2018-02-01 14:24:17 +00:00
Patrick Kuo
dca8699e7c
set network registration poll interval via http cache control header (#434)
* set network registration poll interval via http cache control header from the server side

* default poll interval to 10 seconds if cache header not found

* address PR issues

* address PR issues
2018-02-01 13:38:25 +00:00
Michal Kit
641cecaf70
Mkit cp ent 1458 fixing hardcoded sign interval (#437)
* Fixing hardcoded sign interval config

* Addressing review comments
2018-02-01 07:37:26 +00:00
Andras Slemmer
b71f0c49fb Multi threaded state machine 2018-01-31 18:13:25 +00:00
Patrick Kuo
941429d3a7
Remove word restriction in corda x500 name (#2439)
* Remove word restriction in x500 name https://github.com/corda/corda/issues/2326

* remove unused const

* address PR issue

* address PR issue

* address PR issue
2018-01-31 17:05:52 +00:00
Matthew Nesbit
7f58afc7ca Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180131 2018-01-31 10:37:44 +00:00
Joel Dudley
2d557d04b4
Minor rewrites. Better documentation of granting RPC permissions to RPC users. 2018-01-30 16:06:20 +00:00
Patrick Kuo
1c77736d50 merge os to enterprise 2018-01-30 14:00:22 +00:00
Mike Hearn
d6f9721cb8
Docs: move serialisation into the CorDapp section. Fix some markup issues (#2429)
* Docs: move serialisation into the CorDapp section. Fix some markup issues.

* Address review comments
2018-01-30 10:59:03 +01:00
szymonsztuka
1ecf646f7e
Oracle 11xe and 12c database compatibility (#206)
* Sql setup scripts for Oracle and datasource configuration.
* CashSelection for Oracle.
* Workaround of forbidden distinct for BLOBs.
* ojdbc8.jar driver dependency from Oracle Maven repository, ojdbc6.jar from lib (it's not in Maven repo).
* allow to use random Port in node names and trim it from schema name, remove schema with port numbers from db setup (to cater for new test, non Oracle specific change) 
* Removed unnecessary code from ConfigUtilities (non Oracle specific change) 
* Removed db integration tests setup for RPCStabilityTest as it doesn't start any nodes
2018-01-29 18:35:58 +00:00
Joel Dudley
4851d9ca6a
Documents rationale for using cordapp, cordaRuntime and cordaCompile Gradle configs. 2018-01-29 12:42:31 +00:00
Viktor Kolomeyko
3d32760dcc ENT-1331: Updating High Level design following discussion with Mike, Jose and David H 2018-01-29 12:06:47 +00:00