Merge e47298f into 8aa28e0

aragon · Aug 9, 2019 · ce934af · ce934af
2 parents 8aa28e0 + e47298f
commit ce934af
Show file tree

Hide file tree

Showing 4 changed files with 1,061 additions and 418 deletions.
diff --git a/apps/agent/arapp.json b/apps/agent/arapp.json
@@ -6,6 +6,11 @@
       "appName": "agent.aragonpm.eth",
       "network": "rpc"
     },
+    "mainnet": {
+      "registry": "0x314159265dd8dbb310642f98f50c066173c1259b",
+      "appName": "agent.aragonpm.eth",
+      "network": "mainnet"
+    },
     "rinkeby": {
       "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
       "appName": "agent.aragonpm.eth",
@@ -16,23 +21,22 @@
       "appName": "agent.aragonpm.eth",
       "network": "rinkeby"
     },
-    "mainnet": {
-      "registry": "0x314159265dd8dbb310642f98f50c066173c1259b",
-      "appName": "agent.aragonpm.eth",
-      "network": "mainnet"
-    },
     "ropsten": {
       "registry": "0x6afe2cacee211ea9179992f89dc61ff25c61e923",
       "appName": "agent.aragonpm.eth",
       "network": "ropsten"
-    },
-    "rinkeby-old": {
-      "registry": "0xfbae32d1cde62858bc45f51efc8cc4fa1415447e",
-      "appName": "agent.aragonpm.eth",
-      "network": "rinkeby"
     }
   },
   "roles": [
+    {
+      "name": "Transfer Agent's tokens",
+      "id": "TRANSFER_ROLE",
+      "params": [
+        "Token address",
+        "Receiver address",
+        "Token amount"
+      ]
+    },
     {
       "name": "Execute actions",
       "id": "EXECUTE_ROLE",
@@ -43,19 +47,41 @@
       ]
     },
     {
-      "name": "Designate signer",
-      "id": "DESIGNATE_SIGNER_ROLE",
+      "name": "Execute safe actions",
+      "id": "SAFE_EXECUTE_ROLE",
       "params": [
-        "Designated signer address"
+        "Target address",
+        "Signature"
       ]
     },
     {
-      "name": "Presign hash",
+      "name": "Add protected tokens",
+      "id": "ADD_PROTECTED_TOKEN_ROLE",
+      "params": [
+        "Token"
+      ]
+    },
+    {
+      "name": "Remove protected tokens",
+      "id": "REMOVE_PROTECTED_TOKEN_ROLE",
+      "params": [
+        "Token"
+      ]
+    },
+    {
+      "name": "Add presigned hashes",
       "id": "ADD_PRESIGNED_HASH_ROLE",
       "params": [
         "Hash"
       ]
     },
+    {
+      "name": "Set designated signer",
+      "id": "DESIGNATE_SIGNER_ROLE",
+      "params": [
+        "Designated signer address"
+      ]
+    },
     {
       "name": "Run EVM Script",
       "id": "RUN_SCRIPT_ROLE",
@@ -65,4 +91,4 @@
     }
   ],
   "path": "contracts/Agent.sol"
-}
+}