Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/commitlint-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,24 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
with:
fetch-depth: 0

- name: Display commit messages with line details
run: |
echo "📝 Analyzing commit messages..."
echo "================================"
git log --format=%H origin/main..HEAD | while read -r hash; do
echo ""
echo "Commit: ${hash}"
echo "--------------------------------"
git log --format=%B -n 1 "${hash}" | awk '{printf "%3d [%3d chars] %s\n", NR, length($0), $0}'
echo "--------------------------------"
done

- uses: wagoid/commitlint-github-action@b948419dd99f3fd78a6548d48f94e3df7f6bf3ed #6.2.1
with:
configFile: commitlint.config.mjs
failOnWarnings: false
failOnErrors: true
helpURL: 'https://github.com/conventional-changelog/commitlint/#what-is-commitlint'
env:
VERBOSE: true
2 changes: 1 addition & 1 deletion .github/workflows/dependent-issues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- opened
- edited
- reopened
pull_request_target:
pull_request:
types:
- opened
- edited
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semantic-pull-request.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Lint PR"

on:
pull_request_target:
pull_request:
types:
- opened
- edited
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_weaver-asset-exchange-besu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
besu-cli asset issue --network=network1 --account=1 --token_id=${tokenId} --asset_type=ERC721 1> tmp.out
tokenId=$(cat tmp.out | grep "New ERC721 token minted with id " | sed -e 's/New ERC721 token minted with id //')
cat tmp.out
echo $tokenId
echo "$tokenId"
besu-cli asset lock --network=network1 --sender_account=1 --recipient_account=2 --token_id=${tokenId} --asset_type=ERC721 --timeout=${timeout} --hash_base64=${hashBase64} 1> tmp.out
fi

Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
besu-cli asset issue --network=network1 --account=1 --token_id=${tokenId} --asset_type=ERC721 1> tmp.out
tokenId=$(cat tmp.out | grep "New ERC721 token minted with id " | sed -e 's/New ERC721 token minted with id //')
cat tmp.out
echo $tokenId
echo "$tokenId"
besu-cli asset lock --network=network1 --sender_account=1 --recipient_account=2 --token_id=${tokenId} --asset_type=ERC721 --timeout=${timeout} --hash_base64=${hashBase64} 1> tmp.out
fi

Expand Down Expand Up @@ -335,7 +335,7 @@ jobs:
besu-cli asset issue --network=network1 --account=1 --token_id=${tokenId} --asset_type=ERC721 1> tmp.out
tokenId=$(cat tmp.out | grep "New ERC721 token minted with id " | sed -e 's/New ERC721 token minted with id //')
cat tmp.out
echo $tokenId
echo "$tokenId"
besu-cli asset lock --network=network1 --sender_account=1 --recipient_account=2 --token_id=${tokenId} --asset_type=ERC721 --timeout=${timeout} --hash_base64=${hashBase64} 1> tmp.out
fi

Expand Down Expand Up @@ -379,7 +379,7 @@ jobs:
besu-cli asset issue --network=network1 --account=1 --token_id=${tokenId} --asset_type=ERC721 1> tmp.out
tokenId=$(cat tmp.out | grep "New ERC721 token minted with id " | sed -e 's/New ERC721 token minted with id //')
cat tmp.out
echo $tokenId
echo "$tokenId"
besu-cli asset lock --network=network1 --sender_account=1 --recipient_account=2 --token_id=${tokenId} --asset_type=ERC721 --timeout=${timeout} --hash_base64=${hashBase64} 1> tmp.out
fi

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_weaver-pre-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ jobs:
# Split PR title by space, and take 3rd word
VERSION=$(echo "${TITLE}" | cut -d ' ' -f 3)
# Strip "v" from version
VERSION=$(echo $VERSION | sed -e 's/^v//')
VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "VERSION=$VERSION" >> $GITHUB_ENV
echo $VERSION
echo "$VERSION"

# Gradle
- name: check weaver/common/protos-java-kt/gradle.properties
Expand Down Expand Up @@ -159,9 +159,9 @@ jobs:
# Split PR title by space, and take 3rd word
VERSION=$(echo "${TITLE}" | cut -d ' ' -f 3)
# Strip "v" from version
VERSION=$(echo $VERSION | sed -e 's/^v//')
VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "VERSION=$VERSION" >> $GITHUB_ENV
echo $VERSION
echo "$VERSION"

- name: Update GO Checksum
run: ./go-gen-checksum.sh $VERSION
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/weaver_deploy_go-pkgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
run: |
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
echo $VERSION
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "$VERSION"
if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+[A-Za-z\-]*$ ]]; then
echo -n $VERSION > VERSION
fi
Expand Down Expand Up @@ -97,8 +97,8 @@ jobs:
run: |
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
echo $VERSION
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "$VERSION"
if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+[A-Za-z\-]*$ ]]; then
echo -n $VERSION > VERSION
fi
Expand Down Expand Up @@ -163,8 +163,8 @@ jobs:
run: |
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
echo $VERSION
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "$VERSION"
if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+[A-Za-z\-]*$ ]]; then
echo -n $VERSION > VERSION
fi
Expand Down Expand Up @@ -229,8 +229,8 @@ jobs:
run: |
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
echo $VERSION
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "$VERSION"
if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+[A-Za-z\-]*$ ]]; then
echo -n $VERSION > VERSION
fi
Expand Down Expand Up @@ -295,8 +295,8 @@ jobs:
run: |
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
echo $VERSION
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "$VERSION"
if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+[A-Za-z\-]*$ ]]; then
echo -n $VERSION > VERSION
fi
Expand Down Expand Up @@ -361,8 +361,8 @@ jobs:
run: |
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
echo $VERSION
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "$VERSION"
if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+[A-Za-z\-]*$ ]]; then
echo -n $VERSION > VERSION
fi
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/weaver_deploy_relay-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ jobs:
run: |
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
echo $VERSION
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo "$VERSION" | sed -e 's/^v//')
echo "$VERSION"
if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+[A-Za-z\-]*$ ]]; then
echo -n $VERSION > VERSION
fi
Expand All @@ -82,4 +82,4 @@ jobs:
- name: Push latest tag
if: ${{ env.RELAY_PUSH == 'true' }}
run: (cat out | grep "exists") || make push-server-latest DOCKER_REGISTRY=${DOCKER_REGISTRY}
working-directory: weaver/core/relay
working-directory: weaver/core/relay
6 changes: 3 additions & 3 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ We test most frequently on Ubuntu 20.04 LTS
* Clone the repository

```sh
git clone https://github.com/hyperledger/cactus.git
git clone https://github.com/hyperledger-cacti/cacti.git
```


Expand All @@ -149,7 +149,7 @@ git config --system core.longpaths true
* Change directories to the project root

```sh
cd cactus
cd cacti
```

* Run this command to enable corepack (Corepack is included by default with all Node.js installs, but is currently opt-in.)
Expand Down Expand Up @@ -258,4 +258,4 @@ By creating a PR for the edited `ci.yml` file, this will the CI to run their tes
1) Go to the PR and click the `checks` tab
2) Go to the `Actions` tab within the main Hyperledger Cactus Repository

Click on the `CI Cactus workflow`. There should be a new job you've created be listed underneath the `build (ubuntu-22.04)` jobs. Click on the the new job (what's you've named your build) and locate the SSH Session within the `Setup Upterm Session` dropdown. Copy the SSH command that start with `ssh` and ends in `.dev` (ex. ssh **********:***********@uptermd.upterm.dev). Open your OS and paste the SSH command script in order to begin an upterm session.
Click on the `CI Cactus workflow`. There should be a new job you've created be listed underneath the `build (ubuntu-22.04)` jobs. Click on the the new job (what's you've named your build) and locate the SSH Session within the `Setup Upterm Session` dropdown. Copy the SSH command that start with `ssh` and ends in `.dev` (ex. ssh **********:***********@uptermd.upterm.dev). Open your OS and paste the SSH command script in order to begin an upterm session.
4 changes: 2 additions & 2 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
- [ ] Follow the Commit Linting specification. You may refer to this [link](https://www.conventionalcommits.org/en/v1.0.0-beta.4/#specification) 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).
- [ ] Pull Request Title and Commit Subject must not exceed 80 characters (including spaces and special characters).
- [ ] Commit Message per line must not exceed 102 characters (including spaces and special characters).

**A Must Read for Beginners**
For rebasing and squashing, here's a [must read guide](https://github.com/servo/servo/wiki/Beginner's-guide-to-rebasing-and-squashing) for beginners.
6 changes: 3 additions & 3 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = {
extends: ["@commitlint/config-conventional"],
rules: {
"footer-max-line-length": [1, "always", 80],
"header-max-length": [2, "always", 72],
"body-max-line-length": [2, "always", 80],
"footer-max-line-length": [1, "always", 102],
"header-max-length": [2, "always", 80],
"body-max-line-length": [2, "always", 102],
},
parserPreset: {
parserOpts: {
Expand Down
20 changes: 12 additions & 8 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# Welcome to the documentation template
# Hyperledger Cacti Documentation

This repository serves as a template for creating documentation for Hyperledger projects. The template utilizes MkDocs (documentation at [mkdocs.org](https://www.mkdocs.org)) and the theme Material for MkDocs (documentation at [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/)). Material adds a number of extra features to MkDocs, and Hyperledger repositories can take advantage of the theme's [Insiders](https://squidfunk.github.io/mkdocs-material/insiders/) capabilities.
This directory contains the source for the Hyperledger Cacti documentation
site. It uses MkDocs (documentation at [mkdocs.org](https://www.mkdocs.org)),
the Material for MkDocs theme, and the Mike plugin for versioned deployments to
GitHub Pages.

[Material for MkDocs]: https://squidfunk.github.io/mkdocs-material/
[Mike]: https://github.com/jimporter/mike

## Prerequisites

To test the documents and update the published site, the following tools are needed:
To preview the docs locally and update the published site, the following tools
are needed:

- A Bash shell
- git
Expand All @@ -23,19 +27,19 @@ To test the documents and update the published site, the following tools are nee
### Python 3
`Python 3` can be installed locally, as described in the [Python Getting Started guide](https://www.python.org/about/gettingstarted/).

### Mkdocs
### MkDocs

The Mkdocs-related items can be installed locally, as described in the [Material
for Mkdocs] installation instructions. The short, case-specific version of those
instructions follow:
The MkDocs-related items can be installed locally, as described in the
[Material for MkDocs] installation instructions. The short, case-specific
version for this repository is:

```bash
pip install -r requirements.txt
```

### Verify Setup

To verify your setup, check that you can run `mkdocs` by running the command `mkdocs --help` to see the help text.
To verify your setup, run `mkdocs --help` and confirm the help text is shown.

## Useful MkDocs Commands

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/cactus/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Getting Started
* Clone the repository


git clone https://github.com/hyperledger/cactus.git
git clone https://github.com/hyperledger-cacti/cacti.git

Windows specific gotcha: `File paths too long` error when cloning. To fix: Open PowerShell with administrative rights and then run the following:

Expand All @@ -140,7 +140,7 @@ git config \--system core.longpaths true
* Change directories to the project root


cd cactus
cd cacti

* Run this command to enable corepack (Corepack is included by default with all Node.js installs, but is currently opt-in.)

Expand Down
10 changes: 5 additions & 5 deletions docs/docs/cactus/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ There are many ways to contribute to Hyperledger Cactus, both as a user and as a

As a user, this can include:

* [Making Feature/Enhancement Proposals](https://github.com/hyperledger/cactus/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)
* [Making Feature/Enhancement Proposals](https://github.com/hyperledger-cacti/cacti/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)

* [Reporting bugs](https://github.com/hyperledger/cactus/issues/new?assignees=&labels=bug&template=bug_report.md&title=)
* [Reporting bugs](https://github.com/hyperledger-cacti/cacti/issues/new?assignees=&labels=bug&template=bug_report.md&title=)


As a developer:

* if you only have a little time, consider picking up a [“help-wanted”](https://github.com/hyperledger/cactus/labels/help%20wanted) or [“good-first-issue”](https://github.com/hyperledger/cactus/labels/good%20first%20issue) task
* if you only have a little time, consider picking up a [“help-wanted”](https://github.com/hyperledger-cacti/cacti/labels/help%20wanted) or [“good-first-issue”](https://github.com/hyperledger-cacti/cacti/labels/good%20first%20issue) task

* If you can commit to full-time development, then please contact us on our [Rocketchat channel](https://chat.hyperledger.org/channel/cactus) to work through logistics!

Expand Down Expand Up @@ -61,7 +61,7 @@ PR Checklist - Contributor/Developer

**To avoid issues in the future, do not install dependencies globally. Ensure all dependencies are kept self-contained.**

1. Fork [hyperledger/cactus](https://github.com/hyperledger/cactus) via Github UI
1. Fork [hyperledger-cacti/cacti](https://github.com/hyperledger-cacti/cacti) via Github UI

* If you are using the Git client on the Windows operating system, you will need to enable long paths for git which you can do in PowerShell by executing the command below. To clarify, this may also apply if you are using any Git GUI application on Windows such as `Github Desktop` or others.

Expand Down Expand Up @@ -172,7 +172,7 @@ Create local branch
2. Setup your local fork to keep up-to-date (optional)

\# Add 'upstream' repo to list of remotes
git remote add upstream https://github.com/hyperledger/cactus.git
git remote add upstream https://github.com/hyperledger-cacti/cacti.git

\# Verify the new remote named 'upstream'
git remote \-v
Expand Down
2 changes: 1 addition & 1 deletion docs/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,4 @@ nav:
- Introducing Hyperledger Cacti, a multi-faceted pluggable interoperability framework: blog/2022-11-07-introducing-hyperledger-cacti.md
- October 03, 2023:
- Hyperledger Cacti, A General-Purpose Modular Interoperability Framework, Moves to Graduated Status: blog/2023-10-03-hyperledger-cacti-graduation.md
copyright: Copyright © Hyperledger 2020-2023
copyright: Copyright © Hyperledger 2020-2026
2 changes: 1 addition & 1 deletion examples/cactus-common-example-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@types/shelljs": "0.8.11",
"http-terminator": "3.2.0",
"jest-extended": "7.0.0",
"lodash": "4.17.21",
"lodash": "4.18.1",
"ts-node": "8.9.1"
},
"engines": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"jest-extended": "7.0.0",
"jose": "4.15.5",
"json-stable-stringify": "1.0.2",
"qs": "6.13.0",
"qs": "6.14.2",
"tape-promise": "4.0.0"
},
"engines": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@hyperledger/cactus-plugin-ledger-connector-fabric": "2.1.0",
"@hyperledger/cactus-plugin-ledger-connector-xdai": "2.1.0",
"async-exit-hook": "2.0.1",
"axios": "1.8.4",
"axios": "1.15.0",
"express": "5.1.0",
"openapi-types": "12.1.3",
"typescript-optional": "2.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@angular-builders/custom-webpack": "17.0.2",
"@angular-devkit/build-angular": "17.3.11",
"@angular/cli": "17.3.11",
"@angular/compiler": "17.3.11",
"@angular/compiler": "19.2.20",
"@angular/compiler-cli": "17.3.11",
"@angular/language-service": "17.3.11",
"@ionic/angular-toolkit": "10.0.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/cactus-example-cbdc-bridging-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"@openzeppelin/contracts": "4.9.6",
"@openzeppelin/contracts-upgradeable": "4.9.6",
"async-exit-hook": "2.0.1",
"axios": "1.8.4",
"axios": "1.15.0",
"body-parser": "1.20.3",
"cors": "2.8.5",
"crypto-js": "4.2.0",
Expand All @@ -133,7 +133,7 @@
"web3": "1.6.1",
"web3-core": "1.6.1",
"web3-utils": "1.6.1",
"webpack": "5.94.0"
"webpack": "5.104.1"
},
"devDependencies": {
"@apidevtools/swagger-cli": "4.0.4",
Expand Down
Loading
Loading