Skip to content

Commit

Permalink
feat(cli): add iroha transaction get and other important commands (#…
Browse files Browse the repository at this point in the history
…5289)

* fix: un-flatten enum `Level` to serialize
* feat(cli): add `iroha transaction get` and other important commands
* chore: remove `scripts/tests/tick.json`
* docs: fix invalid links
* ci: exclude from coverage `iroha_cli` `iroha_torii` covered by pytests
* ci: complement #4605: tag not `iroha2:*` but `iroha:*`
* docs: fix lints
* chore: update CHANGELOG.md

Signed-off-by: Shunkichi Sato <49983831+s8sato@users.noreply.github.com>
  • Loading branch information
s8sato authored Feb 13, 2025
1 parent e0ff842 commit 623eb1f
Show file tree
Hide file tree
Showing 26 changed files with 3,166 additions and 1,056 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push iroha2:dev-nightly image
- name: Build and push iroha:dev-nightly image
uses: docker/build-push-action@v6
with:
push: true
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/iroha2-dev-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
- name: Check schema.json
if: always()
run: ./scripts/tests/consistency.sh schema
- name: Check CommandLineHelp.md
if: always()
run: ./scripts/tests/consistency.sh cli-help
- name: Check Docker Compose configurations
if: always()
run: ./scripts/tests/consistency.sh docker-compose
Expand Down Expand Up @@ -119,7 +122,7 @@ jobs:
--all-features
--branch --no-report
- name: Generate lcov report
run: cargo llvm-cov report --doctests --lcov --output-path lcov.info
run: cargo llvm-cov report --doctests --ignore-filename-regex 'iroha_cli|iroha_torii' --lcov --output-path lcov.info
- name: Upload lcov report
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -160,12 +163,12 @@ jobs:
uses: docker/setup-buildx-action@v2
with:
install: true
- name: Build and push iroha2:dev image
- name: Build and push iroha:dev image
uses: docker/build-push-action@v6
if: always()
with:
push: true
tags: docker.soramitsu.co.jp/iroha2/iroha2:dev-${{ github.event.pull_request.head.sha }}
tags: docker.soramitsu.co.jp/iroha2/iroha:dev-${{ github.event.pull_request.head.sha }}
labels: commit=${{ github.sha }}
build-args: TAG=dev
# This context specification is required
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/iroha2-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
registry: docker.soramitsu.co.jp
username: ${{ secrets.HARBOR_USERNAME }}
password: ${{ secrets.HARBOR_TOKEN }}
- name: Build and push iroha2:dev image
- name: Build and push iroha:dev image
uses: docker/build-push-action@v6
with:
context: .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/iroha2-no-incorrect-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
run: pip install -r .github/scripts/ci_test/requirements.txt --no-input
- name: Check containers on iroha2 stable branch
if: github.base_ref == 'stable'
run: python .github/scripts/ci_test/ci_image_scan.py --allow iroha2:stable -- docker-compose*.yml
run: python .github/scripts/ci_test/ci_image_scan.py --allow iroha:stable -- docker-compose*.yml
- name: Check containers on iroha2 main branch
if: github.base_ref == 'main'
run: python .github/scripts/ci_test/ci_image_scan.py --allow iroha2:dev -- docker-compose*.yml
run: python .github/scripts/ci_test/ci_image_scan.py --allow iroha:dev -- docker-compose*.yml
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## [Unreleased]

## [2.0.0-rc.1.1] - 2025-02-12

### Added

- add `iroha transaction get` and other important commands (#5289)

## [2.0.0-rc.1.0] - 2024-12-06

### Added
Expand Down
10 changes: 10 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Prerequisites:
- (Optional) Build the latest Iroha image:

```bash
docker build . -t hyperledger/iroha2:dev
docker build . -t hyperledger/iroha:dev
```

If you skip this step, the Iroha container will be built using the latest available image.
Expand Down Expand Up @@ -181,7 +181,7 @@ Iroha stores blocks and snapshots in the `storage` directory, which is created a

Multiple instances of Iroha peer and client binaries can be run on the same physical machine and in the same working directory. However, we recommend to give each instance a clean new working directory.

The provided `docker-compose` file showcases a minimum viable network and the general methods of using the `hyperledger/iroha2:dev` docker image for deploying a network of peers.
The provided `docker-compose` file showcases a minimum viable network and the general methods of using the `hyperledger/iroha:dev` docker image for deploying a network of peers.

## Further Reading

Expand Down
1 change: 1 addition & 0 deletions crates/iroha_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ thiserror = { workspace = true }
error-stack = { workspace = true, features = ["eyre"] }
eyre = { workspace = true }
clap = { workspace = true, features = ["derive"] }
clap-markdown = "0.1.4"
humantime = { workspace = true }
json5 = { workspace = true }
serde = { workspace = true }
Expand Down
Loading

0 comments on commit 623eb1f

Please # to comment.