Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CORE-16983 / CORE-16967 Atomic Swap with Facade #4691

Closed
wants to merge 42 commits into from

Conversation

jmacmahonr3
Copy link
Contributor

@jmacmahonr3 jmacmahonr3 commented Sep 22, 2023

API additions in corda/corda-api#1282

szymonsztuka and others added 4 commits September 8, 2023 16:54
…a including all nested types used inside DigitalSignatureAndMetadata and especially proof of batch signature.

 The test using extended UtxoLedgerTest class which produces transaction with a Merkle tree proof - signed by "signBatch".
 Due to quite awkward dependencies between modules, the test is in UTXO module - as only this module can produce a sample signature with proof.
@jmacmahonr3 jmacmahonr3 requested review from a team as code owners September 22, 2023 13:08
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title failed to match regex -> ^((CORDA|EG|ENT|INFRA|CORE|DOC|ES)-\d+)(.*)

@@ -48,6 +48,7 @@ dependencies {
implementation project(':libs:platform-info')
implementation project(":libs:serialization:serialization-avro")
implementation project(":libs:tracing")
implementation project(':libs:crypto:merkle-impl')
Copy link
Contributor

@vlajos vlajos Sep 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depending on -impl looks a bit suspicious.
Dependencies should be injected via OSGi.
Although probably some direct constructors are not available via OSGi.

@jmacmahonr3 jmacmahonr3 requested review from a team as code owners September 25, 2023 10:12
jmacmahonr3 and others added 3 commits October 3, 2023 10:50
…com.fasterxml.jackson.databind.MappingIterator cannot be cast to class java.lang.String

2. Move addition of new Jackson deserializers to initialisation of JsonMarshallingServiceImpl, instead adding them in a pretty much random method "setDeserializer" which may be not invoked
@szymonsztuka szymonsztuka requested a review from a team as a code owner October 4, 2023 16:46
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title failed to match regex -> ^((CORDA|EG|ENT|INFRA|CORE|DOC|ES)-\d+)(.*)

@szymonsztuka szymonsztuka removed the WIP label Oct 23, 2023
…rop/jmac/CORE-16983

# Conflicts:
#	components/flow/flow-service/build.gradle
#	components/flow/flow-service/src/main/kotlin/net/corda/flow/application/services/impl/FacadeServiceImpl.kt
#	components/flow/flow-service/src/test/kotlin/net/corda/flow/application/services/interop/dispatchers/FacadeServerDispatcherSpec.kt
#	components/flow/flow-service/src/test/kotlin/net/corda/flow/application/services/interop/proxies/FacadeClientProxySpec.kt
#	components/flow/flow-service/src/test/kotlin/net/corda/flow/application/services/interop/roundtrip/RoundTripTest.kt
#	gradle.properties
#	testing/cpbs/interop-token-demo-workflows/src/main/kotlin/com/r3/corda/demo/interop/tokens/workflows/interop/SwapResponderSubFlow.kt
@corda-jenkins-ci02
Copy link
Contributor

corda-jenkins-ci02 bot commented Oct 24, 2023

Jenkins build for PR 4691 build 26

Build Successful:
Jar artifact version produced by this PR: 5.1.0-INTEROP.0-alpha-1698161066983
Helm chart version produced by this PR: 5.1.0-Interop-alpha.1698161066983
Helm chart pushed to: oci://corda-os-docker-dev.software.r3.com/helm-charts/pr-4691/corda

@szymonsztuka szymonsztuka changed the title Jackson Serializers & Deserializers for DigitalSignatureAndMetadata CORE-16983 Jackson Serializers & Deserializers for DigitalSignatureAndMetadata Oct 24, 2023
@github-actions github-actions bot dismissed stale reviews from themself October 24, 2023 13:53

All good!

# Conflicts:
#	components/ledger/ledger-utxo-flow/src/test/kotlin/net/corda/ledger/utxo/flow/impl/transaction/signatureproof/SignatureProofTests.kt
#	testing/ledger/ledger-utxo-base-test/src/main/kotlin/net/corda/ledger/utxo/test/UtxoLedgerWithBatchSignerTest.kt
Copy link
Contributor

@wzur-r3 wzur-r3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@szymonsztuka szymonsztuka changed the title CORE-16983 Jackson Serializers & Deserializers for DigitalSignatureAndMetadata CORE-16983 / CORE-16967 Atomic Swap with Facade Nov 3, 2023
Copy link

This PR is stale because it has been open 7 days with no activity. Remove the Stale label or add a comment - otherwise this will be closed in 7 days.

@github-actions github-actions bot added the Stale label Dec 18, 2023
Copy link

This PR was closed because it has been stale for 7 days with no activity.

@github-actions github-actions bot closed this Dec 26, 2023
@github-actions github-actions bot deleted the interop/jmac/CORE-16983 branch July 16, 2024 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants