Skip to content

Commit

Permalink
Revert "Upgrade to polkadot-v1.9.0" (#219)
Browse files Browse the repository at this point in the history
  • Loading branch information
seunlanlege committed May 17, 2024
1 parent 8fad8b6 commit fd3101f
Show file tree
Hide file tree
Showing 50 changed files with 2,358 additions and 2,580 deletions.
4,153 changes: 1,974 additions & 2,179 deletions Cargo.lock

Large diffs are not rendered by default.

232 changes: 118 additions & 114 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -102,109 +102,109 @@ lto = "thin"

[workspace.dependencies]
# wasm
frame-benchmarking = { version = "31.0.0", default-features = false }
frame-executive = { version = "31.0.0", default-features = false }
frame-support = { version = "31.0.0", default-features = false }
frame-system = { version = "31.0.0", default-features = false }
frame-system-benchmarking = { version = "31.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "29.0.0", default-features = false }
frame-try-runtime = { version = "0.37.0", default-features = false }
pallet-aura = { version = "30.0.0", features = ["experimental"], default-features = false }
pallet-authorship = { version = "31.0.0", default-features = false }
pallet-balances = { version = "31.0.0", default-features = false }
pallet-session = { version = "31.0.0", default-features = false }
pallet-sudo = { version = "31.0.0", default-features = false }
pallet-utility = { version = "31.0.0", default-features = false }
pallet-timestamp = { version = "30.0.0", default-features = false }
pallet-transaction-payment = { version = "31.0.0", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { version = "31.0.0", default-features = false }
pallet-message-queue = { version = "34.0.0", default-features = false }
sp-api = { version = "29.0.0", default-features = false }
sp-blockchain = { version = "31.0.0", default-features = false }
sp-io = { version = "33.0.0", default-features = false }
sp-trie = { version = "32.0.0", default-features = false }
sp-block-builder = { version = "29.0.0", default-features = false }
sp-consensus-aura = { version = "0.35.0", default-features = false }
sp-consensus-beefy = { version = "16.0.0", default-features = false }
sp-core = { version = "31.0.0", default-features = false }
sp-core-hashing = { version = "16.0.0", default-features = false }
sp-inherents = { version = "29.0.0", default-features = false }
sp-offchain = { version = "29.0.0", default-features = false }
sp-runtime = { version = "34.0.0", default-features = false }
sp-session = { version = "30.0.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 }
pallet-aura = { version = "27.0.0", features = ["experimental"], default-features = false }
pallet-authorship = { version = "28.0.0", default-features = false }
pallet-balances = { version = "28.0.0", default-features = false }
pallet-session = { version = "28.0.0", default-features = false }
pallet-sudo = { version = "28.0.0", default-features = false }
pallet-utility = { 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-message-queue = { version = "31.0.0", default-features = false }
sp-api = { version = "26.0.0", default-features = false }
sp-blockchain = { version = "28.0.0", default-features = false }
sp-io = { version = "30.0.0", default-features = false }
sp-trie = { version = "29.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-consensus-beefy = { version = "13.0.0", default-features = false }
sp-core = { version = "28.0.0", default-features = false }
sp-core-hashing = { version = "15.0.0", default-features = false }
sp-inherents = { version = "26.0.0", default-features = false }
sp-offchain = { version = "26.0.0", default-features = false }
sp-runtime = { version = "31.0.1", default-features = false }
sp-session = { version = "27.0.0", default-features = false }
sp-std = { version = "14.0.0", default-features = false }
sp-transaction-pool = { version = "29.0.0", default-features = false }
sp-version = { version = "32.0.0", default-features = false }
sp-genesis-builder = { version = "0.10.0", default-features = false }
pallet-xcm = { version = "10.0.1", default-features = false }
polkadot-parachain-primitives = { version = "9.0.0", default-features = false }
polkadot-runtime-common = { version = "10.0.0", default-features = false }
staging-xcm = { version = "10.0.0", default-features = false }
staging-xcm-builder = { version = "10.0.0", default-features = false }
staging-xcm-executor = { version = "10.0.0", default-features = false }
cumulus-primitives-aura = { version = "0.10.0", default-features = false }
cumulus-pallet-session-benchmarking = { version = "12.0.0", default-features = false }
cumulus-pallet-aura-ext = { version = "0.10.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.10.0", default-features = false }
cumulus-pallet-xcm = { version = "0.10.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.10.0", default-features = false }
cumulus-primitives-core = { version = "0.10.0", default-features = false }
cumulus-primitives-timestamp = { version = "0.10.0", default-features = false }
cumulus-primitives-utility = { version = "0.10.0", default-features = false }
pallet-collator-selection = { version = "12.0.1", default-features = false }
parachain-info = { version = "0.10.0", package = "staging-parachain-info", default-features = false }
parachains-common = { version = "10.0.0", default-features = false }
sp-timestamp = { version = "29.0.0", default-features = false }
sp-keystore = { version = "0.37.0", default-features = false }
sp-mmr-primitives = { version = "29.0.0", default-features = false }
sp-state-machine = { version = "0.38.0", default-features = false }
sp-storage = { version = "20.0.0", default-features = false }
pallet-beefy-mmr = { version = "31.0.0", default-features = false }
pallet-assets = { version = "32.0.0", default-features = false }
sp-keyring = "34.0.0"
sp-transaction-pool = { version = "26.0.0", default-features = false }
sp-version = { version = "29.0.0", default-features = false }
sp-genesis-builder = { version = "0.7.0", default-features = false }
pallet-xcm = { version = "=7.0.0", default-features = false }
polkadot-parachain-primitives = { version = "=6.0.0", default-features = false }
polkadot-runtime-common = { version = "=7.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 }
cumulus-primitives-aura = { version = "0.7.0", default-features = false }
cumulus-pallet-session-benchmarking = { version = "9.0.0", 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-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 }
pallet-collator-selection = { version = "9.0.0", default-features = false }
parachain-info = { package = "staging-parachain-info", version = "0.7.0", default-features = false }
parachains-common = { version = "7.0.0", default-features = false }
sp-timestamp = { version = "26.0.0", default-features = false }
sp-keystore = { version = "0.34.0", default-features = false }
sp-mmr-primitives = { version = "26.0.0", default-features = false }
sp-state-machine = { version = "0.35.0", default-features = false }
sp-storage = { version = "19.0.0", default-features = false }
pallet-beefy-mmr = { version = "28.0.0", default-features = false }
pallet-assets = { version = "29.0.0", default-features = false }
sp-keyring = "31.0.0"

# client
frame-benchmarking-cli = "35.0.1"
pallet-transaction-payment-rpc = "33.0.0"
sc-basic-authorship = "0.37.0"
sc-chain-spec = "30.0.1"
sc-cli = "0.39.0"
sc-block-builder = "0.36.0"
sc-client-api = "31.0.0"
sc-consensus = "0.36.0"
sc-consensus-manual-seal = "0.38.0"
sc-executor = "0.35.0"
sc-network = "0.37.0"
sc-network-sync = "0.36.0"
sc-network-common = "0.36.0"
sc-rpc = "32.0.0"
sc-service = "0.38.0"
sc-sysinfo = "30.0.0"
sc-telemetry = "17.0.0"
sc-tracing = "31.0.0"
sc-transaction-pool = "31.0.0"
sc-transaction-pool-api = "31.0.0"
sc-offchain = "32.0.0"
substrate-frame-rpc-system = "31.0.0"
frame-benchmarking-cli = "32.0.0"
pallet-transaction-payment-rpc = "30.0.0"
sc-basic-authorship = "0.34.0"
sc-chain-spec = "27.0.0"
sc-cli = "0.36.0"
sc-block-builder = "0.33.0"
sc-client-api = "28.0.0"
sc-consensus = "0.33.0"
sc-consensus-manual-seal = "0.35.0"
sc-executor = "0.32.0"
sc-network = "0.34.0"
sc-network-sync = "0.33.0"
sc-network-common = "0.33.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"
sc-offchain = "29.0.0"
substrate-frame-rpc-system = "28.0.0"
substrate-prometheus-endpoint = "0.17.0"
try-runtime-cli = "0.41.0"
polkadot-cli = "10.0.0"
polkadot-primitives = "10.0.0"
polkadot-service = "10.0.0"
cumulus-client-cli = "0.10.0"
cumulus-client-consensus-aura = "0.10.0"
cumulus-client-consensus-common = "0.10.0"
cumulus-client-network = "0.10.0"
cumulus-client-service = "0.10.0"
cumulus-primitives-parachain-inherent = "0.10.0"
cumulus-relay-chain-interface = "0.10.0"
cumulus-client-consensus-proposer = "0.10.0"
cumulus-client-collator = "0.10.0"
substrate-wasm-builder = { version = "20.0.0" }
mmr-rpc = { version = "31.0.0" }
xcm-simulator-example = "10.0.0"
xcm-simulator = "10.0.0"
polkadot-runtime-parachains = "10.0.0"
try-runtime-cli = "0.38.0"
polkadot-cli = "7.0.0"
polkadot-primitives = "7.0.0"
polkadot-service = "7.0.0"
cumulus-client-cli = "0.7.0"
cumulus-client-consensus-aura = "0.7.0"
cumulus-client-consensus-common = "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-interface = "0.7.0"
cumulus-client-consensus-proposer = "0.7.0"
cumulus-client-collator = "0.7.0"
substrate-wasm-builder = { version = "17.0.0" }
mmr-rpc = { version = "28.0.0" }
xcm-simulator-example = "7.0.0"
xcm-simulator = "7.0.0"
polkadot-runtime-parachains = "7.0.0"

# crates.io
serde = { version = "1", default-features = false }
Expand All @@ -217,11 +217,11 @@ anyhow = {version = "1.0.71", default-features = false }
alloy-rlp = { version = "0.3.2", default-features = false }
alloy-rlp-derive = "0.3.2"
ethabi = { version = "18.0.0", features = ["rlp", "parity-codec"], default-features = false }
orml-xcm-support = { version = "=0.9.1", default-features = false }
orml-traits = { version = "=0.9.1", default-features = false }
orml-xcm-support = { version = "=0.7.0", default-features = false }
orml-traits = { version = "=0.7.0", default-features = false }
primitive-types = { version = "0.12.1", default-features = false }
sc-simnode = { version = "1.9.0" }
simnode-runtime-api = { version = "1.9.0", default-features = false }
sc-simnode = { version = "1.6.3" }
simnode-runtime-api = { version = "1.6.0", default-features = false }
subxt = { version = "0.30.1", default-features = false }

# local crates
Expand All @@ -244,23 +244,23 @@ sync-committee-verifier = { path = "./modules/consensus/sync-committee/verifier"

# consensus clients
ismp-bsc = { path = "./modules/ismp/clients/bsc", default-features = false }
ismp-parachain = { version = "1.9.0", path = "./modules/ismp/clients/parachain/client", default-features = false }
ismp-parachain-inherent = { version = "1.9.0", path = "./modules/ismp/clients/parachain/inherent" }
ismp-parachain-runtime-api = { version = "1.9.0", path = "./modules/ismp/clients/parachain/runtime-api", default-features = false }
ismp-parachain = { version = "1.6.2", path = "./modules/ismp/clients/parachain/client", default-features = false }
ismp-parachain-inherent = { version = "1.6.2", path = "./modules/ismp/clients/parachain/inherent" }
ismp-parachain-runtime-api = { version = "1.6.2", path = "./modules/ismp/clients/parachain/runtime-api", default-features = false }
ismp-sync-committee = { path = "./modules/ismp/clients/sync-committee", default-features = false }
evm-common = { path = "./modules/ismp/clients/sync-committee/evm-common", default-features = false }
arbitrum-verifier = { path = "./modules/ismp/clients/arbitrum", default-features = false }
op-verifier = { path = "./modules/ismp/clients/optimism", default-features = false }

# state machine clients
substrate-state-machine = { version = "1.9.0", path = "modules/ismp/state-machines/substrate", default-features = false }
substrate-state-machine = { version = "1.6.2", path = "modules/ismp/state-machines/substrate", default-features = false }
hyperbridge-client-machine = { path = "modules/ismp/state-machines/hyperbridge", default-features = false }

# pallets
pallet-ismp = { version = "1.9.0", path = "modules/ismp/pallets/pallet", default-features = false }
pallet-ismp-rpc = { version = "1.9.0", path = "modules/ismp/pallets/rpc" }
pallet-ismp-runtime-api = { version = "1.9.0", path = "modules/ismp/pallets/runtime-api", default-features = false }
pallet-hyperbridge = { version = "1.9.0", path = "modules/ismp/pallets/hyperbridge", default-features = false }
pallet-ismp = { version = "1.6.2", path = "modules/ismp/pallets/pallet", default-features = false }
pallet-ismp-rpc = { version = "1.6.2", path = "modules/ismp/pallets/rpc" }
pallet-ismp-runtime-api = { version = "1.6.2", path = "modules/ismp/pallets/runtime-api", default-features = false }
pallet-hyperbridge = { version = "1.6.2", path = "modules/ismp/pallets/hyperbridge", default-features = false }
pallet-fishermen = { path = "modules/ismp/pallets/fishermen", default-features = false }
pallet-ismp-demo = { path = "modules/ismp/pallets/demo", default-features = false }
pallet-ismp-relayer = { path = "modules/ismp/pallets/relayer", default-features = false }
Expand All @@ -273,7 +273,7 @@ pallet-mmr = { path = "modules/trees/mmr/pallet", default-features = false }
pallet-mmr-runtime-api = { path = "modules/trees/mmr/pallet/runtime-api", default-features = false }
mmr-gadget = { path = "modules/trees/mmr/gadget" }
ethereum-triedb = { version = "0.1.1", path = "./modules/trees/ethereum", default-features = false }
mmr-primitives = { version = "1.9.0", path = "modules/trees/mmr/primitives", default-features = false }
mmr-primitives = { version = "1.6.2", path = "modules/trees/mmr/primitives", default-features = false }

# runtimes
gargantua-runtime = { path = "./parachain/runtimes/gargantua", default-features = false }
Expand All @@ -290,9 +290,13 @@ tesseract = { path = "tesseract/relayer" }
transaction-fees = { path = "tesseract/fees" }
telemetry-server = { path = "tesseract/telemetry" }
tesseract-config = { path = "tesseract/config" }
cumulus-pallet-parachain-system= { version = "0.10.0", default-features = false, features = [

[workspace.dependencies.cumulus-pallet-parachain-system]
version = "0.7.0"
default-features = false
features = [
"parameterized-consensus-hook",
] }
]

[workspace.dependencies.ethers]
git = "https://github.com/polytope-labs/ethers-rs"
Expand Down
14 changes: 7 additions & 7 deletions modules/consensus/bsc/verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ publish = false


[dependencies]
log = { workspace = true }
anyhow = { workspace = true }
sp-core = { workspace = true }
alloy-rlp = { workspace = true }
alloy-primitives = { workspace = true }
alloy-rlp-derive = { workspace = true }
codec = { workspace = true }
log = { version = "0.4.17", default-features = false }
anyhow = { workspace = true, default-features = false }
sp-core = {version = "27.0.0", default-features = false }
alloy-rlp = { version = "0.3.2", default-features = false }
alloy-primitives = { version = "0.6.0", default-features = false, features = ["rlp"] }
alloy-rlp-derive = "0.3.2"
codec = { package = "parity-scale-codec", version = "3.1.3", default-features = false }
ethabi = { version = "18.0.0", features = ["rlp", "parity-codec"], default-features = false }
ismp = { path = "../../../ismp/core", default-features = false }
geth-primitives = { path = "../../geth-primitives", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion modules/consensus/geth-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false


[dependencies]
anyhow = { workspace = true }
anyhow = { workspace = true, default-features = false }
alloy-rlp = { workspace = true }
alloy-primitives = { workspace = true }
alloy-rlp-derive.workspace = true
Expand Down
1 change: 1 addition & 0 deletions modules/hyperclient/tests/streams.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ async fn subscribe_to_request_status() -> Result<(), anyhow::Error> {
}

#[wasm_bindgen_test]
#[ignore]
async fn test_timeout_request() -> Result<(), anyhow::Error> {
init_tracing();

Expand Down
8 changes: 4 additions & 4 deletions modules/ismp/clients/arbitrum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ geth-primitives = { workspace = true }
evm-common = { workspace = true }

# crates.io
alloy-rlp = { workspace = true }
alloy-rlp-derive = { workspace = true }
alloy-primitives = { workspace = true }
alloy-rlp = { version = "0.3.2", default-features = false }
alloy-rlp-derive = "0.3.2"
alloy-primitives = { version = "0.6.0", default-features = false, features = ["rlp"] }
hex = { version = "0.4.3", default-features = false }
hex-literal = "0.3.4"
ethabi = { version = "18.0.0", features = ["rlp", "parity-codec"], default-features = false }
codec = { workspace = true }
codec = { package = "parity-scale-codec", version = "3.1.3", default-features = false }


[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions modules/ismp/clients/bsc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ publish = false
[dependencies]
log = { version = "0.4.17", default-features = false }
anyhow = { workspace = true }
sp-core = { workspace = true }
codec = { workspace = true }
scale-info = { workspace = true , features = ["derive"] }
sp-core = {version = "27.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.1.3", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }

ismp = { workspace = true }
bsc-verifier = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions modules/ismp/clients/optimism/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ geth-primitives = { workspace = true }
evm-common = { workspace = true }

# crates.io
alloy-rlp = { workspace = true }
alloy-rlp-derive = { workspace = true }
alloy-primitives = { workspace = true }
alloy-rlp = { version = "0.3.2", default-features = false }
alloy-rlp-derive = "0.3.2"
alloy-primitives = { version = "0.6.0", default-features = false, features = ["rlp"] }
hex = { version = "0.4.3", default-features = false }
hex-literal = "0.3.4"
ethabi = { version = "18.0.0", features = ["rlp", "parity-codec"], default-features = false }
codec = { workspace = true }
codec = { package = "parity-scale-codec", version = "3.1.3", default-features = false }



Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/clients/parachain/client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ismp-parachain"
version = "1.9.0"
version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/clients/parachain/inherent/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ismp-parachain-inherent"
version = "1.9.0"
version = "1.6.3"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/clients/parachain/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ismp-parachain-runtime-api"
version = "1.9.0"
version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
license = "Apache-2.0"
Expand Down
Loading

0 comments on commit fd3101f

Please sign in to comment.