From f8cd05eb73d5afe53f77a9c38d0d36a1ba687d1f Mon Sep 17 00:00:00 2001 From: Daniel Lehnberg Date: Mon, 6 Jan 2020 14:00:02 +0100 Subject: [PATCH 1/4] rework fund.html and accompanying scss --- _sass/fund.scss | 2 +- fund.html | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/_sass/fund.scss b/_sass/fund.scss index 795ee2fc..5689b9f6 100644 --- a/_sass/fund.scss +++ b/_sass/fund.scss @@ -14,7 +14,7 @@ } h1 { text-align: center; - font-size: 72px; + font-size: 5rem; font-weight: 800; margin: 4px 0 16px 0; } diff --git a/fund.html b/fund.html index 828a20ba..aa86dd91 100644 --- a/fund.html +++ b/fund.html @@ -6,38 +6,39 @@
GRIN GENERAL FUND -

$855,042

- 70.77 BTC + 0 GRIN +

3,641.22 GRIN
126.25 BTC

+ Source: 2019 Q4 Transparency Report↗

- The General Fund is for Grin’s ongoing projects and ever-expanding needs. Donations into this fund are always welcome and appreciated. + Grin is strictly non-profit. To keep Grin open and free from controlling influences, the project relies 100% on community donations for its funding needs. We ask any person, corporate entity or institution who sees potential in Grin/Mimblewimble technology to consider donating to the project. We hope that the vibrant cryptocurrency community will help Grin to achieve its goal of providing a reliable, scalable and privacy-driven blockchain implementation that truly belongs to everyone. - Donate to the General Fund to show up on the Friends of Grin page. + Donate to the General Fund to be included on the Friends of Grin page.

-

Donate

- GRIN DONATION ADDRESS - Address in /grin-pm repo. +

Donate now

+ GRIN + Donation address in /grin-pm repo BITCOIN LEGACY - Address in /grin-pm repo + Donation address in /grin-pm repo BITCOIN SEGWIT - Address in /grin-pm repo -

Note that the Bitcoin Segwit address is a Bech32 address. Please ensure your wallet supports sending to a Bech32 address before you use it. Many wallets and exchanges now support it, you can check adoption here.

- ETHEREUM - Ethereum donations are suspended temporarily, and will be operational again as soon as possible. - ZCASH - Zcash donations are suspended temporarily, and will be operational again as soon as possible. -

Funds donated in Ethereum and Zcash will be converted to Bitcoin shortly after for simplicity of accounting.

+ Donation address in /grin-pm repo -

What is the General Fund?

-

This is the general development fund intended to cover costs related to Grin’s ongoing development. While the team may not have visibility on every particular need that will arise, all donated funds will be used towards Grin’s development or promotion. - -This fund is managed entirely by the Grin Technical Council, and all spending decisions will be made public. The funds are kept in a 3/5 Multisig wallet, meaning no spending can occur without at least 3 council members actively signing the transaction. +

Community funding principles

+

Unlike the vast majority of blockchain projects, Grin's development is not motivated by profit for either its developers or early adopters. As a measure of this, the community has ensured that: +

-Some examples of where proceeds of this fund might be allocated (by no means exhaustive and subject to change):

+

What is the General Fund?

+

This is the general development fund intended to cover costs related to Grin’s ongoing development. All donated funds will be used towards Grin’s development or promotion. This fund is managed entirely by the Grin core team, and all spending decisions are made public. The BTC funds are kept in a t-of-n multi-sig wallet, meaning no spending can occur without at least t core team members approving the transaction.

-

Further Information

-

The Grin project is strictly non-profit. Please refer back to our Funding overview page for details on our fundraising appoach and our inclusive development philosophy. +

Friends of Grin

+

Grin would not be where it is today where it not for the support received from the long list of individuals, companies, and fellow cryptocurrency projects. We celebrate those and the many others who opted to remain anonymous on our Friends of Grin page. Your contributions, big or small, will always be appreciated.

-As always, anyone donating to this fund can optionally have themselves listed on the Friends of Grin page.

+

Financials

+

Information about donation wallet addresses, income and spending logs, and quarterly financial transparency reports are available in the /grin-pm repo↗.

From 1239903905f18424c7c2c5d045af10a4a2ca607e Mon Sep 17 00:00:00 2001 From: Daniel Lehnberg Date: Mon, 6 Jan 2020 14:01:58 +0100 Subject: [PATCH 2/4] consolidate nav links under a new 'funding' title --- _includes/navigation.html | 3 +-- _layouts/default-black.html | 3 +-- _layouts/default.html | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/_includes/navigation.html b/_includes/navigation.html index 29ee1b33..2115afb3 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -14,8 +14,7 @@
  • Download
  • Community
  • Governance
    • -
  • Friends of Grin
    • -
  • General Fund
    • +
  • Funding
  • Research
  • GitHub
    • diff --git a/_layouts/default-black.html b/_layouts/default-black.html index 122b79e1..7796706e 100644 --- a/_layouts/default-black.html +++ b/_layouts/default-black.html @@ -22,8 +22,7 @@

    Download

    Community

    Governance

     -

    Friends of Grin

     -

    General Fund

     +

    Funding

    Research

    GitHub

     diff --git a/_layouts/default.html b/_layouts/default.html index 23d4d8a1..049ba5eb 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -27,8 +27,7 @@

    Download

    Community

    Governance

     -

    Friends of Grin

     -

    General Fund

     +

    Funding

    Research

    GitHub

     From d578ebda523416e6772b6da46ec41df65eafd4d0 Mon Sep 17 00:00:00 2001 From: Daniel Lehnberg Date: Mon, 6 Jan 2020 14:05:30 +0100 Subject: [PATCH 3/4] add a FoG link to index.html --- index.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 15611d47..3f2da358 100644 --- a/index.html +++ b/index.html @@ -45,16 +45,19 @@

    “

    Introduction to MimbleWimble

    ” →

  • -

    “

    Grin General Fund

    ” →

    +

    “

    Funding

    ” →

  • “

    Community Projects

    ” →

    • +
  • +

    “

    Friends of Grin

    ” →

    +
    • Grin is launched fairly — free of ICO, pre-mine or founder’s reward. We rely on donations to keep working on - the project. Support the movement by purchasing some merch or making a + the project. Support the movement by purchasing some merch↗ or making a donation.
    From 6250979ff0759a54a2d89aa59c3962cebbacc350 Mon Sep 17 00:00:00 2001 From: Daniel Lehnberg Date: Mon, 6 Jan 2020 14:18:57 +0100 Subject: [PATCH 4/4] tweak: grin title amount --- fund.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fund.html b/fund.html index aa86dd91..7b42c37a 100644 --- a/fund.html +++ b/fund.html @@ -6,7 +6,7 @@
    GRIN GENERAL FUND -

    3,641.22 GRIN
    126.25 BTC

    +

    3.6k GRIN
    126.25 BTC

    Source: 2019 Q4 Transparency Report↗