[ᚬhuobi] Chore: cherry pick master

Makefile

@@ -60,7 +60,6 @@ docker-build:
 	docker build -t mutadev/muta:${COMMIT} .
 
 docker-push:
-	docker tag nervos/muta:${COMMIT}  mutadev/muta:${COMMIT}
 	docker push mutadev/muta:${COMMIT}
 
 e2e-test:

built-in-services/metadata/src/tests/mod.rs

@@ -124,6 +124,7 @@ fn mock_metadata_1() -> Metadata {
         propose_ratio:   10,
         prevote_ratio:   10,
         precommit_ratio: 10,
+        brake_ratio:     7,
     }
 }
 fn mock_metadata_2() -> Metadata {
@@ -152,6 +153,7 @@ fn mock_metadata_2() -> Metadata {
         propose_ratio:   1,
         prevote_ratio:   1,
         precommit_ratio: 1,
+        brake_ratio:     7,
     }
 }
 

common/logger/Cargo.toml

@@ -11,3 +11,4 @@ repository = "https://github.com/nervosnetwork/muta"
 log = "0.4"
 log4rs = "0.8"
 json = "0.12"
+backtrace = "0.3"

common/logger/src/lib.rs

@@ -1,6 +1,8 @@
 use std::collections::HashMap;
 use std::path::PathBuf;
+use std::{panic, thread};
 
+use backtrace::Backtrace;
 use json::JsonValue;
 use log::LevelFilter;
 use log4rs::append::console::ConsoleAppender;
@@ -21,6 +23,8 @@ pub fn init<S: ::std::hash::BuildHasher>(
     log_path: PathBuf,
     modules_level: HashMap<String, String, S>,
 ) {
+    setup_panic_logger();
+
     let console = ConsoleAppender::builder()
         .encoder(Box::new(PatternEncoder::new(
             if console_show_file_and_line {
@@ -98,3 +102,28 @@ pub fn metrics(name: &str, mut content: JsonValue) {
         content
     });
 }
+
+fn setup_panic_logger() {
+    let panic_logger = |info: &panic::PanicInfo| {
+        let backtrace = Backtrace::new();
+        let thread = thread::current();
+        let name = thread.name().unwrap_or("unnamed");
+        let location = info.location().unwrap(); // The current implementation always returns Some
+        let msg = match info.payload().downcast_ref::<&'static str>() {
+            Some(s) => *s,
+            None => match info.payload().downcast_ref::<String>() {
+                Some(s) => &*s,
+                None => "Box<Any>",
+            },
+        };
+        log::error!(
+            target: "panic", "thread '{}' panicked at '{}': {}:{} {:?}",
+            name,
+            msg,
+            location.file(),
+            location.line(),
+            backtrace,
+        );
+    };
+    panic::set_hook(Box::new(panic_logger));
+}

core/api/Cargo.toml

@@ -13,8 +13,8 @@ common-crypto = { path = "../../common/crypto"}
 
 http-service = "0.4"
 http = "0.2"
-tide = "0.5"
-juniper = "0.14"
+tide = "0.6"
+juniper = { git = "https://github.com/graphql-rust/juniper", rev = "eff086a", features = ["async"] }
 juniper_codegen = "0.14"
 async-trait = "0.1"
 hex = "0.4"

core/api/src/lib.rs

@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate juniper_codegen;
-
 pub mod adapter;
 pub mod config;
 mod schema;
@@ -10,7 +7,7 @@ use std::sync::Arc;
 
 use futures::executor::block_on;
 use http::status::StatusCode;
-use juniper::{FieldError, FieldResult};
+use juniper::FieldResult;
 use tide::{Request, Response, ResultExt, Server};
 
 use common_crypto::{
@@ -38,51 +35,52 @@ struct State {
 // context.
 struct Query;
 // Switch to async/await fn https://github.com/graphql-rust/juniper/issues/2
-#[juniper::object(Context = State)]
+#[juniper::graphql_object(Context = State)]
 impl Query {
     #[graphql(name = "getBlock", description = "Get the block")]
-    fn get_latest_block(state_ctx: &State, height: Option<Uint64>) -> FieldResult<Block> {
+    async fn get_latest_block(state_ctx: &State, height: Option<Uint64>) -> FieldResult<Block> {
         let height = match height {
             Some(id) => Some(id.try_into_u64()?),
             None => None,
         };
 
-        let block = block_on(
-            state_ctx
-                .adapter
-                .get_block_by_height(Context::new(), height),
-        )?;
+        let block = state_ctx
+            .adapter
+            .get_block_by_height(Context::new(), height)
+            .await?;
+
         Ok(Block::from(block))
     }
 
     #[graphql(name = "getTransaction", description = "Get the transaction by hash")]
-    fn get_transaction(state_ctx: &State, tx_hash: Hash) -> FieldResult<SignedTransaction> {
+    async fn get_transaction(state_ctx: &State, tx_hash: Hash) -> FieldResult<SignedTransaction> {
         let hash = protocol::types::Hash::from_hex(&tx_hash.as_hex())?;
-        let stx = block_on(
-            state_ctx
-                .adapter
-                .get_transaction_by_hash(Context::new(), hash),
-        )?;
+
+        let stx = state_ctx
+            .adapter
+            .get_transaction_by_hash(Context::new(), hash)
+            .await?;
+
         Ok(SignedTransaction::from(stx))
     }
 
     #[graphql(
         name = "getReceipt",
         description = "Get the receipt by transaction hash"
     )]
-    fn get_receipt(state_ctx: &State, tx_hash: Hash) -> FieldResult<Receipt> {
+    async fn get_receipt(state_ctx: &State, tx_hash: Hash) -> FieldResult<Receipt> {
         let hash = protocol::types::Hash::from_hex(&tx_hash.as_hex())?;
-        let receipt = block_on(
-            state_ctx
-                .adapter
-                .get_receipt_by_tx_hash(Context::new(), hash),
-        )?;
+
+        let receipt = state_ctx
+            .adapter
+            .get_receipt_by_tx_hash(Context::new(), hash)
+            .await?;
 
         Ok(Receipt::from(receipt))
     }
 
     #[graphql(name = "queryService", description = "query service")]
-    fn query_service(
+    async fn query_service(
         state_ctx: &State,
         height: Option<Uint64>,
         cycles_limit: Option<Uint64>,
@@ -112,35 +110,40 @@ impl Query {
 
         let address = protocol::types::Address::from_hex(&caller.as_hex())?;
 
-        let exec_resp = block_on(state_ctx.adapter.query_service(
-            Context::new(),
-            height,
-            cycles_limit,
-            cycles_price,
-            address,
-            service_name,
-            method,
-            payload,
-        ))?;
+        let exec_resp = state_ctx
+            .adapter
+            .query_service(
+                Context::new(),
+                height,
+                cycles_limit,
+                cycles_price,
+                address,
+                service_name,
+                method,
+                payload,
+            )
+            .await?;
         Ok(ExecResp::from(exec_resp))
     }
 }
 
 struct Mutation;
 // Switch to async/await fn https://github.com/graphql-rust/juniper/issues/2
-#[juniper::object(Context = State)]
+#[juniper::graphql_object(Context = State)]
 impl Mutation {
     #[graphql(name = "sendTransaction", description = "send transaction")]
-    fn send_transaction(
+    async fn send_transaction(
         state_ctx: &State,
         input_raw: InputRawTransaction,
         input_encryption: InputTransactionEncryption,
     ) -> FieldResult<Hash> {
         let stx = to_signed_transaction(input_raw, input_encryption)?;
         let tx_hash = stx.tx_hash.clone();
 
-        block_on(state_ctx.adapter.insert_signed_txs(Context::new(), stx))
-            .map_err(FieldError::from)?;
+        state_ctx
+            .adapter
+            .insert_signed_txs(Context::new(), stx)
+            .await?;
 
         Ok(Hash::from(tx_hash))
     }
@@ -149,7 +152,7 @@ impl Mutation {
         name = "unsafeSendTransaction",
         deprecated = "DON'T use it in production! This is just for development."
     )]
-    fn unsafe_send_transaction(
+    async fn unsafe_send_transaction(
         state_ctx: &State,
         input_raw: InputRawTransaction,
         input_privkey: Bytes,
@@ -168,8 +171,10 @@ impl Mutation {
             signature: signature.to_bytes(),
             pubkey:    pubkey.to_bytes(),
         };
-        block_on(state_ctx.adapter.insert_signed_txs(Context::new(), stx))
-            .map_err(FieldError::from)?;
+        state_ctx
+            .adapter
+            .insert_signed_txs(Context::new(), stx)
+            .await?;
 
         Ok(Hash::from(tx_hash))
     }
@@ -191,7 +196,8 @@ async fn handle_graphql(mut req: Request<State>) -> Response {
     };
 
     let schema = Schema::new(Query, Mutation);
-    let response = query.execute(&schema, req.state());
+    let state = &req.state().clone();
+    let response = query.execute_async(&schema, state).await;
     let status = if response.is_ok() {
         StatusCode::OK
     } else {

core/api/src/schema/block.rs

@@ -1,6 +1,6 @@
 use crate::schema::{Address, Bytes, Hash, MerkleRoot, Uint64};
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 #[graphql(
     description = "Block is a single digital record created within a blockchain. \
                    Each block contains a record of the previous Block, \
@@ -14,7 +14,7 @@ pub struct Block {
     ordered_tx_hashes: Vec<Hash>,
 }
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 #[graphql(description = "A block header is like the metadata of a block.")]
 pub struct BlockHeader {
     #[graphql(
@@ -47,7 +47,7 @@ pub struct BlockHeader {
     pub validators:        Vec<Validator>,
 }
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 #[graphql(description = "The verifier of the block header proved")]
 pub struct Proof {
     pub height:     Uint64,
@@ -57,7 +57,7 @@ pub struct Proof {
     pub bitmap:     Bytes,
 }
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 #[graphql(description = "Validator address set")]
 pub struct Validator {
     pub address:        Address,

core/api/src/schema/mod.rs

@@ -16,7 +16,7 @@ pub use transaction::{
     SignedTransaction,
 };
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 pub struct ExecResp {
     ret:      String,
     is_error: bool,
@@ -31,20 +31,20 @@ impl From<protocol::traits::ExecResp> for ExecResp {
     }
 }
 
-#[derive(GraphQLScalarValue, Clone)]
+#[derive(juniper::GraphQLScalarValue, Clone)]
 #[graphql(description = "The output digest of Keccak hash function")]
 pub struct Hash(String);
 pub type MerkleRoot = Hash;
 
-#[derive(GraphQLScalarValue, Clone)]
+#[derive(juniper::GraphQLScalarValue, Clone)]
 #[graphql(description = "20 bytes of account address")]
 pub struct Address(String);
 
-#[derive(GraphQLScalarValue, Clone)]
+#[derive(juniper::GraphQLScalarValue, Clone)]
 #[graphql(description = "Uint64")]
 pub struct Uint64(String);
 
-#[derive(GraphQLScalarValue, Clone)]
+#[derive(juniper::GraphQLScalarValue, Clone)]
 #[graphql(description = "Bytes corresponding hex string.")]
 pub struct Bytes(String);
 

core/api/src/schema/receipt.rs

@@ -1,6 +1,6 @@
 use crate::schema::{Hash, MerkleRoot, Uint64};
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 pub struct Receipt {
     pub state_root:  MerkleRoot,
     pub height:      Uint64,
@@ -10,13 +10,13 @@ pub struct Receipt {
     pub response:    ReceiptResponse,
 }
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 pub struct Event {
     pub service: String,
     pub data:    String,
 }
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 pub struct ReceiptResponse {
     pub service_name: String,
     pub method:       String,

core/api/src/schema/transaction.rs

@@ -2,7 +2,7 @@ use protocol::ProtocolResult;
 
 use crate::schema::{Bytes, Hash, SchemaError, Uint64};
 
-#[derive(GraphQLObject, Clone)]
+#[derive(juniper::GraphQLObject, Clone)]
 pub struct SignedTransaction {
     pub chain_id:     Hash,
     pub cycles_limit: Uint64,
@@ -39,7 +39,7 @@ impl From<protocol::types::SignedTransaction> for SignedTransaction {
 // GraphQLInputObject
 // #####################
 
-#[derive(GraphQLInputObject, Clone)]
+#[derive(juniper::GraphQLInputObject, Clone)]
 #[graphql(description = "There was many types of transaction in Muta, \
                          A transaction often require computing resources or write data to chain,\
                          these resources are valuable so we need to pay some token for them.\
@@ -68,7 +68,7 @@ pub struct InputRawTransaction {
     pub payload:      String,
 }
 
-#[derive(GraphQLInputObject, Clone)]
+#[derive(juniper::GraphQLInputObject, Clone)]
 #[graphql(description = "Signature of the transaction")]
 pub struct InputTransactionEncryption {
     #[graphql(description = "The digest of the transaction")]

core/consensus/Cargo.toml

@@ -18,7 +18,7 @@ futures-timer = "3.0"
 hex = "0.4"
 log = "0.4"
 moodyblues-sdk = "0.3"
-overlord = "0.2.0-alpha.3"
+overlord = "0.2.0-alpha.4"
 parking_lot = "0.10"
 rlp = "0.4"
 serde = {version = "1.0", features = ["derive"]}