Merge pull request #139 from citahub/regenerate_rs_from_proto

update proto and regenerate rs

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "cita-tool/proto"]
 	path = cita-tool/proto
-	url = https://github.com/cryptape/cita-proto.git
+	url = https://github.com/citahub/cita-proto.git

cita-tool/Cargo.toml

@@ -11,7 +11,7 @@ futures = "^0.1"
 serde_json = "^1.0.17"
 serde = "^1.0.53"
 serde_derive = "^1.0.53"
-protobuf = "^2.0.2"
+protobuf = "=2.8.1"
 hex = "^0.3.2"
 tiny-keccak = "^1.4.2"
 secp256k1 = { version = "0.15.0", features = ["recovery"]}

cita-tool/src/protos.rs

@@ -58,7 +58,7 @@ impl UnverifiedTransaction {
         let sig = Signature::from(signature);
 
         match self.get_crypto() {
-            Crypto::SECP => sig.recover(&hash),
+            Crypto::DEFAULT => sig.recover(&hash),
             _ => Err("Mismatched encryption algorithm".to_string()),
         }
     }
@@ -114,7 +114,7 @@ impl Transaction {
         unverified_tx.set_transaction(self.clone());
         let signature = sign(&sk, &hash);
         unverified_tx.set_signature(signature.to_vec());
-        unverified_tx.set_crypto(Crypto::SECP);
+        unverified_tx.set_crypto(Crypto::DEFAULT);
         unverified_tx
     }
 }