From 0de6fd12eed8dea35765e91c98e65fdf2231782c Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Sat, 29 Dec 2018 20:41:00 +0800 Subject: [PATCH] fix build... disable komodo-tx for now. --- src/Makefile.am | 3 ++- src/importcoin.cpp | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 98cc79adf..06ce32b40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -122,8 +122,9 @@ TESTS = bin_PROGRAMS += komodod #endif +# komodo-tx if BUILD_BITCOIN_UTILS - bin_PROGRAMS += komodo-cli komodo-tx + bin_PROGRAMS += komodo-cli endif if ENABLE_WALLET bin_PROGRAMS += wallet-utility diff --git a/src/importcoin.cpp b/src/importcoin.cpp index bc0b6168f..71e469423 100644 --- a/src/importcoin.cpp +++ b/src/importcoin.cpp @@ -5,10 +5,15 @@ #include "hash.h" #include "script/cc.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 payouts) { + std::vector payload = E_MARSHAL(ss << EVAL_IMPORTCOIN); CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); mtx.vin.push_back(CTxIn(COutPoint(burnTx.GetHash(), 10e8), CScript() << payload));