diff --git a/Cargo.lock b/Cargo.lock
index 46ef66863f..b7a5d4d0f4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -527,13 +527,13 @@ dependencies = [
[[package]]
name = "async-trait"
-version = "0.1.63"
+version = "0.1.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.107",
+ "syn 2.0.26",
]
[[package]]
@@ -668,7 +668,7 @@ version = "0.65.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cexpr",
"clang-sys",
"lazy_static",
@@ -689,6 +689,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
[[package]]
name = "bitvec"
version = "1.0.1"
@@ -1077,7 +1083,7 @@ checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717"
dependencies = [
"anstream",
"anstyle",
- "bitflags",
+ "bitflags 1.3.2",
"clap_lex",
"strsim",
]
@@ -2187,12 +2193,30 @@ dependencies = [
"instant",
]
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
+[[package]]
+name = "fc-api"
+version = "1.0.0-dev"
+dependencies = [
+ "async-trait",
+ "fp-storage",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-runtime",
+]
+
[[package]]
name = "fc-cli"
version = "1.0.0-dev"
dependencies = [
"clap",
"ethereum-types",
+ "fc-api",
"fc-db",
"fp-rpc",
"fp-storage",
@@ -2234,6 +2258,7 @@ version = "2.0.0-dev"
dependencies = [
"async-trait",
"ethereum",
+ "fc-api",
"fc-storage",
"fp-consensus",
"fp-rpc",
@@ -2302,6 +2327,7 @@ dependencies = [
"ethereum",
"ethereum-types",
"evm",
+ "fc-api",
"fc-db",
"fc-mapping-sync",
"fc-rpc-core",
@@ -2751,7 +2777,7 @@ name = "frame-support"
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"environmental",
"frame-metadata",
"frame-support-procedural",
@@ -2881,6 +2907,7 @@ version = "0.0.0"
dependencies = [
"async-trait",
"clap",
+ "fc-api",
"fc-cli",
"fc-consensus",
"fc-db",
@@ -3078,7 +3105,7 @@ version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
dependencies = [
- "fastrand",
+ "fastrand 1.8.0",
"futures-core",
"futures-io",
"memchr",
@@ -4556,6 +4583,12 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+
[[package]]
name = "lock_api"
version = "0.4.9"
@@ -5000,7 +5033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 1.3.2",
"byteorder",
"libc",
"netlink-packet-core",
@@ -5053,7 +5086,7 @@ version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.6.5",
@@ -5083,9 +5116,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "num"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
dependencies = [
"num-bigint",
"num-complex",
@@ -5248,11 +5281,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
-version = "0.10.48"
+version = "0.10.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"foreign-types",
"libc",
@@ -5280,11 +5313,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.83"
+version = "0.9.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
dependencies = [
- "autocfg",
"cc",
"libc",
"pkg-config",
@@ -5763,9 +5795,9 @@ dependencies = [
[[package]]
name = "parity-db"
-version = "0.4.9"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dab3ac198341b2f0fec6e7f8a6eeed07a41201d98a124260611598c142e76df"
+checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8"
dependencies = [
"blake2",
"crc32fast",
@@ -6065,7 +6097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa"
dependencies = [
"autocfg",
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"concurrent-queue",
"libc",
@@ -6551,7 +6583,7 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
@@ -6560,7 +6592,7 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
@@ -6632,15 +6664,6 @@ version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "resolv-conf"
version = "0.7.0"
@@ -6831,7 +6854,7 @@ version = "0.36.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
@@ -6845,7 +6868,7 @@ version = "0.37.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
@@ -6853,6 +6876,19 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "rustix"
+version = "0.38.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.5",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "rustls"
version = "0.19.1"
@@ -7482,7 +7518,7 @@ version = "0.10.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
dependencies = [
"async-trait",
- "bitflags",
+ "bitflags 1.3.2",
"futures",
"libp2p-identity",
"parity-scale-codec",
@@ -8097,7 +8133,7 @@ version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c4437699b6d34972de58652c68b98cb5b53a4199ab126db8e20ec8ded29a721"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -8140,18 +8176,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.171"
+version = "1.0.179"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
+checksum = "0a5bf42b8d227d4abf38a1ddb08602e229108a517cd4e5bb28f9c7eaafdce5c0"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.171"
+version = "1.0.179"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
+checksum = "741e124f5485c7e60c03b043f79f320bff3527f4bbf12cf3831750dc46a0ec2c"
dependencies = [
"proc-macro2",
"quote",
@@ -8160,9 +8196,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.93"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
dependencies = [
"itoa",
"ryu",
@@ -8560,7 +8596,7 @@ version = "21.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
dependencies = [
"array-bytes",
- "bitflags",
+ "bitflags 1.3.2",
"blake2",
"bounded-collections",
"bs58",
@@ -9218,7 +9254,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg_aliases",
"libc",
"parking_lot 0.11.2",
@@ -9506,7 +9542,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
"system-configuration-sys",
]
@@ -9535,16 +9571,15 @@ checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
[[package]]
name = "tempfile"
-version = "3.3.0"
+version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
dependencies = [
"cfg-if",
- "fastrand",
- "libc",
- "redox_syscall 0.2.16",
- "remove_dir_all",
- "winapi",
+ "fastrand 2.0.0",
+ "redox_syscall 0.3.5",
+ "rustix 0.38.4",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -9564,18 +9599,18 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
[[package]]
name = "thiserror"
-version = "1.0.40"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
@@ -9835,7 +9870,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"bytes",
"futures-core",
"futures-util",
@@ -10848,7 +10883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87"
dependencies = [
"async-trait",
- "bitflags",
+ "bitflags 1.3.2",
"bytes",
"cc",
"ipnet",
diff --git a/Cargo.toml b/Cargo.toml
index b673d5f510..3d91d0b39f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
"frame/evm/precompile/bls12377",
"frame/evm/precompile/dispatch",
"frame/evm/precompile/curve25519",
+ "client/api",
"client/consensus",
"client/rpc-core",
"client/rpc",
@@ -53,8 +54,8 @@ impl-serde = { version = "0.4.0", default-features = false }
jsonrpsee = "0.16.2"
kvdb-rocksdb = "0.19.0"
libsecp256k1 = { version = "0.7.1", default-features = false }
-log = { version = "0.4.17", default-features = false }
-parity-db = "0.4.9"
+log = { version = "0.4.19", default-features = false }
+parity-db = "0.4.10"
parking_lot = "0.12.1"
rlp = { version = "0.5.2", default-features = false }
scale-codec = { package = "parity-scale-codec", version = "3.6.4", default-features = false, features = ["derive"] }
@@ -135,6 +136,7 @@ substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/
substrate-test-runtime-client = { version = "2.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
# Frontier Client
+fc-api = { version = "1.0.0-dev", path = "client/api" }
fc-cli = { version = "1.0.0-dev", path = "client/cli", default-features = false }
fc-consensus = { version = "2.0.0-dev", path = "client/consensus" }
fc-db = { version = "2.0.0-dev", path = "client/db", default-features = false }
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
new file mode 100644
index 0000000000..0a70e8db39
--- /dev/null
+++ b/client/api/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "fc-api"
+version = "1.0.0-dev"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+description = "Frontier client interfaces"
+authors = { workspace = true }
+edition = { workspace = true }
+repository = { workspace = true }
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+async-trait = { workspace = true }
+scale-codec = { package = "parity-scale-codec", workspace = true }
+# Substrate
+sp-core = { workspace = true, features = ["default"] }
+sp-runtime = { workspace = true, features = ["default"] }
+# Frontier
+fp-storage = { workspace = true, features = ["default"] }
diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
new file mode 100644
index 0000000000..7ad26b95a8
--- /dev/null
+++ b/client/api/src/backend.rs
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+// This file is part of Frontier.
+//
+// Copyright (c) 2023 Parity Technologies (UK) Ltd.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+use scale_codec::{Decode, Encode};
+// Substrate
+use sp_core::{H160, H256};
+use sp_runtime::traits::Block as BlockT;
+// Frontier
+use fp_storage::EthereumStorageSchema;
+
+#[derive(Clone, Debug, Eq, PartialEq, Encode, Decode)]
+pub struct TransactionMetadata {
+ pub substrate_block_hash: Block::Hash,
+ pub ethereum_block_hash: H256,
+ pub ethereum_index: u32,
+}
+
+/// The frontier backend interface.
+#[async_trait::async_trait]
+pub trait Backend: Send + Sync {
+ /// Get the substrate hash with the given ethereum block hash.
+ async fn block_hash(
+ &self,
+ ethereum_block_hash: &H256,
+ ) -> Result>, String>;
+
+ /// Get the transaction metadata with the given ethereum block hash.
+ async fn transaction_metadata(
+ &self,
+ ethereum_transaction_hash: &H256,
+ ) -> Result>, String>;
+
+ /// Returns reference to log indexer backend.
+ fn log_indexer(&self) -> &dyn LogIndexerBackend;
+
+ /// Indicate whether the log indexing feature is supported.
+ fn is_indexed(&self) -> bool {
+ self.log_indexer().is_indexed()
+ }
+}
+
+#[derive(Debug, Eq, PartialEq)]
+pub struct FilteredLog {
+ pub substrate_block_hash: Block::Hash,
+ pub ethereum_block_hash: H256,
+ pub block_number: u32,
+ pub ethereum_storage_schema: EthereumStorageSchema,
+ pub transaction_index: u32,
+ pub log_index: u32,
+}
+
+/// The log indexer backend interface.
+#[async_trait::async_trait]
+pub trait LogIndexerBackend: Send + Sync {
+ /// Indicate whether the log indexing feature is supported.
+ fn is_indexed(&self) -> bool;
+
+ /// Filter the logs by the parameters.
+ async fn filter_logs(
+ &self,
+ from_block: u64,
+ to_block: u64,
+ addresses: Vec,
+ topics: Vec>>,
+ ) -> Result>, String>;
+}
diff --git a/client/api/src/lib.rs b/client/api/src/lib.rs
new file mode 100644
index 0000000000..c922fcc439
--- /dev/null
+++ b/client/api/src/lib.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+// This file is part of Frontier.
+//
+// Copyright (c) 2023 Parity Technologies (UK) Ltd.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#![deny(unused_crate_dependencies)]
+
+pub mod backend;
+
+pub use self::backend::*;
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 4c2ec2b7b3..e05c20c63e 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -36,6 +36,7 @@ sp-consensus = { workspace = true }
sp-io = { workspace = true }
substrate-test-runtime-client = { workspace = true }
# Frontier
+fc-api = { workspace = true }
fc-db = { workspace = true, features = ["rocksdb"] }
frontier-template-runtime = { workspace = true, features = ["default"] }
diff --git a/client/cli/src/frontier_db_cmd/tests.rs b/client/cli/src/frontier_db_cmd/tests.rs
index bce1bf7d3e..9d9cb3d216 100644
--- a/client/cli/src/frontier_db_cmd/tests.rs
+++ b/client/cli/src/frontier_db_cmd/tests.rs
@@ -579,8 +579,8 @@ fn commitment_create() {
);
// Expect the offchain-stored transaction metadata to match the one we stored in the runtime.
- let expected_transaction_metadata = fc_db::TransactionMetadata {
- block_hash,
+ let expected_transaction_metadata = fc_api::TransactionMetadata {
+ substrate_block_hash: block_hash,
ethereum_block_hash,
ethereum_index: 0,
};
@@ -660,8 +660,8 @@ fn commitment_update() {
);
// Expect the offchain-stored transaction metadata to match the one we stored in the runtime.
- let expected_transaction_metadata_a1_t1 = fc_db::TransactionMetadata {
- block_hash: block_a1_hash,
+ let expected_transaction_metadata_a1_t1 = fc_api::TransactionMetadata {
+ substrate_block_hash: block_a1_hash,
ethereum_block_hash,
ethereum_index: 0,
};
@@ -706,13 +706,13 @@ fn commitment_update() {
);
// Expect the offchain-stored transaction metadata to have data for both blocks.
- let expected_transaction_metadata_a2_t1 = fc_db::TransactionMetadata {
- block_hash: block_a2_hash,
+ let expected_transaction_metadata_a2_t1 = fc_api::TransactionMetadata {
+ substrate_block_hash: block_a2_hash,
ethereum_block_hash,
ethereum_index: 0,
};
- let expected_transaction_metadata_a2_t2 = fc_db::TransactionMetadata {
- block_hash: block_a2_hash,
+ let expected_transaction_metadata_a2_t2 = fc_api::TransactionMetadata {
+ substrate_block_hash: block_a2_hash,
ethereum_block_hash,
ethereum_index: 1,
};
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 60b4ccb864..9bfe25e7e1 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -19,7 +19,7 @@ log = { workspace = true }
parity-db = { workspace = true }
parking_lot = { workspace = true }
scale-codec = { package = "parity-scale-codec", workspace = true }
-smallvec = { version = "1.10", optional = true }
+smallvec = { version = "1.11", optional = true }
sqlx = { workspace = true, features = ["runtime-tokio-native-tls", "sqlite"], optional = true }
tokio = { workspace = true, features = ["macros", "sync"], optional = true }
# Substrate
@@ -32,6 +32,7 @@ sp-database = { workspace = true }
sp-runtime = { workspace = true }
sp-storage = { workspace = true, optional = true }
# Frontier
+fc-api = { workspace = true }
fc-storage = { workspace = true, optional = true }
fp-consensus = { workspace = true, features = ["default"], optional = true }
fp-rpc = { workspace = true, features = ["default"], optional = true }
@@ -40,7 +41,7 @@ fp-storage = { workspace = true, features = ["default"] }
[dev-dependencies]
futures = { workspace = true }
maplit = "1.0.2"
-tempfile = "3.3.0"
+tempfile = "3.7.0"
# Substrate
sc-block-builder = { workspace = true }
sp-consensus = { workspace = true }
diff --git a/client/db/src/kv/mod.rs b/client/db/src/kv/mod.rs
index 01c9e61e10..c70ec5f51d 100644
--- a/client/db/src/kv/mod.rs
+++ b/client/db/src/kv/mod.rs
@@ -31,14 +31,13 @@ use scale_codec::{Decode, Encode};
// Substrate
pub use sc_client_db::DatabaseSource;
use sp_blockchain::HeaderBackend;
-use sp_core::H256;
+use sp_core::{H160, H256};
pub use sp_database::Database;
use sp_runtime::traits::Block as BlockT;
// Frontier
+use fc_api::{FilteredLog, TransactionMetadata};
use fp_storage::{EthereumStorageSchema, PALLET_ETHEREUM_SCHEMA_CACHE};
-use crate::TransactionMetadata;
-
const DB_HASH_LEN: usize = 32;
/// Hash type that this backend uses for the database.
pub type DbHash = [u8; DB_HASH_LEN];
@@ -66,16 +65,18 @@ pub mod static_keys {
pub struct Backend {
meta: Arc>,
mapping: Arc>,
+ log_indexer: LogIndexerBackend,
}
#[async_trait::async_trait]
-impl crate::BackendReader for Backend {
+impl fc_api::Backend for Backend {
async fn block_hash(
&self,
ethereum_block_hash: &H256,
) -> Result>, String> {
self.mapping().block_hash(ethereum_block_hash)
}
+
async fn transaction_metadata(
&self,
ethereum_transaction_hash: &H256,
@@ -83,19 +84,30 @@ impl crate::BackendReader for Backend {
self.mapping()
.transaction_metadata(ethereum_transaction_hash)
}
+
+ fn log_indexer(&self) -> &dyn fc_api::LogIndexerBackend {
+ &self.log_indexer
+ }
+}
+
+#[derive(Clone, Default)]
+pub struct LogIndexerBackend(PhantomData);
+
+#[async_trait::async_trait]
+impl fc_api::LogIndexerBackend for LogIndexerBackend {
+ fn is_indexed(&self) -> bool {
+ false
+ }
+
async fn filter_logs(
&self,
_from_block: u64,
_to_block: u64,
- _addresses: Vec,
+ _addresses: Vec,
_topics: Vec>>,
- ) -> Result>, String> {
+ ) -> Result>, String> {
Err("KeyValue db does not index logs".into())
}
-
- fn is_indexed(&self) -> bool {
- false
- }
}
/// Returns the frontier database directory.
@@ -152,6 +164,7 @@ impl Backend {
db: db.clone(),
_marker: PhantomData,
}),
+ log_indexer: LogIndexerBackend(PhantomData),
})
}
@@ -171,13 +184,11 @@ pub struct MetaDb {
impl MetaDb {
pub fn current_syncing_tips(&self) -> Result, String> {
- match self.db.get(
- crate::columns::META,
- crate::static_keys::CURRENT_SYNCING_TIPS,
- ) {
- Some(raw) => {
- Ok(Vec::::decode(&mut &raw[..]).map_err(|e| format!("{:?}", e))?)
- }
+ match self
+ .db
+ .get(columns::META, static_keys::CURRENT_SYNCING_TIPS)
+ {
+ Some(raw) => Ok(Vec::::decode(&mut &raw[..]).map_err(|e| e.to_string())?),
None => Ok(Vec::new()),
}
}
@@ -186,14 +197,12 @@ impl MetaDb {
let mut transaction = sp_database::Transaction::new();
transaction.set(
- crate::columns::META,
- crate::static_keys::CURRENT_SYNCING_TIPS,
+ columns::META,
+ static_keys::CURRENT_SYNCING_TIPS,
&tips.encode(),
);
- self.db
- .commit(transaction)
- .map_err(|e| format!("{:?}", e))?;
+ self.db.commit(transaction).map_err(|e| e.to_string())?;
Ok(())
}
@@ -201,10 +210,10 @@ impl MetaDb {
pub fn ethereum_schema(&self) -> Result>, String> {
match self
.db
- .get(crate::columns::META, &PALLET_ETHEREUM_SCHEMA_CACHE.encode())
+ .get(columns::META, &PALLET_ETHEREUM_SCHEMA_CACHE.encode())
{
Some(raw) => Ok(Some(
- Decode::decode(&mut &raw[..]).map_err(|e| format!("{:?}", e))?,
+ Decode::decode(&mut &raw[..]).map_err(|e| e.to_string())?,
)),
None => Ok(None),
}
@@ -217,14 +226,12 @@ impl MetaDb {
let mut transaction = sp_database::Transaction::new();
transaction.set(
- crate::columns::META,
+ columns::META,
&PALLET_ETHEREUM_SCHEMA_CACHE.encode(),
&new_cache.encode(),
);
- self.db
- .commit(transaction)
- .map_err(|e| format!("{:?}", e))?;
+ self.db.commit(transaction).map_err(|e| e.to_string())?;
Ok(())
}
@@ -245,10 +252,7 @@ pub struct MappingDb {
impl MappingDb {
pub fn is_synced(&self, block_hash: &Block::Hash) -> Result {
- match self
- .db
- .get(crate::columns::SYNCED_MAPPING, &block_hash.encode())
- {
+ match self.db.get(columns::SYNCED_MAPPING, &block_hash.encode()) {
Some(raw) => Ok(bool::decode(&mut &raw[..]).map_err(|e| format!("{:?}", e))?),
None => Ok(false),
}
@@ -260,7 +264,7 @@ impl MappingDb {
) -> Result>, String> {
match self
.db
- .get(crate::columns::BLOCK_MAPPING, ðereum_block_hash.encode())
+ .get(columns::BLOCK_MAPPING, ðereum_block_hash.encode())
{
Some(raw) => Ok(Some(
Vec::::decode(&mut &raw[..]).map_err(|e| format!("{:?}", e))?,
@@ -274,11 +278,11 @@ impl MappingDb {
ethereum_transaction_hash: &H256,
) -> Result>, String> {
match self.db.get(
- crate::columns::TRANSACTION_MAPPING,
+ columns::TRANSACTION_MAPPING,
ðereum_transaction_hash.encode(),
) {
Some(raw) => Ok(Vec::>::decode(&mut &raw[..])
- .map_err(|e| format!("{:?}", e))?),
+ .map_err(|e| e.to_string())?),
None => Ok(Vec::new()),
}
}
@@ -289,14 +293,12 @@ impl MappingDb {
let mut transaction = sp_database::Transaction::new();
transaction.set(
- crate::columns::SYNCED_MAPPING,
+ columns::SYNCED_MAPPING,
&block_hash.encode(),
&true.encode(),
);
- self.db
- .commit(transaction)
- .map_err(|e| format!("{:?}", e))?;
+ self.db.commit(transaction).map_err(|e| e.to_string())?;
Ok(())
}
@@ -323,7 +325,7 @@ impl MappingDb {
};
transaction.set(
- crate::columns::BLOCK_MAPPING,
+ columns::BLOCK_MAPPING,
&commitment.ethereum_block_hash.encode(),
&substrate_hashes.encode(),
);
@@ -335,26 +337,24 @@ impl MappingDb {
{
let mut metadata = self.transaction_metadata(ðereum_transaction_hash)?;
metadata.push(TransactionMetadata:: {
- block_hash: commitment.block_hash,
+ substrate_block_hash: commitment.block_hash,
ethereum_block_hash: commitment.ethereum_block_hash,
ethereum_index: i as u32,
});
transaction.set(
- crate::columns::TRANSACTION_MAPPING,
+ columns::TRANSACTION_MAPPING,
ðereum_transaction_hash.encode(),
&metadata.encode(),
);
}
transaction.set(
- crate::columns::SYNCED_MAPPING,
+ columns::SYNCED_MAPPING,
&commitment.block_hash.encode(),
&true.encode(),
);
- self.db
- .commit(transaction)
- .map_err(|e| format!("{:?}", e))?;
+ self.db.commit(transaction).map_err(|e| e.to_string())?;
Ok(())
}
diff --git a/client/db/src/kv/upgrade.rs b/client/db/src/kv/upgrade.rs
index c57e47dfb7..b8acafa382 100644
--- a/client/db/src/kv/upgrade.rs
+++ b/client/db/src/kv/upgrade.rs
@@ -321,27 +321,26 @@ pub(crate) fn migrate_1_to_2_parity_db>(
#[cfg(test)]
mod tests {
- use futures::executor;
- use sc_block_builder::BlockBuilderProvider;
- use sp_consensus::BlockOrigin;
- use substrate_test_runtime_client::{
- prelude::*, DefaultTestClientBuilderExt, TestClientBuilder,
- };
-
use std::{
io::{Read, Write},
sync::Arc,
};
- use crate::kv::DatabaseSettings;
+ use futures::executor;
use scale_codec::Encode;
+ use tempfile::tempdir;
+ // Substrate
+ use sc_block_builder::BlockBuilderProvider;
use sp_blockchain::HeaderBackend;
+ use sp_consensus::BlockOrigin;
use sp_core::H256;
use sp_runtime::{
generic::{Block, Header},
traits::{BlakeTwo256, Block as BlockT},
};
- use tempfile::tempdir;
+ use substrate_test_runtime_client::{
+ prelude::*, DefaultTestClientBuilderExt, TestClientBuilder,
+ };
type OpaqueBlock =
Block, substrate_test_runtime_client::runtime::Extrinsic>;
@@ -356,7 +355,7 @@ mod tests {
#[cfg_attr(not(feature = "rocksdb"), ignore)]
#[test]
fn upgrade_1_to_2_works() {
- let settings: Vec = vec![
+ let settings: Vec = vec![
// Rocks db
#[cfg(feature = "rocksdb")]
crate::kv::DatabaseSettings {
@@ -443,7 +442,7 @@ mod tests {
let mut metadata = vec![];
for hash in vec![next_canon_block_hash, orphan_block_hash].iter() {
metadata.push(crate::kv::TransactionMetadata:: {
- block_hash: *hash,
+ substrate_block_hash: *hash,
ethereum_block_hash: ethhash,
ethereum_index: 0u32,
});
@@ -493,7 +492,7 @@ mod tests {
.unwrap();
assert!(mapped_transaction
.into_iter()
- .any(|tx| tx.block_hash == *canon_substrate_block_hash));
+ .any(|tx| tx.substrate_block_hash == *canon_substrate_block_hash));
}
// Upgrade db version file
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index fb3b8c2230..5fa2044b85 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -18,15 +18,11 @@
#![deny(unused_crate_dependencies)]
-use scale_codec::{Decode, Encode};
// Substrate
pub use sc_client_db::DatabaseSource;
-use sp_core::H256;
use sp_runtime::traits::Block as BlockT;
pub mod kv;
-use kv::{columns, static_keys};
-
#[cfg(feature = "sql")]
pub mod sql;
@@ -36,43 +32,3 @@ pub enum Backend {
#[cfg(feature = "sql")]
Sql(sql::Backend),
}
-
-#[derive(Clone, Encode, Debug, Decode, Eq, PartialEq)]
-pub struct TransactionMetadata {
- pub block_hash: Block::Hash,
- pub ethereum_block_hash: H256,
- pub ethereum_index: u32,
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub struct FilteredLog {
- pub substrate_block_hash: Block::Hash,
- pub ethereum_block_hash: H256,
- pub block_number: u32,
- pub ethereum_storage_schema: fp_storage::EthereumStorageSchema,
- pub transaction_index: u32,
- pub log_index: u32,
-}
-
-#[async_trait::async_trait]
-pub trait BackendReader {
- async fn block_hash(
- &self,
- ethereum_block_hash: &H256,
- ) -> Result>, String>;
-
- async fn transaction_metadata(
- &self,
- ethereum_transaction_hash: &H256,
- ) -> Result>, String>;
-
- async fn filter_logs(
- &self,
- from_block: u64,
- to_block: u64,
- addresses: Vec,
- topics: Vec>>,
- ) -> Result>, String>;
-
- fn is_indexed(&self) -> bool;
-}
diff --git a/client/db/src/sql/mod.rs b/client/db/src/sql/mod.rs
index 2cbf0c7f97..ead5c0acb6 100644
--- a/client/db/src/sql/mod.rs
+++ b/client/db/src/sql/mod.rs
@@ -37,13 +37,12 @@ use sp_runtime::{
traits::{BlakeTwo256, Block as BlockT, Header as HeaderT, UniqueSaturatedInto, Zero},
};
// Frontier
+use fc_api::{FilteredLog, TransactionMetadata};
use fc_storage::OverrideHandle;
use fp_consensus::{FindLogError, Hashes, Log as ConsensusLog, PostLog, PreLog};
use fp_rpc::EthereumRuntimeRPCApi;
use fp_storage::{EthereumStorageSchema, PALLET_ETHEREUM_SCHEMA};
-use crate::{BackendReader, FilteredLog};
-
/// Maximum number to topics allowed to be filtered upon
const MAX_TOPIC_COUNT: u16 = 4;
@@ -65,7 +64,7 @@ pub struct Log {
struct BlockMetadata {
pub substrate_block_hash: H256,
pub block_number: i32,
- pub post_hashes: fp_consensus::Hashes,
+ pub post_hashes: Hashes,
pub schema: EthereumStorageSchema,
pub is_canon: i32,
}
@@ -108,7 +107,7 @@ pub struct Backend {
impl Backend
where
- Block: BlockT + Send + Sync,
+ Block: BlockT,
{
/// Creates a new instance of the SQL backend.
pub async fn new(
@@ -201,7 +200,7 @@ where
client: Arc,
) -> Result, Error>
where
- Client: StorageProvider + HeaderBackend + Send + Sync + 'static,
+ Client: StorageProvider + HeaderBackend + 'static,
Client: ProvideRuntimeApi,
Client::Api: EthereumRuntimeRPCApi,
BE: BackendT + 'static,
@@ -270,7 +269,7 @@ where
overrides: Arc>,
) -> Result
where
- Client: StorageProvider + HeaderBackend + Send + Sync + 'static,
+ Client: StorageProvider + HeaderBackend + 'static,
BE: BackendT + 'static,
BE::State: StateBackend,
{
@@ -362,7 +361,7 @@ where
hash: H256,
) -> Result<(), Error>
where
- Client: StorageProvider + HeaderBackend + Send + Sync + 'static,
+ Client: StorageProvider + HeaderBackend + 'static,
BE: BackendT + 'static,
BE::State: StateBackend,
{
@@ -438,7 +437,7 @@ where
/// Index the logs for the newly indexed blocks upto a `max_pending_blocks` value.
pub async fn index_block_logs(&self, client: Arc, block_hash: Block::Hash)
where
- Client: StorageProvider + HeaderBackend + Send + Sync + 'static,
+ Client: StorageProvider + HeaderBackend + 'static,
BE: BackendT + 'static,
BE::State: StateBackend,
{
@@ -519,7 +518,7 @@ where
substrate_block_hash: H256,
) -> Vec
where
- Client: StorageProvider + HeaderBackend + Send + Sync + 'static,
+ Client: StorageProvider + HeaderBackend + 'static,
BE: BackendT + 'static,
BE::State: StateBackend,
{
@@ -567,7 +566,7 @@ where
fn onchain_storage_schema(client: &Client, at: Block::Hash) -> EthereumStorageSchema
where
- Client: StorageProvider + HeaderBackend + Send + Sync + 'static,
+ Client: StorageProvider + HeaderBackend + 'static,
BE: BackendT + 'static,
BE::State: StateBackend,
{
@@ -797,7 +796,7 @@ where
}
#[async_trait::async_trait]
-impl> BackendReader for Backend {
+impl> fc_api::Backend for Backend {
async fn block_hash(
&self,
ethereum_block_hash: &H256,
@@ -822,7 +821,7 @@ impl> BackendReader for Backend {
async fn transaction_metadata(
&self,
ethereum_transaction_hash: &H256,
- ) -> Result>, String> {
+ ) -> Result>, String> {
let ethereum_transaction_hash = ethereum_transaction_hash.as_bytes();
let out = sqlx::query(
"SELECT
@@ -840,8 +839,8 @@ impl> BackendReader for Backend {
let ethereum_block_hash =
H256::from_slice(&row.try_get::, _>(1).unwrap_or_default()[..]);
let ethereum_transaction_index = row.try_get::(2).unwrap_or_default() as u32;
- crate::TransactionMetadata {
- block_hash: substrate_block_hash,
+ TransactionMetadata {
+ substrate_block_hash,
ethereum_block_hash,
ethereum_index: ethereum_transaction_index,
}
@@ -851,6 +850,17 @@ impl> BackendReader for Backend {
Ok(out)
}
+ fn log_indexer(&self) -> &dyn fc_api::LogIndexerBackend {
+ self
+ }
+}
+
+#[async_trait::async_trait]
+impl> fc_api::LogIndexerBackend for Backend {
+ fn is_indexed(&self) -> bool {
+ true
+ }
+
async fn filter_logs(
&self,
from_block: u64,
@@ -876,10 +886,7 @@ impl> BackendReader for Backend {
}
}
- let log_key = format!(
- "{}-{}-{:?}-{:?}",
- from_block, to_block, addresses, unique_topics
- );
+ let log_key = format!("{from_block}-{to_block}-{addresses:?}-{unique_topics:?}");
let mut qb = QueryBuilder::new("");
let query = build_query(&mut qb, from_block, to_block, addresses, unique_topics);
let sql = query.sql();
@@ -949,10 +956,6 @@ impl> BackendReader for Backend {
log::info!(target: "frontier-sql", "FILTER remove handler - {log_key}");
Ok(out)
}
-
- fn is_indexed(&self) -> bool {
- true
- }
}
/// Build a SQL query to retrieve a list of logs given certain constraints.
@@ -1046,6 +1049,7 @@ mod test {
DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
};
// Frontier
+ use fc_api::Backend as BackendT;
use fc_storage::{OverrideHandle, SchemaV3Override, StorageOverride};
use fp_storage::{EthereumStorageSchema, PALLET_ETHEREUM_SCHEMA};
@@ -1073,7 +1077,7 @@ mod test {
#[allow(unused)]
struct TestData {
- backend: super::Backend,
+ backend: Backend,
alice: H160,
bob: H160,
topics_a: H256,
@@ -1135,8 +1139,8 @@ mod test {
});
// Indexer backend
- let indexer_backend = super::Backend::new(
- super::BackendConfig::Sqlite(super::SqliteBackendConfig {
+ let indexer_backend = Backend::new(
+ BackendConfig::Sqlite(SqliteBackendConfig {
path: Path::new("sqlite:///")
.join(tmp.path())
.join("test.db3")
@@ -1383,10 +1387,11 @@ mod test {
}
async fn run_test_case(
- backend: super::Backend,
+ backend: Backend,
test_case: &TestFilter,
) -> Result>, String> {
backend
+ .log_indexer()
.filter_logs(
test_case.from_block,
test_case.to_block,
@@ -1840,8 +1845,7 @@ ORDER BY b.block_number ASC, l.transaction_index ASC, l.log_index ASC
LIMIT 10001";
let mut qb = QueryBuilder::new("");
- let actual_query_sql =
- super::build_query(&mut qb, from_block, to_block, addresses, topics).sql();
+ let actual_query_sql = build_query(&mut qb, from_block, to_block, addresses, topics).sql();
assert_eq!(expected_query_sql, actual_query_sql);
}
}
diff --git a/client/mapping-sync/Cargo.toml b/client/mapping-sync/Cargo.toml
index f999a11e24..6ff63eecd1 100644
--- a/client/mapping-sync/Cargo.toml
+++ b/client/mapping-sync/Cargo.toml
@@ -35,7 +35,7 @@ ethereum = { workspace = true }
ethereum-types = { workspace = true }
scale-codec = { package = "parity-scale-codec", workspace = true }
sqlx = { workspace = true, features = ["runtime-tokio-native-tls", "sqlite"] }
-tempfile = "3.3.0"
+tempfile = "3.7.0"
tokio = { workspace = true, features = ["sync"] }
# Substrate
sc-block-builder = { workspace = true }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index e08070e713..02c9964443 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -48,7 +48,7 @@ sp-runtime = { workspace = true }
sp-state-machine = { workspace = true }
sp-storage = { workspace = true }
# Frontier
-fc-db = { workspace = true }
+fc-api = { workspace = true }
fc-mapping-sync = { workspace = true }
fc-rpc-core = { workspace = true }
fc-storage = { workspace = true }
@@ -59,12 +59,14 @@ fp-storage = { workspace = true, features = ["default"] }
pallet-evm = { workspace = true }
[dev-dependencies]
-tempfile = "3.3.0"
+tempfile = "3.7.0"
# Substrate
sc-block-builder = { workspace = true }
sc-client-db = { workspace = true, features = ["rocksdb"] }
sp-consensus = { workspace = true }
substrate-test-runtime-client = { workspace = true }
+# Frontier
+fc-db = { workspace = true }
[features]
default = ["rocksdb"]
diff --git a/client/rpc/src/eth/filter.rs b/client/rpc/src/eth/filter.rs
index 57e4051810..8a0f484173 100644
--- a/client/rpc/src/eth/filter.rs
+++ b/client/rpc/src/eth/filter.rs
@@ -16,7 +16,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-use std::{collections::HashSet, marker::PhantomData, sync::Arc, time};
+use std::{
+ collections::{BTreeMap, HashSet},
+ marker::PhantomData,
+ sync::Arc,
+ time::{Duration, Instant},
+};
use ethereum::BlockV2 as EthereumBlock;
use ethereum_types::{H256, U256};
@@ -40,7 +45,7 @@ use crate::{eth::cache::EthBlockDataCacheTask, frontier_backend_client, internal
pub struct EthFilter {
client: Arc,
- backend: Arc + Send + Sync>,
+ backend: Arc>,
graph: Arc>,
filter_pool: FilterPool,
max_stored_filters: usize,
@@ -52,7 +57,7 @@ pub struct EthFilter {
impl EthFilter {
pub fn new(
client: Arc,
- backend: Arc + Send + Sync>,
+ backend: Arc>,
graph: Arc>,
filter_pool: FilterPool,
max_stored_filters: usize,
@@ -340,7 +345,7 @@ where
if backend.is_indexed() {
let _ = filter_range_logs_indexed(
client.as_ref(),
- backend.as_ref(),
+ backend.log_indexer(),
&block_data_cache,
&mut ret,
max_past_logs,
@@ -419,7 +424,7 @@ where
if backend.is_indexed() {
let _ = filter_range_logs_indexed(
client.as_ref(),
- backend.as_ref(),
+ backend.log_indexer(),
&block_data_cache,
&mut ret,
max_past_logs,
@@ -508,7 +513,7 @@ where
if backend.is_indexed() {
let _ = filter_range_logs_indexed(
client.as_ref(),
- backend.as_ref(),
+ backend.log_indexer(),
&block_data_cache,
&mut ret,
max_past_logs,
@@ -536,7 +541,7 @@ where
async fn filter_range_logs_indexed(
_client: &C,
- backend: &(dyn fc_db::BackendReader + Send + Sync),
+ backend: &dyn fc_api::LogIndexerBackend,
block_data_cache: &EthBlockDataCacheTask,
ret: &mut Vec,
max_past_logs: u32,
@@ -551,13 +556,12 @@ where
C: HeaderBackend + StorageProvider + 'static,
BE: Backend + 'static,
{
- use std::time::Instant;
let timer_start = Instant::now();
let timer_prepare = Instant::now();
// Max request duration of 10 seconds.
- let max_duration = time::Duration::from_secs(10);
- let begin_request = time::Instant::now();
+ let max_duration = Duration::from_secs(10);
+ let begin_request = Instant::now();
let topics_input = if filter.topics.is_some() {
let filtered_params = FilteredParams::new(Some(filter.clone()));
@@ -595,7 +599,6 @@ where
{
let time_fetch = timer_fetch.elapsed().as_millis();
let timer_post = Instant::now();
- use std::collections::BTreeMap;
let mut statuses_cache: BTreeMap>> = BTreeMap::new();
@@ -697,8 +700,8 @@ where
BE: Backend + 'static,
{
// Max request duration of 10 seconds.
- let max_duration = time::Duration::from_secs(10);
- let begin_request = time::Instant::now();
+ let max_duration = Duration::from_secs(10);
+ let begin_request = Instant::now();
let mut current_number = from;
diff --git a/client/rpc/src/eth/mod.rs b/client/rpc/src/eth/mod.rs
index ed7a1491a1..646924bb9b 100644
--- a/client/rpc/src/eth/mod.rs
+++ b/client/rpc/src/eth/mod.rs
@@ -80,7 +80,7 @@ pub struct Eth> {
is_authority: bool,
signers: Vec>,
overrides: Arc>,
- backend: Arc + Send + Sync>,
+ backend: Arc>,
block_data_cache: Arc>,
fee_history_cache: FeeHistoryCache,
fee_history_cache_limit: FeeHistoryCacheLimit,
@@ -100,7 +100,7 @@ impl Eth {
sync: Arc>,
signers: Vec>,
overrides: Arc>,
- backend: Arc + Send + Sync>,
+ backend: Arc>,
is_authority: bool,
block_data_cache: Arc>,
fee_history_cache: FeeHistoryCache,
diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs
index 9964cad1e4..6d52fb4d68 100644
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -187,7 +187,7 @@ pub mod frontier_backend_client {
pub async fn native_block_id(
client: &C,
- backend: &(dyn fc_db::BackendReader + Send + Sync),
+ backend: &dyn fc_api::Backend,
number: Option,
) -> RpcResult>>
where
@@ -213,7 +213,7 @@ pub mod frontier_backend_client {
pub async fn load_hash(
client: &C,
- backend: &(dyn fc_db::BackendReader + Send + Sync),
+ backend: &dyn fc_api::Backend,
hash: H256,
) -> RpcResult>
where
@@ -250,7 +250,7 @@ pub mod frontier_backend_client {
pub async fn load_transactions(
client: &C,
- backend: &(dyn fc_db::BackendReader + Send + Sync),
+ backend: &dyn fc_api::Backend,
transaction_hash: H256,
only_canonical: bool,
) -> RpcResult>
@@ -265,7 +265,7 @@ pub mod frontier_backend_client {
transaction_metadata
.iter()
- .find(|meta| is_canon::(client, meta.block_hash))
+ .find(|meta| is_canon::(client, meta.substrate_block_hash))
.map_or_else(
|| {
if !only_canonical && transaction_metadata.len() > 0 {
diff --git a/docs/yarn.lock b/docs/yarn.lock
index e551b16dbd..ff92a6011b 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -6842,14 +6842,14 @@ semver@7.0.0:
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+ version "5.7.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+ integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
- integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+ integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
send@0.18.0:
version "0.18.0"
diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs
index cf69889944..8d4b5be5cd 100644
--- a/frame/ethereum/src/lib.rs
+++ b/frame/ethereum/src/lib.rs
@@ -33,16 +33,16 @@ mod tests;
use ethereum_types::{Bloom, BloomInput, H160, H256, H64, U256};
use evm::ExitReason;
use fp_consensus::{PostLog, PreLog, FRONTIER_ENGINE_ID};
-use fp_ethereum::{
- TransactionData, TransactionValidationError, ValidatedTransaction as ValidatedTransactionT,
-};
+use fp_ethereum::{TransactionValidationError, ValidatedTransaction as ValidatedTransactionT};
use fp_evm::{
CallOrCreateInfo, CheckEvmTransaction, CheckEvmTransactionConfig, InvalidEvmTransactionError,
};
use fp_storage::{EthereumStorageSchema, PALLET_ETHEREUM_SCHEMA};
use frame_support::{
codec::{Decode, Encode, MaxEncodedLen},
- dispatch::{DispatchInfo, DispatchResultWithPostInfo, Pays, PostDispatchInfo},
+ dispatch::{
+ DispatchErrorWithPostInfo, DispatchInfo, DispatchResultWithPostInfo, Pays, PostDispatchInfo,
+ },
scale_info::TypeInfo,
traits::{EnsureOrigin, Get, PalletInfoAccess, Time},
weights::Weight,
@@ -55,7 +55,7 @@ use sp_runtime::{
transaction_validity::{
InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransactionBuilder,
},
- DispatchErrorWithPostInfo, RuntimeDebug, SaturatedConversion,
+ RuntimeDebug, SaturatedConversion,
};
use sp_std::{marker::PhantomData, prelude::*};
@@ -63,6 +63,7 @@ pub use ethereum::{
AccessListItem, BlockV2 as Block, LegacyTransactionMessage, Log, ReceiptV3 as Receipt,
TransactionAction, TransactionV2 as Transaction,
};
+pub use fp_ethereum::TransactionData;
pub use fp_rpc::TransactionStatus;
#[derive(Clone, Eq, PartialEq, RuntimeDebug)]
@@ -241,7 +242,7 @@ pub mod pallet {
Self::validate_transaction_in_block(source, &transaction).expect(
"pre-block transaction verification failed; the block cannot be built",
);
- let r = Self::apply_validated_transaction(source, transaction)
+ let (r, _) = Self::apply_validated_transaction(source, transaction)
.expect("pre-block apply transaction failed; the block cannot be built");
weight = weight.saturating_add(r.actual_weight.unwrap_or_default());
@@ -290,7 +291,7 @@ pub mod pallet {
"pre log already exists; block is invalid",
);
- Self::apply_validated_transaction(source, transaction)
+ Self::apply_validated_transaction(source, transaction).map(|(post_info, _)| post_info)
}
}
@@ -356,15 +357,17 @@ pub mod pallet {
}
impl Pallet {
- /// The call wrapped in the extrinsic is part of the PoV, record this as a base cost for the size of the proof.
- fn proof_size_base_cost(transaction: &Transaction) -> u64 {
- transaction
- .encode()
- .len()
- // pallet index
- .saturating_add(1)
- // call index
- .saturating_add(1) as u64
+ pub fn transaction_weight(transaction_data: &TransactionData) -> (Option, Option) {
+ match ::GasWeightMapping::gas_to_weight(
+ transaction_data.gas_limit.unique_saturated_into(),
+ true,
+ ) {
+ weight_limit if weight_limit.proof_size() > 0 => (
+ Some(weight_limit),
+ Some(transaction_data.proof_size_base_cost.unwrap_or_default()),
+ ),
+ _ => (None, None),
+ }
}
fn recover_signer(transaction: &Transaction) -> Option {
@@ -486,19 +489,7 @@ impl Pallet {
) -> TransactionValidity {
let transaction_data: TransactionData = transaction.into();
let transaction_nonce = transaction_data.nonce;
-
- let (weight_limit, proof_size_base_cost) =
- match ::GasWeightMapping::gas_to_weight(
- transaction_data.gas_limit.unique_saturated_into(),
- true,
- ) {
- weight_limit if weight_limit.proof_size() > 0 => (
- Some(weight_limit),
- Some(Self::proof_size_base_cost(transaction)),
- ),
- _ => (None, None),
- };
-
+ let (weight_limit, proof_size_base_cost) = Self::transaction_weight(&transaction_data);
let (base_fee, _) = T::FeeCalculator::min_gas_price();
let (who, _) = pallet_evm::Pallet::::account_basic(&origin);
@@ -520,6 +511,16 @@ impl Pallet {
.and_then(|v| v.with_balance_for(&who))
.map_err(|e| e.0)?;
+ // EIP-3607: https://eips.ethereum.org/EIPS/eip-3607
+ // Do not allow transactions for which `tx.sender` has any code deployed.
+ //
+ // This check should be done on the transaction validation (here) **and**
+ // on trnasaction execution, otherwise a contract tx will be included in
+ // the mempool and pollute the mempool forever.
+ if !pallet_evm::AccountCodes::::get(origin).is_empty() {
+ return Err(InvalidTransaction::BadSigner.into());
+ }
+
let priority = match (
transaction_data.gas_price,
transaction_data.max_fee_per_gas,
@@ -561,14 +562,14 @@ impl Pallet {
fn apply_validated_transaction(
source: H160,
transaction: Transaction,
- ) -> DispatchResultWithPostInfo {
+ ) -> Result<(PostDispatchInfo, CallOrCreateInfo), DispatchErrorWithPostInfo> {
let (to, _, info) = Self::execute(source, &transaction, None)?;
let pending = Pending::::get();
let transaction_hash = transaction.hash();
let transaction_index = pending.len() as u32;
- let (reason, status, weight_info, used_gas, dest, extra_data) = match info {
+ let (reason, status, weight_info, used_gas, dest, extra_data) = match info.clone() {
CallOrCreateInfo::Call(info) => (
info.exit_reason.clone(),
TransactionStatus {
@@ -683,24 +684,27 @@ impl Pallet {
extra_data,
});
- Ok(PostDispatchInfo {
- actual_weight: {
- let mut gas_to_weight = T::GasWeightMapping::gas_to_weight(
- sp_std::cmp::max(
- used_gas.standard.unique_saturated_into(),
- used_gas.effective.unique_saturated_into(),
- ),
- true,
- );
- if let Some(weight_info) = weight_info {
- if let Some(proof_size_usage) = weight_info.proof_size_usage {
- *gas_to_weight.proof_size_mut() = proof_size_usage;
+ Ok((
+ PostDispatchInfo {
+ actual_weight: {
+ let mut gas_to_weight = T::GasWeightMapping::gas_to_weight(
+ sp_std::cmp::max(
+ used_gas.standard.unique_saturated_into(),
+ used_gas.effective.unique_saturated_into(),
+ ),
+ true,
+ );
+ if let Some(weight_info) = weight_info {
+ if let Some(proof_size_usage) = weight_info.proof_size_usage {
+ *gas_to_weight.proof_size_mut() = proof_size_usage;
+ }
}
- }
- Some(gas_to_weight)
+ Some(gas_to_weight)
+ },
+ pays_fee: Pays::No,
},
- pays_fee: Pays::No,
- })
+ info,
+ ))
}
/// Get current block hash
@@ -713,10 +717,12 @@ impl Pallet {
from: H160,
transaction: &Transaction,
config: Option,
- ) -> Result<
- (Option, Option, CallOrCreateInfo),
- DispatchErrorWithPostInfo,
- > {
+ ) -> Result<(Option, Option, CallOrCreateInfo), DispatchErrorWithPostInfo> {
+ let transaction_data: TransactionData = transaction.into();
+ let (weight_limit, proof_size_base_cost) = Self::transaction_weight(&transaction_data);
+ let is_transactional = true;
+ let validate = false;
+
let (
input,
value,
@@ -777,20 +783,6 @@ impl Pallet {
}
};
- let is_transactional = true;
- let validate = false;
-
- let (proof_size_base_cost, weight_limit) =
- match ::GasWeightMapping::gas_to_weight(
- gas_limit.unique_saturated_into(),
- true,
- ) {
- weight_limit if weight_limit.proof_size() > 0 => (
- Some(Self::proof_size_base_cost(transaction)),
- Some(weight_limit),
- ),
- _ => (None, None),
- };
match action {
ethereum::TransactionAction::Call(target) => {
let res = match T::Runner::call(
@@ -865,22 +857,10 @@ impl Pallet {
transaction: &Transaction,
) -> Result<(), TransactionValidityError> {
let transaction_data: TransactionData = transaction.into();
-
+ let (weight_limit, proof_size_base_cost) = Self::transaction_weight(&transaction_data);
let (base_fee, _) = T::FeeCalculator::min_gas_price();
let (who, _) = pallet_evm::Pallet::::account_basic(&origin);
- let (weight_limit, proof_size_base_cost) =
- match ::GasWeightMapping::gas_to_weight(
- transaction_data.gas_limit.unique_saturated_into(),
- true,
- ) {
- weight_limit if weight_limit.proof_size() > 0 => (
- Some(weight_limit),
- Some(Self::proof_size_base_cost(transaction)),
- ),
- _ => (None, None),
- };
-
let _ = CheckEvmTransaction::::new(
CheckEvmTransactionConfig {
evm_config: T::config(),
@@ -969,7 +949,10 @@ impl