Mike Hearn
b40fee1512
Allow for easier conversion from Amount<Issued<T>> to Amount<T> and de-issuerify a few places.
2016-08-01 16:42:56 +02:00
Mike Hearn
97ad07be89
Fix progress rendering after the switch to log4j, as ANSIProgressRenderer had assumed JDK logging.
...
Also, start using colours and a more compact logging format in the default log4j config.
2016-08-01 13:07:48 +02:00
Ross Nicoll
cf4bb0c9af
Break down topic into component parts
...
Break down what is referred to as "topic" of a message into its component parts. This splits the
general topic from the session ID, so it's clear where a session ID is provided, and whether any
given topic string includes a session ID or not.
2016-07-29 14:24:46 +01:00
Matthew Nesbit
8c77ae7c84
Add comment to explain why AbstractNode is marked as SingletonSerializeAsToken
2016-07-28 16:54:40 +01:00
Matthew Nesbit
a462bb1d6a
Incorporate comments from PR
2016-07-28 16:30:53 +01:00
Matthew Nesbit
601b2faf5f
Incorporate comments from PR
2016-07-28 16:22:35 +01:00
Matthew Nesbit
c57f265cce
Fixup plugins to include static content property after rebase inclusive of that work
2016-07-28 13:55:06 +01:00
Matthew Nesbit
10f68b22f9
Minor fix after rebase
2016-07-28 13:39:16 +01:00
Matthew Nesbit
235497e0f4
Convert long lived services supporting protocol listeners to plugins
2016-07-28 13:39:12 +01:00
Matthew Nesbit
09c795e341
Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl
2016-07-28 13:28:31 +01:00
Clinton Alexander
5410f8b228
Merged in demowebui (pull request #230 )
...
Added an IRS demo web interface
2016-07-28 13:19:32 +01:00
Ross Nicoll
ec726da7d0
Merged in rnicoll-warnings (pull request #246 )
...
Correct warnings
2016-07-28 13:03:55 +01:00
Matthew Nesbit
7d5ee8ba08
Create MessageServiceInternal interface to allow NetworkMapCache to register addresses with the network service.
...
Activate WhitelistTrustManager for now to secure the TLS messaging.
2016-07-28 11:25:57 +01:00
Ross Nicoll
d54beca77e
Add wallet service for notifying remote nodes of transactions
2016-07-27 17:40:52 +01:00
Ross Nicoll
aaaf6ea4f6
Correct warnings
2016-07-27 17:11:46 +01:00
Matthew Nesbit
e3aef96b09
Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl
...
# Conflicts:
# build.gradle
2016-07-27 15:43:01 +01:00
Ross Nicoll
8bdeda63ae
Merged in rnicoll-checkpoint-generic (pull request #241 )
...
Rework checkpoint storage to include the FiberRequest
2016-07-27 15:20:40 +01:00
Matthew Nesbit
e5777fd999
Fetch KeyStore passwords from NodeConfiguration
2016-07-26 10:35:57 +01:00
Matthew Nesbit
4c08141ce3
Tidy up based upon comments on PR
2016-07-26 10:35:56 +01:00
Matthew Nesbit
00f897d58d
Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ
2016-07-26 10:35:54 +01:00
Matthew Nesbit
0d68523f5c
Validate protocol type and args via whitelist ahead of class loading. Also, push this work into another method on the Factory.
2016-07-25 16:35:45 +01:00
Matthew Nesbit
0542f7c509
Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler.
2016-07-25 13:46:40 +01:00
Clinton Alexander
67defe19cc
Small refactor of initWebServer to improve readability.
2016-07-25 10:36:37 +01:00
Clinton Alexander
93f4440c14
Moved IRS web folder up a level. Added support for static serving plugins.
2016-07-25 10:30:30 +01:00
Ross Nicoll
2f04d876ae
Move FiberRequest out to a top level class
...
Move FiberRequest out to a top level class, both because it is expanding as functionality is added,
and to enable alternative state machine implementations to share it.
2016-07-24 09:30:16 +01:00
Ross Nicoll
31ee8ab60b
Rework checkpoint storage to include the FiberRequest
...
Rework checkpoint storage to include the FiberRequest, so that different requests can be supported.
2016-07-22 16:40:15 +01:00
Mike Hearn
119813a36d
Minor: document the SMM.changes observable.
2016-07-22 15:50:21 +02:00
Ross Nicoll
2c139ae40c
Merged in rnicoll-state-machine-id (pull request #234 )
...
Add Fiber ID to state machine change events
2016-07-20 13:23:02 +01:00
Clinton Alexander
40a4623c51
Improved error handling when exceptions occur during suspend.
2016-07-20 11:50:23 +01:00
Ross Nicoll
f72d8ed9fb
Add Fiber ID to state machine change events
...
Where state machine change events are to be serialized for relay to external systems, serializing the entire
protocol is excessive. Instead being able to identify changes based on the ID of the fiber is a lot simpler
for these use-cases.
2016-07-19 14:58:54 +01:00
Ross Nicoll
c92d51a0b6
Correct processing of unhandled messages
...
Unhandled messages in the in memory messaging network can disrupt runNetwork(), as they
result in getNextQueue() returning null, irrespective of whether there is further work
which could be done. This modifies the flow to loop through the remaining transfers on
the queue before giving up, rather than stopping after the first.
2016-07-19 14:19:57 +01:00
Andrius Dagys
c442cd01a7
Merged in andrius-cleanup-tweaks (pull request #208 )
...
Remove the "verify correct notary has signed" check from TwoParty protocols
2016-07-18 10:40:25 +01:00
Matthew Nesbit
9d18234383
Consistently use an sl4j logger with timestamp, rather than console println within the node. Note that the current protocol events published via the ProgressTracker are sent to the console without a timestamp.
2016-07-13 11:28:52 +01:00
Mike Hearn
ead19c619a
Merged in mike-cp-issuance-fix (pull request #224 )
...
Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract.
2016-07-13 11:13:23 +02:00
Ross Nicoll
254592dc54
Move protocols into correct package
2016-07-12 18:42:00 +01:00
Mike Hearn
f6789c93dd
Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract.
...
This confusion was introduced by a previous refactoring.
2016-07-12 16:01:50 +02:00
Matthew Nesbit
dba2b980a5
Remove TODO as the usage of CheckpointStorage is only through ServiceHubInternal into the StateMachineManager. We don't restrict access to internal for now as this causes too much other change.
2016-07-12 13:43:43 +01:00
Andras Slemmer
d7cc34c9a5
all: Full stops in comments!
2016-07-11 17:58:53 +01:00
Mike Hearn
e28ecae8c0
Address review comments
2016-07-11 18:47:24 +02:00
Mike Hearn
0a2f313d40
Minor: run IntelliJ 'code cleanup'
2016-07-11 18:15:28 +02:00
Mike Hearn
41d092a169
Minor: optimize imports
2016-07-11 18:15:28 +02:00
Mike Hearn
cc22810b09
Testing cleanup:
...
- Move code out of ambiguously named TestUtils files (there were three). Sometimes it's simpler to just put these things into the contract source files directly.
- Remove JavaTestHelpers objects (there were three), in favour of just giving the top level kotlin file class better names.
- Misc other small tweaks and cleanups.
2016-07-11 16:22:02 +02:00
Ross Nicoll
6b775ebd4d
Replace named timestamping authority with notary
...
As the timestamping authority is now always the notary service, contracts should
no longer be using name-based lookup of the timestamping authority (as this will
generally be wrong). This introduces a new "timestamp" property on a transaction,
and updates most contracts to refer to it.
In some cases (IRS, CommercialPaper) there are transactions with no input states
to derive notary from, that use timestamps. In these cases a notary is specified
in the command.
2016-07-11 14:54:36 +01:00
Andras Slemmer
4324e33fea
testdsl: Removed R type parameter, unify verifies() interface
2016-07-11 14:25:27 +01:00
Andras Slemmer
9bb8439dc3
testdsl: Add failsWith to Ledger
2016-07-11 14:25:27 +01:00
Andras Slemmer
cd0299f650
testdsl: Javadoc comments
2016-07-11 14:25:27 +01:00
Matthew Nesbit
eee049d66b
Add cacheing to ServiceLoader scanning of plugins and add a TODO on whitelisting
2016-07-08 10:38:23 +01:00
Matthew Nesbit
1557a82992
Make ServiceLoader results for CordaPlugins a protected property on the AbstractNode
2016-07-08 10:38:21 +01:00
Matthew Nesbit
51ba0cc8dd
Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler.
2016-07-08 10:38:18 +01:00
Matthew Nesbit
d9d4fb360f
Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler.
2016-07-08 10:34:32 +01:00