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.

Sign up for GitHub

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

feat: derive ephem_msk in the lib #21

Merged
merged 2 commits into from
Oct 14, 2024
Merged

feat: derive ephem_msk in the lib #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14f571e
feat: derive ephem_msk in the lib
juangirini Oct 11, 2024
8dde149
chore: add docs to murmur errors
juangirini Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ rand_chacha = { version = "0.3.1" }

[dev-dependencies]
rand_core = { version = "0.6.4", features = ["getrandom"], default-features = false }
hkdf = "0.12.4"

[features]
default = ["client"]
Expand Down
29 changes: 24 additions & 5 deletions core/src/murmur.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ use w3f_bls::{DoublePublicKey, EngineBLS};
/// Error types for murmur wallet usage
#[derive(Debug, PartialEq)]
pub enum Error {
/// An error occurred when executing a call
ExecuteError,
/// An error occurred when creating a murmur wallet
MMRError,
InconsistentStore,
/// No leaf could be identified in the MMR at the specified position
Expand All @@ -60,6 +62,8 @@ pub enum Error {
InvalidSeed,
/// The public key was invalid (could not be decoded)
InvalidPubkey,
/// The key derivation failed
KeyDerivationFailed,
}

/// The murmur store contains minimal data required to use a murmur wallet
Expand Down Expand Up @@ -271,10 +275,13 @@ mod tests {
keypair.public.0,
);

let ephem_msk = [1; 32];
let seed = vec![1, 2, 3];
let schedule = vec![1, 2, 3];

let hk = hkdf::Hkdf::<sha3::Sha3_256>::new(None, &seed);
let mut ephem_msk = [0u8; 32];
hk.expand(b"ephemeral key", &mut ephem_msk).unwrap();

let murmur_store = MurmurStore::new::<TinyBLS377, DummyIdBuilder>(
seed.clone(),
schedule.clone(),
Expand All @@ -295,14 +302,17 @@ mod tests {
keypair.public.0,
);

let ephem_msk = [1; 32];
let seed = vec![1, 2, 3];
let schedule = vec![
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
];

let aux_data = vec![2, 3, 4, 5];

let hk = hkdf::Hkdf::<sha3::Sha3_256>::new(None, &seed);
let mut ephem_msk = [0u8; 32];
hk.expand(b"ephemeral key", &mut ephem_msk).unwrap();

let murmur_store = MurmurStore::new::<TinyBLS377, DummyIdBuilder>(
seed.clone(),
schedule.clone(),
Expand Down Expand Up @@ -349,12 +359,15 @@ mod tests {
keypair.public.0,
);

let ephem_msk = [1; 32];
let seed = vec![1, 2, 3];
let schedule = vec![1, 2, 3, 4, 5];

let aux_data = vec![2, 3, 4, 5];

let hk = hkdf::Hkdf::<sha3::Sha3_256>::new(None, &seed);
let mut ephem_msk = [0u8; 32];
hk.expand(b"ephemeral key", &mut ephem_msk).unwrap();

let murmur_store = MurmurStore::new::<TinyBLS377, DummyIdBuilder>(
seed.clone(),
schedule.clone(),
Expand All @@ -381,12 +394,15 @@ mod tests {
keypair.public.0,
);

let ephem_msk = [1; 32];
let seed = vec![1, 2, 3];
let schedule = vec![1, 2, 3];

let aux_data = vec![2, 3, 4, 5];

let hk = hkdf::Hkdf::<sha3::Sha3_256>::new(None, &seed);
let mut ephem_msk = [0u8; 32];
hk.expand(b"ephemeral key", &mut ephem_msk).unwrap();

let murmur_store = MurmurStore::new::<TinyBLS377, DummyIdBuilder>(
seed.clone(),
schedule.clone(),
Expand Down Expand Up @@ -432,13 +448,16 @@ mod tests {
keypair.public.0,
);

let ephem_msk = [1; 32];
let seed = vec![1, 2, 3];
let schedule = vec![1, 2, 3];
let other_schedule = vec![1, 2, 3, 4, 5];

let aux_data = vec![2, 3, 4, 5];

let hk = hkdf::Hkdf::<sha3::Sha3_256>::new(None, &seed);
let mut ephem_msk = [0u8; 32];
hk.expand(b"ephemeral key", &mut ephem_msk).unwrap();

let murmur_store = MurmurStore::new::<TinyBLS377, DummyIdBuilder>(
seed.clone(),
schedule.clone(),
Expand Down
3 changes: 2 additions & 1 deletion lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ ark-serialize = "0.4.0"
w3f-bls = "0.1.3"
murmur-core = { path = "../core/", features = ["client"] }
zeroize = "1.8.1"
hkdf = "0.12.4"


[dev-dependencies]
murmur-test-utils = { path = "../test-utils/" }
murmur-test-utils = { path = "../test-utils/" }
2 changes: 0 additions & 2 deletions lib/src/bin/murmur/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ pub const MMR_STORE_FILEPATH: &str = "mmr_store";
async fn main() -> Result<(), Box<dyn std::error::Error>> {
let cli = Cli::parse();
let before = Instant::now();
let ephem_msk = [1; 32];

let (client, current_block_number, round_pubkey_bytes) = idn_connect().await?;

Expand All @@ -105,7 +104,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// 2. create mmr
let create_data = create(
args.seed.as_bytes().to_vec(),
ephem_msk,
schedule,
round_pubkey_bytes,
)
Expand Down
18 changes: 12 additions & 6 deletions lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

use beefy::{known_payloads, Commitment, Payload};
use hkdf::Hkdf;
use murmur_core::types::{Identity, IdentityBuilder};
use serde::Serialize;
use subxt::{
Expand Down Expand Up @@ -74,16 +75,20 @@ pub struct ProxyData {
/// Create a new MMR and return the data needed to build a valid call for creating a murmur wallet.
///
/// * `seed`: The seed used to generate otp codes
/// * `ephem_msk`: An ephemeral secret key TODO: replace with an hkdf?
/// * `block_schedule`: A list of block numbers when the wallet will be executable
/// * `round_pubkey_bytes`: The Ideal Network randomness beacon public key
///
pub fn create(
mut seed: Vec<u8>,
mut ephem_msk: [u8; 32],
block_schedule: Vec<BlockNumber>,
round_pubkey_bytes: Vec<u8>,
) -> Result<CreateData, Error> {
// Derive ephem_msk from seed using HKDF
let hk = Hkdf::<sha3::Sha3_256>::new(None, &seed);
let mut ephem_msk = [0u8; 32];
hk.expand(b"ephemeral key", &mut ephem_msk)
.map_err(|_| Error::KeyDerivationFailed)?;

let round_pubkey = DoublePublicKey::<TinyBLS377>::from_bytes(&round_pubkey_bytes)
.map_err(|_| Error::InvalidPubkey)?;
let mmr_store = MurmurStore::new::<TinyBLS377, BasicIdBuilder>(
Expand Down Expand Up @@ -185,17 +190,19 @@ mod tests {
#[test]
pub fn it_can_create_an_mmr_store() {
let seed = b"seed".to_vec();
let ephem_msk = [1; 32];
let block_schedule = vec![1, 2, 3, 4, 5, 6, 7];
let double_public_bytes = murmur_test_utils::get_dummy_beacon_pubkey();
let create_data = create(
seed.clone(),
ephem_msk,
block_schedule.clone(),
double_public_bytes.clone(),
)
.unwrap();

let hk = Hkdf::<sha3::Sha3_256>::new(None, &seed);
let mut ephem_msk = [0u8; 32];
hk.expand(b"ephemeral key", &mut ephem_msk).unwrap();

let mmr_store = MurmurStore::new::<TinyBLS377, BasicIdBuilder>(
seed,
block_schedule,
Expand All @@ -211,11 +218,10 @@ mod tests {
#[test]
pub fn it_can_prepare_valid_execution_call_data() {
let seed = b"seed".to_vec();
let ephem_msk = [1; 32];
let block_schedule = vec![1, 2, 3, 4, 5, 6, 7];
let double_public_bytes = murmur_test_utils::get_dummy_beacon_pubkey();
let create_data =
create(seed.clone(), ephem_msk, block_schedule, double_public_bytes).unwrap();
create(seed.clone(), block_schedule, double_public_bytes).unwrap();

let bob = subxt_signer::sr25519::dev::bob().public_key();
let balance_transfer_call =
Expand Down