From 79e3bf06e7f7e6c0d02ecc18ecb5885911a4182b Mon Sep 17 00:00:00 2001
From: "littletux89@gmail.com" <littletux89@gmail.com>
Date: Sun, 15 Dec 2019 20:45:36 +0300
Subject: [PATCH] [*] Made changes.
---
.../CellFrameDashboardService.pro | 4 +--
.../DapChainWalletHandler.cpp | 35 -------------------
.../DapChainWalletHandler.h | 2 --
3 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/CellFrameDashboardService/CellFrameDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro
index e59c75465..e03e0a079 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 f3815d37d..fd61172fe 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 5a57b924a..5b3d3cd46 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:
--
GitLab