Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds glossary term content [contributes to #1718] #1725

Merged
merged 6 commits into from
Nov 11, 2020
Merged

Adds glossary term content [contributes to #1718] #1725

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a02c96a
contributes to glossary #1718
wackerow Nov 2, 2020
1afd919
updated defi, stablcoin, staking definitions
wackerow Nov 3, 2020
f0521c7
Changed gatekeeper to intermediaries
ryancreatescopy Nov 4, 2020
43f142e
Merge branch 'dev' into w/glossary2
wackerow Nov 4, 2020
ec58225
refactored links to markdown
wackerow Nov 4, 2020
cc2f6dc
Update link to staking page
samajammin Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/content/glossary/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ Decentralized application. At a minimum, it is a [smart contract](#smart-contrac

See [non-fungible token (NFT)](#nft)

### defi {#defi}

Short for "decentralized finance," a broad category of [Dapps](#dapp) with the intent of providing a wide range of financial services in a decentralized, peer-to-peer manner, without the need for a trusted third party, but instead utilizing [smart contracts](#smart-contract). How truly decentralized a given defi application may be involves many factors, and the truth often exists somewhere on a spectrum between completely centralized, and completely decentralized.
samajammin marked this conversation as resolved.
Show resolved Hide resolved

<a href="/en/dapps/#how-to-use-an-application-built-on-ethereum">More about Dapp uses<Emoji text=":point_right:" size={1} marginLeft={0.75} /></a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<a href="/en/dapps/#how-to-use-an-application-built-on-ethereum">More about Dapp uses<Emoji text=":point_right:" size={1} marginLeft={0.75} /></a>
[More about Dapp uses <Emoji text=":point_right:" size={1} marginLeft={0.75} />](/dapps/#how-to-use-an-application-built-on-ethereum)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can & should continue to use markdown syntax where possible.

Note: we can & should also drop the language path (/en/ in this case). When we use markdown links, Gatsby uses our Link component under the hood, which automatically adds the language path. This makes it easier when translating pages - we don't have to update the links everywhere.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samajammin 👍 Will definitely remove the /en/ language path. (Note though that all static.js pages will interpret the anchor tags into the custom Link component as well, not just when using markdown... custom component in the works will do the same):
image

I'll fix these now to get this pulled in first.


### difficulty {#difficulty}

A network-wide setting that controls how much computation is required to produce a [proof-of-work](#pow).
Expand Down Expand Up @@ -424,6 +430,18 @@ A procedural (imperative) programming language with syntax that is similar to Ja

A [hard fork](#hard-fork) of the Ethereum blockchain, which occurred at block 2,675,000 to address more denial-of-service attack vectors and clear state (see [Tangerine Whistle](#tangerine-whistle)). Also, a replay attack protection mechanism.

### stablecoin {#stablecoin}

An [ERC-20 token](#token-standard), backed by a reserve asset, with price pegged to real-world asset value. Examples of uses include pegging an ERC-20 tokens value to the value of fiat currency, precious metals, or other cryptocurrencies.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested edit:

"An ERC-20 token with a value pegged to another asset's value. There are stablecoins backed by fiat currency like dollars, precious metals like gold, and other cryptocurrencies like Bitcoin."


<a href="/en/eth/#tokens">More about tokens<Emoji text=":point_right:" size={1} marginLeft={0.75} /></a>
samajammin marked this conversation as resolved.
Show resolved Hide resolved

### staking {#staking}

The act of locking up a quantity of [ether](#ether) (your stake in the network) to earn the right to validate [transactions](#transaction) and propose [blocks](#block) under a [proof-of-stake](#pos) consensus model. For [Ethereum 2.0](#serenity), each validator requires staking 32 ether by depositing to a [smart contract](#smart-contract), which enables each validator to attest to transactions and propose blocks. Being a validator carries responsibilities, and comes with rewards for fulfilling them, and varying degrees of penalties for not.
samajammin marked this conversation as resolved.
Show resolved Hide resolved

<a href="/en/eth2/get-involved/">More about staking<Emoji text=":point_right:" size={1} marginLeft={0.75} /></a>
samajammin marked this conversation as resolved.
Show resolved Hide resolved

### szabo {#szabo}

A denomination of [ether](#ether). 1 szabo = 10¹² [wei](#wei), 10⁶ szabo = 1 ether.
Expand Down