Merge branch 'master' into polkadot-v0.9.38

humanode-network · Apr 3, 2023 · d5220fb · d5220fb
2 parents a6322b8 + 4378ae1
commit d5220fb
Show file tree

Hide file tree

Showing 31 changed files with 301 additions and 153 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/author-ext-api/Cargo.toml b/crates/author-ext-api/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
 sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
 

diff --git a/crates/bioauth-flow-api/Cargo.toml b/crates/bioauth-flow-api/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
 sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
 

diff --git a/crates/crypto-utils/src/lib.rs b/crates/crypto-utils/src/lib.rs
@@ -15,12 +15,20 @@ pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Pu
         .public()
 }
 
+/// Generate an account public key from seed.
+pub fn get_account_public_from_seed<TPublic: Public, AccountPublic>(seed: &str) -> AccountPublic
+where
+    AccountPublic: From<<TPublic::Pair as Pair>::Public>,
+{
+    AccountPublic::from(get_from_seed::<TPublic>(seed))
+}
+
 /// Generate an account ID from seed.
 pub fn get_account_id_from_seed<TPublic: Public, AccountPublic, AccountId>(seed: &str) -> AccountId
 where
     AccountPublic: From<<TPublic::Pair as Pair>::Public> + IdentifyAccount<AccountId = AccountId>,
 {
-    AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
+    get_account_public_from_seed::<TPublic, AccountPublic>(seed).into_account()
 }
 
 /// Generate consensus authority keys.

diff --git a/crates/humanode-peer/Cargo.toml b/crates/humanode-peer/Cargo.toml
@@ -22,7 +22,7 @@ robonode-client = { version = "0.1", path = "../robonode-client" }
 
 anyhow = "1"
 async-trait = "0.1"
-bip32 = "0.4.0"
+bip32 = "0.5.0"
 clap = { version = "4.0", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.2.2" }
 fc-cli = { git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.38" }
@@ -82,14 +82,14 @@ sp-panic-handler = { git = "https://github.com/humanode-network/substrate", bran
 sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
 sp-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
 thiserror = "1"
-tiny-bip39 = "0.8"
+tiny-bip39 = "1.0"
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 try-runtime-cli = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38", optional = true }
 url = "2"
 
 [dev-dependencies]
-indoc = "1.0"
+indoc = "2.0"
 sp-io = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
 
 [build-dependencies]