Merge remote-tracking branch 'remotes/origin/eager_electron_5.2RC_API' into mainnet

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();

explorer/adapter.cpp

@@ -257,6 +257,8 @@ class Adapter : public Node::IObserver, public IAdapter {
             std::make_shared<wallet::OfferBoardProtocolHandler>(_walletDB->get_SbbsKdf());
         _offersBulletinBoard = std::make_shared<wallet::SwapOffersBoard>(
             *_broadcastRouter, *_offerBoardProtocolHandler, _walletDB);
+        _walletDbSubscriber = std::make_unique<WalletDbSubscriber>(
+                    static_cast<wallet::IWalletDbObserver*>(_offersBulletinBoard.get()), _walletDB);
 #endif  // BEAM_ATOMIC_SWAP_SUPPORT
     }
 
@@ -925,6 +927,8 @@ class Adapter : public Node::IObserver, public IAdapter {
 #ifdef BEAM_ATOMIC_SWAP_SUPPORT
     std::shared_ptr<wallet::OfferBoardProtocolHandler> _offerBoardProtocolHandler;
     wallet::SwapOffersBoard::Ptr _offersBulletinBoard;
+    using WalletDbSubscriber = wallet::ScopedSubscriber<wallet::IWalletDbObserver, wallet::IWalletDB>;
+    std::unique_ptr<WalletDbSubscriber> _walletDbSubscriber;
 #endif  // BEAM_ATOMIC_SWAP_SUPPORT
 };
 

utility/cli/options.cpp

@@ -319,6 +319,7 @@ namespace beam
         const char* MAX_PRIVACY_ADDRESS = "max_privacy";
         const char* OFFLINE_ADDRESS     = "offline";
         const char* PUBLIC_OFFLINE      = "public_offline";
+        const char* ENABLE_LELANTUS     = "enable_lelantus";
     }
 
 

utility/cli/options.h

@@ -220,6 +220,7 @@ namespace beam
         extern const char* MAX_PRIVACY_ADDRESS;
         extern const char* OFFLINE_ADDRESS;
         extern const char* PUBLIC_OFFLINE;
+        extern const char* ENABLE_LELANTUS;
     }
 
     enum OptionsFlag : int

utility/io/timer.cpp

@@ -62,31 +62,57 @@ void Timer::cancel() {
 }
 
 
-
+IdleEvt::~IdleEvt()
+{
+    if (m_pHandle)
+    {
+        m_pHandle->CancelSafe();
+        uv_close(reinterpret_cast<uv_handle_t*>(&Cast::Down<uv_idle_t>(*m_pHandle)), Handle::OnClosed);
+    }
+}
 
 void IdleEvt::cancel()
 {
-    if (m_Set)
+    if (m_pHandle)
+        m_pHandle->CancelSafe();
+}
+
+void IdleEvt::start()
+{
+    if (m_pHandle)
+    {
+        if (m_pHandle->m_pThis)
+            return; // already set
+    }
+    else
     {
-        m_Set = false;
-        uv_idle_stop(&m_Handle);
-        uv_close(reinterpret_cast<uv_handle_t*>(&Cast::Down<uv_idle_t>(m_Handle)), nullptr);
+        m_pHandle = new Handle;
+        uv_idle_init(&Reactor::get_Current().get_UvLoop(), m_pHandle);
     }
+
+    m_pHandle->m_pThis = this;
+    uv_idle_start(m_pHandle, Handle::OnSchedule);
 }
 
-void IdleEvt::start()
+void IdleEvt::Handle::CancelSafe()
 {
-    if (!m_Set)
+    if (m_pThis)
     {
-        m_Set = true;
-        uv_idle_init(&Reactor::get_Current().get_UvLoop(), &m_Handle);
-        uv_idle_start(&m_Handle, Handle::CallbackRaw);
+        m_pThis = nullptr;
+        uv_idle_stop(this);
     }
 }
 
-void IdleEvt::Handle::CallbackRaw(uv_idle_t* p)
+void IdleEvt::Handle::OnClosed(uv_handle_t* p)
+{
+    delete Cast::Up<Handle>(reinterpret_cast<uv_idle_t*>(p));
+}
+
+void IdleEvt::Handle::OnSchedule(uv_idle_t* p)
 {
-    static_cast<Handle*>(p)->get_ParentObj().OnSchedule();
+    IdleEvt* pThis = Cast::Up<Handle>(p)->m_pThis;
+    assert(pThis);
+    pThis->OnSchedule();
 }
 
 

utility/io/timer.h

@@ -43,7 +43,7 @@ class Timer : protected Reactor::Object {
 
 struct IdleEvt
 {
-    ~IdleEvt() { cancel(); }
+    ~IdleEvt();
 
     void start();
     void cancel();
@@ -55,12 +55,15 @@ struct IdleEvt
     struct Handle
         :public uv_idle_t
     {
-        static void CallbackRaw(uv_idle_t*);
+        IdleEvt* m_pThis;
 
-        IMPLEMENT_GET_PARENT_OBJ(IdleEvt, m_Handle)
-    } m_Handle;
+        void CancelSafe();
 
-    bool m_Set = false;
+        static void OnClosed(uv_handle_t*);
+        static void OnSchedule(uv_idle_t*);
+    };
+
+    Handle* m_pHandle = nullptr;
 };
 
 }} //namespaces

wallet/api/api.cpp

@@ -24,6 +24,7 @@
 #include "wallet/transactions/swaps/swap_tx_description.h"
 #endif  // BEAM_ATOMIC_SWAP_SUPPORT
 #include <regex>
+#include <string_view>
 
 namespace beam::wallet {
     namespace {
@@ -145,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
@@ -156,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},
@@ -849,7 +854,37 @@ OfferInput collectOfferInput(const JsonRpcId& id, const json& params)
     void WalletApi::onCreateAddressMessage(const JsonRpcId& id, const json& params)
     {
         CreateAddress createAddress;
+        
         FillAddressData(id, params, createAddress);
+
+        auto it = params.find("type");
+        if (it != params.end())
+        {
+            static constexpr std::array<std::pair<std::string_view, TxAddressType>, 4> types =
+            {
+                {
+                    {"regular",         TxAddressType::Regular},
+                    {"offline",         TxAddressType::Offline},
+                    {"max_privacy",     TxAddressType::MaxPrivacy},
+                    {"public_offline",  TxAddressType::PublicOffline}
+                }
+            };
+            auto t = std::find_if(types.begin(), types.end(), [&](const auto& p) { return p.first == it->get<std::string>(); });
+            if (t != types.end())
+            {
+                createAddress.type = t->second;
+            }
+        }
+        it = params.find("new_style_regular");
+        if (it != params.end())
+        {
+            createAddress.newStyleRegular = it->get<bool>();
+        }
+        it = params.find("offline_payments");
+        if (it != params.end())
+        {
+            createAddress.offlinePayments = it->get<uint32_t>();
+        }
         getHandler().onMessage(id, createAddress);
     }
 
@@ -930,21 +965,18 @@ OfferInput collectOfferInput(const JsonRpcId& id, const json& params)
         auto txParams = ParseParameters(addressOrToken);
         if (!txParams)
         {
-            throw jsonrpc_exception{ ApiError::InvalidAddress , "Invalid receiver address or token.", id };
+            throw jsonrpc_exception{ ApiError::InvalidAddress , "Invalid receiver address.", id };
         }
-        send.txParameters = *txParams;
-
-        if (auto peerID = send.txParameters.GetParameter<WalletID>(TxParameterID::PeerID); peerID)
+        send.txParameters = std::move(*txParams);
+        auto peerID = send.txParameters.GetParameter<WalletID>(beam::wallet::TxParameterID::PeerID);
+        if (peerID)
         {
             send.address = *peerID;
-            if (std::to_string(*peerID) != addressOrToken)
-            {
-                send.txParameters.SetParameter(beam::wallet::TxParameterID::OriginalToken, addressOrToken);
-            }
         }
-        else
+
+        if (!peerID || std::to_string(*peerID) != addressOrToken)
         {
-            throw jsonrpc_exception{ ApiError::InvalidAddress , "Invalid receiver address.", id };
+            send.txParameters.SetParameter(beam::wallet::TxParameterID::OriginalToken, addressOrToken);
         }
 
         if (existsJsonParam(params, "from"))
@@ -1487,7 +1519,7 @@ OfferInput collectOfferInput(const JsonRpcId& id, const json& params)
         {
             {JsonRpcHrd, JsonRpcVerHrd},
             {"id", id},
-            {"result", std::to_string(res.address)}
+            {"result", res.address}
         };
     }
 
@@ -1760,7 +1792,8 @@ OfferInput collectOfferInput(const JsonRpcId& id, const json& params)
                 resItem.tx,
                 item,
                 resItem.txHeight,
-                resItem.systemHeight);
+                resItem.systemHeight,
+                true);
             msg["result"].push_back(item);
         }
     }

wallet/api/api.h

@@ -262,9 +262,12 @@ namespace beam::wallet
 
     struct CreateAddress : AddressData
     {
+        TxAddressType type = TxAddressType::Regular;
+        bool newStyleRegular = false; // by default we generate SBBS addresses for regular type
+        uint32_t offlinePayments = 10;
         struct Response
         {
-            WalletID address;
+            std::string address;
         };
     };
 

wallet/api/api.rest

@@ -239,4 +239,18 @@ content-type: application/json-rpc
     "params": {}
 }
 
+
+######## Explorer node #######################
+###
+
+GET http://127.0.0.1:8888/status HTTP/1.1
+
+###
+
+GET http://127.0.0.1:8888/blocks?height=13600&n=100 HTTP/1.1
+
+###
+
+GET http://127.0.0.1:8888/swap_offers HTTP/1.1
+
 ###

wallet/api/api_cli.cpp

@@ -61,6 +61,8 @@
 #include "wallet/client/extensions/offers_board/swap_offers_board.h"
 #endif  // BEAM_ATOMIC_SWAP_SUPPORT
 
+#include "wallet/transactions/lelantus/lelantus_reg_creators.h"
+
 #include "nlohmann/json.hpp"
 #include "version.h"
 
@@ -706,7 +708,7 @@ int main(int argc, char* argv[])
             std::string whitelist;
 
             uint32_t logCleanupPeriod;
-
+            bool enableLelentus = false;
         } options;
 
         TlsOptions tlsOptions;
@@ -729,7 +731,8 @@ int main(int argc, char* argv[])
                 (cli::IP_WHITELIST, po::value<std::string>(&options.whitelist)->default_value(""), "IP whitelist")
                 (cli::LOG_CLEANUP_DAYS, po::value<uint32_t>(&options.logCleanupPeriod)->default_value(5), "old logfiles cleanup period(days)")
                 (cli::NODE_POLL_PERIOD, po::value<Nonnegative<uint32_t>>(&options.pollPeriod_ms)->default_value(Nonnegative<uint32_t>(0)), "Node poll period in milliseconds. Set to 0 to keep connection. Anyway poll period would be no less than the expected rate of blocks if it is less then it will be rounded up to block rate value.")
-                (cli::WITH_ASSETS,    po::bool_switch()->default_value(false), "enable confidential assets transactions");
+                (cli::WITH_ASSETS,    po::bool_switch()->default_value(false), "enable confidential assets transactions")
+                (cli::ENABLE_LELANTUS, po::bool_switch()->default_value(false), "enable Lelantus MW transactions");
             ;
 
             po::options_description authDesc("User authorization options");
@@ -850,6 +853,8 @@ int main(int argc, char* argv[])
             // this should be exactly CLI flag value to print correct error messages
             // Rules::CA.Enabled would be checked as well but later
             wallet::g_AssetsEnabled = vm[cli::WITH_ASSETS].as<bool>();
+
+            options.enableLelentus = vm[cli::ENABLE_LELANTUS].as<bool>();
         }
 
         io::Address listenTo = io::Address().port(options.port);
@@ -896,6 +901,11 @@ int main(int argc, char* argv[])
             RegisterAssetCreators(*wallet);
         }
 
+        if (options.enableLelentus)
+        {
+            lelantus::RegisterCreators(*wallet, walletDB);
+        }
+
         // All TxCreators must be registered by this point
         wallet->ResumeAllTransactions();