LumeWeb
/
ethers-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix handling empty tx parameters (#686)

This commit is contained in:
joshieDo 2021-12-13 19:39:24 +02:00 committed by GitHub
parent 8a7252fe58
commit ebf52934e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ethers-signers/src/trezor/app.rs
View File

@ -261,6 +261,20 @@ mod tests {
let tx = trezor.sign_transaction(&tx_req).await.unwrap(); let tx = trezor.sign_transaction(&tx_req).await.unwrap();
} }
#[tokio::test]
#[ignore]
async fn test_sign_empty_txes() {
let trezor = TrezorEthereum::new(DerivationType::TrezorLive(0), 1).await.unwrap();
{
let tx_req = Eip1559TransactionRequest::new().into();
let tx = trezor.sign_transaction(&tx_req).await.unwrap();
}
{
let tx_req = TransactionRequest::new().into();
let tx = trezor.sign_transaction(&tx_req).await.unwrap();
}
}
#[tokio::test] #[tokio::test]
#[ignore] #[ignore]
async fn test_sign_eip1559_tx() { async fn test_sign_eip1559_tx() {

26
ethers-signers/src/trezor/types.rs
View File

@ -4,7 +4,7 @@
use std::fmt; use std::fmt;
use thiserror::Error; use thiserror::Error;
use ethers_core::types::{transaction::eip2718::TypedTransaction, NameOrAddress, U256}; use ethers_core::types::{transaction::eip2718::TypedTransaction, NameOrAddress, H160, U256};
use trezor_client::client::AccessListItem as Trezor_AccessListItem; use trezor_client::client::AccessListItem as Trezor_AccessListItem;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -72,16 +72,16 @@ impl TrezorTransaction {
} }
pub fn load(tx: &TypedTransaction) -> Result<Self, TrezorError> { pub fn load(tx: &TypedTransaction) -> Result<Self, TrezorError> {
let to: String = match tx.to().ok_or(TrezorError::DataError)? { let to: String = match tx.to().unwrap_or(&NameOrAddress::Address(H160::from(&[0; 20]))) {
NameOrAddress::Name(_) => unimplemented!(), NameOrAddress::Name(_) => unimplemented!(),
NameOrAddress::Address(value) => format!("0x{}", hex::encode(value)), NameOrAddress::Address(value) => format!("0x{}", hex::encode(value)),
}; };
let nonce = Self::to_trimmed_big_endian(tx.nonce().ok_or(TrezorError::DataError)?); let nonce = tx.nonce().map_or(vec![], Self::to_trimmed_big_endian);
let gas = Self::to_trimmed_big_endian(tx.gas().ok_or(TrezorError::DataError)?); let gas = tx.gas().map_or(vec![], Self::to_trimmed_big_endian);
let gas_price = Self::to_trimmed_big_endian(&tx.gas_price().ok_or(TrezorError::DataError)?); let gas_price = tx.gas_price().map_or(vec![], |v| Self::to_trimmed_big_endian(&v));
let value = Self::to_trimmed_big_endian(tx.value().ok_or(TrezorError::DataError)?); let value = tx.value().map_or(vec![], Self::to_trimmed_big_endian);
let data = tx.data().ok_or(TrezorError::DataError)?.to_vec(); let data = tx.data().map_or(vec![], |v| v.to_vec());
match tx { match tx {
TypedTransaction::Eip2930(_) | TypedTransaction::Legacy(_) => Ok(Self { TypedTransaction::Eip2930(_) | TypedTransaction::Legacy(_) => Ok(Self {
@ -96,12 +96,12 @@ impl TrezorTransaction {
access_list: vec![], access_list: vec![],
}), }),
TypedTransaction::Eip1559(eip1559_tx) => { TypedTransaction::Eip1559(eip1559_tx) => {
let max_fee_per_gas = Self::to_trimmed_big_endian( let max_fee_per_gas =
&eip1559_tx.max_fee_per_gas.ok_or(TrezorError::DataError)?, eip1559_tx.max_fee_per_gas.map_or(vec![], |v| Self::to_trimmed_big_endian(&v));
);
let max_priority_fee_per_gas = Self::to_trimmed_big_endian( let max_priority_fee_per_gas = eip1559_tx
&eip1559_tx.max_priority_fee_per_gas.ok_or(TrezorError::DataError)?, .max_priority_fee_per_gas
); .map_or(vec![], |v| Self::to_trimmed_big_endian(&v));
let mut access_list: Vec<Trezor_AccessListItem> = Vec::new(); let mut access_list: Vec<Trezor_AccessListItem> = Vec::new();
for item in &eip1559_tx.access_list.0 { for item in &eip1559_tx.access_list.0 {