Commit Graph

12993 Commits

Author SHA1 Message Date
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
0d1e9694ae Merge remote-tracking branch 'open/master' into andrius-merge-1503 2018-03-15 15:07:55 +00:00
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
f67c6874f4 Merge pull request #560 from corda/corda/tudor-os-merge
Corda/tudor os merge
2018-03-15 14:21:41 +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
52a4252ac5 [ENT-1567] Document hot-cold deployment 2018-03-15 10:35:12 +00:00
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
15e4449b38 Adding BigInteger serialization support (#2804)
* Adding BigInteger serialization support

* Addressing review comments
2018-03-15 10:11:01 +00:00
5360709917 Merge pull request #558 from corda/chrisr3-os-merge
Merge from OS
2018-03-15 10:06:36 +00:00
88c5ab8870 Feature/corda 1219/remove out of process verifier (#2820) 2018-03-15 09:57:59 +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
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
247f15ec19 Merge pull request #556 from corda/merges/igor-os-master
Merge Corda/OS master branch
2018-03-14 19:03:48 +00:00
f454b949e8 CORDA-1142: Fix explorer to support all transaction types 2018-03-14 18:22:52 +00:00
53509f9a52 Post-merge fixes 2018-03-14 17:33:51 +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
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
a24a2105b1 CORDA-1217 Replace Guava caches with Caffeine (#2818) 2018-03-14 16:07:31 +00:00
0b12c5f602 Merge remote-tracking branch 'open/master' into bogdan-merge-14 2018-03-14 15:01:27 +00:00
a2783f4c8f Write update query in HQL (#523) 2018-03-14 15:01:04 +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
cd37f761ab Merge pull request #476 from corda/mnesbit-external-bridge
ENT-1549: Initial Creation of Bridge/Float Process
2018-03-14 14:14:34 +00:00
8f750c0629 CORDA-1042: Change the way how Jolokia library located on the classpath so that it work on Windows (#2817)
Old code failed with:
```
11:34:01.536 [main] ERROR net.corda.node.internal.Node - Exception during node startup
java.nio.file.InvalidPathException: Illegal char <:> at index 2: /C:/Program%20Files/JetBrains/IntelliJ%20IDEA%20Community%20Edition%202017.3.1/lib/idea_rt.jar
	at sun.nio.fs.WindowsPathParser.normalize(WindowsPathParser.java:182) ~[?:1.8.0_144]
	at sun.nio.fs.WindowsPathParser.parse(WindowsPathParser.java:153) ~[?:1.8.0_144]
	at sun.nio.fs.WindowsPathParser.parse(WindowsPathParser.java:77) ~[?:1.8.0_144]
	at sun.nio.fs.WindowsPath.parse(WindowsPath.java:94) ~[?:1.8.0_144]
	at sun.nio.fs.WindowsFileSystem.getPath(WindowsFileSystem.java:255) ~[?:1.8.0_144]
	at java.nio.file.Paths.get(Paths.java:84) ~[?:1.8.0_144]
	at net.corda.node.utilities.JVMAgentRegistry.resolveAgentJar(JVMAgentRegistry.kt:46) ~[classes/:?]
	at net.corda.node.internal.AbstractNode.initialiseJVMAgents(AbstractNode.kt:785) ~[classes/:?]
	at net.corda.node.internal.AbstractNode.start(AbstractNode.kt:199) ~[classes/:?]
	at net.corda.node.internal.Node.start(Node.kt:335) ~[classes/:?]
	at net.corda.node.internal.NodeStartup.startNode(NodeStartup.kt:146) ~[classes/:?]
	at net.corda.node.internal.NodeStartup.run(NodeStartup.kt:120) [classes/:?]
	at net.corda.node.Corda.main(Corda.kt:16) [classes/:?]
```
2018-03-14 13:42:18 +00:00
a7d0b124d2 Set up instructions no longer rely on Java installer in Mac (defaults to JDK 9). 2018-03-14 13:38:21 +00:00
ca586eda18 Merge pull request #549 from corda/andr3ej-provider-setup-ent
ENT-1439 Refactor Provider setup
2018-03-14 13:16:37 +00:00
1407f01600 Upgrade to corda-gradle-plugins 4.0.8 (#2815)
* Add missing @DoNotImplement annotations.
* Upgrade to corda-gradle-plugins 4.0.8
2018-03-14 12:47:38 +00:00
a435c23e19 ENT-1557 - Network Map returns 404 not found for current node info advertised in the network map (#511)
* * added is current and timestamp to the node info table
* getNodeInfoHashes returns all "current" node info hashes
* TODO: network map should return 404 if receive old node info request
* TODO: database migration integration test

* fix compilation error

* * removed unnecessary unique constraint

* rebase and tidy up liquid base xml

* address PR issues

* address PR issues

* address PR issues
2018-03-14 11:53:55 +00:00
dc250bc701 Minor clarification of network map docs. 2018-03-14 11:45:26 +00:00
3502186572 Bogdan - small rework of RPC client sending (#2812)
* rework message handling while connection is down: do not send anything, throw on all obs and futures when failure detected

* RPC calls will throw if used during failover; adapted tests
2018-03-14 11:45:18 +00:00
d592fb5c49 Create basic bridge module and capsule build
Basic pieces of bridge, still very rough

Work in progress

Fixes after rebase

Primitive float tunnel implementation

Put explanatory comments on the interfaces. Add support for different SSL KeyStores for the different connections to/from the bridge and float.

Add a couple more comments

Cleanup

Fix some issues

Use a new custom header to relay the login identity from bridges. (Will add more security to this shortly)

Make key protection logic a bit clearer in the comments

Create some basic test and integrationTests

Add a couple of tests of the BridgeAMQPListenerService

Add some basic tests

Correct comment

Fixup after rebase

Fixup after rebase

Fixup after rebase

Explicit parameter types to work on build box.

Address PR comments

Address some of Mike's PR comments.

Re-enable test on enterprise.

Don't sweep up node default config

Remove obsolete config entry

Correct merge mistake

Configurable whitelist headers on bridge

Don't access primary artemis session from different threads used by inbound packet pathway.

Fix unit test
2018-03-14 11:08:09 +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
e969d22ebb Create DesignChecklist.md 2018-03-14 10:48:55 +00:00
df536cee86 CORDA-966 - RELEASE - Merge release notes from release branch to master (#2775) 2018-03-14 10:05:38 +00:00
42d1fcc7b2 Ignore 2 flaky SSH via StandaloneShell tests temporarily. (#2810) 2018-03-14 09:34:42 +00:00
341e060424 Adding CSR signature verification (#537) 2018-03-14 09:17:09 +00:00
1a6f7bc2c0 Whitelisting CRLReason class (#2803) 2018-03-14 08:05:00 +00:00
9afcbb16a2 Unwrapping InvocationTargetException during config parsing (#2811) 2018-03-14 07:04:25 +00:00
34800ab527 Split up the parsing of the command line arguments from the parsing of the config files. (#547)
Also, the "config-file" command line argument for the doorman jar is required - it no longer defaults to network-management.conf
2018-03-14 07:01:53 +00:00
4b1e0a6ffd Merge pull request #546 from corda/merges/march-13-14-55
Merges: March 13 14:55
2018-03-13 22:51:22 +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
5ced7e2d35 Ignoring an unstable test. 2018-03-13 17:04:32 +00:00
4f263f806b Fixing missing configuration (#530)
* Fixing missing configuration

* Addressing review comments
2018-03-13 16:49:02 +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
fae0dc0276 [CORDA-1216]: Moved dependency on Jackson Databind from core to finance. (#2802) 2018-03-13 14:51:55 +00:00
ags
8a22a00d68 crash shell with help and bye 2018-03-13 14:32:14 +00:00
ags
ff7db8685a increased crash shell version 2018-03-13 14:30:16 +00:00
ags
57a52f43a4 shell: list commands alphabetically 2018-03-13 14:30:01 +00:00