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

13691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Knowles
94dd223662
Merge pull request #1579 from corda/oknowles-os-merge-20-11 
OS Merge 20/11/18
 2018-11-21 09:07:34 +00:00
szymonsztuka
17d6634761
Expose JPA to flows (#4140) - add Liquibase script for test to run in database mode (#1581) 2018-11-20 21:21:16 +00:00
Oliver Knowles
aa27a51069 Fix merge 2018-11-20 18:31:47 +00:00
Viktor Kolomeyko
8ef4de9eaf
ENT-2653: Minor command line tools changes (#1577) 
* ENT-2653: Correcting "country" typo.

* ENT-2653: Introduce common constant for command line tools and use it.
 2018-11-20 15:01:46 +00:00
Oliver Knowles
b1982e5b55 Merge remote-tracking branch 'open/master' into oknowles-os-merge-20-11 2018-11-20 14:46:30 +00:00
Tudor Malene
a3a9be6594
Merge pull request #1575 from corda/tudor-os-merge-19-11 
Tudor os merge 19 11
 2018-11-20 12:57:23 +00:00
szymonsztuka
8827801ae6
CORDA-1915 Release notes for build system signing CorDapp JARs. (#4185) 2018-11-20 13:53:11 +01:00
Tudor Malene
c35dde5e7a Revert api-current 2018-11-20 10:30:20 +00:00
cburlinchon
b6f6775cab
Fix bridge smoke test, add commons-lang dependency (#1574) 
* Add commons-lang dependency now pulled in

* Pull out commons lang version
 2018-11-20 09:50:48 +00:00
Oliver Knowles
373d99435c
CORDA-1965 Auto-accept network parameter changes (#4222) 
* add auto acceptance of certain network parameters

* Remove incorrect nullification of newNetworkParameters object within NetworkMapUpdater

* Automatically update network parameters if update accepted and flag day occured

* Comment cleanup

* Add node configuration for auto accepting network parameter changes

* Remove hot swapping of network parameters

* Add docs for auto accept config flag

* Minor change to log line

* Remove unrelated fix that was corrected on master

* Minor name change within NetworkParameters class

* Minor doc rewording

* Fix typo in docs

* Address PR comments

* Add node config option to turn off network param auto-accept on a per param basis

* Address PR comments

* Fix failing Network Map update integration test
 2018-11-20 09:50:42 +00:00
Tudor Malene
1d35c322c9 Fix merge 2018-11-19 18:30:29 +00:00
Christian Sailer
ba743985ad
Switch perf test CorDapp to the new finality flow API. (#1570) 
ENT-2754 Switch perf test CorDapp to the new finality flow API.
 2018-11-19 18:25:05 +00:00
Tudor Malene
12b79fc40b Fix merge 2018-11-19 18:13:07 +00:00
Michele Sollecito
2762c34ebe
[CORDA-1877]: Ensured Driver fails to start when Notary tried to bind an already bound port. (#4246) 2018-11-19 18:06:27 +00:00
tudor.malene@gmail.com
06e74c4442 Merge remote-tracking branch 'open/master' into tudor-os-merge-19-11 
# Conflicts:
#	docs/source/cli-ux-guidelines.rst
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/core/TestUtils.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalTestUtils.kt
 2018-11-19 17:40:34 +00:00
Chris Burlinchon
cb0091f097 Pull out commons lang version 2018-11-19 17:19:44 +00:00
Chris Burlinchon
f676941dbf Add commons-lang dependency now pulled in 2018-11-19 17:12:44 +00:00
Michele Sollecito
cb9fc3391f
Merge pull request #4256 from corda/hide_error_codes_for_config_parsing_issues 2018-11-19 16:51:21 +00:00
Michele Sollecito
b9f2401123 Removed errorCode for raw configuration parsing errors. 2018-11-19 16:47:57 +00:00
Dominic Fox
ddf45f4e07
CORDA-2099: define local type model (#4118) 
* CORDA-2099 define LocalTypeInformation and related data types and functions

* Enums don't have superclasses

* Separate ACollection from AMap

* Remove spurious import

* Small fixes, slightly improved testing

* Log warnings if types that we expect to be able to serialise are non-composable

* Rename lookup -> findOrBuild

* Pull changes from working branch

* Missing files needed for unit test

* Pull in whitelist-based type model configuration

* Move opaque type list across

* Remote duplicate declaration

* Restore fixes from other PR
 2018-11-19 16:07:01 +00:00
Michele Sollecito
a22344b330
[ENT-2722]: Make support tool usable with installations where config and Corda JAR are separated (#1573) 2018-11-19 15:22:23 +00:00
Mike Hearn
349d9a5ffe Expose SerializedBytes.from in the API 2018-11-19 14:25:39 +00:00
Tudor Malene
2d043828a0
CORDA-2083 verify transaction in AttachmentsClassloader (#4188) 
CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 add support for explicit upgrade transactions

CORDA-2083 cleanup

CORDA-2083 cleanup

CORDA-2083 More cleanup

CORDA-2083 More cleanup

CORDA-2083 Clean up tests

CORDA-2083 Address code review comments

CORDA-2083 Fix merge

CORDA-2083 Fix merge

CORDA-2083 Address code review comments

revert file

CORDA-2083 Fix test

CORDA-2083 Add test

CORDA-2083 cleanup

CORDA-2083 Fix test

CORDA-2083 Address code review comments.

CORDA-2083 Remove unused functions.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.
 2018-11-19 13:42:12 +00:00
Mike Hearn
38a4737764 Small tweaks useful for the experimental C++ support. 2018-11-19 12:37:31 +00:00
Mike Hearn
a867e7cb8b Bugfix: make decimal64 amqp type work (nothing uses it today) 2018-11-19 12:37:31 +00:00
Joel Dudley
1658cb0269
Updates running-a-cordapp to point to new samples page. (#4251) 2018-11-19 12:19:05 +00:00
Stefano Franz
828892a3d9
write nodeInfo to additional-node-info folder as well as baseDirectory (#4247) 
* write nodeInfo to additional-node-info folder as well as baseDirectory

* fix broken network map tests
 2018-11-19 11:26:42 +00:00
Joel Dudley
0c323bce5c
Documents Corda dependencies. Clean-up. (#4196) 
* Documents Corda dependencies. Clean-up.

* Review feedback.

* Addresses review feedback.
 2018-11-19 11:09:33 +00:00
Dominic Fox
f66944cac5
CORDA-2099 remote type model (#4179) 
* CORDA-2099 create remote type model

* Comments

* Test the class-carpenting type loader

* Comment on cache usage

* Pull changes from main serialisation branch

* Add missing file

* Minor tweaks
 2018-11-19 11:03:32 +00:00
Anthony Keenan
8ea6f1c7c5
[CORDA-2004]: Update CLI UX guidelines for backwards compatibility (#4248) 
* Update CLI UX guidelines for backwards compatibility

* De-lousing

* Spelling mistake
 2018-11-18 12:36:21 +00:00
Roger Willis
4c88e26a46
Fixed incorrect diagram. (#4212) 2018-11-18 11:35:56 +00:00
Mike Hearn
3e396ff41f
Merge pull request #1569 from corda/mike-merge-4d2d9b83 
Merge OS to 4d2d9b83
 2018-11-17 15:20:55 +00:00
Stefano Franz
8f463c46a9 Add message to uses of require(...) (#4192) 2018-11-16 17:13:55 +00:00
Stefano Franz
51e66af2fd CORDA-2201 add documentation for hiding passwords in node.conf (#4221) 2018-11-16 17:10:53 +00:00
Mike Hearn
9594aea9f7 Merge remote-tracking branch 'open/master' into mike-merge-4d2d9b83 2018-11-16 16:43:20 +00:00
Mike Hearn
4d2d9b8304 Fix a regression in the shell that was preventing it from fuzzy matching against notary names. 2018-11-16 14:37:43 +00:00
Shams Asari
134f6a016c
Merge pull request #1568 from corda/os-merge-e8b6f5f 
O/S merge e8b6f5f
 2018-11-16 13:58:42 +00:00
Shams Asari
d138914640
Using epoch for the entries in the test CorDapp jars to remove that non-determinism (#4243) 2018-11-16 12:19:29 +00:00
Patrick Kuo
5244d41384
ENT-2653 Standalone Keytool/Registration tool for HA deployment (#1558) 
* Node registration tool for registering multiple nodes at the same time
* SSL key import tool for creating SSL keystore for the bridge or adding new key to existing bridge keystore
* Self signed SSL keystores generator for creating SSL keystores for firewall components' internal communication
 2018-11-16 11:49:21 +00:00
Shams Asari
15a6618223 Bunch of changes to get ENT working in light of the new FinalityFlow API 
* Updated the performance cordapp tests to use target version 3 as it's not been updated and uses the old FinalityFlow API
* Updated the api-current.txt file as the API checker on TC is throwing a false-negative
* Deleted IntegrationTestingTutorial, rather than fixing its failure, as it's a leftover of KotlinIntegrationTestingTutorial
 2018-11-16 10:19:41 +00:00
Anthony Keenan
3ea03068b8
Update picocli to latest version (#4241) 2018-11-16 10:10:52 +00:00
Shams Asari
ac1d3d1fc7 Merge branch 'merge-point-e8b6f5f' into os-merge-e8b6f5f 
# Conflicts:
#	docs/source/api-persistence.rst
#	docs/source/example-code/src/main/java/net/corda/docs/java/FlowCookbook.java
#	docs/source/upgrade-notes.rst
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
 2018-11-15 13:09:06 +00:00
Shams Asari
105adc9e8d
Merge pull request #1567 from corda/os-merge-shams 
O/S merge 8e6d4b4
 2018-11-15 10:43:54 +00:00
Joel Dudley
0e51d11743
Update CONTRIBUTORS.md 2018-11-15 09:49:59 +00:00
Joel Dudley
1d2b99f616
Removes a reference to an outdated JIRA ticket. (#4238) 2018-11-15 09:31:20 +00:00
Shams Asari
7696a570d1 Merge fixes 2018-11-14 18:50:29 +00:00
Konstantinos Chalkias
b8327ddf98
[CORDA-2225] Use platform's non-blocking PRNG when invoking SecureRandom() (#4234) 2018-11-14 18:32:22 +00:00
Andrius Dagys
e1e5d13941
CORDA-2221: Fix clustered notary identity generation (#4230) 
- Don't generate a composite key certificate for CFT notaries
- Don't require a composite key certificate for CFT notaries on startup
 2018-11-14 18:15:05 +00:00
Shams Asari
4984e92e31 Merge branch 'os-merge-point' into os-merge-shams 
# Conflicts:
#	build.gradle
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	docs/source/api-persistence.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	settings.gradle
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt
 2018-11-14 18:13:01 +00:00
Hristo Gatsinski
eb9bd10da0 [CORDA-2219] Show message if CorDapp already exists (#4236) 
* [CORDA-2219] Show message if CorDapp already exists

* Update definition of `net.corda.core.node.services.Vault$StateMetadata` in `api-current.txt` or else diff tool gets very confused.
 2018-11-14 17:50:55 +00:00