Commit Graph

1603 Commits

Author SHA1 Message Date
Ross Nicoll
13b040ecd6 Rework clauses to use composition
Rework clauses so that rather than defining match/no-match behaviour themselves, they are
now composed by nesting them within clauses that understand how to match their child clauses.
This unifies a lot of the structure of clauses and removes corner cases needed for the first
design, as well as moving towards a model which is easier to prove.
2016-08-26 17:35:52 +01:00
RogerWillis
6cf01f614f Added getFreeLocalPorts() for grabbing more than one port. Fixes bug in freeLocalHostAndPort() where the same port can be picked multiple times. 2016-08-26 13:46:11 +01:00
Andras Slemmer
d6c595da37 Merged in aslemmer-canonicalizer-plugin-in-buildsrc (pull request #303)
build: Move definition of CanonicalizerPlugin into buildSrc
2016-08-26 13:23:15 +01:00
Andras Slemmer
1f14fe0705 build: Fix CanonicalizerPlugin dependencies 2016-08-26 12:31:09 +01:00
Andras Slemmer
f783d8466d build: Move definition of CanonicalizerPlugin into buildSrc 2016-08-26 12:11:23 +01:00
Mike Hearn
3e94fc1921 More review fixes 2016-08-26 13:05:26 +02:00
Mike Hearn
2f35dbc339 Refresh the documentation site (developer guide): fresh docs are happy docs! 2016-08-26 12:58:33 +02:00
Ross Nicoll
22a8b0adb4 Merged in rnicoll-commit-tx-protocol (pull request #286)
Add CommitTransactionProtocol
2016-08-25 16:37:03 +01:00
Ross Nicoll
ad8ffca0b4 Add CommitTransactionProtocol
Add new protocol which manages the entire process of taking a signed transaction ready
for notarisation, through notarisation and onto recording it both locally and informing
remote nodes.

This protocol also optionally can include the ClientToServiceCommand which triggered a transaction
being created, to give the remote nodes context on why a change occurred (i.e. "You are being sent
£100")
2016-08-25 16:30:39 +01:00
Ross Nicoll
a5344f9578 Modify obligation tests to ensure issuance does not require notary signature 2016-08-25 16:28:46 +01:00
Ross Nicoll
5ff28df1ff Modify cash issuance tests to ensure transaction does not need notary signature 2016-08-25 16:28:46 +01:00
Matthew Nesbit
4ac71bb97b Merged in mnesbit-cor-356-artemis-identity-as-address (pull request #301)
Only NetworkMapServer addresses can be publicly manufactured. Use identity public key as addressing, with only bridges using the HostAndPort information
2016-08-25 16:05:24 +01:00
Matthew Nesbit
089ba2cb69 Only NetworkMapServer addresses can be publicly manufactured. Use identity publick key as addressing, with only bridges using the HostAndPort information
Fixup after rebase and fix issue with checking previous deployment of bridges

Correct comments on ArtemisMessagingClient constructor

Fixup rates fix demo

Get rid of when statements

Make NetworkMapCache send modify as well as add//remove events. Make inboxes for nodes persistent.

Suppress warnings

Fix message acknowledgement so that it actually consumes messages properly.

Change queueName to SimpleString to stop lots of wasted conversions

Get rid of spurious import

Tidy up and add comments

Update to include comments on PR

Remove unnecessary import
2016-08-25 15:56:50 +01:00
Ross Nicoll
99a0da9202 Merged in rnicoll-gui-cash-issuer-filter (pull request #302)
Pre-filter states passed to generateSpend()
2016-08-25 15:32:27 +01:00
Clinton Alexander
4cb6d11e9f Merged in clint-caplet (pull request #292)
Node server now loads plugins/cordapps from directory
2016-08-25 13:46:50 +01:00
Ross Nicoll
f9880a4990 Pre-filter states passed to generateSpend()
Pre-filter states passed to generateSpend(), so that requests from the UI to spend cash only ever
spend cash with the correct issuer.
2016-08-25 13:20:12 +01:00
Mike Hearn
8185596224 Merged in mike-simplify-cp-contracts (pull request #297)
Minor: cleanup the commercial paper contracts.
2016-08-25 11:31:04 +02:00
Mike Hearn
c8323099bb Minor: cleanup the commercial paper contracts.
There's no need for the notary to be specified in commands. A few other tweaks and additions found whilst refreshing the docsite.
2016-08-25 11:30:25 +02:00
Mike Hearn
bf41d66c6d Merged in whitepaper-minor-edits-prerelease (pull request #298)
Whitepaper minor edits prerelease
2016-08-25 11:28:58 +02:00
Clinton Alexander
f2a93ea67b Fixed review comments. 2016-08-24 21:03:20 +01:00
Clinton Alexander
f46cbd32c6 Fixed isJar checks. 2016-08-24 17:44:47 +01:00
Clinton Alexander
a8d73fb73f Caplet now filters for JAR files. 2016-08-24 16:40:43 +01:00
Clinton Alexander
bdcbd80d4e Updated docs to reflect gradle changes. 2016-08-24 16:30:35 +01:00
Clinton Alexander
4652872338 Renamed corda output JAR to corda.jar. 2016-08-24 16:28:28 +01:00
Clinton Alexander
70c057dfef Review changes. 2016-08-24 16:19:11 +01:00
Clinton Alexander
24df3e3c52 Removed term standalone and replaced with more neutral language. 2016-08-24 16:18:52 +01:00
Clinton Alexander
c03d9a2cf7 Review fixes. 2016-08-24 15:33:43 +01:00
Mike Hearn
74e5e1bce8 Merged in rnicoll-commodity-cleanup (pull request #295)
Documentation cleanup
2016-08-23 21:30:56 +02:00
Ross Nicoll
b8ec7631b4 Update introduction to messaging documentation 2016-08-23 17:43:42 +01:00
Ross Nicoll
59d3cbdece Add documentation around Commodity and CommodityContract 2016-08-23 17:40:45 +01:00
Mike Hearn
3e330a2d36 Merged in mike-fix-walletfiller (pull request #277)
Rewrite the test wallet filler code to not be buggy.
2016-08-23 17:59:19 +02:00
Ross Nicoll
e3ef4ce3b3 Merged in rnicoll-cash-destroy-own (pull request #293)
Restrict cash exit commands to working on cash held by the issuer
2016-08-23 14:15:54 +01:00
RogerWillis
dc60db5f69 waitForNodeStartup should now throw after 2 minutes rather than 20 seconds.
Some bank devs were finding integration tests failing as nodes had still not started.
2016-08-23 13:39:23 +01:00
Mike Hearn
3b8712627d Regen docsite 2016-08-23 14:29:46 +02:00
Ross Nicoll
88da5ba942 Merged in rnicoll-clause-default (pull request #290)
Add default values for ifMatched/ifNotMatched/requiredCommands
2016-08-23 11:49:59 +01:00
Ross Nicoll
03e120d04b Add default values for ifMatched/ifNotMatched/requiredCommands 2016-08-23 11:23:47 +01:00
Clinton Alexander
214c98b6aa Added first Cordapp documentation. 2016-08-23 10:25:06 +01:00
Ross Nicoll
dc2f4055fc Restrict cash exit commands to working on cash held by the issuer
Remove the ability to exit cash not held by the cash issuer; this solves a number of problems:

* Ensuring owner of the cash is aware of the funds being destroyed
* Determining where to send any change resulting from partial exiting of funds
* Auditing the destruction of funds
2016-08-22 17:17:19 +01:00
Clinton Alexander
668fecfea7 Merged in clint-no-notary-error (pull request #283)
Fixed bug when incorrect notary service type is specified.
2016-08-22 16:41:38 +01:00
Clinton Alexander
f6407b9e95 Caplet now loads plugins from plugins dir. 2016-08-22 16:22:37 +01:00
Clinton Alexander
c45aa9ffb1 Started capsule work. 2016-08-22 16:22:37 +01:00
Mike Hearn
097bb033c4 Rewrite the test wallet filler code to not be buggy. 2016-08-22 16:26:32 +02:00
sofusmortensen
5daad3580c verify of conditions, timestamp working 2016-08-21 23:40:32 +02:00
Richard G Brown
47cc33deb1 Final edit - simplification 2016-08-21 10:15:08 +01:00
sofusmortensen
d5172ea2d0 added timestamp check 2016-08-21 10:39:20 +02:00
Richard G Brown
932038ef9b Edits in response to Tim Swanson, Clark Thompson, Kathleen Breitman 2016-08-20 14:19:57 +01:00
Andras Slemmer
c3bf914d30 Merged in aslemmer-node-driver-improvements (pull request #287)
node driver improvements
2016-08-19 17:11:07 +01:00
Andras Slemmer
1a2c712a48 node-driver: Make debugging optional and off by default 2016-08-19 17:05:00 +01:00
Andras Slemmer
9d22d66548 node-driver: Fix some kdocs. Also, full stops! 2016-08-19 17:05:00 +01:00
Andras Slemmer
f4577b743e node-driver: Add startClient, startLocalServer 2016-08-19 17:05:00 +01:00