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

Update to polkadot-stable2412 #1

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Update to polkadot-stable2412 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6ef606
init
4meta5 Jan 10, 2025
05d6141
all crates required by generic template compile post this commit
4meta5 Jan 12, 2025
450efb7
update xcm transactor benchmarks
4meta5 Jan 29, 2025
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
12,419 changes: 8,744 additions & 3,675 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

283 changes: 140 additions & 143 deletions Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/rpc-core/debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = { workspace = true }
version = "0.1.0"

[dependencies]
ethereum = { workspace = true, features = [ "with-codec" ] }
ethereum = { workspace = true, features = [ "with-scale" ] }
ethereum-types = { workspace = true, features = [ "std" ] }
futures = { workspace = true, features = [ "compat" ] }
jsonrpsee = { workspace = true, features = [ "macros", "server" ] }
Expand Down
2 changes: 1 addition & 1 deletion client/rpc-core/txpool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = { workspace = true }
version = "0.6.0"

[dependencies]
ethereum = { workspace = true, features = [ "std", "with-codec" ] }
ethereum = { workspace = true, features = [ "std", "with-scale" ] }
ethereum-types = { workspace = true, features = [ "std" ] }
jsonrpsee = { workspace = true, features = [ "macros", "server" ] }
serde = { workspace = true, features = [ "derive" ] }
Expand Down
2 changes: 1 addition & 1 deletion client/rpc/debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sp-runtime = { workspace = true, features = [ "std" ] }
sp-trie = { workspace = true, features = [ "std" ] }

# Frontier
ethereum = { workspace = true, features = [ "std", "with-codec" ] }
ethereum = { workspace = true, features = [ "std", "with-scale" ] }
ethereum-types = { workspace = true, features = [ "std" ] }
fc-consensus = { workspace = true }
fc-db = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion client/rpc/trace/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = { workspace = true }
version = "0.6.0"

[dependencies]
ethereum = { workspace = true, features = [ "with-codec" ] }
ethereum = { workspace = true, features = [ "with-scale" ] }
ethereum-types = { workspace = true }
futures = { workspace = true }
jsonrpsee = { workspace = true, features = [ "macros", "server" ] }
Expand Down
2 changes: 1 addition & 1 deletion pallets/ethereum-xcm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version = "1.0.0-dev"
targets = [ "x86_64-unknown-linux-gnu" ]

[dependencies]
ethereum = { workspace = true, features = [ "with-codec" ] }
ethereum = { workspace = true, features = [ "with-scale" ] }
serde = { workspace = true, optional = true }

# Parity
Expand Down
28 changes: 14 additions & 14 deletions pallets/xcm-transactor/src/benchmarks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ benchmarks! {
let location = Location::parent();
}: _(
RawOrigin::Root,
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
extra_weight,
max_weight,
None
Expand All @@ -70,12 +70,12 @@ benchmarks! {
let location = Location::parent();
Pallet::<T>::set_transact_info(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
extra_weight,
max_weight,
None
).expect("must succeed");
}: _(RawOrigin::Root, Box::new(xcm::VersionedLocation::V4(location.clone())))
}: _(RawOrigin::Root, Box::new(xcm::VersionedLocation::V5(location.clone())))
verify {
assert!(Pallet::<T>::transact_info(&location).is_none());
}
Expand All @@ -85,7 +85,7 @@ benchmarks! {
let location = Location::parent();
}: _(
RawOrigin::Root,
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
fee_per_second
)
verify {
Expand All @@ -105,14 +105,14 @@ benchmarks! {
let user: T::AccountId = account("account id", 0u32, 0u32);
Pallet::<T>::set_transact_info(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
extra_weight,
max_weight,
Some(extra_weight)
).expect("must succeed");
Pallet::<T>::set_fee_per_second(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
fee_per_second
).expect("must succeed");
Pallet::<T>::register(
Expand Down Expand Up @@ -162,21 +162,21 @@ benchmarks! {
let user: T::AccountId = account("account id", 0u32, 0u32);
Pallet::<T>::set_transact_info(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
extra_weight,
max_weight,
Some(extra_weight)
).expect("must succeed");
Pallet::<T>::set_fee_per_second(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
fee_per_second
).expect("must succeed");
}: {

let result = Pallet::<T>::transact_through_sovereign(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
Some(user.clone()),
CurrencyPayment {
// This might involve a db Read when translating, therefore worst case
Expand Down Expand Up @@ -215,19 +215,19 @@ benchmarks! {
let user: T::AccountId = account("account id", 0u32, 0u32);
Pallet::<T>::set_transact_info(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
extra_weight,
max_weight,
Some(extra_weight)
).expect("must succeed");
Pallet::<T>::set_fee_per_second(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
fee_per_second
).expect("must succeed");
}: _(
RawOrigin::Signed(user.clone()),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
CurrencyPayment {
// This might involve a db Read when translating, therefore worst case
currency: Currency::AsCurrencyId(currency),
Expand All @@ -254,14 +254,14 @@ benchmarks! {
let user: T::AccountId = account("account id", 0u32, 0u32);
Pallet::<T>::set_transact_info(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
extra_weight,
max_weight,
Some(extra_weight)
).expect("must succeed");
Pallet::<T>::set_fee_per_second(
RawOrigin::Root.into(),
Box::new(xcm::VersionedLocation::V4(location.clone())),
Box::new(xcm::VersionedLocation::V5(location.clone())),
fee_per_second
).expect("must succeed");
}: _(
Expand Down
2 changes: 1 addition & 1 deletion pallets/xcm-transactor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ pub mod pallet {
}
instructions.push(Transact {
origin_kind,
require_weight_at_most: dispatch_weight,
fallback_max_weight: Some(dispatch_weight),
call: call.into(),
});
Ok(Xcm(instructions))
Expand Down
Loading
Loading