Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions core/crates/gem_cardano/src/address.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use bech32::{Bech32, primitives::decode::CheckedHrpstring};
use primitives::SignerError;

const ADDRESS_HRP: &str = "addr";
Expand All @@ -18,12 +19,13 @@ pub(crate) struct ShelleyAddress {

impl ShelleyAddress {
pub(crate) fn parse(address: &str) -> Result<Self, SignerError> {
let (hrp, bytes) = bech32::decode(address).map_err(|_| SignerError::invalid_input("invalid Cardano address"))?;
if hrp.as_str() != ADDRESS_HRP {
let decoded = CheckedHrpstring::new::<Bech32>(address).map_err(|_| SignerError::invalid_input("invalid Cardano address"))?;
if decoded.hrp().as_str() != ADDRESS_HRP {
return SignerError::invalid_input_err("unsupported Cardano address network");
}
decoded.validate_segwit_padding().map_err(|_| SignerError::invalid_input("invalid Cardano address"))?;

Self::from_bytes(bytes)
Self::from_bytes(decoded.byte_iter().collect())
}

pub(crate) fn as_bytes(&self) -> &[u8] {
Expand Down Expand Up @@ -110,6 +112,7 @@ mod tests {
#[test]
fn test_shelley_address_rejects_unsupported() {
assert!(ShelleyAddress::parse("stake1uykptcz226y5r5at5rfqqm00p9n0z0yfajz3gk3j3wm8dxg2sn0r4").is_err());
assert!(ShelleyAddress::parse("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zd3efkrhr").is_err());
assert!(ShelleyAddress::parse("addr_test1qr4p6f6mm0q9kfyyd9u30umk9cc6gk0nxu25k5rsc4fp7ls7k0qqxslcwwj4gvn4yfmdyrfgwjt3ztuz4zpy4242u0m95r0n").is_err());
}
}
10 changes: 7 additions & 3 deletions core/crates/gem_cosmos/src/address.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use bech32::hrp::Hrp;
use bech32::{Bech32, hrp::Hrp, primitives::decode::CheckedHrpstring};
use primitives::chain_cosmos::CosmosChain;
use primitives::{Address as AddressTrait, Chain};
use std::error::Error;
Expand Down Expand Up @@ -34,8 +34,10 @@ impl CosmosAddress {

impl AddressTrait for CosmosAddress {
fn try_parse(address: &str) -> Option<Self> {
let (hrp, bytes) = bech32::decode(address).ok()?;
let hrp = hrp.as_str().to_string();
let decoded = CheckedHrpstring::new::<Bech32>(address).ok()?;
decoded.validate_segwit_padding().ok()?;
let hrp = decoded.hrp().as_str().to_string();
let bytes = decoded.byte_iter().collect::<Vec<_>>();
(CosmosChain::all().any(|chain| chain.hrp() == hrp) && bytes.len() == 20).then_some(Self { hrp, bytes })
}

Expand Down Expand Up @@ -81,6 +83,8 @@ mod tests {
assert_eq!(parsed.encode(), address);
assert!(!CosmosAddress::is_valid_for_chain(address, Chain::Osmosis));
assert!(!CosmosAddress::is_valid_for_chain("invalid", Chain::Cosmos));
assert!(!CosmosAddress::is_valid_for_chain("cosmos1h3laqcrmul79zwtw6j63ncsl0adfj07wqz4qndu", Chain::Cosmos));
assert!(!CosmosAddress::is_valid_for_chain("cosmos1h3laqcrmul79zwtw6j63ncsl0adfj07waq3g6s", Chain::Cosmos));
}

#[test]
Expand Down
Loading