feat(satp-hermes): update satp to 0.0.1-beta #3922

RafaelAPB · 2025-05-23T15:25:55Z

Pull Request Requirements

Rebased onto 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.
Have git sign off at the end of commit message to avoid being marked red. You can add -s flag when using git commit command. You may refer to this link for more information.
Follow the Commit Linting specification. You may refer to this link for more information.

Character Limit

Pull Request Title and Commit Subject must not exceed 72 characters (including spaces and special characters).
Commit Message per line must not exceed 80 characters (including spaces and special characters).

A Must Read for Beginners
For rebasing and squashing, here's a must read guide for beginners.

...in-satp-hermes/src/main/typescript/cross-chain-mechanisms/oracle/oracle-scheduler-manager.ts

@AndreAugusto11

Signed-off-by: Rafael Belchior <[email protected]> feat(bungee): add skeleton for bungee Signed-off-by: André Augusto <[email protected]> refactor(plugin-satp-hermes): update messages formats SATP core version 2.0.0 OpenAPI * created new messages in openAPI definition feat(bungee): fix bungee dependencies Signed-off-by: André Augusto <[email protected]> feat(SATP-Hermes): gateway coordinator feat(SATP-Hermes): gateway coordinator feat(SATP-Hermes): gateway coordinator WIP Signed-off-by: Rafael Belchior <[email protected]> test(SATP-Hermes): enable decorators needed for gateway coordinator checks Signed-off-by: Rafael Belchior <[email protected]> docs(SATP-Hermes): update package.json Signed-off-by: Rafael Belchior <[email protected]> refactor(SATP-Hermes): re-estructure project Signed-off-by: Rafael Belchior <[email protected]> refactor(SATP-Hermes): re-estructure project Signed-off-by: Rafael Belchior <[email protected]> refactor(SATP-Hermes): re-estructure project Signed-off-by: Rafael Belchior <[email protected]> refactor(SATP-Hermes): remove kotlin sdk, add protobuffer Signed-off-by: Rafael Belchior <[email protected]> feat(SATP-Hermes): protobuf structure Signed-off-by: Rafael Belchior <[email protected]> feat(SATP-Hermes): protobuf structure Signed-off-by: Rafael Belchior <[email protected]> refactor(SATP-Hermes): refactor naming Signed-off-by: Rafael Belchior <[email protected]> feat(SATP-Hermes): protobuf structure improvements Signed-off-by: Rafael Belchior <[email protected]> feat(SATP-Hermes): update yarn.lock and clean up Signed-off-by: André Augusto <[email protected]> refactor(test-tooling): fix types of streams: use NodeJS.ReadableStream 1. The container management library that we use in the test infrastructure (called dockerode) is expecting streams that are defined in the global namespace of the `@types/node` library, e.g. the standard library of NodeJS itself. 2. Previously we were using the "streams" package to provide type information to the streams that we were passing around to dockerode and it was working fine, but after some changes that seem unrelated this has broken the compilation process. 3. The mentioned changes are not yet on the main branch, but we expect them to be there soon and so this change is laying the groundwork for that by pre-emptively fixing the broken build's root cause which is that the test-tooling package does not declare it's typings related dependencies correctly: It implicitly uses the NodeJS standard library's types but so far had not declared them on the package level. 4. This change is therefore to rectify the issue of the `@types/node` dependency missing from the test-tooling package and also the refactoring of some of the test ledger classes which were relying on the `streams` builtin package instead of correctly using the NodeJS.ReadableStream global. 5. Earlier the reasoning for this was that we try to avoid pulling in types from the global scope because we try to avoid any sort of dependency on the global scope in general. Once we have proof though that this is causing issues with the build, then we must give up the principle for practical reasons (and only in the minimum viable scope, e.g. this does not change the fact that everywhere else in the codebase we should still do our best to avoid using the global scoped classes, types, functions, etc..). Thank you to @AndreAugusto11 and @RafaelAPB for pointing out this issue through the pull request of his that is currently being worked on at the time of this writing: RafaelAPB#72 Related to but does not address #2811 Signed-off-by: Peter Somogyvari <[email protected]> refactor(SATP-Hermes): remove unused packages * updated openapi version * updated bungee plugin version to 2.0.0-alpha.2 Co-authored-by: Peter Somogyvari <[email protected]> Signed-off-by: André Augusto <[email protected]> Signed-off-by: Peter Somogyvari <[email protected]>

Co-authored-by: André Augusto <[email protected]> Co-authored-by: Peter Somogyvari <[email protected]> Co-authored-by: Rafael Belchior <[email protected]> Signed-off-by: Rafael Belchior <[email protected]> test(satp-hermes): fix hanging tests Signed-off-by: Rafael Belchior <[email protected]> refactor(SATP-Hermes): fix cspell and lint Signed-off-by: André Augusto <[email protected]>

Co-authored-by: Peter Somogyvari <[email protected]> Co-authored-by: André Augusto <[email protected]> Authored-by: Rafael Belchior <[email protected]> Signed-off-by: Rafael Belchior <[email protected]>

Signed-off-by: Andre Augusto <[email protected]>

…ry in Client Request Signed-off-by: Andre Augusto <[email protected]>

… crash * Also removed ABIs and bytecode from the response /oracle/status endpoint Signed-off-by: Andre Augusto <[email protected]>

Signed-off-by: Andre Augusto <[email protected]>

Signed-off-by: Rafael Belchior <[email protected]>

examples/cactus-example-cbdc-bridging-backend/src/main/solidity/satp-contract-interface.sol

examples/cactus-example-cbdc-bridging-backend/src/main/solidity/satp-erc20.sol

VRamakrishna · 2025-06-05T07:56:30Z

...n/typescript/infrastructure/fabric-contracts/satp-contract/chaincode-typescript/package.json

+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "engines": {
+    "node": ">=12",


Do you need to support Node versions as far back as v12? Node v18 reached EOL recently, and other Cacti packages are pegged to at least v18, so I'd suggest a change to that version.

We will fix this

Yes, this is a typo/copy paste from old fabric samples code.

...structure/fabric-contracts/satp-contract/chaincode-typescript/src/satp-contract-interface.ts

VRamakrishna · 2025-06-05T08:02:42Z

examples/cactus-example-cbdc-bridging-frontend/package.json

+    "@types/uuid": "10.0.0",
+    "customize-cra": "1.0.0",
+    "react-app-rewired": "2.2.1",
+    "ts-loader": "9.5.1"
  },
  "engines": {
    "node": ">=18",


Here you have the minimum version set to 18. Can you have this constraint be consistent across all the packages?

We will fix this

VRamakrishna · 2025-06-05T08:11:01Z

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/git_push.sh

+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="hyperledger"


This should be hyperledger-cacti, no?

VRamakrishna · 2025-06-05T08:15:38Z

...in-satp-hermes/src/main/typescript/cross-chain-mechanisms/oracle/smart-contracts/placeholder

Do you want to call this .placeholder as you've done elsewhere? Alternatively, if you want to check in a blank folder, the standard Git convention (as far as I am aware) is to create a blank file named .gitkeep.

We will use .gitkeep

VRamakrishna · 2025-06-05T08:18:13Z

packages/cactus-plugin-satp-hermes/src/test/solidity/contracts/satp-contract-interface.sol

+ *  Smart Contract Interface to define the methods needed by SATP Wrapper Contract.
+ */
+
+interface SATPContractInterface {


With reference to my earlier comment on this PR, this file seems to be a replica of a file in one of the examples. Ideally, you'd want such an interface to be exported from a common package, so IMO this is the right place for it. And you also ideally don't want to replicate code, which makes maintenance and managing inconsistencies harder.

Ideally the examples should import this file, as long as it is a replica. @AndreAugusto11 @LordKubaya

This interface was removed.

VRamakrishna · 2025-06-05T08:19:13Z

...es/src/test/typescript/fabric/contracts/oracle-bl-contract/chaincode-typescript/package.json

+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "engines": {
+    "node": ">=12",


Again, I'd prefer this be >=18.

VRamakrishna

Overall, this looks fine, though I haven't (obviously) gone through each file.

Left some minor questions and suggestions. I'd prefer you address the ones around versioning and naming. Replicated code we can live with as long as eliminating redundancies is in your roadmap and is tracked via issues. Same with moving common code from examples to packages.

Can you also add a small description of the changes made in this PR, perhaps a few high-level bullet points, in the opening comment?

General question: I see several instances of generated code (both in JS and Go) being checked in. Are you sure you want to do this? I don't have a strong view on this and will defer to your decision, but just wanted to inquire.

RafaelAPB · 2025-06-05T11:51:08Z

Thank you for your feedback, dear @VRamakrishna - we will incorporate those changes and come back to you.

Signed-off-by: Andre Augusto <[email protected]>

Signed-off-by: Carlos Amaro <[email protected]> Co-authored-by: Carlos Amaro <[email protected]> Co-authored-by: Rodolfo Carapau <[email protected]>

ci(satp-hermes): cdbc Signed-off-by: Rodolfo Carapau <[email protected]>

…r solidity (#3929) Signed-off-by: Andre Augusto <[email protected]>

RafaelAPB · 2025-06-17T12:16:55Z

@VRamakrishna we incorporated your feedback. Could you please re-review?

Signed-off-by: Carlos Amaro <[email protected]>

RafaelAPB requested review from AndreAugusto11, takeutak, izuru0, jagpreetsinghsasan, VRamakrishna, sandeepnRES and outSH as code owners May 23, 2025 15:25

github-advanced-security bot found potential problems May 23, 2025

View reviewed changes

...in-satp-hermes/src/main/typescript/cross-chain-mechanisms/oracle/oracle-scheduler-manager.ts Show resolved Hide resolved

RafaelAPB force-pushed the satp-stg branch from 4add8d8 to 37ef4cc Compare May 23, 2025 15:30

outSH approved these changes May 23, 2025

View reviewed changes

RafaelAPB force-pushed the satp-stg branch 6 times, most recently from 527f5f2 to 1e43ea3 Compare May 23, 2025 16:09

RafaelAPB marked this pull request as draft May 23, 2025 16:41

RafaelAPB force-pushed the satp-stg branch from 1513391 to 314096a Compare May 27, 2025 17:31

RafaelAPB and others added 2 commits May 27, 2025 18:32

RafaelAPB force-pushed the satp-stg branch 5 times, most recently from 9f53ea4 to 6511ed4 Compare May 27, 2025 18:12

RafaelAPB marked this pull request as ready for review May 27, 2025 18:16

RafaelAPB requested a review from LordKubaya as a code owner May 27, 2025 18:16

RafaelAPB force-pushed the satp-stg branch 2 times, most recently from 1a8d568 to 82d18d4 Compare May 27, 2025 18:26

feat(satp-hermes): add API1 baseline

d5e9594

Co-authored-by: Peter Somogyvari <[email protected]> Co-authored-by: André Augusto <[email protected]> Authored-by: Rafael Belchior <[email protected]> Signed-off-by: Rafael Belchior <[email protected]>

AndreAugusto11 and others added 7 commits May 27, 2025 19:35

fix(satp-hermes): get approve address param

0a033d8

Signed-off-by: Andre Augusto <[email protected]>

feat(satp-hermes): adding check to ensure polling time is reasonable

2395426

Signed-off-by: Andre Augusto <[email protected]>

feat(satp-hermes): removed unused pubkeys of originator and beneficia…

a30a7de

…ry in Client Request Signed-off-by: Andre Augusto <[email protected]>

fix(satp-hermes): added missing try/expect causing unexpected gateway…

034fde6

… crash * Also removed ABIs and bytecode from the response /oracle/status endpoint Signed-off-by: Andre Augusto <[email protected]>

feat(satp-hermes): add gasConfig in SATP Ethereum Leaf

52723af

Signed-off-by: Andre Augusto <[email protected]>

feat(satp-hermes): add timestamps to SATP messages

53a5770

Signed-off-by: Andre Augusto <[email protected]>

fix(satp-hermes): update networkid

dbbfbab

Signed-off-by: Rafael Belchior <[email protected]>

RafaelAPB force-pushed the satp-stg branch from fbeccff to dbbfbab Compare May 27, 2025 18:37

ci(satp-hermes): address action lint errors

118eeef

Signed-off-by: Rafael Belchior <[email protected]>

RafaelAPB force-pushed the satp-stg branch from 4c4e774 to 118eeef Compare May 27, 2025 18:45

VRamakrishna reviewed Jun 3, 2025

View reviewed changes

examples/cactus-example-cbdc-bridging-backend/src/main/solidity/satp-contract-interface.sol Outdated Show resolved Hide resolved

VRamakrishna reviewed Jun 3, 2025

View reviewed changes

examples/cactus-example-cbdc-bridging-backend/src/main/solidity/satp-erc20.sol Outdated Show resolved Hide resolved

VRamakrishna reviewed Jun 5, 2025

View reviewed changes

...structure/fabric-contracts/satp-contract/chaincode-typescript/src/satp-contract-interface.ts Show resolved Hide resolved

VRamakrishna reviewed Jun 5, 2025

View reviewed changes

VRamakrishna requested changes Jun 5, 2025

View reviewed changes

AndreAugusto11 and others added 6 commits June 13, 2025 19:20

feat(satp-hermes): fix /integrations endpoint

7e1562d

Signed-off-by: Andre Augusto <[email protected]>

feat(satp-hermes): fix build

128e8f0

Signed-off-by: Andre Augusto <[email protected]>

feat(satp-hermes): implement /audit endpoint

78c9610

Signed-off-by: Andre Augusto <[email protected]>

ci(satp-hermes): ci fix (#3896)

eeee09d

Signed-off-by: Carlos Amaro <[email protected]> Co-authored-by: Carlos Amaro <[email protected]> Co-authored-by: Rodolfo Carapau <[email protected]>

ci(satp-hermes): added CBDC integration test (#3940)

8f2b926

ci(satp-hermes): cdbc Signed-off-by: Rodolfo Carapau <[email protected]>

feat(satp-hermes): refactor ERC20 SATP token and add foundry tests fo…

b53713d

…r solidity (#3929) Signed-off-by: Andre Augusto <[email protected]>

AndreAugusto11 force-pushed the satp-stg branch from 886d14e to b53713d Compare June 13, 2025 18:23

fix(satp-hermes): contract versioning

6e8eb74

Signed-off-by: Carlos Amaro <[email protected]>

feat(satp-hermes): update satp to 0.0.1-beta #3922

Are you sure you want to change the base?

feat(satp-hermes): update satp to 0.0.1-beta #3922

Uh oh!

Conversation

RafaelAPB commented May 23, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VRamakrishna left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RafaelAPB commented Jun 5, 2025

Uh oh!

RafaelAPB commented Jun 17, 2025

Uh oh!

Uh oh!

VRamakrishna left a comment •

edited

Loading