Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/rust/clap-4.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitry-Borodin authored May 2, 2024
2 parents cd61a5c + 0673d3f commit 97ad22a
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 44 deletions.
2 changes: 1 addition & 1 deletion docs/src/about/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Transactions content is shown before signing; no hash signing is allowed, but si

#### History feature

The Vault now logs all operations it performs. It it important to remember that this is not log of account operations, but log of device history. This history could be cleared if needed, but not modified by other means. Detected presence of network connection is also logged.
The Vault now logs all operations it performs. It is important to remember that this is not log of account operations, but log of device history. This history could be cleared if needed, but not modified by other means. Detected presence of network connection is also logged.

#### N+1 derivation

Expand Down
82 changes: 48 additions & 34 deletions rust/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 rust/db_handling/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = "1.0.81"
anyhow = "1.0.82"
constants = {path = "../constants"}
defaults = {path = "../defaults", default-features = false, optional = true}
definitions = {path = "../definitions", default-features = false}
Expand All @@ -19,7 +19,7 @@ sled = "0.34.6"
sp-core = {git = "https://github.com/paritytech/substrate", default-features = false, features = ["full_crypto"], optional = true}
sp-runtime = {git = "https://github.com/paritytech/substrate", default-features = false, optional = true}
thiserror = "1.0.57"
time = {version = "0.3.34", features = ["formatting", "macros"]}
time = {version = "0.3.36", features = ["formatting", "macros"]}
tiny-bip39 = {version = "1.0.0", default-features = false, optional = true}
zeroize = { version = "1.7.0", optional = true, features = ["std"] }

Expand Down
4 changes: 2 additions & 2 deletions rust/definitions/src/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ pub struct AddressBookEntry {

#[cfg(feature = "active")]
impl AddressBookEntry {
/// Gets [`AddressBookEntry`] from from hot database tree `ADDRESS_BOOK`
/// Gets [`AddressBookEntry`] from hot database tree `ADDRESS_BOOK`
/// (key, value) entry.
pub fn from_entry(
(address_book_key_encoded, address_book_entry_encoded): (IVec, IVec),
Expand All @@ -470,7 +470,7 @@ impl AddressBookEntry {
}

/// Gets network address book title and [`AddressBookEntry`] as a tuple from
/// from hot database tree `ADDRESS_BOOK` (key, value) entry.
/// hot database tree `ADDRESS_BOOK` (key, value) entry.
///
/// Network address book title **differs** from `title` in network specs.
/// This is just a key in hot database `ADDRESS_BOOK`, and is not displayed
Expand Down
4 changes: 2 additions & 2 deletions rust/generate_message/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@
//!
//! Keys to be used in command line:
//!
//! - Key `--goal` followed by the type to to generate
//! - Key `--goal` followed by the type to generate
//! - `qr` will generate only a png QR code
//! - `text` will generate only text file with hex-encoded update.
//! - default, i.e. if goal is not provided, both QR code and text file are generated.
Expand Down Expand Up @@ -742,7 +742,7 @@
//!
//! Keys to be used in command line:
//!
//! - Key `--goal` followed by the type to to generate
//! - Key `--goal` followed by the type to generate
//! - `qr` will generate only a png QR code
//! - `text` will generate only text file with hex-encoded update.
//! - default, i.e. if goal is not provided, both QR code and text file are generated.
Expand Down
2 changes: 1 addition & 1 deletion rust/qr_reader_pc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2018"
[dependencies]
hex = "0.4.3"
qr_reader_phone = {path = "../qr_reader_phone"}
anyhow = "1.0.81"
anyhow = "1.0.82"
image = "0.24.9"
quircs = "0.10.2"
indicatif = "0.17.8"
Expand Down
2 changes: 1 addition & 1 deletion rust/qrcode_static/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = "1.0.81"
anyhow = "1.0.82"
bitvec = "1.0.1"
constants = {path = "../constants"}
png = "0.17.13"
Expand Down
2 changes: 1 addition & 1 deletion rust/transaction_signing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ db_handling = { path = "../db_handling", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["full_crypto"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false }
thiserror = "1.0.57"
anyhow = "1.0.81"
anyhow = "1.0.82"
sled = "0.34"


Expand Down

0 comments on commit 97ad22a

Please sign in to comment.