Skip to content

Commit

Permalink
IOTEX-27 Let nodes panic if committing state changes fails & Add some…
Browse files Browse the repository at this point in the history 
… error logs in statefactory (#73)

* Let nodes panic if committing state changes fails

* Add some error log in statefactory

* Change error log to wrapped error in state factory
  • Loading branch information
@lizhefeng @zjshen14
lizhefeng authored and zjshen14 committed Sep 12, 2018
1 parent 9e60e64 commit 8e06627
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 32 deletions.
6 changes: 4 additions & 2 deletions blockchain/blockchain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,12 +696,14 @@ func (bc *blockchain) commitBlock(blk *Block) error {
if bc.sf != nil {
ExecuteContracts(blk, bc)
if err := bc.sf.CommitStateChanges(blk.Height(), blk.Transfers, blk.Votes, blk.Executions); err != nil {
return err
// TODO: Will fix the log level later, once committing a block and state changes becomes a transaction
logger.Fatal().Err(err).Msgf("Failed to commit state changes on height %d", blk.Height())
}
}
// write smart contract receipt into DB
if err := bc.dao.putReceipts(blk); err != nil {
return err
// TODO: Will fix the log level later, once committing a block and state changes becomes a transaction
logger.Fatal().Err(err).Msgf("Failed to put receipts on height %d", blk.Height())
}
logger.Info().Uint64("height", blk.Header.height).Msg("commit a block")
return nil
Expand Down
58 changes: 29 additions & 29 deletions state/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func (sf *factory) LoadOrCreateState(addr string, init uint64) (*State, error) {
}
sf.cachedAccount[addrHash] = state
case err != nil:
return nil, err
return nil, errors.Wrapf(err, "failed to get state of %x from cached state", addrHash)
}
return state, nil
}
Expand All @@ -207,7 +207,7 @@ func (sf *factory) Balance(addr string) (*big.Int, error) {
}
state, err := sf.getState(byteutil.BytesTo20B(pkHash))
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "failed to get state of %x", pkHash)
}
return state.Balance, nil
}
Expand All @@ -220,7 +220,7 @@ func (sf *factory) Nonce(addr string) (uint64, error) {
}
state, err := sf.getState(byteutil.BytesTo20B(pkHash))
if err != nil {
return 0, err
return 0, errors.Wrapf(err, "failed to get state of %x", pkHash)
}
return state.Nonce, nil
}
Expand Down Expand Up @@ -276,16 +276,16 @@ func (sf *factory) CommitStateChanges(blockHeight uint64, tsf []*action.Transfer

defer sf.clearCache()
if err := sf.handleTsf(tsf); err != nil {
return err
return errors.Wrap(err, "failed to handle transfers")
}
if err := sf.handleVote(blockHeight, vote); err != nil {
return err
return errors.Wrap(err, "failed to handle votes")
}

// update pending state changes to trie
for addr, state := range sf.cachedAccount {
if err := sf.putState(state, addr[:]); err != nil {
return err
return errors.Wrap(err, "failed to update pending state changes to trie")
}
// Perform vote update operation on candidate and delegate pools
if !state.IsCandidate {
Expand All @@ -306,26 +306,26 @@ func (sf *factory) CommitStateChanges(blockHeight uint64, tsf []*action.Transfer
// update pending contract changes
for addr, contract := range sf.cachedContract {
if err := contract.Commit(); err != nil {
return err
return errors.Wrap(err, "failed to update pending contract changes")
}
state := contract.SelfState()
// store the account (with new storage trie root) into state trie
if err := sf.putState(state, addr[:]); err != nil {
return err
return errors.Wrap(err, "failed to update pending contract state changes to trie")
}
}
// increase Executor's Nonce for every execution in this block
for _, e := range executions {
addr, _ := iotxaddress.GetPubkeyHash(e.Executor)
state, err := sf.cachedState(byteutil.BytesTo20B(addr))
if err != nil {
return errors.Wrap(err, "Executor does not exist")
return errors.Wrap(err, "executor does not exist")
}
if e.Nonce > state.Nonce {
state.Nonce = e.Nonce
}
if err := sf.putState(state, addr); err != nil {
return err
return errors.Wrap(err, "failed to update pending state changes to trie")
}
}
// commit to account Trie in a batch
Expand Down Expand Up @@ -369,7 +369,7 @@ func (sf *factory) GetCodeHash(addr hash.AddrHash) (hash.Hash32B, error) {
}
state, err := sf.cachedState(addr)
if err != nil {
return hash.ZeroHash32B, errors.Wrapf(err, "Failed to GetCodeHash for contract %x", addr)
return hash.ZeroHash32B, errors.Wrapf(err, "failed to GetCodeHash for contract %x", addr)
}
return byteutil.BytesTo32B(state.CodeHash), nil
}
Expand All @@ -381,7 +381,7 @@ func (sf *factory) GetCode(addr hash.AddrHash) ([]byte, error) {
}
state, err := sf.cachedState(addr)
if err != nil {
return nil, errors.Wrapf(err, "Failed to GetCode for contract %x", addr)
return nil, errors.Wrapf(err, "failed to GetCode for contract %x", addr)
}
return sf.accountTrie.TrieDB().Get(trie.CodeKVNameSpace, state.CodeHash[:])
}
Expand All @@ -394,7 +394,7 @@ func (sf *factory) SetCode(addr hash.AddrHash, code []byte) error {
}
contract, err := sf.getContract(addr)
if err != nil {
return errors.Wrapf(err, "Failed to SetCode for contract %x", addr)
return errors.Wrapf(err, "failed to SetCode for contract %x", addr)
}
contract.SetCode(byteutil.BytesTo32B(hash.Hash256b(code)), code)
return nil
Expand All @@ -408,7 +408,7 @@ func (sf *factory) GetContractState(addr hash.AddrHash, key hash.Hash32B) (hash.
}
contract, err := sf.getContract(addr)
if err != nil {
return hash.ZeroHash32B, errors.Wrapf(err, "Failed to GetContractState for contract %x", addr)
return hash.ZeroHash32B, errors.Wrapf(err, "failed to GetContractState for contract %x", addr)
}
v, err := contract.GetState(key)
return byteutil.BytesTo32B(v), err
Expand All @@ -421,7 +421,7 @@ func (sf *factory) SetContractState(addr hash.AddrHash, key, value hash.Hash32B)
}
contract, err := sf.getContract(addr)
if err != nil {
return errors.Wrapf(err, "Failed to SetContractState for contract %x", addr)
return errors.Wrapf(err, "failed to SetContractState for contract %x", addr)
}
return contract.SetState(key, value[:])
}
Expand Down Expand Up @@ -462,7 +462,7 @@ func (sf *factory) getState(hash hash.AddrHash) (*State, error) {
return nil, errors.Wrapf(ErrAccountNotExist, "addrHash = %x", hash[:])
}
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "failed to get state of %x", hash)
}
return bytesToState(mstate)
}
Expand All @@ -483,7 +483,7 @@ func (sf *factory) cachedState(hash hash.AddrHash) (*State, error) {
func (sf *factory) putState(state *State, addr []byte) error {
ss, err := stateToBytes(state)
if err != nil {
return err
return errors.Wrapf(err, "failed to convert state %v to bytes", state)
}
if err := sf.accountTrie.Upsert(addr, ss); err != nil {
return err
Expand All @@ -494,7 +494,7 @@ func (sf *factory) putState(state *State, addr []byte) error {
func (sf *factory) getContract(addr hash.AddrHash) (Contract, error) {
state, err := sf.cachedState(addr)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "failed to get the cached state of %x", addr)
}
logger.Warn().Msgf("promote contract %x", addr)
delete(sf.cachedAccount, addr)
Expand All @@ -503,7 +503,7 @@ func (sf *factory) getContract(addr hash.AddrHash) (Contract, error) {
}
tr, err := trie.NewTrie(sf.accountTrie.TrieDB(), trie.ContractKVNameSpace, state.Root)
if err != nil {
return nil, errors.Wrapf(err, "Failed to create storage trie for new contract %x", addr)
return nil, errors.Wrapf(err, "failed to create storage trie for new contract %x", addr)
}
// add to contract cache
contract := newContract(state, tr)
Expand Down Expand Up @@ -549,14 +549,14 @@ func (sf *factory) handleTsf(tsf []*action.Transfer) error {
// check sender
sender, err := sf.LoadOrCreateState(tx.Sender, 0)
if err != nil {
return err
return errors.Wrapf(err, "failed to load or create the state of sender %s", tx.Sender)
}
if tx.Amount.Cmp(sender.Balance) == 1 {
return ErrNotEnoughBalance
return errors.Wrapf(ErrNotEnoughBalance, "failed to verify the balance of sender %s", tx.Sender)
}
// update sender balance
if err := sender.SubBalance(tx.Amount); err != nil {
return err
return errors.Wrapf(err, "failed to update the balance of sender %s", tx.Sender)
}
// update sender nonce
if tx.Nonce > sender.Nonce {
Expand All @@ -567,26 +567,26 @@ func (sf *factory) handleTsf(tsf []*action.Transfer) error {
// sender already voted to a different person
voteeOfSender, err := sf.LoadOrCreateState(sender.Votee, 0)
if err != nil {
return err
return errors.Wrapf(err, "failed to load or create the state of sender's votee %s", sender.Votee)
}
voteeOfSender.VotingWeight.Sub(voteeOfSender.VotingWeight, tx.Amount)
}
}
// check recipient
recipient, err := sf.LoadOrCreateState(tx.Recipient, 0)
if err != nil {
return err
return errors.Wrapf(err, "failed to laod or create the state of recipient %s", tx.Recipient)
}
// update recipient balance
if err := recipient.AddBalance(tx.Amount); err != nil {
return err
return errors.Wrapf(err, "failed to update the balance of recipient %s", tx.Recipient)
}
// Update recipient votes
if len(recipient.Votee) > 0 && recipient.Votee != tx.Recipient {
// recipient already voted to a different person
voteeOfRecipient, err := sf.LoadOrCreateState(recipient.Votee, 0)
if err != nil {
return err
return errors.Wrapf(err, "failed to load or create the state of recipient's votee %s", recipient.Votee)
}
voteeOfRecipient.VotingWeight.Add(voteeOfRecipient.VotingWeight, tx.Amount)
}
Expand All @@ -600,7 +600,7 @@ func (sf *factory) handleVote(blockHeight uint64, vote []*action.Vote) error {
voterAddress := pbVote.VoterAddress
voteFrom, err := sf.LoadOrCreateState(voterAddress, 0)
if err != nil {
return err
return errors.Wrapf(err, "failed to load or create the state of voter %s", voterAddress)
}

// update voteFrom nonce
Expand All @@ -612,7 +612,7 @@ func (sf *factory) handleVote(blockHeight uint64, vote []*action.Vote) error {
// voter already voted
oldVotee, err := sf.LoadOrCreateState(voteFrom.Votee, 0)
if err != nil {
return err
return errors.Wrapf(err, "failed to load or create the state of voter's old votee %s", voteFrom.Votee)
}
oldVotee.VotingWeight.Sub(oldVotee.VotingWeight, voteFrom.Balance)
voteFrom.Votee = ""
Expand All @@ -627,7 +627,7 @@ func (sf *factory) handleVote(blockHeight uint64, vote []*action.Vote) error {

voteTo, err := sf.LoadOrCreateState(voteeAddress, 0)
if err != nil {
return err
return errors.Wrapf(err, "failed to load or create the state of votee %s", voteeAddress)
}

if voterAddress != voteeAddress {
Expand Down
3 changes: 2 additions & 1 deletion state/factory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"testing"

"github.com/golang/mock/gomock"
"github.com/pkg/errors"
"github.com/stretchr/testify/require"

"github.com/iotexproject/iotex-core/blockchain/action"
Expand Down Expand Up @@ -116,7 +117,7 @@ func TestNonce(t *testing.T) {

accountTrie.EXPECT().Get(gomock.Any()).Times(1).Return(nil, nil)
_, err = sf.Nonce(addr.RawAddress)
require.Equal(ErrFailedToUnmarshalState, err)
require.Equal(ErrFailedToUnmarshalState, errors.Cause(err))
}

func voteForm(height uint64, cs []*Candidate) []string {
Expand Down

0 comments on commit 8e06627

Please sign in to comment.