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

Uses precompile_utils from frontier #2812

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Uses precompile_utils from frontier #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
558cfa6
Moves precompile-utils into frontier
Aug 8, 2023
79e448b
Fix the naming in accordance with the naming convention
Aug 11, 2023
ff38cec
Rename XcmWeight back to XCMWeight
Aug 11, 2023
31ea77e
fix precompile-util usage
RomarQ May 23, 2024
8e30003
remove unused dependencies
RomarQ May 23, 2024
f0b1dbf
fix features
RomarQ May 23, 2024
a31db28
add no-std config attribute
RomarQ May 24, 2024
e21a880
Merge branch 'master' into rq/move-precompile-utils
RomarQ Jun 17, 2024
e8cc17d
update locked dependencies
RomarQ Jun 17, 2024
c03fe1e
fix build
RomarQ Jun 17, 2024
962c30e
Merge branch 'master' into rq/move-precompile-utils
RomarQ Jun 27, 2024
421b344
fix build
RomarQ Jun 27, 2024
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
261 changes: 70 additions & 191 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ members = [
"precompiles/batch",
"precompiles/call-permit",
"precompiles/collective",
"precompiles/common",
"precompiles/conviction-voting",
"precompiles/crowdloan-rewards",
"precompiles/gmp",
Expand All @@ -33,9 +34,6 @@ members = [
"precompiles/referenda",
"precompiles/relay-encoder",
"precompiles/relay-data-verifier",
"precompiles/utils",
"precompiles/utils/macro",
"precompiles/utils/tests-external",
"precompiles/xcm-transactor",
"precompiles/xtokens",
"primitives/storage-proof",
Expand Down Expand Up @@ -78,6 +76,8 @@ pallet-asset-manager = { path = "pallets/asset-manager", default-features = fals
pallet-erc20-xcm-bridge = { path = "pallets/erc20-xcm-bridge", default-features = false }
pallet-ethereum-xcm = { path = "pallets/ethereum-xcm", default-features = false }


pallet-moonbeam-lazy-migrations = { path = "pallets/moonbeam-lazy-migrations", default-features = false }
pallet-evm-precompile-author-mapping = { path = "precompiles/author-mapping", default-features = false }
pallet-evm-precompile-balances-erc20 = { path = "precompiles/balances-erc20", default-features = false }
pallet-evm-precompile-batch = { path = "precompiles/batch", default-features = false }
Expand All @@ -104,8 +104,7 @@ pallet-parachain-staking = { path = "pallets/parachain-staking", default-feature
pallet-precompile-benchmarks = { path = "pallets/precompile-benchmarks", default-features = false }
pallet-proxy-genesis-companion = { path = "pallets/proxy-genesis-companion", default-features = false }
pallet-xcm-transactor = { path = "pallets/xcm-transactor", default-features = false }
pallet-moonbeam-lazy-migrations = { path = "pallets/moonbeam-lazy-migrations", default-features = false }
precompile-utils = { path = "precompiles/utils", default-features = false }
moonbeam-precompile-common = { path = "precompiles/common", default-features = false }
xcm-primitives = { path = "primitives/xcm", default-features = false }

pallet-crowdloan-rewards = { git = "https://github.com/moonbeam-foundation/crowdloan-rewards", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
Expand Down Expand Up @@ -230,6 +229,7 @@ substrate-test-runtime-client = { git = "https://github.com/moonbeam-foundation/
substrate-wasm-builder = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0" }

# Frontier (wasm)

ethereum = { version = "0.15.0", default-features = false, features = [
"with-codec",
] }
Expand All @@ -256,7 +256,10 @@ pallet-evm-precompile-sha3fips = { git = "https://github.com/moonbeam-foundation
pallet-evm-precompile-simple = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
pallet-evm-precompile-storage-cleaner = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }

precompile-utils = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }

# Frontier (client)

fc-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0" }
fc-db = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0" }
fc-api = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0" }
Expand All @@ -270,6 +273,7 @@ fp-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch
fp-storage = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0" }

# Cumulus (wasm)

cumulus-pallet-dmp-queue = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
cumulus-pallet-parachain-system = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false, features = [
"parameterized-consensus-hook",
Expand Down Expand Up @@ -342,7 +346,6 @@ session-keys-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", br
nimbus-consensus = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.11.0" }

# Other (wasm)
affix = "0.1.2"
async-trait = { version = "0.1.42" }
blake2-rfc = { version = "0.2.18", default-features = false }
derive_more = "0.99"
Expand Down
22 changes: 12 additions & 10 deletions precompiles/assets-erc20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,25 @@ num_enum = { workspace = true }
paste = { workspace = true }

# Moonbeam
precompile-utils = { workspace = true }
moonbeam-precompile-common = { workspace = true }

# Substrate
frame-support = { workspace = true }
frame-system = { workspace = true }
pallet-assets = { workspace = true }
pallet-balances = { workspace = true }
pallet-timestamp = { workspace = true }
parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] }
scale-info = { workspace = true, features = [ "derive" ] }
parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
scale-info = { workspace = true, features = ["derive"] }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

# Frontier
fp-evm = { workspace = true }
pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] }
pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] }
precompile-utils = { workspace = true }

# Moonkit
moonkit-xcm-primitives = { workspace = true }
Expand All @@ -41,15 +42,15 @@ serde = { workspace = true }
sha3 = { workspace = true }

# Moonbeam
precompile-utils = { workspace = true, features = [ "std", "testing" ] }
precompile-utils = { workspace = true, features = ["std", "testing"] }

pallet-timestamp = { workspace = true, features = [ "std" ] }
parity-scale-codec = { workspace = true, features = [ "max-encoded-len", "std" ] }
scale-info = { workspace = true, features = [ "derive" ] }
sp-runtime = { workspace = true, features = [ "std" ] }
pallet-timestamp = { workspace = true, features = ["std"] }
parity-scale-codec = { workspace = true, features = ["max-encoded-len", "std"] }
scale-info = { workspace = true, features = ["derive"] }
sp-runtime = { workspace = true, features = ["std"] }

[features]
default = [ "std" ]
default = ["std"]
std = [
"fp-evm/std",
"frame-support/std",
Expand All @@ -65,4 +66,5 @@ std = [
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
"moonbeam-precompile-common/std",
]
1 change: 1 addition & 0 deletions precompiles/assets-erc20/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ use frame_support::{
dispatch::{GetDispatchInfo, PostDispatchInfo},
sp_runtime::traits::StaticLookup,
};
use moonbeam_precompile_common::SYSTEM_ACCOUNT_SIZE;
use moonkit_xcm_primitives::AccountIdAssetIdConversion;
use pallet_evm::AddressMapping;
use precompile_utils::prelude::*;
Expand Down
14 changes: 7 additions & 7 deletions precompiles/author-mapping/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ num_enum = { workspace = true }

# Moonbeam
pallet-author-mapping = { workspace = true }
precompile-utils = { workspace = true }

# Substrate
frame-support = { workspace = true }
Expand All @@ -24,7 +23,8 @@ sp-runtime = { workspace = true }

# Frontier
fp-evm = { workspace = true }
pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] }
pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] }
precompile-utils = { workspace = true }

# Nimbus
nimbus-primitives = { workspace = true }
Expand All @@ -35,18 +35,18 @@ hex-literal = { workspace = true }
serde = { workspace = true }

# Moonbeam
pallet-author-mapping = { workspace = true, features = [ "std" ] }
precompile-utils = { workspace = true, features = [ "std", "testing" ] }
pallet-author-mapping = { workspace = true, features = ["std"] }
precompile-utils = { workspace = true, features = ["std", "testing"] }

# Substrate
pallet-balances = { workspace = true, features = [ "std" ] }
pallet-balances = { workspace = true, features = ["std"] }
pallet-scheduler = { workspace = true }
pallet-timestamp = { workspace = true }
scale-info = { workspace = true, features = [ "derive" ] }
scale-info = { workspace = true, features = ["derive"] }
sp-runtime = { workspace = true }

[features]
default = [ "std" ]
default = ["std"]
std = [
"fp-evm/std",
"frame-support/std",
Expand Down
18 changes: 10 additions & 8 deletions precompiles/balances-erc20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,23 @@ paste = { workspace = true }
slices = { workspace = true }

# Moonbeam
precompile-utils = { workspace = true }
moonbeam-precompile-common = { workspace = true }

# Substrate
frame-support = { workspace = true }
frame-system = { workspace = true }
pallet-balances = { workspace = true }
pallet-timestamp = { workspace = true }
parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] }
parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

# Frontier
fp-evm = { workspace = true }
pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] }
pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] }
precompile-utils = { workspace = true }

[dev-dependencies]
derive_more = { workspace = true }
Expand All @@ -37,14 +38,14 @@ serde = { workspace = true }
sha3 = { workspace = true }

# Moonbeam
precompile-utils = { workspace = true, features = [ "std", "testing" ] }
precompile-utils = { workspace = true, features = ["std", "testing"] }

pallet-timestamp = { workspace = true, features = [ "std" ] }
scale-info = { workspace = true, features = [ "derive" ] }
sp-runtime = { workspace = true, features = [ "std" ] }
pallet-timestamp = { workspace = true, features = ["std"] }
scale-info = { workspace = true, features = ["derive"] }
sp-runtime = { workspace = true, features = ["std"] }

[features]
default = [ "std" ]
default = ["std"]
std = [
"fp-evm/std",
"frame-support/std",
Expand All @@ -56,4 +57,5 @@ std = [
"sp-core/std",
"sp-io/std",
"sp-std/std",
"moonbeam-precompile-common/std",
]
1 change: 1 addition & 0 deletions precompiles/balances-erc20/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use frame_support::{
traits::StorageInstance,
Blake2_128Concat,
};
use moonbeam_precompile_common::SYSTEM_ACCOUNT_SIZE;
use pallet_balances::pallet::{
Instance1, Instance10, Instance11, Instance12, Instance13, Instance14, Instance15, Instance16,
Instance2, Instance3, Instance4, Instance5, Instance6, Instance7, Instance8, Instance9,
Expand Down
24 changes: 11 additions & 13 deletions precompiles/batch/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,35 @@ num_enum = { workspace = true }
paste = { workspace = true }
slices = { workspace = true }

# Moonbeam
precompile-utils = { workspace = true }

# Substrate
frame-support = { workspace = true }
frame-system = { workspace = true }
parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] }
parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-std = { workspace = true }

# Frontier
evm = { workspace = true, features = [ "with-codec" ] }
evm = { workspace = true, features = ["with-codec"] }
fp-evm = { workspace = true }
pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] }
pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] }
precompile-utils = { workspace = true }

[dev-dependencies]
derive_more = { workspace = true }
hex-literal = { workspace = true }
serde = { workspace = true }
sha3 = { workspace = true }

pallet-balances = { workspace = true, features = [ "insecure_zero_ed", "std" ] }
pallet-timestamp = { workspace = true, features = [ "std" ] }
parity-scale-codec = { workspace = true, features = [ "max-encoded-len", "std" ] }
precompile-utils = { workspace = true, features = [ "std", "testing" ] }
scale-info = { workspace = true, features = [ "derive", "std" ] }
sp-runtime = { workspace = true, features = [ "std" ] }
pallet-balances = { workspace = true, features = ["insecure_zero_ed", "std"] }
pallet-timestamp = { workspace = true, features = ["std"] }
parity-scale-codec = { workspace = true, features = ["max-encoded-len", "std"] }
precompile-utils = { workspace = true, features = ["std", "testing"] }
scale-info = { workspace = true, features = ["derive", "std"] }
sp-runtime = { workspace = true, features = ["std"] }

[features]
default = [ "std" ]
default = ["std"]
std = [
"fp-evm/std",
"frame-support/std",
Expand Down
4 changes: 1 addition & 3 deletions precompiles/call-permit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ num_enum = { workspace = true }
paste = { workspace = true }
slices = { workspace = true }

# Moonbeam
precompile-utils = { workspace = true }

# Substrate
frame-support = { workspace = true }
frame-system = { workspace = true }
Expand All @@ -28,6 +25,7 @@ sp-std = { workspace = true }
evm = { workspace = true, features = [ "with-codec" ] }
fp-evm = { workspace = true }
pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] }
precompile-utils = { workspace = true }

[dev-dependencies]
derive_more = { workspace = true }
Expand Down
26 changes: 14 additions & 12 deletions precompiles/collective/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,24 @@ paste = { workspace = true }
slices = { workspace = true }

# Moonbeam
precompile-utils = { workspace = true }
moonbeam-precompile-common = { workspace = true }
xcm-primitives = { workspace = true }

# Substrate
frame-support = { workspace = true }
frame-system = { workspace = true }
pallet-collective = { workspace = true }
parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] }
parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

# Frontier
evm = { workspace = true, features = [ "with-codec" ] }
evm = { workspace = true, features = ["with-codec"] }
fp-evm = { workspace = true }
pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] }
pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] }
precompile-utils = { workspace = true }

[dev-dependencies]
derive_more = { workspace = true }
Expand All @@ -37,16 +38,16 @@ serde = { workspace = true }
sha3 = { workspace = true }
similar-asserts = { workspace = true }

pallet-balances = { workspace = true, features = [ "std" ] }
pallet-timestamp = { workspace = true, features = [ "std" ] }
pallet-treasury = { workspace = true, features = [ "std" ] }
parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] }
precompile-utils = { workspace = true, features = [ "std", "testing" ] }
scale-info = { workspace = true, features = [ "derive", "std" ] }
sp-runtime = { workspace = true, features = [ "std" ] }
pallet-balances = { workspace = true, features = ["std"] }
pallet-timestamp = { workspace = true, features = ["std"] }
pallet-treasury = { workspace = true, features = ["std"] }
parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
precompile-utils = { workspace = true, features = ["std", "testing"] }
scale-info = { workspace = true, features = ["derive", "std"] }
sp-runtime = { workspace = true, features = ["std"] }

[features]
default = [ "std" ]
default = ["std"]
std = [
"fp-evm/std",
"frame-support/std",
Expand All @@ -59,5 +60,6 @@ std = [
"sp-io/std",
"sp-std/std",
"xcm-primitives/std",
"moonbeam-precompile-common/std",
]
runtime-benchmarks = []
1 change: 1 addition & 0 deletions precompiles/collective/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use frame_support::{
traits::ConstU32,
weights::Weight,
};
use moonbeam_precompile_common::SYSTEM_ACCOUNT_SIZE;
use pallet_evm::AddressMapping;
use parity_scale_codec::DecodeLimit as _;
use precompile_utils::prelude::*;
Expand Down
14 changes: 14 additions & 0 deletions precompiles/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[package]
name = "moonbeam-precompile-common"
authors = { workspace = true }
description = "Precompile common logic"
edition = "2021"
version = "0.1.0"

[dependencies]

[dev-dependencies]

[features]
default = ["std"]
std = []
Loading
Loading