Skip to content
Snippets Groups Projects
Commit 79e3bf06 authored by littletux89@gmail.com's avatar littletux89@gmail.com
Browse files

[*] Made changes.

parent 153a6065
No related branches found
No related tags found
1 merge request!65Bugs 2797
Pipeline #1463 canceled with stage
......@@ -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)
......
......@@ -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;
......
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment