diff options
Diffstat (limited to 'src/main.h')
-rw-r--r-- | src/main.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/main.h b/src/main.h index 099e436d9e..c3c7ee3966 100644 --- a/src/main.h +++ b/src/main.h @@ -253,20 +253,6 @@ struct CDiskTxPos : public CDiskBlockPos }; -/** An inpoint - a combination of a transaction and an index n into its vin */ -class CInPoint -{ -public: - CTransaction* ptx; - unsigned int n; - - CInPoint() { SetNull(); } - CInPoint(CTransaction* ptxIn, unsigned int nIn) { ptx = ptxIn; n = nIn; } - void SetNull() { ptx = NULL; n = (unsigned int) -1; } - bool IsNull() const { return (ptx == NULL && n == (unsigned int) -1); } -}; - - /** An input of a transaction. It contains the location of the previous @@ -424,6 +410,8 @@ enum GetMinFee_mode GMF_SEND, }; +int64 GetMinFee(const CTransaction& tx, unsigned int nBlockSize = 1, bool fAllowFree = true, enum GetMinFee_mode mode = GMF_BLOCK); + /** The basic transaction that is broadcasted on the network and contained in * blocks. A transaction can contain multiple inputs and outputs. */ @@ -575,8 +563,6 @@ public: return dPriority > COIN * 144 / 250; } - int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, enum GetMinFee_mode mode=GMF_BLOCK) const; - friend bool operator==(const CTransaction& a, const CTransaction& b) { return (a.nVersion == b.nVersion && |