ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-21 05:53:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,453 Commits 91 Branches 405 Tags 354 MiB
df34a59b02
Commit Graph

9453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyriakos Tharrouniatis
3cbfb0e024
ENT-6355 Empty flow arguments on error transition (#4307) 
A user passed in a `FlowLogic` as an argument into another `FlowLogic`
called `subFlow` on it and had it throw an exception.

This all occurred before the first checkpoint, causing the state machine
to try and persist a FAILED checkpoint containing the flow's arguments.
Because the arguments contained a `FlowLogic` that had been started via
`subFlow` it held a reference to `FlowLogic._stateMachine` which cannot
be serialized.

This caused the flow to fail when trying to persist the fact that it
failed.

The flow arguments are now emptied during `ErrorFlowTransition` to
resolve this issue which mimics the behaviour of the first suspend.
Note, this only takes the arguments out of the serialized checkpoint, it
does not affect the flow metadata and therefore a flow's arguments can
still be viewed.

Co-authored-by: Dan Newton <dan.newton@r3.com>
 2021-12-01 14:57:30 +00:00
Chris Rankin
e93e7c2846
ENT-6412: Upgrade ClassGraph 4.8.90 -> 4.8.135. (#6973) 2021-11-23 09:43:41 +00:00
Dimos Raptis
18333b4860
Upgrade netty version (#6974) 2021-11-19 14:22:01 +00:00
Chris Rankin
caeafb8201
ENT-6357: Deserialize LedgerTransaction elements for each Contract.verify(). (#6962) 
* ENT-6357: Deserialize LedgerTransaction elements for each Contract.verify().

* Lock the LedgerTransaction and NetworkParameters objects down for contract verification.

* Refactor BasicVerifier to be package private instead of public.

* Simplify verifyConstraints() operation.

* Review fixes: replace HashSet with LinkedHashSet, and add signing parties to commands via mapIndexed.

* Ensure tests also run notary nodes "out of process".

* Streamline SerializationContext switching.

* Cache deserialised cryptographic instances during contract verification.

* Invoke Class.forName() instead of ClassLoader.loadClass() to reduce contention on the system classloader's lock.

* Deserialization cache key now pre-computes its hash code.

* Allow AttachmentsClassLoader to be used concurrently.

* Cache all Envelope objects for reuse during contract verification.

* Generate CertPathProxy hash code using conventional algorithm.

* Adjust CustomSerializer.Proxy to allow better access to SerializationContext.
 2021-11-10 16:38:40 +00:00
Dimos Raptis
b0889e0201
ENT-6374 - Fix slf4j warning in trader-demo (#6971) 2021-10-18 11:59:51 +01:00
Walter Oggioni
883e794853
ENT-6330 Fixed reading jar entries in memory (#6960) 
* ENT-6330 Fixed reading jar entries in memory

This is a trivial fix that is however enough to allow to send zip bombs as attachments without the node crashing, a size limit could be added for increased reliability

* added attachment cumulative size check

* added compression ratio check

* added unit test and moved the code to a standalone verifier object

* removed attachment check from AttachmentClassLoader to minimize performance impact
 2021-10-13 09:46:20 +01:00
Christian Sailer
4540e48087
Merge pull request #6970 from corda/nandor-os-4.6-os-4.7-20211011 
NAAS-301 Backport fix notary flow retries after ETA message sent (#6965)
 2021-10-11 18:06:50 +01:00
Christian Sailer
22f81b161d
Merge pull request #6969 from corda/nandor-os-4.5-os-4.6-20211011 
NAAS-300 Forward merge notary ETA fix
 2021-10-11 15:57:02 +01:00
nkovacsx
5d26ffcd89 Merge branch 'release/os/4.5' into nandor-os-4.5-os-4.6-20211011 2021-10-11 12:29:53 +01:00
nkovacsx
1dacee8d57
NAAS-295 Fix notary flow retries after ETA message sent (#6965) (#6968) 2021-10-11 12:27:31 +01:00
nkovacsx
9a3ea393a2
NAAS-295 Fix notary flow retries after ETA message sent (#6965) (#6966) 2021-10-08 14:53:24 +01:00
Ramzi El-Yafi
f859d809c7 NAAS-295 Fix notary flow retries after ETA message sent (#6965) 2021-10-07 09:43:53 +01:00
Ramzi El-Yafi
9146228b0f
NAAS-295 Fix notary flow retries after ETA message sent (#6965) 2021-10-04 17:37:22 +01:00
Dimos Raptis
84000e0794
ENT-3644: Upgrade Netty (#6957) 2021-09-15 08:52:14 +01:00
Viktor Kolomeyko
e50f508c2c
ENT-6331: Disable AMQP protocol for Artemis RPC broker (#6956) 
Also tidy-up visibility scope of internal constants.
 2021-09-14 10:58:02 +01:00
Waldemar Żurowski
943cf0b32f
Merge pull request #6946 from corda/wz/merge-os-47-48-2021-08-06 
NOTICK: Merging forward updates from OS 4.7 to OS 4.8
 2021-08-06 21:53:18 +02:00
Waldemar Zurowski
d0e8e2d8c2 Merge branch 'release/os/4.7' into wz/merge-os-47-48-2021-08-06 2021-08-06 20:22:40 +02:00
Waldemar Żurowski
18541019e4
Merge pull request #6945 from corda/wz/merge-os-46-47-2021-08-06 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7
 2021-08-06 20:19:00 +02:00
Waldemar Zurowski
b7560b9793 Merge branch 'release/os/4.6' into wz/merge-os-46-47-2021-08-06 2021-08-06 19:50:58 +02:00
Waldemar Żurowski
9d6614aac9
Merge pull request #6944 from corda/wz/merge-os-45-46-2021-08-06 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6
 2021-08-06 19:50:15 +02:00
Waldemar Zurowski
5017885b0f Merge branch 'release/os/4.5' into wz/merge-os-45-46-2021-08-06 2021-08-06 19:23:51 +02:00
Waldemar Żurowski
fcd30f554f
Merge pull request #6943 from corda/wz/merge-os-44-45-2021-08-06 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5
 2021-08-06 19:20:16 +02:00
Waldemar Zurowski
4e4ef3691f Merge branch 'release/os/4.4' into wz/merge-os-44-45-2021-08-06 2021-08-06 17:50:27 +02:00
Waldemar Żurowski
133af149e0
Merge pull request #6942 from corda/wz/merge-os-43-44-2021-08-06 
NOTICK: Merging forward updates from OS 4.3 to OS 4.4
 2021-08-06 17:45:29 +02:00
Waldemar Zurowski
c1d5038d16 Merge branch 'release/os/4.3' into wz/merge-os-43-44-2021-08-06 2021-08-06 15:43:12 +02:00
Waldemar Żurowski
16fdc289d7
INFRA-1549: added SCIJAVA repo (#6939) 
* `com.github.detro:ghostdriver` is gone from repositories configured
  already
* SCI Java public repo has it, and it is configured to resolve
  `com.github.detro` group only
 2021-08-05 20:19:16 +02:00
Waldemar Żurowski
70c94adc1d
NOTICK: added newly introduced input (#6940) 
see https://github.com/corda/jira-create-issue-action/pull/8
 2021-08-05 20:18:41 +02:00
Waldemar Żurowski
bf9d0212d9
Merge pull request #6938 from corda/wz/merge-os-47-48-2021-07-27 
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-07-27)
 2021-07-28 10:03:29 +02:00
Waldemar Zurowski
646fc9678f Merge branch 'release/os/4.7' into wz/merge-os-47-48-2021-07-27 2021-07-27 17:15:01 +02:00
Waldemar Żurowski
5d38669b31
Merge pull request #6937 from corda/wz/merge-os-46-47-2021-07-27 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021-07-27)
 2021-07-27 17:10:05 +02:00
Waldemar Zurowski
6b1faeb25e Merge branch 'release/os/4.6' into wz/merge-os-46-47-2021-07-27 2021-07-27 14:16:32 +02:00
Waldemar Żurowski
b7b597e8be
Merge pull request #6936 from corda/wz/merge-os-45-46-2021-07-26 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021-07-27)
 2021-07-27 11:07:29 +02:00
Waldemar Zurowski
64de942752 Merge branch 'release/os/4.5' into wz/merge-os-45-46-2021-07-26 
Conflicts:
	build.gradle
 2021-07-27 07:33:25 +02:00
Waldemar Żurowski
6b3c8b5868
Merge pull request #6935 from corda/wz/merge-os-44-45-2021-07-26 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021-07-26)
 2021-07-26 18:28:12 +02:00
Waldemar Zurowski
5d27c62510 Merge branch 'release/os/4.4' into wz/merge-os-44-45-2021-07-26 
Conflicts:
	build.gradle
 2021-07-26 09:29:43 +02:00
Waldemar Żurowski
b4a07dce55
Merge pull request #6934 from corda/wz/merge-os-43-44-2021-07-23 
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021-07-23)
 2021-07-24 22:49:12 +02:00
Waldemar Zurowski
bb5eb6f93d Merge branch 'release/os/4.3' into wz/merge-os-43-44-2021-07-23 2021-07-23 13:23:09 +02:00
Waldemar Żurowski
f82f6f9b65
NOTICK: remote obsolete Maven repository for Kotlin in Bintray (#6933) 2021-07-23 11:10:21 +02:00
Waldemar Żurowski
08a3c73596
Merge pull request #6932 from corda/wz/merge-os-46-47-2021-07-19 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021/07/19)
 2021-07-19 22:21:57 +02:00
Waldemar Żurowski
eb5e5918b9
Merge pull request #6931 from corda/wz/merge-os-46-47-2021-07-19 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021/07/19)
 2021-07-19 22:18:09 +02:00
Waldemar Zurowski
ad83074e6d NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021/07/19) 2021-07-19 22:14:03 +02:00
Waldemar Żurowski
0873996efa
Merge pull request #6930 from corda/wz/merge-os-45-46-2021-07-19 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021/07/19)
 2021-07-19 22:12:27 +02:00
Waldemar Zurowski
f3065b81b5 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021/07/19) 
Conflicts:
	samples/irs-demo/build.gradle
 2021-07-19 22:07:31 +02:00
Waldemar Żurowski
2d72d2e67f
Merge pull request #6929 from corda/wz/merge-os-44-45-2021-07-19 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021/07/19)
 2021-07-19 22:02:24 +02:00
Waldemar Zurowski
c60f72d927 NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021/07/19) 2021-07-19 21:56:48 +02:00
Waldemar Żurowski
981e5591ed
Merge pull request #6928 from corda/wz/merge-os-43-44-2021-07-19 
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021/07/19)
 2021-07-19 21:55:49 +02:00
Waldemar Zurowski
e07ec2e7bd NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021/07/19) 2021-07-19 17:47:41 +02:00
Waldemar Żurowski
9e790c4767
INFRA-1309: migrate docker-compose-rule-junit4 from Bintray to Maven Central (#6927) 
docker-compose-rule-junit4 is available from Maven Central, but from
version 1.0.0 onwards

Bumping version number to 1.5.0 introduces following list of
dependencies:

* com.fasterxml.jackson.core:jackson-annotations:2.4.4 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-core:2.9.7 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-databind:2.11.0 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-databind:2.9.7 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-databind:2.9.8 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-databind:2.9.9 (Apache 2.0)
* com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.8 (Apache
  2.0)
* com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.2
  (Apache 2.0)
* com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.8 (Apache
  2.0)
* com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8 (Apache
  2.0)
* com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8 (Apache
  2.0)
* com.fasterxml.jackson.module:jackson-module-afterburner:2.9.8 (Apache
  2.0)
* com.github.zafarkhaja:java-semver:0.9.0 (MIT)
* com.google.code.findbugs:jsr305:3.0.2 (Apache 2.0)
* com.google.errorprone:error_prone_annotations:2.3.3 (Apache 2.0)
* com.google.guava:guava:18.0 (Apache 2.0)
* com.google.guava:guava:21.0  (Apache 2.0)
* commons-io:commons-io:2.6  (Apache 2.0)
* com.palantir.conjure.java.api:errors:2.12.0 (Apache 2.0)
* com.palantir.conjure.java:conjure-lib:5.15.0 (Apache 2.0)
* com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:
  4.18.1 (Apache 2.0)
* com.palantir.docker.compose:docker-compose-rule-core:1.5.0 (Apache
  2.0)
* com.palantir.docker.compose:docker-compose-rule-events-api-objects:
  1.5.0 (Apache 2.0)
* com.palantir.docker.compose:docker-compose-rule-junit4:1.5.0 (Apache
  2.0)
* com.palantir.ri:resource-identifier:1.1.0 (Apache 2.0)
* com.palantir.safe-logging:preconditions:1.11.0 (Apache 2.0)
* com.palantir.safe-logging:preconditions:1.13.0 (Apache 2.0)
* com.palantir.safe-logging:preconditions:1.9.0 (Apache 2.0)
* com.palantir.safe-logging:safe-logging:1.11.0 (Apache 2.0)
* com.palantir.safe-logging:safe-logging:1.13.0 (Apache 2.0)
* com.palantir.tokens:auth-tokens:3.6.1  (Apache 2.0)
* jakarta.annotation:jakarta.annotation-api:1.3.5 (EPL 2.0)
* jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (EPL 2.0)
* joda-time:joda-time:2.10.3 (Apache 2.0)
* junit:junit:4.13 (EPL 1.0)
* one.util:streamex:0.7.2 (Apache 2.0)
* org.apache.commons:commons-lang3:3.7 (Apache 2.0)
* org.awaitility:awaitility:4.0.2 (Apache 2.0)
* org.hamcrest:hamcrest:2.1 (BSD 3-clause)
* org.hamcrest:hamcrest-core:2.1 (BSD 3-clause)
* org.slf4j:slf4j-api:1.7.25 (MIT)
 2021-07-19 15:02:33 +02:00
Waldemar Żurowski
f966b7a873
Merge pull request #6924 from corda/wz/merge-os-47-48-2021-06-25 
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-06-25)
 2021-06-25 10:26:05 +02:00
Waldemar Zurowski
761532926b Merge branch 'release/os/4.7' into wz/merge-os-47-48-2021-06-25 2021-06-25 10:24:56 +02:00