Skip to content

Commit

Permalink
Merge branch 'main' into rano/testkit/basecoin-store
Browse files Browse the repository at this point in the history
  • Loading branch information
rnbguy committed Feb 6, 2024
2 parents 4bb11d6 + ba7b90c commit 7e6913a
Show file tree
Hide file tree
Showing 34 changed files with 451 additions and 301 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/feature/1065-add-new-storage-paths.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- [ibc-core-host] Add remaining storage paths.
([\#1065](https://github.com/cosmos/ibc-rs/issues/1065))
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
name: Bug Report
name: Bug Report
about: Create a report to help us squash bugs!

---

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
v Before smashing the submit button please review the template.
v Please also ensure that this is not a duplicate issue :)
v Please also ensure that this is not a duplicate issue :)
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->

## Bug Summary
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ about: Create a proposal to request a feature!

---

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
v Before smashing the submit button please review the template.
v Word of caution: poorly thought-out proposals may be rejected
v without deliberation
v Word of caution: poorly thought-out proposals may be rejected
v without deliberation
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->

## Feature Summary
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/process-improvement.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ about: Create a proposal to suggest an improvement for `ibc-rs` operations!
---

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
v ✰ Thanks for opening an issue! ✰
v Before smashing the submit button please review the template.
v Please also ensure that this is not a duplicate issue :)
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->

## Improvement Summary

<!-- Short description of the proposed improvement about the projects' processes -->
<!-- Short description of the proposed improvement of the projects' processes -->

## Proposal

<!-- Describe your proposal for how some process of `ibc-rs` should be improved -->
<!-- Describe your proposal for how some processes of `ibc-rs` should be improved -->
<!-- What would be the benefits if we adopted the proposal?
Are there any disadvantages? -->
2 changes: 1 addition & 1 deletion .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Security Audit
on:
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"

jobs:
security_audit:
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Code Quality Checks
on:
pull_request:

jobs:
code-quality:
runs-on: ubuntu-latest
env:
RIPGREP_VERSION: 14.1.0
FD_VERSION: 9.0.0
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Whitestapace lints
run: bash ci/code-quality/whitespace-lints.sh

- name: Spell Check with Typos
uses: crate-ci/typos@master
with:
config: ./.github/typos.toml
6 changes: 2 additions & 4 deletions .github/workflows/cw-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
tags:
- v[0-9]+.*
branches:
- 'release/*'
- "release/*"
- main
paths:
- .github/workflows/cw-check.yml
Expand All @@ -31,9 +31,7 @@ jobs:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
with:
is_ci : true
- name: Run cw-check
run: |
cd ci/cw-check
nix-shell --run "cw-check"
nix-shell --run "cw-check"
8 changes: 4 additions & 4 deletions .github/workflows/markdown-link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Check Markdown links

on:
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"

workflow_dispatch:

Expand All @@ -14,6 +14,6 @@ jobs:
- name: markdown-link-check
uses: gaurav-nelson/[email protected]
with:
config-file: '.github/markdown-link-check.json'
use-quiet-mode: 'yes'
use-verbose-mode: 'yes'
config-file: ".github/markdown-link-check.json"
use-quiet-mode: "yes"
use-verbose-mode: "yes"
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Attempts to perform a release when a particular tag is pushed. This job uses
# the `cargo release` command and assumes that the `CRATES_TOKEN`secret has
# been set and contains an API token with which we can publish our crates to
# Attempts to perform a release when a particular tag is pushed. This job uses
# the `cargo release` command and assumes that the `CRATES_TOKEN`secret has
# been set and contains an API token with which we can publish our crates to
# crates.io.
#
# The `ibc-derive` publishing process is managed manually since it's not
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
run: yes | cargo release --workspace --no-push --no-tag --exclude ibc-derive --allow-branch HEAD --execute
env:
CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }}

gh-release:
if: github.ref_type == 'tag'
name: Create GitHub release
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
- ibc-query/**
- ibc-testkit/**
- ibc-derive/**

env:
CARGO_INCREMENTAL: 0
CARGO_PROFILE_DEV_DEBUG: 1
Expand All @@ -42,10 +42,10 @@ jobs:
cleanup-runs:
runs-on: ubuntu-latest
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}

check-features:
name: Check features
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
with:
command: doc
args: --all-features --release

doc_no_default_features:
runs-on: ubuntu-latest
steps:
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/typos.yml

This file was deleted.

54 changes: 54 additions & 0 deletions ci/code-quality/whitespace-lints.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#!/bin/bash
set -euo pipefail

# use ggrep for macOS, and grep for Linux
case "$OSTYPE" in
darwin*) GREP="ggrep" ;;
linux-gnu*) GREP="grep" ;;
*) echo "Unknown OS: $OSTYPE" && exit 1 ;;
esac

check_binary() {
# exactly one argument is passed
if [ $# -ne 1 ] || [ "$1" = "" ]; then
echo "Usage: check_binary <binary>"
exit 1
fi

if ! (type "$1" >/dev/null 2>&1); then
echo "$1 is not present"
exit 1
fi
}

check_binary "$GREP"
check_binary find

check_code_quality() {
# exactly three arguments are passed
if [ $# -ne 3 ] || [ "$1" = "" ] || [ "$2" = "" ] || [ "$3" = "" ]; then
echo "Usage: check_code_quality <option> <pattern> <message>"
exit 1
fi

if find . -type f -name "*.toml" -o -name "*.rs" \
-not -path '*/.*' -not -path '*/target/*' \
-exec "$GREP" "$1" "$2" {} \; | "$GREP" '.*'; then
echo "$3"
return 1
else
return 0
fi
}

exit_code=0

check_code_quality -nHIP "\s+$" "found: trailing whitespaces" || exit_code=1
check_code_quality -nHIP $"\t" "found: tabs" || exit_code=1
check_code_quality -zLIP ".*\n\Z" "found: no newline at EOF" || exit_code=1

if [ "$exit_code" -eq 0 ]; then
echo "All code quality checks passed successfully."
fi

exit "$exit_code"
2 changes: 1 addition & 1 deletion ci/cw-check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ debug-assertions = false
opt-level = "s"
overflow-checks = true
panic = "abort"
rpath = false
rpath = false
4 changes: 2 additions & 2 deletions ibc-apps/ics20-transfer/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = { workspace = true }
keywords = ["blockchain", "cosmos", "ibc", "transfer", "ics20"]
readme = "./../../README.md"
description = """
Maintained by `ibc-rs`, encapsulates essential ICS-20 Fungible Token Transfer data structures and
Maintained by `ibc-rs`, encapsulates essential ICS-20 Fungible Token Transfer data structures and
domain types, as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal
applicability to facilitate development and integration across diverse IBC-enabled projects.
"""
Expand Down Expand Up @@ -58,7 +58,7 @@ serde = [
schema = [
"dep:schemars",
"ibc-core/schema",
"ibc-proto/json-schema",
"ibc-proto/json-schema",
"serde",
"std"
]
Expand Down
4 changes: 2 additions & 2 deletions ibc-apps/ics721-nft-transfer/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = { workspace = true }
keywords = ["cosmos", "ibc", "transfer", "nft", "ics721"]
readme = "./../../README.md"
description = """
Maintained by `ibc-rs`, encapsulates essential ICS-721 Non-Fungible Token Transfer data structures and
Maintained by `ibc-rs`, encapsulates essential ICS-721 Non-Fungible Token Transfer data structures and
domain types, as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal
applicability to facilitate development and integration across diverse IBC-enabled projects.
"""
Expand Down Expand Up @@ -59,7 +59,7 @@ serde = [
schema = [
"dep:schemars",
"ibc-core/schema",
"ibc-proto/json-schema",
"ibc-proto/json-schema",
"serde",
"std"
]
Expand Down
2 changes: 1 addition & 1 deletion ibc-clients/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = { workspace = true }
keywords = ["blockchain", "cosmos", "ibc", "applications", "tendermint"]
readme = "README.md"
description = """
Maintained by `ibc-rs`, re-exports a comprehensive set of libraries that implement
Maintained by `ibc-rs`, re-exports a comprehensive set of libraries that implement
various IBC light clients, enabling smooth integration with IBC-enabled blockchains.
"""

Expand Down
4 changes: 2 additions & 2 deletions ibc-clients/ics07-tendermint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = { workspace = true }
readme = "./../README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
description = """
Maintained by `ibc-rs`, contains the implementation of the ICS-07 Tendermint Client logic
Maintained by `ibc-rs`, contains the implementation of the ICS-07 Tendermint Client logic
and re-exports essential data structures and domain types from `ibc-client-tendermint-types` crate.
"""

Expand Down Expand Up @@ -77,4 +77,4 @@ parity-scale-codec = [
"ibc-core-host/parity-scale-codec",
"ibc-core-handler-types/parity-scale-codec",
"ibc-primitives/parity-scale-codec",
]
]
4 changes: 2 additions & 2 deletions ibc-clients/ics07-tendermint/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords = ["blockchain", "cosmos", "ibc", "tendermint", "types"]
readme = "./../../README.md"
description = """
Maintained by `ibc-rs`, encapsulates essential ICS-07 Tendermint Client data structures and domain types,
as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
to facilitate development and integration across diverse IBC-enabled projects.
"""

Expand Down Expand Up @@ -89,4 +89,4 @@ parity-scale-codec = [
"ibc-core-host-types/parity-scale-codec",
"ibc-primitives/parity-scale-codec",
"ibc-proto/parity-scale-codec",
]
]
40 changes: 20 additions & 20 deletions ibc-clients/ics08-wasm/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords = ["blockchain", "cosmos", "ibc", "wasm", "ics08"]
readme = "./../../README.md"
description = """
Maintained by `ibc-rs`, encapsulates essential ICS-08 Wasm Light Client data structures and domain types,
as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
to facilitate development and integration across diverse IBC-enabled projects.
"""

Expand All @@ -34,29 +34,29 @@ serde_json = { workspace = true }
[features]
default = ["std"]
std = [
"ibc-core-client/std",
"ibc-core-host-types/std",
"ibc-primitives/std",
"ibc-proto/std",
"base64/std",
"serde/std"
"ibc-core-client/std",
"ibc-core-host-types/std",
"ibc-primitives/std",
"ibc-proto/std",
"base64/std",
"serde/std"
]
serde = [
"ibc-core-client/serde",
"ibc-core-host-types/serde",
"ibc-primitives/serde",
"ibc-proto/serde",
"dep:serde"
"ibc-core-client/serde",
"ibc-core-host-types/serde",
"ibc-primitives/serde",
"ibc-proto/serde",
"dep:serde"
]
schema = [
"ibc-core-client/schema",
"ibc-core-host-types/schema",
"ibc-primitives/schema",
"ibc-proto/json-schema",
"serde",
"std"
"ibc-core-client/schema",
"ibc-core-host-types/schema",
"ibc-primitives/schema",
"ibc-proto/json-schema",
"serde",
"std"
]
cosmwasm = [
"cosmwasm-schema",
"schema"
"cosmwasm-schema",
"schema"
]
Loading

0 comments on commit 7e6913a

Please sign in to comment.