Build transaction context in BlockRes

This commit is contained in:
Taylor Gerring 2015-04-01 13:18:51 +02:00
parent 88f2a96ca3
commit dbf17105f6

View File

@ -55,11 +55,20 @@ func NewBlockRes(block *types.Block, fullTx bool) *BlockRes {
// res.MinGasPrice = // res.MinGasPrice =
res.GasUsed = newHexNum(block.GasUsed()) res.GasUsed = newHexNum(block.GasUsed())
res.UnixTimestamp = newHexNum(block.Time()) res.UnixTimestamp = newHexNum(block.Time())
res.Transactions = NewTransactionsRes(block.Transactions())
res.Transactions = make([]*TransactionRes, len(block.Transactions()))
for i, tx := range block.Transactions() {
res.Transactions[i] = NewTransactionRes(tx)
res.Transactions[i].BlockHash = res.BlockHash
res.Transactions[i].BlockNumber = res.BlockNumber
res.Transactions[i].TxIndex = newHexNum(i)
}
res.Uncles = make([]*hexdata, len(block.Uncles())) res.Uncles = make([]*hexdata, len(block.Uncles()))
for i, uncle := range block.Uncles() { for i, uncle := range block.Uncles() {
res.Uncles[i] = newHexData(uncle.Hash()) res.Uncles[i] = newHexData(uncle.Hash())
} }
return res return res
} }
@ -94,14 +103,6 @@ func NewTransactionRes(tx *types.Transaction) *TransactionRes {
return v return v
} }
func NewTransactionsRes(txs []*types.Transaction) []*TransactionRes {
v := make([]*TransactionRes, len(txs))
for i, tx := range txs {
v[i] = NewTransactionRes(tx)
}
return v
}
// type FilterLogRes struct { // type FilterLogRes struct {
// Hash string `json:"hash"` // Hash string `json:"hash"`
// Address string `json:"address"` // Address string `json:"address"`