ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-16 07:30:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,956 Commits 96 Branches 407 Tags
Commit Graph

1668 Commits

Author SHA1 Message Date
Mike Hearn
75b621bdce Docs: improve appearance of notary service HA doc. 2018-05-15 16:59:35 +02:00
Mike Hearn
6ff91cadca Docs: add a note to the top of the cert hierarchies design doc. 
Enable AutoStructify in ReCommonMark to allow rst/md to be mixed.
 2018-05-15 16:59:35 +02:00
Mike Hearn
2c16de8ec4 Docs: reorganise the left hand table of contents. 
It now has an app dev section, an operations section, and a "participate" section.
 2018-05-15 16:59:35 +02:00
Mike Hearn
da01312ab6 Docs: adjust the certificate hierarchy design doc to render better in sphinx. 2018-05-15 16:59:35 +02:00
Chris Rankin
fafd8406fd Merge commit 'd0d07287' into chrisr3-os-merge 2018-05-15 13:22:34 +01:00
Katarzyna Streich
24fa695ca0
CORDA-866: Implement removal of stale nodes from network - backport (#3128) 
* CORDA-866: Implement removal of stale nodes from network

Backported

* Implement removal of stale nodes from network

Add eventHorizon to NetworkParameters structure. Add republishing of
node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing.

* Add copy method to NetworkParameters data class

Add JvmOverloads annotation to the constructor, because it's data class
exposed in API

* Fix test
 2018-05-15 12:10:04 +01:00
Tudor Malene
759ed7c3d0
CORDA-1369 set co.paralleluniverse.fibers.verifyInstrumentation=true in devMode (#3137) 2018-05-14 17:26:08 +01:00
Tudor Malene
6e59a694c1
CORDA-1461 fix merge (#3139) 2018-05-14 16:39:44 +01:00
sollecitom
9a69a36904 Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21 
# Conflicts:
#	.idea/compiler.xml
#	constants.properties
#	experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt
#	experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt
#	experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
#	node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
#	node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
#	samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt
#	samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
#	testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
#	webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
 2018-05-14 15:56:43 +01:00
Michele Sollecito
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. (#3136) 2018-05-14 21:15:52 +07:00
kid101
e3bc7fa0af Update tut-two-party-flow.rst (#3133) 
Bug: https://github.com/corda/corda/issues/3120
Updated line 55: From: IOUContract.Commands.Create -> IOUContract.Create
 2018-05-14 12:09:53 +01:00
Viktor Kolomeyko
aff7d0bb09
ENT-1865: Guidelines for creating RPC clients compatible with Hot/Cold node deployment. (#826) 
* ENT-1865: Guidelines for creating RPC clients compatible with Hot/Cold node deployment.

* ENT-1865: Changes to documentation following review by @thschroeter

* ENT-1865: Changes to documentation following review by @mnesbit
 2018-05-14 10:51:04 +01:00
Mike Hearn
eea7ae3a67
Merge pull request #832 from corda/mike-merge-ea81548d6 
Merge to ea81548d6
 2018-05-11 21:44:59 +02:00
Richard G Brown
1f046060f0 rogue "of" 2018-05-11 17:55:41 +01:00
Tudor Malene
543491c7df
CORDA-1461 improve devMode (#3100) 
* CORDA-1461 improve devMode

* CORDA-1461 set devMode=true for driver

* CORDA-1461 fix tests and improve UI

* CORDA-1461 Address code review changes

* CORDA-1461 Missing developer emoji

* CORDA-1461 use latest cordform that sets devMode=true

* CORDA-1461 fix test and add driver overrides for notary

* CORDA-1461 fix tests, fix api-scanner version

* CORDA-1461 fix api

* CORDA-1461 formatting

* CORDA-1461 comment style
 2018-05-11 17:48:02 +01:00
Katarzyna Streich
509a52ad5e
CORDA-866: Implement removal of stale nodes from network (#774) 
* Implement removal of stale nodes from network

Add eventHorizon to NetworkParameters structure. Add republishing of
node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing.

* Add copy method to NetworkParameters data class

Add JvmOverloads annotation to the constructor, because it's data class
exposed in API
 2018-05-11 17:11:56 +01:00
Mike Hearn
ce7ba2182b Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6 2018-05-11 16:41:39 +02:00
Michele Sollecito
bb62538d28
[CORDA-1394]: Node can fail to fully start when a port conflict occurs, without a useful error message (fix). (#3119) 
* [CORDA-1394]: Meaningful message if required port is already in use.

* [CORDA-1394]: Meaningful message if required port is already in use.
 2018-05-11 20:08:53 +07:00
Mike Hearn
54e1a7aa7e Docs: fix some broken markup that caused rendering errors and warnings. 2018-05-11 13:02:40 +02:00
Mike Hearn
e110d17bce Docs: upgrade Sphinx and Pygments. 
We get coloured output from make html now. That seems to be the main benefit of the upgrade.
 2018-05-11 13:02:40 +02:00
Mike Hearn
5e759f5025 Docs: remove things from ChangeLog that aren't of interest to end users. 2018-05-11 13:02:40 +02:00
Joel Dudley
76b0f75ea3
Documents how a new CorDapp's dependencies and Corda version are defined. (#3117) 2018-05-11 10:12:35 +01:00
Richard G Brown
3cad4bd1cd addressed comments from the public review 2018-05-11 09:43:52 +01:00
josecoll
42452c6735
Fix problem with Python PDF builder failing to render the Sphinx :math: tag directive correctly. (#3113) 2018-05-11 09:26:54 +01:00
Michele Sollecito
5e0b27cfae
[CORDA-1445]: Raise proper error when starting node in devMode with compatibilityZoneURL. (#3109) 2018-05-10 22:00:47 +07:00
Viktor Kolomeyko
355c65ad62 Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/os-merge 
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/SharedContexts.kt
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/views/SearchField.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt
 2018-05-10 15:36:07 +01:00
josecoll
0dae108088
Reordering fix: move now works as depends on creation of html directory from previous step. (#3108) 2018-05-10 09:48:19 +01:00
bpaunescu
b4a402de36 Merge remote-tracking branch 'open/master' into bogdan-merge-10-05-18 2018-05-10 09:47:54 +01:00
Shams Asari
3bb95c3ed1
Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) (#3102) 
Also deprecated all the public members that shouldn't have leaked into the public API.
 2018-05-09 21:42:55 +01:00
Michele Sollecito
c369680ccb
[CORDA-1383]: Make SignedTransaction fully Jackson de/serialisable. (#3097) 2018-05-09 22:47:06 +07:00
Chris Rankin
3ce2237adc Merge commit 'fe88e99' into chrisr3-os-merge 2018-05-09 16:44:02 +01:00
Tudor Malene
1535a5f601
CORDA-1315 small doc correction (#3079) 
* CORDA-1315 small doc correction

* CORDA-1315 address code review changes
 2018-05-09 13:52:58 +01:00
Chris Rankin
8d6c54e2d5 Merge commit '781b50642aec9deeeadee219318509e050f9026e' into chrisr3-os-merge 2018-05-09 13:50:46 +01:00
Tudor Malene
a70e479696
ENT-1762 doc around jarDirs (#3094) 
* ENT-1762 doc around jarDirs
 2018-05-09 11:16:36 +01:00
Katelyn Baker
96ab22f1da Merge remote-tracking branch 'open/master' into kat-merge-20180508 2018-05-09 11:00:07 +01:00
Michele Sollecito
d7ef385cc7
[CORDA-1395] [CORDA-1378]: Control the max number of transaction dependencies. (#3047) 2018-05-09 15:58:18 +07:00
Michele Sollecito
5318c395ee
[CORDA-860]: Retrieving state by recordTime.max() throws a cast exception (fixed) (#3090) 2018-05-08 19:16:19 +07:00
Katelyn Baker
406cdf39bb Merge remote-tracking branch 'open/master' into kat-merge-20180508 2018-05-08 12:10:22 +01:00
Joel Dudley
173d0f2ada
Updates ports to match new CorDapp example ports. (#3088) 2018-05-08 11:44:33 +01:00
Michele Sollecito
b5e8dc5bd1
[CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState - FIX (#3025) 2018-05-04 22:37:56 +07:00
Richard G Brown
f3954ad911 Addressing Mike's comments 2018-05-04 16:35:06 +01:00
Mike Hearn
0784f079ed Revert "OS merge (#806)" 
This reverts commit 5c0775f7b41561792c2590f6abee4e2d95e430dc.
 2018-05-04 16:09:11 +01:00
Katarzyna Streich
d254bf6d46
ENT-1548: Improve docs for hsm (#805) 
* Improve docs for hsm

Add information on different configs depending on which execution mode
for hsm is run

* Remove default config file argument for hsm, add required to cli flag.
 2018-05-04 15:58:36 +01:00
cburlinchon
5c0775f7b4
OS merge (#806) 2018-05-04 15:47:36 +01:00
Anthony Keenan
100f680042
CORDA-1001 - Remove peristent map in NodeSchedulerService (#763) (#3076) 
* CORDA-1001 - Remove peristent map in NodeSchedulerService (#763)

* Add scheduled flow test that uses multithreaded node

* Replace use of PersistentMap in NodeSchedulerService

* Correct class name and remove duplicate test

* Address initial PR comments

* Remove debugging code

* Remove acidentally added line

* Move Scheduled State contracts to internal module

* Put things in the right places

* Add changelog message

* Fix countdown issue

* Addressing PR comments

* Remove unused class
 2018-05-04 15:04:52 +01:00
Konstantinos Chalkias
907031e840
[ENT-1825] Document details of cipher suites (#3073) 2018-05-04 14:34:45 +01:00
Anthony Keenan
081b7251a7
CORDA-1001 - Remove peristent map in NodeSchedulerService (#763) 
* Add scheduled flow test that uses multithreaded node

* Replace use of PersistentMap in NodeSchedulerService

* Correct class name and remove duplicate test

* Address initial PR comments

* Remove debugging code

* Remove acidentally added line

* Move Scheduled State contracts to internal module

* Put things in the right places

* Add changelog message

* Fix countdown issue

* Addressing PR comments
 2018-05-04 11:35:01 +01:00
Maksymilian Pawlak
24839f25e2
Running Dockerform generated nodes (#3041) 2018-05-04 10:22:03 +01:00
Katelyn Baker
a61aa5d645
CORDA-847 - Pass serialization context down serialization call stack (#3062) 
* CORDA-847 - Pass serialization context down serialization call stack

Needed for later work on AMQP RPC where we need to set per-thread
elements on a context. Could use some magic thread local but I'd rather
it was explicit on the stack and thus easier to reason about.

Additionally, now we're passing this around we can make better use of it
in the future

* Test Fix

* Test fixes

* REVIEW COMMENTS / CODE FORMAT

* Fix build issues
 2018-05-03 16:09:03 +01:00
Roger Willis
db22c5259d
Feature to exclude CorDapps from specific MockNodes in a MockNetwork. (#3028) 
* Feature to exclude CorDapps from specific MockNode's in a MockNetwork.

* Fixed API stability issue.

* * Added docs.
* Changed approach for the new parameter to be additive as opposed to exclusive.

* * Updated incorrect comments.
 2018-05-03 15:39:52 +01:00