ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 17:57:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,915 Commits 91 Branches 405 Tags 354 MiB
4f2d8d058e
Commit Graph

9915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Sailer
45e4a96d77 Merge branch 'master' of https://github.com/corda/enterprise into christians-fix-unittests-for-windows 2017-10-16 13:21:01 +01:00
Andrzej Cichocki
38cf4a489e CORDA-676 Eager cordapp schemas (#1839) 
* Retire customSchemas.
* Key cordapp-to-hash map by url as native equality too strict.
 2017-10-16 11:35:29 +01:00
mkit
5ee784999a Renaming package to com.r3 (#58) 2017-10-16 11:15:35 +01:00
Alberto Arri
d3d87c2497 [CORDA-442] DemoBench copies around the NodeInfos for running nodes. (#1796) 
[CORDA-442] DemoBench copies around the NodeInfos for running nodes.
 2017-10-16 09:42:13 +01:00
Viktor Kolomeyko
99b509cb68 Attempting to make VerifierTests more stable (#1883) 
* Attempting to make VerifierTests more stable

Main point: Alice node will always be faster to locate Alice by name than NotaryNode. Especially given that it may take some time
for Alice node to get reflected on the Notary's NetworkMap.

Also additional logging which might be helpful during debug and IntelliJ changed project structure reflection.

* Introduce a way for nodes to reliably learn about each other existence in the NetworkMap

Plus minor refactoring of the Driver code.
 2017-10-16 09:16:40 +01:00
Christian Sailer
8549a77a76 Use system tmp dir instead of hardcoding unix path 2017-10-13 16:31:44 +01:00
josecoll
be235673e1 H2 coin selection uses Prepared Statement to protect against SQL injection (#1872) 
* Updated H2 coin selection code to use Prepared Statement to protect against SQL Injection attacks.

* Clean-up deprecations and warnings.

* Revert correct indentation.

* Revert logging back to debug for SQL display.

* Fix broken tests.
 2017-10-13 16:26:55 +01:00
Clinton
2680361696 Renamed "plugins" dir to "cordapps" (#1644) 
* Renamed plugins dir to cordapps dir while maintaining backwards compatibility with the plugins dir.
Bumped gradle plugins to 2.0.4
 2017-10-13 15:01:24 +01:00
Christian Sailer
b8538d5eb7 Fix file resource for non-unix filesystems. 2017-10-13 14:43:33 +01:00
Chris Rankin
635ad9ac92 Ensure that the contents of OpaqueBytes cannot be modified. (#1871) 
* Ensure that contents of OpaqueBytes cannot be modified.
* Update documentation and restore the signature verification check.
* Update the API definition.
* KDoc fixes.
* Update the changelog for v1.1.
 2017-10-13 12:27:42 +01:00
Clinton
86ede6f928 Upgraded to 2.0-SNAPSHOT since current changes are for 2.0 (#1880) 2017-10-13 12:21:48 +01:00
Andrzej Cichocki
ce5b7de718 CORDA-530 Unduplicate code (#1791) 2017-10-13 12:15:52 +01:00
Andrius Dagys
7b10e92819 Fixed AbstractNode to load custom notary services properly (#1720) 
* Fixed AbstractNode to load custom notary services properly.
Added a custom notary sample.

* Prevent multiple custom notaries from being loaded

* Throw if more than once custom notary service is loaded
 2017-10-13 10:36:25 +01:00
Christian Sailer
81804df1eb Merge pull request #57 from corda/christians-fix-doorman-tests-for-windows 
Fix URI use in doorman parameters test so it works on Windows as well
 2017-10-13 09:38:54 +01:00
Joel Dudley
544b761682 Remove broken link. 2017-10-12 13:21:00 +01:00
Chris Rankin
d1c5111567 Remove the two header lines from the diff output to simplify the +/- … (#1875) 
* Remove the two header lines from the diff output to simplify the +/- check.
* Revert Kt class changes as they alter the public API.
 2017-10-12 11:39:22 +01:00
Ross Nicoll
327f0ebd73 CORDA-654: Migrate test APIs to match identity changes (#1744) 
Rework identity usage in tests to extract identity from nodes by name, rather than just arbitrarily choosing the first identity. This better models the intended design for production (future work).
 2017-10-11 18:26:09 +01:00
Konstantinos Chalkias
ed79db6864 Clean up Crypto (#1866) 
clean up Crypto comments + PublicKey.toSHA256Bytes() uses .encoded
 2017-10-11 17:47:48 +01:00
Joel Dudley
de391dc9f0 Adds a length method to calculate a time-window's length. 2017-10-11 16:15:24 +01:00
Matthew Nesbit
692b57d845 Merge pull request #1853 from corda/mnesbit-protect-sessionmessage 
Protect the serialization/deserialization code of SessionMessage data
 2017-10-11 15:53:03 +01:00
Matthew Nesbit
899f7f9d0d Change the serialization/deserialization code of SessionMessage data to add more validation. 
Address PR comments

As pointed out by Shams the SessionInit must be well formed at this point.
 2017-10-11 15:17:48 +01:00
Joel Dudley
e232d111ea Applies release-V1 vault docs fixes to master. 2017-10-11 14:46:04 +01:00
Rick Parker
3fdc69e541 Fix coin selection with Flow-friendly sleep (#1847) 2017-10-11 14:33:20 +01:00
Alberto Arri
d0d0f132df Create nodeInfoDirectory in NodeInfoWatcher initialization, and make NodeInfoWatcher logging less verbose and less frequent (#1857) 
Let NodeInfoWatcher create the directory it wants to poll at startup.
Also log failure in creating the directory, but don't log anything if it can be found at poll time.
 2017-10-11 12:54:30 +01:00
Andras Slemmer
af44c96c14 Merge pull request #1863 from corda/aslemmer-kryo-hook 
Aslemmer kryo hook
 2017-10-11 12:42:18 +01:00
Clinton
15d29d7982 Fixed the dozens of artifactory warnings at gradle initialisation. (#1862) 
* Fixed the dozens of artifactory warnings at gradle initialisation.
 2017-10-11 12:41:11 +01:00
Chris Rankin
9cec137a31 CORDA-702: Don't whitelist certain non-annotated types (#1864) 
* Don't whitelist arrays of non-serialisable types for RPC.
* Don't whitelist enums which have not been annotated as serialisable.
 2017-10-11 11:17:14 +01:00
Viktor Kolomeyko
ef0f0acc4a Make integration tests pass in AMQP mode, part 1 (#1855) 2017-10-11 11:13:46 +01:00
Andrzej Cichocki
4ee250a19b Retire setCordappPackages. (#1860) 2017-10-11 10:35:21 +01:00
Andras Slemmer
b354d335a3 Remove extra blank line 2017-10-11 10:35:11 +01:00
Andras Slemmer
c2cda569e1 Add kryo-hook to settings.gradle 2017-10-11 10:06:52 +01:00
Andras Slemmer
c56c9fd455 Add README.md, some docs 2017-10-11 10:06:27 +01:00
Andras Slemmer
16b26970a9 Add kryo-hook javaagent 2017-10-11 09:54:19 +01:00
Matthew Nesbit
c96031d311 Merge pull request #1846 from corda/mnesbit-upgrade-cordaservices 
Update code to use AppServiceHub in services
 2017-10-11 09:11:35 +01:00
Christian Sailer
39d139dc15 Fix URI use in doorman parameters test so it works on Windows as well 2017-10-10 18:05:41 +01:00
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
Christian Sailer
7ab94650a6 Cash flows and unit tests 2017-10-10 17:00:36 +01:00
Christian Sailer
e0b684b3ea Simple trade flow for commercial paper 2017-10-10 16:33:16 +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
Christian Sailer
1cb4f56609 Added unit tests for commercial paper 2017-10-10 14:58:55 +01:00
Christian Sailer
22bf2b1c1d PtCashTests and missing bits of implementation to make them work 2017-10-10 14:32:18 +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
Christian Sailer
8ae92850c9 State and Contract for Cash and CommercialPaper copied to perftestflows 2017-10-10 13:10:21 +01:00
Viktor Kolomeyko
0e47e53b60 Make AttachmentLoadingTests more stable (#1810) 2017-10-10 12:28:19 +01:00