Upgrade upstream v2.0.0 rc5 (#99)

* upgrade toml and lock

* upgrade some dependencies. builds now. xtrinsic fails with bad signature

* panic upon invalid extrinsic with more verbose message

* include transaction_version in extrinsic signature. See paritytech/substrate@ea501c2d

* fix no_std test Cargo.lock

* fix unit tests by moving panic and adjusting error types

* fmt

Author: brenzi

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "substrate-api-client"
-version = "0.4.6-sub2.0.0-alpha.7"
+version = "0.4.7-sub2.0.0-rc5"
 authors = ["Supercomputing Systems AG <[email protected]>"]
 edition = "2018"
 
@@ -15,75 +15,75 @@ thiserror       = { version = "1.0", optional =true }
 primitive-types = { version = "0.6.1", optional = true, features = ["codec"] }
 
 [dependencies.sp-core]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "sp-core"
 default-features = false
 features = ["full_crypto"]
 
 [dependencies.codec]
 package = "parity-scale-codec"
 features = ["derive"]
-version = "1.3.0"
+version = "1.3.1"
 default-features = false
 
 [dependencies.runtime_io]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "sp-io"
 default-features=false
 
 [dependencies.metadata]
-version = '11.0.0-alpha.7'
+version = '11.0.0-rc5'
 package = "frame-metadata"
 default-features=false
 
 [dependencies.sp-version]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "sp-version"
 default-features=false
 
 [dependencies.balances]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "pallet-balances"
 default-features=false
 
 [dependencies.system]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "frame-system"
 default-features=false
 
 [dependencies.sp-runtime]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "sp-runtime"
 default-features=false
 
 [dependencies.support]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "frame-support"
 default-features=false
 
 [dependencies.sp-std]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "sp-std"
 default-features = false
 
 [dependencies.sc-rpc-api]
-version = '0.8.0-alpha.7'
+version = '0.8.0-rc5'
 optional = true
 
 [dev-dependencies.node_template_runtime]
 git = "https://github.com/scs/substrate-api-client-test-node"
-tag = 'v2.0.0-alpha.7'
+tag = 'v2.0.0-rc5'
 package = "node-template-runtime"
 
 [dev-dependencies]
 wabt = "0.9.0"
 
 [dev-dependencies.contracts]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "pallet-contracts"
 
 [dev-dependencies.keyring]
-version = '2.0.0-alpha.7'
+version = '2.0.0-rc5'
 package = "sp-keyring"
 
 [dev-dependencies.clap]

Cargo.toml

@@ -1,6 +1,6 @@
 # substrate-api-client
 
-![badge](https://img.shields.io/badge/substrate-2.0.0--alpha.7-success)
+![badge](https://img.shields.io/badge/substrate-2.0.0--rc5-success)
 
 <p align="center">
 <img src=./web3_foundation_grants_badge_black.svg width = 400>

README.md

@@ -55,7 +55,8 @@ fn main() {
             Era::Immortal,
             api.genesis_hash,
             api.genesis_hash,
-            api.runtime_version.spec_version
+            api.runtime_version.spec_version,
+            api.runtime_version.transaction_version
         );
         // send and watch extrinsic until finalized
         println!("sending extrinsic with nonce {}", nonce);

src/examples/example_benchmark_bulk_xt.rs

@@ -56,7 +56,8 @@ fn main() {
         Era::mortal(period, h.number.into()),
         api.genesis_hash,
         head,
-        api.runtime_version.spec_version
+        api.runtime_version.spec_version,
+        api.runtime_version.transaction_version
     );
 
     println!("[+] Composed Extrinsic:\n {:?}\n", xt);

src/examples/example_compose_extrinsic_offline.rs

@@ -67,7 +67,8 @@ macro_rules! compose_extrinsic_offline {
     $era: expr,
     $genesis_hash: expr,
     $genesis_or_current_hash: expr,
-    $runtime_spec_version: expr) => {{
+    $runtime_spec_version: expr,
+    $transaction_version: expr) => {{
         use sp_runtime::generic::Era;
         use $crate::extrinsic::xt_primitives::*;
         let extra = GenericExtra::new($era, $nonce);
@@ -76,12 +77,12 @@ macro_rules! compose_extrinsic_offline {
             extra.clone(),
             (
                 $runtime_spec_version,
+                $transaction_version,
                 $genesis_hash,
                 $genesis_or_current_hash,
                 (),
                 (),
                 (),
-                (),
             ),
         );
 
@@ -131,7 +132,8 @@ macro_rules! compose_extrinsic {
                     Era::Immortal,
                     $api.genesis_hash,
                     $api.genesis_hash,
-                    $api.runtime_version.spec_version
+                    $api.runtime_version.spec_version,
+                    $api.runtime_version.transaction_version
                 )
             } else {
                 UncheckedExtrinsicV4 {

src/extrinsic/mod.rs

@@ -55,7 +55,7 @@ impl Default for GenericExtra {
 
 /// additionalSigned fields of the respective SignedExtra fields.
 /// Order is the same as declared in the extra.
-pub type AdditionalSigned = (u32, H256, H256, (), (), (), ());
+pub type AdditionalSigned = (u32, u32, H256, H256, (), (), ());
 
 #[derive(Encode, Clone)]
 pub struct SignedPayload<Call>((Call, GenericExtra, AdditionalSigned));

src/extrinsic/xt_primitives.rs

@@ -101,7 +101,7 @@ pub fn on_extrinsic_msg_until_finalized(
     debug!("got msg {}", retstr);
     match parse_status(retstr) {
         (XtStatus::Finalized, val) => end_process(out, result, val),
-        (XtStatus::Error, e) => end_process(out, result, e),
+        (XtStatus::Error, e) => panic!(e),
         (XtStatus::Future, _) => {
             warn!("extrinsic has 'future' status. aborting");
             end_process(out, result, None);
@@ -122,7 +122,7 @@ pub fn on_extrinsic_msg_until_in_block(
         (XtStatus::Finalized, val) => end_process(out, result, val),
         (XtStatus::InBlock, val) => end_process(out, result, val),
         (XtStatus::Future, _) => end_process(out, result, None),
-        (XtStatus::Error, _) => end_process(out, result, None),
+        (XtStatus::Error, e) => panic!(e),
         _ => (),
     };
     Ok(())
@@ -139,7 +139,7 @@ pub fn on_extrinsic_msg_until_broadcast(
         (XtStatus::Finalized, val) => end_process(out, result, val),
         (XtStatus::Broadcast, _) => end_process(out, result, None),
         (XtStatus::Future, _) => end_process(out, result, None),
-        (XtStatus::Error, _) => end_process(out, result, None),
+        (XtStatus::Error, e) => panic!(e),
         _ => (),
     };
     Ok(())
@@ -156,7 +156,7 @@ pub fn on_extrinsic_msg_until_ready(
         (XtStatus::Finalized, val) => end_process(out, result, val),
         (XtStatus::Ready, _) => end_process(out, result, None),
         (XtStatus::Future, _) => end_process(out, result, None),
-        (XtStatus::Error, e) => end_process(out, result, e),
+        (XtStatus::Error, e) => panic!(e),
         _ => (),
     };
     Ok(())
@@ -175,12 +175,18 @@ fn parse_status(msg: &str) -> (XtStatus, Option<String>) {
     match value["error"].as_object() {
         Some(obj) => {
             let error_message = obj.get("message").unwrap().as_str().unwrap().to_owned();
-            error!(
-                "extrinsic error code {}: {}",
-                obj.get("code").unwrap().as_u64().unwrap(),
-                error_message
-            );
-            (XtStatus::Error, Some(error_message))
+            let code = obj.get("code").unwrap().as_i64().unwrap();
+            let details = match obj.get("data") {
+                Some(d) => d.as_str().unwrap().to_owned(),
+                None => "".to_string(),
+            };
+            (
+                XtStatus::Error,
+                Some(format!(
+                    "extrinsic error code {}: {}: {}",
+                    code, error_message, details
+                )),
+            )
         }
         None => match value["params"]["result"].as_object() {
             Some(obj) => {
@@ -261,21 +267,27 @@ mod tests {
         let msg = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32700,\"message\":\"Parse error\"},\"id\":null}";
         assert_eq!(
             parse_status(msg),
-            (XtStatus::Error, Some("Parse error".into()))
+            (
+                XtStatus::Error,
+                Some("extrinsic error code -32700: Parse error: ".into())
+            )
         );
 
-        let msg = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":1010,\"message\":\"Invalid Transaction\",\"data\":0},\"id\":\"4\"}";
+        let msg = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":1010,\"message\":\"Invalid Transaction\",\"data\":\"Bad Signature\"},\"id\":\"4\"}";
         assert_eq!(
             parse_status(msg),
-            (XtStatus::Error, Some("Invalid Transaction".into()))
+            (
+                XtStatus::Error,
+                Some("extrinsic error code 1010: Invalid Transaction: Bad Signature".into())
+            )
         );
 
         let msg = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":1001,\"message\":\"Extrinsic has invalid format.\"},\"id\":\"0\"}";
         assert_eq!(
             parse_status(msg),
             (
                 XtStatus::Error,
-                Some("Extrinsic has invalid format.".into())
+                Some("extrinsic error code 1001: Extrinsic has invalid format.: ".into())
             )
         );
 
@@ -285,7 +297,7 @@ mod tests {
             (
                 XtStatus::Error,
                 Some(
-                    "Verification Error: Execution(Wasmi(Trap(Trap { kind: Unreachable })))".into()
+                    "extrinsic error code 1002: Verification Error: Execution(Wasmi(Trap(Trap { kind: Unreachable }))): RuntimeApi(\"Execution(Wasmi(Trap(Trap { kind: Unreachable })))\")".into()
                 )
             )
         );