Commit Graph

11366 Commits

Author SHA1 Message Date
Joel Dudley
a7d0b124d2
Set up instructions no longer rely on Java installer in Mac (defaults to JDK 9). 2018-03-14 13:38:21 +00:00
Andrzej Cichocki
ca586eda18
Merge pull request #549 from corda/andr3ej-provider-setup-ent
ENT-1439 Refactor Provider setup
2018-03-14 13:16:37 +00:00
Chris Rankin
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
Patrick Kuo
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
Joel Dudley
dc250bc701
Minor clarification of network map docs. 2018-03-14 11:45:26 +00:00
bpaunescu
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
Matthew Nesbit
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
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
Katelyn Baker
df536cee86
CORDA-966 - RELEASE - Merge release notes from release branch to master (#2775) 2018-03-14 10:05:38 +00:00
szymonsztuka
42d1fcc7b2 Ignore 2 flaky SSH via StandaloneShell tests temporarily. (#2810) 2018-03-14 09:34:42 +00:00
Michal Kit
341e060424
Adding CSR signature verification (#537) 2018-03-14 09:17:09 +00:00
Michal Kit
1a6f7bc2c0
Whitelisting CRLReason class (#2803) 2018-03-14 08:05:00 +00:00
Shams Asari
9afcbb16a2
Unwrapping InvocationTargetException during config parsing (#2811) 2018-03-14 07:04:25 +00:00
Shams Asari
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
Michele Sollecito
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
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
5ced7e2d35 Ignoring an unstable test. 2018-03-13 17:04:32 +00:00
Michal Kit
4f263f806b
Fixing missing configuration (#530)
* Fixing missing configuration

* Addressing review comments
2018-03-13 16:49:02 +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
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
Shams Asari
e22e7acd67
Various cleanups of the network-management code (#545) 2018-03-13 10:58:04 +00:00
szymonsztuka
98f554c08d
Fix database doc - SQL Server / Azure and PostgreSQL (#539)
Fixed wrong configuration example for SQL Server / Azure, fixed duplicated and conflicting PostgreSQL instructions after merge from OS.
2018-03-13 11:31:25 +01:00
Andrzej Cichocki
6b80072b18
ENT-1439 Use thread-local MessageDigest. (#541) 2018-03-13 10:20:22 +00:00
Thomas Schroeter
721728c8ab
Terminate observables on RPC connection failures (#2770) 2018-03-13 10:01:44 +00:00
Joel Dudley
568f7d7c17
Documents limitations of calls to external resources in flows. 2018-03-13 09:34:00 +00:00
Joel Dudley
d591ed5907
Update key-concepts-transactions.rst. 2018-03-13 04:06:20 +09:00
Joel Dudley
2ecec9617e
Adds demobench as an option for running nodes. Minor reorganisation. 2018-03-13 04:03:17 +09:00
Chris Rankin
5de831c1d3
Only include the Oracle repository if the username/password properties are set. (#544) 2018-03-12 16:03:13 +00:00
Katelyn Baker
0e33ab7fdb CORDA-966 - RELEASE - Update static versions for V3 2018-03-12 13:40:34 +00:00
Katelyn Baker
82786b3655 CORDA-966 - RELEASE - Update version number to corda-4.0-snapshot 2018-03-12 13:40:34 +00:00
Tudor Malene
065fdbf647
Merge pull request #543 from corda/feature/migration_tool_cfg_fix
config parsing non-strict
2018-03-12 13:22:50 +00:00
Andrzej Grzesik
c2e89f007c
Merge pull request #542 from corda/ags_2018-03-12
Merge from OS 20180312
2018-03-12 12:27:10 +00:00
Tudor Malene
5de8b72ae2 config parsing non-strict 2018-03-12 11:55:24 +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
ags
dba52b1676
Merge remote-tracking branch 'open/master' into ags_2018-03-12 2018-03-12 11:25:46 +00:00
Andrzej Grzesik
9a0a0e9880
Merge pull request #2758 from corda/merge/CORDA-1155
CORDA-1155 - Jolokia logging via slf4j (#2753)
2018-03-12 11:19:05 +00:00
Chris Rankin
46a5684762
Delete assertion for modified time as it can never be reliable. (#540) 2018-03-12 10:40:36 +00:00
Joel Dudley
3f735451a5
Documents the default username and password for H2. 2018-03-12 19:15:54 +09:00
Ben Abineri
d9ab693752
make two exceptions that held me up recently more helpful (#2778) 2018-03-12 09:35:40 +00:00
Andrius Dagys
ac328aeb67
Merge pull request #538 from corda/andrius-merge-03-09
O/S merge 03 09
2018-03-09 18:58:53 +00:00
Andrius Dagys
2fbb34ba38 CORDA-1171: Update MySQL uniqueness provider to throw the correct exception 2018-03-09 16:22:36 +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
Patrick Kuo
fb350d9463
* Fix change set ID (#529) 2018-03-09 15:09:46 +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
Viktor Kolomeyko
af60848da7 CORDA-1197: Take into account last amount submitted when adding data points.
Current logic in `CashWidget` is not handling well updates done in close succession, i.e. less than 1 second.
And such frequent updates do indeed happen, e.g. from: `net.corda.client.jfx.model.ContractStateModel#cashStates`
where `list` is modified twice.

Also use `.toDecimal()` instead of `.quantity`to have amount represented in pounds rather than in pennies.

(cherry picked from commit 952cc35)
2018-03-09 12:57:58 +00:00
Andras Slemmer
a8753a692e
Merge pull request #535 from corda/aslemmer-ENT-1589
ENT-1589
2018-03-09 12:02:36 +00:00