refactor: Add AccessList result type to eth_createAccessList #9811
Conversation
| /// Optional error message if the transaction failed. | ||
| pub error: Option<String>, |
There was a problem hiding this comment.
this should be skipped if none
#[serde(default, skip_serializing_if = "Option::is_none")]
| let (result, env) = match self.inspect(&mut db, env, &mut inspector) { | ||
| Ok((res, env)) => (res, env), | ||
| Err(e) => { | ||
| return Err(e.into()); | ||
| } | ||
| ExecutionResult::Success { .. } => Ok(()), | ||
| }?; | ||
| }; | ||
|
|
||
| let error = match result.result { | ||
| ExecutionResult::Halt { reason, .. } => Some(format!("{:?}", reason)), | ||
| ExecutionResult::Revert { output, .. } => Some(format!("{:?}", output)), | ||
| ExecutionResult::Success { .. } => None, | ||
| }; |
There was a problem hiding this comment.
we can keep the code on main and use RevertError::new(output) for the revert case
There was a problem hiding this comment.
I use the code regarding (result, env) from the main branch as is.
Also, I made some changes to the Revert part and left a commit for it.
|
|
||
| /// `AccessListWithGasUsedAndError` for handling error from `eth_createAccessList` | ||
| #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] | ||
| pub struct AccessListWithGasUsedAndError { |
There was a problem hiding this comment.
let's also name this AccessListResult
|
|
||
| /// `AccessListWithGasUsedAndError` for handling error from `eth_createAccessList` | ||
| #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] | ||
| pub struct AccessListWithGasUsedAndError { |
There was a problem hiding this comment.
this needs camelCase rename
| use revm_primitives::U256; | ||
| use serde::{Deserialize, Serialize}; | ||
|
|
||
| /// `AccessListResult ` for handling error from `eth_createAccessList` |
There was a problem hiding this comment.
| /// `AccessListResult ` for handling error from `eth_createAccessList` | |
| /// `AccessListResult` for handling errors from `eth_createAccessList` |
nit
| return Err(e.into()); | ||
| } | ||
| }; | ||
| let (result, env) = self.inspect(&mut db, env, &mut inspector)?; | ||
|
|
||
| let error = match result.result { | ||
| ExecutionResult::Halt { reason, .. } => Some(format!("{:?}", reason)), |
There was a problem hiding this comment.
this should use + to_string
reth/crates/rpc/rpc-eth-types/src/error.rs
Line 410 in ef84899
There was a problem hiding this comment.
reth/crates/rpc/rpc-eth-api/src/helpers/call.rs
Lines 245 to 249 in d711292
There was a problem hiding this comment.
we still need to use
reth/crates/rpc/rpc-eth-types/src/error.rs
Line 410 in ef84899
to create the appropriate error message
There was a problem hiding this comment.
Sorry to bother you. I fix it.
reth/crates/rpc/rpc-eth-api/src/helpers/call.rs
Lines 245 to 251 in 49ef679
|
|
||
| let error = match result.result { | ||
| ExecutionResult::Halt { reason, .. } => Some(format!("{:?}", reason)), | ||
| ExecutionResult::Revert { output, .. } => Some(format!("{:?}", output)), | ||
| ExecutionResult::Revert { output, .. } => { | ||
| Some(format!("{:?}", RevertError::new(output))) |
There was a problem hiding this comment.
| Some(format!("{:?}", RevertError::new(output))) | |
| Some(RevertError::new(output).to_string()) |
c0np4nn4
force-pushed
the
refactor/access_list
branch
from
b6547b4
to
1f1b634
Compare
close #9746.
@mattsse I made changes based on the conversation we had on the issue #9746 .
I wonder is this the right way to handle the issue. Thank you.