From 42cac1e871cd7237d3a10c6606c8649e3bbfef1c Mon Sep 17 00:00:00 2001 From: Michael Yeates Date: Thu, 13 Jun 2019 18:46:21 +0100 Subject: [PATCH 1/3] Change config to used scoped test contracts --- statics/config/config.jungle.json | 35 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/statics/config/config.jungle.json b/statics/config/config.jungle.json index 8336d96..b79920a 100644 --- a/statics/config/config.jungle.json +++ b/statics/config/config.jungle.json @@ -1,10 +1,10 @@ { - "dacName": "eosDAC", - "dacScope": "eos.dac", + "dacName": "Jerry's DAC", + "dacScope": "jerry.dac", "contracts": { "token": { - "name": "kasdactokens", - "symbol": "KASDAC", + "name": "hosteddactok", + "symbol": "JERRYS", "totalSupply": 1000000000.0000, "decimals": 4 }, @@ -14,8 +14,8 @@ "decimals": 4 }, "custodian": { - "name": "dacelections", - "memo": "dacelections", + "name": "hosteddaccus", + "memo": "hosteddaccus", "enable_voting" : true }, "bot":{ @@ -25,10 +25,10 @@ "name": "eosiomsigold" }, "dac_msig": { - "name": "dacmultisigs" + "name": "hosteddacsig" }, "wpproposal":{ - "name": "dacproposals" + "name": "hosteddacwps" }, "escrow":{ "name": "eosdacescrow" @@ -40,35 +40,36 @@ "name": "eosdacserval" }, "treasuryAccount":{ - "name": "eosdacdoshhq" + "name": "t.jerry.dac" }, "authAccount": { - "name": "dacauthority", + "name": "a.jerry.dac", "controlling": [ { - "name":"eosdacdoshhq", + "name":"t.jerry.dac", "linkedAuths": [ - {"contract": "eosio.token", "action": "transfer", "permission": "xfer", "label": "Transfer EOS"} + {"contract": "eosio.token", "action": "transfer", "permission": "xfer", "label": "Transfer EOS"}, + {"contract": "hosteddactok", "action": "transfer", "permission": "xfer", "label": "Transfer JERRYS"} ] }, { "name":"dacelections", "linkedAuths": [ - {"contract": "kasdactokens", "action": "transfer", "permission": "xfer", "label": "Transfer KASDAC"} + {"contract": "hosteddactok", "action": "transfer", "permission": "xfer", "label": "Transfer JERRYS"} ] }, { "name":"kasdactokens", "linkedAuths": [ - {"contract": "kasdactokens", "action": "newmemterms", "permission": "active", "label": "Update Constitution"} + {"contract": "hosteddactok", "action": "newmemtermse", "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"} + {"contract": "hosteddaccus", "action": "firecust", "permission": "med", "label": "Fire Custodian"}, + {"contract": "hosteddaccus", "action": "firecand", "permission": "med", "label": "Fire Candidate"} ] } @@ -79,7 +80,7 @@ "default_eos_node": "https://jungle2.cryptolions.io:443", "bpnodes": "https://eosdac.io/topnodes.json", "memberclient": "http://ns3119712.ip-51-38-42.eu:3000", - "memberclient_state_api": "https://api-jungle.eosdac.io/v1/eosdac", + "memberclient_state_api": "http://127.0.0.1:8383/v1/eosdac", "hyperion": "https://jungle.hyperion.eosrio.io/v2/state", "firehose": "ws://jungle.eosdac.io:1337" From 95e0e4350681a6c9fb54214a00a6c24e66cd9df0 Mon Sep 17 00:00:00 2001 From: Michael Yeates Date: Fri, 14 Jun 2019 13:22:18 +0100 Subject: [PATCH 2/3] Use public jungle api --- statics/config/config.jungle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/statics/config/config.jungle.json b/statics/config/config.jungle.json index f51bb86..7a26f13 100644 --- a/statics/config/config.jungle.json +++ b/statics/config/config.jungle.json @@ -80,7 +80,7 @@ "default_eos_node": "https://jungle2.cryptolions.io:443", "bpnodes": "https://eosdac.io/topnodes.json", "memberclient": "http://ns3119712.ip-51-38-42.eu:3000", - "memberclient_state_api": "http://127.0.0.1:8383/v1/eosdac", + "memberclient_state_api": "https://api-jungle.eosdac.io/v1/eosdac", "hyperion": "https://jungle.hyperion.eosrio.io/v2/state", "firehose": "ws://jungle.eosdac.io:1337" From 56703d4a7bb1aa3b049bed6a14974b4098d1a55a Mon Sep 17 00:00:00 2001 From: Michael Yeates Date: Fri, 14 Jun 2019 19:25:15 +0100 Subject: [PATCH 3/3] Revert "Merge pull request #3 from eosdac/scoped" This reverts commit 95fb466dccb32d00420e7b3ab6730c3a507a356b, reversing changes made to f4f067a19be07b2d6fff09d7c50ab7662c51dd04. --- i18n/en_US/index.json | 1 - pages/home.vue | 8 +++---- statics/config/config.jungle.json | 37 ++++++++++++++----------------- statics/config/credits.json | 5 ----- statics/config/wp_categories.json | 20 ++++++++--------- 5 files changed, 30 insertions(+), 41 deletions(-) diff --git a/i18n/en_US/index.json b/i18n/en_US/index.json index ebd3542..b78d139 100644 --- a/i18n/en_US/index.json +++ b/i18n/en_US/index.json @@ -5,7 +5,6 @@ "noscript": "To view this webpage you need to have javascript enabled" }, "index": { - "already_subscribed": "Already subscribed", "description_p1": "eosDAC is a decentralized autonomous community which means it is owned and operated by the token holders who agree to the constitution and register as members of the community.", "description_p2": "When completed, this member client will allow you to read the constitution, register as a member, submit worker proposals, register as a custodian candidate, vote on custodians, transfer tokens, and more. If you have any questions, please reach out to us using the links below.", "discord_description": "eosDAC exists as an active, engaged community building tools to enable other DACs. Discord is where we bring our skills together and coordinate our activites.", diff --git a/pages/home.vue b/pages/home.vue index c94fa83..905c853 100644 --- a/pages/home.vue +++ b/pages/home.vue @@ -358,11 +358,9 @@ export default { return false; } - // let url = - // this.$helper.noBackSlash(this.$configFile.get("memberclientapi")) + - // "/subscribe"; - - let url = "https://toolkit-api.eosdac.io/subscribe"; + let url = + this.$helper.noBackSlash(this.$configFile.get("memberclientapi")) + + "/subscribe"; this.loading = true; try { diff --git a/statics/config/config.jungle.json b/statics/config/config.jungle.json index 7a26f13..8336d96 100644 --- a/statics/config/config.jungle.json +++ b/statics/config/config.jungle.json @@ -1,10 +1,10 @@ { - "dacName": "Jerry's DAC", - "dacScope": "jerry.dac", + "dacName": "eosDAC", + "dacScope": "eos.dac", "contracts": { "token": { - "name": "hosteddactok", - "symbol": "JERRYS", + "name": "kasdactokens", + "symbol": "KASDAC", "totalSupply": 1000000000.0000, "decimals": 4 }, @@ -14,8 +14,8 @@ "decimals": 4 }, "custodian": { - "name": "hosteddaccus", - "memo": "hosteddaccus", + "name": "dacelections", + "memo": "dacelections", "enable_voting" : true }, "bot":{ @@ -25,10 +25,10 @@ "name": "eosiomsigold" }, "dac_msig": { - "name": "hosteddacsig" + "name": "dacmultisigs" }, "wpproposal":{ - "name": "hosteddacwps" + "name": "dacproposals" }, "escrow":{ "name": "eosdacescrow" @@ -40,36 +40,35 @@ "name": "eosdacserval" }, "treasuryAccount":{ - "name": "t.jerry.dac" + "name": "eosdacdoshhq" }, "authAccount": { - "name": "a.jerry.dac", + "name": "dacauthority", "controlling": [ { - "name":"t.jerry.dac", + "name":"eosdacdoshhq", "linkedAuths": [ - {"contract": "eosio.token", "action": "transfer", "permission": "xfer", "label": "Transfer EOS"}, - {"contract": "hosteddactok", "action": "transfer", "permission": "xfer", "label": "Transfer JERRYS"} + {"contract": "eosio.token", "action": "transfer", "permission": "xfer", "label": "Transfer EOS"} ] }, { "name":"dacelections", "linkedAuths": [ - {"contract": "hosteddactok", "action": "transfer", "permission": "xfer", "label": "Transfer JERRYS"} + {"contract": "kasdactokens", "action": "transfer", "permission": "xfer", "label": "Transfer KASDAC"} ] }, { "name":"kasdactokens", "linkedAuths": [ - {"contract": "hosteddactok", "action": "newmemtermse", "permission": "active", "label": "Update Constitution"} + {"contract": "kasdactokens", "action": "newmemterms", "permission": "active", "label": "Update Constitution"} ] }, { "name":"dacauthority", "linkedAuths":[ - {"contract": "hosteddaccus", "action": "firecust", "permission": "med", "label": "Fire Custodian"}, - {"contract": "hosteddaccus", "action": "firecand", "permission": "med", "label": "Fire Candidate"} + {"contract": "dacelections", "action": "firecust", "permission": "med", "label": "Fire Custodian"}, + {"contract": "dacelections", "action": "firecand", "permission": "med", "label": "Fire Candidate"} ] } @@ -88,8 +87,6 @@ "external":{ "homepage": "https://eosdac.io", - "discord": "https://discord.io/eosdac", - "explorer": "https://bloks.io", - "dacexplorer": "https://explorer.eosdac.io" + "explorer": "https://jungle.bloks.io" } } diff --git a/statics/config/credits.json b/statics/config/credits.json index d26d7ce..40ec1b0 100644 --- a/statics/config/credits.json +++ b/statics/config/credits.json @@ -30,11 +30,6 @@ "name": "Scatter", "url": "https://get-scatter.com/", "logo": "https://avatars3.githubusercontent.com/u/40841390?s=200&v=4" - }, - { - "name": "Quasar Framework", - "url": "https://quasar-framework.org/", - "logo": "https://quasar-framework.org/images/quasar-logo-big.png" } ] } \ No newline at end of file diff --git a/statics/config/wp_categories.json b/statics/config/wp_categories.json index 9f3c14b..b0423f8 100644 --- a/statics/config/wp_categories.json +++ b/statics/config/wp_categories.json @@ -1,12 +1,12 @@ [ - { "label": "wp_categories.cat_0", "value": "0", "desc": "wp_categories.cat_0_desc"}, - { "label": "wp_categories.cat_1", "value": "1", "desc": "wp_categories.cat_1_desc"}, - { "label": "wp_categories.cat_2", "value": "2", "desc": "wp_categories.cat_2_desc"}, - { "label": "wp_categories.cat_3", "value": "3", "desc": "wp_categories.cat_3_desc"}, - { "label": "wp_categories.cat_4", "value": "4", "desc": "wp_categories.cat_4_desc"}, - { "label": "wp_categories.cat_5", "value": "5", "desc": "wp_categories.cat_5_desc"}, - { "label": "wp_categories.cat_6", "value": "6", "desc": "wp_categories.cat_6_desc"}, - { "label": "wp_categories.cat_7", "value": "7", "desc": "wp_categories.cat_7_desc"}, - { "label": "wp_categories.cat_8", "value": "8", "desc": "wp_categories.cat_8_desc"}, - { "label": "wp_categories.cat_9", "value": "9", "desc": "wp_categories.cat_9_desc"} + { "label": "cat_0", "value": "0", "desc": "cat_0_desc"}, + { "label": "cat_1", "value": "1", "desc": "cat_1_desc"}, + { "label": "cat_2", "value": "2", "desc": "cat_2_desc"}, + { "label": "cat_3", "value": "3", "desc": "cat_3_desc"}, + { "label": "cat_4", "value": "4", "desc": "cat_4_desc"}, + { "label": "cat_5", "value": "5", "desc": "cat_5_desc"}, + { "label": "cat_6", "value": "6", "desc": "cat_6_desc"}, + { "label": "cat_7", "value": "7", "desc": "cat_7_desc"}, + { "label": "cat_8", "value": "8", "desc": "cat_8_desc"}, + { "label": "cat_9", "value": "9", "desc": "cat_9_desc"} ] \ No newline at end of file