Upgrade crates

Cargo.toml

@@ -1,27 +1,27 @@
 [workspace]
-default-members = ["bin/node"]
+# default-members = ["bin/node"]
 members = [
-  "bin/node",
+#   "bin/node",
   #    "cli",
-  "frame/crowdloan",
-  "frame/rws",
-  "frame/launch",
-  "frame/datalog",
-  "frame/liability",
-  "frame/lighthouse",
-  "frame/digital-twin",
-  "frame/staking",
+#   "frame/crowdloan",
+#   "frame/rws",
+#   "frame/launch",
+#   "frame/datalog",
+#   "frame/liability",
+#   "frame/lighthouse",
+#   "frame/digital-twin",
+#   "frame/staking",
   #    "io",
   "pair",
   "primitives",
   "protocol",
   "protocol/examples/reqres",
-  "rpc",
-  "runtime/local",
-  "runtime/alpha",
-  "runtime/main",
-  "runtime/ipci",
-  "service",
+#   "rpc",
+#   "runtime/local",
+#   "runtime/alpha",
+#   "runtime/main",
+#   "runtime/ipci",
+#   "service",
 ]
 
 exclude = ["vendor"]

pair/Cargo.toml

@@ -8,24 +8,24 @@ edition = "2021"
 [dependencies]
 robonomics-protocol = { path = "../protocol" }
 #ipfs-api = { version = "0.10.0", features = ["with-hyper-rustls"], default-features = false }
-async-std = "1.9"
+async-std = "1.12"
 #async-std = { version = "1.9", features = ["attributes", "tokio1"] }
 futures-timer = "3.0.2"
-derive_more = "0.99.11"
+derive_more = "0.99.17"
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
-futures = "0.3.15"
+futures = "0.3.27"
 sds011 = "0.2.1"
-serde = "1.0.130"
-log = "0.4.11"
+serde = "1.0.159"
+log = "0.4.17"
 
 bincode = "1.3.3"
 chrono = "0.4"
-libp2p = " 0.49"
+libp2p = "0.51"
 rust-base58  = "0.0.4"
-env_logger = "0.6.0"
+env_logger = "0.10.0"
 structopt = "0.3.26"
 #clap = "3.0"
 #clap = { version = "3.0", features = ["derive"], optional = true }
-clap = { version = "3.2.5", features = ["derive"] }
+clap = { version = "4.1.14", features = ["derive"] }
 
 tokio = { version = "1", features = ["full"] }

pair/src/pair.rs

@@ -27,7 +27,7 @@ use libp2p::core::{
     muxing::StreamMuxerBox,
     transport::{self},
 };
-use libp2p::request_response::*;
+use libp2p::request_response;
 use libp2p::swarm::{SwarmBuilder, SwarmEvent};
 use libp2p::Multiaddr;
 use libp2p::PeerId;
@@ -154,20 +154,17 @@ pub async fn reqres_server(
 
     log::debug!(target: "robonomics-io", "reqres: bind address {}", address);
 
-    let protocols = iter::once((RobonomicsProtocol(), ProtocolSupport::Full));
-    let cfg = RequestResponseConfig::default();
+    let protocols = iter::once((RobonomicsProtocol(), request_response::ProtocolSupport::Full));
+    let cfg = request_response::Config::default();
 
-    let ping_proto1 = RequestResponse::new(
+    let ping_proto1 = request_response::Behaviour::new(
         RobonomicsCodec { is_ping: false },
         protocols.clone(),
         cfg.clone(),
     );
 
     let mut swarm1 = {
-        SwarmBuilder::new(trans, ping_proto1, peer1_id.clone())
-            .executor(Box::new(|fut| {
-                tokio::spawn(fut);
-            }))
+        SwarmBuilder::with_tokio_executor(trans, ping_proto1, peer1_id.clone())
             .build()
     };
 
@@ -219,10 +216,10 @@ pub async fn reqres_server(
                     }
                 }
 
-                SwarmEvent::Behaviour(RequestResponseEvent::Message {
+                SwarmEvent::Behaviour(request_response::Event::Message {
                     peer,
                     message:
-                        RequestResponseMessage::Request {
+                        request_response::Message::Request {
                             request, channel, ..
                         },
                 }) => {
@@ -263,7 +260,7 @@ pub async fn reqres_server(
                     }
                 }
 
-                SwarmEvent::Behaviour(RequestResponseEvent::ResponseSent { peer, .. }) => {
+                SwarmEvent::Behaviour(request_response::Event::ResponseSent { peer, .. }) => {
                     log::debug!("Response sent to {:?}", peer);
                 }
 
@@ -296,24 +293,21 @@ pub async fn reqres_client(
     let ms = time::Duration::from_millis(100);
 
     let peer2 = async move {
-        let protocols = iter::once((RobonomicsProtocol(), ProtocolSupport::Full));
-        let cfg = RequestResponseConfig::default();
+        let protocols = iter::once((RobonomicsProtocol(), request_response::ProtocolSupport::Full));
+        let cfg = request_response::Config::default();
 
         let peer_id = node;
         let remote_bytes = peer_id.from_base58().unwrap();
         let remote_peer = PeerId::from_bytes(&remote_bytes).unwrap();
 
-        let ping_proto2 = RequestResponse::new(
+        let ping_proto2 = request_response::Behaviour::new(
             RobonomicsCodec { is_ping: false },
             protocols.clone(),
             cfg.clone(),
         );
 
         let mut swarm2 = {
-            SwarmBuilder::new(trans, ping_proto2, peer2_id.clone())
-                .executor(Box::new(|fut| {
-                    tokio::spawn(fut);
-                }))
+            SwarmBuilder::with_tokio_executor(trans, ping_proto2, peer2_id.clone())
                 .build()
         };
 
@@ -340,10 +334,10 @@ pub async fn reqres_client(
         loop {
             match swarm2.select_next_some().await {
                 SwarmEvent::Behaviour(event) => match event {
-                    RequestResponseEvent::Message {
+                    request_response::Event::Message {
                         peer,
                         message:
-                            RequestResponseMessage::Response {
+                            request_response::Message::Response {
                                 request_id,
                                 response,
                             },

primitives/Cargo.toml

@@ -11,15 +11,15 @@ repository = "https://github.com/airalab/robonomics"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.130", optional = true }
-codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = [
+serde = { version = "1.0.159", optional = true }
+codec = { package = "parity-scale-codec", version = "3.4", default-features = false, features = [
   "derive",
 ] }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
 
 [features]
 default = ["std"]

protocol/Cargo.toml

@@ -6,29 +6,30 @@ authors = ["Airalab <research@aira.life>"]
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.130", features = ["derive"] }
-serde_json = "1.0.68"
-codec = { package = "parity-scale-codec", version = "3.0", features = [
+serde = { version = "1.0.159", features = ["derive"] }
+serde_json = "1.0.95"
+codec = { package = "parity-scale-codec", version = "3.4", features = [
   "derive",
 ] }
-async-trait = "0.1.30"
-derive_more = "0.99.11"
+async-trait = "0.1.68"
+derive_more = "0.99.17"
 futures-timer = "3.0.2"
-subxt = "0.22.0"
-sp-runtime = "6.0.0"
-sp-core = "6.0.0"
-futures = "0.3.15"
-bincode = "1.3.1"
-log = "0.4.11"
-jsonrpsee = { version = "0.14.0", features = ["server"] }
-rand = "0.8.4"
+subxt = "0.27.1"
+sp-runtime = "22.0.0"
+sp-core = "19.0.0"
+futures = "0.3.27"
+bincode = "1.3.3"
+log = "0.4.17"
+jsonrpsee = { version = "0.16.2", features = ["server"] }
+rand = "0.8.5"
 rust-base58 = "0.0.4"
 chrono = "0.4"
-libp2p = { version = "0.49", features = [
+libp2p = { version = "0.51", features = [
     "gossipsub",
     "kad",
     "mdns",
     "request-response",
+    "macros",
     "noise",
     "tcp",
     "yamux",

protocol/examples/reqres/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
-futures = "0.3.15"
-libp2p = " 0.49"
+futures = "0.3.27"
+libp2p = "0.51"
 rust-base58 = "0.0.4"
 robonomics-protocol = { path = "../.." }
 tokio = {version = "1", features = ["full"]}

protocol/examples/reqres/src/main.rs

@@ -1,8 +1,11 @@
 /// Example of usage simple request response protocol from reqresp crate.
 use bincode;
 use futures::StreamExt;
-use libp2p::core::{Multiaddr, PeerId};
-use libp2p::request_response::*;
+use libp2p::{
+    core::Multiaddr,
+    identity,
+};
+use libp2p::request_response;
 use libp2p::swarm::{SwarmBuilder, SwarmEvent};
 use robonomics_protocol::reqres::*;
 use rust_base58::FromBase58;
@@ -18,21 +21,18 @@ async fn main() {
 
     //  server part
     let peer1 = async move {
-        let protocols = iter::once((RobonomicsProtocol(), ProtocolSupport::Full));
-        let cfg = RequestResponseConfig::default();
+        let protocols = iter::once((RobonomicsProtocol(), request_response::ProtocolSupport::Full));
+        let cfg = request_response::Config::default();
 
         let (peer1_id, trans) = mk_transport();
-        let ping_proto1 = RequestResponse::new(
+        let ping_proto1 = request_response::Behaviour::new(
             RobonomicsCodec { is_ping: false },
             protocols.clone(),
             cfg.clone(),
         );
 
         let mut swarm1 = {
-            SwarmBuilder::new(trans, ping_proto1, peer1_id)
-                .executor(Box::new(|fut| {
-                    tokio::spawn(fut);
-                }))
+            SwarmBuilder::with_tokio_executor(trans, ping_proto1, peer1_id)
                 .build()
         };
 
@@ -47,10 +47,10 @@ async fn main() {
                 SwarmEvent::NewListenAddr { address, .. } => {
                     println!("Peer 1 listening on {}", address.clone());
                 }
-                SwarmEvent::Behaviour(RequestResponseEvent::Message {
+                SwarmEvent::Behaviour(request_response::Event::Message {
                     peer,
                     message:
-                        RequestResponseMessage::Request {
+                    request_response::Message::Request {
                             request, channel, ..
                         },
                 }) => {
@@ -99,7 +99,7 @@ async fn main() {
                     }
                 }
 
-                SwarmEvent::Behaviour(RequestResponseEvent::ResponseSent { peer, .. }) => {
+                SwarmEvent::Behaviour(request_response::Event::ResponseSent { peer, .. }) => {
                     println!("Response sent to {:?}", peer);
                 }
 
@@ -111,22 +111,19 @@ async fn main() {
 
     //  client part
     let peer2 = async move {
-        let protocols = iter::once((RobonomicsProtocol(), ProtocolSupport::Full));
-        let cfg = RequestResponseConfig::default();
+        let protocols = iter::once((RobonomicsProtocol(), request_response::ProtocolSupport::Full));
+        let cfg = request_response::Config::default();
 
         let peer_id = std::env::args().nth(2).unwrap();
         let remote_bytes = peer_id.from_base58().unwrap();
-        let remote_peer = PeerId::from_bytes(&remote_bytes).unwrap();
+        let remote_peer = identity::PeerId::from_bytes(&remote_bytes).unwrap();
 
         let (peer2_id, trans) = mk_transport();
-        let ping_proto2 = RequestResponse::new(RobonomicsCodec { is_ping: false }, protocols, cfg);
+        let ping_proto2 = request_response::Behaviour::new(RobonomicsCodec { is_ping: false }, protocols, cfg);
 
         //      let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id.clone());
         let mut swarm2 = {
-            SwarmBuilder::new(trans, ping_proto2, peer2_id.clone())
-                .executor(Box::new(|fut| {
-                    tokio::spawn(fut);
-                }))
+            SwarmBuilder::with_tokio_executor(trans, ping_proto2, peer2_id.clone())
                 .build()
         };
 
@@ -152,10 +149,10 @@ async fn main() {
         loop {
             match swarm2.select_next_some().await {
                 SwarmEvent::Behaviour(event) => match event {
-                    RequestResponseEvent::Message {
+                    request_response::Event::Message {
                         peer,
                         message:
-                            RequestResponseMessage::Response {
+                            request_response::Message::Response {
                                 request_id,
                                 response,
                             },

protocol/src/error.rs

@@ -79,14 +79,14 @@ impl From<swarm::DialError> for Error {
     }
 }
 
-impl From<gossipsub::error::SubscriptionError> for Error {
-    fn from(_: gossipsub::error::SubscriptionError) -> Self {
+impl From<gossipsub::SubscriptionError> for Error {
+    fn from(_: gossipsub::SubscriptionError) -> Self {
         Error::SubscriptionError
     }
 }
 
-impl From<gossipsub::error::PublishError> for Error {
-    fn from(_: gossipsub::error::PublishError) -> Self {
+impl From<gossipsub::PublishError> for Error {
+    fn from(_: gossipsub::PublishError) -> Self {
         Error::PublishError
     }
 }