From 62471b5a411881c9e9d16707f25f2cd03c35c1a9 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Thu, 9 Jun 2016 23:08:19 +0200
Subject: [PATCH] @compleatang changes fix to permissions -> evm connection;
applied to discuss-eris-gateway branch
https://github.com/eris-ltd/eris-db/commit/4769e410880a6daa7a6d2b5d1d7d3c86137223f2
Signed-off-by: Benjamin Bollen <ben@erisindustries.com>
---
manager/eris-mint/evm/snative.go | 6 +++---
permission/types/permissions.go | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/manager/eris-mint/evm/snative.go b/manager/eris-mint/evm/snative.go
index c7e11a6e..60c98b38 100644
--- a/manager/eris-mint/evm/snative.go
+++ b/manager/eris-mint/evm/snative.go
@@ -53,13 +53,13 @@ contract Permissions {
// function identifiers from the solidity abi
var PermsMap = map[string]SNativeFuncDescription{
- "054556ac": SNativeFuncDescription{"has_role", 2, ptypes.HasRole, has_role},
+ "e8145855": SNativeFuncDescription{"has_role", 2, ptypes.HasRole, has_role},
"180d26f2": SNativeFuncDescription{"unset_base", 2, ptypes.UnsetBase, unset_base},
"3a3fcc59": SNativeFuncDescription{"set_global", 2, ptypes.SetGlobal, set_global},
- "9a1c4141": SNativeFuncDescription{"add_role", 2, ptypes.AddRole, add_role},
+ "3fbf7da5": SNativeFuncDescription{"add_role", 2, ptypes.AddRole, add_role},
"9ea53314": SNativeFuncDescription{"set_base", 3, ptypes.SetBase, set_base},
"bb37737a": SNativeFuncDescription{"has_base", 2, ptypes.HasBase, has_base},
- "ded3350a": SNativeFuncDescription{"rm_role", 2, ptypes.RmRole, rm_role},
+ "28fd0194": SNativeFuncDescription{"rm_role", 2, ptypes.RmRole, rm_role},
}
func permissionsContract(appState AppState, caller *Account, args []byte, gas *int64) (output []byte, err error) {
diff --git a/permission/types/permissions.go b/permission/types/permissions.go
index 3c43ed17..d6700b3d 100644
--- a/permission/types/permissions.go
+++ b/permission/types/permissions.go
@@ -135,7 +135,7 @@ func (aP *AccountPermissions) HasRole(role string) bool {
// Returns true if the role is added, and false if it already exists
func (aP *AccountPermissions) AddRole(role string) bool {
- role = string(LeftPadBytes([]byte(role), 32))
+ role = string(RightPadBytes([]byte(role), 32))
for _, r := range aP.Roles {
if r == role {
return false
--
GitLab