Skip to content

Refactor websocket module #3

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

Closed
vmarkushin wants to merge 1 commit into from
Closed

Refactor websocket module #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions example_solver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,3 @@ lib = { git = "https://github.com/ComposableFi/emulated-light-client.git", branc
# https://github.com/dalek-cryptography/curve25519-dalek/pull/606
aes-gcm-siv = { git = "https://github.com/RustCrypto/AEADs", rev = "6105d7a5591aefa646a95d12b5e8d3f55a9214ef" }
curve25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek", rev = "8274d5cbb6fc3f38cdc742b4798173895cd2a290" }



25 changes: 11 additions & 14 deletions example_solver/src/chains/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pub mod solana;
use lazy_static::lazy_static;
use std::collections::HashMap;

use crate::env;
use crate::{env, SignedPayload};
use ethers::prelude::*;
use ethers::signers::LocalWallet;
use ethers::utils::hash_message;
Expand Down Expand Up @@ -144,26 +144,23 @@ pub fn get_token_info(token: &str, blockchain: &str) -> Option<(&'static str, u3
Some((address, info.decimals))
}

pub async fn create_keccak256_signature(
json_data: &mut Value,
pub async fn create_keccak256_signature<T: Serialize>(
json_data: T,
private_key: String,
) -> Result<(), Box<dyn Error>> {
let json_str = json_data.to_string();
) -> Result<SignedPayload<T>, Box<dyn Error>> {
let json_str = serde_json::to_string(&json_data)?;
let json_bytes = json_str.as_bytes();

let hash = keccak256(json_bytes);
let hash_hex = hex::encode(hash);
let hash = H256(keccak256(json_bytes));

let wallet: LocalWallet = private_key.parse().unwrap();
let eth_message_hash = hash_message(hash);

let signature: Signature = wallet.sign_hash(H256::from(eth_message_hash)).unwrap();
let signature_hex = signature.to_string();

if let Some(msg) = json_data.get_mut("msg") {
msg["hash"] = Value::String(hash_hex);
msg["signature"] = Value::String(signature_hex);
}

Ok(())
Ok(SignedPayload {
payload: json_data,
hash,
signature,
})
}
Loading