Skip to content

Commit

Permalink
Merge branch 'bat/eth-0.11.0-merge' (#871)
Browse files Browse the repository at this point in the history
* bat/eth-0.11.0-merge: (205 commits)
  tiny refactor vote_extensions
  [chore]: Added some docstrings
  Makefile: add core to clippy-abcipp and test-unit-abcipp and fix shared
  [fix] abcipp ethereum_events unit test
  [feat]: Fixed up the abcipp feature flag
  [fix]: Fixed FinalizeBlock method
  more abcipp fixes
  fix `make check-abcipp` and `make clippy-abcipp`
  fix 0.11.0 merge
  move eth-bridge types and storage mods to core
  Namada 0.11.0
  wasm: update checksums.json
  wasm_for_tests: rebuild all
  fix default chain IDs lengths
  make fmt
  s/anoma/namada in all files
  apps: s/anoma/namada/ in paths
  wasm: update checksums.json
  [ci] wasm checksums update
  changelog: add #733
  docs/overview: update deps graph and add a generated one too
  pos: replace generic types with concrete types from core
  update paths for core split and apply many small fixes
  add new crate "namada_core" for core types, storage_api, tx_env, vp_env
  proto/types: remove an & to placate 1.65 clippy
  changelog: add #807
  tx: sign hash of code rather than full code blob
  maint: fix incorrect clippy placation in previous merge
  fix: use multitoken credit_tokens() in tests
  maint: patch funty 1.2.0
  ci: update rust/docker image
  Fix changelog
  Fix up for namada v0.10.1
  Add changelog
  Add check-abcipp command
  Use ferveo-tpke flag to stop tendermint-rpc being pulled into wasm
  First attempt at fixing shared abcipp
  deleted out of date TS docs
  changelog: add #797
  [ci] wasm checksums update
  changelog: add #707
  remove comments to self
  convert to tm voting power in `update_epoch`
  client: replace voting power with bonded stake in queries, etc
  fix pos state machine test
  clean up naming of "validator total deltas" -> "validator deltas"
  fix client voting power query
  fix `TendermintValidator::power`
  clippy: suppress unused validation vars (may need later)
  fmt + cleanup after cherrypicking commits from #388
  more voting_power removal and accurate variable renaming
  keep voting_power as a possible client query
  change `validator_total_deltas` -> `validator_deltas`
  Update wasm tx_(un)bond with VotingPower removal
  refactor VotingPower out of PoS VP
  continue refactoring away VotingPower
  refactor out VotingPower(Delta) in pos crate, distinguish total and validator deltas
  rename slash rate params with `min`, update default `PosParam` values
  Update tests/src/vm_host_env/tx.rs
  Update shared/src/ledger/parameters/mod.rs
  changelog: add #775
  [feat]: Renamed 'fee' CLI arguments to 'gas'.
  make: clean any existing WASM files before WASM build
  changelog: add #719
  changelog: add #674
  pos: use  method
  governance: added  method, fmt, clippy
  changelog: add #570
  [ci] wasm checksums update
  changelog: add #708
  remove `min_duration` from `ParametersConfig`
  remove `staked_ratio` and `pos_inflation_amount` from `ParametersConfig`
  update comments
  [ci] wasm checksums update
  fmt and includes
  updates to accommodate `tm_votes_per_token` relative to namnam
  Update rewards parameters and distribution
  update toml files with latest parameters and values
  fix arb_amount to max out at max tm voting power (fix wasm test bug)
  storage change: last inflation rate -> last inflation token amount
  fix: write all fields in Parameters storage in `init_storage`
  fix initial staked ratio parameter at genesis
  update rust_decimal version + fmt
  clean comments and toml files of basis points
  fix correct inner type of ValidationError::TotalVotingPowerTooLarge
  more decimal_mult function uses
  add fns to multiply Decimal and integer type, return truncated integer
  remove BasisPoints and change relevant parameters to Decimal type
  documentation updates + unused imports removal
  rename reward_rate -> inflation_rate for pos
  specify read or write intentions for parameters storage keys
  add target_staked_ratio to PoS params
  update max inflation rate in params (formerly max_staking_rewards_rate)
  rename `votes_per_token` to `tm_votes_per_token` since this will only be used to interface with tendermint
  add new parameters needed for rewards PD controller to the Parameters storage
  add max_staking_reward_rate to PosParams
  clarify+rename 'epoch_storage_key' as 'epoch_duration_storage_key'
  changelog: add #695
  [ci] wasm checksums update
  addressing 2nd round of review comments
  ...
  • Loading branch information
tzemanovic committed Dec 9, 2022
2 parents c776aaf + 6d8fd0d commit 158b8e1
Show file tree
Hide file tree
Showing 358 changed files with 13,928 additions and 11,501 deletions.
2 changes: 2 additions & 0 deletions .changelog/v0.10.1/bug-fixes/797-fix-shielded-to-shielded.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Avoid reading from nonexistent storage keys in shielded-to-shielded transfers.
([#797](https://github.com/anoma/namada/pull/797))
2 changes: 2 additions & 0 deletions .changelog/v0.11.0/bug-fixes/754-fix-abcipp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix building with the `abcipp` feature again
([#754](https://github.com/anoma/namada/pull/754))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fixed validation of a validator initialization transaction.
([#763](https://github.com/anoma/namada/pull/763))
2 changes: 2 additions & 0 deletions .changelog/v0.11.0/features/582-native-token-param.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Allow to set the native token via genesis configuration.
([#582](https://github.com/anoma/namada/pull/582))
6 changes: 6 additions & 0 deletions .changelog/v0.11.0/features/592-implicit-vp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- Added a validity predicate for implicit accounts. This is set in
protocol parameters and may be changed via governance. Additionally,
added automatic public key reveal in the client that use an implicit
account that hasn't revealed its PK yet as a source. It's also
possible to manually submit reveal transaction with client command
([#592](https://github.com/anoma/namada/pull/592))
2 changes: 2 additions & 0 deletions .changelog/v0.11.0/features/687-remove-staking-address.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- PoS: Removed staking reward addresses in preparation of auto-staked rewards
system. ([#687](https://github.com/anoma/namada/pull/687))
4 changes: 4 additions & 0 deletions .changelog/v0.11.0/features/695-validator-commission-rates.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Allow to set validator's commission rates and a limit on change of commission
rate per epoch. Commission rate can be changed via a transaction authorized
by the validator, but the limit is immutable value, set when the validator's
account is initialized. ([#695](https://github.com/anoma/namada/pull/695))
5 changes: 5 additions & 0 deletions .changelog/v0.11.0/features/707-refactor-voting-powers.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Optimize the PoS code to depend only on bonded stake, removing
the VotingPower(Delta) structs. This mitigates some previous
information loss in PoS calculations. Instead, the notion of
voting power is only relevant when communicating with Tendermint.
([#707](https://github.com/anoma/namada/pull/707))
4 changes: 4 additions & 0 deletions .changelog/v0.11.0/features/708-update-pos-params.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Update the set of parameters in the PoS system according to the
latest spec and standardizes the use of the rust_decimal crate
for parameters and calculations that require fractional numbers.
([#708](https://github.com/anoma/namada/pull/708))
2 changes: 2 additions & 0 deletions .changelog/v0.11.0/features/775-rename-cli-fee-args.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Renamed transaction CLI arguments `--fee-amount` and `--fee-token` to `--gas-
amount` and `--gas-token`. ([#775](https://github.com/anoma/namada/pull/775))
2 changes: 2 additions & 0 deletions .changelog/v0.11.0/improvements/436-remove-f64.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Refactored token decimal formatting.
([#436](https://github.com/anoma/namada/pull/436))
1 change: 1 addition & 0 deletions .changelog/v0.11.0/improvements/570-rpc-sub-vp-pos.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Added PoS specific queries ([#570](https://github.com/anoma/namada/pull/570))
3 changes: 3 additions & 0 deletions .changelog/v0.11.0/improvements/674-event-log.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Added a custom events store and replaced WebSocket client for
transaction results with query endpoints to the events store.
([#674](https://github.com/anoma/namada/pull/674))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Refactored governance code to use storage_api.
([#719](https://github.com/anoma/namada/pull/719))
4 changes: 4 additions & 0 deletions .changelog/v0.11.0/improvements/733-core-crate-split.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Public parts of shared `namada` crate have been split up into a
`namada_core` crate. The `namada_proof_of_stake`, `namada_vp_prelude`
and `namada_tx_prelude` crates now depend on this `namada_core` crate.
([#733](https://github.com/anoma/namada/pull/733))
2 changes: 2 additions & 0 deletions .changelog/v0.11.0/improvements/807-smaller-signing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Sign over the hash of code rather than code in transaction signing.
([#807](https://github.com/anoma/namada/pull/807))
2 changes: 2 additions & 0 deletions .changelog/v0.11.0/miscellaneous/650-last-block.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Improve some docstrings relating to block heights
([#650](https://github.com/anoma/namada/pull/650))
1 change: 1 addition & 0 deletions .changelog/v0.11.0/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Namada 0.11.0 is a scheduled minor release.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug Report
about: Create a bug report for Anoma.
about: Create a bug report for Namada.
labels: bug
---

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature Request
about: Request a new feature in Anoma.
about: Request a new feature in Namada.
labels: enhancement
---

34 changes: 17 additions & 17 deletions .github/workflows/build-and-test-bridge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
timeout-minutes: 30
runs-on: ${{ matrix.os }}
container:
image: ghcr.io/anoma/namada:wasm-0.8.0
image: ghcr.io/anoma/namada:wasm-0.11.0
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -136,15 +136,15 @@ jobs:
BUCKET_NAME: namada-wasm-master
AWS_REGION: eu-west-1

anoma-eth:
namada-eth:
runs-on: ${{ matrix.os }}
timeout-minutes: 80
needs: [build-wasm]
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
nightly_version: [nightly-2022-05-20]
nightly_version: [nightly-2022-11-03]
mold_version: [1.7.0]
make:
- name: ABCI
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
if: always()
run: sccache --stop-server || true

anoma-release-eth:
namada-release-eth:
runs-on: ${{ matrix.os }}
timeout-minutes: 25
strategy:
Expand Down Expand Up @@ -342,7 +342,7 @@ jobs:
run: sccache --stop-server || true


anoma-e2e-eth:
namada-e2e-eth:
runs-on: ${{ matrix.os }}
timeout-minutes: 80
strategy:
Expand All @@ -358,14 +358,14 @@ jobs:
cache_key: anoma
cache_version: v2
tendermint_artifact: tendermint-unreleased-ad825dcadbd4b98c3f91ce5a711e4fb36a69c377
wait_for: anoma-release-eth (ubuntu-latest, 1.7.0, ABCI Release build, anoma-e2e-release, v2)
wait_for: namada-release-eth (ubuntu-latest, 1.7.0, ABCI Release build, namada-e2e-release, v2)
- name: e2e
suffix: ''
index: 1
cache_key: anoma
cache_version: v2
tendermint_artifact: tendermint-unreleased-ad825dcadbd4b98c3f91ce5a711e4fb36a69c377
wait_for: anoma-release-eth (ubuntu-latest, 1.7.0, ABCI Release build, anoma-e2e-release, v2)
wait_for: namada-release-eth (ubuntu-latest, 1.7.0, ABCI Release build, namada-e2e-release, v2)

env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -466,7 +466,7 @@ jobs:
with:
name: wasm-${{ github.event.pull_request.head.sha|| github.sha }}
path: ./wasm
- name: Download anoma binaries
- name: Download namada binaries
uses: actions/download-artifact@v3
with:
name: binaries${{ matrix.make.suffix }}-${{ github.event.pull_request.head.sha || github.sha }}
Expand All @@ -481,13 +481,13 @@ jobs:
- name: Run e2e test
run: python3 .github/workflows/scripts/schedule-e2e.py
env:
ANOMA_TENDERMINT_WEBSOCKET_TIMEOUT: 20
ANOMA_E2E_USE_PREBUILT_BINARIES: "true"
ANOMA_E2E_KEEP_TEMP: "true"
ANOMA_TM_STDOUT: "false"
ANOMA_LOG_COLOR: "false"
ANOMA_MASP_PARAMS_DIR: "/home/runner/work/masp"
ANOMA_LOG: "info"
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_LOG: "info"
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold"
INDEX: ${{ matrix.make.index }}
- name: Upload e2e logs
Expand All @@ -497,11 +497,11 @@ jobs:
name: logs-e2e-${{ matrix.make.index }}-${{ github.event.pull_request.head.sha || github.sha }}
path: |
/tmp/.*/logs/
/tmp/.*/e2e-test.*/setup/validator-*/.anoma/logs/*.log
/tmp/.*/e2e-test.*/setup/validator-*/.namada/logs/*.log
retention-days: 5
- name: Print sccache stats
if: always()
run: sccache --show-stats
- name: Stop sccache server
if: always()
run: sccache --stop-server || true
run: sccache --stop-server || true
34 changes: 17 additions & 17 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
timeout-minutes: 30
runs-on: ${{ matrix.os }}
container:
image: ghcr.io/anoma/namada:wasm-0.8.0
image: ghcr.io/anoma/namada:wasm-0.11.0
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -138,15 +138,15 @@ jobs:
BUCKET_NAME: namada-wasm-master
AWS_REGION: eu-west-1

anoma:
namada:
runs-on: ${{ matrix.os }}
timeout-minutes: 80
needs: [build-wasm]
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
nightly_version: [nightly-2022-05-20]
nightly_version: [nightly-2022-11-03]
mold_version: [1.7.0]
make:
- name: ABCI
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:
if: always()
run: sccache --stop-server || true

anoma-release:
namada-release:
runs-on: ${{ matrix.os }}
timeout-minutes: 25
strategy:
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
run: sccache --stop-server || true


anoma-e2e:
namada-e2e:
runs-on: ${{ matrix.os }}
timeout-minutes: 80
strategy:
Expand All @@ -360,14 +360,14 @@ jobs:
cache_key: anoma
cache_version: v2
tendermint_artifact: tendermint-unreleased-ad825dcadbd4b98c3f91ce5a711e4fb36a69c377
wait_for: anoma-release (ubuntu-latest, 1.7.0, ABCI Release build, anoma-e2e-release, v2)
wait_for: namada-release (ubuntu-latest, 1.7.0, ABCI Release build, namada-e2e-release, v2)
- name: e2e
suffix: ''
index: 1
cache_key: anoma
cache_version: v2
tendermint_artifact: tendermint-unreleased-ad825dcadbd4b98c3f91ce5a711e4fb36a69c377
wait_for: anoma-release (ubuntu-latest, 1.7.0, ABCI Release build, anoma-e2e-release, v2)
wait_for: namada-release (ubuntu-latest, 1.7.0, ABCI Release build, namada-e2e-release, v2)

env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -468,7 +468,7 @@ jobs:
with:
name: wasm-${{ github.event.pull_request.head.sha|| github.sha }}
path: ./wasm
- name: Download anoma binaries
- name: Download namada binaries
uses: actions/download-artifact@v3
with:
name: binaries${{ matrix.make.suffix }}-${{ github.event.pull_request.head.sha || github.sha }}
Expand All @@ -483,13 +483,13 @@ jobs:
- name: Run e2e test
run: python3 .github/workflows/scripts/schedule-e2e.py
env:
ANOMA_TENDERMINT_WEBSOCKET_TIMEOUT: 20
ANOMA_E2E_USE_PREBUILT_BINARIES: "true"
ANOMA_E2E_KEEP_TEMP: "true"
ANOMA_TM_STDOUT: "false"
ANOMA_LOG_COLOR: "false"
ANOMA_MASP_PARAMS_DIR: "/home/runner/work/masp"
ANOMA_LOG: "info"
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_LOG: "info"
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold"
INDEX: ${{ matrix.make.index }}
- name: Upload e2e logs
Expand All @@ -499,11 +499,11 @@ jobs:
name: logs-e2e-${{ matrix.make.index }}-${{ github.event.pull_request.head.sha || github.sha }}
path: |
/tmp/.*/logs/
/tmp/.*/e2e-test.*/setup/validator-*/.anoma/logs/*.log
/tmp/.*/e2e-test.*/setup/validator-*/.namada/logs/*.log
retention-days: 5
- name: Print sccache stats
if: always()
run: sccache --show-stats
- name: Stop sccache server
if: always()
run: sccache --stop-server || true
run: sccache --stop-server || true
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-latest]
nightly_version: [nightly-2022-05-20]
nightly_version: [nightly-2022-11-03]
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-latest]
nightly_version: [nightly-2022-05-20]
nightly_version: [nightly-2022-11-03]
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-latest]
nightly_version: [nightly-2022-05-20]
nightly_version: [nightly-2022-11-03]
mdbook_version: [rust-lang/[email protected]]
mdbook_mermaid: [badboy/[email protected]]
mdbook_linkcheck: [Michael-F-Bryan/[email protected]]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
anoma_cache_version: [v1]
namada_cache_version: [v1]
make:
- name: Build package
command: package
Expand Down Expand Up @@ -70,8 +70,8 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-anoma-release-${{ matrix.anoma_cache_version }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-anoma-release-${{ matrix.anoma_cache_version }}
key: ${{ runner.os }}-namada-release-${{ matrix.namada_cache_version }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-namada-release-${{ matrix.namada_cache_version }}
- name: Start sccache server
run: sccache --start-server
- name: ${{ matrix.make.name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"e2e::ledger_tests::proposal_submission": 35,
"e2e::ledger_tests::run_ledger": 5,
"e2e::ledger_tests::run_ledger_load_state_and_reset": 5,
"e2e::ledger_tests::test_anoma_shuts_down_if_tendermint_dies": 2,
"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::wallet_tests::wallet_address_cmds": 1,
Expand Down
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Anoma default home dir
# Namada default home dir
/.namada
/.anoma

# Generated by Cargo
Expand All @@ -7,8 +8,8 @@ debug/
target/

# Release packages
/anoma-*/
/anoma-*.tar.gz
/namada-*/
/namada-*.tar.gz

# These are backup files generated by rustfmt
**/*.rs.bk
Expand All @@ -26,4 +27,4 @@ target/
wasm/*.wasm

# app version string file
/apps/version.rs
/apps/version.rs
Loading

0 comments on commit 158b8e1

Please sign in to comment.