13291 Commits

Author SHA1 Message Date
Ivan Schasny
d0ecab0781 Added more descriptive error message for the cases when a transaction context is missing from the flow state machine 2018-08-20 08:31:35 +01:00
Christian Sailer
9a3b1629a2
ENT-2414 Cache trace capture (#1337)
* Naive implementation of a trace capturing wrapper.

* Thread-safe cache tracing wrapper using a queue

* Use sipHash to get a long representing secure hash

* Code review rework

* Add copyright headers

* Move config back to enterprise config and remove trace name from CacheTracingConfig so it can be injected when the cache is created.
Add defaults to reference.conf
Add code and test to create directories when required.

* Remove empty line

* Sort out writer thread

* Blank line

* Revert: Code review rework (892911a)
2018-08-17 17:28:28 +01:00
Chris Rankin
494661cc0c
CORDA-1905: Extend JSON deserialisation to handle Amount<T> for any T. (#3790)
* Extend JSON deserialisation to handle Amount<T> for any T.
* Rewrite message for @Deprecated.
2018-08-17 17:20:26 +01:00
Joel Dudley
4634283665
Azure OS testnet instructions - minor changes (#3777)
* Formatting.

* Further formatting.

* Updates Azure instructions for OS testnet nodes.
2018-08-17 16:59:52 +01:00
Joel Dudley
5d39f2bb46
Better docs of CorDapp structure and node interaction (#3761)
* Clean-up. Instructions on how template would be modified for production.

* Change page titles to make it clearer make they contain.

* Simple example of how to connect to node via RPC. Explanation of how to interact with node via RPC.

* Bigger warning about deprecated webserver. Makes it clear that CordaRPCClient is THE way to interact with a node.

* Review from Clinton.

* Separating template info from general info.
2018-08-17 16:52:56 +01:00
Mike Hearn
e8a1564429 Add a design doc for signature constraints. 2018-08-17 16:09:46 +02:00
Chris Rankin
911aa1381b
CORDA-1906: Add Servlet 3.1 implementation into the WebServer. (#3794) 2018-08-17 14:08:48 +01:00
Thomas Schroeter
047489ba7e
Allow base dir and config file (#1331) 2018-08-17 13:55:41 +01:00
Roger Willis
b7867c3bcb
* Added "isRelevant" functionality to the vault. (#3789)
* * Added "isRelevant" functionality to the vault.

* * Changed "isRelevant" to "isParticipant" as this makes more sense in the context of Corda.
* Minor tweak to "isParticipant" method in NodeVaultService.
* Fixed API break and broken JAva tests.

* * Addressed PR comments from Jose.
* Changed all mentions of "relevant" and "participant" to "modifiable".
* Made the default behaviour of vault queries to return ALL states instead of just MODIFIABLE states as this is what always previously happened.
* Updated cash balance queries to only return MODIFIABLE states.

* * Updated cash selection and tryLockFungfibleStatesForSpending.
2018-08-17 13:39:05 +01:00
Joel Dudley
f3392e31d2
Documents waitQuiescent. Explains why it is important. (#3787)
* Update api-testing.rst

* Warning regarding using threadPerNode

* Corrects JavaDocs. Adds message to .
2018-08-16 17:34:50 +01:00
Stefano Franz
fffa063803
Cli backwards compatibility testing (#3733)
* first pass at infrastructure around cli compatibility

* add example unit test

* inspect enum types

* add a basic unit test to verify behaviour of the cli checker

* revert root build.gradle
2018-08-16 15:44:40 +01:00
PokeyBot
f2dbc3e662
Merge pull request #1325 from corda/DW-local
Minor fix to HA doc, add blank lines so code blocks render properly
2018-08-16 15:29:48 +01:00
Joel Dudley
9c9e8dab40
Fixes formatting. (#3793) 2018-08-16 10:01:26 +01:00
Michele Sollecito
e5e4596461
[CORDA-1681]: It is not possible to run stateMachinesSnapshot from the shell (fixed). (#3791) 2018-08-15 17:02:25 +01:00
Joel Dudley
6f37a9e323
Clarifies need for creating migration scripts for schemas (#1323)
* Clarifies need for creating migration scripts for schemas

* Self-review.

* Adds content directive.
2018-08-15 16:07:48 +01:00
josecoll
2b69789a30
Fix Vault contractStateType's bootstrapping bug, and add integration test. (#3785) 2018-08-15 15:15:11 +01:00
szymonsztuka
86ef53710d ENT-2243 Recommend table and db permissions and how best to set up a secure node in ent docsite
For standalone database, the database user may be setup with permissions required for normal operations or administrative permissions for creating tables use when database.runMigration=true
2018-08-15 10:37:20 +01:00
Michele Sollecito
7a1b75ef35
[CORDA-1822]: Derive error code from exception signature (#3774) 2018-08-15 10:22:09 +01:00
Michele Sollecito
1f1800fbd4
Merge pull request #1329 from corda/ssztuka/fix-dbmigration-regression
Fix database migration tool after CORDA-1799
2018-08-15 09:50:16 +01:00
Chris Rankin
f979d9d3cf
Include the deterministic test-data.jar in the build's assembly. (#3784) 2018-08-14 18:33:12 +01:00
Rick Parker
d93f7fd7d2
Merge pull request #1330 from corda/parkri-os-merge-20180814-1
OS -> ENT merge
2018-08-14 13:16:24 +01:00
Thomas Schroeter
7ec41fba43
Config file and base dir can be specified together (#3783) 2018-08-14 12:13:22 +01:00
rick.parker
237c133804 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180814-1
# Conflicts:
#	CONTRIBUTORS.md
#	constants.properties
#	docs/source/index.rst
#	docs/source/upgrading-cordapps.rst
#	node/build.gradle
2018-08-14 11:26:52 +01:00
Joel Dudley
753d67a519
Reword index page (#3782) 2018-08-14 10:06:30 +01:00
josecoll
f684cb29bd
CORDA-1888 Fix Vault Query composite queries (#3775)
* Reproduce composite query failures.

* Fixes to OR querying and composite queries that use the same QueryCriteria (Linear, Fungible, Custom) more than once.

* Revert debug logging for Hibernate SQL.

* Cleanup and remove redundant joinPredicates global var.

* Fix failing Java Unit test.

* Fix Java compilation error in example-code section of docs.

* Include copy() function for original constructor to maintain backwards API compatibility.
2018-08-13 18:11:29 +01:00
josecoll
166554a558
Fix duplicate index declaration. (#3779) 2018-08-13 17:31:35 +01:00
szymonsztuka
96a8c1fdfb Re-enable database migration tool to migrated databse (mapped) schemas from Cordapps in 'cordapps' directory - regression introduced by CORDA-1799. 2018-08-13 16:55:57 +01:00
Michele Sollecito
3b63723934
[CORDA-1822]: Improved error message when too many results are asked with default pagination. (#3776) 2018-08-13 16:50:29 +01:00
Michele Sollecito
7607244557
[CORDA-1841]: Made paths in tutorial-cordapp consistent. (#3778) 2018-08-13 16:21:16 +01:00
Rick Parker
0a18979307
CORDA-1894 Remove if condition from service hub that prevents vault logic executing. (#3773) 2018-08-13 14:17:03 +01:00
Andrius Dagys
0746b1f927
CORDA-1850: Minor: improve flow timeout error message (#3764) 2018-08-13 10:05:55 +01:00
Chris Rankin
dfea9b6940
CORDA-1889: Update some CordFormation samples to use nodeDefaults{}. (#3771) 2018-08-11 12:57:04 +01:00
Roger Willis
75ac13815b
Updates to new resolve tx flows... (#3766) 2018-08-10 16:19:09 +01:00
Mike Hearn
68bfb7ff66 New jokes. 2018-08-10 14:32:16 +02:00
David Wray
9bbc85db61 Miscellaneous doc fixes (#3760)
* ENT-2298: CE Hello World Tutorial Page references Corda V1.0

Removed version number completely from text, I thought this made more sense than hardcoding a version which will almost immediately be out of date.

* ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text

Updated text to proper method

* ENT-2305: Java Instructions to Invoke Hello World CordApp fail

Removed Java instructions
2018-08-10 12:28:59 +01:00
Joel Dudley
839cae9872
Update CONTRIBUTORS.md 2018-08-10 12:26:15 +01:00
Joel Dudley
b72d4295ba
Fixes formatting. (#1326)
* Fixes formatting.

* Fixes backticks.
2018-08-10 11:27:35 +01:00
Roger Willis
b0d36b6617
* Minor formatting changes. (#3758)
* NotaryServiceFlow now takes references into account when comparing number of inputs vs maxAllowedInputs.
* Added reference state support for BFTSMaRt notary.

* Fixes broken BFT notary tests.
2018-08-10 08:51:56 +01:00
Andrius Dagys
ce5f38104b
ENT-2168: Add a shell command to check for an existing transaction (#3762)
* ENT-2168: Add a shell command to check for an existing transaction

When a double-spend occurs the notary returns the hash of the consuming
transaction id. I've added a 'hash-lookup' shell command that matches
any recorded transactions on the node against this id hash to determine
whether the state has been consumed by this node (that could happen in certain race conditions).
2018-08-09 18:33:51 +01:00
Tommy Lillehagen
66739c138c NOTICK - Fix version reference for New Relic dependency (#3765) 2018-08-09 18:17:20 +01:00
Rick Parker
e4ae53d99b
Merge pull request #1324 from corda/parkri-os-merge-20180809-1
OS -> ENT merge
2018-08-09 16:04:36 +01:00
szymonsztuka
43def2a352 Fix test in database mode - ensure remote database is initialized before test object are created. 2018-08-09 14:16:15 +01:00
David Wray
528164c173 Revert "ENT-2305: Java Instructions to Invoke Hello World CordApp fail"
This reverts commit 70346c45b3d0ef14ed329673e54553cc4bbc7726.
2018-08-09 12:26:54 +01:00
David Wray
c8872eac6a Revert "ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text"
This reverts commit ed088562f657713d3b7d55f700ee0216b86a33e2.
2018-08-09 12:24:00 +01:00
David Wray
fef494ea9c Revert "ENT-2298: CE Hello World Tutorial Page references Corda V1.0"
This reverts commit 403407a919c9878f2563542a9a4106adc7f08cb4.
2018-08-09 12:11:31 +01:00
Joel Dudley
892215e27f
Clarification in upgrade docs. (#3759)
* Clarification in upgrade docs.

* Address review comments.
2018-08-09 11:46:14 +01:00
szymonsztuka
3b0ddd30bf Added SQL setup for integration test in database mode. 2018-08-09 10:59:07 +01:00
rick.parker
046209ea0d Fix compilation error 2018-08-09 10:27:58 +01:00
rick.parker
e508033201 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180809-1 2018-08-09 09:33:38 +01:00
evh69
5f17fc1b07 Jmx Reporter Addition to allow for New Relic over Jolokia alternative (#3739)
* gradle.build - Added metrics-new-relic dependency
Node.kt - Refactored start(): NodeInfo function extracting the code that was creating the Jolokia JMX reporter configuration and placing it into its own registerJolokiaReporter private function, added a registerJmxReporter function that is now called from start(), the registerJxmReporter function checks the NodeConfiguration's JmxReporterType value for either JOLOKIA or NEW_RELIC to derive whether to execute the registerJolokiaReporter vs. registerNewRelic reporter.
NodeConfiguration - enhanced to encapsulate a JmxReporterType (JOLOKIA is the default config) configuration options for Jolokia or NewRelic reporters.
Enhanced NodeTest.kt, NodeConfigurationImpleTest.kt and added test-working-config-newrelic.conf to ensure that tests still work as expected.

* Added configuration details concerning JmxReporterType ...

* Updated files with style suggestions made by @tlil

* Updated markdown of the external url

* Changed grammer on "See `Introduction to New Relic for Java`_ for details on getting started and how to install the New Relic Java Agent."
to "See `Introduction to New Relic for Java`_ for details on how to get started and how to install the New Relic Java agent."
2018-08-09 08:11:17 +01:00