ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-03 19:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,996 Commits 91 Branches 405 Tags 354 MiB
7a9364c8d5
Commit Graph

9996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viktor Kolomeyko
c0dd8d338e CORDA-649: Improving logging (#1699) 2017-09-28 10:06:10 +01:00
Chris Rankin
57e131d8a0 Prevent the root project from building an unwanted dummy cordapp. (#1706) 2017-09-27 23:49:20 +01:00
Katelyn Baker
006df7f23c Merge pull request #1668 from corda/feature/kat/carpenterRespectWhitelistPArt2 
CORDA-601 - Tests to ensure carpenter isn't exposed by unwhitlisted types
 2017-09-27 23:36:44 +01:00
Katelyn Baker
cfcc5aad67 CORDA-601 - Review Comments 
So...

On reflection, and adding a number of tests for static initialisation
with serialised types it looks like there is no chance that the
serializer factory will ever pass a non white-listed type through to the
carpenter in the first place.

As such leaving the plumbing in as it may be useful to pass a blacklist
at some point into the carpenter and the tests are always useful
(ignoring those that won't work without the white-list checking)
 2017-09-27 21:53:15 +01:00
Katelyn Baker
f59b22ba98 CORDA-601 - Carpenter should respect whitelist 
The class carpenter should refuse to carpent classes that are not
whitelisted or marked as CordaSerializable. This prevents any security
issue where a malicious message could indicate a class had a member of
some type that on construction did something bad. By respecting the
whitelist we avoid this.

As the carpeter annotates anythign it constructs as CordaSerializable,
it will always be able to carpent classes that contain memebrs that were
unknown, and thus unannotated, carpented classes
 2017-09-27 21:26:15 +01:00
Clinton
334164aa86 Fixed several bugs in the contract constraints work (#1695) 
* Added schedulable flows to cordapp scanning
* Fixed a bug where the core flows are included in every cordapp. 
* Added a test to prove the scheduled flows are loaded correctly. 
* Enabled a negative test to prove that we are not currently dynamically loading attachment classes from the network.
 2017-09-27 18:34:17 +01:00
Katelyn Baker
5ed755d3fe CORDA-653 - Serialised enums should respect whitelist (#1692) 2017-09-27 18:02:35 +01:00
Konstantinos Chalkias
c8fc1b624b Updating docs w.r.t. new FilteredTransaction and TransactionSignature (#1678) 2017-09-27 15:51:44 +01:00
Michele Sollecito
e393fdd292 Merge pull request #52 from corda/enterprise-merge-september-26 
Enterprise merge september 26
 2017-09-27 15:50:25 +01:00
Andras Slemmer
72cff032e6 FlowSession docs (#1660) 2017-09-27 15:33:09 +01:00
josecoll
512de2690d Added changelog entry. (#1691) 2017-09-27 15:29:00 +01:00
Rick Parker
39160de0a3 BIGINT fix for H2 coin selection. (#1659) 2017-09-27 15:15:34 +01:00
Rick Parker
0c910640bb Misc documentation fixes (#1690) 2017-09-27 15:14:39 +01:00
sollecitom
3f5561db1e Fixed Enclavelet 2017-09-27 15:05:18 +01:00
Shams Asari
0ce0baa235 Removed initialiseSerialization param from CordaRPCClient, mirroring change in 1.0 branch 2017-09-27 14:43:04 +01:00
Andras Slemmer
2054827528 Merge pull request #1650 from corda/aslemmer-rpc-delay-arg-deserialisation 
Delay RPC arguments deserialisation to allow routing of errors
 2017-09-27 13:47:19 +01:00
Andrius Dagys
7a55855afb Fix validating notary flow to handle notary change transactions properly. 
Add a notary change test for checking longer chains involving both regular and notary change transactions.
 2017-09-27 13:44:57 +01:00
josecoll
241f843555 Unification of VaultQuery And VaultService APIs (into single VaultService interface) to simplify node bootstrapping and usability. (#1677) 2017-09-27 13:33:23 +01:00
Maksymilian Pawlak
06cf741c0d Merge pull request #1684 from corda/m4ksio_irs_demo_fixes 
IRS Demo UI Fixes
 2017-09-27 13:21:13 +01:00
mkit
d1891faa4d FlowSnapshot serialization error (#1671) 
* Converting SubList to list due to the Kryo lack of support

* Adding test

* Addressing review comments
 2017-09-27 13:17:55 +01:00
Andrzej Cichocki
9874e1ff34 uncheckedCast crusade (#1667) 2017-09-27 12:58:48 +01:00
Maksymilian Pawlak
c8739e83a9 IRS Fixes to bring UI closer to declared financial types 2017-09-27 12:41:40 +01:00
sollecitom
85bc0a38a2 Trying to fix EnclaveletTest.kt 
Trying to fix EnclaveletTest.kt

Trying to fix EnclaveletTest.kt

Trying to fix EnclaveletTest.kt

EnclaveletTest passes.

Restored incorrectly removed function in TransactionDSLInterpreter.

Fixed NativeSgxApiTest
 2017-09-27 12:04:18 +01:00
Andras Slemmer
762b2a5123 More memory to attachment demo test nodes 2017-09-27 11:41:34 +01:00
Chris Rankin
c6c4c13bee Declare this internal message string as "const". (#1674) 2017-09-27 11:32:10 +01:00
Mike Hearn
1b349214ff Docs: mention RPC access in NodeInfo javadoc 2017-09-27 11:47:34 +02:00
Mike Hearn
df453bdaa8 Docs: add @suppress to a few things that were polluting the Dokka docs. 2017-09-27 11:47:34 +02:00
Mike Hearn
6686b054a2 Docs: flesh out javadocs on ServiceHub 2017-09-27 11:47:34 +02:00
Mike Hearn
b75c9f9254 Ironic: upgrade the version of the Gradle plugin that checks for upgraded versions of things. 
It had broken due being incompatible with the new versions of Gradle
itself.
 2017-09-27 11:47:34 +02:00
Mike Hearn
7a082a6598 Add an IntelliJ scope that covers the currently supported Corda API. 
This is useful when used in combination with the "Highlight public
declarations with missing KDoc" inspection.
 2017-09-27 11:47:34 +02:00
Mike Hearn
c79d14cb6e RPC: make RPCConnection non-internal, as it's a core API. Move docs around so they're on public API not internal API. 2017-09-27 11:47:34 +02:00
Mike Hearn
e49da94418 Minor: use package descriptions in Kotlin build of api docs too, not just javadocs. 2017-09-27 11:47:34 +02:00
Mike Hearn
d3e1a8e1c0 Minor: improve javadocs in NodeInfo 2017-09-27 11:47:34 +02:00
Viktor Kolomeyko
8a842d1d53 CORDA-540: Ensure that covariance of type is handled correctly when serializing with AMQP (#1631) 2017-09-27 09:19:25 +01:00
Ross Nicoll
aff4d35ccb Enforce JSON serialized key format (#1606) 
Move Jackson public key encode/decode support away from Kryo serialization format for compactness and to DER format encoded as base64 for compatibility with other systems.
 2017-09-26 18:22:35 +01:00
sollecitom
9284e731c0 Merge remote-tracking branch 'remotes/open/master' into enterprise-merge-september-26 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
#	settings.gradle
 2017-09-26 18:08:47 +01:00
Clinton
24ff7efd5f Cordapps now have a name field (#1645) 
* Cordapps now have a name field.
 2017-09-26 17:15:11 +01:00
Michele Sollecito
35924ba737 Upgraded to Kotlin 1.1.50. (#1657) 2017-09-26 14:34:13 +01:00
Patrick Kuo
474a72d1d2 [CORDA-624] Node Explorer on Issuing cash throws MissingContractAttachements exception (#1654) 2017-09-26 14:21:40 +01:00
Ross Nicoll
e1b040ba0e Replace for ..-1 with until (#1513) 2017-09-26 13:37:13 +01:00
Michele Sollecito
63168c0299 [CORDA-481]: GH 965: Java 8 lambdas don't work properly in checkpointing (#1619) 2017-09-26 13:22:59 +01:00
Alberto Arri
246ab26d30 Properly escape backslashes in windows paths (#1556) 
* fix some backslashes in the windows paths in the docs


This reverts commit 4532bca580.
 2017-09-26 12:54:28 +01:00
Andras Slemmer
9d115a2111 Delay RPC arguments deserialisation to allow routing of errors 2017-09-26 11:18:11 +01:00
Shams Asari
4df8b427d2 Removed SSLConfiguration parameter from CordaRPCClient, thus removing SSL support. 
The current use of SSL RPC relies on access to the node's keystore file, and further to that some uses where using the NODE_USER to login on the p2p port.
 2017-09-26 10:41:43 +01:00
Viktor Kolomeyko
b4e674c2fe CORDA-540: Implementation of path in the serialization graph (#1484) 2017-09-26 10:31:37 +01:00
Ross Nicoll
da82a0be40 CORDA-499: Dokka cleanup (#1575) 
* Make functions in CompositeSignature static
* Make contract IDs constant
* Remove use of "e.g." which Dokka will take as end of the first sentence
* Move example onto function that it actually works with
* Change comment which refers to comment above it, without any linkage, to directly describe the function
* Move implementation notes out of Dokka comment
* Change contract IDs to constants in companion objects
 2017-09-26 10:26:44 +01:00
Chris Rankin
04a801e0cd Squashed commit of the following: (#50) 
commit 9d8046e310efe860bb9d81e977a323f3905665c1
Author: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Date:   Sat Sep 16 11:26:45 2017 -0500

    Check and handle signal interrupts in sockets

    Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>

commit 960ad91a4a8ec06020273a175471def37870fda6
Author: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Date:   Sat Sep 16 11:27:35 2017 -0500

    Add error code in oal for invalid inputs

    Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>

commit e22c569335c1ec8d18f7df8105a68e9b9a82e691
Author: Li, Xun <xun.li@intel.com>
Date:   Wed Sep 20 10:51:18 2017 +0800

    Update libunwind for glibc 2.26 compatibility

    libunwind should include <signal.h> explicitly.
    glibc change sys/ucontext.h as a bug fix(https://sourceware.org/git/?p=glibc.git;a=commit;h=cfed8ece799b6e6540193a14b41d9de52dc3b08f)

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 9cda5c4774b2f4fc02fd031f98057cd88d14f2e0
Merge: 94c162c98 36918f071
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Wed Sep 20 09:58:29 2017 +0800

    Merge pull request #165 from corda/chrisr3-stack-protector-fix

    Ensure trts_nsp.cpp is compiled without stack protection.

    Signed-off-by: Zhang Lili lili.z.zhang@intel.com

commit 36918f071fd29c86335b0cea0e072c3f08a51eae
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Tue Sep 19 07:31:57 2017 +0000

    Ensure trts_nsp.cpp is compiled without stack protection.

    Signed-off-by: Chris Rankin <chris.rankin@r3.com>

commit 94c162c98bf95a034eadb41bfa6e6a35f410a0c8
Author: Kai Mast <kaimast@cs.cornell.edu>
Date:   Mon Sep 18 04:07:19 2017 -0400

    g++7 fixes (#148)

    Signed-off-by: Li, Xun<xun.li@intel.com>

commit 8a72fed8737dc8e331889e6530925fc5a0be2ea0
Merge: 2133df2d4 635e3a370
Author: Li Xun <xun.li@intel.com>
Date:   Mon Sep 18 15:58:10 2017 +0800

    Merge pull request #159 from corda/chrisr3-gcc7-fix

    Resolve GCC 7.1 warnings about deprecated throw(std::bad_alloc) in C++11.

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 635e3a37081ad3f773a0ff24c89f1e6094034d28
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Wed Sep 13 10:31:11 2017 +0100

    Resolve warnings about deprecated throw(std::bad_alloc) in C++11.
 2017-09-26 10:22:55 +01:00
Mike Hearn
20a9892123 RPC: Report failures during deserialisation of method arguments to the client as an exception. 2017-09-26 11:15:29 +02:00
Shams Asari
4030903fee Merge pull request #1642 from corda/shams-fix-attachment-demo-test 
Fixed AttachmentDemoTest
 2017-09-26 09:45:25 +01:00
Katelyn Baker
7c63597937 Merge pull request #1622 from corda/feature/kat/carpenterRespectWhitelist 
CORDA-601 - Start adding whitelist support to the carpenter
 2017-09-26 09:39:07 +01:00