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

11846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matthew Nesbit
4fa5c00be8
Merge pull request #836 from corda/mnesbit-change-bridge-mode-constant 
Change the FloatInner config property to BridgeInner to be more consistent
 2018-05-14 15:46:34 +01:00
josecoll
9d822cdbe8
CORDA-861 Pagination failure with aggregate groupBy query (#3135) 
* Pagination relies on a recursive call to count total results, this sub-query should NOT perform pagination checks.

* Fix using defaulted parameter.

* Make internal method private.
 2018-05-14 15:34:21 +01:00
Tudor Malene
95054f71d5 Fix merge 2018-05-14 15:23:27 +01:00
tudor.malene@gmail.com
9b42dd3a87 Merge branch 'tudor_os_merge' into tudor_merge_14_05_2018 
# Conflicts:
#	constants.properties
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
 2018-05-14 15:20:14 +01:00
Michele Sollecito
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. (#3136) 2018-05-14 21:15:52 +07:00
Matthew Nesbit
1d1d05086f Change the FloatInner config property to BridgeInner to be more consistent. 2018-05-14 14:30:32 +01:00
Matthew Nesbit
4e7bbbaf93
Merge pull request #831 from corda/mnesbit-fix-flaky-test 
Fix flaky integration test and Smoke Test
 2018-05-14 14:19:34 +01:00
kid101
5a92079011 Updated CONTRIBUTORS.md after resloving #3120 (#3134) 
Added name to Contributors list after fixing https://github.com/corda/corda/issues/3120
 2018-05-14 12:13:27 +01: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
Matthew Nesbit
ebe6d5060e Fix flaky integration test 
Reenable broken smokeTest so I can investigate

Testing testing

Testing testing

remove debug
 2018-05-14 11:40:25 +01:00
Matthew Nesbit
ae48e6e4fb Fix a Unit Test error that appears to be on ENT master now? (#835) 2018-05-14 17:38:59 +07:00
cburlinchon
65bae084da
ENT-1673 - Add command line arg to exclude jars from capsule on startup (#775) 2018-05-14 11:33:06 +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
Chris Rankin
e3062e7b9e
Merge pull request #834 from corda/chrisr3-os-merge 
Merge to a2de18b6
 2018-05-14 10:30:59 +01:00
Andras Slemmer
7076605371
Merge pull request #822 from corda/aslemmer-fix-shadowjar-task 
disable default jar task
 2018-05-14 09:48:08 +01:00
Matthew Nesbit
3c005789c0
ENT-1850: Improve reporting of connection problems (#3124) 
* Add nicer logging for SSL handshake problems

* Just in case let people see the horrid netty exception traces at trace level
 2018-05-14 09:14:09 +01:00
Chris Rankin
6077a04ec2 Fix node heartbeat test (NetworkMapTest). 2018-05-12 15:42:04 +01:00
Chris Rankin
b43a54326b Merge commit 'a2de18b63cf3d4b146872e1609bf112fc21ffbcd' into chrisr3-os-merge 2018-05-12 12:43:37 +01:00
Richard Gendal Brown
e47a84ab49
Merge pull request #3126 from corda/contributor-typos 
typos
 2018-05-11 22:36:32 +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
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
Richard G Brown
9f4e9238a8 typos 2018-05-11 17:37:06 +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
c817c98d5b Merge fix: make NetworkMapTest compile again 2018-05-11 17:12:05 +02:00
Chris Rankin
a2de18b63c
ENT1463: Turn ClassCarpenter and SerializerFactoryFactory into interfaces. (#3121) 2018-05-11 15:42:12 +01:00
Mike Hearn
ce7ba2182b Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6 2018-05-11 16:41:39 +02:00
josecoll
4afc7f3824
Behave: fix compilation problem in IntelliJ (#830) 
* Sprinkled new gradle dust to make both IntelliJ and TC (gradle) compilation happy.

* Fix compilation problem once and for all + ignore the RPCProxyWebServiceTest smoke test.
 2018-05-11 15:21:42 +01:00
Michele Sollecito
ea81548d60
[CORDA-1269]: Changed usages of arrayOf() in Entities to use Kotlin 1.2 style. (#3122) 2018-05-11 21:07:53 +07:00
Katelyn Baker
c5591defe3 Test Fixes 2018-05-11 14:44:17 +01:00
Andras Slemmer
cafed58421 Add back shadowJar compile artifact 2018-05-11 14:19:05 +01: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
af802bd8c5 Minor: fix a warning in VaultQueryTests 2018-05-11 13:02:40 +02: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
c9e31ecd4b Minor: fix a typo in a warning suppression and operator ordering. 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
Katelyn Baker
df68fa1a5e Review comments 2018-05-11 11:53:24 +01:00
Michele Sollecito
3a218b228d
[CORDA-1455]: Error in process-id deletion process allows multiple instances of same node to be run (fix). (#3118) 2018-05-11 17:10:18 +07:00
Joel Dudley
ecc0560ebc
Adds a clear error message from progress tracker requirement fails. (#3116) 2018-05-11 10:46:46 +01:00
Viktor Kolomeyko
1425899b95
Temporarily disable failing test. (#828) 
It will be properly investigated and fixed.
 2018-05-11 10:36:23 +01:00
Viktor Kolomeyko
e7c2a0ca88
Merge pull request #825 from corda/feature/vkolomeyko/os-merge 
OS->Ent merge
 2018-05-11 10:35:46 +01:00
Andras Slemmer
7a39ff8617 disable default jar task 2018-05-11 10:20:17 +01: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
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
Viktor Kolomeyko
e0dfe7a75a Compilation fixes after OS merged. 2018-05-10 16:12:32 +01:00
Michele Sollecito
590f626433
[ENT-1731]: Record an event of loading and unloading CorDapps. (#818) 2018-05-10 22:01:43 +07: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
Viktor Kolomeyko
15e87050c7
CORDA-1393: Make Explorer GUI recover on RPC connection loss. (#3093) 
* CORDA-1393: Install `onError()` handler for folding action
or else `ErrorNotImplementedAction` will be invoked which is never a good thing

* CORDA-1335: Improve exception handling in `cleanUpOnConnectionLoss()`

* CORDA-1335: Try to trick the logic to pretend we are running in HA mode to have a chance of re-connecting.

* CORDA-1416: Make `NodeMonitorModel` code react to proxy changing.

* CORDA-1416: Workaround `CordaRPCOps.equals()` calls when listener dispatching change.

* CORDA-1416: Increase re-try interval to allow enough time for server to come back online.

* CORDA-1355: Properly close RPC connection we are moving away from.

* CORDA-1355: Unsubscribe on Error to prevent propagation of it downstream.

* CORDA-1355: For downstream subscribers ignore errors properly. Thanka to @exfalso for the hint.

This fixes: Transaction Updates do not flow after re-connect

* CORDA-1355: Bugfix eliminate duplicating items on "Transactions" blotter after re-connect.

* CORDA-1355: Bugfix eliminate double counting on dashboards.

* CORDA-1355: Bugfix eliminate same parties in dropdowns.

* CORDA-1355: Stop using `SecureHash.randomSHA256()` for painting widget icon.
Instead use combined SHA hash such that icon represents the whole population of trades.
That way two transactions blotters can be compared by a single glimpse at corresponding icons.

Also minor refactoring.

* CORDA-1416: Make RPC re-connection faster/more robust.

* CORDA-1416: Properly announce thet Proxy may not be available during re-connect and prevent UI crashing.

* CORDA-1416: Disable UI until RPC proxy is available.

* CORDA-1416: Correct typo.

* CORDA-1416: Unit test fix.

* CORDA-1416: GUI cosmetic changes.

* CORDA-1416: Correct spaces.

* CORDA-1416: Remove un-necessary overrides in CordaRPCOpsWrapper.

* CORDA-1416: Switch from using `doOnError` to installing an error handler upon subscription.
 2018-05-10 15:20:41 +01:00