Skip to content
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

Jump to bottom

Feat(engine): EIP-2930 support #181

Merged
merged 8 commits into from
Jul 20, 2021
Merged

Feat(engine): EIP-2930 support #181

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a6e9d4
Start defining AccessList transaction type
birchmd Jun 29, 2021
a3765eb
Mostly integrate AccessList transaction into the submit flow. Will no…
birchmd Jun 29, 2021
829c831
access list transaction signature includes the type byte
birchmd Jul 9, 2021
2ec659b
Use berlin pre-release from our fork
birchmd Jul 14, 2021
256d6e5
Merge branch 'develop' into eip-2930-support
joshuajbouw Jul 15, 2021
528a28b
Migrate all workflows to self-hosted runners
strokovok Jul 16, 2021
a9d36c0
Merge remote-tracking branch 'origin/self-hosted-runners' into eip-29…
joshuajbouw Jul 16, 2021
de87bdf
EIP-2930 refactor and extra changes (#182)
joshuajbouw Jul 20, 2021
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
12 changes: 4 additions & 8 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ rpath = false
blake2 = { git = "https://github.com/near/near-blake2.git", version = "0.9.1", default-features = false }
borsh = { version = "0.8.2", default-features = false }
bn = { package = "aurora-bn", git = "https://github.com/aurora-is-near/aurora-bn.git", default-features = false }
evm = { version = "0.28.0", default-features = false }
evm-core = { version = "0.28.0", default-features = false }
evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "09d4fe09dcb5fcabed8c1076699c8a2e70f14c23", default-features = false }
evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "09d4fe09dcb5fcabed8c1076699c8a2e70f14c23", default-features = false }
Comment on lines +44 to +45
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Obviously, this is temporary. An issue should be raised regarding this to track it.

libsecp256k1 = { version = "0.3.5", default-features = false }
num = { version = "0.4.0", default-features = false, features = ["alloc"] }
primitive-types = { version = "0.9.0", default-features = false, features = ["rlp"] }
Expand Down
12 changes: 4 additions & 8 deletions etc/state-migration-test/Cargo.lock
View file
Open in desktop

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

24 changes: 15 additions & 9 deletions src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::parameters::{
ViewCallArgs,
};

use crate::precompiles;
use crate::precompiles::{self, PrecompileAddresses};
use crate::prelude::{Address, TryInto, Vec, H256, U256};
use crate::sdk;
use crate::state::AuroraStackState;
Expand Down Expand Up @@ -340,7 +340,7 @@ impl Engine {
pub fn deploy_code_with_input(&mut self, input: Vec<u8>) -> EngineResult<SubmitResult> {
let origin = self.origin();
let value = Wei::zero();
self.deploy_code(origin, value, input, u64::MAX)
self.deploy_code(origin, value, input, u64::MAX, Vec::new())
}

pub fn deploy_code(
Expand All @@ -349,11 +349,12 @@ impl Engine {
value: Wei,
input: Vec<u8>,
gas_limit: u64,
access_list: Vec<(Address, Vec<H256>)>, // See EIP-2930
) -> EngineResult<SubmitResult> {
let mut executor = self.make_executor(gas_limit);
let address = executor.create_address(CreateScheme::Legacy { caller: origin });
let (status, result) = (
executor.transact_create(origin, value.raw(), input, gas_limit),
executor.transact_create(origin, value.raw(), input, gas_limit, access_list),
address,
);
let is_succeed = status.is_succeed();
Expand All @@ -378,7 +379,7 @@ impl Engine {
let origin = self.origin();
let contract = Address(args.contract);
let value = Wei::zero();
self.call(origin, contract, value, args.input, u64::MAX)
self.call(origin, contract, value, args.input, u64::MAX, Vec::new())
}

pub fn call(
Expand All @@ -388,10 +389,11 @@ impl Engine {
value: Wei,
input: Vec<u8>,
gas_limit: u64,
access_list: Vec<(Address, Vec<H256>)>, // See EIP-2930
) -> EngineResult<SubmitResult> {
let mut executor = self.make_executor(gas_limit);
let (status, result) =
executor.transact_call(origin, contract, value.raw(), input, gas_limit);
executor.transact_call(origin, contract, value.raw(), input, gas_limit, access_list);

let is_succeed = status.is_succeed();
if let Err(e) = status.into_result() {
Expand Down Expand Up @@ -438,15 +440,18 @@ impl Engine {
) -> EngineResult<Vec<u8>> {
let mut executor = self.make_executor(gas_limit);
let (status, result) =
executor.transact_call(origin, contract, value.raw(), input, gas_limit);
executor.transact_call(origin, contract, value.raw(), input, gas_limit, Vec::new());
status.into_result()?;
Ok(result)
}

fn make_executor(&self, gas_limit: u64) -> StackExecutor<AuroraStackState> {
fn make_executor(
&self,
gas_limit: u64,
) -> StackExecutor<AuroraStackState, PrecompileAddresses<precompiles::Istanbul>> {
let metadata = StackSubstateMetadata::new(gas_limit, CONFIG);
let state = AuroraStackState::new(metadata, self);
StackExecutor::new_with_precompile(state, CONFIG, precompiles::istanbul_precompiles)
StackExecutor::new_with_precompile(state, CONFIG, PrecompileAddresses::istanbul())
}

pub fn register_relayer(&mut self, account_id: &[u8], evm_address: Address) {
Expand Down Expand Up @@ -486,7 +491,7 @@ impl Engine {
value: Wei,
gas_limit: u64,
) -> EngineResult<SubmitResult> {
self.call(sender, receiver, value, Vec::new(), gas_limit)
self.call(sender, receiver, value, Vec::new(), gas_limit, Vec::new())
}

/// Mint tokens for recipient on a particular ERC20 token
Expand Down Expand Up @@ -572,6 +577,7 @@ impl Engine {
Wei::zero(),
[selector, tail.as_slice()].concat(),
u64::MAX,
Vec::new(), // TODO: are there values we should put here?
),
output_on_fail
);
Expand Down
40 changes: 23 additions & 17 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,7 @@ mod contract {

let input = sdk::read_input();

let EthTransaction::Legacy(signed_transaction) =
EthTransaction::try_from(input.as_slice()).sdk_unwrap();
let signed_transaction = EthTransaction::try_from(input.as_slice()).sdk_unwrap();

let state = Engine::get_state().sdk_unwrap();

Expand All @@ -236,35 +235,41 @@ mod contract {
.sender()
.sdk_expect("ERR_INVALID_ECDSA_SIGNATURE");

Engine::check_nonce(&sender, &signed_transaction.transaction.nonce).sdk_unwrap();
Engine::check_nonce(&sender, signed_transaction.nonce()).sdk_unwrap();

// Check intrinsic gas is covered by transaction gas limit
match signed_transaction
.transaction
.intrinsic_gas(crate::engine::CONFIG)
{
match signed_transaction.intrinsic_gas(crate::engine::CONFIG) {
None => sdk::panic_utf8(GAS_OVERFLOW.as_bytes()),
Some(intrinsic_gas) => {
if signed_transaction.transaction.gas < intrinsic_gas.into() {
if signed_transaction.gas_limit() < &intrinsic_gas.into() {
sdk::panic_utf8(b"ERR_INTRINSIC_GAS")
}
}
}

// Figure out what kind of a transaction this is, and execute it:
let mut engine = Engine::new_with_state(state, sender);
let value = signed_transaction.transaction.value;
let gas_limit = signed_transaction
.transaction
.get_gas_limit()
.sdk_expect(GAS_OVERFLOW);
let data = signed_transaction.transaction.data;
let result = if let Some(receiver) = signed_transaction.transaction.to {
Engine::call(&mut engine, sender, receiver, value, data, gas_limit)
let (value, gas_limit, data, maybe_receiver, access_list) =
signed_transaction.destructure();
let gas_limit = gas_limit.sdk_expect(GAS_OVERFLOW);
let access_list = access_list
.into_iter()
.map(|a| (a.address, a.storage_keys))
.collect();
let result = if let Some(receiver) = maybe_receiver {
Engine::call(
&mut engine,
sender,
receiver,
value,
data,
gas_limit,
access_list,
)
// TODO: charge for storage
} else {
// Execute a contract deployment:
Engine::deploy_code(&mut engine, sender, value, data, gas_limit)
Engine::deploy_code(&mut engine, sender, value, data, gas_limit, access_list)
// TODO: charge for storage
};
result
Expand Down Expand Up @@ -294,6 +299,7 @@ mod contract {
meta_call_args.value,
meta_call_args.input,
u64::MAX, // TODO: is there a gas limit with meta calls?
crate::prelude::Vec::new(),
);
result
.map(|res| res.try_to_vec().sdk_expect("ERR_SERIALIZE"))
Expand Down
Loading