ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-19 18:45:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,661 Commits 99 Branches 407 Tags
Commit Graph

13661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Kuo
459b330ebd
Add programmatic print help to CordaCliWrapper (#4177) 
* add programmatic print help to CordaCliWrapper

* address PR issues

* bug fix
 2018-11-07 14:14:58 +00:00
szymonsztuka
729b457332
Update to corda-grade-plugins version 4.0.34. (#4176) 2018-11-07 13:50:15 +00:00
Dominic Fox
f3b372d31d
CORDA-2099 make serializer factory interface (#4137) 
* Separate SerializerFactory construction from concrete implementation

* Fewer build methods

* Method naming that doesn't fatally confuse determinisation

* Extract SerializerFactory interface

* Reset to master's version of compiler.xml

* Un-ignore flickering test

* Remove unnecessary build method

* Whitespace

* Unused import

* Change build method

* Formatting fixes

* Fix test
 2018-11-07 13:48:45 +00:00
szymonsztuka
7f01f9ca61
Added new static method to API Stability check (related to CORDA-2011/CORDA-2057). (#4186) 2018-11-07 13:38:03 +00:00
szymonsztuka
7961124bca
Merge pull request #1545 from corda/merges/os-merge-to-6f00560 
OS -> ENT merge to 6f00560
 2018-11-07 13:28:07 +00:00
szymonsztuka
0a8aa828b3 API stability - Added new static method in Crypto. 2018-11-07 11:29:54 +00:00
szymonsztuka
9b57490b2d API stability - Added new static method in Crypto. 2018-11-07 11:16:54 +00:00
Stefano Franz
ba9852bbe9
add documentation for initiating flow modification (#4180) 2018-11-07 11:40:10 +01:00
szymonsztuka
19510315b4 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-6f00560 
# Conflicts:
#	core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
 2018-11-07 09:49:23 +00:00
Konstantinos Chalkias
da8dec0d63
[CORDA-2192] Corda specific OID for AliasPrivateKey (#4175) 2018-11-07 09:48:13 +00:00
Michal Kit
6f005605aa
CORDA-2187 & CORDA-2038: reverting maxTransactionSize <= maxMessageSize (#4166) 
* CORDA-2187 reverting maxTransactionSize <= maxMessageSize

* Addressing review comments

* Increasing the maxTransactionSize for the Bootstrapper

* Updating the testNetworkParameters
 2018-11-07 09:28:27 +00:00
James Brown
c205a10ec0
ENT-2684 Fix owasp dependency checker to fail builds based on CVSS level (#4169) 
OWASP Dependency Checker has been updated so that it can be configured to automatically fail a build when a vulnerable dependency is detected. This option is exposed through gradle settings, so that a build can be configured in TeamCity to pass/fail. This change is backward-compatible - i.e. it does not affect a build by default unless configured to do so.

Ability to fail a build is exposed by the new owasp.failBuildOnCVSS gradle property
By default this is set to '11.0' which will always pass a build even if a vulnerability is found (so will not affect anything by default)
Reduce the CVSS level between 0-10 to indicate what level to fail a build on
Example usage to catch Medium severity (and above) issues:

Configure gradle with the option -Powasp.failBuildOnCVSS=4
 2018-11-07 09:00:19 +00:00
josecoll
b692c59553
Merge pull request #1543 from corda/colljos-merge-to-015a36dad 
OS -> ENT merge
 2018-11-06 22:16:13 +00:00
Anthony Keenan
6fd724338a
CORDA-2183: Show root cause of error in console to aid with debugging (#4178) 
* Show root cause of error in console

* Add more explicit logical separator between message and root error

* Add default if e.cause is null
 2018-11-06 22:15:22 +00:00
szymonsztuka
d33aeb9881
Disable integration test with timing to run in database mode. (#1541) 
Disable TimedFlowMultiThreadedSMMTests running in database mode.
Added new logins for Azure SQL reference setup.
 2018-11-06 18:09:31 +00:00
Anthony Keenan
ac64b6c37c
Ignoring invalid test (works on Linux not on Windows) (#4173) 2018-11-06 17:31:11 +00:00
josecoll
356941a733 Merge commit '015a36dad67998236eda7e45309e66e5d58b6374' 2018-11-06 16:29:24 +00:00
Christian Sailer
105091548e
Merge pull request #1540 from corda/christians/merge_3260d9f 
Merge up to  3260d9f
 2018-11-06 16:07:41 +00:00
szymonsztuka
9efb4121d5
Don't check signers of META-INF/LIST.INDEX file (workaround for CORDA-2116) (#4148) 
Temporally treating META-INF/INDEX.LIST as unsignable entry because java.util.jar.JarVerifier doesn't load its signers. https://r3-cev.atlassian.net/browse/CORDA-2177 for further investigation.
 2018-11-06 14:34:03 +00:00
Christian Sailer
2fafb118a1 Fix up Enterprise only Integration tests 2018-11-06 14:10:02 +00:00
szymonsztuka
d9c5350d4a Add SQL schema setup to new test. (#1538) 2018-11-06 13:14:46 +00:00
Konstantinos Chalkias
106eb9df4a
[CORDA-2011] [CORDA-2057] CryptoService interface and BC HSM simulation (#4099) 2018-11-06 12:57:13 +00:00
Rick Parker
59504b4439
ENT-2691 Soft locking got regressed in Enterprise (#1539) 
* Fix soft locking regression

* Fix caffeine version in core

* Fix default cache bound
 2018-11-06 11:40:28 +00:00
Christian Sailer
1f5436dcfc
CORDA-2175 Fix attachment service tests on Windows (#4168) 
* Switch to directory per test and suppress deletion exception on windows
to deal with the fact that NTFS keeps files locked to the running process
once opened.

* Closing files when we're done makes all the file locking issues go away.
 2018-11-06 11:31:23 +00:00
Christian Sailer
4d335843b2 Remove blank line and formatting 2018-11-06 11:27:18 +00:00
Christian Sailer
bbb26bc6ba Merge commit '3260d9f2c419463fb68178ce70633dd34079bd1e' into christians/merge_3260d9f 2018-11-06 11:20:55 +00:00
bpaunescu
9a778b0097
ENT-2655: added a lock on leader status to ensure no clients can be leader at the same time (#1517) 
* ENT-2655: added a lock on leader status to ensure no clients can be leader at the same time

* ENT-2655: reworked tests to not use hacky timeouts, now check for max 1 leader at any given time, improved error handling in the latch

* ENT-2655: address PR comments and use atomic int properly
 2018-11-06 10:48:11 +00:00
josecoll
015a36dad6
CORDA 2131 - Extend Network Bootstrapper to enable registration of Java Package Namespaces. (#4116) 
* Package Ownership Network Parameters: add register / unregister CLI options to network bootstrapper.

* Fix 2 failing unit tests.

* Fix failing unit tests.

* Added changelog, documentation and cosmetic changes.

* Fixed exception message.

* Address PR review feedback.

* Fix typo.

* Resolve conflicts.

* Rebase, resolve conflicts and remove PackageOwner class.

* Address latest PR review feedback.

* Fix incorrect imports.

* Fix broken JUnit

* Add support for key store passwords including delimiter characters.

* Updated and improved documentation.

* Minor doc update.

* Documentation changes following PR review feedback

* Replace Bank Of Corda with Example CorDapp.
Remove references to locally built network bootstrapper.
 2018-11-06 09:28:55 +00:00
Anthony Keenan
e52f4bc2a7
Fixed a missing file error when building docs (#4167) 2018-11-06 09:12:13 +00:00
James Brown
035c84ce2a
CORDA-2169 Update requests dependency to latest/secure version (#4138) 
Requests library in docs/requirements is vulnerable. Bump to latest version (2.20.0)
 2018-11-06 08:58:22 +00:00
Joel Dudley
8b2ab41057
Updated network docs (#4154) 
* Renaming and reordering to help users navigate the Networks section.

* Split of pages between bootstrapped, existing and dynamic compatibility zones. Reintegrates Mike H content about creating a dynamic zone.

* Address review feedback except BNO point.

* Documents BNO app.

* Better docs of networkServices config option. Better comments of NetworkParameters fields.

* Documents additional network map protocol endpoint.

* Address review feedback.

* Addresses Kostas review feedback.

* Update protocol due to bug.

* Addresses Kostas's review feedback.

* Addresses Kostas's review feedback.
 2018-11-05 15:51:42 +00:00
Anthony Keenan
b07cd38186
ENT-2534: Seperate database manager into commands (#1527) 
* Seperate database manager into commands

* Documentation update

* Slightly better naming

* Address review comments

* Review comments

* Address review comments
 2018-11-05 14:32:51 +00:00
Joel Dudley
9fcf15e825
Fixes headers to correctly render in side-bar. (#4165) 2018-11-05 14:11:40 +00:00
Roger Willis
80591bc6fd
StatePointer (#4074) 
* Introducing linear pointer.

* Added design document.
Added StatePointer interface.
Updated design document.
Updated StatePointer implementation.
Added doc section for state pointer.

* Updated design document.
Added API for StatePointer.

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update docs/source/design/linear-pointer/design.md

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update docs/source/design/linear-pointer/design.md

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Resolve pointers
Added test to check pointers are resolved.
Updated docs and kdocs.
Reverted changes to api-current.txt
Revert "Reverted changes to api-current.txt"
This reverts commit dc1cece91a595a4e772f63917b830c7e1fd0586d.
Fix CI bug.
Made StatePointers type safe.
Resolving StatePointers is now optionally recursive
Addressed review comments.

Fixed compile error.

Addressed review comments.

Fixed bug in state pointer search.
Improved efficiency of state pointer search.

Removed whitespace.

TxBuilder logs warning when no service hub is supplied for resolving pointers as opposed to throwing an exception.

* Addressed review comments.
 2018-11-05 10:33:26 +00:00
Christian Sailer
3260d9f2c4
CORDA-1489 Exposure of node internals in mock network (#4130) 
* Introduce public subset of config to tweak config via mock net work without exposing internal node config.

* Removal of functions exposing (internal) NodeConfiguration from the public test API

* Code review fixes

* Blank lines removed

* Documented mock network API change in upgrade notes.

* Updated documentation and API doc.

* More documentation/API doc
 2018-11-05 09:29:05 +00:00
szymonsztuka
241c045bb9
Added back Liquibase script for FungibleState (#1526) 
Added back Liquibase script for FungibleState column change to nullable/ commit dd60ae2 with modification to run for H2 database only. For standalone databases the column `vault_fungible_states .issuer_ref `was always nullable, however using H2 db from OS it could be not null (as it was created from JPA annotations) .
 2018-11-03 10:36:20 +00:00
Viktor Kolomeyko
ffa1adb5d4
Merge pull request #1536 from corda/feature/vkolomeyko/OS-Ent-merge 
OS->Ent merge
 2018-11-02 18:10:24 +00:00
Viktor Kolomeyko
f6ac49aba3 Merge remote-tracking branch 'open/master' into feature/vkolomeyko/OS-Ent-merge 2018-11-02 16:29:21 +00:00
Viktor Kolomeyko
513305ee7d
ENT-2669: SocksProxy rename into Proxy (#1533) 
* ENT-2669: Rename SocksProxyVersion into ProxyVersion

* ENT-2669: Rename SocksProxyConfig into ProxyConfig

Update documentation and make code changes such that old style configs are still parsed.

* ENT-2669: Changelog update
 2018-11-02 16:07:41 +00:00
Andrius Dagys
460cf3480f ENT-1858: Minor fix for a uniqueness provider test 2018-11-02 16:06:55 +00:00
Christian Sailer
07719489e4
ENT-2682 Fix cordapp layout for notaryhealthcheck (#1528) 
* Move state and command to contract.

* Rollback compiler.xml
 2018-11-02 15:39:14 +00:00
Michele Sollecito
6fb2996fd6
[ENT-2678]: PluginRegistrationTest.test plugin registration is failing (fix) (#1535) 2018-11-02 14:01:14 +00:00
Michele Sollecito
ae8f26bd42
Merge pull request #1534 from corda/merges/02_11_2018_13_15 
[ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153)
 2018-11-02 13:31:34 +00:00
Michele Sollecito
6408b845b6 [ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153) 
(cherry picked from commit 24e9ceac484f3ed42a929a095010aed1d168db70)
 2018-11-02 13:18:36 +00:00
Andrius Dagys
c0c997f6ce
Merge pull request #1532 from corda/andrius/merge-11-02 
Andrius/merge 11 02
 2018-11-02 13:13:11 +00:00
Venelin Stoykov
094eb266a8 [CORDA-2174] Fix demo node startup (#4151) 
- Make issuableCurrencies config optional

- Allow additionalCordapps to override cordappsForAllNodes

In driver DSL when passing additionalCordapps to startNode and
one of the CordApps is also in cordappsForAllNodes will lead to confilc.
This commit is resolving the conflict by using the CordApp provided
by additionalCordapps
 2018-11-02 11:44:18 +00:00
Michele Sollecito
24e9ceac48
[ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153) 2018-11-02 11:36:28 +00:00
Andrius Dagys
b9ff958011 ENT-1858: All non-bft notary services are now async 2018-11-02 11:12:46 +00:00
Viktor Kolomeyko
b1502c98f8
ENT-2681: Ensure we can parse old style bridge configs. (#1529) 
* ENT-2681: Ensure we can parse old style bridge configs.

* ENT-2681: Minor change

* ENT-2681: Minor change
 2018-11-02 10:45:52 +00:00
Andrius Dagys
539fac0d57 Merge remote-tracking branch 'open/master' into andrius/merge-11-02 2018-11-02 09:08:03 +00:00