Merge pull request #5 from eosdac/v0.4.3_rc1

V0.4.3 rc1
eosdac · Jun 20, 2019 · fc5c71b · fc5c71b
2 parents 56703d4 + 773293d
commit fc5c71b
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 110 deletions.
diff --git a/statics/config/config.jungle.json b/statics/config/config.jungle.json
@@ -1,6 +1,16 @@
 {
     "dacName": "eosDAC",
     "dacScope": "eos.dac",
+
+    "accounts":{
+        "treasuryAccount":{
+            "name": "eosdacdoshhq"
+        },
+        "authAccount": {
+            "name": "dacauthority"
+        }
+    },
+
     "contracts": {
         "token": {
             "name": "kasdactokens",
@@ -36,44 +46,35 @@
 
     },
 
-    "bpAccount": {
-        "name": "eosdacserval"
-    },
-    "treasuryAccount":{
-        "name": "eosdacdoshhq"
-    },
-
-    "authAccount": {
-        "name": "dacauthority",
-        "controlling": [
-            {
-                "name":"eosdacdoshhq", 
-                "linkedAuths": [
-                    {"contract": "eosio.token", "action": "transfer", "permission": "xfer", "label": "Transfer EOS"}
-                ]
-            },
-            {
-                "name":"dacelections", 
-                "linkedAuths": [
-                    {"contract": "kasdactokens", "action": "transfer", "permission": "xfer", "label": "Transfer KASDAC"}
-                ]
-            },
-            {
-                "name":"kasdactokens", 
-                "linkedAuths": [
-                    {"contract": "kasdactokens", "action": "newmemterms", "permission": "active", "label": "Update Constitution"}
-                ]
-            },
-            {
-                "name":"dacauthority", 
-                "linkedAuths":[
-                    {"contract": "dacelections", "action": "firecust", "permission": "med", "label": "Fire Custodian"},
-                    {"contract": "dacelections", "action": "firecand", "permission": "med", "label": "Fire Candidate"}
-                ]
-            }
-
-        ]
-    },
+    "financial_page_graphs": [
+        {
+          "account": "eosdacserval",
+          "contract": "eosio.token",
+          "symbol": "EOS",
+          "description":
+            "The EOS Mainnet block producer account for eosDAC which receives Block Producer rewards."
+        },
+        {
+          "account": "eosdacdoshhq",
+          "contract": "eosio.token",
+          "symbol": "EOS",
+          "description":
+            "The DAC owner account where DAC funds are secured and controlled by a 12-account multisig permission system of elected custodians."
+        },
+        {
+          "account": "dacocoiogmbh",
+          "contract": "eosio.token",
+          "symbol": "EOS",
+          "description":
+            "The current eosDAC service provider account which manages payroll, employment contracts, and real-world interactions on behalf of the DAC."
+        },
+        {
+          "account": "dacelections",
+          "contract": "kasdactokens",
+          "symbol": "KASDAC",
+          "description": "custodian contract description"
+        }
+      ],
 
     "api": {
         "default_eos_node": "https://jungle2.cryptolions.io:443",
@@ -87,6 +88,8 @@
 
     "external":{
         "homepage": "https://eosdac.io",
-        "explorer": "https://jungle.bloks.io"
+        "discord": "https://discord.io/eosdac",
+        "explorer": "https://jungle.bloks.io",
+        "dacexplorer": "https://explorer.eosdac.io"
     }
 }
diff --git a/statics/config/config.mainnet.json b/statics/config/config.mainnet.json
@@ -1,6 +1,14 @@
 {
     "dacName": "eosDAC",
     "dacScope": "eosdac",
+    "accounts": {
+        "treasuryAccount":{
+            "name": "eosdacthedac"
+        },
+        "authAccount": {
+            "name": "dacauthority"
+        }
+    },
     "contracts": {
 
         "token": {
@@ -37,44 +45,35 @@
 
     },
 
-
-    "bpAccount": {
-        "name": "eosdacserver"
-    },
-    "treasuryAccount":{
-        "name": "eosdacthedac"
-    },
-
-    "authAccount": {
-        "name": "dacauthority",
-        "controlling": [
-            {
-                "name":"eosdacthedac", 
-                "linkedAuths": [
-                    {"contract": "eosio.token", "action": "transfer", "permission": "xfer", "label": "Transfer EOS"}
-                ]
-            },
-            {
-                "name":"daccustodian", 
-                "linkedAuths": [
-                    {"contract": "eosdactokens", "action": "transfer", "permission": "xfer", "label": "Transfer EOSDAC"}
-                ]
-            },
-            {
-                "name":"eosdactokens", 
-                "linkedAuths": [
-                    {"contract": "eosdactokens", "action": "newmemterms", "permission": "active", "label": "Update Constitution"}
-                ]
-            },
-            {
-                "name":"dacauthority", 
-                "linkedAuths":[
-                    {"contract": "daccustodian", "action": "firecust", "permission": "med", "label": "Fire Custodian"},
-                    {"contract": "daccustodian", "action": "firecand", "permission": "med", "label": "Fire Candidate"}
-                ]
-            }
-        ]
-    },
+    "financial_page_graphs": [
+        {
+          "account": "eosdacserver",
+          "contract": "eosio.token",
+          "symbol": "EOS",
+          "description":
+            "The EOS Mainnet block producer account for eosDAC which receives Block Producer rewards."
+        },
+        {
+            "account": "eosdacthedac",
+            "contract": "eosio.token",
+            "symbol": "EOS",
+            "description":
+              "The DAC owner account where DAC funds are secured and controlled by a 12-account multisig permission system of elected custodians."
+        },
+        {
+          "account": "daccustodian",
+          "contract": "eosdactokens",
+          "symbol": "EOSDAC",
+          "description": "custodian contract description"
+        },
+        {
+          "account": "dacocoiogmbh",
+          "contract": "eosio.token",
+          "symbol": "EOS",
+          "description":
+            "The current eosDAC service provider account which manages payroll, employment contracts, and real-world interactions on behalf of the DAC."
+        }
+    ],
 
     "api": {
         "default_eos_node": "https://proxy.eosnode.tools:443",

diff --git a/statics/config/transaction.templates.json b/statics/config/transaction.templates.json