Skip to content

Commit

Permalink
Deps upgrade incl. substrate monthly-2023-08
Browse files Browse the repository at this point in the history
  • Loading branch information
@chevdor
chevdor committed Aug 1, 2023
1 parent d141f04 commit 1c8446b
Show file tree
Hide file tree
Showing 11 changed files with 289 additions and 371 deletions.
597 changes: 262 additions & 335 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ wasm-loader = { version = "0.20.0", path = "../libs/wasm-loader" }
wasm-testbed = { version = "0.20.0", path = "../libs/wasm-testbed" }
serde_json = "1.0"
text-style = { version = "0.3", features = ["crossterm"] }
sp-runtime = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-runtime = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
url = "2.3"

[dev-dependencies]
Expand Down
7 changes: 2 additions & 5 deletions lib/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ keywords = [

[dependencies]
uuid = { version = "1.3", features = ["v4"] }
frame-metadata = { version = "15", package = "frame-metadata", features = [
"v12",
"v13",
"v14",
frame-metadata = { version = "16", package = "frame-metadata", features = [
"std",
] }
log = "0.4"
Expand All @@ -37,7 +34,7 @@ serde = { version = "1.0", features = ["derive"] }
scale-info = { version = "2.1", default-features = false, features = [
"derive",
] }
sp-version = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-version = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
ipfs-hasher = { version = "0.20.0", path = "../libs/ipfs-hasher" }
wasm-loader = { version = "0.20.0", path = "../libs/wasm-loader" }
wasm-testbed = { version = "0.20.0", path = "../libs/wasm-testbed" }
Expand Down
7 changes: 2 additions & 5 deletions libs/substrate-differ/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ scale-info = { version = "2.1.2", default-features = false, features = [
"std",
"serde",
] }
frame-metadata = { version = "15", package = "frame-metadata", features = [
"v12",
"v13",
"v14",
"std",
frame-metadata = { version = "16", package = "frame-metadata", features = [
"std", "legacy"
] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion libs/substrate-differ/src/differs/reduced/reduced_extrinsic.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use comparable::Comparable;
use frame_metadata::{ExtrinsicMetadata, SignedExtensionMetadata};
use frame_metadata::v14::{ExtrinsicMetadata, SignedExtensionMetadata};
use scale_info::form::PortableForm;
use serde::Serialize;

Expand Down
2 changes: 1 addition & 1 deletion libs/substrate-differ/src/differs/reduced/reduced_pallet.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::calls::{prelude::PalletId, *};
use comparable::Comparable;
use frame_metadata::PalletMetadata;
use frame_metadata::v14::PalletMetadata;
use scale_info::form::PortableForm;
use serde::Serialize;
use std::{collections::BTreeMap, fmt::Display};
Expand Down
3 changes: 2 additions & 1 deletion libs/substrate-differ/src/differs/reduced/reduced_runtime.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ use crate::differs::reduced::calls::{
use crate::error::*;
use comparable::Comparable;
use frame_metadata::{
v14, PalletMetadata,
v14,
v14::PalletMetadata,
RuntimeMetadata::{self, *},
};
use scale_info::{form::PortableForm, PortableRegistry};
Expand Down
8 changes: 4 additions & 4 deletions libs/substrate-runtime-proposal-hash/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ hex = "0.4"
blake2 = "0.10"
thiserror = "1.0"
codec = { version = "3.1", package = "parity-scale-codec" }
sp-core = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-io = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-runtime = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-wasm-interface = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-core = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sp-io = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sp-runtime = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sp-wasm-interface = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
frame-metadata = { package = "frame-metadata", git = "https://github.com/paritytech/frame-metadata", branch = "main", features = [
"std",
] }
6 changes: 3 additions & 3 deletions libs/wasm-loader/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ repository = "https://github.com/chevdor/subwasm"
log = "0.4"
thiserror = "1.0"
multibase = "0.9"
multihash = "0.18"
multihash = "0.19"
array-bytes = { version = "6.1" }
serde = { version = "1.0", features = ["derive"] }
sp-maybe-compressed-blob = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate/" }
sp-maybe-compressed-blob = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate/" }
url = "2.3"

# RPC components
serde_json = { version = "1.0" }
subrpcer = { version = "0.10" }
tungstenite = { version = "0.19", features = ["rustls-tls-native-roots"] }
tungstenite = { version = "0.20", features = ["rustls-tls-native-roots"] }
ureq = { version = "2.6", features = ["json"] }

[dev-dependencies]
Expand Down
5 changes: 2 additions & 3 deletions libs/wasm-loader/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,15 @@ impl WasmLoader {
let mut ws = map_err(tungstenite::connect(url), WasmLoaderError::WsClient(url.to_string()))?.0;

map_err(
ws.write_message(Message::Binary(serde_json::to_vec(&data).expect("invalid data"))),
ws.send(Message::Binary(serde_json::to_vec(&data).expect("invalid data"))),
WasmLoaderError::WsClient(url.to_string()),
)?;

let mut wasm_hex = None;

// One for Ping, one for response.
for _ in 0..2_u8 {
let Message::Text(t) = map_err(ws.read_message(), WasmLoaderError::WsClient(url.to_string()))?
else {
let Message::Text(t) = map_err(ws.read(), WasmLoaderError::WsClient(url.to_string()))? else {
continue;
};

Expand Down
21 changes: 9 additions & 12 deletions libs/wasm-testbed/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,18 @@ log = "0.4"
thiserror = "1.0"
wasm-loader = { version = "0.20.0", path = "../wasm-loader" }
substrate-runtime-proposal-hash = { version = "0.20.0", path = "../substrate-runtime-proposal-hash" }
sc-executor = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sc-executor-common = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sc-executor = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sc-executor-common = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
scale = { version = "3", package = "parity-scale-codec", default-features = false }
sp-core = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-io = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-runtime = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-state-machine = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-wasm-interface = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-version = { tag = "monthly-2023-07", git = "https://github.com/paritytech/substrate" }
sp-core = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sp-io = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sp-runtime = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sp-state-machine = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sp-wasm-interface = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
sp-version = { tag = "monthly-2023-08", git = "https://github.com/paritytech/substrate" }
scale-info = { version = "2.1", default-features = false, features = [
"derive",
] }
frame-metadata = { version = "15", package = "frame-metadata", features = [
"v12",
"v13",
"v14",
frame-metadata = { version = "16", package = "frame-metadata", features = [
"std",
] }

0 comments on commit 1c8446b

Please sign in to comment.