Commit Graph

4633 Commits

Author SHA1 Message Date
Matthew Nesbit
f19ff141dd Update code to use AppServiceHub in services and support for services when using MockServices hub. 2017-10-10 17:11:32 +01:00
Clinton Alexander
daa6caeee2 Bumped gradle plugins to 2.0.2 to publish latest changes. 2017-10-10 15:50:23 +01:00
Alberto Arri
3bee830604 [CORDA-442] Removed the NetworkMap option from Cordform, changed all the examples… (#1827)
[CORDA-442]
Removed the option for Cordformation to specify a networkMap.

All the samples have been migrated to not specify a networkMap.
2017-10-10 15:45:42 +01:00
Maksymilian Pawlak
32e7272642 Review fixes 2017-10-10 15:27:29 +01:00
Maksymilian Pawlak
e7e8bff3dd Merge branch 'master' into m4ksio_gradle_no_o_fix
# Conflicts:
#	constants.properties
2017-10-10 15:26:36 +01:00
szymonsztuka
8c9045bd73 deployNodes Gradle task appends properties from an optional file to node.conf (#1444)
* deployNodes Gradle task appends properties from an optional file to node.conf
2017-10-10 15:03:05 +01:00
Shams Asari
bd53a22efa Removed extraAdvertisedServiceIds config
The remaining use for it was the finance CorDapp for permissioning CCY issuers. Instead this is now taken from a custom config in node.conf.
2017-10-10 13:47:37 +01:00
Ross Nicoll
34dbbe626b Add confidential identity support to cash exit logic (#1849)
generateExit() previously required all states to have a single owner, which was used as the change output's owner. This deprecates that function but enables it to work as expected using `firstOrNull()` instead of `singleOrNull()`, and adds new functions which take in the change output's owner.
2017-10-10 13:46:25 +01:00
Ross Nicoll
242b019dc2 CORDA-641: Remove special case handling of notary transactions (#1675)
Move special case handling of notary transactions into `SignedTransaction`
2017-10-10 13:23:31 +01:00
Viktor Kolomeyko
0e47e53b60 Make AttachmentLoadingTests more stable (#1810) 2017-10-10 12:28:19 +01:00
Alberto Arri
7af1f02a2d Add a configuration option to set how often should a node check for new nodeinfos on disk (#1851)
* Add a configuration option to set how often should a node check for new NodeInfo files in additional-node-infos
2017-10-10 09:55:20 +01:00
cburlinchon
6166fa8358 Don't generate Kt classes (#1798) 2017-10-10 09:51:01 +01:00
Alberto Arri
22b1dead32 Remove functions with spaces in their name (#1850)
Remove all the Kotlin functions with spaces in them since the Android doesn't support them.

See https://github.com/corda/corda/issues/1730 for a more in-depth discussion.
2017-10-10 09:32:43 +01:00
Joel Dudley
d1db35c344 Removes unnecessary @JVMOverloads annotation. 2017-10-10 09:25:45 +01:00
Clinton
484cf75420 CORDA-686 - Split Cordapp gradle plugin from cordformation (#1817)
Added CorDapp gradle plugin written in Kotlin and bumped the version of gradle plugins to 2.0.0 to reflect that this backwards incompatible change is a part of the on going stabilisation of the Corda gradle plugin suite.
2017-10-09 20:08:08 +01:00
Chris Rankin
747830ff90 Scan API for addition of new abstract methods. (#1854)
* Scan API for addition of new abstract methods.
* Make sure we ignore blank lines when counting API changes.
* Add 6 new abstract APIs to our API definition.
2017-10-09 17:38:45 +01:00
Ross Nicoll
70f3d02ce4 Update docs on how IdentitySyncFlow works (#1816) 2017-10-09 17:14:55 +01:00
Ross Nicoll
7ad754fe78 Add signature exchange to transaction key flow (#1417)
Require a signature on a deterministic data blob (which includes X.500 name and public key) when exchanging new confidential identities, in order to ensure that the owner of the key pair wants it to represent the specified name, not just that the certificate owner states the key represents the given identity.
2017-10-09 17:03:04 +01:00
Ross Nicoll
7340a2e32f CORDA-654: Handle non-standard file systems in NodeInfoWatcher (#1818)
Handle non-standard file systems such as JimFs, in NodeInfoWatcher. Instead of using `toFile()` to convert a Path to a File, open the Path for writing to directly.
2017-10-09 16:15:27 +01:00
Tommy Lillehagen
0d15e70d51 Merge pull request #1842 from corda/tlil/reformat-2017-oct
Reformat Oct 2017
2017-10-09 15:57:43 +01:00
Tommy Lillehagen
e1458a40cb Revert code transformation; use of deprecated method 2017-10-09 15:26:40 +01:00
Tommy Lillehagen
14f959b4af Code clean-up run 2017-10-09 15:26:40 +01:00
Tommy Lillehagen
f9dc331551 Reformat files in webserver 2017-10-09 15:26:40 +01:00
Tommy Lillehagen
3f3ffd50e1 Reformat files in verifier 2017-10-09 15:26:40 +01:00
Tommy Lillehagen
b053449b74 Reformat files in tools 2017-10-09 15:26:40 +01:00
Tommy Lillehagen
fcc4bdae7e Reformat files in testing 2017-10-09 15:26:40 +01:00
Tommy Lillehagen
f98942d7ad Reformat files in node-api 2017-10-09 15:26:39 +01:00
Tommy Lillehagen
cb9e27a84a Reformat files in node 2017-10-09 15:26:39 +01:00
Tommy Lillehagen
7a372bed59 Reformat files in finance 2017-10-09 15:26:39 +01:00
Tommy Lillehagen
b1fb321230 Reformat files in experimental 2017-10-09 15:26:39 +01:00
Tommy Lillehagen
551dc43265 Reformat files in client 2017-10-09 15:26:39 +01:00
Tommy Lillehagen
08c4fe2e9e Reformat files in buildSrc 2017-10-09 15:26:39 +01:00
Tommy Lillehagen
a633f8dada Reformat files in core 2017-10-09 15:26:39 +01:00
Viktor Kolomeyko
f6e5d2385a Non-material public API change due to interfaces being re-arranged (#1852) 2017-10-09 15:24:39 +01:00
Alberto Arri
69ad52cf5c Deflake node infoWatcherTest (#1836)
* Stop using the watch service, just re-read the whole directory every time. On macOS it's quite unpredictable and the tests are almost always failing.
2017-10-09 13:53:36 +01:00
Michele Sollecito
29a101c378 [CORDA-683] Enable receiveAll() from Flows. 2017-10-09 13:46:37 +01:00
Viktor Kolomeyko
20a30b30da Initial stub for IntelliJ Code Style settings (#1832)
* Initial stub for IntelliJ Code Style settings

* Added exclusion to ".gitignore"
2017-10-09 13:24:17 +01:00
Chris Rankin
689758a71c CORDA-644: Only serialise Kotlin lambdas when checkpointing. (#1801)
* Remove local function because it is serialised as a lambda.
* Don't automatically whitelist Kotlin lambdas unless checkpointing.
* Add comment to @CordaSerializable, warning not to allow AnnotationTarget.EXPRESSION.
2017-10-09 13:02:40 +01:00
Andrzej Cichocki
f83f1b7010 CORDA-599 Fix circular dependency between vault and SH (#1630)
Fix circular dependency between the 2 vault objects and SH.
2017-10-09 12:49:07 +01:00
Joel Dudley
0c2289de8c Joel move api docs 2017-10-09 11:32:03 +01:00
Viktor Kolomeyko
a9508b393c CORDA-540: AMQP Private key serializer (#1838) 2017-10-09 11:22:11 +01:00
Viktor Kolomeyko
a425f82c77 CORDA-540: Change how standard mutable whitelists structured (#1814) 2017-10-09 10:19:37 +01:00
Matthew Nesbit
d196de32ad Merge pull request #1841 from corda/shams-update-gradle-version
Update gradle plugin version for previous commit
2017-10-09 10:05:10 +01:00
Shams Asari
8d46b6bcbf Update gradle plugin version for previous commit 2017-10-09 09:34:08 +01:00
Shams Asari
727cd0e55c Cleaned up notary configuration by introducing a notary config option.
extraAdvertisedServiceIds is no longer used for this.
2017-10-07 12:52:37 +01:00
Joel Dudley
83f37417ae Fixes the API docs. 2017-10-07 12:48:16 +01:00
Andrzej Cichocki
894f05d84e CORDA-599 Remove dependency of NetworkMapService impls on ServiceHub (#1713) 2017-10-07 10:46:20 +01:00
Tommy Lillehagen
91e2249410 Merge pull request #1823 from corda/tlil/misc-tutorial-fixes
Tutorial Fixes
2017-10-06 16:14:37 +01:00
Michele Sollecito
0b35a99c5a [CORDA-682]: Claim Jigsaw module names (#1824)
[CORDA-682] Specify Jigsaw module names for all JAR projects.
2017-10-06 15:37:33 +01:00
Chris Rankin
7c8a23aea6 Merge pull request #1834 from corda/chrisr3-muppet-fix
Fix filterAnnotationsFor() to return MethodInfo.
2017-10-06 15:27:54 +01:00