diff --git a/CellFrameDashboardGUI/DapCommandController.h b/CellFrameDashboardGUI/DapCommandController.h index 285936209637ccb1cc1dc2c27bbf7bf2b658aa2e..e9bb6d3aff1ff882db05ebb1d44605f3a6bbb883 100644 --- a/CellFrameDashboardGUI/DapCommandController.h +++ b/CellFrameDashboardGUI/DapCommandController.h @@ -116,8 +116,9 @@ private slots: void processGetCmdHistory(); // --------------------------------------------- + /// Handling service response for get wallet data void processGetWalletData(); - + /// Handling service response for get result of putting transaction to mempool void processGetResultTransaction(); public slots: @@ -176,12 +177,21 @@ public slots: // --------------------------------------------- + /// Response wallet data + /// @param data void setNewWalletData(const QVariant& aData); - + /// Request wallet data void requestWalletData(); - + /// Request for creation new transaction + /// @param name of wallet + /// @param address of a receiver + /// @param name of token + /// @param name of network + /// @param sum for transaction + /// @return result of trying to do transaction void sendMempool(const QString& aFromWallet, const QString& aToAddress, const QString& aToken, const QString& aNetwork, const quint64 aValue); - + /// Taking everything from mempool + /// @param network void takeFromMempool(const QString& aNetwork); }; diff --git a/CellFrameDashboardGUI/DapServiceController.h b/CellFrameDashboardGUI/DapServiceController.h index 27d08052e339d4e3a70d59cabf519f89e756074d..d2fe094cbc709acd7d490002885ecaf5aaee4729 100644 --- a/CellFrameDashboardGUI/DapServiceController.h +++ b/CellFrameDashboardGUI/DapServiceController.h @@ -176,6 +176,7 @@ public slots: static QObject *singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine); public slots: + /// Request wallet data void requestWalletData(); }; diff --git a/CellFrameDashboardGUI/DapTransaction.cpp b/CellFrameDashboardGUI/DapTransaction.cpp index 372c3811f8e3f1c7ba2eee6489fab046dee62026..01f91e1dae7df53c450a782c5067d087dcc50970 100644 --- a/CellFrameDashboardGUI/DapTransaction.cpp +++ b/CellFrameDashboardGUI/DapTransaction.cpp @@ -23,5 +23,6 @@ void DapTransaction::sendToken(const QString& aNetwork) void DapTransaction::receiveResult(const bool aSuccessful) { + if(aSuccessful) emit sendToken("private"); emit sendResult(aSuccessful); } diff --git a/CellFrameDashboardGUI/DapTransaction.h b/CellFrameDashboardGUI/DapTransaction.h index 23fa41ff02cc89a035041dbf766918b262080137..90e8d6998b06a2ab68ad38bf01470f60a0982137 100644 --- a/CellFrameDashboardGUI/DapTransaction.h +++ b/CellFrameDashboardGUI/DapTransaction.h @@ -12,8 +12,18 @@ public: static DapTransaction& instance(); public slots: + /// Request for creation new transaction + /// @param name of wallet + /// @param address of a receiver + /// @param name of token + /// @param name of network + /// @param sum for transaction void createRequestTransaction(const QString& aFromWallet, const QString& aToAddress, const QString& aToken, const QString& aNetwork, const quint64 aValue); + /// Taking everything from mempool + /// @param network void sendToken(const QString& aNetwork); + /// Recevie result of putting to mempool + /// @param successful or not void receiveResult(const bool aSuccessful); signals: diff --git a/CellFrameDashboardService/DapChainDashboardService.h b/CellFrameDashboardService/DapChainDashboardService.h index e6e039b8b88ae53ef1bab7b09ef57e56093dd1ad..808cfbc896ce5d78604c4ef09a0eab8696612b7a 100755 --- a/CellFrameDashboardService/DapChainDashboardService.h +++ b/CellFrameDashboardService/DapChainDashboardService.h @@ -137,12 +137,23 @@ public slots: /// @return history of last 50 commands QString getCmdHistory() const; + /// Add new wallet + /// @param wallet name + /// @return sucessful or not bool appendWallet(const QString& aWalletName) const; - + /// Wallets data + /// @return data QByteArray walletData() const; - + /// Putting new transaction in mempool + /// @param name of wallet + /// @param address of a receiver + /// @param name of token + /// @param name of network + /// @param sum for transaction + /// @return sucessful or not bool createTransaction(const QString& aFromWallet, const QString& aToAddress, const QString& aTokenName, const QString& aNetwork, const quint64 aValue); - + /// Taking everything from mempool + /// @param network void takeFromMempool(const QString& aNetwork); private slots: @@ -151,7 +162,8 @@ private slots: /// Send new history transaction to client /// @param New history transaction void doSendNewHistory(const QVariant& aData); - + /// Taking everything from mempool + /// @param network void doSendNewWalletData(const QByteArray& aData); }; diff --git a/CellFrameDashboardService/DapChainTransaction.h b/CellFrameDashboardService/DapChainTransaction.h index 7b13307923cd109153ee109870d2b1f72abafa9b..e7a3a3a5e4418fccd02acf59208a65fd733e21fd 100644 --- a/CellFrameDashboardService/DapChainTransaction.h +++ b/CellFrameDashboardService/DapChainTransaction.h @@ -21,6 +21,8 @@ public: /// @return result of trying to do transaction bool createTransaction(const QString& aFromWallet, const QString& aToAddress, const QString& aTokenName, const QString& aNetwork, const quint64 aValue) const; + /// Taking everything from mempool + /// @param network void takeFromMempool(const QString& aNetwork); };