Clean up X500 names in Corda simulation, and ensure they're consistent with the standard test names.
This includes using the locations present in those test names, which requires updates to the node
config test.
This is an intermediary step to introducing X500Names in all Party instances, which adds:
* Party constructor which accepts X500Name and then converts it to string.
* startNode() function which takes in X500Name instead of String
* Numerous legal name fixes to use full distinguished names
DemoBench: Misc usability improvements:
- Pre-fill details for some fictional banks when Add Node is pushed.
- Make services a checkbox list rather than one where you have to know how to use the keyboard to do multi-select.
- Make web server launch button spin until server is launched to show activity.
- Suppress an exception that spams the log due to inability to load all the states. It'll get fixed as part of the vault API and serialisation work.
* Subscribe to updates for transaction and vault RPCs.
* Ensure we unsubscribe our observables at the end.
* Use Rx scheduler that can observe on FX application thread.
* Remove progress Observable from FlowHandle, unless explicitly requested.
* Refactor FlowHandle creation into FlowStateMachine.
* Prevent server-side queue subscription for dummy Observable.
* Refactor so that RPC client does not receive any unused progress Observables. This is the simplest way of ensuring we have no dangling "hot" Observables when the RPC client closes.
* Test flow has correct handle.
* Resolve some compiler warnings.
* Document how starting a flow does not involve progress tracking by default.
* Update changelog and release notes for RPC API.
* Rename new RPC API to startTrackedFlow().
* Remove optimisation because of its affect on the client-side.
* Update documentation.
Standaridise the identity names of Alice, Bob and Charlie, notary, map service, etc. in order
to ensure consistency across the code base and reduce number of places that have to be changed
to introduce proper X.500 names.
Move Alice, Bob & Charlie identities into the utilities package so they can be used in demos
* Make CompositeKey implement PublicKey
The initial implementation of composite keys as their own distinct class separate from PublicKey
means that the keys cannot be used on standard classes such as Certificate. This work is a beginning
to modifying CompositeKey to being a PublicKey implementation, although significant further work
is required to integrate this properly with the standard Java APIs, especially around verifying
signatures using the new key type.
* First stage of making CompositeKey implement PublicKey interface. Revert to using PublicKey everywhere we expect a key.
* Move algorithm and format into companion object (#432)
Move algorithm and format into companion object so that they can be referenced from other
classes (i.e. the upcoming signature class).
* Add simple invariants to construction of CompositeKey.
Builder emits CompositeKeys in simplified normalised form. Forbid keys with single child node, force ordering on children and forbid duplicates on the same level. It's not full semantical normalisation.
* Make constructor of CompositeKey private, move NodeWeight inside the class.
Add utility function for Kryo deserialization to read list with length constraints.
* Install DemoBench as a systemwide application.
* This application's correct full name is "Corda DemoBench".
* Tidy up imports.
* Cordapps -> CorDapps
* Ensure application name is "Corda DemoBench" on MacOSX.
* Avoid NPE if corda.jar cannot be found.
* Log an error if Node Explorer or WebServer fail to start.
* Display an error dialog if we cannot find corda.jar at start-up.
* Use official notUsed() function for unwanted Observables.
* Fix unit tests.
* Rename function to readErrorLines().
Observable.subscribe().unsubscribe() dance to free up the MQ resources server-side.
* remove an unused import
* implement a FlowHandle<Transaction>.finalize method
* Rename finalize() to discard() - remove the collection and run discard individually
* Remove unused imports
* Observable.notUsed helper function
* Tweaks to comments
* FlowHandle implements AutoClosable
* Resolving conflicts and move notUsed to RPC module
* Copy Observable.notUsed in core module.
* delete discard method
Add an AmountTransfer type to express the concept of asset flows.
Unify the currency amount creators and fix a few old style display conversions in teh explorer cash dialogs.
Modifications according to PR comments.
Change TransferAmount display string as it may not always be a payment.
Update docs
* 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.
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.
* CORDA-305: Refactor CordaRPCClient into :client:rpc module
* CORDA-305: Remove the Kotlin test framework from the artifacts.
* CORDA-305: Migrate serialisation whitelist into node-api module.
* CORDA-305: Clean up unused RPC observables.
* CORDA-305: Add :client:rpc module to documentation tasks.
* CORDA-305: Include :finance into :client:rpc for its serialisable classes.
* CORDA-305: Move test classes into the correct directory.
* CORDA-305: Migrate :finance dependency from :client:rpc into DemoBench.
* CORDA-305: Update wording of TODO about handling Observables.
* CORDA-304: Refactor :client modules into :client:javafx and :client:mock.
* CORDA-304: Add :client:mock to Dokka tasks, and remove unused integrationTest task.
* CORDA-304: Migrate DriverBasedTest from node into test-utils.
* CORDA-304: Rename .fx. package to .jfx. to prevent confusion with "exchange rate".
* CORDA-304: Rename module to ':client:jfx'.
* Add basic spec for the demobench tool.
* Initial commit: Creating new tabs whenever the "Add Node" button is pressed. These tabs currently contain the bash shell only.
* Refactor shutdown code, although AWT is still misbehaving.
* Remove duplicate libpty native objects.
* Add initial form for configuring new nodes.
* Update to Corda 0.8-SNAPSHOT
* Patch JediTerm to allow the application to shutdown cleanly.
* Write configuration parameters into node.conf, and then run corda.jar in its own directory.
* The first node now becomes the session's Network Map service used by all other nodes. Force nodes to be created one-by-one.
* Trim node name and nearest city values.
* Fix logging location of corda.jar
* legalName field can be val.
* Allow configuration of extra network services.
* Launch DB viewer for node.
* Small tidy-up.
* Allow services to be loaded as a resources as well as a file.
* Include native artifacts in distribution.
* Add cash and issuer services to DemoBench.
* Configure Node and DemoBench to use same version of H2 database.
* Implement launching "Node Explorer" for each node.
* Create a capsule for Node Explorer, and allow login via command line parameters to bypass login screen.
* Simplify Kotlin objects.
* Include issuer for CHF (Swiss Francs)
* Fix SLF4J logging.
* Display simple statistics about the node on each tab.
* Add new RPC operation getCashBalances() to Node.
* Ensure demobench is built after explorer:capsule.
* Grant permissions to the Node's user, and install BanfOfCorda plugin for cash issuers.
* Initial inclusion of Corda and BankOfCorda JARs in distribution.
* Fix DemoBench distribution target.
* Add SLF4J binding for Log4J 2.x
* First batch of code review changes.
* More changes from review.
* Remove ".exe" from Java executable path, because Windows doesn't need it.
* Remove superfluous lamba parameter names.
* Better usage of Paths vs File API.
* Simplify the configuration object.
* Ensure a DemoBench installation is relocatable.
* Ensure that Node Explorer can write into its working directory.
* Disable Node Explorer and Database Viewer buttons until the node has launched and is responding to RPC.
* Only allow the first node to run notary services. And validate port numbers more strongly.
* Force all chosen port numbers to be different.
* Initial javapackager task: currently builds RPMs.
* Ensure JavaPackager task finds custom resources on the classpath.
* Move demobench.log into the user's demobench directory.
* Upgrade to Logback 1.1.10
* Make the javapackage task "more gradle" and "less ant".
* Display "0" balance for a node which has no cash balances at all.
* CORPRIV-665: Ensure tab closes if the node exits.
* CORPRIV-665: Protect against NPE
* CORPRIV-665: Protect harder against NPE
* CORPRIV-665: Protect NodeTerminalView from being destroyed twice.
* Initial custom resource script for Windows bundle.
* Take java executable from JRE.
* Allow Node Explorer to be relaunched.
* CORPRIV-658: Add gradle parameter "packageType" for javapackage task.
* Replace R3 logo with Corda logo.
* CORPRIV-658: Add icon file for Windows installer.
* CORPRIV-658: Add BAT file to create unsigned DemoBench.exe.
* CORPRIV-659: Add icon file for DMG package.
* Improve packaging information.
* CORPRIV-660: Allow user to launch Web server for each node.
* Tidy up gradle usage.
* Document provenance of jediterm-terminal-2.5.jar.
* Use "safe" casting operator.
* CORPRIV-659: Add bin/java to minimal JRE.
* CORPRIV-659: Basic shell script to package DemoBench as DMG.
* Add utility function for creating SLF4J loggers, and close unused I/O streams from forked processes.
* Switch from Runtime.exec() to ProcessBuilder.
* CORPRIV-660: Display Web server's port number on launch button.
* CORPRIV-661: Allow profiles to be loaded into DemoBench.
* Upgrade to TornadoFX 1.6.2.
* CORPRIV-661: Implement saving profiles.
* CORPRIV-661: Refactor code for guaranteeing a .zip extension.
* CORRIV-658: Add icon for Windows installer.
* CORPRIV-659: Update installer script and icons for DMG.
* CORPRIV-659: Tweak post-image script for DMG.
* CORPRIV-658: I've wasted enough time on this - Windows rejects this BMP
as invalid, and I have no idea why!?
* CORPRIV-658: Add external manifest for DemoBench.exe that declares it incapable of native HiDPI support.
* CORPRIV-661: Ensure that we can rewrite saved profiles correctly.
* Fix terminal resizing.
* CORPRIV-659: Fix DMG installer.
* CORPRIV-659: Better validation for JAVA_HOME.
* Downgrade JDK requirement to 8u102, for consistency with capsules.
* Comment how JediTerm is not available via Maven.
* CORPRIV-658: Rename packaging script.
* CORPRIV-659: Renaming packaging script.
* Comment file copying vs file filtering during packaging.
* Fixes from code review.
* CORPRIV-661: Ensure that nodes loaded from a profile have the correct network map service.
* Break textfield definitions out into separate functions.
* Fixes from code review.
* Code review tweaks.
* More code review tweaks.
* Another simple code review tweak.
* Replace companion object with a BiPredicate lambda.
* CORPRIV-664: Implement saving/loading of Cordapps with profiles.
* CORPRIV-664: Refactor saving/loading plugins.
* CORPRIV-664: Add initial unit tests for model.
* CORPRIV-664: Add simple unit tests for NodeController.
* CORPRIV-664: Unit test enhancements, e.g. configure JUL properly.
* CORPRIV-664: Use Suite instead of abstract test class.
* CORPRIV-664: Allow Cordapps to be loaded when each Node is configured.
* CORPRIV-664: Document which checked Java exceptions are thrown.
* Write JavaPackager output into build/javapackage directory.
* CORPRIV-664: Document more checked Java exceptions.
* Refactor Web and Explorer classes into their own packages.
* Declare WebServer and Explorer constructors as "internal".
* Update packaging scripts: tell user where the installer is!
* CORPRIV-659: Set "system menu bar" property for MacOSX.
* CORPRIV-661: Use "*.profile" for profile files.
* Remove unnecessary <children/> elements, as they are defaults.
* Fix build breakage when on Windows.
* Tweaks for EXE packaging script.
* Change function to extension function.
* Merged in corpriv-702 (pull request #25)
CORPRIV-702: Sign the DMG with a 'Developer ID Application' certificate.
* CORPRIV-702: Sign the DMG with a 'Mac Developer' certificate.
* CORPRIV-702: Use "Developer ID Application" certificate instead. And now JavaPackager signs the application, which means that we only need to resign our embedded JVM.
* CORPRIV-702: Update comment better to explain why JRE must be resigned.
Approved-by: Mike Hearn
* Exclude old version of Javassist in favour of Hibernate's version from Node. (#320)
* Exclude old version of Javassist in favour of Hibernate's version.
* Comment why we are excluding javassist:javassist, and add TODO for when junit-quickcheck 0.8 is released.
* CORDA-265: Implement "ALL" permission for RPC users. (#306)
* CORDA-265: Implement "ALL" permission for RPC users. Users with this permission in node.conf can use any flow.
* CORDA-265: Ensure that we always close the RPC proxy object after each test.
* CORDA-265: Refactor construction of dummy RPC client into an abstract base class.
* CORDA-265: Document RPC "ALL" permission.
* CORDA-266: Update DemoBench to be compatible with 0.10-SNAPSHOT.
* CORDA-268: Reimplement to work on both JDK8 and JDK9 (for now).
* CORDA-268: Copy java from $JAVA_HOME/bin as this also works on JDK > 8.
* Code review fixes.
* Use SLF4J's version of the commons-logging bindings. Only include SLF4J's Log4J back-end for actual applications, e.g. Node. (#350)
* Update with SLF4J change.
* CORDA-266: Update to latest node.conf format.
* Upgrade to H2 1.4.194. (#389)
- Timezone related fixes.
- A Turkish case canonicalisation bug.
- Fixes for some scary threading related bugs.
* Non-ssl artemis acceptor for RPC connection. (#271)
* New non-ssl acceptor in artemis server for RPC connection.
* Rename artemisAddress with messagingAddress
Rename artemisAddress with messagingAddress so that the node configuration file properties match
the code variable names.
Rename artemisPort to messagingPort in Gradle configuration to match node configuration naming.
* Add rpcPort configuration option for Gradle
* Update docs to reflect changes to RPC port configuration
* Renumber ports in example CorDapp to match numbering used elsewhere
* Restructure upgrade guide
* added config file checks on corda startup to make the upgrade path a bit smoother.
Split CashFlow into independent CashIssueFlow, CashExitFlow and CashPaymentFlow,
so that users can be given access to one but not the other(s).
Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
Add AnonymousParty superclass of Party in preparation for anonymising parties stored in
contract states.
Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
* Added Certificate setting to the login screen, user can now specify certificates path and keystore/truststore password in the certificate setting screen.
Initial conversion of Explorer to use IssuerFlow (from BankOfCorda)
Initial conversion of TraderDemo to use IssuerFlow (from BankOfCorda)
Updated TraderDemo to use IssuerFlow (from BankOfCorda)
Fixed TraderDemo integration text (added new BankOfCorda node)
Updated Explorer with changes IssuerRequest params
Explorer now correctly displaying transaction id upon Issue.
Moved IssuerFlow into finance package so can be reused across multiple demos (TraderDemo) and applications (eg Explorer)
Refactored BankOfCorda demo to use Finance package and TestUtil constants
Updated TraderDemo to use IssuerFlow
Updated Explorer to use finance package IssuerFlow.
Advertised BankOfCorda as Issuer for usage by Explorer.
Explorer no longer depends on BankOfCorda demo since IssuerFlow promoted to Finance module
Added IssuerFlow to AbstractNode whitelist.
Explicit declarations of IssuerFlow no longer required.
Added plugin registration of IssuerFlow at bootstrap.
Revert whitelisting of IssuerFlow (plugin configured)
Refactored to use constant BOC definition.
Added gradle RPC security config.
Updated documentation
Fixed incorrect references.
Renamed Issuer banks.
Added new permission set (for Issuer nodes)
Added node nearestCity info
Added new Issuer Event Generator for Issuer nodes only
Associated currency with issuer using ServiceType naming structure.
Added argument flag (-S) to trigger event generator simulation node.
Fixed problem with issuers not resolving from network map.
Updated perms on Issuer rpc proxy nodes.
Fixed minor in cash generateExit identified by Explorer.
Changes applied in prep for AWG demo.
Added IntelliJ run-configurations for launching Explorer demo nodes (with and without simulation)
Updated documentation (and added additional gradle task to launch Explorer nodes in simulation mode).
Fix following rebase.
Addressed review items from PR.
Updated TraderDemo readme.
Updated TraderDemo gradle file to launch Bank of Corda node.
Updated JRE properties.
Updated IssuerModel to incorporate correct JFX Observable handling.
Fixed bug with Exit command not displaying any currency.
Added TODO's for revisiting correct Exception handling strategy.
Optimization for when issuing cash to self.
Minor updates following PR review.
Remove old refs to Royal Mint and Federal Reserve
* merge foldToObservableList and foldToObservableMap to fold
* added a 1 second buffer to the rx observable subscription to batch up the incoming updates, to avoid flooding FX UI thread with runnable
* renamed GatheredTransactionDataModel to TransactionDataModel
Changes :
*Show other nodes on network map.
*Enabled zooming and panning on the map.
*Scroll the node label to the centre of the screen when clicking on the node info list on the right hand-side of the screen.
*Draw line and fire bullets between nodes according to incoming transactions.
*Higher resolution map.
