ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-15 16:46:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,693 Commits 99 Branches 407 Tags
Commit Graph

2935 Commits

Author SHA1 Message Date
szymonsztuka
58056d4ea9
Improve integration tests to run in database mode - Sql setup for new test, cleanup of new test table. (#1582) 2018-11-21 09:47:29 +00:00
Oliver Knowles
94dd223662
Merge pull request #1579 from corda/oknowles-os-merge-20-11 
OS Merge 20/11/18
 2018-11-21 09:07:34 +00:00
szymonsztuka
17d6634761
Expose JPA to flows (#4140) - add Liquibase script for test to run in database mode (#1581) 2018-11-20 21:21:16 +00:00
Oliver Knowles
b1982e5b55 Merge remote-tracking branch 'open/master' into oknowles-os-merge-20-11 2018-11-20 14:46:30 +00:00
Oliver Knowles
373d99435c
CORDA-1965 Auto-accept network parameter changes (#4222) 
* add auto acceptance of certain network parameters

* Remove incorrect nullification of newNetworkParameters object within NetworkMapUpdater

* Automatically update network parameters if update accepted and flag day occured

* Comment cleanup

* Add node configuration for auto accepting network parameter changes

* Remove hot swapping of network parameters

* Add docs for auto accept config flag

* Minor change to log line

* Remove unrelated fix that was corrected on master

* Minor name change within NetworkParameters class

* Minor doc rewording

* Fix typo in docs

* Address PR comments

* Add node config option to turn off network param auto-accept on a per param basis

* Address PR comments

* Fix failing Network Map update integration test
 2018-11-20 09:50:42 +00:00
Tudor Malene
1d35c322c9 Fix merge 2018-11-19 18:30:29 +00:00
Tudor Malene
12b79fc40b Fix merge 2018-11-19 18:13:07 +00:00
Michele Sollecito
2762c34ebe
[CORDA-1877]: Ensured Driver fails to start when Notary tried to bind an already bound port. (#4246) 2018-11-19 18:06:27 +00:00
tudor.malene@gmail.com
06e74c4442 Merge remote-tracking branch 'open/master' into tudor-os-merge-19-11 
# Conflicts:
#	docs/source/cli-ux-guidelines.rst
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/core/TestUtils.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalTestUtils.kt
 2018-11-19 17:40:34 +00:00
Michele Sollecito
b9f2401123 Removed errorCode for raw configuration parsing errors. 2018-11-19 16:47:57 +00:00
Tudor Malene
2d043828a0
CORDA-2083 verify transaction in AttachmentsClassloader (#4188) 
CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 fix tests

CORDA-2083 add support for explicit upgrade transactions

CORDA-2083 cleanup

CORDA-2083 cleanup

CORDA-2083 More cleanup

CORDA-2083 More cleanup

CORDA-2083 Clean up tests

CORDA-2083 Address code review comments

CORDA-2083 Fix merge

CORDA-2083 Fix merge

CORDA-2083 Address code review comments

revert file

CORDA-2083 Fix test

CORDA-2083 Add test

CORDA-2083 cleanup

CORDA-2083 Fix test

CORDA-2083 Address code review comments.

CORDA-2083 Remove unused functions.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.

CORDA-2083 Address code review comments.
 2018-11-19 13:42:12 +00:00
Stefano Franz
828892a3d9
write nodeInfo to additional-node-info folder as well as baseDirectory (#4247) 
* write nodeInfo to additional-node-info folder as well as baseDirectory

* fix broken network map tests
 2018-11-19 11:26:42 +00:00
Stefano Franz
8f463c46a9 Add message to uses of require(...) (#4192) 2018-11-16 17:13:55 +00:00
Mike Hearn
9594aea9f7 Merge remote-tracking branch 'open/master' into mike-merge-4d2d9b83 2018-11-16 16:43:20 +00:00
Shams Asari
ac1d3d1fc7 Merge branch 'merge-point-e8b6f5f' into os-merge-e8b6f5f 
# Conflicts:
#	docs/source/api-persistence.rst
#	docs/source/example-code/src/main/java/net/corda/docs/java/FlowCookbook.java
#	docs/source/upgrade-notes.rst
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
 2018-11-15 13:09:06 +00:00
Shams Asari
7696a570d1 Merge fixes 2018-11-14 18:50:29 +00:00
Andrius Dagys
e1e5d13941
CORDA-2221: Fix clustered notary identity generation (#4230) 
- Don't generate a composite key certificate for CFT notaries
- Don't require a composite key certificate for CFT notaries on startup
 2018-11-14 18:15:05 +00:00
Shams Asari
4984e92e31 Merge branch 'os-merge-point' into os-merge-shams 
# Conflicts:
#	build.gradle
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	docs/source/api-persistence.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	settings.gradle
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt
 2018-11-14 18:13:01 +00:00
Shams Asari
e8b6f5f2f2
CORDA-2005: FinalityFlow has been made into an inlined flow to resolve issue with FinalityHandler (#4050) 
FinalityHandler is insecure in that it is open to receive any transaction from any party.

Any CorDapp targeting platform version 4 or above is required use the new c'tors which take in FlowSession objects to the counterpart flow. This flow must subcall ReceiveFinalityFlow to receive and record the finalised transaction.

Old CorDapps (with target platform version < 4) will continue to work as previously. However if there are no old CorDapps loaded then the node will disable FinalityHandler.
 2018-11-14 14:16:22 +00:00
Christian Sailer
a08807b591
Ent-2570 Replace caffeine jitpack dependency (#1564) 
* Use our caffeine version from artifactory

* Switch to use the 50% window version of caffeine
 2018-11-14 13:28:34 +00:00
tudor.malene@gmail.com
1e27f0cbe0 Merge remote-tracking branch 'private/master' into feature/tudor_constraints 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
 2018-11-14 11:50:19 +00:00
Michele Sollecito
8aaf120881
[CORDA-2224]: Removed field value from Validated. Renamed function orThrow() to value(). (#4231) 2018-11-14 11:19:38 +00:00
Michele Sollecito
aa0ccecfde
[CORDA-2172]: Add link to error-codes-webapp in Corda. (#4224) 2018-11-13 15:46:21 +00:00
Konstantinos Chalkias
71117ebdad
[CORDA-2212] Better error on empty Party name fuzzy matching (#4220) 
* typo - no matching
 2018-11-12 19:34:21 +00:00
Shams Asari
1c012f6403
Back porting clean up of FlowFrameworkTests.kt made in ENT (#4218) 2018-11-12 18:38:47 +00:00
Anthony Keenan
369f23e306
CORDA-1817: Fix issue with misleading capsule error messages (#4215) 
* Make caplet respect all acceptable combinations of cmd line parameters

* If cordapp dir fails to create, still run corda.jar and let it fail gracefully

* Don't parse additional options as the parameter for the previous one.

* Remove commented lines
 2018-11-12 17:22:22 +00:00
Michele Sollecito
dc62b20c5d
[CORDA-1879]: Ensure Node dies on unrecoverable errors. (#4213) 2018-11-12 15:56:04 +00:00
Matthew Nesbit
2600376773 Acknowledge all artemis messages 2018-11-12 14:01:45 +00:00
Michele Sollecito
ac23fcdf24
[CORDA-2208]: NodeHandles hashcode attemps an RPC invocation. (#4217) 2018-11-12 13:50:10 +00:00
Shams Asari
fab0c5cd2c
Merge pull request #1561 from corda/os-merge-99e9864 
O/S merge 99e9864
 2018-11-12 12:37:31 +00:00
Konstantinos Chalkias
23907c40d9
[CORDA-2210] Add matching party on the first X500 attribute match (#4211) 2018-11-12 11:59:04 +00:00
Shams Asari
2e9d7ce811 CORDA-2129: Ported changes in SingleThreadedStateMachineManager to MultiThreadedStateMachineManager 
Introduced a new FlowFrameworkTestsUsingMultithreadedSMM test class to test the changes. In the process extracted out the multiple test classes in FlowFrameworkTests.kt.
 2018-11-12 10:44:40 +00:00
Konstantinos Chalkias
81418ca7e7
[CORDA-2200][CORDA-2202] More tests for BCCryptoService and CryptoServiceException (#4190) 2018-11-12 09:38:06 +00:00
Roger Willis
4684259970
Expose JPA to flows (#4140) 
* First pass
* Update test.
* Address review comments.
* Added docs and kdocs.
* Clean-up.
* Add extra test.
* Changes to docsite.
* Added try/catch block as recommended by Andras.
* Removed try catch block. It's not required as the checkpoint serialiser deals with this.
* Re-used existing DB session instead of creating a new session.
* Entity manager auto flushes.
* Added java friendly api.
* Addressed review comments.
 2018-11-09 17:47:36 +00:00
bpaunescu
7fbe8e7de7
renamed external artemis config properties for consistency (#1555) 2018-11-09 16:47:12 +00:00
Michal Kit
32ff24ddc7
ENT-2706 Fixing the CRL issuer cert lookup (#1556) 
* ENT-2706 Fixing the CRL issuer cert lookup

* Addressing review comments

* Reverting imports
 2018-11-09 16:20:00 +00:00
Shams Asari
4801942a87 Merge branch 'merge-99e9864' into os-merge-99e9864 
# Conflicts:
#	.gitignore
#	.idea/codeStyles/Project.xml
 2018-11-09 14:53:26 +00:00
Andrius Dagys
336185de23
CORDA-2190: Improve notary service flow exception handling (#4200) 
* CORDA-2190: Improve notary service flow exception handling

- Refactored notary flows to reduce validation code duplication
- Improved notarisation error handling to provide more helpful responses to the client
 2018-11-09 14:00:40 +00:00
Michal Kit
2f644039b5
CORDA-2205 Fixing CRL issuer store lookup (#4205) 2018-11-09 13:45:23 +00:00
Michele Sollecito
72be3aa830
Merge pull request #1553 from corda/merges/08_11_2018_16_05 
Merges: 08/11/2018 at 16:05
 2018-11-09 10:50:39 +00:00
Michele Sollecito
420b2ccd40 Merge branch 'master' into merges/08_11_2018_16_05 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/EnterpriseConfiguration.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-11-08 18:20:02 +00:00
Michele Sollecito
6a90f42eba Added enterprise specific fields to V1NodeConfigurationSpec. 2018-11-08 18:00:47 +00:00
Michele Sollecito
b6b37ad6f4 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:54:09 +00:00
Michele Sollecito
545dd25ef3 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:25:41 +00:00
Michele Sollecito
69921669e7 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:18:44 +00:00
Michele Sollecito
92ab3ab025 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:17:26 +00:00
Matthew Nesbit
0b134eee86 Improve artemis client shutdown time when disconnected and don't block on commit if Artemis is already closing. 2018-11-08 17:04:13 +00:00
Shams Asari
d4474e87e1
CORDA-2129: Attempts to initiate a flow that's unknown is paused and instead sent to the flow hospital (#4181) 
This allows for the case of a missing CorDapp to be installed on node restart and recover the original flow initiate request.
 2018-11-08 17:03:17 +00:00
Michele Sollecito
1671f7da31 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:00:03 +00:00
Michele Sollecito
fe581f8cf1 Working on merging changes to NodeConfigurationImpl. 2018-11-08 16:52:30 +00:00