Move engine transactions module to engine-transactions crate

Cargo.toml

@@ -35,6 +35,7 @@ members = [
     "engine-standalone-storage",
     "engine-standalone-tracing",
     "engine-tests",
+    "engine-transactions",
     "engine-types",
 ]
 exclude = [

engine-standalone-storage/Cargo.toml

@@ -17,6 +17,7 @@ crate-type = ["lib"]
 aurora-engine = { path = "../engine", default-features = false, features = ["std"] }
 aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] }
 aurora-engine-sdk = { path = "../engine-sdk", default-features = false, features = ["std"] }
+aurora-engine-transactions = { path = "../engine-transactions", default-features = false }
 borsh = { version = "0.8.2" }
 evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", default-features = false }
 rocksdb = "0.16.0"

engine-standalone-storage/src/relayer_db/mod.rs

@@ -1,6 +1,6 @@
 use aurora_engine::engine;
-use aurora_engine::transaction::EthTransactionKind;
 use aurora_engine_sdk::env::{self, Env, DEFAULT_PREPAID_GAS};
+use aurora_engine_transactions::EthTransactionKind;
 use aurora_engine_types::account_id::AccountId;
 use aurora_engine_types::H256;
 use postgres::fallible_iterator::FallibleIterator;
@@ -166,16 +166,19 @@ pub mod error {
             Self::Storage(e)
         }
     }
+
     impl From<postgres::Error> for Error {
         fn from(e: postgres::Error) -> Self {
             Self::Postgres(e)
         }
     }
+
     impl From<engine::EngineStateError> for Error {
         fn from(e: engine::EngineStateError) -> Self {
             Self::EngineState(e)
         }
     }
+
     impl From<engine::EngineError> for Error {
         fn from(e: engine::EngineError) -> Self {
             Self::Engine(e)

engine-standalone-storage/src/relayer_db/types.rs

@@ -1,4 +1,4 @@
-use aurora_engine::transaction::{
+use aurora_engine_transactions::{
     legacy::{LegacyEthSignedTransaction, TransactionLegacy},
     EthTransactionKind,
 };

engine-standalone-storage/src/sync/types.rs

@@ -1,5 +1,5 @@
 use aurora_engine::parameters;
-use aurora_engine::transaction::EthTransactionKind;
+use aurora_engine_transactions::EthTransactionKind;
 use aurora_engine_types::account_id::AccountId;
 use aurora_engine_types::H256;
 

engine-tests/Cargo.toml

@@ -17,6 +17,7 @@ aurora-engine = { path = "../engine", default-features = false, features = ["std
 aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] }
 aurora-engine-sdk = { path = "../engine-sdk", default-features = false, features = ["std"] }
 aurora-engine-precompiles = { path = "../engine-precompiles", default-features = false, features = ["std"] }
+aurora-engine-transactions = { path = "../engine-transactions", default-features = false }
 engine-standalone-storage = { path = "../engine-standalone-storage", default-features = false }
 engine-standalone-tracing = { path = "../engine-standalone-tracing", default-features = false }
 borsh = { version = "0.8.2", default-features = false }

engine-tests/src/benches/nft_pagination.rs

@@ -1,6 +1,6 @@
 use crate::prelude::{Address, Wei, U256};
 use crate::test_utils::{self, solidity};
-use aurora_engine::transaction::legacy::TransactionLegacy;
+use aurora_engine_transactions::legacy::TransactionLegacy;
 use secp256k1::SecretKey;
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -54,6 +54,7 @@ pub(crate) fn measure_gas_usage(
 }
 
 struct MarketPlaceConstructor(solidity::ContractConstructor);
+
 struct MarketPlace(solidity::DeployedContract);
 
 impl MarketPlaceConstructor {

engine-tests/src/prelude.rs

@@ -4,12 +4,13 @@ mod v0 {
     #[cfg(feature = "meta-call")]
     pub use aurora_engine::meta_parsing;
     pub use aurora_engine::parameters;
-    pub use aurora_engine::transaction;
     pub use aurora_engine_sdk as sdk;
+    pub use aurora_engine_transactions as transactions;
     pub use aurora_engine_types::parameters::*;
     pub use aurora_engine_types::storage;
     pub use aurora_engine_types::types::*;
     pub use aurora_engine_types::*;
     pub use borsh::{BorshDeserialize, BorshSerialize};
 }
+
 pub use v0::*;

engine-tests/src/test_utils/erc20.rs

@@ -1,4 +1,4 @@
-use crate::prelude::{transaction::legacy::TransactionLegacy, Address, U256};
+use crate::prelude::{transactions::legacy::TransactionLegacy, Address, U256};
 use crate::test_utils::solidity;
 use std::path::{Path, PathBuf};
 use std::sync::Once;

engine-tests/src/test_utils/exit_precompile.rs

@@ -1,5 +1,5 @@
 use crate::prelude::{
-    parameters::SubmitResult, transaction::legacy::TransactionLegacy, Address, Wei, U256,
+    parameters::SubmitResult, transactions::legacy::TransactionLegacy, Address, Wei, U256,
 };
 use crate::test_utils::{self, solidity, AuroraRunner, Signer};
 

engine-tests/src/test_utils/mod.rs

@@ -14,7 +14,7 @@ use secp256k1::{self, Message, PublicKey, SecretKey};
 
 use crate::prelude::fungible_token::{FungibleToken, FungibleTokenMetadata};
 use crate::prelude::parameters::{InitCallArgs, NewCallArgs, SubmitResult, TransactionStatus};
-use crate::prelude::transaction::{
+use crate::prelude::transactions::{
     eip_1559::{self, SignedTransaction1559, Transaction1559},
     eip_2930::{self, SignedTransaction2930, Transaction2930},
     legacy::{LegacyEthSignedTransaction, TransactionLegacy},

engine-tests/src/test_utils/one_inch/liquidity_protocol.rs

@@ -27,7 +27,7 @@ impl<'a> Helper<'a> {
         let (result, profile) = self
             .runner
             .submit_with_signer_profiled(self.signer, |nonce| {
-                crate::prelude::transaction::legacy::TransactionLegacy {
+                crate::prelude::transactions::legacy::TransactionLegacy {
                     nonce,
                     gas_price: Default::default(),
                     gas_limit: u64::MAX.into(),

engine-tests/src/test_utils/random.rs

@@ -1,6 +1,6 @@
 use crate::prelude::U256;
 use crate::test_utils::{self, solidity, AuroraRunner, Signer};
-use aurora_engine::transaction::legacy::TransactionLegacy;
+use aurora_engine_transactions::legacy::TransactionLegacy;
 use aurora_engine_types::H256;
 use ethabi::Constructor;
 

engine-tests/src/test_utils/self_destruct.rs

@@ -1,5 +1,5 @@
 use crate::prelude::{
-    parameters::CallArgs, parameters::FunctionCallArgsV2, transaction::legacy::TransactionLegacy,
+    parameters::CallArgs, parameters::FunctionCallArgsV2, transactions::legacy::TransactionLegacy,
     Address, WeiU256, U256,
 };
 use crate::test_utils::{self, solidity, AuroraRunner, Signer};

engine-tests/src/test_utils/solidity.rs

@@ -1,4 +1,4 @@
-use crate::prelude::{transaction::legacy::TransactionLegacy, Address, U256};
+use crate::prelude::{transactions::legacy::TransactionLegacy, Address, U256};
 use near_sdk::serde_json;
 use serde::Deserialize;
 use std::fs;

engine-tests/src/test_utils/standalone/mocks/block.rs

@@ -1,4 +1,4 @@
-use aurora_engine::transaction::legacy::LegacyEthSignedTransaction;
+use aurora_engine_transactions::legacy::LegacyEthSignedTransaction;
 
 /// A vastly simplified block structure
 pub struct Block {

engine-tests/src/test_utils/standalone/mod.rs

@@ -1,7 +1,7 @@
 use aurora_engine::engine;
 use aurora_engine::parameters::{CallArgs, DeployErc20TokenArgs, SubmitResult, TransactionStatus};
-use aurora_engine::transaction::legacy::{LegacyEthSignedTransaction, TransactionLegacy};
 use aurora_engine_sdk::env::{self, Env};
+use aurora_engine_transactions::legacy::{LegacyEthSignedTransaction, TransactionLegacy};
 use aurora_engine_types::types::{Address, NearGas, Wei};
 use aurora_engine_types::{H256, U256};
 use borsh::BorshDeserialize;

engine-tests/src/test_utils/standard_precompiles.rs

@@ -1,4 +1,4 @@
-use crate::prelude::{transaction::legacy::TransactionLegacy, U256};
+use crate::prelude::{transactions::legacy::TransactionLegacy, U256};
 use crate::test_utils::solidity;
 use std::path::{Path, PathBuf};
 

engine-tests/src/test_utils/uniswap.rs

@@ -1,6 +1,6 @@
 use crate::prelude::{Address, U256};
 use crate::test_utils::solidity;
-use aurora_engine::transaction::legacy::TransactionLegacy;
+use aurora_engine_transactions::legacy::TransactionLegacy;
 use std::ops::Not;
 use std::path::{Path, PathBuf};
 use std::process::Command;

engine-tests/src/test_utils/weth.rs

@@ -1,4 +1,4 @@
-use aurora_engine::transaction::legacy::TransactionLegacy;
+use aurora_engine_transactions::legacy::TransactionLegacy;
 use aurora_engine_types::types::{Address, Wei};
 use aurora_engine_types::U256;
 

engine-tests/src/tests/access_lists.rs

@@ -1,8 +1,8 @@
+use crate::prelude::transactions::eip_2930::{self, AccessTuple, Transaction2930};
+use crate::prelude::transactions::EthTransactionKind;
 use crate::prelude::Wei;
 use crate::prelude::{H256, U256};
 use crate::test_utils;
-use aurora_engine::transaction::eip_2930::{self, AccessTuple, Transaction2930};
-use aurora_engine::transaction::EthTransactionKind;
 use std::convert::TryFrom;
 use std::iter;
 

engine-tests/src/tests/eip1559.rs

@@ -1,10 +1,10 @@
+use crate::prelude::transactions::eip_1559::{self, SignedTransaction1559, Transaction1559};
+use crate::prelude::transactions::eip_2930::AccessTuple;
+use crate::prelude::transactions::EthTransactionKind;
 use crate::prelude::Wei;
 use crate::prelude::{H256, U256};
 use crate::test_utils;
 use aurora_engine::parameters::SubmitResult;
-use aurora_engine::transaction::eip_1559::{self, SignedTransaction1559, Transaction1559};
-use aurora_engine::transaction::eip_2930::AccessTuple;
-use aurora_engine::transaction::EthTransactionKind;
 use borsh::BorshDeserialize;
 use std::convert::TryFrom;
 use std::iter;

engine-tests/src/tests/erc20_connector.rs

@@ -2,7 +2,7 @@ use crate::prelude::{Address, Balance, TryInto, Wei, WeiU256, U256};
 use crate::test_utils;
 use crate::test_utils::{create_eth_transaction, origin, AuroraRunner};
 use aurora_engine::parameters::{CallArgs, FunctionCallArgsV2, SubmitResult};
-use aurora_engine::transaction::legacy::LegacyEthSignedTransaction;
+use aurora_engine_transactions::legacy::LegacyEthSignedTransaction;
 use borsh::{BorshDeserialize, BorshSerialize};
 use ethabi::Token;
 use near_vm_logic::VMOutcome;
@@ -520,7 +520,7 @@ mod sim_tests {
             nep_141_balance_of(
                 aurora.contract.account_id.as_str(),
                 &aurora.contract,
-                &aurora
+                &aurora,
             ),
             (INITIAL_ETH_BALANCE - ETH_EXIT_AMOUNT).into()
         );
@@ -615,7 +615,7 @@ mod sim_tests {
             nep_141_balance_of(
                 aurora.contract.account_id.as_str(),
                 &aurora.contract,
-                &aurora
+                &aurora,
             ),
             INITIAL_ETH_BALANCE.into()
         );

engine-tests/src/tests/one_inch.rs

@@ -125,7 +125,7 @@ fn deploy_1_inch_limit_order_contract(
         test_utils::solidity::ContractConstructor::compile_from_extended_json(contract_path);
 
     let nonce = signer.use_nonce();
-    let deploy_tx = crate::prelude::transaction::legacy::TransactionLegacy {
+    let deploy_tx = crate::prelude::transactions::legacy::TransactionLegacy {
         nonce: nonce.into(),
         gas_price: Default::default(),
         gas_limit: u64::MAX.into(),

engine-tests/src/tests/sanity.rs

@@ -194,7 +194,7 @@ fn test_override_state() {
     // deploy contract
     let result = runner
         .submit_with_signer(&mut account1, |nonce| {
-            crate::prelude::transaction::legacy::TransactionLegacy {
+            crate::prelude::transactions::legacy::TransactionLegacy {
                 nonce,
                 gas_price: Default::default(),
                 gas_limit: u64::MAX.into(),

engine-tests/src/tests/standalone/sync.rs

@@ -304,7 +304,7 @@ fn test_consume_submit_message() {
     let signed_transaction =
         test_utils::sign_transaction(transaction, Some(runner.chain_id), &signer.secret_key);
     let eth_transaction =
-        aurora_engine::transaction::EthTransactionKind::Legacy(signed_transaction);
+        crate::prelude::transactions::EthTransactionKind::Legacy(signed_transaction);
 
     let transaction_message = sync::types::TransactionMessage {
         block_hash,

engine-tests/src/tests/standalone/tracing.rs

@@ -130,7 +130,7 @@ fn test_evm_tracing() {
     runner.init_evm();
 
     // Deploy contract
-    let deploy_tx = aurora_engine::transaction::legacy::TransactionLegacy {
+    let deploy_tx = aurora_engine_transactions::legacy::TransactionLegacy {
         nonce: signer.use_nonce().into(),
         gas_price: U256::zero(),
         gas_limit: u64::MAX.into(),
@@ -145,7 +145,7 @@ fn test_evm_tracing() {
         Address::try_from_slice(test_utils::unwrap_success_slice(&result)).unwrap();
 
     // Interact with contract (and trace execution)
-    let tx = aurora_engine::transaction::legacy::TransactionLegacy {
+    let tx = aurora_engine_transactions::legacy::TransactionLegacy {
         nonce: signer.use_nonce().into(),
         gas_price: U256::zero(),
         gas_limit: 90_000.into(),

engine-transactions/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "aurora-engine-transactions"
+version = "1.0.0"
+authors = ["NEAR <hello@near.org>"]
+edition = "2018"
+description = ""
+documentation = ""
+readme = true
+homepage = "https://github.com/aurora-is-near/aurora-engine"
+repository = "https://github.com/aurora-is-near/aurora-engine"
+license = "CC0-1.0"
+publish = false
+autobenches = false
+
+[dependencies]
+aurora-engine-types = { path = "../engine-types", default-features = false }
+aurora-engine-sdk = { path = "../engine-sdk", default-features = false }
+aurora-engine-precompiles = { path = "../engine-precompiles", default-features = false }
+evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", default-features = false }
+rlp = { version = "0.5.0", default-features = false }
+hex = { version = "0.4", default-features = false, features = ["alloc"] }
+
+[features]
+std = ["aurora-engine-types/std", "aurora-engine-precompiles/std"]

engine/src/transaction/eip_1559.rs → engine-transactions/src/eip_1559.rs

@@ -1,6 +1,7 @@
-use crate::prelude::precompiles::secp256k1::ecrecover;
-use crate::prelude::{Address, Vec, Wei, U256};
-use crate::transaction::eip_2930::AccessTuple;
+use crate::eip_2930::AccessTuple;
+use aurora_engine_precompiles::secp256k1::ecrecover;
+use aurora_engine_types::types::{Address, Wei};
+use aurora_engine_types::{Vec, U256};
 use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};
 
 /// Type indicator (per EIP-1559)

engine/src/transaction/eip_2930.rs → engine-transactions/src/eip_2930.rs

@@ -1,5 +1,7 @@
-use crate::prelude::precompiles::secp256k1::ecrecover;
-use crate::prelude::{sdk, Address, Vec, Wei, H160, H256, U256};
+use aurora_engine_precompiles::secp256k1::ecrecover;
+use aurora_engine_sdk as sdk;
+use aurora_engine_types::types::{Address, Wei};
+use aurora_engine_types::{Vec, H160, H256, U256};
 use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};
 
 /// Type indicator (per EIP-2718) for access list transactions

engine/src/transaction/legacy.rs → engine-transactions/src/legacy.rs

@@ -1,5 +1,7 @@
-use crate::prelude::precompiles::secp256k1::ecrecover;
-use crate::prelude::{sdk, Address, Vec, Wei, U256};
+use aurora_engine_precompiles::secp256k1::ecrecover;
+use aurora_engine_sdk as sdk;
+use aurora_engine_types::types::{Address, Wei};
+use aurora_engine_types::{Vec, U256};
 use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};
 
 #[derive(Debug, Eq, PartialEq, Clone)]
@@ -40,7 +42,7 @@ impl TransactionLegacy {
     /// Returns self.gas as a u64, or None if self.gas > u64::MAX
     #[allow(unused)]
     pub fn get_gas_limit(&self) -> Option<u64> {
-        use crate::prelude::TryInto;
+        use aurora_engine_types::TryInto;
         self.gas_limit.try_into().ok()
     }
 
@@ -149,6 +151,7 @@ impl Decodable for LegacyEthSignedTransaction {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use aurora_engine_types::vec;
 
     #[test]
     fn test_eth_signed_no_chain_sender() {