Refine Cosmos signing output (#568)

* return broadcast mode async, return signature instead of not used encoded data

* Fix typo

* set default to block mode

Author: hewigovens

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cosmos/TestCosmosTransactions.kt

@@ -57,7 +57,7 @@ class TestCosmosTransactions {
 
         val jsonPayload = CosmosSigner.sign(signingInput).json
 
-        val expectedJsonPayload = """{"tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}],"type":"cosmos-sdk/MsgSend"}}"""
+        val expectedJsonPayload = """{"mode":"block","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}],"type":"cosmos-sdk/MsgSend"}}"""
         assertEquals(expectedJsonPayload, jsonPayload)
 
     }

js/README.md

@@ -45,4 +45,4 @@ HDWallet.create(128);
 
 -   For general [`TrustWallet/wallet-core`](https://github.com/TrustWallet/wallet-core) documentation, please refer to [GitBooks](https://developer.trustwallet.com/wallet-core).
 
--   For documentation on specific modules that are avaiable, please refer to [`TrustWallet/wallet-core`](https://github.com/TrustWallet/wallet-core) [exposed C headers](https://github.com/TrustWallet/wallet-core/tree/master/include/TrustWalletCore).
+-   For documentation on specific modules that are available, please refer to [`TrustWallet/wallet-core`](https://github.com/TrustWallet/wallet-core) [exposed C headers](https://github.com/TrustWallet/wallet-core/tree/master/include/TrustWalletCore).

js/tests/blockchain/cosmos/CosmosTransactions.test.ts

@@ -47,7 +47,7 @@ describe('CosmosTransactions', () => {
 
         const jsonPayload = CosmosSigner.sign(signingInput).json;
 
-        const expectedJsonPayload = {'tx':{'fee':{'amount':[{'amount':'200','denom':'muon'}],'gas':'200000'},'memo':'','msg':[{'type':'cosmos-sdk/MsgSend','value':{'amount':[{'amount':'1','denom':'muon'}],'from_address':'cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02','to_address':'cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573'}}],'signatures':[{'pub_key':{'type':'tendermint/PubKeySecp256k1','value':'AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F'},'signature':'/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=='}],'type':'cosmos-sdk/MsgSend'}};
+        const expectedJsonPayload = {'mode':'block','tx':{'fee':{'amount':[{'amount':'200','denom':'muon'}],'gas':'200000'},'memo':'','msg':[{'type':'cosmos-sdk/MsgSend','value':{'amount':[{'amount':'1','denom':'muon'}],'from_address':'cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02','to_address':'cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573'}}],'signatures':[{'pub_key':{'type':'tendermint/PubKeySecp256k1','value':'AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F'},'signature':'/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=='}],'type':'cosmos-sdk/MsgSend'}};
         expect(jsonPayload).to.equal(JSON.stringify(expectedJsonPayload));
     });
 

src/Cosmos/Serialization.cpp

@@ -23,10 +23,11 @@ const std::string AMINO_PREFIX_WITHDRAW_STAKE_MESSAGE = "cosmos-sdk/MsgWithdrawD
 const std::string AMINO_PREFIX_TRANSACTION = "auth/StdTx";
 const std::string AMINO_PREFIX_PUBLIC_KEY = "tendermint/PubKeySecp256k1";
 
-json higherWrapperJSON(json& jsonObj) {
+json broadcastJSON(json& jsonObj) {
     json jsonMsgWrapper;
 
     jsonMsgWrapper["tx"] = jsonObj;
+    jsonMsgWrapper["mode"] = "block";
 
     return jsonMsgWrapper;
 }
@@ -176,5 +177,5 @@ json TW::Cosmos::transactionJSON(const Transaction& transaction, std::string typ
     jsonTx["msg"] = json::array({messageJSON(transaction)});
     jsonTx["signatures"] = json::array({signatureJSON(transaction.signature())});
 
-    return higherWrapperJSON(jsonTx);
+    return broadcastJSON(jsonTx);
 }

src/Cosmos/Signer.cpp

@@ -9,7 +9,6 @@
 
 #include "../Hash.h"
 #include "../HexCoding.h"
-#include "../Base64.h"
 #include "../PrivateKey.h"
 #include "../Data.h"
 
@@ -62,11 +61,6 @@ std::vector<uint8_t> Signer::sign() const {
     return std::vector<uint8_t>(signature.begin(), signature.end() - 1);
 }
 
-std::string Signer::signInBase64() const {
-    auto signature = sign();
-    return Base64::encode(Data(signature.begin(), signature.end()));
-}
-
 std::string Signer::signaturePreimage() const {
     return signaturePreimageJSON(input).dump();
 }
@@ -107,10 +101,9 @@ Proto::SigningOutput Signer::build() const {
 
     auto signature = sign();
     auto txJson = buildTransactionJSON(signature);
-    auto txEncoded = json::to_cbor(txJson);
 
     output.set_json(txJson.dump());
-    output.set_encoded(txEncoded.data(), txEncoded.size());
+    output.set_signature(signature.data(), signature.size());
 
     return output;
 }

src/Cosmos/Signer.h

@@ -26,7 +26,6 @@ class Signer {
     ///
     /// \returns the transaction signature or an empty vector if there is an error.
     Data sign() const;
-    std::string signInBase64() const;
 
     /// Builds the signed transaction.
     ///

src/proto/Cosmos.proto

@@ -83,8 +83,8 @@ message SigningInput {
 
 // Transaction signing output.
 message SigningOutput {
-    // Signed and encoded transaction bytes.
-    bytes encoded = 1;
+    // Signature
+    bytes signature = 1;
     // Signed transaction in JSON.
     string json = 2;
 }

swift/Podfile.lock

@@ -17,4 +17,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: cbcc5bab5b64fa9f7863e62cc106d25d3fc1dfc5
 
-COCOAPODS: 1.7.3
+COCOAPODS: 1.7.5

swift/Tests/Blockchains/CosmosTests.swift

@@ -46,11 +46,11 @@ class CosmosSignerTests: XCTestCase {
         }
 
         let output = CosmosSigner.sign(input: signingInput)
-        XCTAssertEqual("a1627478a563666565a266616d6f756e7481a266616d6f756e74633230306564656e6f6d646d756f6e6367617366323030303030646d656d6f60636d736781a2647479706572636f736d6f732d73646b2f4d736753656e646576616c7565a366616d6f756e7481a266616d6f756e7461316564656e6f6d646d756f6e6c66726f6d5f61646472657373782d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b7967783065706836646430326a746f5f61646472657373782d636f736d6f73317a743530617a7570616e716c66616d356166687633686578777975746e756b656834633537336a7369676e61747572657381a2677075625f6b6579a26474797065781a74656e6465726d696e742f5075624b6579536563703235366b316576616c7565782c416c636f6273507a66544e56653775714141736e6445724a416a71706c6e79756461474230662b522b703346697369676e617475726578582f4437346d644947794942332f73517649626f4c54665339503945562f6659477267485a45322f764e6a395836654d36653537473361746c6a4e422b5041426e52773370546b353175586d6843466f70384f2f5a4a673d3d647479706572636f736d6f732d73646b2f4d736753656e64", output.encoded.hexString)
 
         let expectedJSON: String =
 """
 {
+  "mode": "block",
   "tx": {
     "fee": {
       "amount": [
@@ -129,10 +129,10 @@ class CosmosSignerTests: XCTestCase {
         }
 
         let output = CosmosSigner.sign(input: signingInput)
-        XCTAssertEqual("a1627478a563666565a266616d6f756e7481a266616d6f756e7464313031386564656e6f6d646d756f6e6367617366313031373231646d656d6f60636d736781a2647479706576636f736d6f732d73646b2f4d736744656c65676174656576616c7565a366616d6f756e74a266616d6f756e746231306564656e6f6d646d756f6e7164656c656761746f725f61646472657373782d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b7967783065706836646430327176616c696461746f725f616464726573737834636f736d6f7376616c6f706572317a6b757072383368727a6b6e33757035656c6b747a63713374756674386e78736d77647167706a7369676e61747572657381a2677075625f6b6579a26474797065781a74656e6465726d696e742f5075624b6579536563703235366b316576616c7565782c416c636f6273507a66544e56653775714141736e6445724a416a71706c6e79756461474230662b522b703346697369676e61747572657858774976666243734c52436a7a6558586f58544b66484c4758526241416d5570304f313334485666566336706664564e4a76767a49534d485255486759636a735369466c4c79523332686569612f794c674d44744959513d3d647479706572636f736d6f732d73646b2f4d736753656e64", output.encoded.hexString)
 
         let expectedJSON = """
 {
+  "mode": "block",
   "tx": {
     "fee": {
       "amount": [

swift/Tests/Blockchains/TerraTests.swift

@@ -48,12 +48,11 @@ class TerraTests: XCTestCase {
         }
 
         let output = CosmosSigner.sign(input: signingInput)
-        // swiftlint:disable:next line_length
-        XCTAssertEqual(output.encoded.hexString, "a1627478a563666565a266616d6f756e7481a266616d6f756e746533303030306564656e6f6d65756c756e616367617366323030303030646d656d6f60636d736781a264747970656b7061792f4d736753656e646576616c7565a366616d6f756e7481a266616d6f756e74663130303030306564656e6f6d65756c756e616c66726f6d5f61646472657373782c7465727261316a663961616a396d79727a736e6d70647237747765636e6166747a6d6b75326d6873326866656a746f5f61646472657373782c746572726131737a7667647361736e6666756e77616b703977303430756e78647265736b3761333463666b616a7369676e61747572657381a2677075625f6b6579a26474797065781a74656e6465726d696e742f5075624b6579536563703235366b316576616c7565782c4131337868565a6c4964616e67434d5a376762686f6f3658743363742b312f64453870764258565269576a6b697369676e61747572657858754a59732b6f623147503235574f782b57434248304c56665050347273563277456b4c422f565462675670425a4f69574761662b514a432f4a2f52386245364c706356493356376343656a58344274794c6e78446a413d3d64747970656b7061792f4d736753656e64")
 
         let expectedJSON: String =
         """
 {
+    "mode": "block",
     "tx": {
         "fee": {
             "amount": [{

tests/Any/SignerTests.cpp

@@ -26,7 +26,7 @@ TEST(Signer, CosmosTransactionSign) {
 
     ASSERT_FALSE(output.has_error());
     ASSERT_EQ("", output.encoded());
-    ASSERT_EQ("{\"tx\":{\"fee\":{\"amount\":[{\"amount\":\"5000\",\"denom\":\"uatom\"}],\"gas\":\"200000\"},\"memo\":\"Testing\",\"msg\":[{\"type\":\"cosmos-sdk/MsgSend\",\"value\":{\"amount\":[{\"amount\":\"995000\",\"denom\":\"uatom\"}],\"from_address\":\"cosmos1ufwv9ymhqaal6xz47n0jhzm2wf4empfqvjy575\",\"to_address\":\"cosmos135qla4294zxarqhhgxsx0sw56yssa3z0f78pm0\"}}],\"signatures\":[{\"pub_key\":{\"type\":\"tendermint/PubKeySecp256k1\",\"value\":\"A6EsukEXB53GhohQVeDpxtkeH8KQIayd/Co/ApYRYkTm\"},\"signature\":\"ULEpUqNzoAnYEx2x22F3ANAiPXquAU9+mqLWoAA/ZOUGTMsdb6vryzsW6AKX2Kqj1pGNdrTcQ58Z09JPyjpgEA==\"}],\"type\":\"cosmos-sdk/MsgSend\"}}",
+    ASSERT_EQ("{\"mode\":\"block\",\"tx\":{\"fee\":{\"amount\":[{\"amount\":\"5000\",\"denom\":\"uatom\"}],\"gas\":\"200000\"},\"memo\":\"Testing\",\"msg\":[{\"type\":\"cosmos-sdk/MsgSend\",\"value\":{\"amount\":[{\"amount\":\"995000\",\"denom\":\"uatom\"}],\"from_address\":\"cosmos1ufwv9ymhqaal6xz47n0jhzm2wf4empfqvjy575\",\"to_address\":\"cosmos135qla4294zxarqhhgxsx0sw56yssa3z0f78pm0\"}}],\"signatures\":[{\"pub_key\":{\"type\":\"tendermint/PubKeySecp256k1\",\"value\":\"A6EsukEXB53GhohQVeDpxtkeH8KQIayd/Co/ApYRYkTm\"},\"signature\":\"ULEpUqNzoAnYEx2x22F3ANAiPXquAU9+mqLWoAA/ZOUGTMsdb6vryzsW6AKX2Kqj1pGNdrTcQ58Z09JPyjpgEA==\"}],\"type\":\"cosmos-sdk/MsgSend\"}}",
             output.json());
 }
 

tests/Cosmos/SignerTests.cpp

@@ -7,6 +7,7 @@
 #include "Coin.h"
 #include "HDWallet.h"
 #include "HexCoding.h"
+#include "Base64.h"
 #include "proto/Cosmos.pb.h"
 #include "Cosmos/Address.h"
 #include "Cosmos/Signer.h"
@@ -45,15 +46,15 @@ TEST(CosmosSigner, SignTx) {
 
     auto signer = Cosmos::Signer(std::move(input));
     auto signature = signer.sign();
-    auto signatureInBase64 = signer.signInBase64();
+    auto signatureInBase64 = Base64::encode(signature);
 
     ASSERT_EQ("/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg==", signatureInBase64);
 
     auto output = signer.build();
 
-    ASSERT_EQ("{\"tx\":{\"fee\":{\"amount\":[{\"amount\":\"200\",\"denom\":\"muon\"}],\"gas\":\"200000\"},\"memo\":\"\",\"msg\":[{\"type\":\"cosmos-sdk/MsgSend\",\"value\":{\"amount\":[{\"amount\":\"1\",\"denom\":\"muon\"}],\"from_address\":\"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02\",\"to_address\":\"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573\"}}],\"signatures\":[{\"pub_key\":{\"type\":\"tendermint/PubKeySecp256k1\",\"value\":\"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F\"},\"signature\":\"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg==\"}],\"type\":\"cosmos-sdk/MsgSend\"}}", output.json());
+    ASSERT_EQ("{\"mode\":\"block\",\"tx\":{\"fee\":{\"amount\":[{\"amount\":\"200\",\"denom\":\"muon\"}],\"gas\":\"200000\"},\"memo\":\"\",\"msg\":[{\"type\":\"cosmos-sdk/MsgSend\",\"value\":{\"amount\":[{\"amount\":\"1\",\"denom\":\"muon\"}],\"from_address\":\"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02\",\"to_address\":\"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573\"}}],\"signatures\":[{\"pub_key\":{\"type\":\"tendermint/PubKeySecp256k1\",\"value\":\"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F\"},\"signature\":\"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg==\"}],\"type\":\"cosmos-sdk/MsgSend\"}}", output.json());
 
-    ASSERT_EQ("a1627478a563666565a266616d6f756e7481a266616d6f756e74633230306564656e6f6d646d756f6e6367617366323030303030646d656d6f60636d736781a2647479706572636f736d6f732d73646b2f4d736753656e646576616c7565a366616d6f756e7481a266616d6f756e7461316564656e6f6d646d756f6e6c66726f6d5f61646472657373782d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b7967783065706836646430326a746f5f61646472657373782d636f736d6f73317a743530617a7570616e716c66616d356166687633686578777975746e756b656834633537336a7369676e61747572657381a2677075625f6b6579a26474797065781a74656e6465726d696e742f5075624b6579536563703235366b316576616c7565782c416c636f6273507a66544e56653775714141736e6445724a416a71706c6e79756461474230662b522b703346697369676e617475726578582f4437346d644947794942332f73517649626f4c54665339503945562f6659477267485a45322f764e6a395836654d36653537473361746c6a4e422b5041426e52773370546b353175586d6843466f70384f2f5a4a673d3d647479706572636f736d6f732d73646b2f4d736753656e64", hex(output.encoded()));
+    ASSERT_EQ(hex(output.signature()), "fc3ef899d206c88077fec42f21ba0b4df4bd3fd115fdf606ae01d9136fef363f57e9e33a7b9ec6ddab658cd07e3c0067470de94e4e75b979a1085a29f0efd926");
 
 
     /*