diff --git a/Cargo.lock b/Cargo.lock index 0ec21c8362..4fa5e98d2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2937,7 +2937,7 @@ dependencies = [ "serde", "sp-core", "sp-io", - "sp-std", + "sp-std 7.0.0", ] [[package]] @@ -2951,7 +2951,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 7.0.0", "static_assertions", ] @@ -2990,7 +2990,7 @@ dependencies = [ "sp-debug-derive", "sp-externalities", "sp-runtime-interface", - "sp-std", + "sp-std 7.0.0", "sp-storage", "ss58-registry", "substrate-bip39", @@ -3010,7 +3010,7 @@ dependencies = [ "digest 0.10.6", "sha2 0.10.6", "sha3", - "sp-std", + "sp-std 7.0.0", "twox-hash", ] @@ -3045,7 +3045,7 @@ checksum = "8ae0f275760689aaefe967943331d458cd99f5169d18364365d4cb584b246d1c" dependencies = [ "environmental", "parity-scale-codec", - "sp-std", + "sp-std 7.0.0", "sp-storage", ] @@ -3068,7 +3068,7 @@ dependencies = [ "sp-keystore", "sp-runtime-interface", "sp-state-machine", - "sp-std", + "sp-std 7.0.0", "sp-tracing", "sp-trie", "tracing", @@ -3104,6 +3104,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sp-metadata-ir" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate.git#da9f88dcac328d8f6de38dd61e33078c20bd6685" +dependencies = [ + "frame-metadata", + "parity-scale-codec", + "scale-info", + "sp-std 5.0.0", +] + [[package]] name = "sp-panic-handler" version = "7.0.0" @@ -3134,7 +3145,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-io", - "sp-std", + "sp-std 7.0.0", "sp-weights", ] @@ -3150,7 +3161,7 @@ dependencies = [ "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", - "sp-std", + "sp-std 7.0.0", "sp-storage", "sp-tracing", "sp-wasm-interface", @@ -3185,12 +3196,17 @@ dependencies = [ "sp-core", "sp-externalities", "sp-panic-handler", - "sp-std", + "sp-std 7.0.0", "sp-trie", "thiserror", "tracing", ] +[[package]] +name = "sp-std" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git#da9f88dcac328d8f6de38dd61e33078c20bd6685" + [[package]] name = "sp-std" version = "7.0.0" @@ -3208,7 +3224,7 @@ dependencies = [ "ref-cast", "serde", "sp-debug-derive", - "sp-std", + "sp-std 7.0.0", ] [[package]] @@ -3218,7 +3234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00fab60bf3d42255ce3f678903d3a2564662371c75623de4a1ffc7cac46143df" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 7.0.0", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -3241,7 +3257,7 @@ dependencies = [ "scale-info", "schnellru", "sp-core", - "sp-std", + "sp-std 7.0.0", "thiserror", "tracing", "trie-db", @@ -3261,7 +3277,7 @@ dependencies = [ "serde", "sp-core-hashing-proc-macro", "sp-runtime", - "sp-std", + "sp-std 7.0.0", "sp-version-proc-macro", "thiserror", ] @@ -3288,7 +3304,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 7.0.0", "wasmi", "wasmtime", ] @@ -3306,7 +3322,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-debug-derive", - "sp-std", + "sp-std 7.0.0", ] [[package]] @@ -3500,6 +3516,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core-hashing", + "sp-metadata-ir", ] [[package]] diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index a51d718d91..093db6022f 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -18,6 +18,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = frame-metadata = { version = "15.1.0", features = ["v14", "v15-unstable", "std"] } scale-info = "2.5.0" sp-core-hashing = "7.0.0" +sp-metadata-ir = { git = "https://github.com/paritytech/substrate.git", version = "0.1.0" } [dev-dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } diff --git a/metadata/src/lib.rs b/metadata/src/lib.rs index 8867f7ed24..3b31f205e9 100644 --- a/metadata/src/lib.rs +++ b/metadata/src/lib.rs @@ -5,6 +5,8 @@ mod retain; mod validation; +pub use sp_metadata_ir as metadata_ir; + pub use retain::retain_metadata_pallets; pub use validation::{ get_call_hash, get_constant_hash, get_metadata_hash, get_metadata_per_pallet_hash,