Browse Source

blockNumber is optional for LocalisedTransaction

cl-refactor
Marek Kotewicz 10 years ago
parent
commit
c6371bec49
  1. 2
      libethereum/ClientBase.cpp
  2. 12
      libethereum/Transaction.h

2
libethereum/ClientBase.cpp

@ -336,7 +336,7 @@ Transaction ClientBase::transaction(h256 _blockHash, unsigned _i) const
LocalisedTransaction ClientBase::localisedTransaction(h256 const& _blockHash, unsigned _i) const
{
Transaction t = Transaction(bc().transaction(_blockHash, _i), CheckTransaction::Cheap);
return LocalisedTransaction(t, _blockHash, numberFromHash(_blockHash), _i);
return LocalisedTransaction(t, _blockHash, _i, numberFromHash(_blockHash));
}
TransactionReceipt ClientBase::transactionReceipt(h256 const& _transactionHash) const

12
libethereum/Transaction.h

@ -136,23 +136,23 @@ public:
LocalisedTransaction(
Transaction const& _t,
h256 const& _blockHash,
BlockNumber _blockNumber,
unsigned _transactionIndex
unsigned _transactionIndex,
BlockNumber _blockNumber = 0
):
Transaction(_t),
m_blockHash(_blockHash),
m_blockNumber(_blockNumber),
m_transactionIndex(_transactionIndex)
m_transactionIndex(_transactionIndex),
m_blockNumber(_blockNumber)
{}
h256 const& blockHash() const { return m_blockHash; }
BlockNumber blockNumber() const { return m_blockNumber; }
unsigned transactionIndex() const { return m_transactionIndex; }
BlockNumber blockNumber() const { return m_blockNumber; }
private:
h256 m_blockHash;
BlockNumber m_blockNumber;
unsigned m_transactionIndex;
BlockNumber m_blockNumber;
};
}

Loading…
Cancel
Save