Chore: Cleanup dead dependencies

Add new github action Revert "Add new github action" This reverts commit 6265406. Fix wee_alloc depends to be based on arch Revert "Revert "Add new github action"" This reverts commit 36aca38. Add cargo udeps action and make Rebase fixes Add serde feature to evm dependency
aurora-is-near · Aug 16, 2022 · 5c9937d · 5c9937d
1 parent a7c2727
commit 5c9937d
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 856 deletions.
diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
@@ -27,6 +27,14 @@ jobs:
         run: cargo make clippy
       - name: Run cargo clippy
         run: cargo clippy
+  udeps:
+    name: Udeps
+    runs-on: [self-hosted, heavy]
+    steps:
+      - name: Clone the repository
+        uses: actions/checkout@v3
+      - name: Run udeps
+        run: cargo make udeps
   contracts:
     name: Contracts
     runs-on: [self-hosted, light]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile.toml b/Makefile.toml
@@ -64,6 +64,16 @@ args = [
     "--all",
 ]
 
+[tasks.udeps]
+category = "Check"
+env = { "CARGO_MAKE_RUST_CHANNEL" = "nightly", "CARGO_MAKE_CRATE_INSTALLATION_LOCKED" = "true" }
+install_crate = { crate_name = "cargo-udeps", binary = "cargo", min_version = "0.1.30", test_arg = ["udeps", "-h"], force = false }
+command = "${CARGO}"
+args = [
+    "udeps",
+    "--all-targets",
+]
+
 [tasks.clippy]
 category = "Check"
 command = "${CARGO}"
@@ -100,6 +110,7 @@ dependencies = [
     "check-contracts",
     "check-fmt",
     "clippy",
+    "udeps",
 ]
 
 [tasks.post-engine-build-env]

diff --git a/engine-precompiles/Cargo.toml b/engine-precompiles/Cargo.toml
@@ -15,11 +15,9 @@ autobenches = false
 [dependencies]
 aurora-engine-types = { path = "../engine-types", default-features = false }
 aurora-engine-sdk = { path = "../engine-sdk", default-features = false }
-base64 = { version = "0.13.0", default-features = false, features = ["alloc"] }
 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 = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false }
-evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false }
 libsecp256k1 = { version = "0.7.0", default-features = false, features = ["static-context", "hmac"] }
 num = { version = "0.4.0", default-features = false, features = ["alloc"] }
 primitive-types = { version = "0.11", default-features = false, features = ["rlp"] }
@@ -35,7 +33,7 @@ serde_json = "1"
 rand = "0.7.3"
 
 [features]
-std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "borsh/std", "bn/std", "evm/std", "evm-core/std", "libsecp256k1/std", "ripemd160/std", "sha2/std", "sha3/std", "ethabi/std"]
+std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "borsh/std", "bn/std", "evm/std", "libsecp256k1/std", "ripemd160/std", "sha2/std", "sha3/std", "ethabi/std"]
 contract = []
 log = []
 error_refund = []
diff --git a/engine-precompiles/src/utils.rs b/engine-precompiles/src/utils.rs
@@ -2,7 +2,7 @@ use crate::prelude::Borrowed;
 use core::num::TryFromIntError;
 #[cfg(test)]
 use evm::Context;
-use evm_core::ExitError;
+use evm::ExitError;
 
 #[cfg(test)]
 pub fn new_context() -> Context {

diff --git a/engine-sdk/Cargo.toml b/engine-sdk/Cargo.toml
@@ -19,7 +19,7 @@ sha3 = { version = "0.10.2", default-features = false }
 sha2 = { version = "0.10.2", default-features = false }
 
 [features]
-std = ["aurora-engine-types/std"]
+std = ["aurora-engine-types/std", "borsh/std", "sha3/std", "sha2/std"]
 contract = []
 log = []
 mainnet = []

diff --git a/engine-standalone-tracing/Cargo.toml b/engine-standalone-tracing/Cargo.toml
@@ -14,9 +14,7 @@ autobenches = false
 crate-type = ["lib"]
 
 [dependencies]
-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"] }
 evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false, features = ["std"] }
 evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false, features = ["std", "tracing"] }
 evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false, features = ["std", "tracing"] }

diff --git a/engine-tests/Cargo.toml b/engine-tests/Cargo.toml
@@ -13,6 +13,8 @@ publish = false
 autobenches = false
 
 [dependencies]
+
+[dev-dependencies]
 aurora-engine = { path = "../engine", default-features = false, features = ["std", "tracing"] }
 aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] }
 aurora-engine-sdk = { path = "../engine-sdk", default-features = false, features = ["std"] }
@@ -26,8 +28,6 @@ evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-
 evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false, features = ["std", "tracing"] }
 evm-gasometer = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false, features = ["std", "tracing"] }
 rlp = { version = "0.5.0", default-features = false }
-
-[dev-dependencies]
 base64 = "0.13.0"
 bstr = "0.2"
 byte-slice-cast = { version = "1.0", default-features = false }

diff --git a/engine-transactions/Cargo.toml b/engine-transactions/Cargo.toml
@@ -18,9 +18,11 @@ 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", tag = "v0.36.0-aurora", default-features = false }
 rlp = { version = "0.5.0", default-features = false }
-hex = { version = "0.4", default-features = false, features = ["alloc"] }
 serde = { version = "1", features = ["derive"], optional = true }
 
+[dev-dependencies]
+hex = { version = "0.4", default-features = false, features = ["alloc"] }
+
 [features]
-std = ["aurora-engine-types/std", "aurora-engine-precompiles/std", "evm/std", "rlp/std", "hex/std"]
+std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "aurora-engine-precompiles/std", "evm/std", "rlp/std", "hex/std"]
 impl-serde = ["aurora-engine-types/impl-serde", "serde"]
diff --git a/engine-types/Cargo.toml b/engine-types/Cargo.toml
@@ -14,19 +14,14 @@ autobenches = false
 
 [dependencies]
 borsh = { version = "0.8.2", default-features = false }
-ethabi = { version = "17.1", default-features = false }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 primitive-types = { version = "0.11", default-features = false, features = ["rlp"] }
-sha3 = { version = "0.10.2", default-features = false }
 serde = { version = "1", features = ["derive"], optional = true }
 
 [dev-dependencies]
-bstr = "0.2"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
 rand = "0.7.3"
 
 [features]
 default = ["std"]
-std = ["primitive-types/std"]
+std = ["borsh/std", "hex/std", "primitive-types/std"]
 impl-serde = ["primitive-types/impl-serde", "serde"]
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
@@ -22,31 +22,24 @@ aurora-engine-precompiles = { path = "../engine-precompiles", default-features =
 aurora-engine-transactions = { path = "../engine-transactions", default-features = false }
 base64 = { version = "0.13.0", default-features = false, features = ["alloc"] }
 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 = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false }
-evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false }
-libsecp256k1 = { version = "0.7.0", default-features = false }
-num = { version = "0.4.0", default-features = false, features = ["alloc"] }
-primitive-types = { version = "0.10.0", default-features = false, features = ["rlp"] }
-ripemd160 = { version = "0.9.1", default-features = false }
-rlp = { version = "0.5.0", default-features = false }
-sha3 = { version = "0.10.2", default-features = false }
-wee_alloc = { version = "0.4.5", default-features = false }
-logos = { version = "0.12", default-features = false, features = ["export_derive"] }
+byte-slice-cast = { version = "1.0", default-features = false }
 ethabi = { version = "17.1", default-features = false }
+evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
-byte-slice-cast = { version = "1.0", default-features = false }
 rjson = { git = "https://github.com/aurora-is-near/rjson", rev = "cc3da949", default-features = false, features = ["integer"] }
+rlp = { version = "0.5.0", default-features = false }
 serde = { version = "1", features = ["derive"], optional = true }
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wee_alloc = { version = "0.4.5", default-features = false }
+
 [dev-dependencies]
-serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 rand = "0.7.3"
 
 [features]
 default = ["std"]
-std = ["borsh/std", "evm/std", "primitive-types/std", "rlp/std", "sha3/std", "ethabi/std", "logos/std", "bn/std", "aurora-engine-types/std", "rjson/std", "aurora-engine-precompiles/std", "aurora-engine-transactions/std"]
+std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "aurora-engine-precompiles/std", "aurora-engine-transactions/std", "base64/std", "borsh/std", "byte-slice-cast/std", "ethabi/std", "evm/std", "hex/std", "rjson/std", "rlp/std"]
 contract = ["aurora-engine-sdk/contract", "aurora-engine-precompiles/contract"]
 evm_bully = []
 log = ["aurora-engine-sdk/log", "aurora-engine-precompiles/log"]
@@ -55,4 +48,4 @@ error_refund = ["aurora-engine-precompiles/error_refund"]
 integration-test = ["log"]
 mainnet = ["contract", "log", "aurora-engine-sdk/mainnet"]
 testnet = ["contract", "log", "aurora-engine-sdk/testnet"]
-impl-serde = ["aurora-engine-types/impl-serde", "serde", "aurora-engine-transactions/impl-serde", "evm-core/with-serde"]
+impl-serde = ["aurora-engine-types/impl-serde", "serde", "aurora-engine-transactions/impl-serde", "evm/with-serde"]
diff --git a/engine/src/lib.rs b/engine/src/lib.rs
@@ -14,8 +14,6 @@ extern crate alloc;
 extern crate core;
 
 mod map;
-#[cfg(feature = "meta-call")]
-pub mod meta_parsing;
 pub mod parameters;
 pub mod proof;
 
@@ -264,40 +262,6 @@ mod contract {
             .sdk_process();
     }
 
-    #[cfg(feature = "meta-call")]
-    #[no_mangle]
-    pub extern "C" fn meta_call() {
-        use crate::prelude::U256;
-        let io = Runtime;
-        let input = io.read_input().to_vec();
-        let state = engine::get_state(&io).sdk_unwrap();
-        let domain_separator = crate::meta_parsing::near_erc712_domain(U256::from(state.chain_id));
-        let meta_call_args = crate::meta_parsing::parse_meta_call(
-            &domain_separator,
-            io.current_account_id().as_bytes(),
-            input,
-        )
-        .sdk_expect(errors::ERR_META_TX_PARSE);
-
-        engine::check_nonce(&io, &meta_call_args.sender, &meta_call_args.nonce).sdk_unwrap();
-
-        let current_account_id = io.current_account_id();
-        let mut engine =
-            Engine::new_with_state(state, meta_call_args.sender, current_account_id, io, &io);
-        let result = engine.call(
-            &meta_call_args.sender,
-            &meta_call_args.contract_address,
-            meta_call_args.value,
-            meta_call_args.input,
-            u64::MAX, // TODO: is there a gas limit with meta calls?
-            crate::prelude::Vec::new(),
-            &mut Runtime,
-        );
-        result
-            .map(|res| res.try_to_vec().sdk_expect(errors::ERR_SERIALIZE))
-            .sdk_process();
-    }
-
     #[no_mangle]
     pub extern "C" fn register_relayer() {
         let io = Runtime;