Skip to content

Commit

Permalink
fix compatibility issues with trust wallet
Browse files Browse the repository at this point in the history
  • Loading branch information
zksemi committed Jul 31, 2024
1 parent 13f5d38 commit e75fb40
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ edition = "2021"

[dependencies]
cfg-if = { workspace = true }
hex = { workspace = true }
thiserror = { workspace = true }
wasm-bindgen = { workspace = true, features = ["serde-serialize"] }
zklink_sdk_signers = { path = "../signers" }
Expand Down
30 changes: 26 additions & 4 deletions signers/src/eth_signer/json_rpc_signer.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::eth_signer::{EthSignerError, PackedEthSignature};
use crate::RpcErr;
use hex;
use serde::{Deserialize, Serialize};
use wasm_bindgen::prelude::*;

Expand Down Expand Up @@ -39,11 +40,32 @@ impl JsonRpcSigner {
self.provider.selectedAddress()
}

// https://docs.metamask.io/wallet/reference/provider-api/#legacy-properties
// https://docs.metamask.io/whats-new/#march-2024
// selectedAddress is deprecated and not all wallet extensions provide this method, use eth_requestAccounts instead
pub async fn get_request_account(&self) -> Result<String, EthSignerError> {
let req_params = RequestArguments {
method: "eth_requestAccounts".to_string(),
params: Vec::new(),
};
let params = serde_wasm_bindgen::to_value(&req_params)
.map_err(|e| EthSignerError::CustomError(e.to_string()))?;
let address = self.provider.request(params).await.map_err(|e| {
EthSignerError::RpcSignError(serde_wasm_bindgen::from_value::<RpcErr>(e).unwrap())
})?;
let address = serde_wasm_bindgen::from_value::<Vec<String>>(address)
.map_err(|e| EthSignerError::SigningFailed(e.to_string()))?;
Ok(address[0].clone())
}

pub async fn sign_message(&self, message: &[u8]) -> Result<PackedEthSignature, EthSignerError> {
let provider_address = self.provider.selectedAddress();
let provider_address = self.get_request_account().await?;
let mut params = Vec::new();
let msg_str =
std::str::from_utf8(message).map_err(|e| EthSignerError::CustomError(e.to_string()))?;

// https://docs.metamask.io/wallet/reference/personal_sign/
// Convert message to hex string since non-hex string are not well supported by all wallet extensions, result signature should be the same.
let msg_str = format! { "0x{}", hex::encode(message) };

params.push(serde_json::to_value(msg_str).unwrap());
params.push(serde_json::to_value(provider_address).unwrap());
let req_params = RequestArguments {
Expand All @@ -64,7 +86,7 @@ impl JsonRpcSigner {
&self,
message: &[u8],
) -> Result<PackedEthSignature, EthSignerError> {
let provider_address = self.provider.selectedAddress();
let provider_address = self.get_request_account().await?;
let mut params = Vec::new();
let msg_str =
std::str::from_utf8(message).map_err(|e| EthSignerError::CustomError(e.to_string()))?;
Expand Down

0 comments on commit e75fb40

Please sign in to comment.