Upgrade subxt (#6)

* Reorg the order of deps (paritytech#284) * Reorg the order of deps This patch is simply for easier editor operation when replacing the substrate deps. * . * deps: update jsonrpsee 0.2.0 (paritytech#285) * deps: update jsonrpsee 0.2.0 The motivation is to avoid pinning certain alpha versions and to avoid breaking users builds without having to some `Cargo.lock` updating. * cargo fmt * fix tests * fix a few clippy lints * cargo fmt * Update substrate * update version * update version * update version * deps: update jsonrpsee 0.3.0 (paritytech#289) Signed-off-by: Gregory Hill <[email protected]> * Add NextKeys and QueuedKeys for session module (paritytech#291) * Add NextKeys and QueuedKeys for session module * Fix fmt * for darwinia * fix test, use `RuntimeMetadata::V13` Co-authored-by: Liu-Cheng Xu <[email protected]> Co-authored-by: Niklas Adolfsson <[email protected]> Co-authored-by: Aki Wu <[email protected]> Co-authored-by: Greg Hill <[email protected]>
darwinia-network · Sep 3, 2021 · 931aa5a · 931aa5a
1 parent 8b5bb8d
commit 931aa5a
Show file tree

Hide file tree

Showing 14 changed files with 835 additions and 501 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members = [".", "client", "proc-macro"]
 
 [package]
 name = "substrate-subxt"
-version = "0.15.2"
+version = "0.15.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 
@@ -19,47 +19,51 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 [features]
 default = ["tokio1"]
 client = ["substrate-subxt-client"]
-# jsonrpsee http client can be configured to use tokio02 or tokio1.
-tokio02 = ["jsonrpsee-http-client/tokio02"]
-tokio1 = ["jsonrpsee-http-client/tokio1"]
+# jsonrpsee can be configured to use tokio02 or tokio1.
+tokio02 = ["jsonrpsee-http-client/tokio02", "jsonrpsee-ws-client/tokio02"]
+tokio1 = ["jsonrpsee-http-client/tokio1", "jsonrpsee-ws-client/tokio1"]
 
 [dependencies]
 async-trait = "0.1.49"
-log = "0.4.14"
-thiserror = "1.0.24"
+codec = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
+dyn-clone = "1.0.4"
 futures = "0.3.13"
-jsonrpsee-proc-macros = "=0.2.0-alpha.6"
-jsonrpsee-ws-client = "=0.2.0-alpha.6"
-jsonrpsee-http-client = { version = "=0.2.0-alpha.6", default-features = false }
+hex = "0.4.3"
+jsonrpsee-proc-macros = "0.3.0"
+jsonrpsee-ws-client = { version = "0.3.0", default-features = false }
+jsonrpsee-http-client = { version = "0.3.0", default-features = false }
+jsonrpsee-types = "0.3.0"
+log = "0.4.14"
 num-traits = { version = "0.2.14", default-features = false }
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
+thiserror = "1.0.24"
 url = "2.2.1"
-codec = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
-dyn-clone = "1.0.4"
 
-frame-metadata = "13.0.0"
-frame-support = "3.0.0"
-sp-runtime = "3.0.0"
-sp-version = "3.0.0"
-pallet-indices = "3.0.0"
-hex = "0.4.3"
-sp-std = "3.0.0"
-application-crypto = { version = "3.0.0", package = "sp-application-crypto" }
-pallet-staking = "3.0.0"
-
-sp-rpc = { version = "3.0.0", package = "sp-rpc" }
-sp-core = { version = "3.0.0", package = "sp-core" }
 substrate-subxt-client = { version = "0.7.0", path = "client", optional = true }
 substrate-subxt-proc-macro = { version = "0.15.0", path = "proc-macro" }
 
+sp-application-crypto = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+sp-core               = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+sp-rpc                = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+sp-runtime            = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+sp-std                = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+sp-version            = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+
+frame-metadata = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+frame-support  = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+pallet-staking = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+
+
 [dev-dependencies]
-async-std = { version = "1.9.0", features = ["attributes"] }
+assert_matches = "1.5.0"
+async-std = { version = "1.9.0", features = ["attributes", "tokio1"] }
 env_logger = "0.8.3"
-frame-system = "3.0.0"
-pallet-balances = "3.0.0"
-sp-keyring = "3.0.0"
 tempdir = "0.3.7"
 wabt = "0.10.0"
 which = "4.0.2"
-assert_matches = "1.5.0"
+
+sp-keyring      = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+frame-system    = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+pallet-balances = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -15,17 +15,20 @@ keywords = ["parity", "substrate", "blockchain"]
 async-std = "1.8.0"
 futures = { version = "0.3.9", features = ["compat"], package = "futures" }
 futures01 = { package = "futures", version = "0.1.29" }
-jsonrpsee-types = "=0.2.0-alpha.6"
+jsonrpsee-types = "0.3.0"
 log = "0.4.13"
-sc-network = { version = "0.9.0", default-features = false }
-sc-client-db = "0.9.0"
-sc-service = { version = "0.9.0", default-features = false }
 serde_json = "1.0.61"
-sp-keyring = "3.0.0"
 thiserror = "1.0.23"
 
+sc-client-db = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3", default-features = false }
+sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3", default-features = false }
+
+
+
 [target.'cfg(target_arch="x86_64")'.dependencies]
-sc-service = { version = "0.9.0", default-features = false, features = ["wasmtime"] }
+sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3", default-features = false, features = ["wasmtime"] }
 
 [dev-dependencies]
 async-std = { version = "1.8.0", features = ["attributes"] }

diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -42,32 +42,31 @@ use futures01::sync::mpsc as mpsc01;
 use jsonrpsee_types::{
     v2::{
         error::{
-            JsonRpcErrorAlloc,
+            JsonRpcError,
             JsonRpcErrorCode,
         },
         params::{
             Id,
             JsonRpcParams,
+            JsonRpcSubscriptionParams,
             SubscriptionId,
             TwoPointZero,
         },
-        parse_request_id,
         request::{
             JsonRpcCallSer,
             JsonRpcInvalidRequest,
+            JsonRpcNotification,
             JsonRpcNotificationSer,
         },
-        response::{
-            JsonRpcNotifResponse,
-            JsonRpcResponse,
-        },
+        response::JsonRpcResponse,
     },
     DeserializeOwned,
     Error as JsonRpseeError,
     FrontToBack,
     JsonValue,
     RequestMessage,
     Subscription,
+    SubscriptionKind,
     SubscriptionMessage,
 };
 use sc_network::config::TransportConfig;
@@ -94,7 +93,6 @@ use sc_service::{
 };
 use std::{
     collections::HashMap,
-    marker::PhantomData,
     sync::atomic::{
         AtomicU64,
         Ordering,
@@ -211,7 +209,9 @@ impl SubxtClient {
                                     while let Some(Ok(response)) = from_back.next().await
                                     {
                                         let notif = serde_json::from_str::<
-                                            JsonRpcNotifResponse<JsonValue>,
+                                            JsonRpcNotification<
+                                                JsonRpcSubscriptionParams<_>,
+                                            >,
                                         >(
                                             &response
                                         )
@@ -241,7 +241,7 @@ impl SubxtClient {
                                     let _ = rpc.rpc_query(&session, &message).await;
                                 }
                             }
-                            FrontToBack::Batch(_) => (),
+                            _ => (),
                         }
                     }
                 })),
@@ -280,7 +280,7 @@ impl SubxtClient {
             .clone()
             .send(FrontToBack::Notification(msg))
             .await
-            .map_err(|e| JsonRpseeError::TransportError(Box::new(e)))
+            .map_err(|e| JsonRpseeError::Transport(Box::new(e)))
     }
 
     /// Send a JSONRPC request.
@@ -306,12 +306,12 @@ impl SubxtClient {
                 send_back: Some(send_back_tx),
             }))
             .await
-            .map_err(|e| JsonRpseeError::TransportError(Box::new(e)))?;
+            .map_err(|e| JsonRpseeError::Transport(Box::new(e)))?;
 
         let json_value = match send_back_rx.await {
             Ok(Ok(v)) => v,
             Ok(Err(err)) => return Err(err),
-            Err(err) => return Err(JsonRpseeError::TransportError(Box::new(err))),
+            Err(err) => return Err(JsonRpseeError::Transport(Box::new(err))),
         };
         serde_json::from_value(json_value).map_err(JsonRpseeError::ParseError)
     }
@@ -351,14 +351,13 @@ impl SubxtClient {
         let (notifs_rx, id) = match send_back_rx.await {
             Ok(Ok(val)) => val,
             Ok(Err(err)) => return Err(err),
-            Err(err) => return Err(JsonRpseeError::TransportError(Box::new(err))),
+            Err(err) => return Err(JsonRpseeError::Transport(Box::new(err))),
         };
-        Ok(Subscription {
-            to_back: self.to_back.clone(),
+        Ok(Subscription::new(
+            self.to_back.clone(),
             notifs_rx,
-            marker: PhantomData,
-            id,
-        })
+            SubscriptionKind::Subscription(id),
+        ))
     }
 }
 
@@ -376,9 +375,10 @@ impl From<Role> for sc_service::Role {
         match role {
             Role::Light => Self::Light,
             Role::Authority(_) => {
-                Self::Authority {
-                    sentry_nodes: Default::default(),
-                }
+                // Self::Authority {
+                //     sentry_nodes: Default::default(),
+                // }
+                Self::Authority
             }
         }
     }
@@ -464,8 +464,8 @@ impl<C: ChainSpec + 'static> SubxtClientConfig<C> {
             telemetry_endpoints,
 
             telemetry_external_transport: Default::default(),
-            telemetry_handle: Default::default(),
-            telemetry_span: Default::default(),
+            // telemetry_handle: Default::default(),
+            // telemetry_span: Default::default(),
             default_heap_pages: Default::default(),
             disable_grandpa: Default::default(),
             disable_log_reloading: Default::default(),
@@ -512,26 +512,25 @@ fn read_jsonrpc_response(
     maybe_msg: Option<String>,
     id: Id,
 ) -> Option<Result<JsonValue, JsonRpseeError>> {
-    let msg = maybe_msg?;
-    match serde_json::from_str::<JsonRpcResponse<JsonValue>>(&msg) {
-        Ok(rp) => {
-            match parse_request_id::<Id>(rp.id) {
-                Ok(rp_id) if rp_id == id => Some(Ok(rp.result)),
-                _ => Some(Err(JsonRpseeError::InvalidRequestId)),
-            }
-        }
+    let msg: String = maybe_msg?;
+    // NOTE: `let res` is a workaround because rustc otherwise doesn't compile
+    // `msg` doesn't live long enough.
+    let res = match serde_json::from_str::<JsonRpcResponse<JsonValue>>(&msg) {
+        Ok(rp) if rp.id == id => Some(Ok(rp.result)),
+        Ok(_) => Some(Err(JsonRpseeError::InvalidRequestId)),
         Err(_) => {
             match serde_json::from_str::<JsonRpcInvalidRequest<'_>>(&msg) {
                 Ok(err) => {
-                    let err = JsonRpcErrorAlloc {
+                    let err = JsonRpcError {
                         jsonrpc: TwoPointZero,
                         error: JsonRpcErrorCode::InvalidRequest.into(),
-                        id: parse_request_id(err.id).ok()?,
+                        id: err.id,
                     };
-                    Some(Err(JsonRpseeError::Request(err)))
+                    Some(Err(JsonRpseeError::Request(err.to_string())))
                 }
                 Err(_) => None,
             }
         }
-    }
+    };
+    res
 }
diff --git a/proc-macro/Cargo.toml b/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-subxt-proc-macro"
-version = "0.15.2"
+version = "0.15.3"
 authors = ["David Craven <[email protected]>", "Parity Technologies <[email protected]>"]
 edition = "2018"
 autotests = false
@@ -29,10 +29,11 @@ async-std = { version = "1.8.0", features = ["attributes"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 env_logger = "0.8.2"
 pretty_assertions = "0.6.1"
-sp-keyring = "3.0.0"
 substrate-subxt = { path = ".." }
 trybuild = "1.0.38"
 
+sp-keyring      = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" }
+
 [[test]]
 name = "balances"
 path = "tests/balances.rs"
diff --git a/src/error.rs b/src/error.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with substrate-subxt.  If not, see <http://www.gnu.org/licenses/>.
 
-use jsonrpsee_ws_client::Error as RequestError;
+use jsonrpsee_types::Error as RequestError;
 use sp_core::crypto::SecretStringError;
 use sp_runtime::{
     transaction_validity::TransactionValidityError,
@@ -140,6 +140,10 @@ impl RuntimeError {
             DispatchError::ConsumerRemaining => Ok(Self::ConsumerRemaining),
             DispatchError::NoProviders => Ok(Self::NoProviders),
             DispatchError::Other(msg) => Ok(Self::Other(msg.into())),
+            DispatchError::Arithmetic(_err) => {
+                Ok(Self::Other("Arithmetic Err".to_string()))
+            }
+            DispatchError::Token(_err) => Ok(Self::Other("Token Err".to_string())),
         }
     }
 }

diff --git a/src/events.rs b/src/events.rs
@@ -363,7 +363,7 @@ mod tests {
         ModuleMetadata,
         RuntimeMetadata,
         RuntimeMetadataPrefixed,
-        RuntimeMetadataV12,
+        RuntimeMetadataV13,
         META_RESERVED,
     };
     use std::convert::TryFrom;
@@ -401,7 +401,7 @@ mod tests {
         let decoder = EventsDecoder::<TestRuntime>::new(
             Metadata::try_from(RuntimeMetadataPrefixed(
                 META_RESERVED,
-                RuntimeMetadata::V12(RuntimeMetadataV12 {
+                RuntimeMetadata::V13(RuntimeMetadataV13 {
                     modules: DecodeDifferent::Decoded(vec![ModuleMetadata {
                         name: DecodeDifferent::Decoded("System".to_string()),
                         storage: None,

diff --git a/src/frame/session.rs b/src/frame/session.rs
@@ -72,6 +72,22 @@ pub struct ValidatorsStore<T: Session> {
     pub _runtime: PhantomData<T>,
 }
 
+/// The queued keys for the next session.
+#[derive(Encode, Store, Debug)]
+pub struct QueuedKeysStore<T: Session> {
+    #[store(returns = Vec<(<T as Session>::ValidatorId, T::Keys)>)]
+    /// Marker for the runtime
+    pub _runtime: PhantomData<T>,
+}
+
+/// The next session keys for a validator.
+#[derive(Encode, Store, Debug)]
+pub struct NextKeysStore<'a, T: Session> {
+    #[store(returns = Option<<T as Session>::Keys>)]
+    /// The validator account.
+    pub validator_id: &'a <T as Session>::ValidatorId,
+}
+
 default_impl!(ValidatorsStore);
 
 /// Set the session keys for a validator.

diff --git a/src/lib.rs b/src/lib.rs
@@ -52,10 +52,8 @@ use codec::{
 };
 use futures::future;
 use jsonrpsee_http_client::HttpClientBuilder;
-use jsonrpsee_ws_client::{
-    Subscription,
-    WsClientBuilder,
-};
+use jsonrpsee_types::Subscription;
+use jsonrpsee_ws_client::WsClientBuilder;
 use sp_core::{
     storage::{
         StorageChangeSet,
@@ -210,7 +208,7 @@ impl<T: Runtime> ClientBuilder<T> {
             if url.starts_with("ws://") || url.starts_with("wss://") {
                 let client = WsClientBuilder::default()
                     .max_notifs_per_subscription(4096)
-                    .build(&url)
+                    .build(url)
                     .await?;
                 RpcClient::WebSocket(Arc::new(client))
             } else {