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,218 Commits 91 Branches 405 Tags 354 MiB
a26c5c1483
Commit Graph

1578 Commits

Author SHA1 Message Date
szymonsztuka
c4dc8accde Merge remote-tracking branch 'remotes/opensource/master' into merges/1 2018-03-16 17:52:01 +00:00
Andrzej Cichocki
48ab7193f4
Revert "ENT-1439 Delegate SecureRandom to thread-local (#551)" (#574) 
This reverts commit 58e0e8c1f5.
 2018-03-16 17:48:27 +00:00
Andrzej Cichocki
58e0e8c1f5
ENT-1439 Delegate SecureRandom to thread-local (#551) 
* Use SHA1PRNG only
* Minimise CryptoUtils diff
 2018-03-16 16:26:14 +00:00
Shams Asari
78b2bc7549
network_map table references the network_parameters table (ENT-1524). (#567) 2018-03-16 10:57:30 +00:00
Chris Rankin
9f80cfa249
Remove superfluous @JvmStatic annotation. (#2832) 
This annotation was applied because of a misunderstanding of what it actually did.
 2018-03-16 10:31:48 +00:00
Andrius Dagys
0d1e9694ae Merge remote-tracking branch 'open/master' into andrius-merge-1503 2018-03-15 15:07:55 +00:00
Andrius Dagys
e31d2b0cad
CORDA-1208: Notary service should persist the notarisation request si… (#2823) 
* CORDA-1208: Notary service should persist the notarisation request signature along with the committed input states.

This required modifying the uniqueness provider interface to accept the signature in addition to input states.
Until now the committed state log used to be stored as a map of (state reference -> (tranasction id, consuming party)).
Adding the serialized signature would mean inflating each state entry by around 700 bytes, which would be grossly inefficient.
Instead, two tables are now used: one for storing (state referece -> transaction id) map, and another for storing the notarisation
request details (transaction id, consuming party, date, signature).

* Update api - all of these changes are only related to custom notaries
 2018-03-15 13:29:42 +00:00
Chris Rankin
d0efe85a44 Merge commit 'a64474181971e79638d6c23cb677a91a6c0f1bb5' into chrisr3-os-merge 2018-03-15 09:04:57 +00:00
Chris Rankin
a644741819
Expose two static fields on SecureHash for Java. (#2822) 2018-03-15 08:59:45 +00:00
Michal Kit
27e45bc865
Adding public key verification to the X509Utilities.createCertificateSigningRequest (#2784) 2018-03-15 08:42:36 +00:00
IgorNitto
0a0c8538c4 Merge from Corda/OS 2018-03-14 17:24:47 +00:00
igor nitto
2cff495553
Remove CordApps JARs from node classpath [CORDA-1135] (#2691) 2018-03-14 16:42:23 +00:00
Chris Rankin
1b02291321
ENT-1439: Hide the FastThreadLocal class behind a Supplier. (#550) 
* Hide the FastThreadLocal class behind a Supplier.
* Add SHA256 to class and field names.
* Updates from code review: extra comment and class renamed.
 2018-03-14 14:27:43 +00:00
Andrzej Cichocki
f7151e96d3
Merge commit '932d632716c55fef0bda7c6519677a46b66f05c2' into andr3ej-provider-setup-ent 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
#	node/src/main/kotlin/net/corda/node/Corda.kt
 2018-03-14 10:50:41 +00:00
Michal Kit
341e060424
Adding CSR signature verification (#537) 2018-03-14 09:17:09 +00:00
Andrzej Cichocki
932d632716
ENT-1439 Refactor Provider setup (#2780) 
* Initialise crypto nice and early
* More OO way of requiring correct name for BouncyCastlePQCProvider
 2018-03-13 17:22:38 +00:00
sollecitom
f31afd1520 Merge remote-tracking branch 'remotes/open/master' into merges/march-13-14-55 
# Conflicts:
#	build.gradle
#	docs/source/_static/versions
#	docs/source/running-a-node.rst
 2018-03-13 15:02:58 +00:00
Michele Sollecito
fae0dc0276
[CORDA-1216]: Moved dependency on Jackson Databind from core to finance. (#2802) 2018-03-13 14:51:55 +00:00
Andrzej Cichocki
6b80072b18
ENT-1439 Use thread-local MessageDigest. (#541) 2018-03-13 10:20:22 +00:00
Katelyn Baker
6fbc6a55cf
CORDA-1186 - Actually move annotation into core module, not just core namespace (#2789) 2018-03-12 11:47:58 +00:00
Andrius Dagys
98ba212e00 Merge remote-tracking branch 'open/master' into andrius-merge-03-09 2018-03-09 16:09:59 +00:00
Andrius Dagys
2d31247da2 CORDA-1171: When a double-spend occurs, do not send the consuming transaction id and requesting party back to the client - this might lead to privacy leak. Only the transaction id hash is now returned. 2018-03-09 16:00:52 +00:00
Andrius Dagys
a3bf4577f3 CORDA-696 - Ensure deterministic transaction id calculation for contra… (#2676) 
The problem with the previous implementation is that the transaction would be deserialized with the schema specified
in the serialized form, but the calculation of the id would involve re-serializing properties using a local serialization context
which might produce a different result.
 2018-03-09 14:39:31 +00:00
Andras Slemmer
4e16c2a06a Switch checkpoints on for retryable sends, add back confirmationWindowSize setting 2018-03-09 10:18:39 +00:00
Konstantinos Chalkias
2e9027db1b
secureRandomBytes should call getNextBytes, not generateSeed (#2587) 2018-03-08 11:44:26 +00:00
Konstantinos Chalkias
d70cd26a7c
Kdoc/comment updates (#2626) 2018-03-08 10:52:07 +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
igor nitto
f109c170ad
PluginRegistrationTest update (#517) 2018-03-06 15:56:09 +00:00
Tudor Malene
ad4bed779d
Merge pull request #515 from corda/merge/tudor_network_bootstrap 
Merge/tudor network bootstrap
 2018-03-06 15:15:00 +00:00
Andrzej Cichocki
00c171cd61
CORDA-973 Turn on compression for checkpoints and tx storage (#490) 2018-03-06 15:01:30 +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
Chris Rankin
596edcc2ae Merge commit '29ccd4d' into os-merge-050318 2018-03-05 23:21:35 +00:00
Tudor Malene
3a247f2966
CORDA-1147 - fix shell (#2730) (#2737) 2018-03-05 19:11:04 +00:00
Katelyn Baker
d116b5e9f4
CORDA-1140 - FOR RPC Client P2P context use AMQP (#2716) 
* CORDA-1140 - FOR RPC Client P2P context use AMQP

* Review comments

* Review comments

* review comments

* review comments
 2018-03-05 18:05:32 +00:00
igor nitto
1caca44076
Fixed smoke tests after config parsing changes [CORDA-926] 2018-03-05 15:32:05 +00:00
Andrius Dagys
37de2e770e CORDA-696: Contract upgrade transactions - handle WhitelistedByZoneAttachmentConstraint for input state constraint verification 2018-03-05 14:34:18 +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
Shams Asari
4a73a80b39
CORDA-1160: Only read node-info files if their last modified time has changed. (#2717) 2018-03-05 11:10:38 +00:00
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
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
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
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
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
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