DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix build... disable komodo-tx for now.

Browse Source
This commit is contained in:
blackjok3r
2018-12-29 20:41:00 +08:00
parent 045afa5dd7
commit 0de6fd12ee
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@@ -122,8 +122,9 @@ TESTS =
bin_PROGRAMS += komodod bin_PROGRAMS += komodod
#endif #endif
# komodo-tx
if BUILD_BITCOIN_UTILS if BUILD_BITCOIN_UTILS
bin_PROGRAMS += komodo-cli komodo-tx bin_PROGRAMS += komodo-cli
endif endif
if ENABLE_WALLET if ENABLE_WALLET
bin_PROGRAMS += wallet-utility bin_PROGRAMS += wallet-utility

5
src/importcoin.cpp
View File

@@ -5,10 +5,15 @@
#include "hash.h" #include "hash.h"
#include "script/cc.h" #include "script/cc.h"
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "core_io.h"
#include "script/sign.h"
#include "wallet/wallet.h"
int32_t komodo_nextheight();
CTransaction MakeImportCoinTransaction(const TxProof proof, const CTransaction burnTx, const std::vector<CTxOut> payouts) CTransaction MakeImportCoinTransaction(const TxProof proof, const CTransaction burnTx, const std::vector<CTxOut> payouts)
{ {
std::vector<uint8_t> payload = E_MARSHAL(ss << EVAL_IMPORTCOIN); std::vector<uint8_t> payload = E_MARSHAL(ss << EVAL_IMPORTCOIN);
CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
mtx.vin.push_back(CTxIn(COutPoint(burnTx.GetHash(), 10e8), CScript() << payload)); mtx.vin.push_back(CTxIn(COutPoint(burnTx.GetHash(), 10e8), CScript() << payload));