fix: tron message sign (trustwallet#4326)

Author: y3fers0n

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tron/TestTronMessageSigner.kt

@@ -20,7 +20,7 @@ class TestTronMessageSigner {
         val privateKey = PrivateKey(data)
         val msg = "Hello World"
         val signature = TronMessageSigner.signMessage(privateKey, msg)
-        assertEquals("9bb6d11ec8a6a3fb686a8f55b123e7ec4e9746a26157f6f9e854dd72f5683b450397a7b0a9653865658de8f9243f877539882891bad30c7286c3bf5622b900471b", signature)
+        assertEquals("bc0753c070cc55693097df11bc11e1a7c4bd5e1a40b9dc94c75568e59bcc9d6b50a7873ef25b469e494490a54de37327b4bc7fc825c81a377b555e34fb7261ba1c", signature)
         val pubKey = privateKey.getPublicKey(CoinType.TRON)
         assertTrue(TronMessageSigner.verifyMessage(pubKey, msg, signature))
     }

src/Tron/MessageSigner.cpp

@@ -14,7 +14,7 @@ namespace TW::Tron {
 Data generateMessage(const std::string& message) {
     std::string prefix(1, MessageSigner::TronPrefix);
     std::stringstream ss;
-    ss << prefix << MessageSigner::MessagePrefix << message;
+    ss << prefix << MessageSigner::MessagePrefix << message.length() << message;
     Data signableMessage = Hash::keccak256(data(ss.str()));
     return signableMessage;
 }

src/Tron/MessageSigner.h

@@ -24,7 +24,7 @@ class MessageSigner {
     /// \param signature signature to verify the message against
     /// \return true if the message match the signature, false otherwise
     static bool verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept;
-    static constexpr auto MessagePrefix = "TRON Signed Message:\n32";
+    static constexpr auto MessagePrefix = "TRON Signed Message:\n";
     static constexpr std::uint8_t TronPrefix{0x19};
 };
 

swift/Tests/Blockchains/TronTests.swift

@@ -79,7 +79,7 @@ class TronTests: XCTestCase {
         let privateKey = PrivateKey(data: Data(hexString: "75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a")!)!
         let msg = "Hello World"
         let signature = TronMessageSigner.signMessage(privateKey: privateKey, message: msg)
-        XCTAssertEqual(signature, "9bb6d11ec8a6a3fb686a8f55b123e7ec4e9746a26157f6f9e854dd72f5683b450397a7b0a9653865658de8f9243f877539882891bad30c7286c3bf5622b900471b")
+        XCTAssertEqual(signature, "bc0753c070cc55693097df11bc11e1a7c4bd5e1a40b9dc94c75568e59bcc9d6b50a7873ef25b469e494490a54de37327b4bc7fc825c81a377b555e34fb7261ba1c")
         let pubKey = privateKey.getPublicKey(coinType: .tron)
         XCTAssertTrue(TronMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
     }

tests/chains/Tron/TronMessageSignerTests.cpp

@@ -15,9 +15,16 @@ namespace TW::Tron {
         PrivateKey tronKey(parse_hex("75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a"));
         auto msg = "Hello World";
         auto signature = Tron::MessageSigner::signMessage(tronKey, msg);
-        ASSERT_EQ(signature, "9bb6d11ec8a6a3fb686a8f55b123e7ec4e9746a26157f6f9e854dd72f5683b450397a7b0a9653865658de8f9243f877539882891bad30c7286c3bf5622b900471b");
         auto pubKey = tronKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+
+        ASSERT_EQ(signature, "bc0753c070cc55693097df11bc11e1a7c4bd5e1a40b9dc94c75568e59bcc9d6b50a7873ef25b469e494490a54de37327b4bc7fc825c81a377b555e34fb7261ba1c");
         ASSERT_TRUE(Tron::MessageSigner::verifyMessage(pubKey, msg, signature));
+
+        auto msg2 = "A much longer message to test the signing and verification process";
+        auto signature2 = Tron::MessageSigner::signMessage(tronKey, msg2);
+
+        ASSERT_EQ(signature2, "93aee5f753cf889e0749c74dd0c5996cce889883ae079e09ede462e16d65d06a4f43d1ed2745e9f3c1690695628269bd58f057a4a93953cc50e66b4a05bc0f451b");
+        ASSERT_TRUE(Tron::MessageSigner::verifyMessage(pubKey, msg2, signature2));
     }
 
     TEST(TWTronMessageSigner, SignAndVerifyLegacy) {
@@ -27,7 +34,12 @@ namespace TW::Tron {
 
         const auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeTron));
         const auto signature = WRAPS(TWTronMessageSignerSignMessage(privateKey.get(), message.get()));
-        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "9bb6d11ec8a6a3fb686a8f55b123e7ec4e9746a26157f6f9e854dd72f5683b450397a7b0a9653865658de8f9243f877539882891bad30c7286c3bf5622b900471b");
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "bc0753c070cc55693097df11bc11e1a7c4bd5e1a40b9dc94c75568e59bcc9d6b50a7873ef25b469e494490a54de37327b4bc7fc825c81a377b555e34fb7261ba1c");
         EXPECT_TRUE(TWTronMessageSignerVerifyMessage(pubKey.get(), message.get(), signature.get()));
+
+        const auto message2 = STRING("A much longer message to test the signing and verification process");
+        const auto signature2 = WRAPS(TWTronMessageSignerSignMessage(privateKey.get(), message2.get()));
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature2.get())), "93aee5f753cf889e0749c74dd0c5996cce889883ae079e09ede462e16d65d06a4f43d1ed2745e9f3c1690695628269bd58f057a4a93953cc50e66b4a05bc0f451b");
+        EXPECT_TRUE(TWTronMessageSignerVerifyMessage(pubKey.get(), message2.get(), signature2.get()));
     }
 }