Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sia): add ed25519 dexfee pubkey #2258

Open
wants to merge 2 commits into
base: sia-wallet
Choose a base branch
from
Open

fix(sia): add ed25519 dexfee pubkey #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf7ae4a
add ed25519 pubkey
ca333 Oct 31, 2024
6e86c9e
fix typo in ED25519 dex pubkey const
shamardy Oct 31, 2024
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
6 changes: 3 additions & 3 deletions mm2src/coins/siacoin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use async_trait::async_trait;
use common::executor::abortable_queue::AbortableQueue;
use common::executor::{AbortableSystem, AbortedError, Timer};
use common::log::info;
use common::DEX_FEE_PUBKEY_ED25510;
use common::DEX_FEE_PUBKEY_ED25519;
use derive_more::{From, Into};
use futures::compat::Future01CompatExt;
use futures::{FutureExt, TryFutureExt};
Expand Down Expand Up @@ -53,7 +53,7 @@ use mm2_err_handle::prelude::*;

lazy_static! {
pub static ref FEE_PUBLIC_KEY_BYTES: Vec<u8> =
hex::decode(DEX_FEE_PUBKEY_ED25510).expect("DEX_FEE_PUBKEY_ED25510 is a valid hex string");
hex::decode(DEX_FEE_PUBKEY_ED25519).expect("DEX_FEE_PUBKEY_ED25510 is a valid hex string");
pub static ref FEE_PUBLIC_KEY: PublicKey =
PublicKey::from_bytes(&FEE_PUBLIC_KEY_BYTES).expect("DEX_FEE_PUBKEY_ED25510 is a valid PublicKey");
pub static ref FEE_ADDR: Address = Address::from_public_key(&FEE_PUBLIC_KEY);
Expand Down Expand Up @@ -1878,7 +1878,7 @@ mod tests {
/// Test the .expect()s used during lazy_static initialization of FEE_PUBLIC_KEY
#[test]
fn test_sia_fee_pubkey_init() {
let pubkey_bytes: Vec<u8> = hex::decode(DEX_FEE_PUBKEY_ED25510).unwrap();
let pubkey_bytes: Vec<u8> = hex::decode(DEX_FEE_PUBKEY_ED25519).unwrap();
let pubkey = PublicKey::from_bytes(&FEE_PUBLIC_KEY_BYTES).unwrap();
assert_eq!(pubkey_bytes, *FEE_PUBLIC_KEY_BYTES);
assert_eq!(pubkey, *FEE_PUBLIC_KEY);
Expand Down
4 changes: 1 addition & 3 deletions mm2src/common/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,7 @@ pub const SATOSHIS: u64 = 100_000_000;

pub const DEX_FEE_ADDR_PUBKEY: &str = "03bc2c7ba671bae4a6fc835244c9762b41647b9827d4780a89a949b984a8ddcc06";

// TODO: needs a real key
// pubkey of iguana passphrase "horribly insecure passphrase" for now
pub const DEX_FEE_PUBKEY_ED25510: &str = "8483e8da48fbac06b292fcd077a71078d094789fccfab581debd4dd13410ea08";
pub const DEX_FEE_PUBKEY_ED25519: &str = "77b0936728f63257b074c7b3fb2c4fad98df345f57de1ec418fc42619e4e29f8";

pub const PROXY_REQUEST_EXPIRATION_SEC: i64 = 15;

Expand Down
Loading