* commit '36903c1e65':
  deleted
  added mining page
  fixed governance and masternodes content
  fixed typograph
  cleaned up contact page
  cleaned up governance page; budget page=> governance page
  fixed masternodes mage

Conflicts:
	_includes/hero/governance.html
	masternodes/index.html
This commit is contained in:
Chuck Williams 2017-02-24 11:22:04 -07:00
commit 9229e744a9
8 changed files with 276 additions and 220 deletions

View file

@ -2,6 +2,83 @@
# For multiple paragraph content add two line breaks # For multiple paragraph content add two line breaks
pages: pages:
mining:
title: Dash Official Website | Dash Crypto Currency
description: Dash is Digital Cash
hero-heading: Mining
hero-text: Masternodes are computers that run a dash wallet and make decisions, such as locking transactions with InstantSend, coordinate mixing of coins, and voting on budget funding.
hero-how-to-btn: How to start
hero-pools-btn: Tools
hero-guides-btn: Guides
pools-heading: Mining Pools
pools-text: |
DISCLAIMER: This list is provided for informational purposes only. Services listed here have not been evaluated or endorsed by the Dash developers and no guarantees are made as to the accuracy of this information. Please exercise discretion when using third-party services. If youd like to be added to this list please reach out to coingun@masternode.io
pools-masternode-heading: Mining vs. Masternode
pools-masternode-text: |
Dash, like Bitcoin and most other cryptocurrencies, is based on a decentralized ledger of all transactions, known as a blockchain. This blockchain is secured through a consensus mechanism; in the case of both Dash and Bitcoin, the consensus mechanism is Proof of Work (PoW). Miners attempt to solve difficult problems with specialized computers, and when they solve the problem, they receive the right to add a new block to the blockchain. If all the other people running the software agree that the problem was solved correctly, the block is added to the blockchain and the miner is rewarded.
Dash works a little differently from Bitcoin, however, because it has a two-tier network. The second tier is powered by masternodes (Full Nodes), which enable financial privacy (PrivateSend), instant transactions (InstantSend), and the decentralized governance and budget system. Because this second tier is so important, masternodes are also rewarded when miners discover new blocks. The breakdown is as follows: 45% of the block reward goes to the miner, 45% goes to masternodes, and 10% is reserved for the budget system (created by superblocks every month).
The masternode system is referred to as Proof of Service (PoSe), since the masternodes provide crucial services to the network. In fact, the entire network is overseen by the masternodes, which have the power to reject improperly formed blocks from miners. If a miner tried to take the entire block reward for themselves or tried to run an old version of the Dash software, the masternode network would orphan that block, and it would not be added to the blockchain. In short, miners power the first tier, which is the basic sending and receiving of funds and prevention of doublespending. Masternodes power the second tier, which provide the added features that make Dash different from other cryptocurrencies. Masternodes do not mine, and mining computers cannot serve as masternodes. Additionally, each masternode is “secured” by 1000 DASH. Those DASH remain under the sole control of their owner at all times, and can still be freely spent. The funds are not locked in any way. However, if the funds are moved or spent, the associated masternode will go offline and stop receiving rewards.
how-start-heading: How to start Mining
asic-heading: ASIC Miner Hardware
asic-text: >
A server or a VPS installed with Linux: For the purposes of this guide we will be used Ubuntu 14.04 LTS.
We recommend cheap VPSes such as from Vultr and DigitalOcean though any decent provider will do.
Generally a low specced one will do. I use the 5 USD ones from Vultr and they work fine.
cpu-gpu-heading: Guides (CPU / GPU)
cpu-gpu-text: >
This is a fairly simple procedure and examples will be given in order to achieve the fastest possible hash rate for your cpu, but remember that more optimized miners can exist, so I advise you to keep an eye out on mining sites such as these in order to keep up with the latest releases.
pools-stat-heading: Pool Statistics
description-text-hero: >
Governance in a decentralized project is difficult,
because by definition there are no central authorities to make decisions for the project.
In Dash, such decisions are made by the network, that is, by the owners of masternodes. The DGBB system allows masternodes
to vote for or against proposals, which can then be implemented (or not) by Dash's developers. A key example is early in 2016,
when Dash's Core Team submitted a proposal to the network asking whether the blocksize should be increased to 2 MB. Within 24 hours,
consensus had been reached to approve this change. Compare this to Bitcoin, where debate on the blocksize has been raging for nearly three years.
description: >
The DGBB also provides a means for Dash to fund its own development. While other projects have to depend on donations or premined endowments,
Dash uses 10% of the block reward to fund its own development. Every time a block is mined, 45% of the reward goes to the miner, 45% goes to a
masternode, and the remaining 10% is not created until the end of the month. During the month, anybody can make a budget proposal to the network.
If that proposal is approved by at least 10% of the masternode network, then at the end of the month a series of "superblocks" will be created.
At that time, the block rewards that were not paid out (10% of each block) will be used to fund approved proposals. The network thus funds itself
by reserving 10% of the block reward for budget projects.
governance-meaning: What is Governance and what does it mean for Dash
voting-header: How to Vote
voting-automatic: Automated Voting
voting-automatic-text: >
One of the greatest challenges of building a crypto currency platform is ensuring you create a decentralized system of governance to manage,
fund, maintain and expand the project. This key element is absent in every currency to date, the natural response is to create a not-for-profit
foundation that is tasked with maintaining the core protocol and promoting the coin but is not really connected to the coin holders in any meaningful way.
This approach has a few issues that have been made evident from the experience of older crypto currency platforms.
voting-guide-btn: Guide - Amanda B.
voting-manual-btn: Manual Voting (in QT Wallet)
voting-central-btn: DashCentral
voting-tools: Governance Tools
voting-tools-text: >
The system would work as a decentralized voting mechanism setup in the software, where budgets for specific projects are proposed,
then the masternodes as a whole vote on them. Each project, if it passes, is added to the total budget and paid directly from the blockchain
to the person doing the work. With this, we could hire core developers and pay them directly after approval of the work in a decentralized fashion.
generator-link: Budget Proposal Generator
dashcentral-link: DashCentral
votetracker-link: VoteTracker
budget-monitoring-link: Budget Monitoring
proposal-status-link: Proposal Status
proposal-service: Proposal Automated Service
masternodes: masternodes:
title: Dash Official Website | Dash Crypto Currency title: Dash Official Website | Dash Crypto Currency
description: Dash is Digital Cash description: Dash is Digital Cash
@ -85,9 +162,8 @@ pages:
hero-text: > hero-text: >
Decentralized Governance by Blockchain, or DGBB, is Dash's attempt to solve two important problems in cryptocurrency: governance and funding. Decentralized Governance by Blockchain, or DGBB, is Dash's attempt to solve two important problems in cryptocurrency: governance and funding.
hero-how-to-btn: How to start hero-how-to-btn: What is DGBB
hero-guide-btn: Guides hero-tools-btn: Tools
hero-pools-btn: Pools
description-text-hero: > description-text-hero: >
Governance in a decentralized project is difficult, Governance in a decentralized project is difficult,

View file

@ -15,9 +15,8 @@
<p class="hero__lead">{% t pages.governance.hero-text %}</p> <p class="hero__lead">{% t pages.governance.hero-text %}</p>
<div class="hero__buttons"> <div class="hero__buttons">
<a href="#" class="btn-white-solid">{% t pages.governance.hero-how-to-btn %}</a> <a href="https://dashpay.atlassian.net/wiki/x/FgAMBQ" class="btn-white-solid" target="_blank">{% t pages.governance.hero-how-to-btn %}</a>
<a href="#" class="btn-white-solid">{% t pages.governance.hero-guide-btn %}</a> <a href="https://dashpay.atlassian.net/wiki/x/CIBuAQ" class="btn-white-solid" target="_blank">{% t pages.governance.hero-tools-btn %}</a>
<a href="#" class="btn-white-solid">{% t pages.governance.hero-pools-btn %}</a>
</div> </div>
</div> </div>

View file

@ -0,0 +1,27 @@
<div class="hero" id="hero">
<div class="hero__background">
{% srcset hero/community.jpg ppi:1,2 class="hero__background-image" %}
{% srcset_source width:1920 %}
{% srcset_source width:960 %}
{% endsrcset %}
</div>
<!-- Navigation -->
{% include nav-desktop.html %}
<!-- Hero content -->
<div class="hero__content">
<h1 class="hero__title">{% t pages.mining.hero-heading %}</h1>
<p class="hero__lead">{% t pages.mining.hero-text %}</p>
<div class="hero__buttons">
<a href="#" class="btn-white-solid" target="_blank">{% t pages.mining.hero-how-to-btn %}</a>
<a href="#" class="btn-white-solid" target="_blank">{% t pages.mining.hero-pools-btn %}</a>
<a href="#" class="btn-white-solid" target="_blank">{% t pages.mining.hero-guides-btn %}</a>
</div>
</div>
<!-- Hero stripe -->
<div class="hero__stripe"></div>
</div>

Binary file not shown.

View file

@ -27,19 +27,6 @@ description: pages.budget.description
<div class="col-sm-6"> <div class="col-sm-6">
<h2 class="bottom-space">{% t pages.masternodes.earn-heading %}</h2> <h2 class="bottom-space">{% t pages.masternodes.earn-heading %}</h2>
<p>{% t pages.masternodes.earn-text %}</p> <p>{% t pages.masternodes.earn-text %}</p>
<table id="exchanges">
<thead>
<tr>
<th>Exchange</th>
<th>Volume (24h)</th>
<th>Price</th>
<th>Volume (%)</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div> </div>
</div> </div>
</div> </div>
@ -67,20 +54,6 @@ description: pages.budget.description
<div class="section__content"> <div class="section__content">
<div class="section__lead"> <div class="section__lead">
<h2>{% t pages.masternodes.host-table-heading %}</h2> <h2>{% t pages.masternodes.host-table-heading %}</h2>
<table id="blocks">
<thead>
<tr>
<th>Height</th>
<th>Block Time</th>
<th>Transactions</th>
<th>Value Out</th>
<th>Difficulty</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div> </div>
</div> </div>
</section> </section>
@ -88,103 +61,16 @@ description: pages.budget.description
<section class=""> <section class="">
<div class="section__content"> <div class="section__content">
<h2 class="bottom-space">P2P</h2> <h2 class="bottom-space">P2P</h2>
<div class="row"> <div class="row class="bottom-space"">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="bottom-space">{% tmd pages.masternodes.p2p-text %}</div> <div>{% tmd pages.masternodes.p2p-text %}</div>
<a href="http://178.254.23.111/~pub/Dash/Dash_Info.html" class="btn-blue" target="_blank">{% t pages.masternodes.p2p-btn %}</a>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<img src="/assets/img/masternodes/p2p.png" alt=""> <img src="/assets/img/masternodes/p2p.png" alt="">
</div> </div>
</div> </div>
<a href="http://178.254.23.111/~pub/Dash/Dash_Info.html" class="btn-blue" target="_blank">{% t pages.masternodes.p2p-btn %}</a>
</div> </div>
</section> </section>
</div> </div>
<script type="text/javascript">
window.onload = function () {
$( document ).ready(function(){
// Get the exchange data
$.ajax({
url: "{{ site.api }}/exchange/",
error: function(jqXHR, textStatus, errorThrown) {
console.log(jqXHR);
console.log(textStatus);
console.log('errorThrown:');
}
})
.done(function(response){
var exchanges = response;
exchanges.map(function(exchange){
if(exchange){
console.log('exchange',exchange);
var name = exchange.exchange,
url = exchange.url
volume = "$" + formatCurrency(exchange.volume,0),
price = "$" + formatCurrency(exchange.price),
change = formatNumber(exchange.percent_change);
$("#exchanges>tbody").append('<tr><td data-header="Exchange"><a target="_blank" href="' + url + '">' + name + '</a></td><td data-header="Volume (24h)">' + volume + '</td><td data-header="Price">' + price + '</td><td data-header="Volume (%)">' + change + '%</td></tr>');
}
});
});
// Get the current number of masternodes.
$.ajax({
url: "{{ site.api }}/masternodes/stats/"
})
.done(function(response){
console.log('masternode stats', response.stats);
var masternodes_count = formatNumber(response.stats['count']),
masternodes_max = formatNumber(response.stats['max']);
$("#masternodes_count").text(masternodes_count);
$("#masternodes_max").text(masternodes_max);
});
// Get the budget proposals
$.ajax({
url: "{{ site.api }}/budgets/"
})
.done(function(response){
var proposals = response.proposals;
proposals.map(function(proposal){
var title = proposal.title ? proposal.title : proposal.name,
url = proposal.dw_url,
owner = proposal.owner_username,
votes_yes = proposal.yes,
votes_no = proposal.no,
required_votes = proposal.remaining_yes_votes_until_funding,
amount_monthly = formatCurrency(proposal.monthly_amount)
will_be_funded = proposal.will_be_funded ? "yes" : "no";
$("#budgets>tbody").append('<tr><td data-header="Title"><a href="' + url + '" target="_blank">' + title + '</a></td><td data-header="Owner">' + owner + '</td><td data-header="Votes (yes/no)">' + votes_yes + '/' + votes_no + '</td><td data-header="Votes Required">' + required_votes + '</td><td data-header="Monthly Amount">' + amount_monthly + '</td><td data-header="Will be Funded">' + will_be_funded + '</td></tr>');
});
});
// Get the blockchain info
$.ajax({
url: "{{ site.api }}/chain/latestBlocks/"
})
.done(function(response){
var blocks = response.blocks;
blocks.map(function(block){
var height = block.height,
age = moment.unix(block.time).format("LLL"),
txs = block.txlength,
out = block.cbvalue,
difficulty = block.difficulty;
$("#blocks>tbody").append('<tr><td data-header="Height">' + height + '</td><td data-header="Block Time">' + age + '</td><td data-header="Transactions">' + txs + '</td><td data-header="Value Out">' + out + '</td><td data-header="Difficulty">' + difficulty + '</td></tr>');
});
});
});
}
</script>

68
mining/index.html Normal file
View file

@ -0,0 +1,68 @@
---
layout: default
title: pages.mining.title
description: pages.mining.description
---
{% include hero/mining.html %}
{% include base.html %}
<div class="page page--home">
<section>
<div class="section__content">
<h2 class="section__title">{% t pages.mining.pools-heading %}</h2>
<p class="section__lead">{% tmd pages.mining.marsternode-text %}</p>
</div>
</section>
<section class="section">
<div class="section__content">
<div class="row">
<div class="col-sm-6">
</div>
<div class="col-sm-6">
</div>
</div>
</div>
</section>
<section class="section">
<div class="section__content">
<div class="row">
<div class="col-sm-6">
<h2 class="bottom-space">{% t pages.mining.host-heading %}</h2>
</div>
<div class="col-sm-6">
</div>
</div>
</div>
</section>
<section class="section">
<div class="section__content">
<div class="section__lead">
</div>
</div>
</section>
<section class="">
<div class="section__content">
<h2 class="bottom-space">P2P</h2>
<div class="row class="bottom-space"">
<div class="col-sm-6">
</div>
<div class="col-sm-6">
</div>
</div>
</div>
</section>
</div>

View file

@ -480,7 +480,7 @@ a.blog_link {
} }
.mailboxes-bg{ .mailboxes-bg{
background-image: url(../../assets/img/hero/mailboxes.jpg); background-image: url(/assets/img/hero/mailboxes.jpg);
position: relative; position: relative;
background-size: cover; background-size: cover;
z-index: 1; z-index: 1;