pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-17 21:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

XXX: Use v15 docs

Browse Source 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
This commit is contained in:
Alexandru Vasile
2023-02-22 18:20:00 +02:00
parent 8911550234
commit 16d43d28af
13 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+16 -17
View File
@@ -957,6 +957,16 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "frame-metadata"
version = "15.0.0"
dependencies = [
"cfg-if",
"parity-scale-codec",
"scale-info",
"serde",
]
[[package]] [[package]]
name = "frame-metadata" name = "frame-metadata"
version = "15.0.0" version = "15.0.0"
@@ -968,17 +978,6 @@ dependencies = [
"scale-info", "scale-info",
] ]
[[package]]
name = "frame-metadata"
version = "15.0.0"
source = "git+https://github.com/paritytech/frame-metadata/?branch=lexnv/md_v15_test#35b8304e004f9a759aa2663e24c5f56e2a50c301"
dependencies = [
"cfg-if",
"parity-scale-codec",
"scale-info",
"serde",
]
[[package]] [[package]]
name = "funty" name = "funty"
version = "2.0.0" version = "2.0.0"
@@ -1508,7 +1507,7 @@ name = "integration-tests"
version = "0.25.0" version = "0.25.0"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"frame-metadata 15.0.0 (git+https://github.com/paritytech/frame-metadata/?branch=lexnv/md_v15_test)", "frame-metadata 15.0.0",
"futures", "futures",
"hex", "hex",
"parity-scale-codec", "parity-scale-codec",
@@ -3338,7 +3337,7 @@ dependencies = [
"bitvec", "bitvec",
"blake2", "blake2",
"derivative", "derivative",
"frame-metadata 15.0.0 (git+https://github.com/paritytech/frame-metadata/?branch=lexnv/md_v15_test)", "frame-metadata 15.0.0",
"futures", "futures",
"getrandom 0.2.8", "getrandom 0.2.8",
"hex", "hex",
@@ -3371,7 +3370,7 @@ version = "0.25.0"
dependencies = [ dependencies = [
"clap 4.1.1", "clap 4.1.1",
"color-eyre", "color-eyre",
"frame-metadata 15.0.0 (git+https://github.com/paritytech/frame-metadata/?branch=lexnv/md_v15_test)", "frame-metadata 15.0.0",
"hex", "hex",
"jsonrpsee", "jsonrpsee",
"parity-scale-codec", "parity-scale-codec",
@@ -3389,7 +3388,7 @@ version = "0.25.0"
dependencies = [ dependencies = [
"bitvec", "bitvec",
"darling", "darling",
"frame-metadata 15.0.0 (git+https://github.com/paritytech/frame-metadata/?branch=lexnv/md_v15_test)", "frame-metadata 15.0.0",
"heck", "heck",
"hex", "hex",
"jsonrpsee", "jsonrpsee",
@@ -3435,7 +3434,7 @@ version = "0.25.0"
dependencies = [ dependencies = [
"bitvec", "bitvec",
"criterion", "criterion",
"frame-metadata 15.0.0 (git+https://github.com/paritytech/frame-metadata/?branch=lexnv/md_v15_test)", "frame-metadata 15.0.0",
"parity-scale-codec", "parity-scale-codec",
"scale-info", "scale-info",
"sp-core-hashing", "sp-core-hashing",
@@ -3811,7 +3810,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
name = "ui-tests" name = "ui-tests"
version = "0.25.0" version = "0.25.0"
dependencies = [ dependencies = [
"frame-metadata 15.0.0 (git+https://github.com/paritytech/frame-metadata/?branch=lexnv/md_v15_test)", "frame-metadata 15.0.0",
"parity-scale-codec", "parity-scale-codec",
"scale-info", "scale-info",
"subxt", "subxt",
cli/Cargo.toml
+1 -1
View File
@@ -31,7 +31,7 @@ serde_json = "1.0.68"
# hex encoded metadata to bytes # hex encoded metadata to bytes
hex = "0.4.3" hex = "0.4.3"
# actual metadata types # actual metadata types
frame-metadata = { version = "15.0.0", git = "https://github.com/paritytech/frame-metadata/", branch = "lexnv/md_v15_test", default-features = false, features = ["std", "v14", "v15-unstable"] } frame-metadata = { version = "15.0.0", path = "/home/lexnv/workspace/frame-metadata/frame-metadata", default-features = false, features = ["std", "v14", "v15-unstable"] }
# decode bytes into the metadata types # decode bytes into the metadata types
scale = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
# generate the item mod for codegen # generate the item mod for codegen
codegen/Cargo.toml
+1 -1
View File
@@ -14,7 +14,7 @@ description = "Generate an API for interacting with a substrate node from FRAME
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] }
darling = "0.14.0" darling = "0.14.0"
frame-metadata = { version = "15.0.0", git = "https://github.com/paritytech/frame-metadata/", branch = "lexnv/md_v15_test", default-features = false, features = ["std", "v14", "v15-unstable"] } frame-metadata = { version = "15.0.0", path = "/home/lexnv/workspace/frame-metadata/frame-metadata", default-features = false, features = ["std", "v14", "v15-unstable"] }
heck = "0.4.0" heck = "0.4.0"
proc-macro2 = "1.0.24" proc-macro2 = "1.0.24"
proc-macro-error = "1.0.4" proc-macro-error = "1.0.4"
codegen/src/api/calls.rs
+2 -2
View File
@@ -9,9 +9,9 @@ use crate::{
}, },
CratePath, CratePath,
}; };
use frame_metadata::{ use frame_metadata::v15::{
v15::RuntimeMetadataV15,
PalletMetadata, PalletMetadata,
RuntimeMetadataV15,
}; };
use heck::{ use heck::{
ToSnakeCase as _, ToSnakeCase as _,
codegen/src/api/constants.rs
+2 -2
View File
@@ -6,9 +6,9 @@ use crate::{
types::TypeGenerator, types::TypeGenerator,
CratePath, CratePath,
}; };
use frame_metadata::{ use frame_metadata::v15::{
v15::RuntimeMetadataV15,
PalletMetadata, PalletMetadata,
RuntimeMetadataV15,
}; };
use heck::ToSnakeCase as _; use heck::ToSnakeCase as _;
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
codegen/src/api/events.rs
+1 -1
View File
@@ -6,7 +6,7 @@ use crate::{
types::TypeGenerator, types::TypeGenerator,
CratePath, CratePath,
}; };
use frame_metadata::PalletMetadata; use frame_metadata::v15::PalletMetadata;
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use quote::quote; use quote::quote;
use scale_info::form::PortableForm; use scale_info::form::PortableForm;
codegen/src/api/mod.rs
+2
View File
@@ -141,7 +141,9 @@ pub fn generate_runtime_api_from_bytes(
let decoded: Option<frame_metadata::OpaqueMetadata> = Decode::decode(&mut &*bytes) let decoded: Option<frame_metadata::OpaqueMetadata> = Decode::decode(&mut &*bytes)
.unwrap_or_else(|e| abort_call_site!("Failed to decode opaque metadata: {}", e)); .unwrap_or_else(|e| abort_call_site!("Failed to decode opaque metadata: {}", e));
let decoded = decoded.unwrap(); let decoded = decoded.unwrap();
let bytes = &decoded.0; let bytes = &decoded.0;
let metadata: RuntimeMetadataPrefixed = Decode::decode(&mut &bytes[..]) let metadata: RuntimeMetadataPrefixed = Decode::decode(&mut &bytes[..])
.unwrap_or_else(|e| abort_call_site!("Failed to decode metadata: {}", e)); .unwrap_or_else(|e| abort_call_site!("Failed to decode metadata: {}", e));
codegen/src/api/storage.rs
+4 -2
View File
@@ -7,8 +7,10 @@ use crate::{
CratePath, CratePath,
}; };
use frame_metadata::{ use frame_metadata::{
v15::RuntimeMetadataV15, v15::{
PalletMetadata, PalletMetadata,
RuntimeMetadataV15,
},
StorageEntryMetadata, StorageEntryMetadata,
StorageEntryModifier, StorageEntryModifier,
StorageEntryType, StorageEntryType,
metadata/Cargo.toml
+1 -1
View File
@@ -14,7 +14,7 @@ description = "Command line utilities for checking metadata compatibility betwee
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] }
frame-metadata = { version = "15.0.0", git = "https://github.com/paritytech/frame-metadata/", branch = "lexnv/md_v15_test", default-features = false, features = ["std", "v14", "v15-unstable"] } frame-metadata = { version = "15.0.0", path = "/home/lexnv/workspace/frame-metadata/frame-metadata", default-features = false, features = ["std", "v14", "v15-unstable"] }
scale-info = "2.0.0" scale-info = "2.0.0"
sp-core-hashing = "6.0.0" sp-core-hashing = "6.0.0"
metadata/src/lib.rs
+9 -7
View File
@@ -377,7 +377,8 @@ pub fn get_metadata_hash(metadata: &RuntimeMetadataV15) -> [u8; 32] {
.pallets .pallets
.iter() .iter()
.map(|pallet| { .map(|pallet| {
let hash = get_pallet_hash(&metadata.types, pallet); // let hash = get_pallet_hash(&metadata.types, pallet);
let hash = [0u8; 32];
(&*pallet.name, hash) (&*pallet.name, hash)
}) })
.collect(); .collect();
@@ -425,12 +426,13 @@ pub fn get_metadata_per_pallet_hash<T: AsRef<str>>(
let in_pallet = pallets let in_pallet = pallets
.iter() .iter()
.any(|pallet_ref| pallet_ref.as_ref() == pallet.name); .any(|pallet_ref| pallet_ref.as_ref() == pallet.name);
if in_pallet { None
let hash = get_pallet_hash(&metadata.types, pallet); // if in_pallet {
Some((&*pallet.name, hash)) // let hash = get_pallet_hash(&metadata.types, pallet);
} else { // Some((&*pallet.name, hash))
None // } else {
} // None
// }
}) })
.collect(); .collect();
subxt/Cargo.toml
+1 -1
View File
@@ -47,7 +47,7 @@ serde_json = { version = "1.0.64", features = ["raw_value"] }
thiserror = "1.0.24" thiserror = "1.0.24"
tracing = "0.1.34" tracing = "0.1.34"
parking_lot = "0.12.0" parking_lot = "0.12.0"
frame-metadata = { version = "15.0.0", git = "https://github.com/paritytech/frame-metadata/", branch = "lexnv/md_v15_test", default-features = false, features = ["std", "v14", "v15-unstable"] } frame-metadata = { version = "15.0.0", path = "/home/lexnv/workspace/frame-metadata/frame-metadata", default-features = false, features = ["std", "v14", "v15-unstable"] }
derivative = "2.2.0" derivative = "2.2.0"
subxt-macro = { version = "0.25.0", path = "../macro" } subxt-macro = { version = "0.25.0", path = "../macro" }
testing/integration-tests/Cargo.toml
+1 -1
View File
@@ -18,7 +18,7 @@ default = ["subxt/integration-tests"]
[dev-dependencies] [dev-dependencies]
assert_matches = "1.5.0" assert_matches = "1.5.0"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
frame-metadata = { version = "15.0.0", git = "https://github.com/paritytech/frame-metadata/", branch = "lexnv/md_v15_test", default-features = false, features = ["std", "v14", "v15-unstable"] } frame-metadata = { version = "15.0.0", path = "/home/lexnv/workspace/frame-metadata/frame-metadata", default-features = false, features = ["std", "v14", "v15-unstable"] }
futures = "0.3.13" futures = "0.3.13"
hex = "0.4.3" hex = "0.4.3"
regex = "1.5.0" regex = "1.5.0"
testing/ui-tests/Cargo.toml
+1 -1
View File
@@ -11,6 +11,6 @@ publish = false
[dev-dependencies] [dev-dependencies]
trybuild = "1.0.76" trybuild = "1.0.76"
scale-info = { version = "2.3.0", features = ["bit-vec"] } scale-info = { version = "2.3.0", features = ["bit-vec"] }
frame-metadata = { version = "15.0.0", git = "https://github.com/paritytech/frame-metadata/", branch = "lexnv/md_v15_test", default-features = false, features = ["std", "v14", "v15-unstable"] } frame-metadata = { version = "15.0.0", path = "/home/lexnv/workspace/frame-metadata/frame-metadata", default-features = false, features = ["std", "v14", "v15-unstable"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
subxt = { path = "../../subxt" } subxt = { path = "../../subxt" }