From 6a71342500b173cf60a05698efd2b18835b21249 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 29 Dec 2018 01:39:30 -1100 Subject: [PATCH] Fixes --- src/cc/channels.cpp | 6 ------ src/komodo-tx.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cc/channels.cpp b/src/cc/channels.cpp index 3877ece2d..4ee2d73e1 100644 --- a/src/cc/channels.cpp +++ b/src/cc/channels.cpp @@ -429,12 +429,6 @@ int64_t AddChannelsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx, C else return 0; } - -int32_t komodo_nextheight() -{ - return(100000000); -} - std::string ChannelOpen(uint64_t txfee,CPubKey destpub,int32_t numpayments,int64_t payment) { CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); diff --git a/src/komodo-tx.cpp b/src/komodo-tx.cpp index 1e3e632d4..b1b478972 100644 --- a/src/komodo-tx.cpp +++ b/src/komodo-tx.cpp @@ -178,6 +178,12 @@ static void RegisterLoad(const std::string& strInput) } +int32_t komodo_nextheight() +{ + return(100000000); +} + + // Set default values of new CMutableTransaction based on consensus rules at given height. CMutableTransaction CreateNewContextualCMutableTransaction(const Consensus::Params& consensusParams, int nHeight) {