5c32f34838
Merge commit 'cb670dcb6255aa07c2b06fe1e381d0c4d032634c' into chrisr3-merge-os
2018-04-03 13:21:01 +01:00
cb670dcb62
ENT-1463: Instantiate all contract classes before verifying any of them. ( #2906 )
2018-04-03 12:14:53 +01:00
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
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
89ecfb96c5
Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11
2018-03-29 13:12:00 +01:00
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
bc3605e8da
Merge remote-tracking branch 'open/master' into kat-merge-28-03-18
2018-03-28 09:47:49 +01:00
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
1f2d9454ee
Merge remote-tracking branch 'open/master' into kat-merge-27-03-18
2018-03-27 10:22:42 +01:00
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
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
975b81c2c4
[CORDA-1243]: Avoid drain-related deadlocks between 2 nodes. ( #2866 )
2018-03-23 11:45:19 +00:00
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
b81c005230
Merge OS -> ENT
2018-03-21 09:53:28 +00:00
d7147b7399
Adds JavaDocs for SoftLockingCondition.
2018-03-20 18:42:38 +00:00
96d976d555
ENT-1439 Delegate SecureRandom to thread-local ( #575 )
...
while minimising CryptoUtils diff
2018-03-20 17:56:32 +00:00
a80be413e0
Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1
2018-03-20 10:20:17 +00:00
1a1cd94161
ENT-1564 - add additional uploader check to the HashConstraint ( #2845 )
2018-03-20 10:17:44 +00:00
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
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell ( #2831 )
2018-03-19 14:20:10 +00:00
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects ( #2841 )
2018-03-19 12:47:23 +00:00
c4dc8accde
Merge remote-tracking branch 'remotes/opensource/master' into merges/1
2018-03-16 17:52:01 +00:00
48ab7193f4
Revert "ENT-1439 Delegate SecureRandom to thread-local ( #551 )" ( #574 )
...
This reverts commit 58e0e8c1f5
2018-03-16 17:48:27 +00:00
58e0e8c1f5
ENT-1439 Delegate SecureRandom to thread-local ( #551 )
...
* Use SHA1PRNG only
* Minimise CryptoUtils diff
2018-03-16 16:26:14 +00:00
78b2bc7549
network_map table references the network_parameters table (ENT-1524). ( #567 )
2018-03-16 10:57:30 +00:00
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
0d1e9694ae
Merge remote-tracking branch 'open/master' into andrius-merge-1503
2018-03-15 15:07:55 +00:00
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
d0efe85a44
Merge commit 'a64474181971e79638d6c23cb677a91a6c0f1bb5' into chrisr3-os-merge
2018-03-15 09:04:57 +00:00
a644741819
Expose two static fields on SecureHash for Java. ( #2822 )
2018-03-15 08:59:45 +00:00
27e45bc865
Adding public key verification to the X509Utilities.createCertificateSigningRequest ( #2784 )
2018-03-15 08:42:36 +00:00
0a0c8538c4
Merge from Corda/OS
2018-03-14 17:24:47 +00:00
2cff495553
Remove CordApps JARs from node classpath [CORDA-1135] ( #2691 )
2018-03-14 16:42:23 +00:00
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
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
341e060424
Adding CSR signature verification ( #537 )
2018-03-14 09:17:09 +00:00
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
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
6b80072b18
ENT-1439 Use thread-local MessageDigest. ( #541 )
2018-03-13 10:20:22 +00:00
6fbc6a55cf
CORDA-1186 - Actually move annotation into core module, not just core namespace ( #2789 )
2018-03-12 11:47:58 +00:00
98ba212e00
Merge remote-tracking branch 'open/master' into andrius-merge-03-09
2018-03-09 16:09:59 +00:00
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
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
4e16c2a06a
Switch checkpoints on for retryable sends, add back confirmationWindowSize setting
2018-03-09 10:18:39 +00:00
2e9027db1b
secureRandomBytes should call getNextBytes, not generateSeed ( #2587 )
2018-03-08 11:44:26 +00:00
d70cd26a7c
Kdoc/comment updates ( #2626 )
2018-03-08 10:52:07 +00:00
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
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
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
f109c170ad
PluginRegistrationTest update ( #517 )
2018-03-06 15:56:09 +00:00
