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

13677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tommy Lillehagen
74aa51fee3
ENT-2661 - Publish health survey tool (#1566) 2018-11-14 16:48:10 +00:00
josecoll
70a1b48192
Merge pull request #1565 from corda/colljos-merge-141118 
OS -> ENT merge 141118
 2018-11-14 16:04:18 +00:00
Michele Sollecito
4059966ccb
[CORDA-2203]: Demobench ends up with a stuck tab when you unselect notary type for the first node. (fix) (#4235) 2018-11-14 14:42:57 +00:00
Shams Asari
e8b6f5f2f2
CORDA-2005: FinalityFlow has been made into an inlined flow to resolve issue with FinalityHandler (#4050) 
FinalityHandler is insecure in that it is open to receive any transaction from any party.

Any CorDapp targeting platform version 4 or above is required use the new c'tors which take in FlowSession objects to the counterpart flow. This flow must subcall ReceiveFinalityFlow to receive and record the finalised transaction.

Old CorDapps (with target platform version < 4) will continue to work as previously. However if there are no old CorDapps loaded then the node will disable FinalityHandler.
 2018-11-14 14:16:22 +00:00
josecoll
9bfa67de02 Remove duplicate declaration. 2018-11-14 13:53:29 +00:00
josecoll
6a4ef24f54 Merge commit '74c80aafd657e2718787f97932b89a069af7949f' into colljos-merge-141118 2018-11-14 13:52:56 +00:00
Tudor Malene
8e6d4b4b38
Merge pull request #4232 from corda/feature/tudor_constraints 
Feature/tudor constraints
 2018-11-14 13:33:39 +00:00
Christian Sailer
a08807b591
Ent-2570 Replace caffeine jitpack dependency (#1564) 
* Use our caffeine version from artifactory

* Switch to use the 50% window version of caffeine
 2018-11-14 13:28:34 +00:00
Tudor Malene
8f6047e3f8 fix merge 2018-11-14 12:06:30 +00:00
tudor.malene@gmail.com
1e27f0cbe0 Merge remote-tracking branch 'private/master' into feature/tudor_constraints 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
 2018-11-14 11:50:19 +00:00
Michele Sollecito
8aaf120881
[CORDA-2224]: Removed field value from Validated. Renamed function orThrow() to value(). (#4231) 2018-11-14 11:19:38 +00:00
Viktor Kolomeyko
482277bad1
ENT-2689: Change SSL config structure (#1551) 
* ENT-2689: Intent of the changes to be made (doesn't compile)

* ENT-2689: Propagate renaming of `customSSLConfiguration`

* ENT-2689: Documentation update

* ENT-2689: More renaming

* ENT-2689: Add a test for SSL keystores location override

* ENT-2689: Add V3 configuration compatibility unit tests (failing for now)

* ENT-2689: Add ability to read V3 configs.

* ENT-2689: Reflect changes on Integration tests.

* ENT-2689: For BridgeControlListener use Artemis SSL configuration if specified, otherwise fall back onto main SSL configuration.

* Revert: ENT-2689: For BridgeControlListener use Artemis SSL configuration if specified, otherwise fall back onto main SSL configuration.

And rename `p2pSslOptions` to `publicSSLConfiguration`.

* ENT-2689: Move V3 config structures into a separate file.
 2018-11-13 16:34:41 +00:00
Michele Sollecito
aa0ccecfde
[CORDA-2172]: Add link to error-codes-webapp in Corda. (#4224) 2018-11-13 15:46:21 +00:00
Joel Dudley
f3b09988a9
Updates tutorial to reflect new template structure. Clean-up. (#4216) 
* Initial improvements.

* Updates tutorials.

* Missing imports.

* Addresses review feedback.
 2018-11-13 11:50:24 +00:00