Merge pull request #78 from KeystoneHQ/keystone-sign

change response of tron-signature
KeystoneHQ · Nov 28, 2023 · 7627b8b · 7627b8b
2 parents 0a78622 + efda897
commit 7627b8b
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/libs/ur-registry-ffi/src/tron/tron_signature.rs b/libs/ur-registry-ffi/src/tron/tron_signature.rs
@@ -23,7 +23,7 @@ export! {
 
         let parse_signature = || -> Result<(String, String), Error> {
             let cbor = hex::decode(cbor_hex.to_string())?;
-            let keystone_sign_result = KeystoneSignResult::from_cbor(cbor).map_err(|_| format_err!(""))?;
+            let keystone_sign_result = KeystoneSignResult::try_from(cbor).map_err(|_| format_err!(""))?;
             let ziped_sign_result = keystone_sign_result.get_sign_result();
             let sign_result = unzip(ziped_sign_result).map_err(|_| format_err!(""))?;
             let sign_result_base = parse_protobuf::<Base>(sign_result).map_err(|_| format_err!(""))?;
@@ -32,20 +32,15 @@ export! {
             match content {
                 Content::SignTxResult(sign_tx_result) => {
                     let request_id = sign_tx_result.sign_id;
-                    match Transaction::parse_from_bytes(&hex::decode(sign_tx_result.raw_tx)?) {
-                        Ok(tron_tx) => {
-                            Ok((request_id, hex::encode(&tron_tx.signature[0])))
-                        },
-                        Err(_) => Err(format_err!(""))
-                    }
+                    Ok((request_id, sign_tx_result.raw_tx))
                 },
                 _ => Err(format_err!(""))
             }
         };
         match parse_signature() {
-            Ok((request_id, signature)) => json!({
+            Ok((request_id, raw)) => json!({
                 "request_id": request_id,
-                "signature": signature,
+                "raw": raw,
             }).to_string(),
             Err(_) => json!({"error": "signature is invalid"}).to_string(),
         }
@@ -59,7 +54,7 @@ mod tests {
     #[test]
     fn test_parse_tron_signature() {
         let tron_signature_cbor = "a1015901bd1f8b08000000000000008d523d8e94310cd54aac342024a429b7a2a0a019c9761c3ba6a24053738538761a24462c349c85821b5071324e80bf866e259c2acf3fc97bcfa7bbf3ab4ff9fdebb7dbe77cfde571dd221f7edd9f9e9f4f576a57bb7ea0773fef5fbc31c748e7b834d7b8b0cfb898475cc821d45b2c9738bf4708696e0b1612766308304cd71d996da5ae4d2e991464440b779f16da1c3a590eebfcf0fb19cc60409840a006443012dd227b3791be449161c062d361eeb4fa9c59f50337d2b4a3b3a1b29a82744a51d975549674c1c24c5ba1adb0a0ada0245bb96e07b2283b176255afd2957a93a82e52e6239f7a64519a321606133be3889d0b5724ee9469b9da98284b436a7acb563c46c70587205cfa14f36563f65c13eac54aeebdcd9a9930b5b545963527622e36dd963b3c112533a96df498b6577da746a1f7b61a88000de1de5a6a7baaff3f623331282c28d760e8a1b701e000e3f458d09018990edad967efe527378d12aa1c09d8f51b825d245bcf42dc04dd8753a9422327e8e251aa90501fd29a61b0899197db0344b725c0613cd7aa64d916633a1869bd85735755772df7dffef873472fff6df1c7c7db5f8509bb54d6020000";
-        let expect_result = "{\"request_id\":\"9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d\",\"signature\":\"42a9ece5a555a9437de74108d0fb5320f20835e108b961bb8b230228ea07c485412625863391d49692be558067f9e00559641f5ee63d8ab09275a51afe555b7e01\"}";
+        let expect_result = "{\"raw\":\"0ad4010a0207902208e1b9de559665c6714080c49789bb2c5aae01081f12a9010a31747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e54726967676572536d617274436f6e747261637412740a15418dfec1cde1fe6a9ec38a16c7d67073e3020851c01215410d292c98a5eca06c2085fff993996423cf66c93b2244a9059cbb0000000000000000000000009c0279f1bda9fc40a85f1b53c306602864533e7300000000000000000000000000000000000000000000000000000000000f424070c0b6e087bb2c90018094ebdc03124142a9ece5a555a9437de74108d0fb5320f20835e108b961bb8b230228ea07c485412625863391d49692be558067f9e00559641f5ee63d8ab09275a51afe555b7e01\",\"request_id\":\"9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d\"}";
 
         assert_eq!(
             expect_result,