Skip to content

Commit

Permalink
Merge pull request #7 from faetos/master
Browse files Browse the repository at this point in the history
Seeds, 1000 stake, mac build
  • Loading branch information
Graham Higgins committed Jun 22, 2018
2 parents 6bcc38d + aeef07f commit 5d446e2
Show file tree
Hide file tree
Showing 16 changed files with 11,981 additions and 23 deletions.
11 changes: 11 additions & 0 deletions libbitcoinconsensus.pc
@@ -0,0 +1,11 @@
prefix=/usr/local
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include

Name: Helium Core consensus library
Description: Library for the Bitcoin consensus protocol.
Version: 0.13.99
Libs: -L${libdir} -lbitcoinconsensus
Cflags: -I${includedir}
Requires.private: libcrypto
4 changes: 2 additions & 2 deletions src/activemasternode.cpp
Expand Up @@ -12,7 +12,7 @@
#include "spork.h"

//
// Bootup the Masternode, look for a 10000 PIV input and register on the network
// Bootup the Masternode, look for a 1000 HLM input and register on the network
//
void CActiveMasternode::ManageStatus()
{
Expand Down Expand Up @@ -456,7 +456,7 @@ vector<COutput> CActiveMasternode::SelectCoinsMasternode()

// Filter
BOOST_FOREACH (const COutput& out, vCoins) {
if (out.tx->vout[out.i].nValue == 10000 * COIN) { //exactly
if (out.tx->vout[out.i].nValue == MASTERNODE_COLLATERAL_AMOUNT * COIN) { //exactly
filteredCoins.push_back(out);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/activemasternode.h
Expand Up @@ -33,7 +33,7 @@ class CActiveMasternode
/// Create Masternode broadcast, needs to be relayed manually after that
bool CreateBroadcast(CTxIn vin, CService service, CKey key, CPubKey pubKey, CKey keyMasternode, CPubKey pubKeyMasternode, std::string& errorMessage, CMasternodeBroadcast &mnb);

/// Get 10000 PIV input that can be used for the Masternode
/// Get 1000 HLM input that can be used for the Masternode
bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey, std::string strTxHash, std::string strOutputIndex);
bool GetVinFromOutput(COutput out, CTxIn& vin, CPubKey& pubkey, CKey& secretKey);

Expand Down Expand Up @@ -61,7 +61,7 @@ class CActiveMasternode
/// Create Masternode broadcast, needs to be relayed manually after that
bool CreateBroadcast(std::string strService, std::string strKey, std::string strTxHash, std::string strOutputIndex, std::string& errorMessage, CMasternodeBroadcast &mnb, bool fOffline = false);

/// Get 10000 PIV input that can be used for the Masternode
/// Get 1000 HLM input that can be used for the Masternode
bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey);
vector<COutput> SelectCoinsMasternode();

Expand Down
2,753 changes: 2,753 additions & 0 deletions src/bak/chainparams.cpp

Large diffs are not rendered by default.

0 comments on commit 5d446e2

Please sign in to comment.