LumeWeb
/
helios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Optional CallOpts Recipient (#207)

This commit is contained in:
refcell.eth 2023-03-10 11:05:34 -05:00 committed by GitHub
parent 0e20b5f783
commit a73f9c648b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
execution/src/evm.rs
View File

@ -131,7 +131,7 @@ impl<'a, R: ExecutionRpc> Evm<'a, R> {
}; };
let to_access_entry = AccessListItem { let to_access_entry = AccessListItem {
address: opts_moved.to, address: opts_moved.to.unwrap_or_default(),
storage_keys: Vec::default(), storage_keys: Vec::default(),
}; };
@ -172,7 +172,7 @@ impl<'a, R: ExecutionRpc> Evm<'a, R> {
let mut env = Env::default(); let mut env = Env::default();
let payload = &self.evm.db.as_ref().unwrap().current_payload; let payload = &self.evm.db.as_ref().unwrap().current_payload;
env.tx.transact_to = TransactTo::Call(opts.to); env.tx.transact_to = TransactTo::Call(opts.to.unwrap_or_default());
env.tx.caller = opts.from.unwrap_or(Address::zero()); env.tx.caller = opts.from.unwrap_or(Address::zero());
env.tx.value = opts.value.unwrap_or(U256::from(0)); env.tx.value = opts.value.unwrap_or(U256::from(0));
env.tx.data = Bytes::from(opts.data.clone().unwrap_or_default()); env.tx.data = Bytes::from(opts.data.clone().unwrap_or_default());

2
execution/src/rpc/http_rpc.rs
View File

@ -63,7 +63,7 @@ impl ExecutionRpc for HttpRpc {
let block = Some(BlockId::from(block)); let block = Some(BlockId::from(block));
let mut raw_tx = Eip1559TransactionRequest::new(); let mut raw_tx = Eip1559TransactionRequest::new();
raw_tx.to = Some(opts.to.into()); raw_tx.to = Some(opts.to.unwrap_or_default().into());
raw_tx.from = opts.from; raw_tx.from = opts.from;
raw_tx.value = opts.value; raw_tx.value = opts.value;
raw_tx.gas = Some(opts.gas.unwrap_or(U256::from(100_000_000))); raw_tx.gas = Some(opts.gas.unwrap_or(U256::from(100_000_000)));

4
execution/src/types.rs
View File

@ -64,7 +64,7 @@ pub enum Transactions {
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct CallOpts { pub struct CallOpts {
pub from: Option<Address>, pub from: Option<Address>,
pub to: Address, pub to: Option<Address>,
pub gas: Option<U256>, pub gas: Option<U256>,
pub gas_price: Option<U256>, pub gas_price: Option<U256>,
pub value: Option<U256>, pub value: Option<U256>,
@ -90,7 +90,7 @@ where
let bytes: Option<String> = serde::Deserialize::deserialize(deserializer)?; let bytes: Option<String> = serde::Deserialize::deserialize(deserializer)?;
match bytes { match bytes {
Some(bytes) => { Some(bytes) => {
let bytes = hex::decode(bytes.strip_prefix("0x").unwrap()).unwrap(); let bytes = hex::decode(bytes.strip_prefix("0x").unwrap_or("")).unwrap_or_default();
Ok(Some(bytes.to_vec())) Ok(Some(bytes.to_vec()))
} }
None => Ok(None), None => Ok(None),