diff --git a/dao.adoc b/dao.adoc index 43982ac..e98f556 100644 --- a/dao.adoc +++ b/dao.adoc @@ -4,23 +4,23 @@ Here we collect resources to help you learn more about the Bisq DAO, what it is, and how it works. -_The Bisq DAO is currently live on testnet, and is projected to go live on mainnet in March 2019._ +_The Bisq DAO is currently live on our testnet, and is projected to go live on mainnet in March 2019._ == General Info ==== <> Plain language introduction to the Bisq DAO. -==== <<#, Bisq DAO in Brief (videos)>> -Quick, short video series on the Bisq DAO. _Coming soon._ +==== https://www.youtube.com/playlist?list=PLFH5SztL5cYPAXWFz-IMB4dBZ0MEZEG_e[Bisq DAO in Brief (videos)^] +Quick, short video series on the Bisq DAO. Get up to speed with a handful of 3-4 minute videos. ==== https://www.youtube.com/playlist?list=PLFH5SztL5cYOLdYJj3nQ6-DekbjMTVhCS[Bisq DAO Basics (videos)^] A more thorough treatment of the DAO covering everything from the basics of bitcoin transactions and colored coins to the economic and technical roots of the BSQ token and how it powers the Bisq DAO. == Try It -==== <> -The Bisq DAO isn't live yet, but you can experience truly decentralized governance for yourself right now with this easy-to-follow guide. It walks you through the process of making a compensation request, but you can use the same process to make any proposal you'd like (e.g., adjust fees, trading limits, or any other parameter). +==== <> +The Bisq DAO isn't live yet, but it's available for you to test right now! This easy-to-follow guide will walk you through the process of making a compensation request, but you can use the same process to make any proposal you'd like (e.g., adjust fees, trading limits, or any other parameter). == More Details diff --git a/getting-started-dao.adoc b/getting-started-dao.adoc index 79e9a78..7f78e2b 100644 --- a/getting-started-dao.adoc +++ b/getting-started-dao.adoc @@ -4,7 +4,7 @@ The Bisq DAO will soon go live on mainnet. But there's no need to wait—you can tinker with it right now and experience truly decentralized governance for yourself. -In this guide, we'll show you how to use the Bisq DAO on testnet. +In this guide, we'll show you how to use the Bisq DAO on our testnet. Specifically, we will walk through one voting cycle. Voting is a crucial duty within the Bisq DAO that makes decision-making for the Bisq project accessible to all who use it—users and contributors alike. You'll see how to make a proposal, vote on other proposals, and how the BSQ token enables the process to be handled in a decentralized and trustless but meritocratic way. @@ -16,74 +16,41 @@ For a brief overview of how the Bisq DAO works, see our <> doc, virtually all actions in the Bisq DAO require BSQ tokens. So let's get some! -First, in order to get any BSQ, you'll need your BSQ wallet address, which is already generated. On the `DAO` screen, go to the `BSQ Wallet` tab. In the `Receive` section, you'll see an address: +To get test BSQ, simply ask for some https://bisq.network/slack-invite[on Slack^] and a contributor will send you some. Don't forget to include your BSQ address. + +To get your BSQ address: go to the `DAO` screen, navigate to the `BSQ Wallet` tab. In the `Receive` section, you'll see an address: .Get your BSQ wallet address. image::get-bsq-address.png[Get your BSQ address] -Now, there are 2 ways to get BSQ for testnet: - -* request some BSQ https://bisq.network/slack-invite[on Slack^] -* buy BSQ in Bisq with testnet BTC - -=== Option A: Request BSQ on Slack - -This method is simple enough. Just ask for some BSQ https://bisq.network/slack-invite[on Slack^], and a contributor will send you some. Don't forget to include your BSQ address. - -=== Option B: Buy BSQ on Bisq - -Of course, when the Bisq DAO goes live on mainnet, getting BSQ won't be as simple as asking for it—you'll need to buy it (or work for it). - -Buying BSQ on Bisq is a little more work, but if you want a more authentic Bisq DAO experience, this is the way to go. - -NOTE: In order to buy BSQ on Bisq, there need to be sellers offering BSQ for you to buy. Because the Bisq DAO is in testing right now, the market can be a bit thin. You might want to check the `Sell BTC` screen to see if there are any open offers for BSQ before proceeding. - -==== 1. Create a BSQ payment account - -In order to take an offer to buy BSQ, you'll need to have a BSQ payment account set up. Go ahead and create one, just like you would create a fiat or altcoin account: on the `Account` screen, pick BSQ from the `Altcoin` dropdown and put in your BSQ address. - -.Create a new BSQ payment account. -image::add-new-bsq-account.png[Create a new BSQ payment account] - -==== 2. Get some testnet BTC - -To buy BSQ, you'll need BTC. You can get testnet BTC https://coinfaucet.eu/en/btc-testnet/[here^] or http://tpfaucet.appspot.com/[here^]. Just put in the BTC address of your Bisq wallet, which you can find in the `Receive funds` section of the `Funds` screen, and you should receive testnet BTC shortly afterward. - -==== 3. Take an offer to buy BSQ with BTC - -Now that you've got testnet BTC, head over to the `Sell BTC` screen and choose BSQ in the `Filter by currency` dropdown. Take an offer you like and complete the trade. - -.Pick an offer to buy BSQ with BTC. -image::buy-bsq-with-btc.png[Buy BSQ with BTC] - -As noted above, you may not see any open offers to buy BSQ with BTC. If that's the case, you can try waiting until there is an offer, or acquire BSQ through <> instead. - == Participate in a voting cycle Now that you've got some BSQ, let's use it. @@ -101,8 +68,8 @@ We'll do this by participating in one voting cycle in the Bisq DAO. Voting cycle For testing, voting cycles are shortened to 979 blocks (just under 7 days), and each phase is shortened proportionally. You can see exact timeframes on the `Dashboard` section of the `Governance` tab on the `DAO` screen. -.Testnet voting cycle overview. -image::voting-cycle-overview.png[Testnet voting cycle overview] +.Voting cycle overview. +image::voting-cycle-overview.png[Voting cycle overview] Let's begin by making a proposal. @@ -188,8 +155,6 @@ Since BSQ is just bitcoin, you can see BSQ transactions on any bitcoin block exp So there's a https://explorer.bisq.network/testnet/[BSQ block explorer^]. Whenever you do a BSQ transaction, you can see it there. -See the difference: here's https://explorer.bisq.network/tx.html?tx=3dc364b55fa9e92058d52a9c09b98300781414573f123e63367ff3749a8615b2[a simple transaction^] on the BSQ block explorer that shows the transfer of 500 BSQ from one wallet to another. https://blockstream.info/testnet/tx/3dc364b55fa9e92058d52a9c09b98300781414573f123e63367ff3749a8615b2/[Here's that same transaction^] on an ordinary bitcoin block explorer. - Here's a screenshot of the past few BSQ transactions as of mid-December 2018. You'll notice that this block explorer recognizes the various transaction properties that make valid BSQ transactions, and it labels them accordingly: .Some BSQ transactions on the https://explorer.bisq.network[BSQ block explorer^]. diff --git a/images/switch-testnet.png b/images/switch-testnet.png index a50c0a3..689cc3c 100644 Binary files a/images/switch-testnet.png and b/images/switch-testnet.png differ diff --git a/user-dao-intro.adoc b/user-dao-intro.adoc index 9bce62b..da792eb 100644 --- a/user-dao-intro.adoc +++ b/user-dao-intro.adoc @@ -124,7 +124,7 @@ In this way, the risk that people in high-trust roles misbehave is minimized, an == Now you try -As of Bisq v0.9, the Bisq DAO is live on testnet! You can make a proposal, vote on others' proposals, buy testnet BSQ, and earn testnet BSQ. +As of Bisq v0.9, the Bisq DAO is live on our testnet! You can make a proposal, vote on others' proposals, and buy/sell BSQ for testing. Voting cycles are currently set to about 7 days instead of the usual 1 month so that feedback and testing can be done quicker. @@ -134,7 +134,7 @@ Voting cycles are currently set to about 7 days instead of the usual 1 month so See our <>. ==== -While the DAO is on testnet, we're offering bounties for bugs ranging from 100 to 10,000 BSQ. See https://bisq.community/t/how-to-explore-the-dao-on-testnet/6692[more details here^]. +While the DAO is live on our testnet, we're offering bounties for bugs ranging from 100 to 10,000 BSQ. See https://bisq.community/t/how-to-explore-the-dao-on-testnet/6692[more details here^]. == Learn more and stay in touch