fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-30 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

cleanups, fix AllSet

Browse Source
This commit is contained in:
Ethan Buchman 2015-05-21 15:51:57 -04:00 committed by Jae Kwon
parent b2282d5a39
commit d824e1b731
4 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
permission/types/permissions.go
View File

@ -30,7 +30,7 @@ const (
NumBasePermissions uint = 6 NumBasePermissions uint = 6
TopBasePermission PermFlag = 1 << (NumBasePermissions - 1) TopBasePermission PermFlag = 1 << (NumBasePermissions - 1)
AllSet PermFlag = 1<<NumBasePermissions - 1 AllSet PermFlag = (1 << 63) - 1 + (1 << 63)
) )
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
@ -52,6 +52,9 @@ func NewBasePermissions() *BasePermissions {
// ErrValueNotSet is returned if the permission's set bit is off, // ErrValueNotSet is returned if the permission's set bit is off,
// and should be caught by caller so the global permission can be fetched // and should be caught by caller so the global permission can be fetched
func (p *BasePermissions) Get(ty PermFlag) (bool, error) { func (p *BasePermissions) Get(ty PermFlag) (bool, error) {
if ty == 0 {
return false, ErrInvalidPermission(ty)
}
if p.SetBit&ty == 0 { if p.SetBit&ty == 0 {
return false, ErrValueNotSet(ty) return false, ErrValueNotSet(ty)
} }

2
state/genesis.go
View File

@ -93,8 +93,10 @@ func MakeGenesisState(db dbm.DB, genDoc *GenesisDoc) *State {
if genDoc.Params != nil && genDoc.Params.GlobalPermissions != nil { if genDoc.Params != nil && genDoc.Params.GlobalPermissions != nil {
globalPerms = genDoc.Params.GlobalPermissions globalPerms = genDoc.Params.GlobalPermissions
// XXX: make sure the set bits are all true // XXX: make sure the set bits are all true
// Without it the HasPermission() functions will recurse till death
globalPerms.Base.SetBit = ptypes.AllSet globalPerms.Base.SetBit = ptypes.AllSet
} }
permsAcc := &account.Account{ permsAcc := &account.Account{
Address: ptypes.GlobalPermissionsAddress, Address: ptypes.GlobalPermissionsAddress,
PubKey: nil, PubKey: nil,

40
vm/snative.go
View File

@ -7,6 +7,15 @@ import (
ptypes "github.com/tendermint/tendermint/permission/types" ptypes "github.com/tendermint/tendermint/permission/types"
) )
type ErrInvalidPermission struct {
Address Word256
SNative string
}
func (e ErrInvalidPermission) Error() string {
return fmt.Sprintf("Account %X does not have permission snative.%s", e.Address.Postfix(20), e.SNative)
}
// Checks if a permission flag is valid (a known base chain or snative permission) // Checks if a permission flag is valid (a known base chain or snative permission)
func ValidPermN(n ptypes.PermFlag) bool { func ValidPermN(n ptypes.PermFlag) bool {
if n > ptypes.TopBasePermission && n < FirstSNativePerm { if n > ptypes.TopBasePermission && n < FirstSNativePerm {
@ -37,13 +46,13 @@ const (
) )
var registeredSNativeContracts = map[Word256]ptypes.PermFlag{ var registeredSNativeContracts = map[Word256]ptypes.PermFlag{
RightPadWord256([]byte("hasBasePerm")): HasBasePerm, LeftPadWord256([]byte("hasBasePerm")): HasBasePerm,
RightPadWord256([]byte("setBasePerm")): SetBasePerm, LeftPadWord256([]byte("setBasePerm")): SetBasePerm,
RightPadWord256([]byte("unsetBasePerm")): UnsetBasePerm, LeftPadWord256([]byte("unsetBasePerm")): UnsetBasePerm,
RightPadWord256([]byte("setGlobalPerm")): SetGlobalPerm, LeftPadWord256([]byte("setGlobalPerm")): SetGlobalPerm,
RightPadWord256([]byte("hasRole")): HasRole, LeftPadWord256([]byte("hasRole")): HasRole,
RightPadWord256([]byte("addRole")): AddRole, LeftPadWord256([]byte("addRole")): AddRole,
RightPadWord256([]byte("rmRole")): RmRole, LeftPadWord256([]byte("rmRole")): RmRole,
} }
// takes an account so it can check for permission to access the contract // takes an account so it can check for permission to access the contract
@ -80,7 +89,7 @@ func (vm *VM) SNativeContract(name Word256) SNativeContract {
func (vm *VM) hasBasePerm(acc *Account, args []byte) (output []byte, err error) { func (vm *VM) hasBasePerm(acc *Account, args []byte) (output []byte, err error) {
if !vm.HasPermission(acc, HasBasePerm) { if !vm.HasPermission(acc, HasBasePerm) {
return nil, fmt.Errorf("acc %X does not have permission to call snative.HasBasePerm") return nil, ErrInvalidPermission{acc.Address, "HasBasePerm"}
} }
if len(args) != 2*32 { if len(args) != 2*32 {
return nil, fmt.Errorf("hasBasePerm() takes two arguments (address, permission number)") return nil, fmt.Errorf("hasBasePerm() takes two arguments (address, permission number)")
@ -107,7 +116,7 @@ func (vm *VM) hasBasePerm(acc *Account, args []byte) (output []byte, err error)
func (vm *VM) setBasePerm(acc *Account, args []byte) (output []byte, err error) { func (vm *VM) setBasePerm(acc *Account, args []byte) (output []byte, err error) {
if !vm.HasPermission(acc, SetBasePerm) { if !vm.HasPermission(acc, SetBasePerm) {
return nil, fmt.Errorf("acc %X does not have permission to call snative.SetBasePerm") return nil, ErrInvalidPermission{acc.Address, "SetBasePerm"}
} }
if len(args) != 3*32 { if len(args) != 3*32 {
return nil, fmt.Errorf("setBasePerm() takes three arguments (address, permission number, permission value)") return nil, fmt.Errorf("setBasePerm() takes three arguments (address, permission number, permission value)")
@ -134,7 +143,7 @@ func (vm *VM) setBasePerm(acc *Account, args []byte) (output []byte, err error)
func (vm *VM) unsetBasePerm(acc *Account, args []byte) (output []byte, err error) { func (vm *VM) unsetBasePerm(acc *Account, args []byte) (output []byte, err error) {
if !vm.HasPermission(acc, UnsetBasePerm) { if !vm.HasPermission(acc, UnsetBasePerm) {
return nil, fmt.Errorf("acc %X does not have permission to call snative.UnsetBasePerm") return nil, ErrInvalidPermission{acc.Address, "UnsetBasePerm"}
} }
if len(args) != 2*32 { if len(args) != 2*32 {
return nil, fmt.Errorf("unsetBasePerm() takes two arguments (address, permission number)") return nil, fmt.Errorf("unsetBasePerm() takes two arguments (address, permission number)")
@ -158,6 +167,9 @@ func (vm *VM) unsetBasePerm(acc *Account, args []byte) (output []byte, err error
} }
func (vm *VM) setGlobalPerm(acc *Account, args []byte) (output []byte, err error) { func (vm *VM) setGlobalPerm(acc *Account, args []byte) (output []byte, err error) {
if !vm.HasPermission(acc, SetGlobalPerm) {
return nil, ErrInvalidPermission{acc.Address, "SetGlobalPerm"}
}
if len(args) != 2*32 { if len(args) != 2*32 {
return nil, fmt.Errorf("setGlobalPerm() takes three arguments (permission number, permission value)") return nil, fmt.Errorf("setGlobalPerm() takes three arguments (permission number, permission value)")
} }
@ -183,14 +195,14 @@ func (vm *VM) setGlobalPerm(acc *Account, args []byte) (output []byte, err error
// TODO: needs access to an iterator ... // TODO: needs access to an iterator ...
func (vm *VM) clearPerm(acc *Account, args []byte) (output []byte, err error) { func (vm *VM) clearPerm(acc *Account, args []byte) (output []byte, err error) {
if !vm.HasPermission(acc, ClearBasePerm) { if !vm.HasPermission(acc, ClearBasePerm) {
return nil, fmt.Errorf("acc %X does not have permission to call snative.ClearBasePerm") return nil, ErrInvalidPermission{acc.Address, "ClearPerm"}
} }
return nil, nil return nil, nil
} }
func (vm *VM) hasRole(acc *Account, args []byte) (output []byte, err error) { func (vm *VM) hasRole(acc *Account, args []byte) (output []byte, err error) {
if !vm.HasPermission(acc, HasRole) { if !vm.HasPermission(acc, HasRole) {
return nil, fmt.Errorf("acc %X does not have permission to call snative.HasRole") return nil, ErrInvalidPermission{acc.Address, "HasRole"}
} }
if len(args) != 2*32 { if len(args) != 2*32 {
return nil, fmt.Errorf("hasRole() takes two arguments (address, role)") return nil, fmt.Errorf("hasRole() takes two arguments (address, role)")
@ -214,7 +226,7 @@ func (vm *VM) hasRole(acc *Account, args []byte) (output []byte, err error) {
func (vm *VM) addRole(acc *Account, args []byte) (output []byte, err error) { func (vm *VM) addRole(acc *Account, args []byte) (output []byte, err error) {
if !vm.HasPermission(acc, AddRole) { if !vm.HasPermission(acc, AddRole) {
return nil, fmt.Errorf("acc %X does not have permission to call snative.AddRole") return nil, ErrInvalidPermission{acc.Address, "AddRole"}
} }
if len(args) != 2*32 { if len(args) != 2*32 {
return nil, fmt.Errorf("addRole() takes two arguments (address, role)") return nil, fmt.Errorf("addRole() takes two arguments (address, role)")
@ -238,7 +250,7 @@ func (vm *VM) addRole(acc *Account, args []byte) (output []byte, err error) {
func (vm *VM) rmRole(acc *Account, args []byte) (output []byte, err error) { func (vm *VM) rmRole(acc *Account, args []byte) (output []byte, err error) {
if !vm.HasPermission(acc, RmRole) { if !vm.HasPermission(acc, RmRole) {
return nil, fmt.Errorf("acc %X does not have permission to call snative.RmRole") return nil, ErrInvalidPermission{acc.Address, "RmRole"}
} }
if len(args) != 2*32 { if len(args) != 2*32 {
return nil, fmt.Errorf("rmRole() takes two arguments (address, role)") return nil, fmt.Errorf("rmRole() takes two arguments (address, role)")

2
vm/vm.go
View File

@ -782,7 +782,7 @@ func (vm *VM) call(caller, callee *Account, code, input []byte, value int64, gas
// Push result // Push result
if err != nil { if err != nil {
dbg.Printf("error on call: %s", err.Error()) dbg.Printf("error on call: %s\n", err.Error())
stack.Push(Zero256) stack.Push(Zero256)
} else { } else {
stack.Push(One256) stack.Push(One256)