Skip to content

Commit

Permalink
Leo/upgrade to 113 (#357)
Browse files Browse the repository at this point in the history 
* feat: initial round of fixes

* feat: move to v4

* feat: upgrade config to v4

* feat: upgrade config to v4

* feat: align dependencies

* chore: bump jwt_compact

* chore: pin sc-network-types

* chore: pin the right versions

* feat: update the note to latests

* chore: refactor execute_migrations

* chore: inital tests cleanup

* chore: fix integration tests

* feat: restore fees to treasury

* chore: restore test in staking

* chore: cleanup syntax

* chore: remove unnecessary parenthesis

* chore: address dispenser warning

* chore: restore previous test case

* chore: fix linear release bench

* chore: align ids on tests

* chore: inital benchmark wave

* feat: use the new FungibleAdapter

* chore: remove multi prefix

* chore: prepare and execute the XCM Message

* feat: add the new Juan's trait in the executor

* chore: partially restore PalletInfo

* fixing things

* fixing things

* fixed test

* remove benchmark tests from runtime

* roll back sp-runtime one minor since they removed sp-std and that errors out

* fix runtime config for benchmarks

* remove unused fields and clippy run

* remove unused fields and clippy run

* remove todo! panicking benchmarks

* fmt

* Fix round timings

* Fix round timings

* Remove SuccessToSettlementTime

* cargo clippy

* fix benchmark

* fixes

* fixes

---------

Co-authored-by: Juan Ignacio Rios <[email protected]>
  • Loading branch information
@lrazovic @JuaniRios
lrazovic and JuaniRios authored Aug 27, 2024
1 parent ea31031 commit c1e532c
Show file tree
Hide file tree
Showing 69 changed files with 4,056 additions and 4,856 deletions.
4,366 changes: 2,677 additions & 1,689 deletions Cargo.lock
View file

Large diffs are not rendered by default.

274 changes: 135 additions & 139 deletions Cargo.toml
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ scale-info = { workspace = true, features = ["derive"] }

# Local
polimec-receiver.workspace = true
polimec-xcm-executor.workspace = true
macros.workspace = true
polimec-common.workspace = true
polimec-common-test-utils.workspace = true
Expand Down Expand Up @@ -119,7 +118,6 @@ std = [
"polimec-common/std",
"polimec-receiver/std",
"polimec-runtime/std",
"polimec-xcm-executor/std",
"polkadot-core-primitives/std",
"polkadot-parachain-primitives/std",
"polkadot-primitives/std",
Expand All @@ -142,4 +140,5 @@ std = [
"xcm/std",
]
development-settings = [ "polimec-runtime/development-settings" ]
runtime-benchmarks = []

129 changes: 62 additions & 67 deletions integration-tests/penpal/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,86 +15,83 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
substrate-wasm-builder = { workspace = true, optional = true }
substrate-wasm-builder = { optional = true, workspace = true, default-features = true }

[dependencies]
parity-scale-codec = { workspace = true, default-features = false, features = ["derive"] }
hex-literal = { version = "0.4.1", optional = true }
log = { version = "0.4.20", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
smallvec = "1.11.0"
parity-scale-codec = { features = ["derive"], workspace = true }
hex-literal = { optional = true, workspace = true, default-features = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
smallvec = { workspace = true, default-features = true }

# Local
polimec-receiver.workspace = true
polimec-common.workspace = true


# Substrate
frame-benchmarking = { workspace = true, default-features = false, optional = true }
frame-executive = { workspace = true, default-features = false }
frame-support = { workspace = true, default-features = false }
frame-system = { workspace = true, default-features = false }
frame-system-benchmarking = { workspace = true, default-features = false, optional = true }
frame-system-rpc-runtime-api = { workspace = true, default-features = false }
frame-try-runtime = { workspace = true, default-features = false, optional = true }
pallet-aura = { workspace = true, default-features = false }
pallet-authorship = { workspace = true, default-features = false }
pallet-balances = { workspace = true, default-features = false }
pallet-session = { workspace = true, default-features = false }
pallet-sudo = { workspace = true, default-features = false }
pallet-timestamp = { workspace = true, default-features = false }
pallet-transaction-payment = { workspace = true, default-features = false }
pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = false }
pallet-asset-tx-payment = { workspace = true, default-features = false }
pallet-assets = { workspace = true, default-features = false }
sp-api = { workspace = true, default-features = false }
sp-block-builder = { workspace = true, default-features = false }
sp-consensus-aura = { workspace = true, default-features = false }
sp-core = { workspace = true, default-features = false }
sp-genesis-builder = { workspace = true, default-features = false }
sp-inherents = { workspace = true, default-features = false }
sp-offchain = { workspace = true, default-features = false }
sp-runtime = { workspace = true, default-features = false }
sp-session = { workspace = true, default-features = false }
sp-std = { workspace = true, default-features = false }
frame-benchmarking = { optional = true, workspace = true }
frame-executive = { workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
frame-system-benchmarking = { optional = true, workspace = true }
frame-system-rpc-runtime-api = { workspace = true }
frame-try-runtime = { optional = true, workspace = true }
pallet-aura = { workspace = true }
pallet-authorship = { workspace = true }
pallet-balances = { workspace = true }
pallet-session = { workspace = true }
pallet-sudo = { workspace = true }
pallet-timestamp = { workspace = true }
pallet-transaction-payment = { workspace = true }
pallet-transaction-payment-rpc-runtime-api = { workspace = true }
pallet-asset-tx-payment = { workspace = true }
pallet-assets = { workspace = true }
pallet-vesting = { workspace = true }
sp-api = { workspace = true }
sp-block-builder = { workspace = true }
sp-consensus-aura = { workspace = true }
sp-core = { workspace = true }
sp-genesis-builder = { workspace = true }
sp-inherents = { workspace = true }
sp-offchain = { workspace = true }
sp-runtime = { workspace = true }
sp-session = { workspace = true }
sp-transaction-pool = { workspace = true }
sp-version = { workspace = true }
sp-std = { workspace = true }
sp-storage = { version = "19.0.0", default-features = false }
sp-transaction-pool = { workspace = true, default-features = false }
sp-version = { workspace = true, default-features = false }
polkadot-runtime-parachains.workspace = true
pallet-collator-selection = { version = "9.0.2", default-features = false }



pallet-collator-selection = { version = "16.0.0", default-features = false }
# Polkadot
polkadot-primitives = { workspace = true, default-features = false }
pallet-xcm = { workspace = true, default-features = false }
polkadot-parachain-primitives = { workspace = true, default-features = false }
polkadot-runtime-common = { workspace = true, default-features = false }
xcm = { workspace = true, default-features = false }
xcm-builder = { workspace = true, default-features = false }
xcm-executor = { workspace = true, default-features = false }
polkadot-primitives = { workspace = true }
pallet-xcm = { workspace = true }
polkadot-parachain-primitives = { workspace = true }
polkadot-runtime-common = { workspace = true }
xcm = { workspace = true }
xcm-builder = { workspace = true }
xcm-executor = { workspace = true }

# Cumulus
cumulus-pallet-aura-ext = { workspace = true, default-features = false }
pallet-message-queue = { workspace = true, default-features = false }
cumulus-pallet-dmp-queue = { workspace = true, default-features = false }
cumulus-pallet-parachain-system = { workspace = true, default-features = false, features = ["parameterized-consensus-hook"] }
cumulus-pallet-session-benchmarking = { workspace = true, default-features = false }
cumulus-pallet-xcm = { workspace = true, default-features = false }
cumulus-pallet-xcmp-queue = { workspace = true, default-features = false }
cumulus-primitives-core = { workspace = true, default-features = false }
cumulus-primitives-utility = { workspace = true, default-features = false }
parachain-info = { workspace = true, default-features = false }
parachains-common = { workspace = true, default-features = false }
pallet-vesting.workspace = true
assets-common = { version = "0.7.0", default-features = false }
snowbridge-rococo-common = { version = "0.1.0", default-features = false }
cumulus-pallet-aura-ext = { workspace = true }
pallet-message-queue = { workspace = true }
cumulus-pallet-parachain-system = { workspace = true }
cumulus-pallet-session-benchmarking = { workspace = true }
cumulus-pallet-xcm = { workspace = true }
cumulus-pallet-xcmp-queue = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-utility = { workspace = true }
parachain-info = { workspace = true }
parachains-common = { workspace = true }
polkadot-runtime-parachains = { workspace = true }
assets-common = { version = "0.14.0", default-features = false }
testnet-parachains-constants = { version = "7.0.0", default-features = false }
xcm-fee-payment-runtime-api = { version = "0.4.0", default-features = false }

[features]
default = [ "std" ]
std = [
"assets-common/std",
"cumulus-pallet-aura-ext/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-session-benchmarking/std",
"cumulus-pallet-xcm/std",
Expand Down Expand Up @@ -133,7 +130,6 @@ std = [
"polkadot-runtime-common/std",
"polkadot-runtime-parachains/std",
"scale-info/std",
"snowbridge-rococo-common/std",
"sp-api/std",
"sp-block-builder/std",
"sp-consensus-aura/std",
Expand All @@ -148,14 +144,15 @@ std = [
"sp-transaction-pool/std",
"sp-version/std",
"substrate-wasm-builder",
"testnet-parachains-constants/std",
"xcm-builder/std",
"xcm-executor/std",
"xcm-fee-payment-runtime-api/std",
"xcm/std",
]

runtime-benchmarks = [
"assets-common/runtime-benchmarks",
"cumulus-pallet-dmp-queue/runtime-benchmarks",
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
Expand All @@ -182,15 +179,14 @@ runtime-benchmarks = [
"polkadot-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
"snowbridge-rococo-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-fee-payment-runtime-api/runtime-benchmarks",
]

try-runtime = [
"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-dmp-queue/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
Expand Down Expand Up @@ -219,4 +215,3 @@ try-runtime = [
"sp-runtime/try-runtime",
]

experimental = [ "pallet-aura/experimental" ]
Loading

0 comments on commit c1e532c

Please sign in to comment.