accountant: review comments

This commit is contained in:
Conor Patrick 2023-02-24 16:09:54 +00:00
parent 7c5bdb1863
commit a64e4717de
3 changed files with 6 additions and 7 deletions

View File

@ -5,7 +5,7 @@ authors = ["Wormhole Project Contributors"]
edition = "2021"
[features]
fake = ["dep:cw-multi-test", "dep:k256"]
fake = ["dep:cw-multi-test", "dep:k256", "dep:serde_wormhole"]
[dependencies]
anyhow = "1"
@ -13,7 +13,7 @@ cosmwasm-schema = "1"
cosmwasm-std = "1"
schemars = "0.8.8"
serde = { version = "1.0.137", default-features = false, features = ["derive"] }
serde_wormhole = "0.1.0"
serde_wormhole = { version = "0.1.0", optional = true }
cw-multi-test = { version = "0.13.2", optional = true }
k256 = { version = "0.9.4", optional = true, features = ["ecdsa", "keccak256"] }
wormhole-core = "0.1.0"

View File

@ -1,4 +1,3 @@
// use core::slice::SlicePattern;
use std::{cell::RefCell, collections::BTreeSet, fmt::Debug, rc::Rc};
use anyhow::{anyhow, bail, ensure, Context};
@ -92,7 +91,7 @@ impl WormholeKeeper {
.guardians
.iter()
.map(|g| {
let sig: recoverable::Signature = g.sign(&msg);
let sig: recoverable::Signature = g.sign(msg);
sig.as_ref().try_into().unwrap()
})
.enumerate()
@ -104,7 +103,7 @@ impl WormholeKeeper {
}
pub fn verify_vaa(&self, vaa: &[u8], block_time: u64) -> anyhow::Result<Empty> {
let (header, data) = serde_wormhole::from_slice::<(Header, &RawMessage)>(&vaa)
let (header, data) = serde_wormhole::from_slice::<(Header, &RawMessage)>(vaa)
.context("failed to parse VAA header")?;
let mut signers = BTreeSet::new();

View File

@ -668,12 +668,12 @@ func DeprecatedSigningDigest(bz []byte) common.Hash {
// MessageSigningDigest returns the hash of the data prepended with it's signing prefix.
// This is intending to be used for signing messages of different types from VAA's.
// The message prefix help protect from message collisions.
// The message prefix helps protect from message collisions.
func MessageSigningDigest(prefix []byte, data []byte) (common.Hash, error) {
if len(prefix) < 32 {
// Prefixes must be at least 32 bytes
// https://github.com/wormhole-foundation/wormhole/blob/main/whitepapers/0009_guardian_key.md
return common.Hash([32]byte{}), errors.New("prefix must be atleast 32 bytes")
return common.Hash([32]byte{}), errors.New("prefix must be at least 32 bytes")
}
return crypto.Keccak256Hash(prefix[:], data), nil
}