Skip to content

runtime-sdk/modules/evm: Migrate engine to evm v1.1.0 #2448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kostko wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

runtime-sdk/modules/evm: Migrate engine to evm v1.1.0 #2448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,064 changes: 741 additions & 323 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

192 changes: 101 additions & 91 deletions contract-sdk/specs/access/oas173/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

192 changes: 101 additions & 91 deletions contract-sdk/specs/token/oas20/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

131 changes: 69 additions & 62 deletions runtime-sdk-macros/src/evm_derive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ fn get_method(f: &ImplItemFn) -> Option<(Signature, EvmMethod, TokenStream)> {
},
}
}
if signature.convert && signature.args.len() != f.sig.inputs.len() - 1 {
if signature.convert && signature.args.len() != f.sig.inputs.len() - 2 {
signature
.name
.span()
Expand Down Expand Up @@ -136,9 +136,7 @@ fn generate_method_call(attr: &EvmMethod, sig: &Signature) -> Option<TokenStream
arg_decls.push(quote! {
let #temp_name = decoded_args.#field_index.clone();
if *#temp_name.high() != 0 {
return Some(Err(::evm::executor::stack::PrecompileFailure::Error {
exit_status: ::evm::ExitError::Other("integer overflow".into()),
}));
return Err(::evm::interpreter::ExitError::Exception(::evm::interpreter::ExitException::Other("integer overflow".into())).into());
}
let #arg_name = #temp_name.as_u128();
});
Expand All @@ -163,14 +161,12 @@ fn generate_method_call(attr: &EvmMethod, sig: &Signature) -> Option<TokenStream
};

Some(quote! { {
let decoded_args: #decode_type = match ::solabi::decode(&handle.input()[#SELECTOR_LENGTH..]) {
Err(e) => return Some(Err(::evm::executor::stack::PrecompileFailure::Error {
exit_status: ::evm::ExitError::Other("invalid argument".into()),
})),
let decoded_args: #decode_type = match ::solabi::decode(&input[#SELECTOR_LENGTH..]) {
Err(e) => return Err(::evm::interpreter::ExitError::Exception(::evm::interpreter::ExitException::Other("invalid argument".into())).into()),
Ok(tokens) => tokens,
};
#(#arg_decls)*
Some(Self::#method_name(handle, #(#call_args),*))
Self::#method_name(gasometer, handler, #(#call_args),*)
} })
}

Expand Down Expand Up @@ -213,15 +209,27 @@ pub fn derive_evm_contract(input: ItemImpl) -> TokenStream {
} else {
let method_name = sig.name.clone();
quote! {
&[#keccak] => Some(Self::#method_name(handle, #SELECTOR_LENGTH)),
&[#keccak] => Self::#method_name(gasometer, handler, #SELECTOR_LENGTH),
}
}
})
.collect();

let impl_generics = &input.generics;
let (impl_generics, _, _) = input.generics.split_for_impl();

// Add custom G and H type parameters for use in the PrecompileSet impl.
let mut extended_generics = input.generics.clone();
extended_generics.params.push(
syn::parse_quote!(G: AsRef<::evm::interpreter::runtime::RuntimeState> + ::evm::GasMutState),
);
extended_generics
.params
.push(syn::parse_quote!(H: ::evm::interpreter::runtime::RuntimeBackend));
let (impl_generics_gh, _, _) = extended_generics.split_for_impl();

let self_ty = input.self_ty.clone();
let evm_crate = evm_crate_path();

quote! {
#input

Expand All @@ -231,62 +239,48 @@ pub fn derive_evm_contract(input: ItemImpl) -> TokenStream {
Self::#address_fn()
}

fn dispatch_call(
handle: &mut impl ::evm::executor::stack::PrecompileHandle,
) -> Option<Result<::evm::executor::stack::PrecompileOutput, ::evm::executor::stack::PrecompileFailure>> {
if handle.context().address != handle.code_address() {
return Some(Err(::evm::executor::stack::PrecompileFailure::Error {
exit_status: ::evm::ExitError::Other("invalid call".into()),
}));
}
let selector = match handle.input().get(..#SELECTOR_LENGTH) {
fn dispatch_call<G, H>(
input: &[u8],
gasometer: &mut G,
handler: &mut H,
) -> #evm_crate::precompile::PrecompileResult
where
G: AsRef<::evm::interpreter::runtime::RuntimeState> + ::evm::GasMutState,
H: ::evm::interpreter::runtime::RuntimeBackend,
{
let selector = match input.get(..#SELECTOR_LENGTH) {
Some(slice) => slice,
None => return Some(Err(::evm::executor::stack::PrecompileFailure::Revert {
exit_status: ::evm::ExitRevert::Reverted,
output: vec![],
})),
None => return Err(::evm::interpreter::ExitError::Reverted.into()),
};
match selector {
#(#method_arms)*
_ => Some(Err(::evm::executor::stack::PrecompileFailure::Revert {
exit_status: ::evm::ExitRevert::Reverted,
output: vec![],
})),
_ => Err(::evm::interpreter::ExitError::Reverted.into()),
}
}
}

#[automatically_derived]
impl #impl_generics ::evm::executor::stack::PrecompileSet for #self_ty {
fn execute(&self, handle: &mut impl ::evm::executor::stack::PrecompileHandle) -> Option<Result<::evm::executor::stack::PrecompileOutput, ::evm::executor::stack::PrecompileFailure>> {
match self.is_precompile(handle.code_address(), handle.remaining_gas()) {
::evm::executor::stack::IsPrecompileResult::Answer {
is_precompile: true,
extra_cost,
} => {
if let Err(e) = handle.record_cost(extra_cost) {
return Some(Err(e.into()));
}
}
::evm::executor::stack::IsPrecompileResult::OutOfGas => {
return Some(Err(::evm::ExitError::OutOfGas.into()));
}
_ => {
return None;
}
impl #impl_generics_gh ::evm::standard::PrecompileSet<G, H> for #self_ty {
fn execute(
&self,
code_address: H160,
input: &[u8],
gasometer: &mut G,
handler: &mut H,
) -> Option<(::evm::interpreter::ExitResult, Vec<u8>)> {
if code_address != Self::address() {
return None;
}

<Self as #evm_crate::precompile::contract::StaticContract>::dispatch_call(handle)
}
let result = <Self as #evm_crate::precompile::contract::StaticContract>::dispatch_call(
input,
gasometer,
handler,
);

fn is_precompile(
&self,
address: ::primitive_types::H160,
_remaining_gas: u64,
) -> ::evm::executor::stack::IsPrecompileResult {
::evm::executor::stack::IsPrecompileResult::Answer {
is_precompile: Self::address() == address,
extra_cost: 0,
match result {
Ok(success) => Some((success.status.into(), success.output)),
Err(err) => Some((err.error.into(), err.output)),
}
}
}
Expand Down Expand Up @@ -372,14 +366,26 @@ pub fn derive_evm_event(input: DeriveInput) -> TokenStream {
#[automatically_derived]
#[allow(clippy::cloned_ref_to_slice_refs)]
impl #evm_crate::precompile::contract::EvmEvent for #event_ty {
fn emit<C: #evm_crate::precompile::contract::StaticContract>(&self, handle: &mut impl ::evm::executor::stack::PrecompileHandle) -> Result<(), ::evm::ExitError> {
fn emit<C, H>(
&self,
handler: &mut H,
) -> Result<(), #evm_crate::precompile::PrecompileError>
where
C: #evm_crate::precompile::contract::StaticContract,
H: ::evm::interpreter::runtime::RuntimeBackend,
{
let address = C::address();
let topics = vec![
::primitive_types::H256::from_slice(&[#(#signature_tokens ,)*]),
#(#topics ,)*
];
let data = #data_tokens;
handle.log(address, topics, data)
handler.log(::evm::interpreter::runtime::Log {
address,
topics,
data,
})?;
Ok(())
}
}
}
Expand All @@ -405,6 +411,8 @@ pub fn derive_evm_error(input: DeriveInput) -> TokenStream {
Err(e) => return e.write_errors(),
};

let evm_crate = evm_crate_path();

let mut variant_encoders: Vec<TokenStream> = Vec::new();
for variant in error.data.as_ref().take_enum().unwrap().iter() {
let ident = &variant.ident;
Expand Down Expand Up @@ -458,21 +466,20 @@ pub fn derive_evm_error(input: DeriveInput) -> TokenStream {
let mut output = Vec::new();
output.extend(&[#(#hash_bytes,)*]);
#encode_expr
::evm::executor::stack::PrecompileFailure::Revert {
exit_status: ::evm::ExitRevert::Reverted,
#evm_crate::precompile::PrecompileError::new(
::evm::interpreter::ExitError::Reverted,
output,
}
)
}
});
}

let evm_crate = evm_crate_path();
let error_ty = &error.ident;

quote! {
#[automatically_derived]
impl #evm_crate::precompile::contract::EvmError for #error_ty {
fn encode(&self) -> ::evm::executor::stack::PrecompileFailure {
fn encode(&self) -> #evm_crate::precompile::PrecompileError {
match self {
#(#variant_encoders)*
}
Expand Down
7 changes: 4 additions & 3 deletions runtime-sdk/modules/evm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "oasis-runtime-sdk-evm"
description = "EVM module for the Oasis Runtime SDK."
version = "0.6.0"
version = "0.7.0"
authors = ["Oasis Protocol Foundation <info@oasisprotocol.org>"]
edition = "2021"
edition = "2024"
license = "Apache-2.0"

[dependencies]
Expand Down Expand Up @@ -32,7 +32,8 @@ rand_core = { version = "0.6.4", default-features = false }
solabi = "0.3.0"
ethabi = { version = "18.0.0", default-features = false, features = ["std"] }
ethereum = "0.15"
evm = { git = "https://github.com/oasisprotocol/evm", tag = "v0.39.1-oasis" }
evm = "1.1.1"
evm-precompile = "1.0.1"
fixed-hash = "0.8.0"
primitive-types = { version = "0.12", default-features = false, features = ["rlp", "num-traits"] }
rlp = "0.5.2"
Expand Down
Loading
Loading