Skip to content

Ab/benchmark pallet xcm #266

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

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

Ab/benchmark pallet xcm #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1f0665
upgrade to polkadot-v1.6.0 deps
brenzi Feb 11, 2024
d0e9851
apply necessary code changes
brenzi Feb 11, 2024
1fb3655
fix build setup
brenzi Feb 11, 2024
06f27a8
fixes
brenzi Feb 11, 2024
86be427
fix chain spec
brenzi Feb 11, 2024
b0d000d
cleanup
brenzi Feb 11, 2024
678ea99
bump versions
brenzi Feb 11, 2024
115ee44
WIP
brenzi Feb 11, 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
1,995 changes: 1,164 additions & 831 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

239 changes: 121 additions & 118 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,132 +11,135 @@ members = [
panic = "unwind"

[workspace.dependencies]
async-trait = "0.1.59"
clap = { version = "4.0.29", features = ["derive"] }
parity-scale-codec = { version = "3.6.4", default-features = false, features = ["derive"] }
async-trait = "0.1.73"
clap = { version = "4.4.10", features = ["derive"] }
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive"] }
color-print = "0.3.4"
futures = "0.3.25"
futures = "0.3.28"
hex-literal = "0.4.1"
log = { version = "0.4.20", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.188", features = ["derive"] }
serde = { version = "1.0.195", features = ["derive"] }
serde_json = "1.0"
smallvec = "1.11.0"

# integritee pallets
pallet-claims = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.3.0" }
pallet-enclave-bridge = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.3.0" }
pallet-sidechain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.3.0" }
pallet-teeracle = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.3.0" }
pallet-teerex = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.3.0" }
pallet-xcm-transactor = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.3.0" }
xcm-transactor-primitives = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.3.0" }
pallet-claims = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-enclave-bridge = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-sidechain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-teeracle = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-teerex = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-xcm-transactor = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
xcm-transactor-primitives = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }

# Polkadot-sdk and ecosystem crates [no_std]
cumulus-pallet-aura-ext = { version = "0.4.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.4.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.4.1", default-features = false }
cumulus-pallet-xcm = { version = "0.4.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.4.0", default-features = false }
cumulus-primitives-core = { version = "0.4.0", default-features = false }
cumulus-primitives-timestamp = { version = "0.4.0", default-features = false }
cumulus-primitives-utility = { version = "0.4.1", default-features = false }
frame-benchmarking = { version = "25.0.0", default-features = false }
frame-executive = { version = "25.0.0", default-features = false }
frame-support = { version = "25.0.0", default-features = false }
frame-system = { version = "25.0.0", default-features = false }
frame-system-benchmarking = { version = "25.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "23.0.0", default-features = false }
frame-try-runtime = { version = "0.31.0", default-features = false }
orml-traits = { version = "0.6.7", default-features = false }
orml-xcm = { version = "0.6.7", default-features = false }
orml-xcm-support = { version = "0.6.7", default-features = false }
orml-xtokens = { version = "0.6.7", default-features = false }
pallet-aura = { version = "24.0.0", default-features = false }
pallet-authorship = { version = "25.0.0", default-features = false }
pallet-balances = { version = "25.0.0", default-features = false }
pallet-bounties = { version = "24.0.0", default-features = false }
pallet-child-bounties = { version = "24.0.0", default-features = false }
pallet-collective = { version = "25.0.0", default-features = false }
pallet-democracy = { version = "25.0.0", default-features = false }
pallet-multisig = { version = "25.0.0", default-features = false }
pallet-preimage = { version = "25.0.0", default-features = false }
pallet-proxy = { version = "25.0.0", default-features = false }
pallet-scheduler = { version = "26.0.0", default-features = false }
pallet-sudo = { version = "25.0.0", default-features = false }
pallet-timestamp = { version = "24.0.0", default-features = false }
pallet-transaction-payment = { version = "25.0.0", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { version = "25.0.0", default-features = false }
pallet-treasury = { version = "24.0.0", default-features = false }
pallet-utility = { version = "25.0.0", default-features = false }
pallet-vesting = { version = "25.0.0", default-features = false }
pallet-xcm = { version = "4.0.0", default-features = false }
staging-parachain-info = { version = "0.4.0", default-features = false }
polkadot-core-primitives = { version = "4.0.0", default-features = false }
polkadot-parachain-primitives = { version = "3.0.0", default-features = false }
polkadot-primitives = { version = "4.0.0", default-features = false }
polkadot-runtime-common = { version = "4.0.0", default-features = false }
sp-api = { version = "23.0.0", default-features = false }
sp-block-builder = { version = "23.0.0", default-features = false }
sp-consensus-aura = { version = "0.29.0", default-features = false }
sp-core = { version = "25.0.0", default-features = false }
sp-genesis-builder = { version = "0.4.0", default-features = false }
sp-inherents = { version = "23.0.0", default-features = false }
sp-io = { version = "27.0.0", default-features = false }
sp-offchain = { version = "23.0.0", default-features = false }
sp-runtime = { version = "28.0.0", default-features = false }
sp-session = { version = "24.0.0", default-features = false }
sp-std = { version = "12.0.0", default-features = false }
sp-storage = { version = "17.0.0", default-features = false }
sp-transaction-pool = { version = "23.0.0", default-features = false }
sp-version = { version = "26.0.0", default-features = false }
staging-xcm = { version = "4.0.0", default-features = false }
staging-xcm-builder = { version = "4.0.1", default-features = false }
staging-xcm-executor = { version = "4.0.2", default-features = false }
cumulus-pallet-aura-ext = { version = "0.7.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.7.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.7.0", default-features = false }
cumulus-pallet-xcm = { version = "0.7.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.7.0", default-features = false }
cumulus-primitives-core = { version = "0.7.0", default-features = false }
cumulus-primitives-timestamp = { version = "0.7.0", default-features = false }
cumulus-primitives-utility = { version = "0.7.0", default-features = false }
frame-benchmarking = { version = "28.0.0", default-features = false }
frame-executive = { version = "28.0.0", default-features = false }
frame-support = { version = "28.0.0", default-features = false }
frame-system = { version = "28.0.0", default-features = false }
frame-system-benchmarking = { version = "28.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "26.0.0", default-features = false }
frame-try-runtime = { version = "0.34.0", default-features = false }
orml-traits = { version = "0.7", default-features = false }
orml-xcm = { version = "0.7", default-features = false }
orml-xcm-support = { version = "0.7", default-features = false }
orml-xtokens = { version = "0.7", default-features = false }
pallet-aura = { version = "27.0.0", default-features = false }
pallet-authorship = { version = "28.0.0", default-features = false }
pallet-balances = { version = "28.0.0", default-features = false }
pallet-bounties = { version = "27.0.0", default-features = false }
pallet-child-bounties = { version = "27.0.0", default-features = false }
pallet-collective = { version = "28.0.0", default-features = false }
pallet-democracy = { version = "28.0.0", default-features = false }
pallet-message-queue = { version = "31.0.0", default-features = false }
pallet-multisig = { version = "28.0.0", default-features = false }
pallet-preimage = { version = "28.0.0", default-features = false }
pallet-proxy = { version = "28.0.0", default-features = false }
pallet-scheduler = { version = "29.0.0", default-features = false }
pallet-sudo = { version = "28.0.0", default-features = false }
pallet-timestamp = { version = "27.0.0", default-features = false }
pallet-transaction-payment = { version = "28.0.0", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { version = "28.0.0", default-features = false }
pallet-treasury = { version = "27.0.0", default-features = false }
pallet-utility = { version = "28.0.0", default-features = false }
pallet-vesting = { version = "28.0.0", default-features = false }
pallet-xcm = { version = "7.0.0", default-features = false }
pallet-xcm-benchmarks = { version = "7.0.0", default-features = false }
parachains-common = { version = "7.0.0", default-features = false }
staging-parachain-info = { version = "0.7.0", default-features = false }
polkadot-core-primitives = { version = "7.0.0", default-features = false }
polkadot-parachain-primitives = { version = "6.0.0", default-features = false }
polkadot-primitives = { version = "7.0.0", default-features = false }
polkadot-runtime-common = { version = "7.0.0", default-features = false }
sp-api = { version = "26.0.0", default-features = false }
sp-block-builder = { version = "26.0.0", default-features = false }
sp-consensus-aura = { version = "0.32.0", default-features = false }
sp-core = { version = "28.0.0", default-features = false }
sp-genesis-builder = { version = "0.7.0", default-features = false }
sp-inherents = { version = "26.0.0", default-features = false }
sp-io = { version = "30.0.0", default-features = false }
sp-offchain = { version = "26.0.0", default-features = false }
sp-runtime = { version = "31.0.0", default-features = false }
sp-session = { version = "27.0.0", default-features = false }
sp-std = { version = "14.0.0", default-features = false }
sp-storage = { version = "19.0.0", default-features = false }
sp-transaction-pool = { version = "26.0.0", default-features = false }
sp-version = { version = "29.0.0", default-features = false }
staging-xcm = { version = "7.0.0", default-features = false }
staging-xcm-builder = { version = "7.0.0", default-features = false }
staging-xcm-executor = { version = "7.0.0", default-features = false }

# std stuff
cumulus-client-cli = "0.4.0"
cumulus-client-collator = "0.4.0"
cumulus-client-consensus-aura = "0.4.0"
cumulus-client-consensus-common = "0.4.0"
cumulus-client-consensus-proposer = "0.4.0"
cumulus-client-network = "0.4.0"
cumulus-client-service = "0.4.0"
cumulus-primitives-parachain-inherent = "0.4.0"
cumulus-relay-chain-inprocess-interface = "0.4.0"
cumulus-relay-chain-interface = "0.4.0"
cumulus-relay-chain-minimal-node = "0.4.0"
cumulus-relay-chain-rpc-interface = "0.4.0"
frame-benchmarking-cli = "29.0.0"
substrate-frame-rpc-system = "25.0.0"
jsonrpsee = { version = "0.16.2", features = ["server"] }
pallet-transaction-payment-rpc = "27.0.0"
polkadot-cli = "4.0.0"
polkadot-service = "4.0.0"
sc-basic-authorship = "0.31.0"
sc-chain-spec = "24.0.0"
sc-cli = "0.33.0"
sc-client-api = "25.0.0"
sc-consensus = "0.30.0"
sc-consensus-grandpa = "0.16.0"
sc-executor = "0.29.0"
sc-network = "0.31.0"
sc-network-common = "0.30.0"
sc-network-sync = "0.30.0"
sc-offchain = "26.0.0"
sc-rpc = "26.0.0"
sc-service = "0.32.0"
sc-sysinfo = "24.0.0"
sc-telemetry = "12.0.0"
sc-tracing = "25.0.0"
sc-transaction-pool = "25.0.0"
sc-transaction-pool-api = "25.0.0"
sp-blockchain = "25.0.0"
sp-consensus = "0.29.0"
sp-keyring = "28.0.0"
sp-keystore = "0.31.0"
sp-timestamp = "23.0.0"
substrate-prometheus-endpoint = "0.16.0"
cumulus-client-cli = "0.7.0"
cumulus-client-collator = "0.7.0"
cumulus-client-consensus-aura = "0.7.0"
cumulus-client-consensus-common = "0.7.0"
cumulus-client-consensus-proposer = "0.7.0"
cumulus-client-network = "0.7.0"
cumulus-client-service = "0.7.0"
cumulus-primitives-parachain-inherent = "0.7.0"
cumulus-relay-chain-inprocess-interface = "0.7.0"
cumulus-relay-chain-interface = "0.7.0"
cumulus-relay-chain-minimal-node = "0.7.0"
cumulus-relay-chain-rpc-interface = "0.7.0"
frame-benchmarking-cli = "32.0.0"
substrate-frame-rpc-system = "28.0.0"
jsonrpsee = { version = "0.16.3", features = ["server"] }
pallet-transaction-payment-rpc = "30.0.0"
polkadot-cli = "7.0.0"
polkadot-service = "7.0.0"
sc-basic-authorship = "0.34.0"
sc-chain-spec = "27.0.0"
sc-cli = "0.36.0"
sc-client-api = "28.0.0"
sc-consensus = "0.33.0"
sc-consensus-grandpa = "0.19.0"
sc-executor = "0.32.0"
sc-network = "0.34.0"
sc-network-common = "0.33.0"
sc-network-sync = "0.33.0"
sc-offchain = "29.0.0"
sc-rpc = "29.0.0"
sc-service = "0.35.0"
sc-sysinfo = "27.0.0"
sc-telemetry = "15.0.0"
sc-tracing = "28.0.0"
sc-transaction-pool = "28.0.0"
sc-transaction-pool-api = "28.0.0"
sp-blockchain = "28.0.0"
sp-consensus = "0.32.0"
sp-keyring = "31.0.0"
sp-keystore = "0.34.0"
sp-timestamp = "26.0.0"
substrate-prometheus-endpoint = "0.17.0"

# Temporary pin only
# See https://github.com/bluejekyll/trust-dns/issues/1946 for more details.
Expand All @@ -146,14 +149,14 @@ enum-as-inner = "=0.5.1"
assert_cmd = "2.0"
nix = "0.25"
tempfile = "3.3.0"
tokio = { version = "1.23.0", features = ["macros", "time", "parking_lot"] }
tokio = { version = "1.33.0", features = ["macros", "time", "parking_lot"] }
wait-timeout = "0.2"
hex = "0.4.3"
polkadot-runtime-parachains = "4.0.0"
polkadot-runtime-parachains = "7.0.0"

# build dependencies
substrate-build-script-utils = "9.0.0"
substrate-wasm-builder = "14.0.0"
substrate-build-script-utils = "11.0.0"
substrate-wasm-builder = "17.0.0"

#[patch."https://github.com/integritee-network/pallets.git"]
#claims-primitives = { path = '../pallets/primitives/claims' }
Expand Down
4 changes: 2 additions & 2 deletions polkadot-parachains/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "integritee-collator"
description = "The Integritee parachain collator binary"
# align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag
version = "1.8.1"
version = "1.9.0"
authors = ["Integritee AG <hello@integritee.network>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand All @@ -25,7 +25,7 @@ serde_json = { workspace = true }

# Parachain runtimes
integritee-runtime = { path = "integritee-runtime" }
parachains-common = { path = "common" }
integritee-parachains-common = { path = "common" }
shell-runtime = { path = "shell-runtime" }

# Substrate dependencies
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "parachains-common"
name = "integritee-parachains-common"
# major.minor revision must match collator node. patch bump ad lib
version = "1.8.0"
authors = ["Parity Technologies <admin@parity.io>"]
Expand Down
9 changes: 9 additions & 0 deletions polkadot-parachains/common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ mod constants {
WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
polkadot_primitives::MAX_POV_SIZE as u64,
);

/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
/// into the relay chain.
pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
/// How many parachain blocks are processed by the relay chain per parent. Limits the
/// number of blocks authored per slot.
pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
/// Relay chain slot duration, in milliseconds.
pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
}

/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
Expand Down
Loading