pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 17:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gav-xcm-v3

Browse Source
This commit is contained in:
Keith Yeung
2022-09-26 18:22:49 +08:00
parent 25958aa09f 397075f2c0
commit 4f88026e83
17 changed files with 211 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+1 -18
View File
@@ -411,22 +411,7 @@ benchmarks-assets:
- *git-commit-push
# create PR to release-parachains-v* branch
- curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'${CI_COMMIT_BRANCH}'"}'
-X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
# create PR to master
- curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"master"}'
-X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
# create PR to a branch with version number (e.g. v0.9.270) and release-v* (e.g. release-v0.9.270)
# transform release-parachains-v9270 to v0.9.270
- export BASEBRANCH=$(echo ${CI_COMMIT_BRANCH} | cut -d "-" -f 3 | sed -e "s/\(.\)\(.\)\(...\)/\10.\2.\3/")
# create PR to v* branch
- curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'${BASEBRANCH}'"}'
-X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
# create PR to release-v* branch
- curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'release-${BASEBRANCH}'"}'
-d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI. (Once merged please backport to master and node release branch.)","head":"'${BRANCHNAME}'","base":"'${CI_COMMIT_BRANCH}'"}'
-X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
after_script:
- rm -rf .git/config
@@ -669,5 +654,3 @@ cancel-pipeline:
PR_NUM: "${PR_NUM}"
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
Cargo.lock
Generated
+181 -183
View File
File diff suppressed because it is too large Load Diff
Cargo.toml
+1 -1
View File
@@ -24,7 +24,7 @@ members = [
"primitives/parachain-inherent",
"primitives/timestamp",
"primitives/utility",
"polkadot-parachain/",
"polkadot-parachain",
"parachains/common",
"parachains/pallets/parachain-info",
"parachains/pallets/ping",
client/consensus/aura/src/lib.rs
-1
View File
@@ -201,7 +201,6 @@ where
let info = SlotInfo::new(
inherent_data_providers.slot(),
inherent_data_providers.timestamp(),
inherent_data,
self.slot_duration.as_duration(),
parent.clone(),
client/relay-chain-inprocess-interface/Cargo.toml
-3
View File
@@ -42,6 +42,3 @@ sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master
# Polkadot
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
# Cumulus
cumulus-test-service = { path = "../../test/service" }
client/service/src/lib.rs
+1 -2
View File
@@ -125,9 +125,8 @@ where
task_manager
.spawn_essential_handle()
.spawn("cumulus-pov-recovery", None, pov_recovery.run());
cumulus_client_collator::start_collator(cumulus_client_collator::StartCollatorParams {
runtime_api: client.clone(),
runtime_api: client,
block_status,
announce_block,
overseer_handle,
pallets/parachain-system/proc-macro/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ description = "Proc macros provided by the parachain-system pallet"
proc-macro = true
[dependencies]
syn = "1.0.99"
syn = "1.0.100"
proc-macro2 = "1.0.43"
quote = "1.0.21"
proc-macro-crate = "1.2.1"
pallets/xcm/Cargo.toml
+1
View File
@@ -30,5 +30,6 @@ std = [
"sp-runtime/std",
"frame-support/std",
"frame-system/std",
"xcm/std",
]
try-runtime = ["frame-support/try-runtime"]
parachain-template/node/src/service.rs
+6 -6
View File
@@ -427,15 +427,15 @@ pub fn parachain_build_import_queue(
block_import: client.clone(),
client: client.clone(),
create_inherent_data_providers: move |_, _| async move {
let time = sp_timestamp::InherentDataProvider::from_system_time();
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time,
*timestamp,
slot_duration,
);
Ok((time, slot))
Ok((slot, timestamp))
},
registry: config.prometheus_registry(),
spawner: &task_manager.spawn_essential_handle(),
@@ -494,11 +494,11 @@ pub async fn start_parachain_node(
&validation_data,
id,
).await;
let time = sp_timestamp::InherentDataProvider::from_system_time();
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time,
*timestamp,
slot_duration,
);
@@ -507,7 +507,7 @@ pub async fn start_parachain_node(
"Failed to create parachain inherent",
)
})?;
Ok((time, slot, parachain_inherent))
Ok((slot, timestamp, parachain_inherent))
}
},
block_import: client.clone(),
parachains/common/Cargo.toml
+2
View File
@@ -63,5 +63,7 @@ std = [
"sp-std/std",
"pallet-collator-selection/std",
"cumulus-primitives-utility/std",
"xcm/std",
"xcm-executor/std",
"xcm-builder/std"
]
parachains/pallets/ping/Cargo.toml
+1
View File
@@ -30,4 +30,5 @@ std = [
"sp-runtime/std",
"frame-support/std",
"frame-system/std",
"xcm/std",
]
parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs
+2 -2
View File
@@ -138,7 +138,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
// Storage: Proxy Proxies (r:1 w:1)
/// The range of component `p` is `[1, 31]`.
fn anonymous(p: u32, ) -> Weight {
fn create_pure(p: u32, ) -> Weight {
Weight::from_ref_time(31_472_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(21_000 as u64).saturating_mul(p as u64))
@@ -147,7 +147,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
}
// Storage: Proxy Proxies (r:1 w:1)
/// The range of component `p` is `[0, 30]`.
fn kill_anonymous(p: u32, ) -> Weight {
fn kill_pure(p: u32, ) -> Weight {
Weight::from_ref_time(24_620_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(85_000 as u64).saturating_mul(p as u64))
parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs
+2 -2
View File
@@ -138,7 +138,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
// Storage: Proxy Proxies (r:1 w:1)
/// The range of component `p` is `[1, 31]`.
fn anonymous(p: u32, ) -> Weight {
fn create_pure(p: u32, ) -> Weight {
Weight::from_ref_time(30_378_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(16_000 as u64).saturating_mul(p as u64))
@@ -147,7 +147,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
}
// Storage: Proxy Proxies (r:1 w:1)
/// The range of component `p` is `[0, 30]`.
fn kill_anonymous(p: u32, ) -> Weight {
fn kill_pure(p: u32, ) -> Weight {
Weight::from_ref_time(23_977_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(76_000 as u64).saturating_mul(p as u64))
parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs
+2 -2
View File
@@ -138,7 +138,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
// Storage: Proxy Proxies (r:1 w:1)
/// The range of component `p` is `[1, 31]`.
fn anonymous(p: u32, ) -> Weight {
fn create_pure(p: u32, ) -> Weight {
Weight::from_ref_time(31_575_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(35_000 as u64).saturating_mul(p as u64))
@@ -147,7 +147,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
}
// Storage: Proxy Proxies (r:1 w:1)
/// The range of component `p` is `[0, 30]`.
fn kill_anonymous(p: u32, ) -> Weight {
fn kill_pure(p: u32, ) -> Weight {
Weight::from_ref_time(24_640_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(80_000 as u64).saturating_mul(p as u64))
parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
+2 -2
View File
@@ -138,7 +138,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
// Storage: Proxy Proxies (r:1 w:1)
/// The range of component `p` is `[1, 31]`.
fn anonymous(p: u32, ) -> Weight {
fn create_pure(p: u32, ) -> Weight {
Weight::from_ref_time(29_260_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(38_000 as u64).saturating_mul(p as u64))
@@ -147,7 +147,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
}
// Storage: Proxy Proxies (r:1 w:1)
/// The range of component `p` is `[0, 30]`.
fn kill_anonymous(p: u32, ) -> Weight {
fn kill_pure(p: u32, ) -> Weight {
Weight::from_ref_time(23_012_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(97_000 as u64).saturating_mul(p as u64))
polkadot-parachain/src/service.rs
+6 -6
View File
@@ -722,7 +722,7 @@ pub fn rococo_parachain_build_import_queue(
slot_duration,
);
Ok((timestamp, slot))
Ok((slot, timestamp))
},
registry: config.prometheus_registry(),
spawner: &task_manager.spawn_essential_handle(),
@@ -797,7 +797,7 @@ pub async fn start_rococo_parachain_node(
)
})?;
Ok((timestamp, slot, parachain_inherent))
Ok((slot, timestamp, parachain_inherent))
}
},
block_import: client.clone(),
@@ -1096,7 +1096,7 @@ where
slot_duration,
);
Ok((timestamp, slot))
Ok((slot, timestamp))
},
telemetry: telemetry_handle,
},
@@ -1223,7 +1223,7 @@ where
)
})?;
Ok((timestamp, slot, parachain_inherent))
Ok((slot, timestamp, parachain_inherent))
}
},
block_import: client2.clone(),
@@ -1537,7 +1537,7 @@ pub fn contracts_rococo_build_import_queue(
slot_duration,
);
Ok((timestamp, slot))
Ok((slot, timestamp))
},
registry: config.prometheus_registry(),
spawner: &task_manager.spawn_essential_handle(),
@@ -1611,7 +1611,7 @@ pub async fn start_contracts_rococo_node(
)
})?;
Ok((timestamp, slot, parachain_inherent))
Ok((slot, timestamp, parachain_inherent))
}
},
block_import: client.clone(),
primitives/utility/Cargo.toml
+2
View File
@@ -41,5 +41,7 @@ std = [
"polkadot-parachain/std",
"polkadot-primitives/std",
"cumulus-primitives-core/std",
"xcm/std",
"xcm-builder/std",
"xcm-executor/std",
]