diff --git a/CellFrameDashboardService/CellFrameDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro index e59c75465048ead095d1160fd176d4b27408d934..e03e0a07991dd1f50cae6f3ed8def0abd796c4ff 100755 --- a/CellFrameDashboardService/CellFrameDashboardService.pro +++ b/CellFrameDashboardService/CellFrameDashboardService.pro @@ -55,7 +55,7 @@ SOURCES += \ $$PWD/DapChainLogHandler.cpp \ $$PWD/DapChainNetworkHandler.cpp \ $$PWD/DapChainConsoleHandler.cpp \ - DapChainTransaction.cpp + $$PWD/DapChainTransaction.cpp HEADERS += \ $$PWD/DapChainDashboardService.h \ @@ -67,7 +67,7 @@ HEADERS += \ $$PWD/DapChainLogHandler.h \ $$PWD/DapChainNetworkHandler.h \ $$PWD/DapChainConsoleHandler.h \ - DapChainTransaction.h + $$PWD/DapChainTransaction.h include (../libdap/libdap.pri) include (../libdap-crypto/libdap-crypto.pri) diff --git a/CellFrameDashboardService/DapChainWalletHandler.cpp b/CellFrameDashboardService/DapChainWalletHandler.cpp index f3815d37d0b8e74dc1178af2c7944c51a8b7cd0b..fd61172fe0e2c4b658922572d765ad74ddb94baa 100755 --- a/CellFrameDashboardService/DapChainWalletHandler.cpp +++ b/CellFrameDashboardService/DapChainWalletHandler.cpp @@ -21,41 +21,6 @@ bool DapChainWalletHandler::appendWallet(const QString& aWalletName) return rx.indexIn(result, 0); } -bool DapChainWalletHandler::createTransaction(const QString& aFromAddress, const QString& aToAddress, const QString& aTokenName, const QString& aNetwork, const quint64 aValue) const -{ - QString fromWalletName; - for(int i = 0; i < m_walletList.count(); i++) - { - if(m_walletList[i].first.Address == aFromAddress) - fromWalletName = m_walletList[i].first.Name; - } - - if(fromWalletName.isEmpty() || !m_networkList.contains(aNetwork)) return false; - QProcess processCreate; - processCreate.start(QString("%1 tx_create -net %2 -chain gdb -from_wallet %3 -to_addr %4 -token %5 -value %6") - .arg(CLI_PATH) - .arg(aNetwork) - .arg(fromWalletName) - .arg(aToAddress) - .arg(aTokenName) - .arg(QString::number(aValue))); - processCreate.waitForFinished(-1); - QByteArray result = processCreate.readAll(); - QRegExp rx("transfer=(\\w+)"); - rx.indexIn(result, 0); - - if(rx.cap(1) == "Ok") { - - QProcess processMempool; - processMempool.start(QString("%1 mempool_proc -net " + aNetwork +" -chain gdb").arg(CLI_PATH)); - processMempool.waitForFinished(-1); - processMempool.readAll(); - return true; - } - - return false; -} - QByteArray DapChainWalletHandler::walletData() const { QByteArray data; diff --git a/CellFrameDashboardService/DapChainWalletHandler.h b/CellFrameDashboardService/DapChainWalletHandler.h index 5a57b924abb8519b2a9a7d7d008bbc5d1d356eed..5b3d3cd46be657ce045f1870d50c0eda761f2f68 100755 --- a/CellFrameDashboardService/DapChainWalletHandler.h +++ b/CellFrameDashboardService/DapChainWalletHandler.h @@ -24,8 +24,6 @@ public: bool appendWallet(const QString& aWalletName); - bool createTransaction(const QString& aFromAddress, const QString& aToAddress, const QString& aTokenName, const QString& aNetwork, const quint64 aValue) const; - QByteArray walletData() const; private slots: