From c7ce67c0fb0af4862e350fe42f8563f280039cd9 Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Tue, 15 Jan 2019 13:58:52 -0500 Subject: [PATCH 1/7] Add dao page with link on main nav --- _data/main_nav.yml | 3 +++ dao.html | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 dao.html diff --git a/_data/main_nav.yml b/_data/main_nav.yml index 17660faa..9f963a1d 100644 --- a/_data/main_nav.yml +++ b/_data/main_nav.yml @@ -3,6 +3,9 @@ links: - title: Vision url: /vision +- title: Bisq DAO + url: /dao + - title: Community url: /community diff --git a/dao.html b/dao.html new file mode 100644 index 00000000..ce67e744 --- /dev/null +++ b/dao.html @@ -0,0 +1,6 @@ +--- +layout: page +title: Bisq DAO ‹ Bisq - The decentralized Bitcoin exchange +--- + +

Some DAO stuff.

\ No newline at end of file From 1f71f4484866cafcaedd3ec4b1da798e98972813 Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Tue, 15 Jan 2019 20:40:53 -0500 Subject: [PATCH 2/7] Add dropdown to main nav to accommodate dao link Adding the Bisq DAO link on the main nav made the list of links in the main nav too long, so I consolidated written resources into a single dropdown called "Learn More" with links to docs, faqs, and the blog. --- _data/main_nav.yml | 8 +++-- _includes/main_nav.html | 74 ++++++++++++++++++++++++++++------------- css/styles.css | 16 +++++++++ 3 files changed, 72 insertions(+), 26 deletions(-) diff --git a/_data/main_nav.yml b/_data/main_nav.yml index 9f963a1d..9ed09b3e 100644 --- a/_data/main_nav.yml +++ b/_data/main_nav.yml @@ -9,6 +9,11 @@ links: - title: Community url: /community +- title: Markets + url: /markets + +learn_more_links: + - title: FAQ url: /faq @@ -18,6 +23,3 @@ links: - title: Documentation url: https://docs.bisq.network/ target: _blank - -- title: Markets - url: /markets diff --git a/_includes/main_nav.html b/_includes/main_nav.html index 971a13b9..60ad81ce 100644 --- a/_includes/main_nav.html +++ b/_includes/main_nav.html @@ -2,39 +2,67 @@ diff --git a/css/styles.css b/css/styles.css index 03bb3e4b..ee1ddd32 100644 --- a/css/styles.css +++ b/css/styles.css @@ -643,6 +643,22 @@ td { display: none; } +.learn-more-links div.dropdown-menu { + width: 240px; +} + +.learn-more-links div.dropdown-menu a.nav-link { + padding: 0; + border-bottom: 1px solid transparent !important; + color: #25B135; + display: inline-block; +} + +.learn-more-links div.dropdown-menu a.nav-link:hover { + color: #25B135 !important; + border-bottom: 1px solid #25B135 !important; +} + @media (max-width: 990px) { From adcb302266b00698a5ed276e0cd264aca5a6e42c Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Mon, 28 Jan 2019 19:10:44 -0500 Subject: [PATCH 3/7] Finish faqs and link-list --- css/styles.css | 125 +++++++++++++++++++++++++- dao.html | 237 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 359 insertions(+), 3 deletions(-) diff --git a/css/styles.css b/css/styles.css index e8dfa10b..98b379fe 100644 --- a/css/styles.css +++ b/css/styles.css @@ -5,6 +5,18 @@ body { letter-spacing: 0.03rem; } +.strong { + font-weight: 700; +} + +.emphasis { + font-style: italic; +} + +.center { + text-align: center; +} + .green, a { color: #25B135 } @@ -198,7 +210,24 @@ hr { margin-top: 10px; } +.responsive-youtube-container { + position: relative; + padding-bottom: 56.25%; + padding-top: 30px; height: 0; overflow: hidden; + margin-top: 50px; + margin-bottom: 175px; + +} +.responsive-youtube-container iframe, +.responsive-youtube-container object, +.responsive-youtube-container embed { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} @@ -773,9 +802,10 @@ ol li { margin: 1rem 0; } -/****************/ -/*****************front page*****************/ +/***************** +front page +*****************/ #dao-coming-soon { text-align: center; @@ -786,6 +816,74 @@ ol li { margin-bottom: 0; } + +/***************** +dao page +*****************/ + +#dao-explainer { + text-align: center; + padding-bottom: 100px; +} + +#dao-explainer .panel { /* :not(:last-child) */ + min-height: 50vh; + position: relative; + border-bottom: 1px solid #f3f3f3; +} + +#dao-explainer .panel:not(:first-of-type) { + padding-top: 150px; + padding-bottom: 150px; +} + +#dao-explainer .panel h3 { + font-weight: 300; + font-family: 'IBM Plex Sans', monospace; + font-size: 2.5rem; + line-height: 1.2; +} + +#dao-explainer .panel h4 { + font-weight: 200; + font-family: 'IBM Plex Sans', monospace; + font-size: 1.75rem; + line-height: 2.5rem; +} + +#dao-explainer .panel .panel-intro { + text-align: left; + margin: 50px auto; +} + +#dao-explainer .panel-interlude { + background-color: #f3f3f3; + position: absolute; + bottom: -100px; + left: 0; + right: 0; + margin-left: auto; + margin-right: auto; + width: 100%; + max-width: 600px; + height: 200px; + padding: 45px; +} + +#dao-explainer .panel-interlude p:last-child { + margin-bottom: 0; +} + +#dao-explainer .faqs .question-answer-group { + text-align: left; + margin: 25px auto; +} + +#dao-explainer .faqs .question-answer-group .question { + font-weight: 700; +} + + /****************/ @media (max-width: 1100px) { @@ -837,6 +935,29 @@ ol li { column-gap: 0; } + /***************** + dao page + *****************/ + + .responsive-youtube-container { + margin-bottom: 80px; + } + + #dao-explainer .panel { + border-bottom: none; + } + + #dao-explainer .panel:not(:first-of-type) { + padding-top: 80px; + } + + #dao-explainer .panel-interlude { + position: relative; + bottom: initial; + width: 100%; + max-width: initial; + height: auto; + } } diff --git a/dao.html b/dao.html index ce67e744..8e2c6441 100644 --- a/dao.html +++ b/dao.html @@ -3,4 +3,239 @@ title: Bisq DAO ‹ Bisq - The decentralized Bitcoin exchange --- -

Some DAO stuff.

\ No newline at end of file +
+ +

The Bisq DAO

+

Using the Bitcoin protocol to decentralize Bisq Network's funding and policy-making

+ + + + +
+ +
+ +
+ + +
+

Usually, tokens aren't useful because the entities issuing them could accomplish the same goals without a token.

+

But Bisq is not an entity, so it needs a token to do what an entity would otherwise do.

+
+ +
+ + + + +
+

Why a DAO?

+

Bisq seems to work just fine right now...?

+ +
+

Bisq trading is currently decentralized, but management is not.

+

Bisq needs to decentralize its own management to become truly resistant to censorship.

+ +
+
+ + + + + + +
+

Okay...But Why a Token?

+

"Just use plain bitcoin"

+ +
+

To make a Bitcoin transaction, you need a recipient's address. As Bisq itself is decentralized, that address won't be known.

+

Thus sending trading fees with a plain Bitcoin transaction is impossible, and a token is needed as a placeholder.

+
+
+ + + + +
+

Common Questions

+

Let's break it down

+ +
+
+

Is Bisq doing this because it needs money?

+

No. Bisq has bootstrapped itself to facilitate 20,000+ total trades since in the 2.5 years since April 2016. It makes real revenue right now.

+

The goal is to remove central points of authority from Bisq's governance.

+
+ +
+

All tokens are useless. So why create one?

+

Tokens so far are useless because they're all issued by legal entities like companies and foundations. These entities could easily accomplish their goals without tokens.

+

However, when there is no entity, as in Bisq's case, things change. New tools are needed to collect revenue and make policy. Where can revenue be collected if there is no central wallet? Who determines policy if there is no leadership team?

+
+ +
+

Explain to this to me, simply. Please.

+

Developer does $1000 of work on Bisq software. He requests $1000 of BSQ, and includes 1000 satoshis with his request. DAO stakeholders vote to approve his request, coloring his 1000 satoshis into BSQ worth $1000. Traders buy this BSQ with $1000 of BTC and redeem the BSQ as trading fees.

+

BSQ is just a placeholder for a BTC payment until the other party is known. The DAO is just a mechanism for collective decision-making in the absence of a CEO.

+
+ +
+

Why can't you just do this with plain Bitcoin?

+

Because the sender of bitcoin is not known ahead of time. Consider the trading fee transaction. You need a sender and a recipient to do a Bitcoin transaction, right? There's a gap between the time a contributor does work and the time a trader places a trade, and nowhere to hold the value to be transferred in the interim. BSQ is a tool to hold the value of a contributor's labor until a trader shows up to pay for it.

+
+ +
+

Practically, what changes for me as a user?

+

Not much. Old model: pay bitcoin as trading fees. New model: pay bitcoin for BSQ, and redeem BSQ as trading fees. Just 1 extra step.

+
+ +
+

Even 1 extra step is more work. Why would I do that?

+

BSQ trading fees will be dramatically cheaper than plain BTC trading fees. Also, BSQ fees actually help sustain the project and BTC fees do not.

+
+ +
+

Will I be required to use BSQ to trade on Bisq?

+

No, you can choose to continue paying trading fees with plain bitcoin instead of BSQ—just note that (1) you'll pay more and (2) your bitcoin won't go to Bisq contributors, and thus won't help to sustain the project.

+

Where exactly BTC trading fees will go has not been decided yet.

+
+ +
+

But...Bisq works just fine without a token right now. Why do a token?

+

Because Bisq is changing its governance model. It's going from a centralized control structure (funding and policy determined by founders) to a decentralized control structure (funding and policy collectively by users and contibutors).

+

With the old model, all fees went to the founders. The new model enables fees to be distributed meritocratically to all contributors, and a token is needed to make it work.

+
+ +
+

Why is Bisq changing its governance model?

+

Because decentralized software is not good enough. What's the point if the team in charge of the software is still a single point of failure?

+

This is why we call it the Bisq Network and not the Bisq Project. This has been the plan from the beginning.

+
+ + +
+

The BSQ token bothers me because it creates money out of thin air. That's sketchy.

+

The very act of human labor is creating something out of nothing. Take a developer, for instance. When they implement a feature, they'll add code where there wasn't any before. If they do it right, the code they added will result in new functionality. Voilà! They've just created something out of nothing.

+

The BSQ token is a tool to capture this newly-created value in an exchangeable medium. Bitcoin miners create money out of thin air too, right? This is no different, just with human labor and validation instead of machine labor and validation.

+
+ +
+

What is the issuance schedule for BSQ tokens?

+

New BSQ is issued every time a contributor's request is approved. BSQ issuance is not a 1-time event. Issuance is not a capital raise like an ICO—it's a revenue event—so it happens continually.

+

BSQ is also burned out of existance continually as traders redeem them for trading fees.

+
+ +
+

Many tokens sound good in theory. How do you know yours will work in practice?

+

Good question. Theory cannot be tested until it's put into practice. However, quite a few aspects of the token and DAO have already been put into practice. People have been paying real trading fees to use Bisq for over 2.5 years now, so the token must have value at launch. As for the DAO, the Bisq contributor team has approximated DAO functions with low-tech tools like GitHub and Google Sheets for several months. The DAO merely formalizes these processes.

+
+ +
+ +
+

The Bisq DAO and BSQ token are not required to provide Bisq's core trading service today.

+

But they are required to remove single points of failure from its control structure, so it can be relied upon tomorrow.

+ +
+ +
+ + + +
+

Learn More

+

Docs, videos, and more

+ +

You don't need to know the nitty-gritty details of Bisq's colored coin implementation or DAO mechanism in order to use it. But you might find it interesting, so if you're inclined, here's a series of video and written resources for you to check out.

+ +
+
+ +
Video
+
    +
  • +
    +

    Bisq DAO Basics

    +

    This playlist, by Bisq founder Manfred Karrer and contributor Aruna Surya, covers 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. The videos are long, but done in question-answer interview format, so they're easy to follow.

    +
    +
  • +
  • +
    +

    BSQ Token in Bisq

    +

    Outspoken Bitcoin maximalist Max Hillebrand discusses the BSQ token and why, in his opinion, "it's not a shitcoin." This video is one from a series of videos by Max posted on the World Crypto Network YouTube channel that covers everything from installing Bisq, setting up payment accounts and settings, making offers, taking offers, and beyond.

    +
    +
  • +
  • +
    +

    Bisq DAO Discussion with Eyal Ron

    +

    Casual and insightful discussion about the ideas and concepts of the Bisq DAO between Bisq founder Manfred Karrer and Bisq contributor Eyal Ron. Eyal had a big hand in shaping the workings of the Bisq DAO, along with Manfred, so it's nice to hear their thoughts.

    +
    +
  • +
  • +
    +

    The DAO of Bisq

    +

    Meetup presentation on the Bisq DAO by Eyal Ron. It's a ground-up explanation of the Bisq DAO that doesn't assume any prior knowledge.

    +
    +
  • +
+ +
Written Guides
+
    +
  • +
    +

    Introduction to the Bisq DAO

    +

    Plain-language description of the DAO and BSQ token, and how it enables decentralized funding and decision-making for the Bisq Network.

    +
    +
  • +
  • +
    +

    Getting Started with the Bisq DAO

    +

    Step-by-step walk-through of the Bisq DAO. Shows you how to participate in one round of voting, from making a compensation request to voting on other proposals. As of December 2018, the Bisq DAO is live on testnet, so you can tinker with it right now!

    +
    +
  • +
  • +
    +

    Phase Zero: A Plan for Bootstrapping the Bisq DAO

    +

    An overview of the philosophy behind Bisq, why it was created, and how it planned to decentralize its own team from the very beginning. Doc is a bit long, so check out Max Hillebrand's reading if you prefer.

    +
    +
  • +
+ +
Technical
+
    +
  • +
    +

    Bisq DAO Technical Specification

    +

    Technical details of (1) what BSQ tokens actually are, how they're created, and how they're destroyed and (2) the various functions of the Bisq DAO and how BSQ enables them. The document includes several example transactions so you can see explicitly see the processes.

    +
    +
  • +
  • +
    +

    Dev Session on the Bisq DAO

    +

    This video is a thorough look at the technical implementation of the Bisq DAO. It's a fairly advanced treatment of the DAO that assumes you are already familiar with its basic ideas and workings.

    +
    +
  • +
+
+
+ +
+

Like any social organization, the Bisq DAO is not perfect. But it's an ever-adapting mechanism that will continually improve with time.

+

Feel free to connect with us on Slack and Twitter, and check out our code on GitHub.

+ +
+ +
+ +
From 5c4ee61eb738330ece7027d849ee60f66dde2307 Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Wed, 30 Jan 2019 16:38:25 -0500 Subject: [PATCH 4/7] Add dao simulation --- css/styles.css | 73 ++++++- dao.html | 452 +++++++++++++++++++++++++++++++++++++++++-- images/dao-sim.svg | 2 + images/why-dao-1.svg | 2 + images/why-dao-2.svg | 2 + 5 files changed, 518 insertions(+), 13 deletions(-) create mode 100644 images/dao-sim.svg create mode 100644 images/why-dao-1.svg create mode 100644 images/why-dao-2.svg diff --git a/css/styles.css b/css/styles.css index 98b379fe..fb602586 100644 --- a/css/styles.css +++ b/css/styles.css @@ -827,7 +827,7 @@ dao page } #dao-explainer .panel { /* :not(:last-child) */ - min-height: 50vh; + /* min-height: 50vh; */ position: relative; border-bottom: 1px solid #f3f3f3; } @@ -856,6 +856,58 @@ dao page margin: 50px auto; } +#dao-explainer .panel .image-pair { + margin: 0 auto 75px auto; +} + +#dao-explainer .panel .image-pair img { + margin-top: 75px; +} + +#dao-explainer .panel object { + height: 65vh; + max-width: 100%; + margin: 0 auto 50px auto; + padding: 25px; + border: 4px solid #f3f3f3; +} + +#dao-explainer .panel object.voting { + background-color: #f3f3f3; +} + +#dao-sim-dashboard { + background-color: #f3f3f3; + margin: 40px auto 0 auto; + text-align: left; + position: relative; + padding: 12px 16px 8px 16px; + width: calc(65vh * 1.36969546096); + max-width: 100%; +} + +#dao-sim-dashboard p { + margin-bottom: 0 +} + +#dao-sim-dashboard .stage-indicator { + width: 100%; +} + +#dao-sim-dashboard .stage-indicator .main { + font-size: 22px; +} + +#dao-sim-dashboard p.dao-voting-countdown { + width: 200px; + position: absolute; + right: 20px; + bottom: -60px; + height: 50px; + line-height: 50px; + text-align: right; +} + #dao-explainer .panel-interlude { background-color: #f3f3f3; position: absolute; @@ -884,8 +936,23 @@ dao page } +/***************** +dao simulation +*****************/ + +.animated-blinker { + animation: blinker 1.0s cubic-bezier(.5, 0, 1, 1) infinite alternate; + /* color: #e74c3c; */ +} + +@keyframes blinker { + from { opacity: 1; } + to { opacity: 0; } +} + /****************/ + @media (max-width: 1100px) { .navbar-expand-lg .navbar-nav .nav-link { padding-right: 0.1rem; @@ -951,6 +1018,10 @@ dao page padding-top: 80px; } + #dao-explainer .panel .image-pair img { + width: 100%; + } + #dao-explainer .panel-interlude { position: relative; bottom: initial; diff --git a/dao.html b/dao.html index 8e2c6441..0ce86694 100644 --- a/dao.html +++ b/dao.html @@ -21,7 +21,7 @@

Using the Bitcoin protocol to decentralize Bisq Network's funding and policy
-

Usually, tokens aren't useful because the entities issuing them could accomplish the same goals without a token.

+

Usually, tokens aren't useful because the entities issuing them can accomplish the same goals without a token.

But Bisq is not an entity, so it needs a token to do what an entity would otherwise do.

@@ -36,6 +36,13 @@

Using the Bitcoin protocol to decentralize Bisq Network's funding and policy

Why a DAO?

Bisq seems to work just fine right now...?

+

Bisq's core trading service is not changing a whole lot. The major changes are in how it's controlled: how trading fees are handled and how decisions are made.

+ +
+ + +
+

Bisq trading is currently decentralized, but management is not.

Bisq needs to decentralize its own management to become truly resistant to censorship.

@@ -52,14 +59,434 @@

Bisq seems to work just fine right now...?

Okay...But Why a Token?

-

"Just use plain bitcoin"

+

A simulation to show why plain bitcoin doesn't work

+ +

Play with the simulation below to get a practical feel for how BSQ trading fees differ from BTC trading fees. As with the real Bisq, you're the trader and you ultimately decide how you want to pay fees.

+

Every few seconds, you'll notice that contributors will deliver work and ask for compensation. Periodically, DAO voting converts those requests into BSQ tokens you can buy to place a trade.

+

This is just a simulation. Trading fees are exaggerated for clarity, but the point is that BTC fees will be higher than BSQ fees to incentivize traders to compensate contributors.

+ +
+
+

Click on a contributor to buy BSQ

+

Or click on a trader to trade without BSQ (see what happens!)

+
+

Next DAO Vote in 0:31

+
+ + + +

Who actually votes? Any trader and contributor who wants to. Contributor compensation is just one aspect of voting. Virtually every facet of the Bisq project's policy can be altered by making a proposal in the DAO.

-

To make a Bitcoin transaction, you need a recipient's address. As Bisq itself is decentralized, that address won't be known.

-

Thus sending trading fees with a plain Bitcoin transaction is impossible, and a token is needed as a placeholder.

+

When Bisq governance is decentralized, the destination for trading fees will no longer be known at the time of the transaction.

+

Thus paying trading fees with a plain Bitcoin transaction will be impossible, and a token is needed as a placeholder.

+ +
diff --git a/images/dao-sim.svg b/images/dao-sim.svg new file mode 100644 index 00000000..60681693 --- /dev/null +++ b/images/dao-sim.svg @@ -0,0 +1,2 @@ + +
       Jon
Contributor
[Not supported by viewer]
       Kim
Contributor
[Not supported by viewer]

      Lou
Trader

[Not supported by viewer]

     Amy
Trader

[Not supported by viewer]
YOU
YOU

      Bob
Trader

[Not supported by viewer]
      Tom
Contributor
[Not supported by viewer]
0.0 BSQ
[Not supported by viewer]
BTC Donation Address
[Not supported by viewer]
0.0 BTC
[Not supported by viewer]
0.0 BTC
0.0 BSQ
0.0 BSQ Requested
[Not supported by viewer]
0.0 BTC
4.0 BSQ
0.0 BSQ Requested
[Not supported by viewer]
0.0 BTC
0.0 BSQ
0.0 BSQ Requested
[Not supported by viewer]
[               placeholder               ]
[Not supported by viewer]
Trade with BTC
Trade with BTC
Trade with BSQ
Trade with BSQ
2.0 BTC
[Not supported by viewer]
\ No newline at end of file diff --git a/images/why-dao-1.svg b/images/why-dao-1.svg new file mode 100644 index 00000000..effaf979 --- /dev/null +++ b/images/why-dao-1.svg @@ -0,0 +1,2 @@ + +
Without Bisq DAO
<font face="Courier New" color="#25b135" style="font-size: 24px">Without Bisq DAO</font>
centralized governance 
decision-making concentrated, and all fees go to one place
[Not supported by viewer]
distributed trading network
trading is peer-to-peer
[Not supported by viewer]
✔️
✔️
 ⚠️  vulnerability 
[Not supported by viewer]
contributor
network
[Not supported by viewer]
trader
network
[Not supported by viewer]
  vulnerability  ⚠️
[Not supported by viewer]
\ No newline at end of file diff --git a/images/why-dao-2.svg b/images/why-dao-2.svg new file mode 100644 index 00000000..5e0342b5 --- /dev/null +++ b/images/why-dao-2.svg @@ -0,0 +1,2 @@ + +
With Bisq DAO
[Not supported by viewer]
decentralized governance 
fees distributed on merit, decision-making is collective
[Not supported by viewer]
distributed trading network
trading is peer-to-peer
[Not supported by viewer]
✔️
✔️
contributor
network
[Not supported by viewer]
trader
network
[Not supported by viewer]
✔️
✔️
\ No newline at end of file From 1ceeae7506b1e638862c773abd629b001a8ff8ef Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Thu, 31 Jan 2019 01:29:18 -0500 Subject: [PATCH 5/7] Fix dao simulation bugs Timer error from quick-clicking, negative btc, false zero values. --- dao.html | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dao.html b/dao.html index 0ce86694..c328ee07 100644 --- a/dao.html +++ b/dao.html @@ -124,7 +124,7 @@

A simulation to show why plain bitcoin doesn't work

var contributions = [ { task: "delivered code to Bisq", amount: "6" }, { task: "wrote a doc for Bisq", amount: "4" }, - { task: "provided support to Bisq users", amount: "2" } + { task: "provided support to Bisq users", amount: "4" } ]; //user @@ -162,6 +162,8 @@

A simulation to show why plain bitcoin doesn't work

$( window ).on( 'load', function () { + var tradingActionTimer = undefined; + //get the svg element var daoSim = document.getElementById( "dao-sim" ); var daoSimDOM = daoSim.contentDocument; @@ -258,6 +260,7 @@

A simulation to show why plain bitcoin doesn't work

function tradeWithBSQ() { + clearTimeout( tradingActionTimer ); clearInterval(daoVoteTimer); if( user.bsq > 0 ) { @@ -266,7 +269,7 @@

A simulation to show why plain bitcoin doesn't work

user.bsq -= 2; //display info - $( $( daoSimDOM ).find( alertBoxTextNode )[0] ).text( "Trade placed. You paid 2 BSQ (.05 BTC) in fees. Much cheaper than BTC, and a contributor was paid! Bravo." ); + $( $( daoSimDOM ).find( alertBoxTextNode )[0] ).text( "Trade placed. You paid 2 BSQ (.05 BTC) in fees. Much cheaper than BTC fees, and a contributor was paid! Bravo." ); $( $( daoSimDOM ).find( 'g:nth-child(28) > switch > foreignObject > div > div > div > span' )[0] ).text( ( user.bsq ).toFixed(1) + " BSQ" ); //grab attention @@ -282,7 +285,7 @@

A simulation to show why plain bitcoin doesn't work

} - setTimeout( function() { + tradingActionTimer = setTimeout( function() { removeAttentionGrabbers(); startVotingInterval(); }, 4000 ); @@ -292,6 +295,7 @@

A simulation to show why plain bitcoin doesn't work

function tradeWithBTC() { + clearTimeout( tradingActionTimer ); clearInterval(daoVoteTimer); if( user.btc >= 0.8 ) { @@ -314,7 +318,7 @@

A simulation to show why plain bitcoin doesn't work

$( $( daoSimDOM ).find( 'g:nth-child(46) > switch > foreignObject > div > div > div > span' ) ).addClass( 'attention-grabber highlight' ); } - setTimeout( function() { + tradingActionTimer = setTimeout( function() { removeAttentionGrabbers(); startVotingInterval(); }, 4000 ); @@ -327,20 +331,24 @@

A simulation to show why plain bitcoin doesn't work

*/ function showBSQSale( i ) { + clearTimeout( tradingActionTimer ); clearInterval(daoVoteTimer); - if( contributors[i]['bsq'] < 4 ) { + if( contributors[i]['bsq'] < 2 ) { $( $( daoSimDOM ).find( alertBoxTextNode )[0] ).text( "This contributor doesn't have any BSQ yet. Try another contributor." ); $( $( daoSimDOM ).find( alertBoxTextNode )[0] ).addClass( 'attention-grabber highlight' ); + } else if( user.btc <= 0 ) { + $( $( daoSimDOM ).find( alertBoxTextNode )[0] ).text( "Not enough BTC to buy BSQ." ); + $( $( daoSimDOM ).find( alertBoxTextNode )[0] ).addClass( 'attention-grabber highlight' ); } else { user.btc -= 0.1; - user.bsq += 4; + user.bsq += 2; contributors[i]['btc'] += 0.1; - contributors[i]['bsq'] -= 4; + contributors[i]['bsq'] -= 2; //display info - $( $( daoSimDOM ).find( alertBoxTextNode )[0] ).text( "You bought 4 BSQ from " + contributors[i]['name'] + " for 0.1 BTC. Contributor is paid, and you can trade :)" ); + $( $( daoSimDOM ).find( alertBoxTextNode )[0] ).text( "You bought 2 BSQ from " + contributors[i]['name'] + " for 0.1 BTC. Contributor is paid, and you can trade :)" ); //contributor balances $( $( daoSimDOM ).find( contributors[i]['btc_display_element'] )[0] ).text( ( contributors[i]['btc'] ).toFixed(1) + " BTC" ); $( $( daoSimDOM ).find( contributors[i]['bsq_display_element'] )[0] ).text( ( contributors[i]['bsq'] ).toFixed(1) + " BSQ" ); @@ -356,7 +364,7 @@

A simulation to show why plain bitcoin doesn't work

$( $( daoSimDOM ).find( contributors[i]['bsq_display_element'] )[0] ).addClass( 'attention-grabber highlight' ); } - setTimeout( function() { + tradingActionTimer = setTimeout( function() { removeAttentionGrabbers(); startVotingInterval(); }, 4000 ); From e52b513867db299443479dd1525e9a5fa1612f94 Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Thu, 31 Jan 2019 01:32:11 -0500 Subject: [PATCH 6/7] Move dao - - @@ -675,3 +262,415 @@
Technical
+ + From 5b1fc6f8a42ccbe674c4400a409154a84a238a84 Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Thu, 31 Jan 2019 01:55:13 -0500 Subject: [PATCH 7/7] Fix typos --- dao.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dao.html b/dao.html index 0d1916a5..bd7c42d5 100644 --- a/dao.html +++ b/dao.html @@ -94,7 +94,7 @@

Let's break it down

Is Bisq doing this because it needs money?

-

No. Bisq has bootstrapped itself to facilitate 20,000+ total trades since in the 2.5 years since April 2016. It makes real revenue right now.

+

No. Bisq has bootstrapped itself to facilitate 20,000+ total trades in the 2.5 years since April 2016. It makes real revenue right now.

The goal is to remove central points of authority from Bisq's control structure.

@@ -113,7 +113,7 @@

Let's break it down

Why can't you just do this with plain Bitcoin?

-

Because the sender of bitcoin is not known ahead of time. Consider the trading fee transaction. You need a sender and a recipient to do a Bitcoin transaction, right? There's a gap between the time a contributor does work and the time a trader places a trade, and nowhere to hold the value to be transferred in the interim. BSQ is a tool to hold the value of a contributor's labor until a trader shows up to pay for it.

+

Because the sender of bitcoin is not known ahead of time, when compensation is earned. Consider the trading fee transaction. You need a sender and a recipient to do a Bitcoin transaction, right? There's a gap between the time a contributor does work and the time a trader places a trade, and nowhere to hold the value to be transferred in the interim. BSQ is a tool to hold the value of a contributor's labor until a trader shows up to pay for it.

@@ -230,7 +230,7 @@
Written Guides
  • Phase Zero: A Plan for Bootstrapping the Bisq DAO

    -

    An overview of the philosophy behind Bisq, why it was created, and how it planned to decentralize its own team from the very beginning. Doc is a bit long, so check out Max Hillebrand's reading if you prefer.

    +

    An overview of the philosophy behind Bisq, why it was created, and how it planned to decentralize its own team from the very beginning. The doc is a bit long, so check out Max Hillebrand's reading if you prefer.

  • @@ -240,7 +240,7 @@
    Technical
  • Bisq DAO Technical Specification

    -

    Technical details of (1) what BSQ tokens actually are, how they're created, and how they're destroyed and (2) the various functions of the Bisq DAO and how BSQ enables them. The document includes several example transactions so you can see explicitly see the processes.

    +

    Technical details of (1) what BSQ tokens actually are, how they're created, and how they're destroyed and (2) the various functions of the Bisq DAO and how BSQ enables them. The document includes several example transactions so you can explicitly see the processes.