Skip to content

Commit

Permalink
Merge pull request #23 from 0xcregis/22-secret-key-type-modification
Browse files Browse the repository at this point in the history 
fix: use curve25519::Scalar as secret key
  • Loading branch information
@loki-cmu
loki-cmu authored Dec 18, 2024
2 parents 09de6c5 + ab80e35 commit 3a1e0db
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 155 deletions.
78 changes: 75 additions & 3 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "anychain-ton"
description = "A Rust library for Ton-focused cryptocurrency wallets, enabling seamless transactions on the Ton blockchain"
version = "0.1.18"
version = "0.1.19"
keywords = ["ton", "blockchain", "wallet", "transactions"]
categories = ["cryptography::cryptocurrencies"]
authors = ["Shawndslee", "cregis.com"]
Expand All @@ -18,6 +18,8 @@ num-bigint = { version = "0.4", features = ["serde"] }
num-traits = { version = "0.2" }
nacl = "0.5.3"
ed25519-dalek = { version = "=1.0.1" }
curve25519-dalek = { version = "4.1.3", features = ["group"] }
group = "0.13.0"
base64 = "0.22.1"
crc16 = "0.4.0"
hex = "0.4.3"
Expand Down
131 changes: 9 additions & 122 deletions src/address.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use {
fmt::{Display, Formatter, Result as FmtResult},
str::FromStr,
},
curve25519_dalek::Scalar,
tonlib_core_anychain::types::TonAddress as InnerTonAddress,
tonlib_core_anychain::wallet::{TonWallet, WalletVersion, DEFAULT_WALLET_ID},
};
Expand All @@ -17,7 +18,7 @@ pub struct TonAddress {
}

impl Address for TonAddress {
type SecretKey = ed25519_dalek::SecretKey;
type SecretKey = Scalar;
type Format = TonFormat;
type PublicKey = TonPublicKey;

Expand Down Expand Up @@ -94,12 +95,7 @@ impl Display for TonAddress {

#[cfg(test)]
mod tests {
use {
crate::{address::TonAddress, format::TonFormat, public_key::TonPublicKey},
anychain_core::{public_key::PublicKey, Address},
core::str::FromStr,
ed25519_dalek::PUBLIC_KEY_LENGTH,
};
use super::*;

#[test]
fn test_address_from_str() {
Expand All @@ -126,14 +122,13 @@ mod tests {

#[test]
fn test_address_formats() {
let secret_bytes: [u8; PUBLIC_KEY_LENGTH] = [
let secret_bytes: [u8; 32] = [
163, 27, 236, 35, 251, 127, 152, 172, 241, 108, 136, 153, 30, 28, 111, 7, 8, 203, 61,
254, 254, 28, 22, 140, 180, 158, 52, 246, 207, 241, 80, 203,
];

let secret_key = ed25519_dalek::SecretKey::from_bytes(&secret_bytes).unwrap();
let secret_key = Scalar::from_bytes_mod_order(secret_bytes);
let public_key: TonPublicKey = TonPublicKey::from_secret_key(&secret_key);
// dbg!(&public_key.0.as_bytes());

let a_addr = public_key
.to_address(&TonFormat::MainnetBounceable)
Expand All @@ -154,127 +149,19 @@ mod tests {

assert_eq!(
a_addr.to_string(),
"EQA6W2spRJ6D-AUf6PHTfKJCib63ZJU6fK8BxHVp322UlZH3"
"EQCmtyrjQkH7u0zsfeQFx-rLGhNZNNE-6rI-r6aRA7bgsp2q"
);
assert_eq!(
b_addr.to_string(),
"kQA6W2spRJ6D-AUf6PHTfKJCib63ZJU6fK8BxHVp322UlSp9"
"kQCmtyrjQkH7u0zsfeQFx-rLGhNZNNE-6rI-r6aRA7bgsiYg"
);
assert_eq!(
c_addr.to_string(),
"UQA6W2spRJ6D-AUf6PHTfKJCib63ZJU6fK8BxHVp322Ulcwy"
"UQCmtyrjQkH7u0zsfeQFx-rLGhNZNNE-6rI-r6aRA7bgssBv"
);
assert_eq!(
d_addr.to_string(),
"0QA6W2spRJ6D-AUf6PHTfKJCib63ZJU6fK8BxHVp322UlXe4"
"0QCmtyrjQkH7u0zsfeQFx-rLGhNZNNE-6rI-r6aRA7bgsnvl"
);
}

#[test]
fn test_address_gen() {
let sk_bytes = [
163, 27, 236, 35, 251, 127, 152, 172, 241, 108, 136, 153, 30, 28, 111, 7, 8, 203, 61,
254, 254, 28, 22, 140, 180, 158, 52, 246, 207, 241, 80, 203,
];
let sk = ed25519_dalek::SecretKey::from_bytes(&sk_bytes).unwrap();
let pk = ed25519_dalek::PublicKey::from(&sk);

let xsk = ed25519_dalek::ExpandedSecretKey::from(&sk);
let msg = "e1e0c6e409ed279f8267a96c63c01d24bf5dc698d882ff1dce28c95acbeb8cb7";
let msg = hex::decode(msg).unwrap();
let sig = xsk.sign(&msg, &pk);
let sig = sig.to_bytes();
let sig = hex::encode(sig);

assert_eq!("4091cf5cfa178feba96dfacafd3b015f21ee8ea43fc65a635ae2017c9121ccaca8cce4680a24c23dca37b4dd4118524eb2209f2f2636e4210d4495f840fbb90e", sig);

let pk = TonPublicKey(pk);
let addr = TonAddress::from_public_key(&pk, &TonFormat::TestnetNonBounceable).unwrap();

assert_eq!(
TonAddress {
address: "EQA6W2spRJ6D-AUf6PHTfKJCib63ZJU6fK8BxHVp322UlZH3"
.parse()
.unwrap(),
format: TonFormat::TestnetNonBounceable,
},
addr
);
}

#[test]
fn test_address_gen1() {
let sk_bytes = [
123, 119, 75, 83, 182, 162, 80, 116, 206, 83, 201, 219, 245, 142, 86, 18, 73, 192, 174,
111, 233, 125, 71, 235, 132, 32, 24, 20, 221, 35, 233, 242,
];
let sk = ed25519_dalek::SecretKey::from_bytes(&sk_bytes).unwrap();
let pk = ed25519_dalek::PublicKey::from(&sk);
let pk_bytes = pk.to_bytes();
assert_eq!(
[
209, 9, 210, 168, 165, 17, 12, 6, 90, 130, 114, 95, 216, 134, 24, 71, 88, 234, 123,
15, 99, 213, 149, 212, 147, 53, 129, 236, 50, 236, 224, 41,
],
pk_bytes
);

let xsk = ed25519_dalek::ExpandedSecretKey::from(&sk);
let msg = "4eb4e0616d6905c149c11f55f9efb1f63e02037e2c8c89f91e3f197ac46b47b2";
let msg = hex::decode(msg).unwrap();
let sig = xsk.sign(&msg, &pk);
let sig = sig.to_bytes();
let sig = hex::encode(sig);
assert_eq!("8d08fb78c7b68d9f5a36f958ebd8be6978e932bcba958f018dda0a9019f343061b43db6e621d4a0777742427bb2254f83d992aadb334b510aa430233e73fb705", sig);

let pk = TonPublicKey(pk);
let addr = TonAddress::from_public_key(&pk, &TonFormat::TestnetNonBounceable).unwrap();

assert_eq!(
TonAddress {
address: "EQDPBpF3yMmNNpOJ7gFYkUb3XqJTMmSbLPeWbE9YGDzEXdQp"
.parse()
.unwrap(),
format: TonFormat::TestnetNonBounceable,
},
addr
);
}

#[test]
fn test_address_gen2() {
let pk = [
123, 119, 75, 83, 182, 162, 80, 116, 206, 83, 201, 219, 245, 142, 86, 18, 73, 192, 174,
111, 233, 125, 71, 235, 132, 32, 24, 20, 221, 35, 233, 242,
];
let pk = ed25519_dalek::PublicKey::from_bytes(&pk).unwrap();

let pk = TonPublicKey(pk);
let addr = TonAddress::from_public_key(&pk, &TonFormat::TestnetNonBounceable).unwrap();

assert_eq!(
TonAddress {
address: "EQD3efSsNH7xNTSMgqPuyKWaDvJZ9I49DarhD9nPOU4aS46K"
.parse()
.unwrap(),
format: TonFormat::TestnetNonBounceable,
},
addr
);
}

#[test]
fn test_decode_jetton_address() {
let jetton_addr_str = "0:48FA147B278E22D7FE26C9C7D449999AC929CB818B3BC7A032E5988E73576EB6";

let mut jetton_addr = TonAddress::from_str(jetton_addr_str).unwrap();
jetton_addr.format = TonFormat::TestnetNonBounceable;
jetton_addr.format = TonFormat::MainnetNonBounceable;
jetton_addr.format = TonFormat::TestnetBounceable;
assert_eq!(
"kQBI-hR7J44i1_4mycfUSZmaySnLgYs7x6Ay5ZiOc1dutqkJ",
jetton_addr.to_string()
);
jetton_addr.format = TonFormat::MainnetBounceable;
}
}
Loading

0 comments on commit 3a1e0db

Please sign in to comment.