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

1323 Commits

Author SHA1 Message Date
szymonsztuka
3733e7d715 Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792 
# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaAuthenticationPlugin.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaSSHAuthInfo.kt
#	node/src/main/kotlin/net/corda/node/shell/RPCOpsWithContext.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	settings.gradle
#	testing/test-common/src/main/kotlin/net/corda/testing/common/internal/UnsafeCertificatesFactory.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
#	tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
#	tools/shell/src/main/kotlin/net/corda/tools/shell/FlowWatchPrintingSubscriber.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShellCommand.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/utlities/ANSIProgressRenderer.kt
#	tools/shell/src/main/resources/net/corda/tools/shell/base/login.groovy
#	tools/shell/src/test/kotlin/net/corda/tools/shell/CustomTypeJsonParsingTests.kt
#	tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt
 2018-03-07 16:49:00 +00:00
Shams Asari
4e5df2f4fb
Fix permissioning doc (#2755) 2018-03-07 10:39:03 +00:00
szymonsztuka
72074c76c7
[CORDA-792] Standalone Shell (#2663) 
- Existing embedded Shell connects via RPC including checking RPC user credentials (before was a direct use of CordaRPCOps):  in dev mode when console terminal is enabled, node created `shell` user.
- New Standalone Shell app with the same functionalities as Shell: connects to a node via RPC Client,  can use SSL and run SSH server.
 2018-03-07 09:57:32 +00:00
Michele Sollecito
2a5ef62eed
Merge pull request #520 from corda/merges/march-6-16-56 
Merge: 06/03/2018 at 16:56
 2018-03-06 18:58:48 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. (#519) 2018-03-06 17:29:21 +00:00
sollecitom
906dae11ad Merge remote-tracking branch 'remotes/open/master' into merges/march-6-16-56 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-03-06 16:59:13 +00:00
Konstantinos Chalkias
4121f70da3
CORDA-1175 Docs numbering issue and counterparty consistency. (#2744) 2018-03-06 14:22:38 +00:00
tudor.malene@gmail.com
98a4fe1ce3 Merge remote-tracking branch 'open/master' into merge/tudor_network_bootstrap 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
 2018-03-06 11:37:30 +00:00
Konstantinos Chalkias
65bfc833d3
CORDA-1173 - SwapIdentityFlow doc fixes (#2740) 2018-03-06 11:12:25 +00:00
Konstantinos Chalkias
f1856f0146
CORDA-1145 - troubleshooting updates (#2738) 2018-03-06 10:28:10 +00:00
Chris Rankin
596edcc2ae Merge commit '29ccd4d' into os-merge-050318 2018-03-05 23:21:35 +00:00
Shams Asari
84ff1c875a
CORDA-1006: Undoing the wiring of maxMessageSize as it's not correctly implemented and updating the docs to clarify its status. (#2501) (#2729) 
The network parameter was just fed into Artemis' minLargeMessageSize property which isn't the same thing.

(cherry picked from commit 49f75da)
 2018-03-05 17:26:08 +00:00
Shams Asari
067c9fb75f
CORDA-1082: Add doc for --just-generate-node-info (#2719) 2018-03-05 13:18:53 +00:00
Chris Rankin
04610b8545 Merge remote-tracking branch 'public/master' into chrisr3-merge-os 
O/S merge up to ef703c50
 2018-03-05 12:27:49 +00:00
Joel Dudley
91fd46f2c0
Updates text of running node shel. 2018-03-02 17:48:45 +00:00
Rick Parker
08decac922
CORDA-1144 Fix documentation that refers to IRS demo code (#2711) 2018-03-02 15:36:54 +00:00
Mike Hearn
abc281056f Merge remote-tracking branch 'open/master' into mike-merge-80c00b920b 2018-03-02 15:17:32 +01:00
Joel Dudley
41bdad5aa2
Makes it clear that monitoring must be turned on. 2018-03-02 12:49:44 +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
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