changelog: add #4177

(cherry picked from commit ce55dbc) # Conflicts: # .github/workflows/ci.yml # .github/workflows/scripts/hermes.txt # .mergify.yml # CHANGELOG.md # Cargo.lock # Cargo.toml # README.md # crates/apps/Cargo.toml # crates/apps_lib/src/cli.rs # crates/apps_lib/src/cli/client.rs # crates/apps_lib/src/cli/context.rs # crates/apps_lib/src/cli/wallet.rs # crates/apps_lib/src/client/tx.rs # crates/apps_lib/src/client/utils.rs # crates/apps_lib/src/config/genesis/transactions.rs # crates/apps_lib/src/config/genesis/utils.rs # crates/apps_lib/src/wallet/defaults.rs # crates/benches/native_vps.rs # crates/core/src/masp.rs # crates/ibc/src/lib.rs # crates/node/src/bench_utils.rs # crates/node/src/shell/testing/client.rs # crates/sdk/src/args.rs # crates/sdk/src/lib.rs # crates/sdk/src/signing.rs # crates/sdk/src/tx.rs # crates/shielded_token/src/masp.rs # crates/shielded_token/src/masp/shielded_wallet.rs # crates/shielded_token/src/validation.rs # crates/tests/src/e2e/helpers.rs # crates/tests/src/e2e/ibc_tests.rs # crates/tests/src/e2e/ledger_tests.rs # crates/tests/src/e2e/setup.rs # crates/tests/src/integration/helpers.rs # crates/tests/src/integration/ledger_tests.rs # crates/tests/src/integration/masp.rs # crates/token/src/lib.rs # crates/tx/src/types.rs # crates/wallet/src/keys.rs # crates/wallet/src/lib.rs # crates/wallet/src/store.rs # genesis/hardware/src/pre-genesis/wallet.toml # genesis/localnet/balances.toml # genesis/localnet/src/pre-genesis/signed-transactions.toml # genesis/localnet/src/pre-genesis/unsigned-transactions.toml # genesis/localnet/src/pre-genesis/wallet.toml # genesis/localnet/transactions.toml # wasm/Cargo.lock # wasm_for_tests/Cargo.lock
anoma · Dec 11, 2024 · aadc646 · aadc646
1 parent 922d646
commit aadc646
Show file tree

Hide file tree

Showing 50 changed files with 2,760 additions and 0 deletions.
diff --git a/.changelog/unreleased/miscellaneous/4177-inline-borsh-ext.md b/.changelog/unreleased/miscellaneous/4177-inline-borsh-ext.md
@@ -0,0 +1,2 @@
+- Inline borsh-ext crate function in namada_core crate.
+  ([\#4177](https://github.com/anoma/namada/pull/4177))
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,13 +5,19 @@ on:
     branches:
       - main
       - 'maint-[0-9]+.[0-9]+'
+<<<<<<< HEAD
       - 'maint-libs-[0-9]+.[0-9]+'
+=======
+>>>>>>> ce55dbc74 (changelog: add #4177)
   # Run in PRs with conflicts (https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request)
   pull_request_target:
     branches:
       - main
       - 'maint-[0-9]+.[0-9]+'
+<<<<<<< HEAD
       - 'maint-libs-[0-9]+.[0-9]+'
+=======
+>>>>>>> ce55dbc74 (changelog: add #4177)
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
 
@@ -35,7 +41,10 @@ env:
   AWS_REGION: us-west-2
   NIGHTLY: nightly-2024-09-08
   NAMADA_MASP_PARAMS_DIR: /masp/.masp-params
+<<<<<<< HEAD
   LEDGER_APP_VERSION: "1.0.6-ci-patch"
+=======
+>>>>>>> ce55dbc74 (changelog: add #4177)
 
 jobs:
   changelog:
@@ -652,6 +661,7 @@ jobs:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
 
+<<<<<<< HEAD
   test-ledger-app:
     timeout-minutes: 30
     runs-on: [ubuntu-latest]
@@ -693,6 +703,8 @@ jobs:
           cd ../ledger-namada
           make cpp_test
 
+=======
+>>>>>>> ce55dbc74 (changelog: add #4177)
   test-e2e-with-device-automation:
     runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
     container: 

diff --git a/.github/workflows/scripts/hermes.txt b/.github/workflows/scripts/hermes.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1.10.4-namada-beta18-test
+=======
+1.10.4-namada-beta17-rc2
+>>>>>>> ce55dbc74 (changelog: add #4177)
diff --git a/.mergify.yml b/.mergify.yml
@@ -10,6 +10,7 @@ queue_rules:
     merge_method: merge
     autosquash: true   
 
+<<<<<<< HEAD
   - name: backport-apps-1.0-queue
     batch_size: 3
     queue_conditions:
@@ -23,6 +24,13 @@ queue_rules:
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - base = maint-libs-0.46
+=======
+  - name: backport-0.46-queue
+    batch_size: 3
+    queue_conditions:
+      - "#approved-reviews-by >= 1"
+      - base = maint-0.46
+>>>>>>> ce55dbc74 (changelog: add #4177)
     merge_method: merge
     autosquash: true   
 
@@ -34,8 +42,12 @@ pull_request_rules:
       - "#approved-reviews-by >= 1"
       - or:
         - base = main
+<<<<<<< HEAD
         - base = maint-1.0
         - base = maint-libs-0.46
+=======
+        - base = maint-0.46
+>>>>>>> ce55dbc74 (changelog: add #4177)
     actions:
       queue:
 
@@ -52,6 +64,7 @@ pull_request_rules:
           Sorry about that, but you can requeue the PR by using `@mergifyio requeue`
           if you think this was a mistake.
 
+<<<<<<< HEAD
   - name: backport PR to apps 1.0 lane
     conditions:
       - label = backport-1.0
@@ -67,3 +80,12 @@ pull_request_rules:
       backport:
         branches:
           - "maint-libs-0.46"
+=======
+  - name: backport PR to 0.46 lane
+    conditions:
+      - label = backport-46
+    actions:
+      backport:
+        branches:
+          - "maint-0.46"
+>>>>>>> ce55dbc74 (changelog: add #4177)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
 
+<<<<<<< HEAD
 ## v1.0.0
 
 Namada v1.0.0 is the first stable release of the Namada apps.
@@ -9,6 +10,8 @@ Namada v1.0.0 is the first stable release of the Namada apps.
 - updated namada libraries to libs-v0.46.1
   ([\#4123](https://github.com/anoma/namada/pull/4123))
 
+=======
+>>>>>>> ce55dbc74 (changelog: add #4177)
 ## libs-v0.46.1
 
 Namada 0.46.1 is a libaries patch release containing couple improvements and a bug fix in preparetion for a stable apps release.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -90,7 +90,11 @@ circular-queue = "0.2.6"
 clap = "4.5"
 clap_complete = "4.5"
 clap_complete_nushell = "4.5"
+<<<<<<< HEAD
 clru = "0.6.2"
+=======
+clru = {git = "https://github.com/marmeladema/clru-rs.git", rev = "71ca566"}
+>>>>>>> ce55dbc74 (changelog: add #4177)
 color-eyre = "0.6.2"
 concat-idents = "1.1.2"
 config = "0.14.1"
@@ -134,15 +138,24 @@ konst = { version = "0.3.8", default-features = false }
 lazy_static = "1.4.0"
 # TODO: upstreamed in https://github.com/ledger-community/rust-ledger/pull/9
 ledger-lib = { git = "https://github.com/heliaxdev/rust-ledger", rev = "f96f4559b3237d09218f7583df01acf36034ea79", default-features = false, features = ["transport_tcp"] }
+<<<<<<< HEAD
 ledger-namada-rs = { git = "https://github.com/Zondax/ledger-namada", tag = "v1.0.5" }
+=======
+ledger-namada-rs = { git = "https://github.com/Zondax/ledger-namada", tag = "v0.0.24" }
+>>>>>>> ce55dbc74 (changelog: add #4177)
 ledger-transport = "0.10.0"
 ledger-transport-hid = "0.10.0"
 libc = "0.2.97"
 libloading = "0.7.2"
 linkme = "0.3.24"
 # branch = "tomas/arbitrary"
+<<<<<<< HEAD
 masp_primitives = { git = "https://github.com/anoma/masp", rev = "0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" }
 masp_proofs = { git = "https://github.com/anoma/masp", rev = "0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe", default-features = false, features = ["local-prover"] }
+=======
+masp_primitives = { git = "https://github.com/anoma/masp", rev = "12ed8b060b295c06502a2ff8468e4a941cb7cca4" }
+masp_proofs = { git = "https://github.com/anoma/masp", rev = "12ed8b060b295c06502a2ff8468e4a941cb7cca4", default-features = false, features = ["local-prover"] }
+>>>>>>> ce55dbc74 (changelog: add #4177)
 num256 = "0.3.5"
 num_cpus = "1.13.0"
 num-derive = "0.4"
@@ -200,7 +213,12 @@ toml = "0.5.8"
 tonic = "0.8.3"
 tonic-build = "0.11.0"
 tower = "0.4"
+<<<<<<< HEAD
 tower-abci = "0.16.0"
+=======
+# branch yuji/tendermint-0.38
+tower-abci = { git = "https://github.com/heliaxdev/tower-abci", rev = "30d2a8cdf8321b599ae13ba74f4c78217a64ce58" }
+>>>>>>> ce55dbc74 (changelog: add #4177)
 tracing = "0.1.30"
 tracing-appender = "0.2.2"
 tracing-log = "0.2.0"

diff --git a/README.md b/README.md
@@ -16,7 +16,11 @@ the form of native protocol tokens. A multi-asset shielded transfer
 wallet is provided in order to facilitate safe and private user
 interaction with the protocol.
 
+<<<<<<< HEAD
 * Blogpost: [Introducing Namada: Interchain Asset-agnostic Privacy](https://namada.net/blog/introducing-namada-multichain-asset-agnostic-data-protection)
+=======
+* Blogpost: [Introducing Namada: Interchain Asset-agnostic Privacy](https://blog.namada.net/introducing-namada-interchain-asset-agnostic-privacy/)
+>>>>>>> ce55dbc74 (changelog: add #4177)
 
 ## 📓 Docs
 
@@ -38,10 +42,17 @@ make install
 
 After installation, the main `namada` executable will be available on path.
 
+<<<<<<< HEAD
 To find how to use it, check out the [User Guide section of the docs](https://docs.namada.net/users).
 
 For more detailed instructions and more install options, see the [Install
 section](https://docs.namada.net/introduction/install) of the User
+=======
+To find how to use it, check out the [User Guide section of the docs](https://docs.namada.net/user-guide/index.html).
+
+For more detailed instructions and more install options, see the [Install
+section](https://docs.namada.net/user-guide/install/index.html) of the User
+>>>>>>> ce55dbc74 (changelog: add #4177)
 Guide.
 
 ## ⚙️ Development
@@ -51,7 +62,11 @@ Guide.
 make build-wasm-scripts-docker
 ```
 
+<<<<<<< HEAD
 ### Before submitting a PR, please make sure to run the following
+=======
+### Before submitting a PR, pls make sure to run the following
+>>>>>>> ce55dbc74 (changelog: add #4177)
 
 ```shell
 # Format the code
@@ -71,7 +86,11 @@ To change the log level, set `NAMADA_LOG` environment variable to one of:
 * `debug`
 * `trace`
 
+<<<<<<< HEAD
 The default is set to `info` for all the modules, except for CometBFT ABCI, which has a lot of `debug` logging.
+=======
+The default is set to `info` for all the modules, expect for CometBFT ABCI, which has a lot of `debug` logging.
+>>>>>>> ce55dbc74 (changelog: add #4177)
 
 For more fine-grained logging levels settings, please refer to the [tracing subscriber docs](https://docs.rs/tracing-subscriber/0.2.18/tracing_subscriber/struct.EnvFilter.html#directives) for more information.
 
@@ -83,14 +102,24 @@ Please see the [contributing page](./CONTRIBUTING.md).
 
 ### Dependencies
 
+<<<<<<< HEAD
 The ledger currently requires [CometBFT v0.37.11](https://github.com/cometbft/cometbft/releases/tag/v0.37.11) is installed and available on path. This can be achieved through following [these instructions](https://github.com/cometbft/cometbft/blob/main/docs/tutorials/install.md).
+=======
+The ledger currently requires [CometBFT v0.37.11](https://github.com/cometbft/cometbft/releases/tag/v0.37.11) is installed and available on path. This can be achieved through following [these instructions](https://github.com/cometbft/cometbft/blob/main/docs/tutorials/install.md)
+>>>>>>> ce55dbc74 (changelog: add #4177)
 
 #### Hermes
 
 We maintain a fork of [hermes](https://github.com/heliaxdev/hermes) that adds support for Namada.
 
 Compatibility table with Namada:
 
+<<<<<<< HEAD
 | Namada binaries | Hermes |
 | ----------- | ----------- |
 | v1.0.0 | [1.10.4-namada-beta17-rc2](https://github.com/heliaxdev/hermes/releases/tag/v1.10.4-namada-beta17-rc2) |
+=======
+| Namada | Hermes |
+| ----------- | ----------- |
+| v0.44.0 | 1.10.4-namada-beta17-rc2 |
+>>>>>>> ce55dbc74 (changelog: add #4177)
diff --git a/crates/apps/Cargo.toml b/crates/apps/Cargo.toml
@@ -11,7 +11,11 @@ keywords.workspace = true
 license.workspace = true
 readme.workspace = true
 repository.workspace = true
+<<<<<<< HEAD
 version = "1.0.0"
+=======
+version = "0.46.0"
+>>>>>>> ce55dbc74 (changelog: add #4177)
 
 # Namada CLI that aggregates some common commands for the node and the client
 [[bin]]
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))