crypto/rustwallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改wasm下一些方法的参数

Browse Source
This commit is contained in:
CounterFire2023 2023-09-14 10:37:39 +08:00
parent 98a15a98ef
commit 8dac55ab0e
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/lib.rs
View File

@ -47,7 +47,10 @@ macro_rules! console_log {
}
#[wasm_bindgen]
pub fn get_public_key(msg_key: String, master_key: String, second_key: String) -> String {
pub fn get_public_key(id: String, openid: String, master_key: String, salt: String, pass: String) -> String {
let second_key = wallet_impl::generate_client_key(&pass, &openid, &salt);
let msg_str = format!("{}{}{}", id, openid, salt);
let msg_key = keccak256_hash(msg_str);
let rwallet = Wallet {
msg_key,
master_key,
@ -57,7 +60,10 @@ pub fn get_public_key(msg_key: String, master_key: String, second_key: String) -
}
#[wasm_bindgen]
pub fn generate_sec_key(msg_key: String, master_key: String, second_key: String) -> String {
pub fn generate_sec_key(id: String, openid: String, master_key: String, salt: String, pass: String) -> String {
let second_key = wallet_impl::generate_client_key(&pass, &openid, &salt);
let msg_str = format!("{}{}{}", id, openid, salt);
let msg_key = keccak256_hash(msg_str);
let rwallet = Wallet {
msg_key,
master_key,
@ -67,7 +73,10 @@ pub fn generate_sec_key(msg_key: String, master_key: String, second_key: String)
}
#[wasm_bindgen]
pub fn sign(msg_key: String, master_key: String, second_key: String, msg: String) -> String {
pub fn sign(id: String, openid: String, master_key: String, salt: String, pass: String, msg: String) -> String {
let second_key = wallet_impl::generate_client_key(&pass, &openid, &salt);
let msg_str = format!("{}{}{}", id, openid, salt);
let msg_key = keccak256_hash(msg_str);
let rwallet = Wallet {
msg_key,
master_key,
@ -82,12 +91,10 @@ pub fn sign(msg_key: String, master_key: String, second_key: String, msg: String
}
#[wasm_bindgen]
pub fn sign_for_tran(
msg_key: String,
master_key: String,
second_key: String,
msg: String,
) -> String {
pub fn sign_for_tran(id: String, openid: String, master_key: String, salt: String, pass: String, msg: String) -> String {
let second_key = wallet_impl::generate_client_key(&pass, &openid, &salt);
let msg_str = format!("{}{}{}", id, openid, salt);
let msg_key = keccak256_hash(msg_str);
let rwallet = Wallet {
msg_key,
master_key,
@ -103,11 +110,6 @@ pub fn sign_for_tran(
result
}
#[wasm_bindgen]
pub fn wgenerate_client_key(password: String, openid: String, salt: String) -> String {
wallet_impl::generate_client_key(&password, &openid, &salt)
}
#[wasm_bindgen]
pub fn keccak256_hash(content: String) -> String {
let msg_hex = utils::crypto_utils::keccak256_hash(&content);
@ -115,8 +117,10 @@ pub fn keccak256_hash(content: String) -> String {
}
#[wasm_bindgen]
pub fn wget_address(msg_key: String, master_key: String, second_key: String) -> String {
// console_log!("wget_address: {}, {}!", msg_key, master_key);
pub fn wget_address(id: String, openid: String, master_key: String, salt: String, pass: String) -> String {
let second_key = wallet_impl::generate_client_key(&pass, &openid, &salt);
let msg_str = format!("{}{}{}", id, openid, salt);
let msg_key = keccak256_hash(msg_str);
let rwallet = Wallet {
msg_key,
master_key,
@ -129,7 +133,10 @@ pub fn wget_address(msg_key: String, master_key: String, second_key: String) ->
}
#[wasm_bindgen]
pub fn wencrypt(msg_key: String, master_key: String, second_key: String, msg: String) -> String {
pub fn wencrypt(id: String, openid: String, master_key: String, salt: String, pass: String,msg: String) -> String {
let second_key = wallet_impl::generate_client_key(&pass, &openid, &salt);
let msg_str = format!("{}{}{}", id, openid, salt);
let msg_key = keccak256_hash(msg_str);
let rwallet = Wallet {
msg_key,
master_key,
@ -143,7 +150,10 @@ pub fn wencrypt(msg_key: String, master_key: String, second_key: String, msg: St
r
}
#[wasm_bindgen]
pub fn wdecrypt(msg_key: String, master_key: String, second_key: String, msg: String) -> String {
pub fn wdecrypt(id: String, openid: String, master_key: String, salt: String, pass: String, msg: String) -> String {
let second_key = wallet_impl::generate_client_key(&pass, &openid, &salt);
let msg_str = format!("{}{}{}", id, openid, salt);
let msg_key = keccak256_hash(msg_str);
let rwallet = Wallet {
msg_key,
master_key,