ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,184 Commits 91 Branches 405 Tags 354 MiB
f67c6874f4
Commit Graph

11184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Hearn
abc281056f Merge remote-tracking branch 'open/master' into mike-merge-80c00b920b 2018-03-02 15:17:32 +01:00
Mike Hearn
80c00b920b
Fix another non-serializable exception, add docs, fix a possible security issue. (#2707) 
* Fix another non-serializable exception, add docs, fix a possible security issue.

* Update API definition to reflect methods added to make more exceptions serializable
 2018-03-02 15:10:54 +01:00
Katelyn Baker
799d90b350
CORDA-1134 - Don't use private serializes for all caps public properties (#2692) 
* CORDA-1134 - Don't use private serializes for all caps public properties

* Small fix

* Review Comments
 2018-03-02 13:21:27 +00:00
Katelyn Baker
06a6eace67
CORDA-1115 - Cannot serialize private nested objects (#2665) 
* CORDA-1115 - Cannot serialize private nested objects

Shown up by the simm-valuation-demo the problem was where a private
object field of an object was being serialised within the outer objects
context (see tests added for example)

Fix is to switch from Kotlin reflection back to Java.

Additional fix to the test where it was comparing two lists of state
references in a flow and they weren't equal because they weren't in the
same order... This I assume is just an oversight (in that them being
in a different order but otherwise the same is actually fine) so
converting to set comparison

* Fix forward port issue where fingerprinting has moved

* Review Comments

* Review Comments

* Review Comments

* Gran -> Grab
 2018-03-02 13:13:00 +00:00
Joel Dudley
41bdad5aa2
Makes it clear that monitoring must be turned on. 2018-03-02 12:49:44 +00:00
Michal Kit
021b677b7d
Renaming DAO for the CSR (#500) 2018-03-02 12:15:46 +00:00
Shams Asari
965035a92e
Merge pull request #501 from corda/os-merge-020318 
O/S merge 020318
 2018-03-02 11:54:41 +00:00
Michal Kit
8f05dc2230
Renaming configuration sections for doorman and network map (#472) 2018-03-02 11:41:00 +00:00
Joel Dudley
617838c108
Removes output that is no longer logged. 2018-03-02 11:20:29 +00:00
Katelyn Baker
7d3b585a9c
RELEASE: Bump platform version past V3 (#2701) 2018-03-02 11:18:24 +00:00
Shams Asari
a59083ceb2 Merge remote-tracking branch 'open/master' into os-merge-020318 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
 2018-03-02 10:42:03 +00:00
Michele Sollecito
29215035e1
Merge pull request #498 from corda/merges/march-1-15-20 
merges/CORDA-926_march-1-15_20
 2018-03-02 10:17:12 +00:00
sollecitom
5e5cb1888b Made strict behaviour optional default to true for conf parsing. HSM and Doorman can opt in for this functionality independently. 2018-03-02 09:19:47 +00:00
Michal Kit
2d16647498
Refactoring modifiedBy and status fields for the certificate signing … (#475) 
* Refactoring modifiedBy and status fields for the certificate signing request entity

* Fixing migration
 2018-03-02 08:50:38 +00:00
Thomas Schroeter
f9bfebe4a8
[CORDA-1136] Update startup message of P2P address and port (#2698) 2018-03-02 08:50:31 +00:00
Shams Asari
8616f24523
CORDA-1048: Making it simpler to move an existing local deployment of nodes to across different machines. (#2672) 
This was achieved by having the hash in the node-info file to be just of the node's X.500 name. This also solves existing duplicate node-info file issues that we've been having.

Also updated the docsite.
 2018-03-01 21:24:10 +00:00
sollecitom
38208d9e44 Made strict behaviour optional default to true for conf parsing. HSM and Doorman can opt in for this functionality independently. 2018-03-01 18:08:22 +00:00
Mike Hearn
14cafee66e
Fix the serialisability of TransactionVerificationException and subtypes. (#2689) 
Add KDocs for the exceptions in this file, and deprecate exceptions that aren't actually used.
 2018-03-01 19:03:54 +01:00
sollecitom
b39a1a71d9 Backported removed release notes entry. 2018-03-01 17:41:35 +00:00
Tudor Malene
06af213cdb
CORDA-1050 docs on whitelisting CorDapps (#2671) 
* CORDA-1050 docs on whitelisting CorDapps

* Addressed code review notes

* Addressed code review notes
 2018-03-01 17:37:33 +00:00
Andrzej Cichocki
26a11bccc9
CORDA-1004 Use FastThreadLocalThread in multi-thread SMM. (#492) 2018-03-01 17:35:41 +00:00
Katarzyna Streich
8239c5d29f
Add network-management version info on startup (#497) 
* Add network-management version info on startup

Add version info to manifest file and print it out on network-managemnet
startup
 2018-03-01 17:09:59 +00:00
sollecitom
4f92a2584b Backported removed release notes entry. 2018-03-01 16:53:51 +00:00
sollecitom
c38dccacca Changed system and environmental variables to only be parsed as config if they're prefixed with "corda." e.g., to override "p2pPort" would now take a "corda.p2pPort" from system or environmental variables. 2018-03-01 16:37:15 +00:00
sollecitom
36cd34bff5 Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20 
# Conflicts:
#	docs/source/corda-configuration-file.rst
#	docs/source/release-notes.rst
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
#	tools/explorer/README.md
#	tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
 2018-03-01 15:36:40 +00:00
Joel Dudley
08c5b72874
1076 - Filters out structural steps when tracking a flow via RPC. 2018-03-01 15:08:07 +00:00
Michele Sollecito
b580a2ac30
[CORDA-926]: Parsing NodeConfiguration will now fail if unknown properties are present. (#2484) 2018-03-01 14:57:36 +00:00
Anthony Keenan
351469b765
Merge pull request #495 from corda/anthony-os-merge-2 
Anthony OS merge
 2018-02-28 18:04:23 +00:00
Ross Nicoll
754b87d547 Update identity docs (#2319) 
* Update certificate extension specification

* Extend documentation on node name requirements

* Moving node naming back to node generation file. Merging other permissioning information.

* Update certificate structure image
 2018-02-28 18:04:08 +00:00
Andrzej Grzesik
f5ffdab927
Merge pull request #2673 from corda/merge/CORDA-1127 
CORDA-1127 - updated comments to follow current port layout (#2669)
 2018-02-28 17:55:00 +00:00
Anthony Keenan
97a2a5e497 Update api current 2018-02-28 17:21:56 +00:00
Anthony Keenan
9dc5ce2161 Apply new test api to enterprise tests 2018-02-28 17:07:49 +00:00
Anthony Keenan
c72b3ad4fa Merge remote-tracking branch 'open/master' into anthony-os-merge-2 
# Conflicts:
#	.ci/api-current.txt
#	client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
#	client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt
#	docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
#	docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
#	finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.kt
#	node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
#	node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
#	node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
#	node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
#	node/src/test/kotlin/net/corda/node/modes/draining/ScheduledFlowsDrainingModeTest.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/MaxTransactionSizeTests.kt
#	samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
 2018-02-28 16:55:15 +00:00
Andrzej Cichocki
493c66670d
Merge pull request #493 from corda/andr3ej-os-merge 
Merge my conflicting OS changes
 2018-02-28 16:17:21 +00:00
Andrzej Grzesik
8565fbd47f CORDA-1127 - updated comments to follow current port layout (#2669) 2018-02-28 16:48:40 +01:00
Andrzej Cichocki
90e8621324
Make the test pass. 2018-02-28 15:14:39 +00:00
Andrzej Cichocki
b578b934f7
Merge commit '4d4253a287c6ddccddeab8ed24f9e16da5e25bc2' into andr3ej-os-merge 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
 2018-02-28 14:39:29 +00:00
joeldudleyr3
0f2077364e Fix merge conflicts. 2018-02-28 14:12:54 +00:00
Anthony Keenan
577033441a
[CORDA-1035] Testing api KDoc Updates (#2584) 
* Testing api KDoc Updates

* Update after code review

* Update api-current

* Revert changes to compiler.xml

* Made comment changes from review

* Fixing merge conflict

* Don't expose net.corda.node through test API (first pass)

* Fixing merge conflicts

* Update api-current

* Addressing review commits

* Fix exposure of internal implementation of MessageHandlerRegistration

* Make InProcess expose ServiceHub instead of internal StartedNodeServices

* Move InternalMockMessaginService interface to internal namespace

* Move MOCK_VERSION_INFO to internal namespace to avoid exposing VersionInfo

* Don't expose WritableTransactionStorage via testing api

* Create public VerifierType enum

* Update api-current and modify check-api-changes to check for net.corda.node exposures

* Fix merge conflicts

* Fixing another merge conflict

* Fix accidentally broken unit tests

* Make getInternalServices a property

* Fix failing unit tests

* Add todo to check-api-changes

* Fix rpc sender thread busy looping

* Fix tests

* Fixing tests

* Address mike's comments

* Fixing tests

* Make random port allocation internal

* Update api
 2018-02-28 13:26:49 +00:00
Tommy Lillehagen
b7d48b2f1a
Merge pull request #2667 from corda/tlil/CORDA-1103/fix-irs-windows 
CORDA-1102 / CORDA-1103 - Fix IRS Demo on Windows
 2018-02-28 12:52:21 +00:00
Tommy Lillehagen
a542c0185d CORDA-1103 - Fix JAR paths in IRS demo launcher 2018-02-28 11:39:31 +00:00
Ben Abineri
1e478b5164
Merge pull request #468 from corda/mkit-adding-logging-desc-to-readme 
Documenting log level setting when starting doorman
 2018-02-28 10:57:03 +00:00
Tommy Lillehagen
3572ce05fa CORDA-1102 - Fix IRS demo README 2018-02-28 10:03:15 +00:00
Andras Slemmer
7a9ce48996 Only emit SM Add events when the flow signals that it started 2018-02-27 18:41:52 +00:00
Andrzej Cichocki
2e76cb1715
Merge pull request #491 from corda/andr3ej-typo-merge 
Merge conflicting change from OS
 2018-02-27 18:12:33 +00:00
Andrzej Cichocki
e3086122a8
Merge commit '3abe6888cfd867b7edd398a2f8e80b1d470c7936' into andr3ej-typo-merge 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
 2018-02-27 17:14:20 +00:00
Andrzej Cichocki
4d4253a287
CORDA-1124 Fix thread leak in generateAndSaveNodeInfo (#2659) 2018-02-27 15:43:41 +00:00
Christian Sailer
0ff37c0437
CORDA-1122 Switch AMQP bridge to use auto-commit sends and acks (#2661) 
* CORDA-1122 Switch AMQP bridge to use auto-commit sends and acks

* CORDA-1122 Codereview: Add comment for extra commit to rollback and add better message sequence logging to tricky test
 2018-02-27 15:25:58 +00:00
Maksymilian Pawlak
4695cb0810
Allows DemoBench profile files to utilize extra database settings (#2310) 
Pass-through for supporting external DB properites in .profile files
 2018-02-27 15:15:46 +00:00
Thomas Schroeter
40727f3bdd Update documentation of Postgres support 2018-02-27 14:44:17 +00:00