Skip to content

Commit

Permalink
Merge pull request ethereum#402 from ngtuna/missing-trie-node
Browse files Browse the repository at this point in the history
Fix missing trie node
  • Loading branch information
ngtuna authored Jan 13, 2019
2 parents 702a8ed + 914ea28 commit e9c7d49
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion contracts/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func GetSignersFromContract(state *state.StateDB, block *types.Block) ([]common.
}

// Get signers signed for blockNumber from blockSigner contract.
func GetSignersFromContract1(addrBlockSigner common.Address, client bind.ContractBackend, blockHash common.Hash) ([]common.Address, error) {
func GetSignersByExecutingEVM(addrBlockSigner common.Address, client bind.ContractBackend, blockHash common.Hash) ([]common.Address, error) {
blockSigner, err := contract.NewBlockSigner(addrBlockSigner, client)
if err != nil {
log.Error("Fail get instance of blockSigner", "error", err)
Expand Down
14 changes: 8 additions & 6 deletions internal/ethapi/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -855,17 +855,19 @@ func (s *PublicBlockChainAPI) rpcOutputBlock(b *types.Block, inclTx bool, fullTx
}
fields["uncles"] = uncleHashes

// Get signers for block.
client, err := s.b.GetIPCClient()
if err != nil {
log.Error("Fail to connect IPC client for block status", "error", err)
}

var signers []common.Address
var filterSigners []common.Address
finality := int32(0)
if b.Number().Int64() > 0 {
engine := s.b.GetEngine()
blockNr := rpc.BlockNumber(b.Number().Int64())
state, _, err := s.b.StateAndHeaderByNumber(ctx, blockNr)
if state == nil || err != nil {
return nil, err
}
signers, err = contracts.GetSignersFromContract(state, b)
addrBlockSigner := common.HexToAddress(common.BlockSigners)
signers, err = contracts.GetSignersByExecutingEVM(addrBlockSigner, client, b.Hash())
if err != nil {
log.Error("Fail to get signers from block signer SC.", "error", err)
}
Expand Down

0 comments on commit e9c7d49

Please sign in to comment.