From 018e50ab6d10691dbb63e66ab31aa081be0713f3 Mon Sep 17 00:00:00 2001 From: claravanstaden Date: Mon, 13 Nov 2023 18:17:10 +0200 Subject: [PATCH] update from polkadot and snowbridge upstream --- Cargo.lock | 16 +++++++++++++++- polkadot/xcm/pallet-xcm/Cargo.toml | 4 ---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 450f0f28bee1..656d18e97676 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2471,6 +2471,7 @@ dependencies = [ "snowbridge-outbound-queue", "snowbridge-outbound-queue-runtime-api", "snowbridge-router-primitives", + "snowbridge-runtime-common", "sp-api", "sp-block-builder", "sp-consensus-aura", @@ -17497,7 +17498,6 @@ dependencies = [ "scale-info", "serde", "snowbridge-beacon-primitives", - "snowbridge-ethereum", "sp-arithmetic", "sp-core", "sp-runtime", @@ -17652,6 +17652,20 @@ dependencies = [ "staging-xcm-executor", ] +[[package]] +name = "snowbridge-runtime-common" +version = "0.1.1" +dependencies = [ + "frame-support", + "frame-system", + "log", + "snowbridge-core", + "sp-arithmetic", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + [[package]] name = "socket2" version = "0.4.9" diff --git a/polkadot/xcm/pallet-xcm/Cargo.toml b/polkadot/xcm/pallet-xcm/Cargo.toml index 1cb31a547712..cc5d7d97c451 100644 --- a/polkadot/xcm/pallet-xcm/Cargo.toml +++ b/polkadot/xcm/pallet-xcm/Cargo.toml @@ -28,10 +28,6 @@ xcm-builder = { package = "staging-xcm-builder", path = "../xcm-builder", defaul frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true } pallet-balances = { path = "../../../substrate/frame/balances", default-features = false, optional = true } -# marked optional, used in benchmarking -frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true } -pallet-balances = { path = "../../../substrate/frame/balances", default-features = false, optional = true } - [dev-dependencies] pallet-assets = { path = "../../../substrate/frame/assets" } polkadot-runtime-parachains = { path = "../../runtime/parachains" }