diff options
| author | Mark Friedenbach <mark@friedenbach.org> | 2014-04-22 15:46:19 -0700 |
|---|---|---|
| committer | Mark Friedenbach <mark@blockstream.io> | 2014-09-26 15:42:04 -0700 |
| commit | a372168e77a8a195613a02983f2589252698bf0f (patch) | |
| tree | b300a5f7aa007645c6ba2bd708e7a962fab2894b /src/main.h | |
| parent | 64cfaf891fe539b36f6be37dac6c28a712d70b96 (diff) | |
| download | bitcoin-a372168e77a8a195613a02983f2589252698bf0f.tar.xz | |
Use a typedef for monetary values
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index 5acc551793..93915db519 100644 --- a/src/main.h +++ b/src/main.h @@ -172,7 +172,7 @@ std::string GetWarnings(std::string strFor); bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock, bool fAllowSlow = false); /** Find the best known block, and make it the tip of the block chain */ bool ActivateBestChain(CValidationState &state, CBlock *pblock = NULL); -int64_t GetBlockValue(int nHeight, int64_t nFees); +CAmount GetBlockValue(int nHeight, const CAmount& nFees); /** Create a new block index entry for a given block hash */ CBlockIndex * InsertBlockIndex(uint256 hash); @@ -260,7 +260,7 @@ struct CDiskTxPos : public CDiskBlockPos }; -int64_t GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree); +CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree); // // Check transaction inputs, and make sure any @@ -970,7 +970,7 @@ extern CBlockTreeDB *pblocktree; struct CBlockTemplate { CBlock block; - std::vector<int64_t> vTxFees; + std::vector<CAmount> vTxFees; std::vector<int64_t> vTxSigOps; }; |