ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-01 02:36:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
3,127 Commits 91 Branches 405 Tags 354 MiB
42a6a8302c
Commit Graph

3127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Kuo
42a6a8302c address PR issues 2017-03-08 14:19:03 +00:00
Patrick Kuo
db2840c76a address PR issues 2017-03-08 13:47:05 +00:00
Patrick Kuo
df74024b22 Stop using reference.conf from corda node in doorman 2017-03-07 15:07:59 +00:00
Chris Rankin
d394a30471 Merged in corpriv-702 (pull request #25) 
CORPRIV-702: Sign the DMG with a 'Mac Developer' 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
 2017-03-07 09:55:55 +00:00
Chris Rankin
39dacac330 Merged in corpriv-699 (pull request #24) 
CORPRIV-699: Use platform-specific separator.

Approved-by: Shams Asari
 2017-03-02 09:03:14 +00:00
Chris Rankin
a7d456be15 CORPRIV-699: Use platform-specific separator. 2017-03-01 14:44:35 +00:00
Chris Rankin
438fc97881 Merged in demobench (pull request #16) 
Demobench

Approved-by: Clinton Alexander
Approved-by: Shams Asari
 2017-02-24 09:43:10 +00:00
Chris Rankin
c8ee88a2fb Replace companion object with a BiPredicate lambda. 2017-02-24 09:07:13 +00:00
Chris Rankin
ec9ecc88cc Another simple code review tweak. 2017-02-23 18:15:58 +00:00
Chris Rankin
34797c2735 More code review tweaks. 2017-02-23 17:42:19 +00:00
Chris Rankin
2664a2905c Code review tweaks. 2017-02-23 15:56:40 +00:00
Chris Rankin
396fc43f11 Fixes from code review. 2017-02-23 15:47:46 +00:00
Chris Rankin
a2bf7d4d84 Break textfield definitions out into separate functions. 2017-02-23 10:39:31 +00:00
Chris Rankin
5a13d0355d CORPRIV-661: Ensure that nodes loaded from a profile have the correct network map service. 2017-02-22 17:04:42 +00:00
Chris Rankin
963d015c4d Fixes from code review. 2017-02-22 16:30:25 +00:00
Chris Rankin
dd0d7a0cf4 Merge branch 'master' into demobench 2017-02-22 14:02:30 +00:00
Chris Rankin
d41fa782e0 Merge branch 'get-cash-balances' into demobench 2017-02-22 12:19:49 +00:00
Chris Rankin
63cebb3c96 Merged in get-cash-balances (pull request #21) 
CORPRIV-687: Implement new RPCOp getCashBalances().

* CORPRIV-687: Implement new RPCOp getCashBalances().

* Use proper assertTrue().

Approved-by: Shams Asari
 2017-02-22 12:17:35 +00:00
Chris Rankin
5d81064b4a Use proper assertTrue(). 2017-02-22 12:14:19 +00:00
Chris Rankin
fbd4f0bc6a CORPRIV-687: Refactor RPCOp getCashBalances() into separate branch. 2017-02-22 11:48:26 +00:00
Chris Rankin
0832ea405e CORPRIV-687: Implement new RPCOp getCashBalances(). 2017-02-22 11:27:48 +00:00
Chris Rankin
6ad81ca1e7 Test transmission of an actual cash balance via RPC. 2017-02-22 10:51:46 +00:00
Chris Rankin
1a78ca240a Comment file copying vs file filtering during packaging. 2017-02-22 08:45:35 +00:00
Chris Rankin
2f82b58c9e CORPRIV-659: Renaming packaging script. 2017-02-22 08:45:11 +00:00
Chris Rankin
f6deeff9ae CORPRIV-658: Rename packaging script. 2017-02-22 08:44:38 +00:00
Chris Rankin
9b2b3a31a0 Comment how JediTerm is not available via Maven. 2017-02-21 17:45:45 +00:00
Chris Rankin
f20cb1e74d Downgrade JDK requirement to 8u102, for consistency with capsules. 2017-02-21 16:43:58 +00:00
Chris Rankin
02a9e32d3c CORPRIV-659: Better validation for JAVA_HOME. 2017-02-21 16:32:30 +00:00
Chris Rankin
22d2244ce7 CORPRIV-659: Fix DMG installer. 2017-02-21 15:38:22 +00:00
Chris Rankin
faefae01e2 Fix terminal resizing. 2017-02-21 12:32:47 +00:00
Chris Rankin
d69d9c6fde CORPRIV-661: Ensure that we can rewrite saved profiles correctly. 2017-02-21 11:10:27 +00:00
Chris Rankin
8624537d34 CORPRIV-658: Add external manifest for DemoBench.exe that declares it incapable of native HiDPI support. 2017-02-21 10:40:32 +00:00
Chris Rankin
9023778b07 CORPRIV-658: I've wasted enough time on this - Windows rejects this BMP 
as invalid, and I have no idea why!?
 2017-02-21 09:40:06 +00:00
Chris Rankin
d3e46d97b9 CORPRIV-659: Tweak post-image script for DMG. 2017-02-20 21:49:06 +00:00
Chris Rankin
09d3fb423d CORPRIV-659: Update installer script and icons for DMG. 2017-02-20 17:52:17 +00:00
Chris Rankin
a695ff0140 CORRIV-658: Add icon for Windows installer. 2017-02-20 17:37:06 +00:00
Chris Rankin
31843bbac8 CORPRIV-661: Refactor code for guaranteeing a .zip extension. 2017-02-20 15:49:13 +00:00
Chris Rankin
0f73b68d39 CORPRIV-661: Implement saving profiles. 2017-02-20 15:25:02 +00:00
Patrick Kuo
453d1d8c2b Merged in pat-remove-jira-config (pull request #20) 
Remove jira config template from reference.conf as it is optional configuration

Approved-by: Shams Asari
 2017-02-20 14:42:06 +00:00
Patrick Kuo
e703675e8b Remove jira config template from reference.conf as it is optional configuration 2017-02-20 14:35:28 +00:00
Chris Rankin
ddd8d6a513 Upgrade to TornadoFX 1.6.2. 2017-02-20 09:13:02 +00:00
Ross Nicoll
56387a2831 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-20 08:29:15 +00:00
Andrius Dagys
04e41b5ed4 Include Merkle tree root hash in FilteredTransaction 
Remove no longer needed test. Make FilteredTransaction constructor private
 2017-02-20 08:29:15 +00:00
Patrick Kuo
680bf8e462 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-20 08:29:15 +00:00
David Lee
0431181fed Updated the notice 
... to the last version reviewed & approved by legal counsel
 2017-02-20 08:29:15 +00:00
Clinton Alexander
209ec1b1a0 Capsule fat JAR now contains a CDDL notice. 2017-02-20 08:29:15 +00:00
Shams Asari
a72fb28571 End flow if waiting for ledger commit and committer flow errors 2017-02-20 08:29:15 +00:00
Ross Nicoll
7dc6f47b3d 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-20 08:29:15 +00:00
Ross Nicoll
521994ce23 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-20 08:29:15 +00:00
Konstantinos Chalkias
aae8256041 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-20 08:29:15 +00:00