#1674 fixed lelantus info

Author: anatolse

android/wallet_model.cpp

@@ -58,33 +58,6 @@ namespace
         return addr;
     }
 
-    std::string getAddressFrom(TxDescription m_tx)
-    {
-        if (m_tx.m_txType == wallet::TxType::PushTransaction && !m_tx.m_sender){
-            return m_tx.getSenderIdentity();
-        }
-        return to_string(m_tx.m_sender ? m_tx.m_myId : m_tx.m_peerId);
-    }
-
-    std::string getAddressTo(TxDescription m_tx)
-    {
-        if (m_tx.m_sender)
-        {
-            auto token = m_tx.getToken();
-            if (token.length() == 0) {
-                return to_string(m_tx.m_myId);
-            }
-            auto params = beam::wallet::ParseParameters(token);
-            if (auto peerIdentity = params->GetParameter<WalletID>(TxParameterID::PeerID); peerIdentity)
-            {
-                auto s = std::to_string(*peerIdentity);
-                return s;
-            }
-            return token;
-        }
-        return to_string(m_tx.m_myId);
-    }
-
     jobject fillTransactionData(JNIEnv* env, const TxDescription& txDescription)
     {
         jobject tx = env->AllocObject(TxDescriptionClass);
@@ -113,8 +86,8 @@ namespace
         setStringField(env, TxDescriptionClass, tx, "senderIdentity", txDescription.getSenderIdentity());
         setStringField(env, TxDescriptionClass, tx, "receiverIdentity", txDescription.getReceiverIdentity());
 
-        setStringField(env, TxDescriptionClass, tx, "receiverAddress", getAddressTo(txDescription));
-        setStringField(env, TxDescriptionClass, tx, "senderAddress", getAddressFrom(txDescription));
+        setStringField(env, TxDescriptionClass, tx, "receiverAddress", txDescription.getAddressTo());
+        setStringField(env, TxDescriptionClass, tx, "senderAddress", txDescription.getAddressFrom());
 
         if(txDescription.m_txType == wallet::TxType::PushTransaction) {
             auto token = txDescription.getToken();

wallet/api/api.cpp

@@ -146,6 +146,10 @@ void GetStatusResponseJson(const TxDescription& tx,
         };
         statusInterpreter = std::make_unique<AssetTxStatusInterpreter>(tx);
     }
+    else if (tx.m_txType == TxType::PushTransaction)
+    {
+        statusInterpreter = std::make_unique<MaxPrivacyTxStatusInterpreter>(tx);
+    }
     else if (tx.m_txType == TxType::AtomicSwap)
     {
         #ifdef BEAM_ATOMIC_SWAP_SUPPORT
@@ -157,8 +161,8 @@ void GetStatusResponseJson(const TxDescription& tx,
         {"txId", TxIDToString(tx.m_txId)},
         {"status", tx.m_status},
         {"status_string", statusInterpreter ? statusInterpreter->getStatus() : "unknown"},
-        {"sender", std::to_string(tx.m_sender ? tx.m_myId : tx.m_peerId)},
-        {"receiver", std::to_string(tx.m_sender ? tx.m_peerId : tx.m_myId)},
+        {"sender", tx.getAddressFrom()},
+        {"receiver", tx.getAddressTo()},
         {"value", tx.m_amount},
         {"comment", std::string{ tx.m_message.begin(), tx.m_message.end() }},
         {"create_time", tx.m_createTime},

wallet/core/common.cpp

@@ -90,6 +90,9 @@ namespace std
 {
     string to_string(const beam::wallet::WalletID& id)
     {
+        if (id == Zero)
+            return {};
+
         static_assert(sizeof(id) == sizeof(id.m_Channel) + sizeof(id.m_Pk), "");
         return EncodeToHex(id);
     }
@@ -953,6 +956,28 @@ namespace beam::wallet
         return {};
     }
 
+    std::string TxDescription::getAddressFrom() const
+    {
+        if (m_txType == wallet::TxType::PushTransaction && !m_sender)
+        {
+            return getSenderIdentity();
+        }
+        return std::to_string(m_sender ? m_myId : m_peerId);
+    }
+
+    std::string TxDescription::getAddressTo() const
+    {
+        if (m_sender)
+        {
+            auto token = getToken();
+            if (token.empty())
+                return std::to_string(m_peerId);
+
+            return token;
+        }
+        return std::to_string(m_myId);
+    }
+
     uint64_t get_RandomID()
     {
         uintBigFor<uint64_t>::Type val;

wallet/core/common.h

@@ -605,6 +605,8 @@ namespace beam::wallet
         [[nodiscard]] std::string getSenderIdentity() const;
         [[nodiscard]] std::string getReceiverIdentity() const;
         [[nodiscard]] std::string getIdentity(bool isSender) const;
+        [[nodiscard]] std::string getAddressFrom() const;
+        [[nodiscard]] std::string getAddressTo() const;
 
 #define BEAM_TX_DESCRIPTION_INITIAL_PARAMS(macro) \
         macro(TxParameterID::TransactionType,   TxType,          m_txType,          wallet::TxType::Simple) \

wallet/core/wallet.cpp

@@ -1729,6 +1729,7 @@ namespace beam::wallet
         if (tx)
         {
             storage::setTxParameter(*m_WalletDB, txID, TxParameterID::AddressType, addressType, true);
+            storage::setTxParameter(*m_WalletDB, txID, TxParameterID::KernelProofHeight, coin.m_confirmHeight, true);
             return;
         }
         else
@@ -1754,7 +1755,8 @@ namespace beam::wallet
                 .SetParameter(TxParameterID::CreateTime, RestoreCreationTime(tip, coin.m_confirmHeight))
                 .SetParameter(TxParameterID::PeerWalletIdentity, coin.m_CoinID.m_User.m_Sender)
                 .SetParameter(TxParameterID::MyWalletIdentity, receiverAddress.m_Identity)
-                .SetParameter(TxParameterID::KernelID, Merkle::Hash(Zero));
+                .SetParameter(TxParameterID::KernelID, Merkle::Hash(Zero))
+                .SetParameter(TxParameterID::KernelProofHeight, coin.m_confirmHeight);
 
             if (message->m_MaxPrivacyMinAnonymitySet)
             {