Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Murisi/masp for namadillo (backport #4127) #4167

Closed
wants to merge 18 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2024

Describe your changes

Essentially #3797, but with MASP hardware wallet integration disabled. Hardware wallet integration was disabled because (modified) ZIP 32 derivations are not yet supported by the device. Despite this, this PR is still useful because it separates MASP transaction building from MASP transaction signing, which is required for securely implementing MASP transactions on Namadillo.

Checklist before merging

  • If this PR has some consensus breaking changes, I added the corresponding breaking:: labels
    • This will require 2 reviewers to approve the changes
  • If this PR requires changes to the docs or specs, a corresponding PR is opened in the namada-docs repo
    • Relevant PR if applies:
  • If this PR affects services such as namada-indexer or namada-masp-indexer, a corresponding PR is opened in that repo
    • Relevant PR if applies:

This is an automatic backport of pull request #4127 done by [Mergify](https://mergify.com).

murisi and others added 18 commits December 11, 2024 13:32
(cherry picked from commit 44c5f03)

# Conflicts:
#	crates/apps_lib/src/client/tx.rs
…sure removal of MASP Builder data.

(cherry picked from commit 381531b)
…eters cannot be reused. Fixed MASP integration tests depending on access to secret keys.

(cherry picked from commit 3e72fe1)
…sis files.

(cherry picked from commit e59aaf6)

# Conflicts:
#	crates/apps_lib/src/client/tx.rs
… MASP hardware wallet integration functionality is triggered.

(cherry picked from commit bec57d6)

# Conflicts:
#	crates/apps_lib/src/client/tx.rs
(cherry picked from commit 49a4a5d)
@mergify mergify bot added the conflicts label Dec 11, 2024
Copy link
Contributor Author

mergify bot commented Dec 11, 2024

Cherry-pick of 44c5f03 has failed:

On branch mergify/bp/maint-libs-0.46/pr-4127
Your branch is up to date with 'origin/maint-libs-0.46'.

You are currently cherry-picking commit 44c5f039a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.lock
	modified:   Cargo.toml
	modified:   crates/apps_lib/Cargo.toml
	modified:   crates/apps_lib/src/cli/context.rs
	modified:   crates/apps_lib/src/cli/wallet.rs
	modified:   crates/apps_lib/src/config/genesis/transactions.rs
	modified:   crates/benches/native_vps.rs
	modified:   crates/core/src/masp.rs
	modified:   crates/node/src/bench_utils.rs
	modified:   crates/sdk/src/args.rs
	modified:   crates/sdk/src/lib.rs
	modified:   crates/sdk/src/signing.rs
	modified:   crates/sdk/src/tx.rs
	modified:   crates/shielded_token/src/masp.rs
	modified:   crates/shielded_token/src/masp/shielded_wallet.rs
	modified:   crates/shielded_token/src/validation.rs
	modified:   crates/tests/src/integration/masp.rs
	modified:   crates/token/src/lib.rs
	modified:   crates/tx/src/types.rs
	modified:   crates/wallet/src/lib.rs
	modified:   crates/wallet/src/store.rs
	modified:   wasm/Cargo.lock
	modified:   wasm_for_tests/Cargo.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   crates/apps_lib/src/client/tx.rs

Cherry-pick of e59aaf6 has failed:

On branch mergify/bp/maint-libs-0.46/pr-4127
Your branch is ahead of 'origin/maint-libs-0.46' by 11 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e59aaf6ea.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   crates/core/src/masp.rs
	modified:   crates/node/src/shell/testing/client.rs
	modified:   crates/sdk/src/signing.rs
	modified:   crates/sdk/src/tx.rs
	modified:   crates/shielded_token/src/masp/shielded_wallet.rs
	modified:   crates/tests/src/e2e/helpers.rs
	modified:   crates/tests/src/e2e/ibc_tests.rs
	modified:   crates/tests/src/e2e/ledger_tests.rs
	modified:   crates/tests/src/e2e/setup.rs
	modified:   crates/tests/src/integration/helpers.rs
	modified:   crates/tests/src/integration/ledger_tests.rs
	modified:   crates/tests/src/integration/masp.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   crates/apps_lib/src/client/tx.rs

Cherry-pick of bec57d6 has failed:

On branch mergify/bp/maint-libs-0.46/pr-4127
Your branch is ahead of 'origin/maint-libs-0.46' by 14 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bec57d6eb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.lock
	modified:   Cargo.toml
	modified:   crates/apps_lib/src/cli/wallet.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   crates/apps_lib/src/client/tx.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@tzemanovic tzemanovic closed this Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants