Revert "ci: minors"

This reverts commit 41ef454. (cherry picked from commit 52d0ebb) # Conflicts: # .github/workflows/ci.yml # .github/workflows/scripts/hermes.txt # 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/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 · 834329c · 834329c
1 parent 127dd4b
commit 834329c
Show file tree

Hide file tree

Showing 52 changed files with 3,366 additions and 0 deletions.
diff --git a/.changelog/unreleased/CI/4140-ledger-namada-unit-tests-ci.md b/.changelog/unreleased/CI/4140-ledger-namada-unit-tests-ci.md
@@ -0,0 +1,2 @@
+- Add Ledger app unit tests to the Namada CI.
+  ([\#4140](https://github.com/anoma/namada/pull/4140))
diff --git a/.changelog/unreleased/SDK/4127-masp-for-namadillo.md b/.changelog/unreleased/SDK/4127-masp-for-namadillo.md
@@ -0,0 +1,2 @@
+- Allow MASP transaction building without knowledge of the spend authorization
+  key. ([\#4127](https://github.com/anoma/namada/pull/4127))
diff --git a/.changelog/v1.0.0/miscellaneous/4123-apps-pre-release.md b/.changelog/v1.0.0/miscellaneous/4123-apps-pre-release.md
@@ -0,0 +1,2 @@
+- updated namada libraries to libs-v0.46.1
+  ([\#4123](https://github.com/anoma/namada/pull/4123))
diff --git a/.changelog/v1.0.0/summary.md b/.changelog/v1.0.0/summary.md
@@ -0,0 +1,2 @@
+Namada v1.0.0 is the first stable release of the Namada apps.
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,6 +35,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"
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 
 jobs:
   changelog:
@@ -651,11 +655,20 @@ jobs:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
   test-ledger-app:
     timeout-minutes: 30
     runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
+=======
+  test-ledger-app:
+    timeout-minutes: 30
+    runs-on: [ubuntu-latest]
+
+    env:
+      RUSTC_WRAPPER: ""
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 
     steps:
       - name: Checkout repo
@@ -666,11 +679,14 @@ jobs:
         if: ${{ github.event_name == 'pull_request_target' }}
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+<<<<<<< HEAD
       - name: Configure AWS 
         uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ secrets.AWS_ROLE }}
+=======
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
       - name: Checkout ledger-namada
         run: |
           echo "Using Namada Ledger App version: v${LEDGER_APP_VERSION}"
@@ -680,6 +696,13 @@ jobs:
           git submodule update --init --recursive
           sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
           make deps
+<<<<<<< HEAD
+=======
+      - name: Install rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
       - name: Generate test vectors
         run: |
           # The path where the Ledger app test suite will locate test vectors
@@ -692,7 +715,10 @@ jobs:
           cd ../ledger-namada
           make cpp_test
 
+<<<<<<< HEAD
 >>>>>>> b2e33f943 (Revert "ci/test-ledger-app: skip unnecessary steps")
+=======
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
   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-beta17-rc2
+=======
+1.10.4-namada-beta18-test
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG
 
+<<<<<<< HEAD
+=======
+## v1.0.0
+
+Namada v1.0.0 is the first stable release of the Namada apps.
+
+### MISCELLANEOUS
+
+- updated namada libraries to libs-v0.46.1
+  ([\#4123](https://github.com/anoma/namada/pull/4123))
+
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 ## 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
@@ -134,15 +134,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 = "v0.0.24" }
+=======
+ledger-namada-rs = { git = "https://github.com/Zondax/ledger-namada", tag = "v1.0.5" }
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 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 = "12ed8b060b295c06502a2ff8468e4a941cb7cca4" }
 masp_proofs = { git = "https://github.com/anoma/masp", rev = "12ed8b060b295c06502a2ff8468e4a941cb7cca4", default-features = false, features = ["local-prover"] }
+=======
+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"] }
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 num256 = "0.3.5"
 num_cpus = "1.13.0"
 num-derive = "0.4"

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://blog.namada.net/introducing-namada-interchain-asset-agnostic-privacy/)
+=======
+* Blogpost: [Introducing Namada: Interchain Asset-agnostic Privacy](https://namada.net/blog/introducing-namada-multichain-asset-agnostic-data-protection)
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 
 ## 📓 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/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
+=======
+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
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 Guide.
 
 ## ⚙️ Development
@@ -51,7 +62,11 @@ Guide.
 make build-wasm-scripts-docker
 ```
 
+<<<<<<< HEAD
 ### Before submitting a PR, pls make sure to run the following
+=======
+### Before submitting a PR, please make sure to run the following
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 
 ```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, expect for CometBFT ABCI, which has a lot of `debug` logging.
+=======
+The default is set to `info` for all the modules, except for CometBFT ABCI, which has a lot of `debug` logging.
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 
 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).
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 
 #### Hermes
 
 We maintain a fork of [hermes](https://github.com/heliaxdev/hermes) that adds support for Namada.
 
 Compatibility table with Namada:
 
+<<<<<<< HEAD
 | Namada | Hermes |
 | ----------- | ----------- |
 | v0.44.0 | 1.10.4-namada-beta17-rc2 |
+=======
+| 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) |
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
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 = "0.46.0"
+=======
+version = "1.0.0"
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 
 # Namada CLI that aggregates some common commands for the node and the client
 [[bin]]

diff --git a/crates/apps_lib/src/cli.rs b/crates/apps_lib/src/cli.rs
@@ -3547,6 +3547,10 @@ pub mod args {
             let raw = "http://127.0.0.1:26657";
             Url::from_str(raw).unwrap()
         }));
+<<<<<<< HEAD
+=======
+    pub const LEDGER_ZIP32: ArgFlag = flag("ledger-zip32");
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
     pub const LIST_FIND_ADDRESSES_ONLY: ArgFlag = flag("addr");
     pub const LIST_FIND_KEYS_ONLY: ArgFlag = flag("keys");
     pub const LOCALHOST: ArgFlag = flag("localhost");
@@ -7762,8 +7766,12 @@ pub mod args {
                 find_viewing_key(&mut wallet)
             } else {
                 find_viewing_key(&mut ctx.borrow_mut_chain_or_exit().wallet)
+<<<<<<< HEAD
             }
             .key;
+=======
+            };
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 
             Ok(PayAddressGen::<SdkTypes> {
                 alias: self.alias,
@@ -7811,12 +7819,20 @@ pub mod args {
                 HD_PROMPT_BIP39_PASSPHRASE.parse(matches);
             let use_device = USE_DEVICE.parse(matches);
             let device_transport = DEVICE_TRANSPORT.parse(matches);
+<<<<<<< HEAD
+=======
+            let ledger_zip32 = LEDGER_ZIP32.parse(matches);
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
             Self {
                 scheme,
                 shielded,
                 alias,
                 alias_force,
                 unsafe_dont_encrypt,
+<<<<<<< HEAD
+=======
+                ledger_zip32,
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
                 derivation_path,
                 allow_non_compliant,
                 prompt_bip39_passphrase,
@@ -7887,6 +7903,17 @@ pub mod args {
             .arg(HD_PROMPT_BIP39_PASSPHRASE.def().help(wrap!(
                 "Use an additional passphrase for HD-key generation."
             )))
+<<<<<<< HEAD
+=======
+            .arg(
+                LEDGER_ZIP32.def().requires(SHIELDED.name).help(wrap!(
+                    "Use the modified ZIP 32 algorithm supported by Ledger \
+                     devices. This flag is necessary if importing the \
+                     generated mnemonic code onto the Ledger device at some \
+                     future time is a requirement."
+                )),
+            )
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
         }
     }
 

diff --git a/crates/apps_lib/src/cli/client.rs b/crates/apps_lib/src/cli/client.rs
@@ -3,6 +3,10 @@ use std::io::Read;
 use color_eyre::eyre::Result;
 use namada_sdk::io::{display_line, Io, NamadaIo};
 use namada_sdk::masp::ShieldedContext;
+<<<<<<< HEAD
+=======
+use namada_sdk::wallet::DatedViewingKey;
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
 use namada_sdk::{Namada, NamadaImpl};
 
 use crate::cli;
@@ -349,8 +353,21 @@ impl CliApi {
                             chain_ctx
                                 .wallet
                                 .get_viewing_keys()
+<<<<<<< HEAD
                                 .values()
                                 .copied(),
+=======
+                                .into_iter()
+                                .map(|(k, v)| {
+                                    DatedViewingKey::new(
+                                        v,
+                                        chain_ctx
+                                            .wallet
+                                            .find_birthday(k)
+                                            .copied(),
+                                    )
+                                }),
+>>>>>>> 52d0ebbd7c (Revert "ci: minors")
                         );
 
                         crate::client::masp::syncing(
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))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Allow MASP transaction building without knowledge of the spend authorization
		key. ([\#4127](https://github.com/anoma/namada/pull/4127))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- updated namada libraries to libs-v0.46.1
		([\#4123](https://github.com/anoma/namada/pull/4123))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Namada v1.0.0 is the first stable release of the Namada apps.