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

feat: Enable storage weight reclaiming #2931

Merged
merged 10 commits into from
Sep 4, 2024
Merged

feat: Enable storage weight reclaiming #2931

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cfbba23
feat: Enable storage weight reclaiming
RomarQ Sep 3, 2024
5de0d7b
try removing StorageWeightReclaim
RomarQ Sep 4, 2024
8288afd
test: improve error message
RomarQ Sep 4, 2024
47e6e08
test: improve error message
RomarQ Sep 4, 2024
9fe3b8c
Revert "test: improve error message"
RomarQ Sep 4, 2024
f9ef35a
Revert "test: improve error message"
RomarQ Sep 4, 2024
b7ff7f5
remove cumulus-primitives-storage-weight-reclaim dependency
RomarQ Sep 4, 2024
e760848
Revert "remove cumulus-primitives-storage-weight-reclaim dependency"
RomarQ Sep 4, 2024
f1c5941
Revert "try removing StorageWeightReclaim"
RomarQ Sep 4, 2024
1542cdb
fix test
RomarQ Sep 4, 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
3 changes: 3 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ cumulus-primitives-parachain-inherent = { git = "https://github.com/moonbeam-fou
cumulus-primitives-timestamp = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
cumulus-primitives-utility = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
cumulus-test-relay-sproof-builder = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
cumulus-primitives-storage-weight-reclaim = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
RomarQ marked this conversation as resolved.
Show resolved Hide resolved
parachain-info = { package = "staging-parachain-info", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
parachains-common = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false }

Expand Down Expand Up @@ -375,9 +376,7 @@ slices = "0.2.0"
smallvec = "1.8.0"
strum = { version = "0.24", default-features = false, features = ["derive"] }
strum_macros = "0.24"
p256 = { version = "0.13.2", default-features = false, features = [
"ecdsa",
] }
p256 = { version = "0.13.2", default-features = false, features = ["ecdsa"] }

# Other (client)

Expand Down
3 changes: 2 additions & 1 deletion node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,11 @@ where
let executor = wasm_builder.build();

let (client, backend, keystore_container, task_manager) =
sc_service::new_full_parts::<Block, RuntimeApi, _>(
sc_service::new_full_parts_record_import::<Block, RuntimeApi, _>(
config,
telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
executor,
true,
)?;

if let Some(block_number) = Customizations::first_block_number_compatible_with_ed25519_zebra() {
Expand Down
4 changes: 3 additions & 1 deletion runtime/moonbase/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ cumulus-pallet-xcmp-queue = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-timestamp = { workspace = true }
cumulus-primitives-utility = { workspace = true }
cumulus-primitives-storage-weight-reclaim = { workspace = true }
parachain-info = { workspace = true }
parachains-common = { workspace = true }

Expand Down Expand Up @@ -212,6 +213,7 @@ std = [
"cumulus-primitives-core/std",
"cumulus-primitives-timestamp/std",
"cumulus-primitives-utility/std",
"cumulus-primitives-storage-weight-reclaim/std",
"evm-tracing-events/std",
"fp-evm/std",
"fp-rpc/std",
Expand Down Expand Up @@ -262,7 +264,7 @@ std = [
"pallet-evm-precompile-xcm-utils/std",
"pallet-evm-precompile-xtokens/std",
"pallet-evm-precompileset-assets-erc20/std",
"pallet-evm-precompile-storage-cleaner/std",
"pallet-evm-precompile-storage-cleaner/std",
"pallet-evm-precompile-p256verify/std",
"pallet-evm/std",
"pallet-identity/std",
Expand Down
1 change: 1 addition & 0 deletions runtime/moonbase/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,7 @@ pub type SignedExtra = (
frame_system::CheckNonce<Runtime>,
frame_system::CheckWeight<Runtime>,
pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic =
Expand Down
2 changes: 2 additions & 0 deletions runtime/moonbeam/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ cumulus-pallet-xcmp-queue = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-timestamp = { workspace = true }
cumulus-primitives-utility = { workspace = true }
cumulus-primitives-storage-weight-reclaim = { workspace = true }
parachain-info = { workspace = true }
parachains-common = { workspace = true }

Expand Down Expand Up @@ -205,6 +206,7 @@ std = [
"cumulus-primitives-core/std",
"cumulus-primitives-timestamp/std",
"cumulus-primitives-utility/std",
"cumulus-primitives-storage-weight-reclaim/std",
"evm-tracing-events/std",
"fp-evm/std",
"fp-rpc/std",
Expand Down
1 change: 1 addition & 0 deletions runtime/moonbeam/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,6 +1524,7 @@ pub type SignedExtra = (
frame_system::CheckNonce<Runtime>,
frame_system::CheckWeight<Runtime>,
pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
RomarQ marked this conversation as resolved.
Show resolved Hide resolved
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic =
Expand Down
2 changes: 2 additions & 0 deletions runtime/moonriver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ cumulus-pallet-xcmp-queue = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-timestamp = { workspace = true }
cumulus-primitives-utility = { workspace = true }
cumulus-primitives-storage-weight-reclaim = { workspace = true }
parachain-info = { workspace = true }
parachains-common = { workspace = true }

Expand Down Expand Up @@ -206,6 +207,7 @@ std = [
"cumulus-primitives-core/std",
"cumulus-primitives-timestamp/std",
"cumulus-primitives-utility/std",
"cumulus-primitives-storage-weight-reclaim/std",
"evm-tracing-events/std",
"fp-evm/std",
"fp-rpc/std",
Expand Down
1 change: 1 addition & 0 deletions runtime/moonriver/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,7 @@ pub type SignedExtra = (
frame_system::CheckNonce<Runtime>,
frame_system::CheckWeight<Runtime>,
pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic =
Expand Down
Loading