Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
fix: Replace package from hp-io to sp-io for ecdsa verification
Browse files Browse the repository at this point in the history
  • Loading branch information
@code0xff
code0xff committed Sep 15, 2024
1 parent f8411cd commit 941e550
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 15 deletions.
8 changes: 6 additions & 2 deletions frame/cosmos/x/auth/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@ ripemd = { workspace = true, default-features = false }
frame-support = { workspace = true, default-features = false }
frame-system = { workspace = true, default-features = false }
sp-core = { workspace = true, default-features = false }
sp-io = { workspace = true, default-features = false }
sp-runtime = { workspace = true, default-features = false }

hp-io = { workspace = true, default-features = false }
pallet-cosmos = { workspace = true, default-features = false }
pallet-cosmos-types = { workspace = true, default-features = false }
pallet-cosmos-x-auth-signing = { workspace = true, default-features = false }

[dev-dependencies]
hex = { workspace = true, default-features = false }

[features]
default = ["std"]
std = [
Expand All @@ -30,9 +33,10 @@ std = [
"frame-system/std",
"frame-support/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std",
"hp-io/std",
"pallet-cosmos/std",
"pallet-cosmos-types/std",
"pallet-cosmos-x-auth-signing/std",
"hex/std",
]
16 changes: 8 additions & 8 deletions frame/cosmos/x/auth/signing/src/sign_mode_handler/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ mod tests {

#[test]
fn get_sign_bytes_test() {
let tx_raw = "CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLWNvc21vczFxZDY5bnV3ajk1Z3RhNGFramd5eHRqOXVqbXo0dzhlZG1xeXNxdxItY29zbW9zMWdtajJleGFnMDN0dGdhZnBya2RjM3Q4ODBncm1hOW53ZWZjZDJ3GhAKBXVhdG9tEgcxMDAwMDAwEnEKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQIKEJE0H+VmS/oXgtXgR3lokGjJFrBMs2XsMVN1VoTZoRIECgIIARIfChUKBXVhdG9tEgw4ODY4ODAwMDAwMDAQgMDxxZSVFBpA9+DRmMYoIcxYF8jpNfUjMIMB4pgZ9diC8ySbnhc6YU84AA3b/0RsCr+nx9AZ27FwcrKJM/yBh8lz+/A9BFn3bg==";
let tx_bytes = "CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLWNvc21vczFxZDY5bnV3ajk1Z3RhNGFramd5eHRqOXVqbXo0dzhlZG1xeXNxdxItY29zbW9zMWdtajJleGFnMDN0dGdhZnBya2RjM3Q4ODBncm1hOW53ZWZjZDJ3GhAKBXVhdG9tEgcxMDAwMDAwEnEKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQIKEJE0H+VmS/oXgtXgR3lokGjJFrBMs2XsMVN1VoTZoRIECgIIARIfChUKBXVhdG9tEgw4ODY4ODAwMDAwMDAQgMDxxZSVFBpA9+DRmMYoIcxYF8jpNfUjMIMB4pgZ9diC8ySbnhc6YU84AA3b/0RsCr+nx9AZ27FwcrKJM/yBh8lz+/A9BFn3bg==";

let tx_raw = Base64::decode_vec(&tx_raw).unwrap();
let tx = Tx::decode(&mut &*tx_raw).unwrap();
let tx_bytes = Base64::decode_vec(&tx_bytes).unwrap();
let tx = Tx::decode(&mut &*tx_bytes).unwrap();

let public_key = tx
.auth_info
Expand All @@ -175,18 +175,18 @@ mod tests {
};
let expected_hash = sha2_256(&SignModeHandler::get_sign_bytes(&mode, &data, &tx).unwrap());

let sign_doc_raw =
let sign_doc_bytes =
"CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLWNvc21vczFxZDY5bnV3ajk1Z3RhNGFramd5eHRqOXVqbXo0dzhlZG1xeXNxdxItY29zbW9zMWdtajJleGFnMDN0dGdhZnBya2RjM3Q4ODBncm1hOW53ZWZjZDJ3GhAKBXVhdG9tEgcxMDAwMDAwEnEKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQIKEJE0H+VmS/oXgtXgR3lokGjJFrBMs2XsMVN1VoTZoRIECgIIARIfChUKBXVhdG9tEgw4ODY4ODAwMDAwMDAQgMDxxZSVFBoRdGhldGEtdGVzdG5ldC0wMDEgrYou";
let hash = sha2_256(&Base64::decode_vec(&sign_doc_raw).unwrap());
let hash = sha2_256(&Base64::decode_vec(&sign_doc_bytes).unwrap());

assert_eq!(expected_hash, hash);
}

#[test]
fn get_std_sign_bytes_test() {
let tx_raw = "CpoBCpcBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEncKLWNvc21vczFxZDY5bnV3ajk1Z3RhNGFramd5eHRqOXVqbXo0dzhlZG1xeXNxdxItY29zbW9zMW41amd4NjR6dzM4c3M3Nm16dXU0dWM3amV5cXcydmZqazYwZmR6GhcKBGFjZHQSDzEwMDAwMDAwMDAwMDAwMBJsCk4KRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECChCRNB/lZkv6F4LV4Ed5aJBoyRawTLNl7DFTdVaE2aESBAoCCH8SGgoSCgRhY2R0EgoxMDQwMDAwMDAwEIDa8esEGkBgXIiPoBpecG7QpKDJPaztFogqvmxjDHF5ORfWBrOoSzf0+AAmch1CXrG4OmiKL0y8v9ITx0QzWYUc7ueXcdIm";
let tx_raw = Base64::decode_vec(tx_raw).unwrap();
let tx = Tx::decode(&mut &*tx_raw).unwrap();
let tx_bytes = "CpoBCpcBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEncKLWNvc21vczFxZDY5bnV3ajk1Z3RhNGFramd5eHRqOXVqbXo0dzhlZG1xeXNxdxItY29zbW9zMW41amd4NjR6dzM4c3M3Nm16dXU0dWM3amV5cXcydmZqazYwZmR6GhcKBGFjZHQSDzEwMDAwMDAwMDAwMDAwMBJsCk4KRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECChCRNB/lZkv6F4LV4Ed5aJBoyRawTLNl7DFTdVaE2aESBAoCCH8SGgoSCgRhY2R0EgoxMDQwMDAwMDAwEIDa8esEGkBgXIiPoBpecG7QpKDJPaztFogqvmxjDHF5ORfWBrOoSzf0+AAmch1CXrG4OmiKL0y8v9ITx0QzWYUc7ueXcdIm";
let tx_bytes = Base64::decode_vec(tx_bytes).unwrap();
let tx = Tx::decode(&mut &*tx_bytes).unwrap();

let public_key = tx
.auth_info
Expand Down
52 changes: 47 additions & 5 deletions frame/cosmos/x/auth/src/sigverify.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,14 @@ use cosmos_sdk_proto::{
prost::Message,
Any,
};
use hp_io::cosmos::secp256k1_ecdsa_verify;
use pallet_cosmos::AddressMapping;
use pallet_cosmos_types::{address::acc_address_from_bech32, any_match, handler::AnteDecorator};
use pallet_cosmos_x_auth_signing::{
sign_mode_handler::{traits::SignModeHandler, SignerData},
sign_verifiable_tx::traits::SigVerifiableTx,
};
use ripemd::Digest;
use sp_core::{sha2_256, Get, H160};
use sp_core::{ecdsa, sha2_256, ByteArray, Get, H160};
use sp_runtime::{
transaction_validity::{
InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction,
Expand Down Expand Up @@ -129,19 +128,17 @@ where
acc_address_from_bech32(&signer_data.address).map_err(|_| {
InvalidTransaction::BadSigner
})?;

if signer_addr_raw.len() != 20 {
return Err(InvalidTransaction::BadSigner.into());
}

if H160::from_slice(&signer_addr_raw) != address {
return Err(InvalidTransaction::BadSigner.into());
}

let sign_bytes = T::SignModeHandler::get_sign_bytes(sign_mode, signer_data, tx)
.map_err(|_| InvalidTransaction::Call)?;

if !secp256k1_ecdsa_verify(signature, &sha2_256(&sign_bytes), &public_key.key) {
if !ecdsa_verify(signature, &sign_bytes, &public_key.key) {
return Err(InvalidTransaction::BadProof.into());
}

Expand All @@ -153,6 +150,51 @@ where
}
}

pub fn ecdsa_verify(signature: &[u8], message: &[u8], public_key: &[u8]) -> bool {
let pub_key = match ecdsa::Public::from_slice(public_key) {
Ok(pub_key) => pub_key,
Err(_) => return false,
};
let msg = sha2_256(message);

if signature.len() == 64 {
for rec_id in 0..=3 {
let mut rec_sig = [0u8; 65];
rec_sig[0..signature.len()].copy_from_slice(signature);
rec_sig[64] = rec_id;
let sig = ecdsa::Signature(rec_sig);

if sp_io::crypto::ecdsa_verify_prehashed(&sig, &msg, &pub_key) {
return true;
}
}
false
} else if signature.len() == 65 {
match ecdsa::Signature::try_from(signature) {
Ok(sig) => sp_io::crypto::ecdsa_verify_prehashed(&sig, &msg, &pub_key),
Err(_) => false,
}
} else {
false
}
}

#[cfg(test)]
pub mod tests {
use super::*;

#[test]
fn ecdsa_verify_test() {
let sig = hex::decode("f7e0d198c62821cc5817c8e935f523308301e29819f5d882f3249b9e173a614f38000ddbff446c0abfa7c7d019dbb17072b28933fc8187c973fbf03d0459f76e").unwrap();
let message = hex::decode("0a93010a90010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412700a2d636f736d6f7331716436396e75776a393567746134616b6a677978746a39756a6d7a34773865646d7179737177122d636f736d6f7331676d6a32657861673033747467616670726b6463337438383067726d61396e776566636432771a100a057561746f6d12073130303030303012710a4e0a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a21020a1091341fe5664bfa1782d5e04779689068c916b04cb365ec3153755684d9a112040a020801121f0a150a057561746f6d120c3838363838303030303030301080c0f1c59495141a1174686574612d746573746e65742d30303120ad8a2e").unwrap();
let public_key =
hex::decode("020a1091341fe5664bfa1782d5e04779689068c916b04cb365ec3153755684d9a1")
.unwrap();

assert!(ecdsa_verify(&sig, &message, &public_key));
}
}

pub struct ValidateSigCountDecorator<T>(core::marker::PhantomData<T>);

impl<T> AnteDecorator for ValidateSigCountDecorator<T>
Expand Down

0 comments on commit 941e550

Please sign in to comment.