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 Polkadot-sdk to v1.3.0 #198

Merged
merged 4 commits into from
Nov 28, 2023
Merged

Update Polkadot-sdk to v1.3.0 #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfb912c
update polkadot-sdk to v1.3.0
ahmadkaouk Nov 22, 2023
0929e66
fix compilation errors
ahmadkaouk Nov 22, 2023
3eba5ec
fix warnings
ahmadkaouk Nov 22, 2023
b0649d9
fix tests compilation
ahmadkaouk Nov 22, 2023
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
733 changes: 467 additions & 266 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions client/rpc/src/eth/submit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ use sp_api::{ApiExt, ProvideRuntimeApi};
use sp_block_builder::BlockBuilder as BlockBuilderApi;
use sp_blockchain::HeaderBackend;
use sp_inherents::CreateInherentDataProviders;
use sp_runtime::{
generic::BlockId, traits::Block as BlockT, transaction_validity::TransactionSource,
use sp_runtime::{traits::Block as BlockT, transaction_validity::TransactionSource,
};
// Frontier
use fc_rpc_core::types::*;
Expand Down Expand Up @@ -151,7 +150,7 @@ where

self.pool
.submit_one(
&BlockId::Hash(block_hash),
block_hash,
TransactionSource::Local,
extrinsic,
)
Expand All @@ -178,7 +177,7 @@ where

self.pool
.submit_one(
&BlockId::Hash(block_hash),
block_hash,
TransactionSource::Local,
extrinsic,
)
Expand Down
2 changes: 0 additions & 2 deletions frame/dynamic-fee/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-core = { workspace = true }
sp-inherents = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
# Frontier
fp-dynamic-fee = { workspace = true }
Expand All @@ -38,7 +37,6 @@ std = [
# Substrate
"sp-core/std",
"sp-inherents/std",
"sp-runtime/std",
"sp-std/std",
# Substrate
"frame-system/std",
Expand Down
1 change: 1 addition & 0 deletions frame/ethereum/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ impl pallet_balances::Config for Test {
type MaxReserves = ();
type MaxHolds = ();
type MaxFreezes = ();
type RuntimeFreezeReason = ();
}

parameter_types! {
Expand Down
2 changes: 0 additions & 2 deletions frame/evm-chain-id/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ scale-info = { workspace = true }
# Substrate
frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }

[features]
default = ["std"]
Expand All @@ -26,7 +25,6 @@ std = [
# Substrate
"frame-support/std",
"frame-system/std",
"sp-runtime/std",
]
try-runtime = [
"frame-support/try-runtime",
Expand Down
1 change: 1 addition & 0 deletions frame/evm/precompile/dispatch/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ impl pallet_balances::Config for Test {
type MaxReserves = ();
type MaxHolds = ();
type MaxFreezes = ();
type RuntimeFreezeReason = ();
}

parameter_types! {
Expand Down
1 change: 1 addition & 0 deletions frame/evm/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ impl pallet_balances::Config for Test {
type MaxReserves = ();
type MaxHolds = ();
type MaxFreezes = ();
type RuntimeFreezeReason = ();
}

parameter_types! {
Expand Down
1 change: 1 addition & 0 deletions precompiles/tests-external/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ impl pallet_balances::Config for Runtime {
type MaxReserves = ();
type MaxHolds = ();
type MaxFreezes = ();
type RuntimeFreezeReason = ();
}

#[derive(Debug, Clone)]
Expand Down
1 change: 1 addition & 0 deletions template/node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ where
import_queue,
block_announce_validator_builder: None,
warp_sync_params,
block_relay: None,
})?;

if config.offchain_worker.enabled {
Expand Down
1 change: 1 addition & 0 deletions template/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ impl pallet_balances::Config for Runtime {
type MaxReserves = ();
type MaxHolds = ();
type MaxFreezes = ();
type RuntimeFreezeReason = ();
}

parameter_types! {
Expand Down