ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-12 05:35:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,082 Commits 96 Branches 407 Tags
Commit Graph

12082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shams Asari
27e688e2c8
Merge pull request #895 from corda/os-merge-5d1cc0b 
O/S merge from 5d1cc0b
 2018-05-31 11:14:15 +01:00
rick.parker
6f30225f65 Remove redundant SessionDeliverPersistenceStrategy 2018-05-31 09:59:42 +01:00
David Lee
b3b57ccb19 Dl perftest cordapp measure (#782) 
* Added summary logging

* Added logging of summary metrics to performance log

* Minor arithmetic change

* Tweak

* Reformatted code
 2018-05-31 09:05:26 +01:00
Tudor Malene
fd2f2eb14a ENT-1871 Rebrand R3Corda to Corda Enterprise (#838) 
* ENT-1871 Rebrand R3Corda to Corda Enterprise

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments
 2018-05-31 08:59:05 +01:00
rick.parker
6fef4c86d3 Update configuration files to remove references to StateMachineConfiguration 2018-05-31 08:56:37 +01:00
rick.parker
b43e09a939 Update configuration files to remove references to StateMachineConfiguration 2018-05-31 08:52:48 +01:00
Shams Asari
78a5c708d2 Merge fixes 2018-05-31 00:20:32 +01:00
Shams Asari
03fae9bd7d Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b 
# Conflicts:
#	.idea/compiler.xml
#	node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt
 2018-05-30 21:47:48 +01:00
szymonsztuka
294c134965
Merge pull request #894 from corda/merges/os-2018-05-30-up-to-ed70fea 
OS -> ENT merge up to ed70fea
 2018-05-30 19:06:28 +01:00
Konstantinos Chalkias
5d1cc0bd54
K1 is supported by TLS (permissioning.rst) and identify Sphincs as experimental due to a BC 1.58 issue which needs investigation. (#3269) 2018-05-30 17:38:33 +01:00
Michele Sollecito
e44b6c6f4a
[CORDA-1356]: CashException is unable to derisalize with AMQP through RPC. (fix). (#3274) 2018-05-30 17:15:50 +01:00
Rick Parker
ef2772e328
CORDA-1540 Remove no-longer-used StateMachineConfiguration (#3270) 2018-05-30 17:06:36 +01:00
szymonsztuka
953b0ca87d Added copyrights to the test class. 2018-05-30 16:37:46 +01:00
Shams Asari
7b09795795
CORDA-1383: Cleaned up the JSON format of WireTransaction and SignedTransaction (#3248) 
In particular correctly outputs the custom state and command objects in the txs. Also fixed up deserialisation back into the transaction objects.
 2018-05-30 16:37:41 +01:00
szymonsztuka
37cadbce69 Resolved merge conflicts. 2018-05-30 16:36:06 +01:00
szymonsztuka
ed70fea3a7
CORDA-1548 Hibernate session not flushed before handing over raw JDBC session to user code (e.g. coin selection) (#3266) 
* Hibernate session flushed before handing over raw JDBC session to user code + test - inserting and selecting cash in the same transaction
* Additional two tests copied from Enterprise repo
 2018-05-30 16:19:06 +01:00
Thomas Schroeter
9418f9191e
Document notary.serviceLegalName (#3265) 2018-05-30 15:47:40 +01:00
Viktor Kolomeyko
43ddc5e179
ENT-1396: Improve verification of states to transactions. (#882) 
Since not every output state may be present, e.g. if the whole amount been paid and at source
the state is fully spent, there will not be a trace of an output state at source.
But recipient(target) will always have references of output states in its vault.

Also perform transfer of the full issued amount to eliminate any sort of coin selection issues.
 2018-05-30 15:35:28 +01:00
Michele Sollecito
26ef294d8d
[CORDA-1356]: OOM when using Demobench + Explorer (fix). (#3268) 2018-05-30 15:04:24 +01:00
szymonsztuka
1a82de8b53
Document ability to add custom dataSource properties - related to ENT-1428 (#870) 
When specifying data source for NonStop database custom data source properties needs to be passed, which was always feasible but never documented (as there was no need for it).
 2018-05-30 14:54:55 +01:00
bpaunescu
9447398acb
Hot-cold operational guide fixes and improvements (#884) 
* minor typos, improving the HA operational

* Hot-cold operational guide improvement(typos, styling, more specific settings)

* ENT-1959: address PR comments

* address pr comments
 2018-05-30 14:12:47 +01:00
Matthew Nesbit
86b4086b37
Merge pull request #892 from corda/mnesbit-merge-20180530 
Merge from OS
 2018-05-30 13:39:55 +01:00
sollecitom
6f0363258e [CORDA-1552]: Log commands executed by the Shell. 2018-05-30 13:28:05 +01:00
Joel Dudley
3535633d45
Add DCO requirement to contributing docs. (#3263) 2018-05-30 12:35:51 +01:00
szymonsztuka
621835aea8 ENT-1990 SQL Server and Oracle coin selection over-select coins (#891) 2018-05-30 11:40:38 +01:00
szymonsztuka
d377f14ac3 Upgrade integration test introduced by CORDA-1465 to run in database mode (#887) 2018-05-30 11:31:22 +01:00
Matthew Nesbit
a3c6ef351d Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180530 
# Conflicts:
#	docs/source/changelog.rst
 2018-05-30 11:12:25 +01:00
Konstantinos Chalkias
de99f07d5a Revert adding validatePublicKey to api-current (#3261) 2018-05-30 11:07:59 +01:00
Matthew Nesbit
74a3c70ee5
Merge pull request #890 from corda/mnesbit-bridge-artemis-reconnect-bug 
ENT-1991: The Bridge Artemis reconnection logic failed in test.
 2018-05-30 11:05:20 +01:00
szymonsztuka
0a4d98161a CORDA-1266 When a cash output is identical only the fist output is saved. (#3244) 2018-05-30 10:49:44 +01:00
Michele Sollecito
df928f6f2a
Merge pull request #889 from corda/merges/may-29-16-48 2018-05-30 10:37:34 +01:00
Michele Sollecito
1c1b492532
[CORDA-1542]: Ctrl-C in the shell no longer aborts the flow (fix). (#3260) 2018-05-30 10:29:10 +01:00
Stefano Franz
7c8038f388
Merge pull request #888 from roastario/add_post_process_tarballing_task 
add post process step to build tarball from node distribution
 2018-05-30 10:03:52 +01:00
Matthew Nesbit
202bd6603b
Simplify the toString, so that printing ConnectionChange events into the log output only gives a summary and reduce logging. (#3247) 2018-05-29 18:18:31 +01:00
Matthew Nesbit
f98bf4db14 The Artemis reconnection logic failed in test, because there were active artemis bridge connections. Correct the integration test, fix the bridging code and log all onError cases in the bridge. 2018-05-29 18:14:35 +01:00
sollecitom
afdfd983e7 Fixed some compilation errors. 2018-05-29 17:19:37 +01:00
sollecitom
0b753969ee Fixed some compilation errors. 2018-05-29 17:19:16 +01:00
sollecitom
de0c69a888 Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt
#	node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLogTests.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt
#	samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/api/NodeInterestRatesTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
 2018-05-29 17:17:08 +01:00
Konstantinos Chalkias
ac212972ea
[CORDA-1539] Minimum RSA key of 2048 bits on validatePublicKey (#3239) 2018-05-29 17:11:00 +01:00
Joel Dudley
1c7b44fb3d
Instructions for IntelliJ 2018.1 (#3250) 
* Instructions for IntelliJ 2018.1

* Addresses review feedback
 2018-05-29 16:51:28 +01:00
Stefano Franz
3e9c6f0f96 add post process step to build tarball from node distribution 2018-05-29 16:45:28 +01:00
Rick Parker
22280ee611
Merge pull request #886 from corda/parkri-os-merge-20180529-1 
OS -> ENT merge
 2018-05-29 16:31:29 +01:00
szymonsztuka
9c368b1486
ENT-1956 Fix SQL query for cash selection for SQL Server/Azure and Oracle (#885) 
Bug in SQL code for cash selection in Azure/Sql Server/Oracle db was occurring for selection within outputs few outputs from a single transaction and requiring returning a change.
 2018-05-29 15:39:30 +01:00
Michele Sollecito
7c87353bde
[CORDA-1547]: Make log4j2.xml files more resilient to regex escaping problems. (#3254) 2018-05-29 15:25:52 +01:00
Michele Sollecito
f68cf6f712
[CORDA-1341]: Ensure API can be called concurrently wrt transactions. (#3235) 2018-05-29 15:25:34 +01:00
Shams Asari
0f82e2df7f
Explicitly check the contractStateType param of the RPC vault queries is a ContractState class. (#3251) 
We lose the compile-time checks of the Class type parameter when invoking from the shell.
 2018-05-29 15:01:55 +01:00
Katelyn Baker
a359f627d5
CORDA-1545 - Arrays of primitive byte arrays don't deserialize (#3249) 
* CORDA-1545 - Arrays of primitive byte arrays don't deserialize

At serialization time we incorrectly encode the type as byte[p][] instead
of binary[]
 2018-05-29 14:36:04 +01:00
rick.parker
af1c3289ab ENT-1975 Remove mutex and SQLException handling around perfcordapp coin selection to rely on flow hospital. 2018-05-29 14:25:41 +01:00
rick.parker
34a9a7aa05 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180529-1 2018-05-29 14:21:53 +01:00
Viktor Kolomeyko
8a5978e881
CORDA-1536: Fix client infinitely re-trying when incorrect endpoint specified. (#3243) 
Apparently, if incorrect endpoint provided, ActiveMQNotConnectedException is thrown
which is different to ActiveMQSecurityException. Extend catch block to: ActiveMQException
to cater for all such cases.
 2018-05-29 14:05:51 +01:00