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

1401 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Thomas Schroeter
40727f3bdd Update documentation of Postgres support 2018-02-27 14:44:17 +00:00
Joel Dudley
0c62c6d850
Improves CorDapp build instructions by including other ext versions, and clearly pointing to the templates as a guide. 2018-02-27 12:48:08 +00:00
Thomas Schroeter
c7e03633c7 Merge remote-tracking branch 'open-source/master' into thomas-merge 2018-02-27 12:01:49 +00:00
Joel Dudley
f7c9f0d10e
Wrong file name. 2018-02-27 10:21:03 +00:00
Joel Dudley
3c8db47b5a
Updates shell example of starting flow to reflect cash API change. 2018-02-26 18:16:25 +00:00
Joel Dudley
f1c3f584ac
Showcase link in Quickstart guide. Remove Utilities link (merged with Samples). 2018-02-26 16:47:53 +00:00
Rick Parker
2da28c574e
CORDA-1040 docs for FlowLogic.sleep (#2625) 2018-02-26 16:07:40 +00:00
Joel Dudley
7517270dde
Improves node.conf page. Shows the defaults used. 2018-02-26 14:53:13 +00:00
Andrius Dagys
cc8e38922e Merge remote-tracking branch 'open/master' into andrius-merge-02-26 2018-02-26 11:55:17 +00:00
Andrius Dagys
0edfef2409 CORDA-696 - Create separate transaction types for contract upgrade transactions (#2589) 
* CORDA-986 and CORDA-985 CompositeKey and Signature verification performance fixes (#2467)

* CORDA-696: Create separate transaction types for contract upgrade transactions.

Add rationale around upgrade transactions

Move contract upgrade transaction resolution logic into internal until it's stabilised.

Throw a better exception when contract attachment not found

Default legacy contract constraint to always accepting - needs to be changed to whitelist constraint before merging

Introduce a new upgraded contract interface that allows specifying the legacy constraint.

Remove StateLoader, make all tx resolution functions take in ServicesForResolution

Contract upgrade transactions can handle whitelist by zone constraints

When creating a contract upgrade transaction, make sure the attachment of the old cordapp gets attached when using hash constraints.
Attachment lookup for a given contract class name only scans currently loaded cordapps, and we don't load old versions of cordapps.

CORDA-696: Update upgrade docs
 2018-02-26 11:29:25 +00:00
Joel Dudley
50ccb32700
Adds a 'provision the certificates' step to the Windows deployment instructions. 2018-02-26 09:21:27 +00:00
sollecitom
d41b9a0299 merged OS into master 2018-02-23 15:47:07 +00:00
Michele Sollecito
5be0e4b39e
[CORDA-941]: Add NetworkParameters contract implementation whitelist. (#2580) 2018-02-23 14:29:02 +00:00
Shams Asari
977836f4eb
Enable tests which were ignored due to recent flakiness on TC and issue with maxTransactionSize which should now be resolved. (#2621) 2018-02-23 13:45:18 +00:00
Andras Slemmer
67f9266b24
Merge pull request #2597 from corda/aslemmer-CORDA-1043 
CORDA-1043
 2018-02-22 14:56:20 +00:00
Joel Dudley
904f706e10
[CORDA-1035] Flow test API docs 2018-02-22 14:38:02 +00:00
Joel Dudley
c94b606cf0
Fixes a typo in the node deployment docs. 2018-02-22 14:15:25 +00:00
Michele Sollecito
5db4882668
[CORDA-1089]: Ensure graceful error message is shown on node startup if RPC settings are invalid. (#2595) 2018-02-22 09:47:56 +00:00
Andras Slemmer
6a2217ace6 Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb 2018-02-21 18:10:37 +00:00
Andras Slemmer
66cbe8c56d CORDA-1043 2018-02-21 15:56:29 +00:00
Mike Hearn
ffd726d592
Docs: discuss zone constraints, flow drains and more upgrade related topics (#2585) 
Docs: discuss zone constraints, flow drains and more upgrade related topics.
 2018-02-21 15:33:28 +01:00
Michele Sollecito
9ddd47ea39
[CORDA-1059]: Fix Driver hanging on duplicate node names. (#2590) 2018-02-21 11:28:51 +00:00
Mike Hearn
2cf2fdbc06 Address review comments 2018-02-20 18:45:38 +01:00
Mike Hearn
55a33acc32 Address review comments 2018-02-20 18:45:38 +01:00
Mike Hearn
7548c6c901 Docs: some work on the network map docs. 2018-02-20 18:45:38 +01:00
Andras Slemmer
a6a2008bb9 Ignore flaky test 2018-02-20 16:32:50 +00:00
Andras Slemmer
25263c20c7 Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb 2018-02-20 15:52:09 +00:00
Andras Slemmer
d28c781597 Missing diff from merge 2018-02-20 13:54:11 +00:00
Andras Slemmer
38d0ad30df Merge commit 'da591363fdccd220455a92f083d2ad59ed0e2d12' into aslemmer-merge-19-Feb 2018-02-20 13:52:03 +00:00
Andras Slemmer
6b2b7b6a3c Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb 2018-02-20 13:26:31 +00:00
Andras Slemmer
1d7b0fc499 Merge commit '86fb1ed852c69121f989c9eeea92cfb4c27f9d13' into aslemmer-merge-19-Feb 2018-02-19 16:14:43 +00:00
Joel Dudley
65681e8e9d
plugins folder renamed to cordapps 2018-02-19 14:22:20 +00:00
Shams Asari
71c94f8a9d
Reversing the introduction of GlobalProperties (by CORDA-961), and added NetworkParameters to ServicesForResolution instead. (#2563) 
Also, replaced the maxTransactionSize parameter of the driver and MockNetwork with NetworkParameters.
 2018-02-19 12:23:59 +00:00
Konstantinos Chalkias
fe7c129ae7
CORDA-1038 Update verifySignaturesExcept in api-transactions.rst (#2546) 2018-02-16 12:32:53 +00:00
Katelyn Baker
307e2988c9
DOCS: update AMQP serialization (#2543) 
* DOCS: update AMQP serialization

* Update serialization.rst
 2018-02-16 12:14:31 +00:00
Anthony Keenan
c2485858f5
CORDA-1011 Add powershell script to update testing package imports (#2528) 
* Add powershell script to update testing package imports

* Make sure script works with java files

* Address review comments
 2018-02-16 10:22:41 +00:00