2113 Commits

Author SHA1 Message Date
Christian Sailer
43f7b8477e Merge commit 'bc330bd9890d41904bbeea6e579f5fc4438872b6' into christians/merge-ENT-2414 2018-08-28 12:26:57 +01:00
Dominic Fox
63ebc394bf
Update docs to reflect constraint implementation (#3852) 2018-08-28 12:05:54 +01:00
Dominic Fox
6cb4310f92
ENT-2320 Introduce annotation to link state classes and contract classes (#1336)
* Introduce and check @BelongsToContract annotation

* Fix broken ObligationTests

* TransactionContractConflictException inherits from TransactionVerificationException

* Really fix broken ObligationTests

* Convert fun to val

* Update kdoc on BelongsToContract, simplify contract checking

* Warn in TransactionBuilder if ContractState has no owning contract

* Fix failing tests

* Unseal TransactionVerificationException

* Make contract parameter of TransactionState optional

* Replace exception with a warning for now

* Update api-current to permit @BelongsToContract annotation to be added

* cosmetic tweaks

* Throw IllegalArgumentException, not NPE

* Throw IllegalArgumentException, not NPE
2018-08-28 11:38:33 +01:00
Clinton
3594ccd89b
CORDA-1924: Remove references to Cordform definition and cordform-common (#3842) 2018-08-24 16:29:14 +01:00
Tommy Lillehagen
acd3f44181 Merge remote-tracking branch 'open/master' 2018-08-23 13:55:11 +01:00
Joel Dudley
866e2a2a13
Makes it clear where to put the migration JAR. Bullet point fixes (#1353) 2018-08-22 17:18:08 +01:00
Tommy Lillehagen
d2ef16cbfd
Deterministic JVM (#3386)
* CID-251 - Deterministic JVM

* CID-251 - Add DJVM documentation

* CID-251 - Address review comments from @chrisr3

* CID-251 - Address further review comments from @chrisr3

* CID-251 - Use shadowJar to generate fat JAR

* CID-251 - Address review comments from @exFalso

* CID-251 - Improve naming in ReferenceMap

* CID-251 - Add test for Kotlin meta-class behaviour

* CID-251 - Address review comments from @shamsasari

* CID-251 - Add description of high-level flow

* CID-251 - Refactoring

* CID-251 - Rename package to net.corda.djvm

* CID-251 - Include deterministic-rt.jar as runtime dependency

* CID-251 - Add Gradle task for generating whitelist from deterministic rt.jar

* CID-251 - Error messages for StackOverflow/OutOfMemory, update whitelist

* CID-251 - Reduce set definition of pinned classes

* CID-251 - Tidy up logic around pinned classes

* CID-251 - Shade ASM dependency and split out CLI tool

* CID-251 - Address review comments from @mikehearn (part 1)

* CID-251 - Address review comments from @mikehearn (part 2)

* CID-251 - Address review comments from @mikehearn (part 3)

* CID-251 - Address review comments from @exFalso

* CID-251 - Address review comments from @mikehearn (part 4)

* CID-251 - Address review comments from @exFalso and @mikehearn

* CID-251 - Address review comments from @mikehearn (part 5)
2018-08-22 16:01:39 +01:00
rick.parker
0045fe24fd Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180821-1
# Conflicts:
#	docs/source/index.rst
2018-08-21 09:37:56 +01:00
Chris Rankin
a2182b8b1a
Merge pull request #1339 from corda/chrisr3-os-merge
Merge from OS up to ff62df8d.
2018-08-20 22:05:08 +01:00
PokeyBot
f299305e8d
Merge pull request #3809 from corda/mike-sig-constraints-dd
Add a design doc for signature constraints.
2018-08-20 17:13:17 +01:00
PokeyBot
f55f1b65e6
Merge pull request #1332 from corda/features/ENT-2243-db-permissions-recomendations
ENT-2243 db permissions recomendations
2018-08-20 16:43:00 +01:00
Chris Rankin
a287673432 Merge commit 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge
Conflicts:
	finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
	node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2018-08-20 15:46:20 +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
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
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
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
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
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
Michele Sollecito
7607244557
[CORDA-1841]: Made paths in tutorial-cordapp consistent. (#3778) 2018-08-13 16:21:16 +01: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
b72d4295ba
Fixes formatting. (#1326)
* Fixes formatting.

* Fixes backticks.
2018-08-10 11:27:35 +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
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
Joel Dudley
f987651fe4
Clarifies type of hash used to hash CorDapp JARs (#3756) 2018-08-08 15:47:45 +01:00
Viktor Kolomeyko
f5989013f2 OS->Ent merge 2018-08-06 14:43:51 +01:00
Viktor Kolomeyko
c24d916f5a
RPC changes (#3697)
* Eliminate un-necessary reference to Kryo in the comment

* RPC documentation update.

* Rename RpcClientObservableSerializer into RpcClientObservableDeSerializer
2018-08-06 09:11:15 +01:00
Joel Dudley
286dc7b77d
Joel upgrade docs (#3730)
* Instructions on how to perform H2 DB upgrades without starting the node.

* Formatting error. Adds required subsections in H2 docs.

* Merges duplicated information about H2 DB access.

* Drops script references for now.

* Clarifies upgrade notes.

* Better title.

* Inr

* Addresses review comments.

* Addresses review comments.
2018-08-03 13:34:34 +01:00
szymonsztuka
53ce630889
Document minimal administration rights for databases - related to ENT-2243 (#1312) 2018-08-03 10:30:35 +01:00
rick.parker
49d99f00fc Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180802-1 2018-08-02 10:34:34 +01:00
Joel Dudley
2e03c7f8c0
Clarifies Gradle wrapper usage. Clarifies one module = one CorDapp. (#3721)
* Clarifies Gradle wrapper usage. Clarifies one module = one CorDapp.

* Clean-up. Note on how to create nodes and CorDapps in prod.

* Fixes based on rendering.

* Addresses review comments.
2018-08-01 17:55:00 +01:00
szymonsztuka
a63c9526ca Merge OS 2018-08-01 14:13:39 +01:00
szymonsztuka
c23167f08e
ENT-2188 fix H2 insecure default configuration (#3692)
Set the "h2.allowedClasses" system property, require database password when exposing H2 server on non-localhost address, samples start H2 server by default (reintroduces the behaviour before h2Settings.address configuration option was added)
2018-08-01 11:50:42 +01:00
Dan Newton
0762a61aca In AbstractNode check if an initiating flow already has a flow registered to it and throw exception if one has been (#3713)
* In AbstractNode check if an initiating flow already has a flow registered to it and throw exception if one has been

In AbstractNode.internalRegisterFlowFactory check if a flow factory already exists for a initiating flow
If a factory does exist, throw an exception
A few tests needed to be fixed due to this change

* Reorder test setup to prevent flows from being registered multiple times

* Use check instead of if and throws statement in AbstractNode when checking for initiating flow having multiple flows mapped to it

Use check instead of if throws statement
Change names of methods in tests
Improve FlowRegistrationTest to better check if flow has been registered properly

* tidy up FlowFrameworkTests and FlowRegistrationTest
2018-08-01 07:58:00 +01:00
tudor.malene@gmail.com
159a3d25a5 Merge remote-tracking branch 'open/master' into tudor-os-merge-31-07
# Conflicts:
#	finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
#	finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
#	finance/src/test/kotlin/net/corda/finance/flows/CashIssueFlowTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	node/src/test/kotlin/net/corda/node/services/schema/PersistentStateServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultWithCashTest.kt
2018-07-31 17:53:43 +01:00
josecoll
8b501b1b80
CORDA-1858 - Vault query fails to find a state if it extends from class (#3722)
* Included Contract State parent classes in list of queryable types.

* Added changelog entry.
2018-07-31 17:16:27 +01:00
Shams Asari
dfafdbcb9f
Added checks against the use of the special uploader tokens (#3724)
"app", "rpc", "p2p" and "unknown" have security implications (see isUploaderTrusted method) and thus they are not allowed to be used in the uploader field when importing attachments via the public API.
2018-07-31 17:01:39 +01:00
Shams Asari
994fe0dbdc
CORDA-1845: Check for min plaform version of 4 when building transactions with reference states (#3705)
Also includes some minor cleanup brought up in a previous PR.
2018-07-31 16:07:35 +01:00
Jiachuan Li
d42b9f51ac Miner change to mention notary node dosen't need web server, and also change the total terminal windows number from 8 to 5 (#3012)
* There is a duplication of the kotlin introduce part, which is the same as the description of the "Note" section right below. So remove this duplicated part but keep the "Note".

* A miner change about the build node folder structure, first is Notary node doesn't need one web server, second is in V3.0, there are 5 windows totally but not 8.

* Miner updates for the format of changes, as instructed by Joel on https://github.com/corda/corda/pull/3012
2018-07-31 15:36:25 +01:00
Shams Asari
f04e73352d Merge branch 'os-merge-point' into os-merge-93bb24e
# Conflicts:
#	CONTRIBUTORS.md
#	node/build.gradle
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/test/kotlin/net/corda/node/messaging/InMemoryMessagingTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
2018-07-31 14:52:53 +01:00
Tudor Malene
85caa9ee9d
Feature/corda 1847/remove hibernate observers (#3696)
* CORDA-1847 Fix hibernate observer issue

* CORDA-1847 Fix hibernate observer issue

* CORDA-1847 Fix hibernate observer issue

* CORDA-1847 Fix tests

* CORDA-1847 Fix tests

* CORDA-1847 Fix tests
2018-07-31 13:52:13 +01:00
Dominic Fox
4542e0cd06
CORDA-916: Add registerFlowFactory method to public test API (#3720)
* Add registerFlowFactory method to public test API

* Return CordaFuture rather than a plain Future

* Rename method

* Improve KDoc

* Hide internal interface with public wrapper

* Modify API current to include ResponderFlowFactory interface

* Take API definition change from generated file

* Note API change in changelog
2018-07-31 13:33:18 +01:00
Katelyn Baker
6f47633f71
Merge pull request #1306 from corda/kat-merge-27072018
Kat merge 27072018
2018-07-30 13:19:38 +01:00