Skip to content

Commit

Permalink
Change the Hermes branch used by the CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
murisi committed Dec 3, 2024
1 parent 42b0ac3 commit d681a15
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scripts/hermes.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.4-namada-beta17-rc2
1.10.4-namada-3797
7 changes: 3 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ libc = "0.2.97"
libloading = "0.7.2"
linkme = "0.3.24"
# branch = "tomas/arbitrary"
masp_primitives = { git = "https://github.com/anoma/masp", rev = "2914e6ff9a922bae8f1cb63a79d796a69af3d8aa" }
masp_proofs = { git = "https://github.com/anoma/masp", rev = "2914e6ff9a922bae8f1cb63a79d796a69af3d8aa", 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"] }
num256 = "0.3.5"
num_cpus = "1.13.0"
num-derive = "0.4"
Expand Down
1 change: 0 additions & 1 deletion crates/apps_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ fd-lock.workspace = true
flate2.workspace = true
futures.workspace = true
itertools.workspace = true
jubjub.workspace = true
kdam.workspace = true
lazy_static = { workspace = true, optional = true }
linkme = { workspace = true, optional = true }
Expand Down
6 changes: 3 additions & 3 deletions crates/core/src/masp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -553,23 +553,23 @@ impl TransferSource {
}
}

/// Get the contained ExtendedSpendingKey contained, if any
/// Get the contained extended key, if any
pub fn spending_key(&self) -> Option<PseudoExtendedKey> {
match self {
Self::ExtendedKey(x) => Some(*x),
_ => None,
}
}

/// Get the contained ExtendedSpendingKey contained, if any
/// Get the contained extended key, if any
pub fn spending_key_mut(&mut self) -> Option<&mut PseudoExtendedKey> {
match self {
Self::ExtendedKey(x) => Some(x),
_ => None,
}
}

/// Get the contained Address, if any
/// Get the contained transparent address, if any
pub fn address(&self) -> Option<Address> {
match self {
Self::Address(x) => Some(x.clone()),
Expand Down
6 changes: 3 additions & 3 deletions wasm/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions wasm_for_tests/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d681a15

Please sign in to comment.