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

11271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shams Asari
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects (#2841) 2018-03-19 12:47:23 +00:00
Matthew Nesbit
6885661b66 Initial cut of SOCKS proxy support 
Correct the reconnect logic when SOCKS proxy is in the pipeline

Add integration tests and adjust handling of reconnect

Rename parameter
 2018-03-19 11:37:46 +00:00
Michal Kit
a26c5c1483
Fixing exception logging for the HSM cert generator (#561) 2018-03-19 08:26:27 +00:00
szymonsztuka
fef30e49a8
Merge pull request #576 from corda/merges/1 2018-03-16 
Merge OS to Enterprise.
 2018-03-19 08:18:40 +00:00
Shams Asari
060f7cc3cb
Using CordaX500Name in the doorman database entity objects (ENT-1524) (#573) 
certificate_signing_request.legal_name is nullable - invalid names from CSRs are not stored in the db.
 2018-03-16 18:45:28 +00:00
Andras Slemmer
908a3badf1
Merge pull request #572 from corda/aslemmer-merge-DP3-bla 
Squash of changes on DP3
 2018-03-16 17:57:26 +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
bpaunescu
dc595792e7
github issue #2630: missing rpc info at node startup (#2839) 2018-03-16 17:14:25 +00:00
szymonsztuka
fb37a5bcf1
CORDA-792 Fix local shell in trader demo and SIMM valuation demo. (#2837) 
Added rpcSettings to start RPC so the local shell can connect to the node.
 2018-03-16 16:41:34 +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
Joel Dudley
5b7f06a39d
Direct bootstrapper link instead of manual build. 2018-03-16 16:07:39 +00:00
Andras Slemmer
bb2643cf2e Add hard restart test 
Remove default async db flush

Add in-memory P2P deduplication until we commit the ID persisting tx

Add some explaining comments

Make scheduled state kickoffs atomic with flow starts
 2018-03-16 15:43:20 +00:00
Joel Dudley
d60e0098f2
Removes the glossary and FAQ. Points people to StackOverflow for troubleshooting. 2018-03-16 13:41:38 +00:00
igor nitto
286d1e5add
Propagate cordApp classloader to shell [CORDA-1228] (#2833) 2018-03-16 13:28:04 +00:00
Michal Kit
6d99f7e5d4
Adding CRL signing (#528) 
* Adding CRL signing

* Adding CRL

* Addressing review comments

* Address review comments
 2018-03-16 11:48:41 +00:00
Joel Dudley
06ec20379c
Clarifies that shell doesn't require RPC permissions. 2018-03-16 11:37:23 +00:00
Andrzej Grzesik
c2b7755824
Merge pull request #568 from corda/ags_2018-03-16 
OS merge 2018-03-16
 2018-03-16 11:34:30 +00:00
Shams Asari
78b2bc7549
network_map table references the network_parameters table (ENT-1524). (#567) 2018-03-16 10:57:30 +00:00
Viktor Kolomeyko
a2d65f1a6b
Improve error reporting in case of failure of flaky tests (#2828) 
* Improve error reporting in case of failure of flaky tests

Also eliminate warnings and other minor changes.

* Address code review comments raised by @exFalso

Also improve output for stack traces.
 2018-03-16 10:55:48 +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
Andrzej Grzesik
3c38cb9b2a Merge remote-tracking branch 'open/master' into ags_2018-03-16 2018-03-16 09:58:52 +00:00
Andrzej Grzesik
59d4a2c7fe
Merge pull request #2806 from corda/merge/CORDA-1075 
CORDA-1075: Add 'bye' and 'exit' commands to Shell.
 2018-03-16 09:57:00 +00:00
Patrick Kuo
2a898658c2
ENT-1561 - Identity copying tool for distributed notary (#563) 
* check in before shelving this task

* keytool in-progress, TODO: Docs and more test

* unit test and doc

* minor typo
 2018-03-16 09:42:27 +00:00
Andrius Dagys
180abcb462 CORDA-1208: Remove unnecessary annotation from entity 2018-03-16 09:08:29 +00:00
Shams Asari
a99a910730
Removed duplicate SignedNetworkParameters and SignedNetworkMap type aliases (#562) 2018-03-15 20:55:40 +00:00
Andrius Dagys
8e3e1d7485
Merge pull request #564 from corda/andrius-merge-1503 2018-03-15 18:16:19 +00:00
Andrius Dagys
ac33e9401a Post merge fixes: 
- Fix request log entity annotation
- Regenerate db migration changesets
- Shorten constraint names to fit under 30 chars.
 2018-03-15 17:19:24 +00:00
Joel Dudley
22008327cd
Clarifies that blocking calls should take a timeout 2018-03-15 17:10:39 +00:00
Patrick Kuo
d2b29b42fe
ENT-1592 Add private network id to CSR (#533) 
* * add private network id to CSR
* TODO : Doc
* TODO : Signing server and network map end points

* Remove private network attribute from CSR

* revert unnecessary changes

* remove private network identifier from node as we are not shipping this to the node in DP3

* revert unnecessary changes

* address PR issues
 2018-03-15 15:20:07 +00:00
Andrius Dagys
0d1e9694ae Merge remote-tracking branch 'open/master' into andrius-merge-1503 2018-03-15 15:07:55 +00:00
Viktor Kolomeyko
64871ac024
Fix IRSSimulationTest test (#2821) 
* Fix `IRSSimulationTest` test

Since prod class `IRSSimulation` loading `trade.json` as resource, `trade.json` should be located in prod resources folder of a dependant project to be successfully loaded.

Also improve error reporting.

* Change of Json trades samples locations
 2018-03-15 14:40:22 +00:00
Tudor Malene
f67c6874f4
Merge pull request #560 from corda/corda/tudor-os-merge 
Corda/tudor os merge
 2018-03-15 14:21:41 +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
Thomas Schroeter
52a4252ac5 [ENT-1567] Document hot-cold deployment 2018-03-15 10:35:12 +00:00
tudor.malene@gmail.com
81932b4e88 Merge branch 'open_master' into corda/tudor-os-merge 
# Conflicts:
#	settings.gradle
#	verifier/build.gradle
#	verifier/src/integration-test/kotlin/net/corda/verifier/GeneratedLedger.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
#	verifier/src/main/kotlin/net/corda/verifier/Verifier.kt
 2018-03-15 10:21:35 +00:00
Michal Kit
15e4449b38
Adding BigInteger serialization support (#2804) 
* Adding BigInteger serialization support

* Addressing review comments
 2018-03-15 10:11:01 +00:00
Chris Rankin
5360709917
Merge pull request #558 from corda/chrisr3-os-merge 
Merge from OS
 2018-03-15 10:06:36 +00:00
Tudor Malene
88c5ab8870 Feature/corda 1219/remove out of process verifier (#2820) 2018-03-15 09:57:59 +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
Rick Parker
a71ab3f1a1
ENT-1594 Remove usages of Guava cache. Replace with Caffeine. Added whether message is session initiation or not to cache key for de-duplication to account for the 2 P2P consumers. (#557) 2018-03-15 07:58:28 +00:00
igor nitto
247f15ec19
Merge pull request #556 from corda/merges/igor-os-master 
Merge Corda/OS master branch
 2018-03-14 19:03:48 +00:00
Andrius Dagys
f454b949e8 CORDA-1142: Fix explorer to support all transaction types 2018-03-14 18:22:52 +00:00
IgorNitto
53509f9a52 Post-merge fixes 2018-03-14 17:33:51 +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
bpaunescu
1cf1e2d6f0
Merge pull request #553 from corda/bogdan-merge-14 
Bogdan OS-ENT merge 14-03-18
 2018-03-14 16:36:54 +00:00
Rick Parker
a24a2105b1
CORDA-1217 Replace Guava caches with Caffeine (#2818) 2018-03-14 16:07:31 +00:00