-
Notifications
You must be signed in to change notification settings - Fork 285
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
feat(corda): support 5.1 via TS/HTTP (no JVM) #3241
feat(corda): support 5.1 via TS/HTTP (no JVM) #3241
Conversation
...cactus-plugin-ledger-connector-corda/src/main/typescript/web-services/get-cpi-endpoint-v1.ts
Fixed
Show fixed
Hide fixed
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adrianbatuto we will need another issue to update some code changes. Mentioning it here so that we don't loos the track of the same.
- Update each new endpoint function (in the connector class) to use one universal function to do GET/POST (Currently the universal function,
setupRequest
, does only the basic initialization) - Update the AIO to not use
--network host
tag so that it can be tested via CI
packages/cactus-plugin-ledger-connector-corda/src/main-server/healthcheck.sh
Outdated
Show resolved
Hide resolved
packages/cactus-plugin-ledger-connector-corda/src/main-server/start-app.sh
Outdated
Show resolved
Hide resolved
packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json
Outdated
Show resolved
Hide resolved
packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json
Outdated
Show resolved
Hide resolved
packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json
Outdated
Show resolved
Hide resolved
...s/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/corda-v5-flow.test.ts
Outdated
Show resolved
Hide resolved
...s/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/corda-v5-flow.test.ts
Outdated
Show resolved
Hide resolved
...s/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/corda-v5-flow.test.ts
Outdated
Show resolved
Hide resolved
...s/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/corda-v5-flow.test.ts
Outdated
Show resolved
Hide resolved
packages/cactus-test-tooling/src/main/typescript/corda/corda-v5-test-ledger.ts
Outdated
Show resolved
Hide resolved
0eb899e
to
38c5858
Compare
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
...actus-plugin-ledger-connector-corda/src/main/typescript/web-services/list-cpi-endpoint-v1.ts
Fixed
Show fixed
Hide fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adrianbatuto Two questions:
- Does this work without the JVM app? I see you've made changes to the kotlin code.
- Would merging this still retain compatibility with 4.x Corda ledgers?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Blocking the PR for now as the image used in this from @adrianbatuto personal github registry.
Once the AIO docker image gets published from the Cacti account itself, the process of merging of this PR can progress.
|
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json
Outdated
Show resolved
Hide resolved
packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json
Outdated
Show resolved
Hide resolved
38c5858
to
05a9288
Compare
The corda-v5-flow.test.ts is getting flaky results so I added a timeout as a temporary fix. I will look further into the issue and a separate ticket might be created for it. |
@jagpreetsinghsasan this has been resolved. |
05a9288
to
97811b8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adrianbatuto - OK, thank you for confirming the answers and the PR.
@jagpreetsinghsasan Please make sure that the follow-up issues are opened and added to the board! Thank you in advance!
@petermetz we have added the follow up tasks with the flakiness fix being the highest priority task in the queue followed by the cordapps feature issue. |
@hyperledger/cacti-maintainers |
97811b8
to
7a03e5d
Compare
@jagpreetsinghsasan Thank you! Agreed on all of those! |
7a03e5d
to
8273248
Compare
5c1abee
to
15069c2
Compare
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Fixed
Show fixed
Hide fixed
9014731
to
ebdb9ee
Compare
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...es/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts
Outdated
Show resolved
Hide resolved
...tus-plugin-ledger-connector-corda/src/main/typescript/web-services/start-flow-endpoint-v1.ts
Outdated
Show resolved
Hide resolved
ebdb9ee
to
a93e56c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adrianbatuto Sorry, I wasn't perfectly clear in one of my comments: https://github.com/hyperledger/cacti/pull/3241#discussion_r1712368658
a0397ad
to
c960449
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adrianbatuto We are almost there!
...actus-plugin-ledger-connector-corda/src/main/typescript/web-services/get-flow-endpoint-v1.ts
Outdated
Show resolved
Hide resolved
...actus-plugin-ledger-connector-corda/src/main/typescript/web-services/get-flow-endpoint-v1.ts
Show resolved
Hide resolved
...actus-plugin-ledger-connector-corda/src/main/typescript/web-services/get-flow-endpoint-v1.ts
Outdated
Show resolved
Hide resolved
...actus-plugin-ledger-connector-corda/src/main/typescript/web-services/get-flow-endpoint-v1.ts
Outdated
Show resolved
Hide resolved
3cd5b23
to
5e7ff7b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adrianbatuto Looking good! Now the last thing (hopefully) is to fix the failing corda connector server build
Cactus_CI / ghcr-connector-corda-server (pull_request) Failing after 1m
Details
5e7ff7b
to
755e177
Compare
@petermetz, I fixed the build error and now the check is failing because of vulnerability issues. |
Fixes hyperledger-cacti#2978 Fixes hyperledger-cacti#3293 Signed-off-by: adrianbatuto <adrian.batuto@accenture.com>
755e177
to
35e3ff3
Compare
@adrianbatuto Thanks for the fix, we can address the trivy vulnerabilities later in a different PR, so, looking good to me now. |
Commit to be reviewed
feat(corda): support 5.1 via TS/HTTP (no JVM)
Fixes #2978
Fixes #3293
Pull Request Requirements
upstream/main
branch and squashed into single commit to help maintainers review it more efficient and to avoid spaghetti git commit graphs that obfuscate which commit did exactly what change, when and, why.-s
flag when usinggit commit
command. You may refer to this link for more information.Character Limit
A Must Read for Beginners
For rebasing and squashing, here's a must read guide for beginners.