hyperledger-cacti / cacti

Hyperledger Cacti is a new approach to the blockchain interoperability problem
https://wiki.hyperledger.org/display/cactus
Apache License 2.0
344 stars 286 forks source link

chore: rebase satp-dev onto upstream/main #3584

Closed petermetz closed 1 month ago

petermetz commented 1 month ago

Also fixing a few other bugs which were all necessary to make it work after a rebase onto upstream/main as of 2024-10-10.

  1. The tsconfig.json file in the root did not contain a reference to the package at packages/cactus-plugin-ccmodel-hephaestus so it was being excluded from the compilation.
  2. express version was not up to date with the rest of the monorepo which

Signed-off-by: Peter Somogyvari peter.somogyvari@accenture.com

Pull Request Requirements

Character Limit

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

petermetz commented 1 month ago

Hmm. Seems like the conflicts are unavoidable and the only way to fix them is to force push directly to satp-dev so I'll just do that instead of this PR. cc: @RafaelAPB