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

Feature/evm #1252

Merged
merged 18 commits into from
Apr 12, 2023
Merged

Feature/evm #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4f3c471
Add Frontier pallets to development runtime
Mar 31, 2023
947f5f0
RPCs and runtime APIs
Apr 10, 2023
799a782
Use ethereum block hash mapping for EVM
Mar 18, 2023
91acdcd
Use a transparent & reversible account mapping
Mar 18, 2023
bd4bab9
Cleanup lints
Mar 31, 2023
771c9ae
Add ETH account to genesis
Mar 19, 2023
691e640
Add remaining node-side frontier pieces
Apr 3, 2023
9ab97ac
Fix ethereum block data mapping
Mar 19, 2023
55b1448
Add Dispatch precompile
Apr 3, 2023
0f37e02
Deduplicate sp-database crate
Apr 3, 2023
276a7ad
Update nix hash
Apr 10, 2023
3cef471
Move EVM runtime components to a module
Apr 4, 2023
0e2a9b9
Move EVM service setup to its own file
Apr 4, 2023
7ad48ee
rpc::eth -> rpc::evm for consistency
Apr 4, 2023
c9fcad2
Add copyright headers
Apr 4, 2023
7e22b7a
Use const for dispatch precompile address
Apr 4, 2023
9822e24
Fix taplo
Apr 4, 2023
a7b96f5
Merge remote-tracking branch 'origin/main' into feature/evm
Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
178 changes: 177 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

18 changes: 18 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ members = [

[dependencies]
# third-party dependencies
async-trait = "0.1"
clap = { version = "4.0.9", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0", default-features = false }
futures = "0.3.25"
hex-literal = "0.2.1"
jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
log = "0.4.8"
Expand All @@ -83,14 +85,17 @@ sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polk
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-service = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
Expand Down Expand Up @@ -145,6 +150,17 @@ runtime-integration-tests = { path = "runtime/integration-tests", optional = tru
# xcm
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" }

# frontier
fc-consensus = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fc-db = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fc-mapping-sync = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fc-rpc = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fc-rpc-core = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fp-consensus = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fp-dynamic-fee = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fp-rpc = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fp-storage = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }

[build-dependencies]
substrate-build-script-utils = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
vergen = "3.0.4"
Expand All @@ -170,6 +186,7 @@ std = [
"cumulus-primitives-core/std",
"cumulus-primitives-parachain-inherent/std",
"development-runtime/std",
"fp-dynamic-fee/std",
"frame-benchmarking/std",
"log/std",
"pallet-anchors/std",
Expand Down Expand Up @@ -564,6 +581,7 @@ sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "f
sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "f38bd6671d460293c93062cc1e4fe9e9e490cb29" }
sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "f38bd6671d460293c93062cc1e4fe9e9e490cb29" }
sp-core = { git = "https://github.com/paritytech//substrate", rev = "f38bd6671d460293c93062cc1e4fe9e9e490cb29" }
sp-database = { git = "https://github.com/paritytech//substrate", rev = "f38bd6671d460293c93062cc1e4fe9e9e490cb29" }
sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "f38bd6671d460293c93062cc1e4fe9e9e490cb29" }
sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "f38bd6671d460293c93062cc1e4fe9e9e490cb29" }
sp-weights = { git = "https://github.com/paritytech//substrate", rev = "f38bd6671d460293c93062cc1e4fe9e9e490cb29" }
Expand Down
19 changes: 19 additions & 0 deletions runtime/development/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@ orml-xcm = { git = "https://github.com/open-web3-stack/open-runtime-module-libra
orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.37" }
orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.37" }

# frontier pallets
fp-rpc = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
fp-self-contained = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
pallet-base-fee = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
pallet-ethereum = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
pallet-evm = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
pallet-evm-chain-id = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }
pallet-evm-precompile-dispatch = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.37" }

cfg-primitives = { path = "../../libs/primitives", default-features = false }
cfg-traits = { path = "../../libs/traits", default-features = false }
cfg-types = { path = "../../libs/types", default-features = false }
Expand Down Expand Up @@ -154,6 +163,7 @@ std = [
"pallet-aura/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-base-fee/std",
"pallet-bridge/std",
"pallet-claims/std",
"pallet-collator-allowlist/std",
Expand All @@ -164,6 +174,10 @@ std = [
"pallet-crowdloan-reward/std",
"pallet-democracy/std",
"pallet-elections-phragmen/std",
"pallet-ethereum/std",
"pallet-evm/std",
"pallet-evm-precompile-dispatch/std",
"pallet-evm-chain-id/std",
"pallet-fees/std",
"pallet-identity/std",
"pallet-interest-accrual/std",
Expand Down Expand Up @@ -283,6 +297,7 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-primitives/runtime-benchmarks",
"pallet-evm/runtime-benchmarks",
]

try-runtime = [
Expand Down Expand Up @@ -352,6 +367,10 @@ try-runtime = [
"pallet-xcm/try-runtime",
"parachain-info/try-runtime",
"runtime-common/try-runtime",
"pallet-evm/try-runtime",
"pallet-evm-chain-id/try-runtime",
"pallet-base-fee/try-runtime",
"pallet-ethereum/try-runtime",
]

# A feature that should be enabled when the runtime should be build for on-chain
Expand Down