ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 00:38:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
5,376 Commits 91 Branches 405 Tags 354 MiB
593708e885
Commit Graph

5376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joel Dudley
593708e885
Reflects master changes to set up and contrib instructions. (#3264) 2018-05-30 13:45:58 +01:00
Katelyn Baker
5ee91e6425
Merge pull request #3253 from corda/serializer-backports 
Serializer backports
 2018-05-30 09:20:30 +01:00
Katelyn Baker
aaa6eadadd RELEASE - Update api to match new annotation generation 2018-05-29 18:41:35 +01:00
Katelyn Baker
7d9199fd14 CORDA-1545 - Arrays of primitive byte arrays don't deserialize (#3249) 
At serialization time we incorrectly encode the type as byte[p][] instead
of binary[]
 2018-05-29 14:59:47 +01:00
Katelyn Baker
ba0a94d54d CORDA-1530 - Generics break default evolver (#3232) 
* CORDA-1530 - Generics break default  evolver

When selecting an annotated constructor for evolving a type make sure
we treat generics in the same manner we did when serialized. Effectively
throw away the template information and treat lists as lists and maps
as maps
 2018-05-29 14:52:23 +01:00
Michele Sollecito
76eaff6d88 Corda-1338 | Corda-1394 (#3205) 
* [CORDA-1394]: Node can fail to fully start when a port conflict occurs, without a useful error message (fix).

* [CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState (fix).

* [CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState (fix).

* Attempting to fix weird recursive types problem.

* Attempting to fix weird recursive types problem.

* Attempting to fix weird recursive types problem.
 2018-05-23 17:52:02 +01:00
Shams Asari
2729ada251 CORDA-1405 - Integration test for network parameter updates and improved logging (#2865) 
(cherry picked from commit 620ba1e)

Also updated the toString() of NetworkParameters and NetworkMap to be better formatted.
 2018-05-22 13:57:15 +01:00
Katelyn Baker
f9e0742d69
CORDA-1455 - Error in process-id deletion process allows multiple instances of same node to be run (fix). (#3118) (#3195) 2018-05-19 12:35:32 +01:00
Katelyn Baker
2d1ceb6cb0
CORDA-1342 - The shell doesn't print the return value of a started flow - fixed. (#3007) (#3197) 2018-05-19 12:35:12 +01:00
Katelyn Baker
540132174c
CORDA-1315 - small doc correction (#3079) (#3192) 
* CORDA-1315 small doc correction

* CORDA-1315 address code review changes
 2018-05-18 16:24:22 +01:00
Katelyn Baker
e39c7a222a
CORDA-1386 - Updates withoutIssuer to not strip display token size. (#3191) 2018-05-18 15:46:04 +01:00
Katelyn Baker
35246460e2
Merge pull request #3189 from corda/cherrypick-corda-1397 
CORDA-1397 - Fixed incorrect exception handling in `NodeVaultService…
 2018-05-18 14:29:02 +01:00
Katelyn Baker
839cd04fdc
Merge pull request #3114 from corda/cherrypick-corda-1317 
CORDA-1317 - Add cert role to CSR and doorman issue cert according to the cert role
 2018-05-18 14:28:41 +01:00
Michele Sollecito
1700d30bc7 [CORDA-1397]: Fixed incorrect exception handling in NodeVaultService._query(). (#3043) 2018-05-18 12:14:47 +01:00
josecoll
1b214e00c1
Reordering fix: move now works as depends on creation of html directory from previous step. (#3106) 2018-05-17 10:29:07 +01:00
Anthony Keenan
181829a325 CORDA-1280 - Update the api-scanner to the most recent version + regenerate api (#3154) 
* Update v3 api scanner to most recent version

* Regenerate api-current.txt

* Fix bootstrapper classpath
 2018-05-16 11:56:23 +01:00
Katelyn Baker
d63ee71564
CORDA-1344 Fix query paging in scheduled flow tests (#2970) (#3096) 
* Fix paging tests, move out of scheduled flow tests and provide java example

* Fix a few issues with docs
 2018-05-15 15:57:27 +01:00
Katelyn Baker
c2b733d64c merge failure fix 2018-05-11 18:08:33 +01:00
Joel Dudley
7a7599486b
Resolves conflicts. (#3089) 2018-05-11 10:06:49 +01:00
Patrick Kuo
77a138a04e CORDA-1317 - Add cert role to CSR and doorman issue cert according to the cert role (#2620) 
Cherrypick from master

* ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role (#431)

* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.

(cherry picked from commit 94f7392)

* remove R3 corda code
 2018-05-10 17:48:48 +01:00
Katelyn Baker
92048efaa4
CORDA-1414 - node should continue with parameters from file when network map not available (#3061) (#3098) 
Fix CORDA-1414

If network map is not available or returns exception on network
parameters reading, node should continue with parameters from file.
 2018-05-10 10:59:15 +01:00
Katelyn Baker
25e76017e1
CORDA-1346 - split the simm valuation demo to reduce the size of the contract jar - backport (#3099) 
* CORDA-1346 split the simm valuation demo to reduce the size of the contract jar (#3078)

* CORDA-1346 fix backport
 2018-05-09 17:05:38 +01:00
Shams Asari
05671af82a CORDA-1385 - Ignore duplicate packages and sub-packages in driver extraCordappPackagesToScan (#3068) 
Otherwise duplicate test CorDapps are loaded into the node

(cherry picked from commit 9ffb43f)
 2018-05-09 11:57:48 +01:00
Katelyn Baker
baf5c97e0c
CORDA-1403 - Generics serialization issue (#3030) (#3095) 
When implementing a generic interface subtype check fails, need
to compare to the actual raw type
 2018-05-09 09:44:08 +01:00
Shams Asari
8c5fe16211 DOCS - Fixed invalid page ref in upgrade-notes.rst (#3053) (#3055) 
(cherry picked from commit 514287e)
 2018-05-02 12:25:41 +01:00
Katelyn Baker
7701dad80b
CORDA-1229 - Fix issue with setter-based serialisation (#3051) 2018-05-01 20:52:39 +01:00
Shams Asari
ee8d8a7618 Removed CordappConfig from the V3 release notes as it's not part of this release. (#2966) 2018-05-01 16:23:14 +01:00
Shams Asari
5d4956079a CORDA-1389 - Delete the root nodes directory before initialising the nodes. (#3044) 
This is to enable multiple calls to deployNodes without doing a gradle clean.
 2018-05-01 15:33:11 +01:00
Katelyn Baker
9063e24c69
Update jolokia to 1.5.0 (#2617) (#3034) 
* Update jolokia to 1.5.0

* adding jolokia update to changelog
 2018-05-01 15:29:52 +01:00
Anthony Keenan
59bdc5862c CORDA-1304 - Remove superfluous registerInitiatedFlow calls from tutorial and example tests (#2944) (#3035) 2018-05-01 14:32:11 +01:00
Katelyn Baker
503071a9fc RELEASE - Post V3.1 update vno to 3.2-corda-snapshot 2018-04-11 16:58:05 +01:00
Katelyn Baker
e2c8346e31 RELEASE - update docs for 3.1 2018-04-11 13:30:30 +01:00
Katelyn Baker
d193dd85e0 REVIEW: Final release vno 2018-04-11 13:08:15 +01:00
Katelyn Baker
673d8cbf2a
Pre release v3.1 releasenote (#2937) 
* RELEASE - 3.1 upgrade and release notes

* Update docs for change to vno

* address vno change in release notes

* Update release-notes.rst

* make corda links

* Review comments

* Review comments

* review comments

* remove ref to reverted bugfix

* Review comments
 2018-04-11 13:05:50 +01:00
Kat Baker
a047a1ed5e RELEASE - Update vno for RC02 testing 2018-04-10 19:25:25 +01:00
Katelyn Baker
ddec72674c
REVERT - CORDA-1264 - Needs more thought prior to release (#2952) 
* REVERT - CORDA-1264 - Needs more thought prior to release

This reverts commit 33af80ac55.

Since this causes regressions in the way errors are propogated to
clients it seems best to not break or hold up 3.1 but revert this commit
and move on

* fix revert
 2018-04-10 18:18:57 +01:00
Shams Asari
4e4901825a CORDA-1181 - Add back information on initial registration (#2945) 
(cherry picked from commit 2792716)
 2018-04-07 17:24:14 +01:00
Katelyn
b158102b10 RELEASE: swap version number around 
Was corda-3.1 now it's 3.1-corda

should work better with external tools
 2018-04-06 17:21:02 +01:00
Anthony Keenan
de13c9030c CORDA-1292 - Add CordaService testing documentation and improve tests in irs-demo (#2929) (#2938) 
* Add CordaService testing documentation and improve tests in irs-demo

* Addressed review comments
 2018-04-06 14:24:31 +01:00
Katelyn Baker
ecea71437b RELEASE: update vno for release testing (#2933) 
* RELEASE: update vno for release testing

* [CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo (#2929)

* Add CordaService testing documentation and improve tests in irs-demo

* Addressed review comments

* [CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo (#2929)

* Add CordaService testing documentation and improve tests in irs-demo

* Addressed review comments
 (reverted from commit 4d39be10a5)
 2018-04-06 10:12:27 +01:00
Andras Slemmer
7501e87a54 CORDA-1295: Clean up client->observable association on observable finish (#2915) 2018-04-04 12:40:32 +01:00
Shams Asari
6ae0142bc8 CORDA-1276: Cleaned up creation of node-info object on node start and when using --just-generate-node-info (#2912) 
(cherry picked from commit 65ff214)
 2018-04-04 09:26:03 +01:00
Michele Sollecito
33af80ac55
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2902) 2018-03-29 14:40:40 +01:00
Katelyn Baker
db29fceb4c
Improve the upgrade-test-packages.sh script to work on macOS. Fixes an issue found by tom on pubslack. (#2894) (#2901) 2018-03-29 13:13:09 +01:00
Katarzyna Streich
becfcf8b6c ENT-1668 - Don't crash on node startup when network map is not available (#2897) 
* ENT-1668: Don't crash on node startup when network map is not available (#2887)

Fix ENT-1668

Don't crash on node startup when network map is not available

* Add changelog entry
 2018-03-29 12:45:24 +01:00
Michele Sollecito
5ac4c7eda7 CORDA-1267 - Make JPA entities non-final and Serializable. (#2899) 2018-03-29 12:43:42 +01:00
Katelyn Baker
c59f3e0786
Generate a PDF version of the docsite. Request from a user in Slack. (#2900) 2018-03-29 12:43:22 +01:00
Katarzyna Streich
2f0f737c3f ENT-1686 - Improve error message on parameters mismatch (#2891) (#2896) 
Improve error message on parameters mismatch
 2018-03-29 11:41:39 +01:00
Katelyn Baker
8431616b87
DOCS: Serialization roundtrip removes mutability explanation (#2883) 
* DOCS: Serialization roundtrip removes mutability explanation

* review comments

* review comments

* Review comments

* Review comments

* Review comments
 2018-03-27 20:21:40 +01:00
Tudor Malene
de40d1dae5 ENT-1564 - add additional uploader check to the HashConstraint (#2845) (#2881) 
* ENT-1564 - add additional uploader check to the HashConstraint (#2845)

(cherry picked from commit 1a1cd94)

* ENT-1564 changelog entry

* ENT-1564 ignored tests that were removed in master
 2018-03-27 17:09:22 +01:00