ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 17:57:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,189 Commits 91 Branches 405 Tags 354 MiB
ac33e9401a
Commit Graph

11189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andras Slemmer
4e16c2a06a Switch checkpoints on for retryable sends, add back confirmationWindowSize setting 2018-03-09 10:18:39 +00:00
szymonsztuka
b86071c5c5
ENT-1566 Fixes for db integration tests + ENT-1575 db migrations for db attachment changes (#521) 
ENT-1575 Add db migrations for db attachment changes,

ENT-1566 Fixes for db integration tests -following changes in CORDA-926 (obligatory node properties), upgrade db schema setup in draining mode/RPC tests, set runMigration=true in properties files for db tests, add new tables for deletion in SQL setup scrips
Updated db integration tests description in testing.rst
 2018-03-09 09:52:44 +00:00
Katelyn Baker
198fb4f264
CORDA-1192 - Quieten message when reflecting on a builtin Kotlin type (#2767) 
* CORDA-1192 - Quieten message when reflecting on a builtin Kotlin type

* review comments
 2018-03-08 23:07:41 +00:00
Michal Kit
5f49bfc88a
CRL - persistence layer (#509) 
* Addressing review comments

* Certificate Revocation List - persistence layer

* Addressing review comments

* Addressing review comments

* Addressing review comments

* Adding a crl test
 2018-03-08 13:28:02 +00:00
Matthew Nesbit
b3203c9f3e
Remove a mistakenly duplicated constant defined on ArtemisMessagingComponent (#2765) 2018-03-08 12:44:05 +00:00
Konstantinos Chalkias
2e9027db1b
secureRandomBytes should call getNextBytes, not generateSeed (#2587) 2018-03-08 11:44:26 +00:00
Konstantinos Chalkias
c3c3a859d5
CORDA-1117 - port rst fixes (#2762) 2018-03-08 11:11:28 +00:00
bpaunescu
775877d173
Merge pull request #527 from corda/bogdan-merge-08032018 
Bogdan merge 08032018
 2018-03-08 10:57:36 +00:00
Konstantinos Chalkias
d70cd26a7c
Kdoc/comment updates (#2626) 2018-03-08 10:52:07 +00:00
ags
ca54ed611c
addressing review remarks 2018-03-08 09:06:12 +00:00
bpaunescu
fd9098e7e2 Merge remote-tracking branch 'open/master' into bogdan-merge-08032018 2018-03-08 08:45:15 +00:00
bpaunescu
98a6c71480
CORDA-296: added handler for connection failover (#2639) 
* CORDA-296: added handler for connection failover
print rpc address during node startup

* address PR comments: typo, whitespace, onError observables

* reworked rpc client msg buffering to avoid race conditions when failure happens while the request is being prepared to be sent; added unit test for 8 threads sharing same client sending 1000 requests

* decreased sleep time in rpc test, code cleanup
 2018-03-08 08:21:35 +00:00
szymonsztuka
b106af63eb
Merge pull request #526 from corda/merges/CORDA-792 
Merge up from OS master including Standalone Shell and changes..
 2018-03-07 19:02:25 +00:00
szymonsztuka
17eb30965d
CORDA-792 - Standalone Shell - fix test on Windows (#2757) 
Fix test which uses Paths.get() and doesn't match on Windows.
 2018-03-07 17:14:32 +00:00
szymonsztuka
d6efff7ee8 Post merge - added copyrights to new files. 2018-03-07 16:52:06 +00:00
szymonsztuka
3733e7d715 Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792 
# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaAuthenticationPlugin.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaSSHAuthInfo.kt
#	node/src/main/kotlin/net/corda/node/shell/RPCOpsWithContext.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	settings.gradle
#	testing/test-common/src/main/kotlin/net/corda/testing/common/internal/UnsafeCertificatesFactory.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
#	tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
#	tools/shell/src/main/kotlin/net/corda/tools/shell/FlowWatchPrintingSubscriber.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShellCommand.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/utlities/ANSIProgressRenderer.kt
#	tools/shell/src/main/resources/net/corda/tools/shell/base/login.groovy
#	tools/shell/src/test/kotlin/net/corda/tools/shell/CustomTypeJsonParsingTests.kt
#	tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt
 2018-03-07 16:49:00 +00:00
Anthony Keenan
84e930d52a
[CORDA-991] - Update committed api from v3 release branch (#2734) 
* Update from v3

* Remove CordaInternal attribute as this is removed by v4 api-scanner plugin

* Make SerializationContext @DoNotImplement

* Addition of CordappConfig to contstructor of CordappContext

* Alteration of getOffset/getSize properties in ByteSequence, OpaqueBytes & OpaqueBytesSubSequence

* Make network parameters on MockServices final
 2018-03-07 16:13:16 +00:00
ags
93fda7a515
re-removing irrelevant fragment 2018-03-07 16:06:14 +00:00
Matthew Nesbit
c63311343b
Merge pull request #524 from corda/mnesbit-merge-20180307 
Merge up from OS master including Artemis headers whitelisting
 2018-03-07 16:04:39 +00:00
Patrick Kuo
feeba03fbf Regenerate liquidBase change log (#518) 
* rebase liquidBase change log

* * address PR issues
* Better constraint name
* change Varchar to NVarchar

* Removing liquibase migrations for CRR (#525)

* Removing liquibase migrations for CRR

* Addressing review comments
 2018-03-07 16:02:02 +00:00
Katelyn Baker
e6ed91df8b
CORDA-1186 - Move ConstructorForDeserialization out of internal (#2759) 
Since it's a user facing object it shouldn't exist in an internal
package. Move to core to exist with the other serialization annotations
 2018-03-07 16:02:01 +00:00
ags
eb3f463112
removed obsolete file 2018-03-07 15:58:59 +00:00
ags
5d91531ee0
Webserver should not require Jolokia in any way 2018-03-07 15:22:49 +00:00
ags
3b3614c13b
Removed a reference to a logger not present in tests 2018-03-07 14:50:34 +00:00
ags
ed3ba537f3
Restoring Jolokia in webserver, to be able to redirect logger via Slf4j 2018-03-07 14:35:15 +00:00
szymonsztuka
0d5f033aae
[CORDA-1085] Alter column names to be consistent with R3.Corda. (#2606) 
Alter column names to be consistent with R3.Corda - related to CORDA-990.
 2018-03-07 13:28:49 +00:00
Andrzej Grzesik
803ce15b32
Corda-1155 - Jolokia logging via slf4j (#2753) 
* Jolokia logging through slf4j

* review remarks
 2018-03-07 13:23:00 +00:00