Skip to content

Commit

Permalink
merged in main into amounts
Browse files Browse the repository at this point in the history
  • Loading branch information
mariari committed Jun 29, 2023
2 parents ec9a785 + ce6abb0 commit 714d81c
Show file tree
Hide file tree
Showing 90 changed files with 2,547 additions and 3,047 deletions.
2 changes: 2 additions & 0 deletions .changelog/v0.17.3/bug-fixes/1345-key-parsing-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Correctly handle parsing storage key if they are empty.
([#1345](https://github.com/anoma/namada/pull/1345))
2 changes: 2 additions & 0 deletions .changelog/v0.17.3/features/1570-tendermint-config.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Enable users to change any tendermint config options via namada config.
([#1570](https://github.com/anoma/namada/pull/1570))
2 changes: 2 additions & 0 deletions .changelog/v0.17.3/improvements/1404-ibc-event-query.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Added query endpoint for IBC events replacing Tendermint index.
([\#1404](https://github.com/anoma/namada/pull/1404))
2 changes: 2 additions & 0 deletions .changelog/v0.17.3/miscellaneous/1476-cometbft.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Switch from unreleased Tendermint fork to an official CometBFT release
v0.37.1. ([\#1476](https://github.com/anoma/namada/pull/1476))
1 change: 1 addition & 0 deletions .changelog/v0.17.3/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Namada 0.17.3 is a minor release switching from tendermint to cometbft.
2 changes: 2 additions & 0 deletions .changelog/v0.17.4/bug-fixes/1588-fix-masp-missing-await.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix missing async awaits in MASP load and save calls.
([\#1588](https://github.com/anoma/namada/pull/1588))
1 change: 1 addition & 0 deletions .changelog/v0.17.4/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Namada 0.17.4 is a minor release improving the codebase by bumping the rust toolchain.
2 changes: 2 additions & 0 deletions .changelog/v0.17.5/improvements/1619-masp-checked.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Check MASP parameters are correct in the ledger node.
([#1619](https://github.com/anoma/namada/pull/1619))
2 changes: 2 additions & 0 deletions .changelog/v0.17.5/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Namada 0.17.5 is a maintenance release chiefly addressing MASP
parameter validation.
54 changes: 26 additions & 28 deletions .github/workflows/build-and-test-bridge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
wasm_cache_version: ["v2"]
mold_version: [1.7.0]
mold_version: [1.11.0]

steps:
- name: Checkout repo
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
wasm_cache_version: ["v2"]
mold_version: [1.7.0]
mold_version: [1.11.0]

steps:
- name: Checkout repo
Expand Down Expand Up @@ -144,14 +144,13 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
nightly_version: [nightly-2022-11-03]
mold_version: [1.7.0]
nightly_version: [nightly-2023-06-01]
mold_version: [1.11.0]
make:
- name: ABCI
suffix: ''
cache_key: namada
cache_version: v2
tendermint_artifact: tendermint-unreleased-v0.1.4-abciplus

env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -251,7 +250,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
mold_version: [1.7.0]
mold_version: [1.11.0]
make:
- name: ABCI Release build
suffix: ''
Expand Down Expand Up @@ -324,7 +323,7 @@ jobs:
- name: Build
run: make build-release${{ matrix.make.suffix }}
env:
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold"
RUSTFLAGS: "-C linker=clang -C debug_assertions=true -C link-arg=-fuse-ld=/usr/local/bin/mold"
- name: Upload target binaries
uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -357,22 +356,20 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
nightly_version: [nightly-2022-11-03]
mold_version: [1.7.0]
nightly_version: [nightly-2023-06-01]
mold_version: [1.11.0]
make:
- name: e2e
suffix: ''
index: 0
cache_key: namada
cache_version: v2
tendermint_artifact: tendermint-unreleased-v0.1.4-abciplus
wait_for: namada-release-eth (ubuntu-20.04, 1.7.0, ABCI Release build, namada-e2e-release, v2)
- name: e2e
suffix: ''
index: 1
cache_key: namada
cache_version: v2
tendermint_artifact: tendermint-unreleased-v0.1.4-abciplus
wait_for: namada-release-eth (ubuntu-20.04, 1.7.0, ABCI Release build, namada-e2e-release, v2)

env:
Expand Down Expand Up @@ -443,20 +440,6 @@ jobs:
run: |
wget -q -O- https://github.com/rui314/mold/releases/download/v${{ matrix.mold_version }}/mold-${{ matrix.mold_version }}-x86_64-linux.tar.gz | tar -xz
mv mold-${{ matrix.mold_version }}-x86_64-linux/bin/mold /usr/local/bin
- name: Download tendermint binaries
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build-tendermint.yml
workflow_conclusion: success
name: ${{ matrix.make.tendermint_artifact }}
path: /usr/local/bin
- name: Download masp parameters
run: |
mkdir /home/runner/work/masp
curl -o /home/runner/work/masp/masp-spend.params -sLO https://github.com/anoma/masp-mpc/releases/download/namada-trusted-setup/masp-spend.params?raw=true
curl -o /home/runner/work/masp/masp-output.params -sLO https://github.com/anoma/masp-mpc/releases/download/namada-trusted-setup/masp-output.params?raw=true
curl -o /home/runner/work/masp/masp-convert.params -sLO https://github.com/anoma/masp-mpc/releases/download/namada-trusted-setup/masp-convert.params?raw=true
- name: Build
run: make build
env:
Expand All @@ -483,22 +466,37 @@ jobs:
with:
name: binaries${{ matrix.make.suffix }}-${{ github.event.pull_request.head.sha || github.sha }}
path: ./target/release/
- name: Download tendermint & cometbft
run: |
curl -o cometbft.tar.gz -LO https://github.com/cometbft/cometbft/releases/download/v0.37.2/cometbft_0.37.2_linux_amd64.tar.gz
tar -xvzf cometbft.tar.gz
mv cometbft /usr/local/bin
curl -o tendermint.tar.gz -LO https://github.com/heliaxdev/tendermint/releases/download/v0.1.4-abciplus/tendermint_0.1.4-abciplus_linux_amd64.tar.gz
tar -xvzf tendermint.tar.gz
mv tendermint /usr/local/bin
- name: Change permissions
run: |
chmod +x target/release/namada
chmod +x target/release/namadaw
chmod +x target/release/namadan
chmod +x target/release/namadac
chmod +x /usr/local/bin/tendermint
chmod +x /usr/local/bin/cometbft
- name: Run e2e test
run: python3 .github/workflows/scripts/schedule-e2e.py
run: |
mkdir -p /home/runner/work/masp-params
curl -o /home/runner/work/masp-params/masp-spend.params -LO https://github.com/anoma/masp-mpc/releases/download/namada-trusted-setup/masp-spend.params?raw=true
curl -o /home/runner/work/masp-params/masp-output.params -LO https://github.com/anoma/masp-mpc/releases/download/namada-trusted-setup/masp-output.params?raw=true
curl -o /home/runner/work/masp-params/masp-convert.params -LO https://github.com/anoma/masp-mpc/releases/download/namada-trusted-setup/masp-convert.params?raw=true
ls -l /home/runner/work/masp-params
shasum /home/runner/work/masp-params/*.params
python3 .github/workflows/scripts/schedule-e2e.py
env:
NAMADA_TENDERMINT_WEBSOCKET_TIMEOUT: 20
NAMADA_E2E_USE_PREBUILT_BINARIES: "true"
NAMADA_E2E_KEEP_TEMP: "true"
NAMADA_TM_STDOUT: "false"
NAMADA_LOG_COLOR: "false"
# NAMADA_MASP_PARAMS_DIR: "/home/runner/work/masp"
# NAMADA_MASP_PARAMS_DIR: "/home/runner/work/masp-params"
NAMADA_LOG: "info"
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold"
INDEX: ${{ matrix.make.index }}
Expand Down
52 changes: 34 additions & 18 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
wasm_cache_version: ["v2"]
mold_version: [1.7.0]
mold_version: [1.11.0]

steps:
- name: Checkout repo
Expand Down Expand Up @@ -79,7 +79,8 @@ jobs:
matrix:
os: [ubuntu-20.04]
wasm_cache_version: ["v2"]
mold_version: [1.7.0]
nightly_version: [nightly-2023-06-01]
mold_version: [1.11.0]

steps:
- name: Checkout repo
Expand All @@ -103,6 +104,11 @@ jobs:
path: ./wasm
env:
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold"
- name: Setup rust nightly
uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36
with:
toolchain: ${{ matrix.nightly_version }}
profile: default
- name: Test Wasm
run: make test-wasm
- name: Check wasm up-to-date
Expand Down Expand Up @@ -146,8 +152,8 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
nightly_version: [nightly-2022-11-03]
mold_version: [1.7.0]
nightly_version: [nightly-2023-06-01]
mold_version: [1.11.0]
make:
- name: ABCI
suffix: ''
Expand Down Expand Up @@ -235,6 +241,8 @@ jobs:
name: wasm-${{ github.event.pull_request.head.sha|| github.sha }}
path: ./wasm
- uses: taiki-e/install-action@cargo-llvm-cov
- name: Check crates build with default features
run: make check-crates
- name: Run unit test
run: make test-unit-coverage${{ matrix.make.suffix }}
env:
Expand All @@ -259,7 +267,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
mold_version: [1.7.0]
mold_version: [1.11.0]
make:
- name: ABCI Release build
suffix: ''
Expand Down Expand Up @@ -338,7 +346,7 @@ jobs:
- name: Build
run: make build-release${{ matrix.make.suffix }}
env:
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold"
RUSTFLAGS: "-C linker=clang -C debug_assertions=true -C link-arg=-fuse-ld=/usr/local/bin/mold"
- name: Upload target binaries
uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -366,12 +374,12 @@ jobs:

namada-e2e:
runs-on: ${{ matrix.os }}
timeout-minutes: 80
# timeout-minutes: 80
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
nightly_version: [nightly-2022-11-03]
nightly_version: [nightly-2023-06-01]
mold_version: [1.7.0]
make:
- name: e2e
Expand All @@ -380,14 +388,21 @@ jobs:
cache_key: namada
cache_version: v2
tendermint_artifact: tendermint-unreleased-v0.1.4-abciplus
wait_for: namada-release (ubuntu-20.04, 1.7.0, ABCI Release build, namada-e2e-release, v2)
wait_for: namada-release (ubuntu-20.04, 1.11.0, ABCI Release build, namada-e2e-release, v2)
- name: e2e
suffix: ''
index: 1
cache_key: namada
cache_version: v2
tendermint_artifact: tendermint-unreleased-v0.1.4-abciplus
wait_for: namada-release (ubuntu-20.04, 1.7.0, ABCI Release build, namada-e2e-release, v2)
wait_for: namada-release (ubuntu-20.04, 1.11.0, ABCI Release build, namada-e2e-release, v2)
- name: e2e
suffix: ''
index: 2
cache_key: namada
cache_version: v2
tendermint_artifact: tendermint-unreleased-v0.1.4-abciplus
wait_for: namada-release (ubuntu-20.04, 1.11.0, ABCI Release build, namada-e2e-release, v2)

env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -463,14 +478,6 @@ jobs:
run: |
wget -q -O- https://github.com/rui314/mold/releases/download/v${{ matrix.mold_version }}/mold-${{ matrix.mold_version }}-x86_64-linux.tar.gz | tar -xz
mv mold-${{ matrix.mold_version }}-x86_64-linux/bin/mold /usr/local/bin
- name: Download tendermint binaries
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build-tendermint.yml
workflow_conclusion: success
name: ${{ matrix.make.tendermint_artifact }}
path: /usr/local/bin
- name: Build
run: make build
env:
Expand All @@ -497,13 +504,22 @@ jobs:
with:
name: binaries${{ matrix.make.suffix }}-${{ github.event.pull_request.head.sha || github.sha }}
path: ./target/release/
- name: Download tendermint & cometbft
run: |
curl -o cometbft.tar.gz -LO https://github.com/cometbft/cometbft/releases/download/v0.37.2/cometbft_0.37.2_linux_amd64.tar.gz
tar -xvzf cometbft.tar.gz
mv cometbft /usr/local/bin
curl -o tendermint.tar.gz -LO https://github.com/heliaxdev/tendermint/releases/download/v0.1.4-abciplus/tendermint_0.1.4-abciplus_linux_amd64.tar.gz
tar -xvzf tendermint.tar.gz
mv tendermint /usr/local/bin
- name: Change permissions
run: |
chmod +x target/release/namada
chmod +x target/release/namadaw
chmod +x target/release/namadan
chmod +x target/release/namadac
chmod +x /usr/local/bin/tendermint
chmod +x /usr/local/bin/cometbft
- name: Run e2e test
run: |
mkdir -p /home/runner/work/masp-params
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
nightly_version: [nightly-2022-11-03]
nightly_version: [nightly-2023-06-01]
make:
- name: Clippy
command: clippy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
nightly_version: [nightly-2022-11-03]
nightly_version: [nightly-2023-06-01]
make:
- name: Audit
command: audit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
nightly_version: [nightly-2022-11-03]
nightly_version: [nightly-2023-06-01]
mdbook_version: [rust-lang/[email protected]]
mdbook_mermaid: [badboy/[email protected]]
mdbook_linkcheck: [Michael-F-Bryan/[email protected]]
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/scripts/e2e.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"e2e::eth_bridge_tests::everything": 4,
"e2e::ibc_tests::run_ledger_ibc": 140,
"e2e::ibc_tests::run_ledger_ibc": 155,
"e2e::ledger_tests::double_signing_gets_slashed": 12,
"e2e::ledger_tests::invalid_transactions": 8,
"e2e::ledger_tests::ledger_many_txs_in_a_block": 41,
"e2e::ledger_tests::ledger_txs_and_queries": 11,
"e2e::ledger_tests::masp_incentives": 581,
"e2e::ledger_tests::masp_pinned_txs": 73,
"e2e::ledger_tests::masp_txs_and_queries": 245,
"e2e::ledger_tests::pos_bonds": 19,
"e2e::ledger_tests::pos_init_validator": 15,
"e2e::ledger_tests::proposal_offline": 15,
"e2e::ledger_tests::pgf_governance_proposal": 35,
"e2e::ledger_tests::eth_governance_proposal": 35,
"e2e::ledger_tests::proposal_submission": 35,
"e2e::ledger_tests::invalid_transactions": 13,
"e2e::ledger_tests::ledger_many_txs_in_a_block": 55,
"e2e::ledger_tests::ledger_txs_and_queries": 30,
"e2e::ledger_tests::masp_incentives": 618,
"e2e::ledger_tests::masp_pinned_txs": 75,
"e2e::ledger_tests::masp_txs_and_queries": 282,
"e2e::ledger_tests::pos_bonds": 77,
"e2e::ledger_tests::pos_init_validator": 40,
"e2e::ledger_tests::proposal_offline": 21,
"e2e::ledger_tests::pgf_governance_proposal": 100,
"e2e::ledger_tests::eth_governance_proposal": 100,
"e2e::ledger_tests::proposal_submission": 200,
"e2e::ledger_tests::run_ledger": 5,
"e2e::ledger_tests::run_ledger_load_state_and_reset": 5,
"e2e::ledger_tests::run_ledger_load_state_and_reset": 23,
"e2e::ledger_tests::test_namada_shuts_down_if_tendermint_dies": 2,
"e2e::ledger_tests::test_genesis_validators": 9,
"e2e::ledger_tests::test_node_connectivity_and_consensus": 20,
"e2e::ledger_tests::test_genesis_validators": 14,
"e2e::ledger_tests::test_node_connectivity_and_consensus": 28,
"e2e::wallet_tests::wallet_address_cmds": 1,
"e2e::wallet_tests::wallet_encrypted_key_cmds": 1,
"e2e::wallet_tests::wallet_encrypted_key_cmds_env_var": 1,
Expand Down
Loading

0 comments on commit 714d81c

Please sign in to comment.