Skip to content
This repository was archived by the owner on Jun 1, 2026. It is now read-only.

Commit 5c8f724

Browse files
authored
Refactor chain address validation (#1105)
1 parent 7f6e7ae commit 5c8f724

37 files changed

Lines changed: 503 additions & 104 deletions

File tree

‎crates/gem_algorand/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = { workspace = true }
66
[features]
77
default = []
88
rpc = ["dep:chrono", "dep:chain_traits", "dep:gem_client"]
9-
signer = ["dep:gem_hash", "dep:hex", "dep:num-traits", "dep:signer"]
9+
signer = ["dep:hex", "dep:num-traits"]
1010
reqwest = ["gem_client/reqwest"]
1111
chain_integration_tests = ["rpc", "reqwest", "settings/testkit"]
1212

@@ -23,9 +23,9 @@ chrono = { workspace = true, optional = true }
2323
primitives = { path = "../primitives" }
2424
chain_traits = { path = "../chain_traits", optional = true }
2525
gem_client = { path = "../gem_client", optional = true }
26-
gem_hash = { path = "../gem_hash", optional = true }
26+
gem_hash = { path = "../gem_hash" }
2727
hex = { workspace = true, optional = true }
28-
signer = { path = "../signer", optional = true }
28+
signer = { path = "../signer" }
2929

3030
[dev-dependencies]
3131
tokio = { workspace = true, features = ["macros", "rt"] }

‎crates/gem_algorand/src/address.rs‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ impl Address for AlgorandAddress {
3434
}
3535
}
3636

37+
pub fn validate_address(address: &str) -> bool {
38+
AlgorandAddress::is_valid(address)
39+
}
40+
3741
impl AlgorandAddress {
3842
fn checksum(bytes: &[u8; 32]) -> [u8; ADDRESS_CHECKSUM_LENGTH] {
3943
let digest = sha512_256(bytes);
@@ -53,15 +57,19 @@ impl fmt::Display for AlgorandAddress {
5357
mod tests {
5458
use super::*;
5559

60+
const VALID_ADDRESS: &str = "QKDS2YGDHDFZFAAGA4HAF3AJIKW5ZN46P66QDR3ELCXKKJUJTPJSXVHNQU";
61+
5662
#[test]
5763
fn test_algorand_address() {
58-
assert!(AlgorandAddress::is_valid("QKDS2YGDHDFZFAAGA4HAF3AJIKW5ZN46P66QDR3ELCXKKJUJTPJSXVHNQU"));
59-
assert!(!AlgorandAddress::is_valid(""));
60-
assert!(!AlgorandAddress::is_valid("invalid"));
61-
assert!(!AlgorandAddress::is_valid("QKDS2YGDHDFZFAAGA4HAF3AJIKW5ZN46P66QDR3ELCXKKJUJTPJSXVHNQX"));
64+
let parsed = AlgorandAddress::from_str(VALID_ADDRESS).unwrap();
65+
66+
assert!(validate_address(VALID_ADDRESS));
67+
assert_eq!(parsed.to_string(), VALID_ADDRESS);
68+
assert_eq!(parsed.as_bytes().len(), 32);
6269

63-
let addr = AlgorandAddress::from_str("QKDS2YGDHDFZFAAGA4HAF3AJIKW5ZN46P66QDR3ELCXKKJUJTPJSXVHNQU").unwrap();
64-
assert_eq!(addr.to_string(), "QKDS2YGDHDFZFAAGA4HAF3AJIKW5ZN46P66QDR3ELCXKKJUJTPJSXVHNQU");
65-
assert_eq!(addr.as_bytes().len(), 32);
70+
assert!(!validate_address(""));
71+
assert!(!validate_address("invalid"));
72+
// wrong checksum (last char flipped)
73+
assert!(!validate_address("QKDS2YGDHDFZFAAGA4HAF3AJIKW5ZN46P66QDR3ELCXKKJUJTPJSXVHNQX"));
6674
}
6775
}

‎crates/gem_algorand/src/lib.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ pub mod rpc;
44
#[cfg(feature = "rpc")]
55
pub mod provider;
66

7-
#[cfg(feature = "signer")]
87
pub mod address;
98
pub mod constants;
109
pub mod models;
1110
#[cfg(feature = "signer")]
1211
pub mod signer;
1312

14-
#[cfg(feature = "signer")]
15-
pub use address::AlgorandAddress;
13+
pub use address::{AlgorandAddress, validate_address};
1614
#[cfg(feature = "rpc")]
1715
pub use rpc::client::AlgorandClient;
1816
#[cfg(feature = "signer")]
Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use primitives::{SignerError, decode_hex};
1+
use primitives::{Address as AddressTrait, SignerError, decode_hex};
22
use serde::{Deserialize, Serialize};
33
use std::fmt;
44
use std::str::FromStr;
@@ -39,6 +39,24 @@ impl FromStr for AccountAddress {
3939
}
4040
}
4141

42+
impl AddressTrait for AccountAddress {
43+
fn try_parse(address: &str) -> Option<Self> {
44+
Self::from_hex(address).ok()
45+
}
46+
47+
fn as_bytes(&self) -> &[u8] {
48+
&self.0
49+
}
50+
51+
fn encode(&self) -> String {
52+
self.to_string()
53+
}
54+
}
55+
56+
pub fn validate_address(address: &str) -> bool {
57+
AccountAddress::is_valid(address)
58+
}
59+
4260
impl fmt::Display for AccountAddress {
4361
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
4462
write!(f, "0x{}", ::hex::encode(self.0))
@@ -49,9 +67,19 @@ impl fmt::Display for AccountAddress {
4967
mod tests {
5068
use super::*;
5169

70+
const VALID_ADDRESS: &str = "0x6467997d9c3a5bc9f714e17a168984595ce9bec7350645713a1fe7983a7f5fcc";
71+
5272
#[test]
53-
fn parse_address_short_hex() {
54-
let address = AccountAddress::from_hex("0x1").unwrap();
55-
assert_eq!(address.to_string(), format!("0x{}", "00".repeat(31) + "01"));
73+
fn test_aptos_address() {
74+
let parsed = AccountAddress::from_hex(VALID_ADDRESS).unwrap();
75+
76+
assert!(validate_address(VALID_ADDRESS));
77+
assert_eq!(parsed.to_string(), VALID_ADDRESS);
78+
assert_eq!(parsed.as_bytes().len(), 32);
79+
assert!(!validate_address("invalid"));
80+
81+
// short hex is left-padded to 32 bytes (Aptos framework address convention)
82+
let short = AccountAddress::from_hex("0x1").unwrap();
83+
assert_eq!(short.to_string(), format!("0x{}", "00".repeat(31) + "01"));
5684
}
5785
}

‎crates/gem_aptos/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
pub mod constants;
22
pub use constants::*;
3+
pub mod address;
4+
pub use address::{AccountAddress, validate_address};
35
pub mod models;
46
pub use models::*;
57
pub mod r#move;

‎crates/gem_aptos/src/models/signer_transaction.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use crate::AccountAddress;
12
use crate::r#move::{EntryFunction, TypeTag};
2-
use crate::signer::AccountAddress;
33
use serde::{Deserialize, Serialize};
44

55
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]

‎crates/gem_aptos/src/move/parser.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::signer::AccountAddress;
1+
use crate::AccountAddress;
22
use num_bigint::BigUint;
33
use num_traits::ToPrimitive;
44
use primitives::{SignerError, decode_hex};

‎crates/gem_aptos/src/move/types.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::signer::AccountAddress;
1+
use crate::AccountAddress;
22
use serde::{Deserialize, Serialize};
33

44
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]

‎crates/gem_aptos/src/move/values.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::signer::AccountAddress;
1+
use crate::AccountAddress;
22
use serde::Serialize;
33
use serde::ser::{SerializeSeq, Serializer};
44

‎crates/gem_aptos/src/signer/chain_signer.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use std::str::from_utf8;
55

66
use super::abi::{PANORA_ROUTER_ENTRY_PARAMS, PANORA_ROUTER_FUNCTION, PANORA_ROUTER_MODULE};
77
use super::{
8-
AccountAddress, EntryFunction, EntryFunctionPayload, build_raw_transaction, build_submit_transaction_bcs, expiration_timestamp_secs, sign_message as sign_aptos_message,
9-
sign_raw_transaction,
8+
EntryFunction, EntryFunctionPayload, build_raw_transaction, build_submit_transaction_bcs, expiration_timestamp_secs, sign_message as sign_aptos_message, sign_raw_transaction,
109
};
10+
use crate::AccountAddress;
1111
use crate::token_id::is_fungible_asset_token_id;
1212
use crate::{APTOS_TRANSFER_FUNCTION, DELEGATION_POOL_ADD_STAKE_FUNCTION, DELEGATION_POOL_UNLOCK_FUNCTION, DELEGATION_POOL_WITHDRAW_FUNCTION, ENTRY_FUNCTION_PAYLOAD_TYPE};
1313

0 commit comments

Comments
 (0)