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@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
Chris Burlinchon
cb0091f097
Pull out commons lang version
2018-11-19 17:19:44 +00:00
Mike Hearn
349d9a5ffe
Expose SerializedBytes.from in the API
2018-11-19 14:25:39 +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
Konstantinos Chalkias
b8327ddf98
[CORDA-2225] Use platform's non-blocking PRNG when invoking SecureRandom() ( #4234 )
2018-11-14 18:32:22 +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
josecoll
9bfa67de02
Remove duplicate declaration.
2018-11-14 13:53:29 +00:00
josecoll
6a4ef24f54
Merge commit '74c80aafd657e2718787f97932b89a069af7949f' into colljos-merge-141118
2018-11-14 13:52:56 +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
8f6047e3f8
fix merge
2018-11-14 12:06:30 +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
dc62b20c5d
[CORDA-1879]: Ensure Node dies on unrecoverable errors. ( #4213 )
2018-11-12 15:56:04 +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
Roger Willis
2893271ab4
removed dupe companion object. ( #4207 )
2018-11-09 15:34:10 +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
Konstantinos Chalkias
4c25250fc8
[CORDA-2130] Encumbered states should always be assigned to the same notary ( #4158 )
2018-11-09 12:45:43 +00:00
josecoll
74c80aafd6
CORDA-2178 Signature constraints minimum platform version checking ( #4161 )
...
* Minimum platform version checking for new signature constraints feature.
* Fix broken JUnit
* NP safety checking on network parameters.
* Warning and auto-downgrade of signed states that do not meet the minimum network platform version.
2018-11-09 12:27:28 +00:00
szymonsztuka
44dfa23ad5
Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-ecbf23a
2018-11-07 18:17:29 +00:00
Dominic Fox
f3b372d31d
CORDA-2099 make serializer factory interface ( #4137 )
...
* Separate SerializerFactory construction from concrete implementation
* Fewer build methods
* Method naming that doesn't fatally confuse determinisation
* Extract SerializerFactory interface
* Reset to master's version of compiler.xml
* Un-ignore flickering test
* Remove unnecessary build method
* Whitespace
* Unused import
* Change build method
* Formatting fixes
* Fix test
2018-11-07 13:48:45 +00:00
szymonsztuka
19510315b4
Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-6f00560
...
# Conflicts:
# core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
2018-11-07 09:49:23 +00:00
Konstantinos Chalkias
da8dec0d63
[CORDA-2192] Corda specific OID for AliasPrivateKey ( #4175 )
2018-11-07 09:48:13 +00:00
Michal Kit
6f005605aa
CORDA-2187 & CORDA-2038: reverting maxTransactionSize <= maxMessageSize ( #4166 )
...
* CORDA-2187 reverting maxTransactionSize <= maxMessageSize
* Addressing review comments
* Increasing the maxTransactionSize for the Bootstrapper
* Updating the testNetworkParameters
2018-11-07 09:28:27 +00:00
josecoll
356941a733
Merge commit '015a36dad67998236eda7e45309e66e5d58b6374'
2018-11-06 16:29:24 +00:00
szymonsztuka
9efb4121d5
Don't check signers of META-INF/LIST.INDEX file (workaround for CORDA-2116) ( #4148 )
...
Temporally treating META-INF/INDEX.LIST as unsignable entry because java.util.jar.JarVerifier doesn't load its signers. https://r3-cev.atlassian.net/browse/CORDA-2177 for further investigation.
2018-11-06 14:34:03 +00:00
Konstantinos Chalkias
106eb9df4a
[CORDA-2011] [CORDA-2057] CryptoService interface and BC HSM simulation ( #4099 )
2018-11-06 12:57:13 +00:00
Rick Parker
59504b4439
ENT-2691 Soft locking got regressed in Enterprise ( #1539 )
...
* Fix soft locking regression
* Fix caffeine version in core
* Fix default cache bound
2018-11-06 11:40:28 +00:00
josecoll
015a36dad6
CORDA 2131 - Extend Network Bootstrapper to enable registration of Java Package Namespaces. ( #4116 )
...
* Package Ownership Network Parameters: add register / unregister CLI options to network bootstrapper.
* Fix 2 failing unit tests.
* Fix failing unit tests.
* Added changelog, documentation and cosmetic changes.
* Fixed exception message.
* Address PR review feedback.
* Fix typo.
* Resolve conflicts.
* Rebase, resolve conflicts and remove PackageOwner class.
* Address latest PR review feedback.
* Fix incorrect imports.
* Fix broken JUnit
* Add support for key store passwords including delimiter characters.
* Updated and improved documentation.
* Minor doc update.
* Documentation changes following PR review feedback
* Replace Bank Of Corda with Example CorDapp.
Remove references to locally built network bootstrapper.
2018-11-06 09:28:55 +00:00
Roger Willis
80591bc6fd
StatePointer ( #4074 )
...
* Introducing linear pointer.
* Added design document.
Added StatePointer interface.
Updated design document.
Updated StatePointer implementation.
Added doc section for state pointer.
* Updated design document.
Added API for StatePointer.
* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt
Co-Authored-By: roger3cev <roger.willis@r3cev.com>
* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt
Co-Authored-By: roger3cev <roger.willis@r3cev.com>
* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt
Co-Authored-By: roger3cev <roger.willis@r3cev.com>
* Update docs/source/design/linear-pointer/design.md
Co-Authored-By: roger3cev <roger.willis@r3cev.com>
* Update docs/source/design/linear-pointer/design.md
Co-Authored-By: roger3cev <roger.willis@r3cev.com>
* Resolve pointers
Added test to check pointers are resolved.
Updated docs and kdocs.
Reverted changes to api-current.txt
Revert "Reverted changes to api-current.txt"
This reverts commit dc1cece91a595a4e772f63917b830c7e1fd0586d.
Fix CI bug.
Made StatePointers type safe.
Resolving StatePointers is now optionally recursive
Addressed review comments.
Fixed compile error.
Addressed review comments.
Fixed bug in state pointer search.
Improved efficiency of state pointer search.
Removed whitespace.
TxBuilder logs warning when no service hub is supplied for resolving pointers as opposed to throwing an exception.
* Addressed review comments.
2018-11-05 10:33:26 +00:00
Michele Sollecito
6fb2996fd6
[ENT-2678]: PluginRegistrationTest.test plugin registration is failing (fix) ( #1535 )
2018-11-02 14:01:14 +00:00
Andrius Dagys
b9ff958011
ENT-1858: All non-bft notary services are now async
2018-11-02 11:12:46 +00:00
Andrius Dagys
539fac0d57
Merge remote-tracking branch 'open/master' into andrius/merge-11-02
2018-11-02 09:08:03 +00:00
Andrius Dagys
66116e8d20
ENT-1858: Notary cleanup ( #4134 )
...
* Migrated all non-BFT notary implementations to use async commits.
* Mock network: await for async operation completion. When calling runNetwork()
it keeps "pumping" messages between participants until no more messages are generated.
The problem comes in when a flow suspends on an async operation: the mock network
thinks the flow finished the work for the current step, and since no more messages
are generated, completes the runNetwork() function. The message that the flow
generates once it resumes after async operation completion never gets processed.
This change makes runNetwork() wait until all flow async operations finish,
and only then check whether no more messages can be transferred.
2018-11-01 19:03:43 +00:00
Tudor Malene
56158caa8b
Fix merge
2018-11-01 17:59:39 +00:00
Tudor Malene
6c58a28038
Fix merge
2018-11-01 17:04:52 +00:00
tudor.malene@gmail.com
d97d64d954
Merge remote-tracking branch 'open/master' into tudor-os-merge-1-11
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
# core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
# docs/source/index.rst
# node/src/integration-test/kotlin/net/corda/node/flows/FlowOverrideTests.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
2018-11-01 16:58:28 +00:00
Tudor Malene
4e0a956e20
CORDA-2083 Deserialize component groups lazily ( #4122 )
...
CORDA-2083 Deserialize component groups lazily
2018-11-01 16:54:31 +00:00
szymonsztuka
eaea6546fe
Merge pull request #1524 from corda/merges/os-mere-2018-10-31
...
OS -> ENT merge, resolved conflicts: README.md, docs/source/api-persistence.rst, docs/source/node-database.rst.
2018-11-01 10:31:59 +00:00
szymonsztuka
777026eb79
Undo test deletion which got lost in commit 391c6bf66fc31f2609f787298ef1ce77ffe7fb73. ( #4145 )
2018-11-01 10:29:59 +00:00
Florian Friemel
449463241b
Disable PluginRegistrationTest until we fix it.
2018-11-01 09:52:03 +00:00
szymonsztuka
353c96375d
Merge remote-tracking branch 'remotes/open/master' into merges/os-mere-2018-10-31
...
# Conflicts:
# README.md
# docs/source/api-persistence.rst
# docs/source/node-database.rst
2018-10-31 18:08:59 +00:00
Anthony Keenan
8ddd8d383d
Remove unused test class ( #4139 )
2018-10-31 12:58:57 +00:00
Anthony Keenan
a74da313b6
Compilation error
2018-10-25 12:14:27 +01:00
