chore(transaction): update amounts json (#111)

sleepdefic1t · faustbrian · commit afcd2d3989d4 · 2019-07-16T07:11:18.000+03:00
diff --git a/src/identities/address.cpp b/src/identities/address.cpp
@@ -121,14 +121,14 @@ std::string Ark::Crypto::Identities::Address::base58encode(
 
 std::vector<uint8_t> Ark::Crypto::Identities::Address::bytesFromBase58Check(
     const char* address) {
-  std::vector<std::uint8_t> recipientIdBytes;
-  recipientIdBytes.resize(Ripemd160::HASH_LEN);
+  std::vector<std::uint8_t> recipientBytes;
+  recipientBytes.resize(Ripemd160::HASH_LEN);
   uint8_t version = 0;
   Base58Check::pubkeyHashFromBase58Check(
       address,
-      &recipientIdBytes[0],
+      &recipientBytes[0],
       &version);
-  recipientIdBytes.insert(recipientIdBytes.begin(), version);
+  recipientBytes.insert(recipientBytes.begin(), version);
 
-  return recipientIdBytes;
+  return recipientBytes;
 }
diff --git a/src/include/cpp-crypto/transactions/builder.h b/src/include/cpp-crypto/transactions/builder.h
@@ -31,7 +31,7 @@ class Builder {
   * validation will fail.
   **/
   static Transaction buildTransfer(
-      std::string recipientId,
+      std::string recipient,
       uint64_t amount,
       std::string vendorField,
       std::string passphrase,
diff --git a/src/include/cpp-crypto/transactions/transaction.h b/src/include/cpp-crypto/transactions/transaction.h
@@ -63,7 +63,7 @@ class Transaction {
   uint32_t timelock_type = 0;
   std::vector<std::string> signatures = {};
   std::string id = "";
-  std::string recipientId = "";
+  std::string recipient = "";
   std::string senderPublicKey = "";
   std::string signature = "";
   std::string secondSignature = "";
diff --git a/src/transactions/builder.cpp b/src/transactions/builder.cpp
@@ -17,7 +17,7 @@ namespace Crypto {
 namespace Transactions {
 
 Transaction Builder::buildTransfer(
-    std::string recipientId,
+    std::string recipient,
     uint64_t amount,
     std::string vendorField,
     std::string passphrase,
@@ -28,7 +28,7 @@ Transaction Builder::buildTransfer(
 
   transaction.type = defaults::TransactionTypes::Transfer;
   transaction.fee = configuration.getFee(defaults::TransactionTypes::Transfer);
-  transaction.recipientId = std::move(recipientId);
+  transaction.recipient = std::move(recipient);
   transaction.amount = amount;
   transaction.vendorField = std::move(vendorField);
 
@@ -93,7 +93,7 @@ Transaction Builder::buildVote(
   const auto recipient = Identities::Address::fromPassphrase(
       passphrase.c_str(),
       configuration.getNetwork().version());
-  transaction.recipientId = recipient.toString();
+  transaction.recipient = recipient.toString();
 
   return sign(transaction,
       std::move(passphrase),
@@ -121,7 +121,7 @@ Transaction Builder::buildMultiSignatureRegistration(
   const auto recipient = Identities::Address::fromPassphrase(
       passphrase.c_str(),
       configuration.getNetwork().version());
-  transaction.recipientId = recipient.toString();
+  transaction.recipient = recipient.toString();
 
   return sign(
       transaction,
diff --git a/src/transactions/deserializer.cpp b/src/transactions/deserializer.cpp
@@ -107,7 +107,7 @@ void Deserializer::deserializeTransfer(
     Transaction& transaction) {
   unpack(&transaction.amount, &this->_binary[_assetOffset / 2]);
   unpack(&transaction.expiration, &this->_binary[_assetOffset / 2 + 8]);
-  transaction.recipientId = Identities::Address::base58encode(
+  transaction.recipient = Identities::Address::base58encode(
       &this->_binary[(_assetOffset / 2) + 12]);
 
   _assetOffset += (8 + 4 + 21) * 2;
@@ -253,7 +253,7 @@ void Deserializer::handleVersionOne(
     const auto address = Identities::Address::fromPublicKey(
         publicKey,
         transaction.network);
-    transaction.recipientId = address.toString();
+    transaction.recipient = address.toString();
   };
 
   if (transaction.type == defaults::TransactionTypes::MultiSignatureRegistration) {
@@ -280,7 +280,7 @@ void Deserializer::handleVersionOne(
     const auto address = Identities::Address::fromPublicKey(
         publicKey,
         transaction.network);
-    transaction.recipientId = address.toString();
+    transaction.recipient = address.toString();
   };
 }
 
diff --git a/src/transactions/serializer.cpp b/src/transactions/serializer.cpp
@@ -114,12 +114,12 @@ void Serializer::serializeTransfer(
   pack(bytes, _transaction.amount);
   pack(bytes, _transaction.expiration);
 
-  std::vector<uint8_t> recipientIdBytes = Identities::Address::bytesFromBase58Check(
-      _transaction.recipientId.c_str());
+  std::vector<uint8_t> recipientBytes = Identities::Address::bytesFromBase58Check(
+      _transaction.recipient.c_str());
   bytes.insert(
       bytes.end(),
-      recipientIdBytes.begin(),
-      recipientIdBytes.end());
+      recipientBytes.begin(),
+      recipientBytes.end());
 }
 
 /**/
diff --git a/src/transactions/transaction.cpp b/src/transactions/transaction.cpp
@@ -112,17 +112,17 @@ std::vector<uint8_t> Ark::Crypto::Transactions::Transaction::toBytes(
       std::begin(senderKeyBytes),
       std::end(senderKeyBytes));
 
-  const auto skipRecipientId =
+  const auto skiprecipient =
     type == defaults::TransactionTypes::SecondSignatureRegistration
     || type ==defaults::TransactionTypes::MultiSignatureRegistration;
 
-  if (!this->recipientId.empty() && !skipRecipientId) {
-    std::vector<std::uint8_t> recipientIdBytes = Address::bytesFromBase58Check(
-        this->recipientId.c_str());
+  if (!this->recipient.empty() && !skiprecipient) {
+    std::vector<std::uint8_t> recipientBytes = Address::bytesFromBase58Check(
+        this->recipient.c_str());
     bytes.insert(
         std::end(bytes),
-        std::begin(recipientIdBytes),
-        std::end(recipientIdBytes));
+        std::begin(recipientBytes),
+        std::end(recipientBytes));
   } else {
     std::vector<uint8_t> filler(21, 0);
     bytes.insert(
@@ -301,7 +301,7 @@ std::map<std::string, std::string> Ark::Crypto::Transactions::Transaction::toArr
     { "fee", fee },
     { "id", this->id },
     { "network", network },
-    { "recipientId", this->recipientId },
+    { "recipient", this->recipient },
     { "secondSignature", this->secondSignature },
     { "senderPublicKey", this->senderPublicKey },
     { "signature", this->signature },
@@ -323,7 +323,8 @@ std::string Ark::Crypto::Transactions::Transaction::toJson() {
   DynamicJsonDocument doc(docCapacity);
 
   //  Amount
-  doc["amount"] = strtoull(txArray["amount"].c_str(), nullptr, 10);
+  // >= Core v.2.5 'amount' json is string-type
+  doc["amount"] = txArray["amount"];
 
   //  Asset
   if (this->type == 0) {
@@ -365,7 +366,8 @@ std::string Ark::Crypto::Transactions::Transaction::toJson() {
   };
 
   //  Fee
-  doc["fee"] = strtoull(txArray["fee"].c_str(), nullptr, 10);
+  // >= Core v.2.5 'fee' json is string-type
+  doc["fee"] = txArray["fee"];
 
   //  Id
   doc["id"] = txArray["id"];
@@ -375,8 +377,8 @@ std::string Ark::Crypto::Transactions::Transaction::toJson() {
     doc["network"] = atoi(txArray["network"].c_str());
   };
 
-  //  RecipientId
-  doc["recipientId"] = txArray["recipientId"];
+  //  recipient
+  doc["recipient"] = txArray["recipient"];
 
   //  SecondSignature
   if (std::strlen(txArray["secondSignature"].c_str()) > 0) {
diff --git a/test/transactions/builder.cpp b/test/transactions/builder.cpp
@@ -13,7 +13,7 @@ TEST(transactions, build_transfer) {
   ASSERT_EQ(0, actual.type);
   ASSERT_EQ(defaults::Fees::StaticFeePolicy()[actual.type], actual.fee);
   ASSERT_STREQ("D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib",
-               actual.recipientId.c_str());
+               actual.recipient.c_str());
   ASSERT_EQ(100000000ULL, actual.amount);
   ASSERT_TRUE(actual.vendorField.empty());
 }
@@ -40,7 +40,7 @@ TEST(transactions, build_transfer_custom_network) {
   ASSERT_EQ(0, transaction.type);
   ASSERT_EQ(myCustomConfiguration.getFee(transaction.type), transaction.fee);
   ASSERT_STREQ("D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib",
-               transaction.recipientId.c_str());
+               transaction.recipient.c_str());
   ASSERT_EQ(100000000ULL, transaction.amount);
   ASSERT_STREQ("this is a custom bridgechain transaction",
                transaction.vendorField.c_str());
@@ -56,7 +56,7 @@ TEST(transactions, build_empty_transaction) {
       "",
       "Secret passphrase");
 
-  ASSERT_TRUE(shouldBeEmpty.recipientId.empty());
+  ASSERT_TRUE(shouldBeEmpty.recipient.empty());
   ASSERT_EQ(0ULL, shouldBeEmpty.amount);
   ASSERT_FALSE(shouldBeEmpty.verify());
 }
diff --git a/test/transactions/deserializer.cpp b/test/transactions/deserializer.cpp
@@ -26,7 +26,7 @@ TEST(transactions, deserialize_transfer) { // NOLINT
   ASSERT_STREQ(
       "ecf558fbddd62ae42edcfcba02f402d987a94b72a7636ef1121e8625487e2a1e",
       actual.id.c_str());
-  ASSERT_STREQ("D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib", actual.recipientId.c_str());
+  ASSERT_STREQ("D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib", actual.recipient.c_str());
   ASSERT_STREQ(
       "304402205616d6e361439d67a5c2067bbfc8fce61b93061a4fa113315a1c5cf965ff6f3202200a1d99caaa98aeebcec04edd5365352500addb830c79f49b9de484ec616bb1e1",
       actual.signature.c_str());
@@ -65,10 +65,10 @@ TEST(transactions, deserialize_second_signature_registration) { // NOLINT
       actual.signature.c_str());
   ASSERT_TRUE(actual.verify());
 
-  // special case as the type 1 transaction itself has no recipientId
+  // special case as the type 1 transaction itself has no recipient
   const auto publicKey = Ark::Crypto::Identities::PublicKey::fromHex(actual.senderPublicKey.c_str());
   const auto address = Ark::Crypto::Identities::Address::fromPublicKey(publicKey, actual.network);
-  ASSERT_STREQ(address.toString().c_str(), actual.recipientId.c_str());
+  ASSERT_STREQ(address.toString().c_str(), actual.recipient.c_str());
 }
 
 /**/
@@ -131,7 +131,7 @@ TEST(transactions, deserialize_vote) { // NOLINT
   ASSERT_TRUE(0ULL == actual.amount);
   ASSERT_EQ(0, actual.expiration);
   ASSERT_STREQ("16f28a180cd6f3ea46c10f358a457989e956e9d355258230d0c7b07acec10b73", actual.id.c_str());
-  ASSERT_STREQ("D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib", actual.recipientId.c_str());
+  ASSERT_STREQ("D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib", actual.recipient.c_str());
 
   std::vector<std::string> votes = {std::string("+022cca9529ec97a772156c152a00aad155ee6708243e65c9d211a589cb5d43234d")};
   ASSERT_EQ(1, actual.asset.votes.size());
@@ -207,8 +207,8 @@ TEST(transactions, deserialize_multi_signature_registration) { // NOLINT
 
   ASSERT_TRUE(actual.verify());
 
-  // special case as the type 4 transaction itself has no recipientId
+  // special case as the type 4 transaction itself has no recipient
   const auto publicKey = Ark::Crypto::Identities::PublicKey::fromHex(actual.senderPublicKey.c_str());
   const auto address = Ark::Crypto::Identities::Address::fromPublicKey(publicKey, actual.network);
-  ASSERT_STREQ(address.toString().c_str(), actual.recipientId.c_str());
+  ASSERT_STREQ(address.toString().c_str(), actual.recipient.c_str());
 }
diff --git a/test/transactions/serializer.cpp b/test/transactions/serializer.cpp
@@ -11,7 +11,7 @@ TEST(transactions, serialize_transfer) { // NOLINT
   transaction.fee = 10000000ULL;
   transaction.amount = 200000000ULL;
   transaction.timestamp = 41443847UL;
-  transaction.recipientId = "D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib";
+  transaction.recipient = "D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib";
   transaction.senderPublicKey = "034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192";
   transaction.vendorField = "Hello World";
   transaction.signature = "304402205616d6e361439d67a5c2067bbfc8fce61b93061a4fa113315a1c5cf965ff6f3202200a1d99caaa98aeebcec04edd5365352500addb830c79f49b9de484ec616bb1e1";
@@ -83,7 +83,7 @@ TEST(transactions, serialize_vote) { // NOLINT
   transaction.type = 3;
   transaction.fee = 100000000ULL;
   transaction.timestamp = 41269366UL;
-  transaction.recipientId = "D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib";
+  transaction.recipient = "D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib";
   transaction.senderPublicKey = "034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192";
   transaction.signature = "304402204b8bb403e2db7f9599d46d0f5d39f8bb1d0663d875af7ec1154448e98466e86302201e92fb57e13fb729b07e1027fa3d6e3f28e0d5828ed2d7c53a5e8db08cb6d068";
   transaction.secondSignature = "304402201329882762a42d1af9079c822a9e3feefa47b7476b0afe61440637408958a64402206da179b08e31d9c784fbb23abe2c9b50353ed7881dc29787a5e8ecbee2dfda66";
diff --git a/test/transactions/transaction.cpp b/test/transactions/transaction.cpp
