Commit Graph

3176 Commits

Author SHA1 Message Date
Clinton Alexander
d4e0ab52fe Moved the webserver from being a subproject of node to a subproject of client. 2017-03-30 14:43:18 +01:00
Clinton Alexander
27e7a4226e Removed unnecessary config for webserver. 2017-03-30 14:33:26 +01:00
Clinton Alexander
561b2e50a6 Webserver no longer depends on node. Added a configuration parser for the webserver. Size of resulting JAR now 16MB smaller. 2017-03-30 14:27:18 +01:00
Clinton
3e1b4aaef4 Merge pull request #431 from corda/clint-gradledocs
Docsite can be built from gradle
2017-03-30 13:48:24 +01:00
Qian Hong
03deffa955 MQSecurityTest: Make sure no actual message is received. 2017-03-30 14:01:29 +02:00
Clinton Alexander
796d475e0b Removed repositories from docs build.gradle. 2017-03-30 12:24:06 +01:00
Clinton Alexander
5ef66d8fd6 Removed old information about Dokka from the building docs documentation.
Make docsite no longer cleans. Now gradle should be used for cleaning the docs.

Corrected docs building gradle script.
2017-03-30 12:23:20 +01:00
Clinton Alexander
1b5182fe24 Removed robots.txt from repo and added docs/build back to the gitignore list. 2017-03-30 12:23:14 +01:00
Clinton Alexander
8862920f9a Removed docs build directory from repo.
Make docsite is back in a shell file due to issues invokving outside of the virtualenv.
2017-03-30 12:22:59 +01:00
Clinton Alexander
b80aaa0e9d Moved the build docs functionality into build.gradle.
Removed redundant parts of the docsite generator.

Gradle now calls the docsite requirements installation script when building docs via buildDocs

Added docs build script and moved all docs building related code into it

Corrected directories for build.
2017-03-30 12:22:15 +01:00
Chris Rankin
ade9a7dba8 Filter zero bytes from CRaSH input stream. (#460)
* Work around JavaFX injecting 0 bytes into JediTerm's STDIN stream.

* Add (disabled) unit tests for running JediTerm in both Swing and JavaFX.

* Remove tests for running JediTerm under Swing and JavaFX.
2017-03-30 11:04:51 +01:00
Patrick Kuo
78a0024e00 Fix various deprecated warnings
* Changed deprecated kotlin.reflect.primaryConstructor to kotlin.reflect.full.primaryConstructor
* Changed deprecated kotlin.reflect.memberProperties to kotlin.reflect.full.memberProperties
* Changed deprecated kotlin.reflect.declaredMemberProperties to kotlin.reflect.full.declaredMemberProperties
* Changed deprecated AllComposition to AllOf
* Changed deprecated AnyComposition to AnyOf
* Changed deprecated kotlin.reflect.KotlinReflectionInternalError to kotlin.reflect.jvm.internal.KotlinReflectionInternalError
* Changed deprecated HostAndPort.hostText to HostAndPort.host
* Removed duplicated method net.corda.core.node.recordTransactions
2017-03-30 10:00:46 +01:00
Richard Green
86b5915ae7 changed reference from r3prototyping to corda 2017-03-29 17:45:41 +01:00
Matthew Nesbit
062dc67ab6 Add Any constraint to Amount token
Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
2017-03-29 17:11:30 +01:00
Matthew Nesbit
e0a2c76f39 Remove unnecessary parameters to copy()
Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
2017-03-29 17:11:30 +01:00
Patrick Kuo
9a7d0a0fb5 Replace unused variables with _ after kotlin 1.1.1 upgrade (#456)
* Replace unused variables with _ after kotlin 1.1.1 upgrade
2017-03-29 13:54:40 +01:00
josecoll
7eada1408e Reduce warning and info messages in node log files (Artemis) (#449)
* Reduce warning and info messages in node log files (Artemis)
Add an additional lof message for conflicting states identified by the Notary.

* Upgraded severity of user login message from trace to debug.

* Suppress Artemis log4j WARNING's for core.server.checkDeadLetterAddressAndExpiryAddress
2017-03-29 11:40:19 +01:00
josecoll
3497e42f7c Upgrade to Requery 1.2.1 with Composite Key support (#443)
* Test SELECT WHERE IN composite key using requery 1.2.0

Upgraded Vault Service code to use Requery 1.2.0 SELECT .. WHERE IN

Updated generated schema code with Requery 1.2.0

Upgrade to Requery 1.2.1

Upgrade to Requery 1.2.1 - converted to use update DSL with composite key
Removed redundant JDBC SQL test cases.

Minor updates following PR review comments from RP.

* Streamline companion object initialisation.
2017-03-29 10:51:02 +01:00
josecoll
bafedc21e2 Display Corda node legal name in JVisualVM Console for MockNode testing. (#444)
* Display Corda node legal name in JVisualVM Console for MockNode testing.

* Removed dash in displayed corda node name.

* Reinstated the dash in displayed corda node name (as JVisualVM does not parse the space correctly)
2017-03-29 09:22:01 +01:00
Patrick Kuo
6ca0dffa6c use sshdPortAllocation for sshdAddress instead of portAllocation to fix broken demos due to port shift. 2017-03-29 10:15:14 +02:00
Matthew Nesbit
b75913c24a Merge pull request #451 from corda/mnesbit-fix-flaky-tests
Fixes some charset encoding and timing tests problems on windows
2017-03-28 18:21:29 +01:00
Rick Parker
8ef1d767c9 Consolidate maven repositories (#445)
* Consolidate repositories into root build.gradle
2017-03-28 17:17:40 +01:00
Clinton
2f2d4b64b5 Merge pull request #442 from corda/clint-verifierpublish
Verifier is now correctly publishing
2017-03-28 16:52:03 +01:00
Matthew Nesbit
8f1d58a508 Fix unit tests causing problems on windows 2017-03-28 16:39:29 +01:00
Patrick Kuo
a47a45037d added protocol design to the permissioning doc (#448) 2017-03-28 16:27:53 +01:00
Clinton Alexander
252195672b Corrected driver documentation. 2017-03-28 16:18:33 +01:00
Mike Hearn
3dea759587 Fix a thread safety issue on session close in RPC 2017-03-28 15:35:52 +02:00
Qian Hong
aca00700aa docs: Create users separately for different parties with minimum required permission. (#440) 2017-03-28 12:57:36 +01:00
Clinton Alexander
48832d44fa Added verifier type to JavaDoc for startNode 2017-03-28 12:27:34 +01:00
Clinton Alexander
e545dd3e2b Verifier is now correctly publishing 2017-03-28 12:23:40 +01:00
Chris Rankin
c9c4d1cd31 Remove unwanted dependencies. (#441) 2017-03-28 10:40:44 +01:00
Mike Hearn
dcbfe7bb5d Typo fix to the intro white paper source code. 2017-03-28 10:53:07 +02:00
Qian Hong
d9a1e352cd Bank of Corda demo: Fix broken RPC client test. 2017-03-28 09:53:42 +02:00
Andras Slemmer
259bdf4261 Merge pull request #340 from corda/aslemmer-verifier-split
Verifier split
2017-03-27 18:21:18 +01:00
Ross Nicoll
979b07723d Give "Response" a more meaningful name 2017-03-27 18:14:13 +01:00
Clinton
148b7b7551 Upgraded Kotlin version to 1.1.1 to fix issues with Cordapp building. (#439) 2017-03-27 17:53:58 +01:00
exfalso
81dcde99bf #340: Factor out jvm process start into utility function 2017-03-27 17:42:51 +01:00
Andras Slemmer
48952dfc02 Add node-api, split minimal node functionality, OutOfProcessTransactionVerifierService 2017-03-27 17:42:51 +01:00
josecoll
0280299104 Soft locking implementation using database coin selection
Fix broken IssuerFlowTest

Fix IssuerFlowTests after rebase.

Resolve conflicts after rebase.

Soft locking converted to use persistent store.
Added additional optional 'includeLockStates' parameter in VaultService states API call.
Added Vault softLocked states query API call.

Fixed commercial paper failing test.
Improved exception handling on soft locking UPDATE statement.

Using SELECT FOR UPDATE to ensure correct soft locking data visibility.
Db query operations moved out of mutex code (as locking managed by underlying DB)

Adjusted logging severity levels.

Adjusted logging severity levels.

GenerateSpending now performing fine grained query for unconsumed states by joining with contract_cash_states table.
Using H2 proprietary cummulative counting feature (using sessioni SET variables)
Refactored and simplified HibernateObserver constructor to enable usage in JUnit tests.

Event generator issues larger random amounts (10,000..1,000,000) to those than are spent (0..10,000)
Adjusted Issue (5:1) and Exit (10:1) generation frequency vs spending.

Minor fixes: added optional lockid into select for spending criteria, set notary, additional trace logging.

Generate Cash Schema by default upon node start-up (as part of NodeSchemaService initialisation).

Explicitly close JDBC statements in finally() blocks.

Tightened HibernateObserver constructor.

Fix CommercialPaper test (was missing auto-generation of CONTRACT_CASH table)

Revert default JVM size back to 200Mb.

Revert default number of iterations in Explorer Node Simulation mode (back to 10000 with .5 sec sleep interval).

Remove redundant setter function.

Added TODO messages indicating Requery / H2 restrictions & caveats.

Consumed states lock updates now performed in general consumed state Update.

Updated/added Soft Locking documentation.

Addressed initial PR comments: use THREAD_LOCAL_KRYO, use AbstractParty, extract helper method, improve readability, address some doc typos

Addressed PR comment: removed lockId from WireTransaction.

Fixed soft locking UPDATE statements.

Improvements to VaultSoftLockManager for auto-registration of soft locks for flows with spendable states (as notifications from vault).
Other optimisations (IssuerFlow no longer explicitly reserve/release issued state) and improvements (soft lock release management of soft locks, docs update)

Performance update: now using Requery for UPDATE in release soft locking (non-composite key statement)

Removed redundant TODO messages (TODO: revisit Kryo bug when using THREAD_LOCAL_KYRO)

Minor fixes following rebase

Fixed failing JUnit following rebase

Addressed MH PR review items (1st pass)

Fix broken JUnit

Significant changes to RDBMS operations within coin selection and soft locking as requested by PR review.
(Removed SELECT FOR UPDATE; added RETRY upon coin selection; reverting partial soft locks)

Addressed a number of PR review requests added by MH (comments/spelling, lockID instantiation, HibernateObserver instantiation, cash schema white-listing usage)

Addressed latest PR review comments from RP.

Minor fixes following rebase from master.

Fixed final failing JUnit (issuer flow concurrent).

Updated TraderDemo to trigger concurrent issuance of cash.

Fixed compiler warning on lockId null check.

Fixed subtle bug in coin selection intermittently surfaced in IntegrationTestTutorial.

Fixed small memory leak.

Removed stray } in logger trace message.

Slight rewording of description of Soft Locking in docs.

Renamed NoStatesAvailableException to StatesNotAvailableException.
generateSpend is now Suspendable (calls sleep method on flow upon coin selection retry).

Added companion function to enable a Strand to sleep but without locking transactional context.

Improved logging, changed to StateNotAvailableException, using Flow sleep upon retry, tweaked SELECT criteria in coin selection, fixed bug when insufficient states selectable, generateSpend is now @suspendable

Improved handling and logging of flow results in Simulation Mode.

Fixed minor error in sleep when not an active flow.

Retry coin selection when unavailable states (as these may become available as new states).
Additional debug logging to highlight and identify H2 coin selection sporadic bug.

Inlined sleep method due to intermittent Quasar error.

Re-introduce selection clause that prevents selection and temporary locking of already locked states (by other flows).
Improved trace logging for coin selection (SQL row level info).
Correctly calling FlowStateMachineImpl sleep (now inlined and working correctly)

Fixed rebase error.

Remove redundant TODO message.
2017-03-27 17:12:33 +01:00
Chris Rankin
045efbf074 Remove TERM_PROGRAM from environment because JediTerm does not emulate MacOSX. (#436) 2017-03-27 16:41:50 +01:00
Clinton Alexander
a40d55df84 Updated docs to refer to the latest M9.2 release. 2017-03-27 16:33:33 +02:00
Patrick Kuo
dc06d37369 Intellij bug workaround (#434)
* Workaround for `"bound callable references" is only available since language version 1.1` when using kotlin 1.1.1 plugin.
2017-03-27 15:12:01 +01:00
Ross Nicoll
c73a2e6034 Add utility functions for requesting transaction keys
Add utility functions for requesting transaction keys and a small example flow which uses
these functions for testing purposes. These keys are required in for the anonymisation of
transactions, by providing per-transaction keys which cannot be associated with the owning
party's keys without an intermediary certificate.
2017-03-27 14:19:14 +01:00
Chris Rankin
cec4e20bc8 Refactor DemoBench's configuration classes (#429)
* Reuse User class from :node-api module.

* Test that DemoBench can understand the node's configuration file.

* Add return type to User.toMap().
2017-03-25 00:45:01 +00:00
Shams Asari
bb74f0ca34 Merge pull request #427 from corda/shams-consistent-guava-deps
Upgraded both guava and guava-testlib to 21.0 and made sure they shar…
2017-03-24 18:30:11 +00:00
Ross Nicoll
c3cf2226ea Extend identity service tests
RBS report problems with multiple nodes being able to find each other in the identity service. This extends the name
lookup test case to try three nodes, to check all of the stored values, and to use random keys rather than static.

Add trace log of identity registrations to aid with tracking state.
2017-03-24 18:25:49 +00:00
Shams Asari
52ea54f742 Upgraded both guava and guava-testlib to 21.0 and made sure they share the same version variable 2017-03-24 17:17:36 +00:00
Chris Rankin
558a3207e9 Include CordaCaplet$1 to fix WebServer startup. (#430) 2017-03-24 17:14:20 +00:00
kasiastreich
11cedee211 Size of notary key in vault schema fix. (#414)
Fix in vault schema so notary_key can have more key entries in CompositeKey, as it's kept as Base58 string. Change default varchar field with size 255 to varchar with size 65535.
Add test to VaultSchemaTest.
2017-03-24 15:14:02 +00:00
Ross Nicoll
81b0393766 Add Party type parameter to IRS state
Makes IRS states generic so that the can store anonmyous or full parties depending on use-case (ledger
vs UI).
2017-03-24 13:56:03 +00:00