diff --git a/eth/core/state_processor.go b/eth/core/state_processor.go index f4f75ac..4fbf407 100644 --- a/eth/core/state_processor.go +++ b/eth/core/state_processor.go @@ -88,7 +88,6 @@ func ApplyTransaction(config *params.ChainConfig, bc ChainContext, author *commo // Edit by zhongan txBytes, _ := rlp.EncodeToBytes(tx) receipt.TxHash = common.BytesToHash(gtypes.Tx(txBytes).Hash()) - // receipt.Result = res receipt.GasUsed = gas // if the transaction created a contract, store the creation address in the receipt. if msg.To() == nil { @@ -96,7 +95,6 @@ func ApplyTransaction(config *params.ChainConfig, bc ChainContext, author *commo } // Set the receipt logs and create a bloom for filtering // Edit by zhongan - // receipt.From = msg.From() receipt.Logs = statedb.GetLogs(receipt.TxHash) receipt.Bloom = types.CreateBloom(types.Receipts{receipt}) diff --git a/eth/core/types/receipt.go b/eth/core/types/receipt.go index 210fa94..3aaf2bc 100644 --- a/eth/core/types/receipt.go +++ b/eth/core/types/receipt.go @@ -20,7 +20,7 @@ import ( "bytes" "fmt" "io" - "time" + // "time" "unsafe" "github.com/dappledger/AnnChain/eth/common" @@ -60,13 +60,6 @@ type Receipt struct { TxHash common.Hash `json:"transactionHash" gencodec:"required"` ContractAddress common.Address `json:"contractAddress"` GasUsed uint64 `json:"gasUsed" gencodec:"required"` - - TxIndex uint64 `json:"transactionIndex" gencodec:"required"` - Height uint64 `json:"height"` - BlockHashHex string `json:"blockHash"` - From common.Address `json:"from"` - To common.Address `json:"to"` - Timestamp time.Time `json:"timestamp"` } type receiptMarshaling struct {