Skip to content

Commit

Permalink
Merge branch 'r2d' into dependabot/npm_and_yarn/r2d/gatsby-remark-res…
Browse files Browse the repository at this point in the history 
…ponsive-iframe-2.4.13
  • Loading branch information
@twblack88
twblack88 authored Sep 8, 2020
2 parents e05a42c + 29704f3 commit 8d4ceb9
Show file tree
Hide file tree
Showing 11 changed files with 168 additions and 139 deletions.
38 changes: 15 additions & 23 deletions content/en/funding/community-projects/index.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,35 @@ keywords: Autonomous, Single Owner, Projects

# Community Projects

### Apply to Help Improve the Maker Community
Propose your own work or help other community members with their projects.

Propose your own project or help another community member with theirs. Visit our [help wanted board,](https://github.com/makerdao/community/projects/2?card_filter_query=label%3A%22help+wanted%22) comment on open issues, or contact the owner.
Visit our [help wanted board,](https://github.com/makerdao/community/projects/2?card_filter_query=label%3A%22help+wanted%22) comment on open issues, or contact the owner.

### Community Development Initiative Proposals (CDIPs)
Read more about Community Development and self-directed projects.

<Aligner center>

<Button to="/funding/community-projects/community-projects-process/">
Community Projects Process
</Button>

</Aligner>

## Community Development Initiative Proposals (CDIPs)

Get access to up to 5000 Dai of funding by proposing your own idea. We use Community Development Initiative Proposals (CDIPs) to determine the financing of self-directed projects.

A CDIP is the scoping and framing tool for anyone interested in receiving funds for proposing new MakerDAO community initiatives or resources.

<Callout icon="question" secondary>

Are you looking to contribute to an existing project? Visit our <Link to="/work-with-us/bounties/index.mdx">bounties page.</Link>
Looking to contribute to an existing project? Visit our <Link to="/work-with-us/bounties/index.mdx">bounties page.</Link>

</Callout>

<List>

## Examples
### Examples

<Tout>

Expand Down Expand Up @@ -69,21 +79,3 @@ Ryan Cordell revamped the content in our Community Portal to help us migrate fro
Reach out to us on the community chat if you want to know more about submitting a community project idea.

[Community Chat](https://chat.makerdao.com/channel/community-development)

<Tout image>

<Box>

Read more about Community Development and self-directed projects.

<Aligner center>

<Button to="/funding/community-projects/community-projects-process/">
Community Projects Process
</Button>

</Aligner>

</Box>

</Tout>
45 changes: 14 additions & 31 deletions content/en/funding/development-grants/development-grants-info.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,11 @@ description: Apply for Development Grants from MakerDAO. Development grants prov

# Development Grants

The MakerDAO Community grants program funds projects that increase Dai adoption, support emerging economies, open new markets, provide novel uses for the stablecoin, or other further the MakerDAO Foundation's principles.
## The MakerDAO Core Community Development Initiative

We allocate grants ranging from 5K - 50K Dai. We distribute blocks of funds as teams reach their predetermined milestones.
We provide funding for all kinds of teams that create infrastructure and applications for the Maker ecosystem.

<Tout>

<Box>

### What We Fund

- Tools That Directly Benefit Dai and MKR Users
- Expanding Dai Adoption
- Increasing Access to Personal Liquidity

</Box>

<Box>

### What We Don't Fund

- Pure R&D
- Information Gathering
- Additional Runway
- Generic Ethereum Ecosystem Improvements
- Large Marketing Budgets
- Dai Airdrops | Giveaways

</Box>

</Tout>
So far, since February 2018, we've awarded over 683,887 DAI.

## Requirements

Expand Down Expand Up @@ -70,6 +45,14 @@ Split your work into milestones. We distribute blocks of funds as teams reach pr

Our [Grantee Playbook](/funding/development-grants/grantee-playbook/) will provide an idea of what's expected.

<Aligner center>

<Button to="/funding/development-grants/grantee-playbook/">Read the Grantee Playbook</Button>

</Aligner>

## Application

Due to the high volume of worthy requests we receive, and the limited resources available, we prioritize applications with conservative budgets.

<CTA>
Expand All @@ -84,23 +67,23 @@ To apply, please send an email describing:

<Box>

What is the Project?
#### What is the Project?

What does the project do, and whom are you helping? Describe the solution and anything else that will help us understand your approach.

</Box>

<Box>

Budget
#### Budget

Budget explanations, examples, and anything else that will help a user structure this section of their application.

</Box>

<Box>

What’s the Problem?
#### What’s the Problem?

The problem you’re solving, explanations, examples, and anything else that will help a user structure this section of their application.

Expand Down
37 changes: 34 additions & 3 deletions content/en/funding/development-grants/index.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,45 @@ Dai and MakerDAO, you could be eligible for funding."

# Development Grants

### The MakerDAO Core Community Development Initiative
The MakerDAO Community grants program funds projects that increase Dai adoption, support emerging economies, open new markets, provide novel uses for the stablecoin, or other further the MakerDAO Foundation's principles.

We provide funding for all kinds of teams that create infrastructure and applications for the Maker ecosystem.
We allocate grants ranging from 5K - 50K Dai. We distribute blocks of funds as teams reach their predetermined milestones.

So far, since February 2018, we've awarded over 683,887 DAI.
<Tout>

<Box>

### What We Fund

- Tools That Directly Benefit Dai and MKR Users
- Expanding Dai Adoption
- Increasing Access to Personal Liquidity

</Box>

<Box>

### What We Don't Fund

- Pure R&D
- Information Gathering
- Additional Runway
- Generic Ethereum Ecosystem Improvements
- Large Marketing Budgets
- Dai Airdrops | Giveaways

</Box>

</Tout>

<Aligner center>

<Button to="/funding/development-grants/development-grants-info/">Apply for a Development Grant</Button>

</Aligner>

<Aligner center>

<Button to="/funding/development-grants/grantee-playbook/">Read the Grantee Playbook</Button>

</Aligner>
28 changes: 9 additions & 19 deletions content/en/funding/meetup-funding.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,7 @@ We are currently funding **virtual meetups only**.

# Meetup Funding

<Aligner center>

## Since February 2018, we've brought together over 5,631 people across 33 countries.

</Aligner>

<Aligner center>

### The MakerDAO Core Community Development Initiative supports both virtual and physical meetups.

</Aligner>

<Aligner center>

<Button to="https://airtable.com/shr4HOtcZ8o3VZmek">Apply for Meetup Funding</Button>

</Aligner>
The MakerDAO Core Community Development Initiative supports both virtual and physical meetups.

<Flex sx={{alignItems: 'center', justifyContent: 'space-evenly'}}>

Expand Down Expand Up @@ -60,9 +44,15 @@ Submitted
</TDStat>
</Flex>

<Aligner center>

<Button to="https://airtable.com/shr4HOtcZ8o3VZmek">Apply for Meetup Funding</Button>

</Aligner>

We fund meetups worldwide that support introducing newcomers to the blockchain, Ethereum, DeFi, and MakerDAO.

Since February 2019, Maker has funded over 100 meetups. Maker's Grant Program has distributed over 40,000 Dai to over 5,600 people across 33 countries.
Since February 2018, Maker's Grant Program has distributed over 40,000 Dai to 100+ meetups in 33 countries supporting more than 5,600 attendees.

<Tout>

Expand Down Expand Up @@ -110,7 +100,7 @@ Banners | T-shirts | Paid Marketing
>
> Reach out to us at: [email protected]
Whether this is your first meetup, or if you're an experienced organizer, follow the steps below to apply for funding.
Whether this is your first meetup or if you're an experienced organizer, please follow the steps below to apply for funding.

After submitting your application, please allow three to five business days for a response.

Expand Down
18 changes: 7 additions & 11 deletions content/en/learn/Oracles/how-it-works.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description: "How oracles are used in the Maker Protocol."

In the Maker Protocol, each collateral type has a corresponding oracle that publishes a reference price that the system uses. Each oracle consists of an [Oracle Security Module](https://docs.makerdao.com/smart-contract-modules/oracle-module/oracle-security-module-osm-detailed-documentation) and a [Medianizer.](https://docs.makerdao.com/smart-contract-modules/oracle-module/median-detailed-documentation) The Medianizer is sent data through a system of Feeds and relayers.

Each Feed uses a tool called [Setzer](https://github.com/makerdao/setzer-mcd), which pulls the median price from a set of exchanges and then pushes it to a [Secure Scuttlebut Network](https://scuttlebot.io/more/protocols/secure-scuttlebutt.html) that has relayers reading from it. Relayers aggregate the price data and send a transaction to the Medianizer.
Each Feed uses a tool called [Setzer](https://github.com/makerdao/setzer-mcd), which pulls the median price from a set of exchanges and then pushes it to a [Secure Scuttlebutt Network](https://scuttlebot.io/more/protocols/secure-scuttlebutt.html) that has relayers reading from it. Relayers aggregate the price data and send a transaction to the Medianizer.

The Medianizer then takes the median of the multiple reported medians and publishes it as a queued reference price. This price is then delayed by the Oracle Security Module before it is finally used by the system.

Expand All @@ -22,17 +22,17 @@ Feeds may configure Setzer to pull from any exchanges of their choosing. Relayer

In the Maker Protocol, if the reference price for an asset was determined by a single party, then they could fraudulently report an incorrect price and cause severe issues.

For instance, if the price of ETH was reported to be fraudulently low, say $0.01, then every single ETH [Vault](/learn/vaults/) in the system would be [Liquidated.](https://community-development.makerdao.com/makerdao-mcd-faqs/faqs/liquidation)
For instance, if the price of ETH was reported to be fraudulently low, say $0.01, then every single ETH [Vault](/learn/vaults/) in the system would be [Liquidated.](https://community-development.makerdao.com/makerdao-mcd-faqs/faqs/liquidation)

On the other hand, if the price of ETH was reported to be artificially high, say $1,000,000.00, then any ETH Vault owner would be able to issue an excessive amount of Dai since the system thinks there is more Collateral value than there actually is.

Oracle attacks can be very profitable for a successful attacker and can be very disruptive to MakerDAO and its users.

### How is privacy handled?

From their onset, the individuals running feeds have been pseudonymous out of necessity, to protect the individuals from the risk of extortion and blackmail.
From their onset, the individuals running feeds have been pseudonymous out of necessity, to protect the individuals from the risk of extortion and blackmail.

Pseudonymous Feeds also have the benefit of making it harder to coordinate an Oracle attack since the Feeds don’t know who the others are. Organizations running Feeds, however, are different.
Pseudonymous Feeds also have the benefit of making it harder to coordinate an Oracle attack since the Feeds don’t know who the others are. Organizations running Feeds, however, are different.

Organizations are much more resilient against coercion, have the resources to combat malicious actors, and have their reputations at stake. This makes them much better equipped to be Feeds with public identities. A hybrid model is optimal, one that incorporates the benefits of both individual and organizational Feeds.

Expand All @@ -44,18 +44,14 @@ Yes, the oracle system is resistant to Sybil attacks. The system uses a whitelis

### What happens if an exchange experiences a flash crash?

The reference price published by the Oracles is a median of the median prices reported by at least 20 different Feeds, outliers are automatically filtered out.
The reference price published by the Oracles is a median of the median prices reported by at least 20 different Feeds, outliers are automatically filtered out.

In practice, this means if a single exchange experiences a flash crash the set of prices will look something like this:



[0.70, 104.80, 104.82, **104.88**, 104.90, 105.02, 105.04]


`[0.70, 104.80, 104.82, **104.88**, 104.90, 105.02, 105.04]`

The median of this set still reflects the real market price of the asset. Flash crashes on single exchanges do not affect the published reference price.

### Can MakerDAO governance change the time of the Oracle Security Module’s delay?

Yes. This parameter is called the <inline code>Oracle Security Module Delay</inline> and can be adjusted by MKR token holders.
Yes. This parameter is called the `Oracle Security Module Delay` and can be adjusted by MKR token holders.
35 changes: 24 additions & 11 deletions content/en/work_with_us/content/index.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ description: "Community-contributed content helps ensure up-to-date resources fo

<Box>

## Help us improve the community site by creating new content, editing existing content, or suggesting improvements.
Designers, Writers, Editors, and other skilled contributors are encouraged to help with current content creation efforts and propose new ones.
## Create new content, edit existing content, and suggest improvements.

Designers, writers, editors, and other skilled contributors are encouraged to help with existing efforts and propose new ones.

Community-contributed content helps ensure up-to-date resources for learning about MakerDAO, Maker, and Dai.

</Box>
Expand All @@ -28,11 +30,11 @@ Get paid in Dai to create content for Comm-Dev.

</Callout>

## Requirements

### Requirements
Community-contributed content provides up-to-date resources for learning about MakerDAO, Maker, and Dai.

Designers, Writers, Editors, and other skilled contributors are encouraged to help with current content creation efforts and propose new ones.
Community contributed content helps ensure up-to-date resources for learning about MakerDAO, Maker, and Dai.

Content contributors should be:

Expand All @@ -50,6 +52,12 @@ Collaborative and used to working with a team.

</Checklist>

### How to Contribute

Anyone can edit any page on this site.

We believe open-source contributions are the key to a healthy community.

<Column>

<Box>
Expand All @@ -68,7 +76,7 @@ We welcome videos, documents, pictures.

## Make Edits and Improvements

Anyone can edit any page on this site because we believe open-source contributions are the key to a healthy community. If you spot any mistakes, or if you would like to add any information, feel free to hit Edit and make changes via GitHub. All edits go through a review process before being merged into the community repository.
If you spot any mistakes, or if you would like to add any information, feel free to hit Edit and make changes via GitHub. All edits go through a review process before being merged into the community repository.

[How to review like Maker](/work_with_us/content/reviewer-guide/)

Expand Down Expand Up @@ -130,14 +138,21 @@ Be sure to look over our list of [open bounties](https://github.com/makerdao/com
</Callout> -->


## Payment
### Payment

You can earn Dai for any content you create that gets approved. We'll reach out to you privately to discuss payment and compensation. Don't be afraid to ask someone in the community chat for help with submitting an invoice.
You can earn Dai for any content you create that gets approved. Please reach out privately to discuss payment and compensation.

Don't be afraid to ask someone in the community chat for help with submitting an invoice.

## Ready to Get Started?

Reach out and introduce yourself to the community to let us know you want to contribute
<Link to="https://chat.makerdao.com/channel/community-development" icon="rocketchat">Community Chat</Link>
Introduce yourself to the community to let us know you want to contribute.

<Aligner center>

<Button to="https://chat.makerdao.com/channel/community-development" icon="rocketchat">Community Chat</Button>

</Aligner>

<!-- ## Content Resources

Expand All @@ -147,8 +162,6 @@ These resources should help with writing and editing content for the community:

</List> -->

## Suggested Reading

<Tout>

<Box>
Expand Down
Loading

0 comments on commit 8d4ceb9

Please sign in to comment.