Skip to content

Commit

Permalink
Merge branch 'main' into yuji/ibc-unbonding-period
Browse files Browse the repository at this point in the history
  • Loading branch information
yito88 committed Dec 19, 2024
2 parents cad9341 + b6fcfb2 commit 3ee81a6
Show file tree
Hide file tree
Showing 66 changed files with 432 additions and 257 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/CI/4140-ledger-namada-unit-tests-ci.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Add Ledger app unit tests to the Namada CI.
([\#4140](https://github.com/anoma/namada/pull/4140))
4 changes: 4 additions & 0 deletions .changelog/unreleased/improvements/4182-tx-result-display.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- The display of a transaction's result now includes the result code
and avoids displaying the gas unless the transaction was successful.
Improved the display of a dry-run and aligned it with the former.
([\#4182](https://github.com/anoma/namada/pull/4182))
2 changes: 2 additions & 0 deletions .changelog/unreleased/miscellaneous/4177-inline-borsh-ext.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Inline borsh-ext crate function in namada_core crate.
([\#4177](https://github.com/anoma/namada/pull/4177))
42 changes: 42 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ env:
AWS_REGION: us-west-2
NIGHTLY: nightly-2024-09-08
NAMADA_MASP_PARAMS_DIR: /masp/.masp-params
LEDGER_APP_VERSION: "1.0.6-ci-patch"

jobs:
changelog:
Expand Down Expand Up @@ -651,6 +652,47 @@ jobs:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}

test-ledger-app:
timeout-minutes: 30
runs-on: [ubuntu-latest]

env:
RUSTC_WRAPPER: ""

steps:
- name: Checkout repo
uses: actions/checkout@v4
if: ${{ github.event_name != 'pull_request_target' }}
- name: Checkout PR
uses: actions/checkout@v4
if: ${{ github.event_name == 'pull_request_target' }}
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Checkout ledger-namada
run: |
echo "Using Namada Ledger App version: v${LEDGER_APP_VERSION}"
git clone 'https://github.com/heliaxdev/ledger-namada' ../ledger-namada
cd ../ledger-namada
git checkout "v$LEDGER_APP_VERSION"
git submodule update --init --recursive
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
make deps
- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Generate test vectors
run: |
# The path where the Ledger app test suite will locate test vectors
TESTVEC_PATH="../ledger-namada/tests/testvectors.json"
TESTDBG_PATH="../ledger-namada/tests/testdebugs.txt"
sudo apt-get install -y protobuf-compiler
cargo run --example generate-txs -- $TESTVEC_PATH $TESTDBG_PATH
- name: Check test vectors
run: |
cd ../ledger-namada
make cpp_test
test-e2e-with-device-automation:
runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
container:
Expand Down
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
Examples of behavior that contribute to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
Expand Down Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand Down
75 changes: 34 additions & 41 deletions Cargo.lock

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

17 changes: 8 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ circular-queue = "0.2.6"
clap = "4.5"
clap_complete = "4.5"
clap_complete_nushell = "4.5"
clru = {git = "https://github.com/marmeladema/clru-rs.git", rev = "71ca566"}
clru = "0.6.2"
color-eyre = "0.6.2"
concat-idents = "1.1.2"
config = "0.14.1"
Expand All @@ -104,10 +104,10 @@ ed25519-consensus = "2.1.0"
either = "1.12.0"
escargot = "0.5.7"
ethabi = "18.0.0"
ethbridge-bridge-contract = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.24.0"}
ethbridge-bridge-events = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.24.0"}
ethbridge-events = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.24.0"}
ethbridge-structs = { git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.24.0" }
ethbridge-bridge-contract = "0.24.1"
ethbridge-bridge-events = "0.24.1"
ethbridge-events = "0.24.1"
ethbridge-structs = "0.24.1"
ethers = "2.0.0"
expectrl = "0.7.0"
eyre = "0.6.12"
Expand All @@ -122,7 +122,7 @@ ibc = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38bd2a32f3511
ibc-derive = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" }
ibc-testkit = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38bd2a32f35117d4d9165a3c68c64ccd87ad56dd", default-features = false }
ics23 = "0.12.0"
index-set = { git = "https://github.com/heliaxdev/index-set", tag = "v0.8.1", features = ["serialize-borsh", "serialize-serde"] }
usize-set = { version = "0.10.3", features = ["serialize-borsh", "serialize-serde"] }
indexmap = { git = "https://github.com/heliaxdev/indexmap", tag = "2.2.4-heliax-1", features = ["borsh-schema", "serde"] }
init-once = "0.6.0"
itertools = "0.12.1"
Expand Down Expand Up @@ -179,7 +179,7 @@ sha2 = "0.9.3"
sha2-const = "0.1.2"
signal-hook = "0.3.9"
slip10_ed25519 = "0.1.3"
smooth-operator = {git = "https://github.com/heliaxdev/smooth-operator", tag = "v0.7.0"}
smooth-operator = "0.7.2"
# sysinfo with disabled multithread feature
sysinfo = {version = "0.27.8", default-features = false}
tar = "0.4.37"
Expand All @@ -200,8 +200,7 @@ toml = "0.5.8"
tonic = "0.8.3"
tonic-build = "0.11.0"
tower = "0.4"
# branch yuji/tendermint-0.38
tower-abci = { git = "https://github.com/heliaxdev/tower-abci", rev = "30d2a8cdf8321b599ae13ba74f4c78217a64ce58" }
tower-abci = "0.16.0"
tracing = "0.1.30"
tracing-appender = "0.2.2"
tracing-log = "0.2.0"
Expand Down
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@

## Overview

[Namada](http://namada.net) is a Proof-of-Stake L1 for interchain asset-agnostic privacy. Namada uses CometBFT
[Namada](http://namada.net) is a Proof-of-Stake L1 for multichain asset-agnostic data protection. Namada uses CometBFT
consensus and enables multi-asset shielded transfers for any native
or non-native asset. Namada features full IBC protocol support,
a natively integrated Ethereum bridge, a modern proof-of-stake
system with automatic reward compounding and cubic slashing, and a
stake-weighted governance signalling mechanism. Users of shielded
transfers are rewarded for their contributions to the privacy set in
or non-native asset. Namada features full IBC protocol support, a modern proof-of-stake
system with cubic slashing, and a
stake-weighted on-chain governance mechanism. Users of Namada's MASP (Multi-Asset Shielded Pool) are rewarded for their contributions to the shielded set in
the form of native protocol tokens. A multi-asset shielded transfer
wallet is provided in order to facilitate safe and private user
wallet is provided in order to facilitate safe user
interaction with the protocol.

* Blogpost: [Introducing Namada: Interchain Asset-agnostic Privacy](https://namada.net/blog/introducing-namada-multichain-asset-agnostic-data-protection)
* Blogpost: [Introducing Namada: Multichain Asset-agnostic Data Protection](https://namada.net/blog/introducing-namada-multichain-asset-agnostic-data-protection)

## 📓 Docs

Expand Down
1 change: 0 additions & 1 deletion crates/apps_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ namada_wallet = { path = "../wallet", features = ["std"]}
async-trait.workspace = true
base64.workspace = true
borsh.workspace = true
borsh-ext.workspace = true
clap.workspace = true
color-eyre.workspace = true
config.workspace = true
Expand Down
Loading

0 comments on commit 3ee81a6

Please sign in to comment.