Commit Graph

8095 Commits

Author SHA1 Message Date
Mike Hearn
a8c4a259eb Make FlowLogicRef able to handle multiple constructors more elegantly (e.g. when invoking FinalityFlow directly via RPC). 2017-02-20 08:29:13 +00:00
Mike Hearn
7f7acd22c7 Print out exceptions in the attachment demo test. 2017-02-20 08:29:13 +00:00
Mike Hearn
ead2ca2ade Improve the flow commit API.
Make FinalityFlow do more, and be used more consistently.

Add a new waitForLedgerCommit API that is intended to be used at the end of flows, or at any other point where a flow wants to wait for a transaction to finalise (but the finalisation flow is being done by someone else).

Update the docs a bit.
2017-02-20 08:29:13 +00:00
kasiastreich
e0dd67cf14 Tearoff fixes (#78)
* Move merkle building extension functions on wire tx to WireTransaction class.

* Add timestamp, notary, transaction type and signers to wire transaction id calculation.

* Change construction of MerkleTree from duplicating last node on a given level to padding leaves' list with zero hash to size of the nearest power of 2 - so we always have a full binary tree.
The problem was that it was possible to construct 2 different transactions with the same ids. Trick worked for txs having number of leaves that were not power of 2.

* Update tear-offs documentation and diagrams to reflect changes in construction of Merkle trees - padding with zero hashes and including all WireTransaction fields in id computation.

* Change in filtering API of WireTransaction for partial Merkle trees calculation.
Instead of many filtering functions over a transaction only one needs to be provided.
Additional change to check and verification of FilteredTransaction.

* IRS demo change. Make filtering function a protected method of RatesFixFlow class.
Comment on situation when capturing too much scope and connected problems with checkpointing.
Change oracle and tear-offs documentation.
2017-02-20 08:29:13 +00:00
Clinton Alexander
c6c40f0c84 Cleaned up logging in the webdriver to remove log that fails to display correctly on Windows. 2017-02-20 08:29:13 +00:00
Joel Dudley
577d2c31c8 Addresses RGB feedback. 2017-02-20 08:29:13 +00:00
josecoll
5d6abb6387 Publish new corda module: node-schemas (#249) 2017-02-17 12:53:44 +00:00
exfalso
2df43c54f3 Merge remote-tracking branch 'origin/malloc-hooks' into executable-heap 2017-02-17 10:26:41 +00:00
exfalso
6a34dc2ea0 Merge remote-tracking branch 'origin/fix-mallinfo' into executable-heap 2017-02-17 10:26:39 +00:00
exfalso
37f4325d40 Merge remote-tracking branch 'origin/edger8r-enclave_id' into executable-heap 2017-02-17 10:26:23 +00:00
Chris Rankin
ac56c7d451 Merge branch 'master' into demobench 2017-02-17 08:23:08 +00:00
Patrick Kuo
638bfcd131 Merged in pat-doorman-jira (pull request #19)
Doorman-Jira integration

Approved-by: Shams Asari
2017-02-16 17:50:57 +00:00
Clinton Alexander
539943d790 Added an openAttachment endpoint to the RPC interface and tests for the open, upload and exists attachment RPC interfaces. 2017-02-16 16:57:45 +00:00
Patrick Kuo
1611066c44 Addressed PR issues 2017-02-16 15:13:05 +00:00
Patrick Kuo
f999da3a4d Addressed PR issues 2017-02-16 15:11:25 +00:00
Patrick Kuo
5064cbb5c0 Addressed PR issues 2017-02-16 14:47:20 +00:00
Patrick Kuo
e2f93f64a9 Addressed PR issues 2017-02-16 14:45:36 +00:00
Mike Hearn
cc45121bea Merge pull request #248 from corda/clint-milestonedocsfix
Updated docs to refer to the latest milestone
2017-02-16 14:04:46 +00:00
Clinton Alexander
0e8d7fc2aa Updated docs to refer to the latest milestone and replaced a specific milestone reference with a generic one 2017-02-16 12:26:40 +00:00
Shams Asari
f13817efb3 ProgressTracker emits exception thrown by the flow, allowing the ANSI renderer to correctly stop and print the error (#189) 2017-02-16 12:11:38 +00:00
Ross Nicoll
ed093cdb9d Enforce separation of Party and AnonymousParty 2017-02-16 11:50:33 +00:00
Patrick Kuo
d76db6d047 Addressed PR issues 2017-02-16 11:30:03 +00:00
josecoll
fa33336d38 Initial implementation of Vault Persistence using Requery (#191)
* Initial prototyping with Requery as a persistence replacement for Exposed/Hibernate

Applied changes following PR review by RP

Updated timestamp naming (removed committedTimestamp) and StateStatus (removed AWAITING_CONSENSUS) after discussion with RP.

Removed FungibleState and LinearState schemas (and associated tests) - awaiting Requery uni-directional relationship fix.

Added Transaction propagation such that requery re-uses any existing transaction context.

Made requery default logging configurable (disabled by default)

Nullable fields are now truly nullable (in the Kotlin and DDL sense)

Fix for SimmValuation integration test.

Workarounds applied to resolve Requery issues when sharing Transactional context.

Addressed PR review comments from MH.

Further updates following re-review by RP/MH

Further updates following additional PR review comments by RP

Minor update following additional PR review comments by RP

Optimised makeUpdate state processing code.

Resolved conflicts after rebase.

Additional Unit tests and bug fix for correct spending of multiple contract state types within a single transaction.
Required interface change to states() API to take a setOf (ContractStateClassTypes)

Minor code clean-up.

Re-write NodeVaultService consumed state makeUpdate function using SQL.

* Resolve conflict after rebase from master
2017-02-16 11:02:36 +00:00
Andras Slemmer
24dc91d77c Change mallinfo field type to int as per system malloc.h
Signed-off-by: Andras Slemmer <andras.slemmer@r3cev.com>
2017-02-16 10:09:18 +00:00
Joel Dice
f7a651d6ba Merge pull request #521 from exFalso/extend-proguard
Add Proxy, Executable, InvocationHandler, Enum members to openjdk.pro…
2017-02-15 17:42:31 -07:00
Joel Dice
f58b663aa5 Merge pull request #523 from exFalso/fix-array-class-flags
Fix array flags
2017-02-15 17:42:06 -07:00
Joel Dice
e04c9b22be Merge pull request #524 from exFalso/lambda-fixes
Lambda fixes
2017-02-15 17:41:47 -07:00
Konstantinos Chalkias
111a2fac08 Change encoding between base58, base64, hex (#242)
Helper String extension functions to change encoding between base58, base64, hex
2017-02-15 17:50:15 +00:00
Patrick Kuo
234863f88c Doorman-Jira integration 2017-02-15 15:42:41 +00:00
Ross Nicoll
71babc7019 Remove use of full parties from contract states 2017-02-15 11:43:13 +00:00
Chris Rankin
38e57d6342 CORPRIV-661: Allow profiles to be loaded into DemoBench. 2017-02-14 17:14:54 +00:00
Konstantinos Chalkias
d132d9ed2e Merge pull request #241 from corda/kostas-cryptoB
Useful ByteArray and String {en,de}coding extension functions
2017-02-14 15:56:22 +00:00
Konstantinos Chalkias
ab5c30c3da Comment fixes + split some unit-tests 2017-02-14 14:23:38 +00:00
Konstantinos Chalkias
9e447bd22e Comment fixes + allow mixed and lowercase to Hex 2017-02-14 13:34:03 +00:00
Konstantinos Chalkias
076f0a4435 Useful ByteArray and String {en,de}coding extension functions 2017-02-14 11:07:56 +00:00
Chris Rankin
0ae5713a47 Merge branch 'master' into demobench 2017-02-14 10:37:02 +00:00
Shams Asari
40dde555e7 Added --logging-level cmd line arg to set the logging level, and improved flow logging 2017-02-14 09:56:50 +00:00
Patrick Kuo
7cd8d952a9 Merged in pat-add-keygen-option-to-doorman (pull request #18)
Add keygen option to doorman

Approved-by: Shams Asari
2017-02-14 09:48:22 +00:00
Ross Nicoll
6622db80e7 Remove CashFlow
Remove the CashFlow flow, replacing it with CashFlowCommand which can be used for the use-cases
with instructions passed around as an object.
2017-02-13 17:50:05 +00:00
Andrius Dagys
ac2bc138ac Include Merkle tree root hash in FilteredTransaction
Remove no longer needed test. Make FilteredTransaction constructor private
2017-02-13 17:50:05 +00:00
Patrick Kuo
aff5148c9b Add support for contract upgrades (#165)
* Add support for contract upgrades
* Add interface for the upgraded contract to implement, which provides functionality for upgrading legacy states.
* Add shared upgrade command and verification code for it.
* Add DummyContractV2 to illustrate what an upgraded contract looks like.
* Add new functions to vault service to support upgrading state objects.
* Add contract upgrade flow
2017-02-13 17:50:05 +00:00
David Lee
ef52014504 Updated the notice
... to the last version reviewed & approved by legal counsel
2017-02-13 17:50:05 +00:00
Clinton Alexander
bbb6650632 Capsule fat JAR now contains a CDDL notice. 2017-02-13 17:50:05 +00:00
Shams Asari
71182ec8c1 End flow if waiting for ledger commit and committer flow errors 2017-02-13 17:50:05 +00:00
Ross Nicoll
3c0d6fd14f Split CashFlow into three flows
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>
2017-02-13 17:50:05 +00:00
Ross Nicoll
a9d9441411 Add AnonymousParty superclass of Party
Add AnonymousParty superclass of Party in preparation for anonymising parties stored in
contract states.

Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
2017-02-13 17:50:05 +00:00
Konstantinos Chalkias
35253e53b8 minor changes in for/while loops. Sanity check for even number of nodes (in buildMerkleTree) has now been moved before entering the loop. 2017-02-13 17:50:05 +00:00
chalkido
dbe3b1636d Extract Class pattern: Move MerkleTree (from MerkleTransaction) to its own class file inside core.crypto package. 2017-02-13 17:50:05 +00:00
Joel Dudley
83bcae0cec Rebuilds docs. 2017-02-13 17:50:05 +00:00
Ross Nicoll
53e7c27d58 Split users for bank and big corp 2017-02-13 17:50:04 +00:00