scs#65 add: Await InBlock and Broadcast Status When Sending Extrinsic

Author: developerfred

src/lib.rs

@@ -344,6 +344,18 @@ where
                 info!("ready: {}", res);
                 Ok(None)
             }
+            XtStatus::Broadcast => {
+                rpc::send_extrinsic(self.url.clone(), jsonreq, result_in);
+                let res = result_out.recv().unwrap();
+                info!("broadcast: {}", res);
+                Ok(None)
+            }
+            XtStatus::InBlock => {
+                rpc::send_extrinsic(self.url.clone(), jsonreq, result_in);
+                let res = result_out.recv().unwrap();
+                info!("inBlock: {}", res);
+                Ok(None)
+            }
             _ => panic!("can only wait for finalized or ready extrinsic status"),
         }
     }

src/rpc/client.rs

@@ -26,6 +26,8 @@ pub enum XtStatus {
     Future,
     Error,
     Unknown,
+    InBlock,
+    Broadcast,
 }
 
 pub type OnMessageFn = fn(msg: Message, out: Sender, result: ThreadOut<String>) -> Result<()>;
@@ -114,6 +116,8 @@ pub fn on_extrinsic_msg_until_ready(
     match parse_status(retstr) {
         (XtStatus::Finalized, val) => end_process(out, result, val),
         (XtStatus::Ready, _) => end_process(out, result, None),
+        (XtStatus::InBlock, _) => end_process(out, result, None),
+        (XtStatus::Broadcast, _) => end_process(out, result, None),
         (XtStatus::Future, _) => end_process(out, result, None),
         (XtStatus::Error, _) => end_process(out, result, None),
         _ => (),
@@ -144,7 +148,12 @@ fn parse_status(msg: &str) -> (XtStatus, Option<String>) {
                 if let Some(hash) = obj.get("finalized") {
                     info!("finalized: {:?}", hash);
                     (XtStatus::Finalized, Some(hash.to_string()))
-                } else {
+                } 
+                else if let Some(hash) = obj.get("inBlock") {
+                    info!("inBlock: {:?}", hash);
+                    (XtStatus::InBlock, Some(hash.to_string()))
+                }
+                else {
                     (XtStatus::Unknown, None)
                 }
             }
@@ -185,6 +194,20 @@ mod tests {
         let msg = "{\"jsonrpc\":\"2.0\",\"method\":\"author_extrinsicUpdate\",\"params\":{\"result\":\"future\",\"subscription\":2}}";
         assert_eq!(parse_status(msg), (XtStatus::Future, None));
 
+        let msg = "{\"jsonrpc\":\"2.0\",\"method\":\"author_extrinsicUpdate\",\"params\":{\"result\":{\"broadcast\":[\"QmfSF4VYWNqNf5KYHpDEdY8Rt1nPUgSkMweDkYzhSWirGY\",\"Qmchhx9SRFeNvqjUK4ZVQ9jH4zhARFkutf9KhbbAmZWBLx\",\"QmQJAqr98EF1X3YfjVKNwQUG9RryqX4Hv33RqGChbz3Ncg\"]},\"subscription\":232}}";
+        assert_eq!(parse_status(msg), (XtStatus::Broadcast, None));
+        
+        let msg = "{\"jsonrpc\":\"2.0\",\"method\":\"author_extrinsicUpdate\",\"params\":{\"result\":{\"inBlock\":\"0x3104d362365ff5ddb61845e1de441b56c6722e94c1aee362f8aa8ba75bd7a3aa\"},\"subscription\":232}}";
+        assert_eq!(
+            parse_status(msg), (
+                XtStatus::InBlock, 
+                Some(
+                    "\"0x3104d362365ff5ddb61845e1de441b56c6722e94c1aee362f8aa8ba75bd7a3aa\""
+                        .to_string()
+                )
+            )
+        );
+
         let msg = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32700,\"message\":\"Parse error\"},\"id\":null}";
         assert_eq!(parse_status(msg), (XtStatus::Error, None));