forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updates for dustin

Browse source
This commit is contained in:
greg 2018-06-11 10:56:46 -04:00 committed by Dustin Brickwood
parent 80698f7bc6
commit 62cfec3787
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/blockchain.go
View file

@ -901,7 +901,8 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
if err := WriteBlock(batch, block); err != nil { if err := WriteBlock(batch, block); err != nil {
return NonStatTy, err return NonStatTy, err
} }
// @NOTE:SHYFT - Write block data for block explorer // NOTE:SHYFT - Write block data for block explorer
fmt.Printf("\n\t[BLOCKCHAIN.GO bc.chainConfig] %+v", bc.chainConfig)
if err := shyftdb.WriteBlock(block, receipts); err != nil { if err := shyftdb.WriteBlock(block, receipts); err != nil {
return NonStatTy, err return NonStatTy, err
} }

8
eth/api_tracer.go
View file

@ -532,11 +532,9 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (*
// TraceTransaction returns the structured logs created during the execution of EVM // TraceTransaction returns the structured logs created during the execution of EVM
// and returns them as a JSON object. // and returns them as a JSON object.
func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) {
fmt.Println("\n\n\t[API LOG]", api, "\n") // NOTE:SHYFT
fmt.Printf("%+v\n", api.config) fmt.Printf("\n\t[API_TRACER.GO api.config] %+v", api.config)
fmt.Println("\n") fmt.Printf("\n\t[API_TRACER.GO api.eth] %+v\n", api.eth)
fmt.Printf("%+v\n", api.eth)
fmt.Println("\n")
// Retrieve the transaction and assemble its EVM context // Retrieve the transaction and assemble its EVM context
tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash)
if tx == nil { if tx == nil {

4
miner/worker.go
View file

@ -309,7 +309,9 @@ func (self *worker) wait() {
for _, log := range work.state.Logs() { for _, log := range work.state.Logs() {
log.BlockHash = block.Hash() log.BlockHash = block.Hash()
} }
stat, err := self.chain.WriteBlockWithState(block, work.receipts, work.state) fmt.Printf("\n\t[WORKER.GO self.eth] %+v\n", self.eth)
// NOTE:SHYFT Added eth to writeBlockWithState
stat, err := self.chain.WriteBlockWithState(block, work.receipts, work.state, self.eth)
if err != nil { if err != nil {
log.Error("Failed writing block to chain", "err", err) log.Error("Failed writing block to chain", "err", err)
continue continue