fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-28 04:01:40 +00:00
Code Issues Projects Releases Wiki Activity

some panics, dont panic on invalid opcode

Browse Source
This commit is contained in:
Ethan Buchman
2015-06-26 01:36:31 +00:00
committed by Jae Kwon
parent 415c12fca5
commit 8d6f80592b
4 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
state/execution.go
View File

@ -293,15 +293,6 @@ func adjustByOutputs(accounts map[string]*account.Account, outs []*types.TxOutpu
// If the tx is invalid, an error will be returned.
// Unlike ExecBlock(), state will not be altered.
func ExecTx(blockCache *BlockCache, tx_ types.Tx, runCall bool, evc events.Fireable) error {
defer func() {
if r := recover(); r != nil {
err := errors.New(Fmt("Recovered from panic in ExecTx", "err", r, "tx", tx_))
log.Error(err.Error())
// TODO return error
}
}()
// TODO: do something with fees
fees := int64(0)
_s := blockCache.State() // hack to access validators and block height
@ -822,6 +813,10 @@ func ExecTx(blockCache *BlockCache, tx_ types.Tx, runCall bool, evc events.Firea
// Get permission on an account or fall back to global value
func HasPermission(state AccountGetter, acc *account.Account, perm ptypes.PermFlag) bool {
if perm > ptypes.AllBasePermissions {
panic("Checking an unknown permission in state should never happen")
}
if acc == nil {
// TODO
// this needs to fall back to global or do some other specific things
@ -830,7 +825,10 @@ func HasPermission(state AccountGetter, acc *account.Account, perm ptypes.PermFl
v, err := acc.Permissions.Base.Get(perm)
if _, ok := err.(ptypes.ErrValueNotSet); ok {
return HasPermission(state, state.GetAccount(ptypes.GlobalPermissionsAddress), perm)
if state == nil {
panic("All known global permissions should be set!")
}
return HasPermission(nil, state.GetAccount(ptypes.GlobalPermissionsAddress), perm)
}
return v
}