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,487 Commits 91 Branches 405 Tags 354 MiB
47cc2f0bb1
Commit Graph

1609 Commits

Author SHA1 Message Date
Christian Sailer
a0bf0261bb Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336 2018-04-13 16:39:00 +01:00
Konstantinos Chalkias
6f69f0252d
CORDA-1337 Crypto.registerProviders (#2962) 
CORDA-1337 Crypto.registerProviders + add BCPQC as well
 2018-04-13 12:40:15 +01:00
Katelyn Baker
5bb9514582 Merge remote-tracking branch 'open/master' into kat-merge-180412 2018-04-12 20:34:28 +01:00
Shams Asari
02913b284e
CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. (#2954) 
Instead the current whitelist is read in from the existing network parameters file.
 2018-04-12 17:03:06 +01:00
Shams Asari
4a77712978 Merge remote-tracking branch 'open/master' into os-merge-ecce64b 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
 2018-04-11 11:15:17 +01:00
Shams Asari
ecce64ba03
HttpUrlConnection.getErrorStream() can be null, which if not handled can obscure the reporting of an HTTP error response, like in ENT-1744 (#2948) 2018-04-11 09:39:58 +01:00
Shams Asari
a97abbc8c0 Merge remote-tracking branch 'open/master' into os-merge-1b37cef 2018-04-05 17:23:03 +01:00
Shams Asari
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash (#2931) 2018-04-05 17:18:27 +01:00
Shams Asari
53a0aae489
Introduced a few helper methods around InputStream.readBytes (#2928) 2018-04-05 14:27:42 +01:00
Andrius Dagys
5909a49c30
ENT-1725: Introduce FlowAsyncOperation (#658) 
* ENT-1725: Introduce FlowAsyncOperation, which allows suspending a flow on a custom operation, such as long running I/O requests, notary commit, etc.

* Move async execute to internal, add more tests.

* Add a 30s test timeout

* Update API doc
 2018-04-04 09:52:49 +01:00
Chris Rankin
5c32f34838 Merge commit 'cb670dcb6255aa07c2b06fe1e381d0c4d032634c' into chrisr3-merge-os 2018-04-03 13:21:01 +01:00
Chris Rankin
cb670dcb62
ENT-1463: Instantiate all contract classes before verifying any of them. (#2906) 2018-04-03 12:14:53 +01:00
Chris Rankin
b9b4415d10 ENT-1463: Instantiate the contract class as part of contract verification. (#660) 
* Instantiating the contract class should be part of contract verification. We should not instantiate it while building LedgerTransaction.
* Also catch any exceptions from instantiating the contract.
 2018-03-31 14:53:12 +01:00
Chris Rankin
9c07e67100
ENT-1463: Instantiate the contract class as part of contract verification. (#660) 
* Instantiating the contract class should be part of contract verification. We should not instantiate it while building LedgerTransaction.
* Also catch any exceptions from instantiating the contract.
 2018-03-31 14:52:08 +01:00
sollecitom
89ecfb96c5 Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11 2018-03-29 13:12:00 +01:00
Michele Sollecito
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2892) 2018-03-29 13:01:41 +01:00
Katelyn Baker
bc3605e8da Merge remote-tracking branch 'open/master' into kat-merge-28-03-18 2018-03-28 09:47:49 +01:00
Michele Sollecito
36f02ff4b4 [CORDA-1267]: Making Corda's JPA classes non-final and Serializable. (#2882) 
* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.
 2018-03-28 08:40:28 +01:00
Katelyn Baker
1f2d9454ee Merge remote-tracking branch 'open/master' into kat-merge-27-03-18 2018-03-27 10:22:42 +01:00
Katelyn Baker
91cdcc6752
CORDA-1258 - Only register custom serializers once (#2862) 
* CORDA-1258 - Only register custom serializers once

* Review comments

* Fix test
 2018-03-26 19:09:03 +01:00
sollecitom
ca3ecb97cb Merge remote-tracking branch 'remotes/open/master' into merges/march-23-11-47 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/NodeStartAndStopTest.kt
#	node/src/integration-test/kotlin/net/corda/node/NodeStatePersistenceTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
 2018-03-23 12:17:00 +00:00
Michele Sollecito
975b81c2c4
[CORDA-1243]: Avoid drain-related deadlocks between 2 nodes. (#2866) 2018-03-23 11:45:19 +00:00
Chris Rankin
db2cdda020
ENT-1439: Refactor DelegatingSercureRandomService for modularity. (#590) 
* Refactor DelegatingSercureRandomService so that it can be removed cleanly from the deterministic core module.
* Rename SecureRandom implementation class.
 2018-03-21 15:31:37 +00:00
szymonsztuka
b81c005230 Merge OS -> ENT 2018-03-21 09:53:28 +00:00
Joel Dudley
d7147b7399
Adds JavaDocs for SoftLockingCondition. 2018-03-20 18:42:38 +00:00
Andrzej Cichocki
96d976d555
ENT-1439 Delegate SecureRandom to thread-local (#575) 
while minimising CryptoUtils diff
 2018-03-20 17:56:32 +00:00
tudor.malene@gmail.com
a80be413e0 Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1 2018-03-20 10:20:17 +00:00
Tudor Malene
1a1cd94161
ENT-1564 - add additional uploader check to the HashConstraint (#2845) 2018-03-20 10:17:44 +00:00
sollecitom
8a561cddbf Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41 
# Conflicts:
#	client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
 2018-03-19 15:17:49 +00:00
Michele Sollecito
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell (#2831) 2018-03-19 14:20:10 +00:00
Shams Asari
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects (#2841) 2018-03-19 12:47:23 +00:00
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