logos-blockchain/lssa-zkvm-testing
1
0
Fork 0
mirror of https://github.com/logos-blockchain/lssa-zkvm-testing.git synced 2026-01-07 15:53:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed conflict paragraph

Browse Source
This commit is contained in:
Moudy 2025-08-16 13:01:35 +02:00
parent e0fa74c890
commit 4333bb66a7
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shake256-33bytes-demo/methods/guest/src/main.rs
View File

@ -70,21 +70,14 @@ mod crypto {
out_index: u32, out_index: u32,
) -> [u8; 32] { ) -> [u8; 32] {
let mut hasher = Sha256::new(); let mut hasher = Sha256::new();
<<<<<<< HEAD
hasher.update( b"NSSA/v0.1/KDF-SHA256");
sha2::Digest::update(&mut hasher, &ss_bytes);
sha2::Digest::update(&mut hasher, &epk[..]);
sha2::Digest::update(&mut hasher, &ipk[..]);
sha2::Digest::update(&mut hasher, &commitment[..]);
sha2::Digest::update(&mut hasher, &out_index.to_le_bytes());
=======
hasher.update(b"NSSA/v0.1/KDF-SHA256"); hasher.update(b"NSSA/v0.1/KDF-SHA256");
hasher.update(&ss_bytes); hasher.update(&ss_bytes);
hasher.update(&epk[..]); hasher.update(&epk[..]);
hasher.update(&ipk[..]); hasher.update(&ipk[..]);
hasher.update(&commitment[..]); hasher.update(&commitment[..]);
hasher.update(&out_index.to_le_bytes()); hasher.update(&out_index.to_le_bytes());
>>>>>>> 998382a (fixes)
hasher.finalize().into() hasher.finalize().into()
} }