Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
wtf committed Jul 25, 2019
2 parents dbd4a63 + dfc4d22 commit 803c864
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
28 changes: 17 additions & 11 deletions docs/developers/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ Need a more basic primer first? Check out [ethereum.org/learn.](/learn/)


- [Getting up to speed on Ethereum](https://medium.com/@mattcondon/getting-up-to-speed-on-ethereum-63ed28821bbe) *Aug 7, 2017 - Matt Condon*
- [Ethereum In Depth, Part 1](https://blog.zeppelin.solutions/ethereum-in-depth-part-1-968981e6f833) *May 11, 2018 - Facu Spagnuolo*
- [Ethereum In Depth, Part 2 ](https://blog.zeppelin.solutions/ethereum-in-depth-part-2-6339cf6bddb9) *July 24, 2018 - Facu Spagnuolo*
- [Ethereum In Depth, Part 1](https://blog.openzeppelin.com/ethereum-in-depth-part-1-968981e6f833/) *May 11, 2018 - Facu Spagnuolo*
- [Ethereum In Depth, Part 2 ](https://blog.openzeppelin.com/ethereum-in-depth-part-2-6339cf6bddb9/) *July 24, 2018 - Facu Spagnuolo*
- [Ethereum Development Walkthrough, Parts 1-5](https://hackernoon.com/ethereum-development-walkthrough-part-1-smart-contracts-b3979e6e573e) *Jan 14, 2018 - dev_zl*
- [Ethereum 101, Parts 1-7](https://kauri.io/collection/5bb65f0f4f34080001731dc2/ethereum-101) *Feb 13, 2019 - Wil Barnes*
- [Full Stack Hello World Voting Ethereum Dapp Tutorial ](https://medium.com/@mvmurthy/full-stack-hello-world-voting-ethereum-dapp-tutorial-part-1-40d2d0d807c2) *Feb 2019 - Mahesh Murthy*
- [Mastering Ethereum - A comprehensive textbook available for free online](https://github.com/ethereumbook/ethereumbook) *Dec 1, 2018 - Andreas Antonopoulos & Gavin Wood*
- [Ethereum Developer Portal - Everything you need to get started building on Ethereum](https://ethereum.consensys.net/ethereum-dev-portal) *Updated often - ConsenSys*
- [Deconstructing a Solidity Contract](https://blog.zeppelin.solutions/deconstructing-a-solidity-contract-part-i-introduction-832efd2d7737) *Aug 13, 2018 - Alejandro Santander & Leo Arias*
- [Deconstructing a Solidity Contract](https://blog.openzeppelin.com/deconstructing-a-solidity-contract-part-i-introduction-832efd2d7737/) *Aug 13, 2018 - Alejandro Santander & Leo Arias*
- [Full Stack Dapp Tutorial Series ](https://kauri.io/collection/5b8e401ee727370001c942e3) *Updated Often - Joshua Cassidy*


Expand Down Expand Up @@ -71,10 +71,15 @@ Ethereum has a large and growing number of tools to help developers build, test,
- [buidler.dev](https://buidler.dev)
- [Github](https://github.com/nomiclabs/buidler)

### ZeppelinOS *A development framework for building upgradeable smart contracts, and securely managing smart contract applications.*
- [zeppelinos.org](https://zeppelinos.org)
- [Github](https://github.com/zeppelinos)
- [Community Forum](https://forum.zeppelin.solutions/c/zeppelinos)
### OpenZeppelin SDK *The Ultimate Smart Contract Toolkit: A suite of tools to help you develop, compile, upgrade, deploy and interact with smart contracts.*
- [OpenZeppelin SDK](https://openzeppelin.com/sdk/)
- [Github](https://github.com/OpenZeppelin/openzeppelin-sdk)
- [Community Forum](https://forum.openzeppelin.com/c/sdk)

### Tenderly *A platfrom to easily monitor your smart contracts with error tracking, performance metrics, and detailed contract analytics.*
- [tenderly.dev](https://tenderly.dev/)
- [Github](https://github.com/Tenderly)
- [Discord](https://discord.gg/eCWjuvt)

### Python Tooling *Variety of libraries for Ethereum interaction via Python*
- [py.ethereum.org](http://python.ethereum.org/)
Expand Down Expand Up @@ -233,9 +238,10 @@ The Ethereum network is made up of many nodes who run compatible client software
- [dapp.tools/dappsys](https://dapp.tools/dappsys/)
- [Github](https://github.com/dapphub/dappsys)

### OpenZeppelin *Library for secure smart contract development.*
- [openzeppelin.org](https://openzeppelin.org/)
- [Github](https://github.com/OpenZeppelin/openzeppelin-solidity)
### OpenZeppelin Contracts *Library for secure smart contract development.*
- [openzeppelin.com/contracts/](https://openzeppelin.com/contracts/)
- [Github](https://github.com/OpenZeppelin/openzeppelin-contracts)
- [Community Forum](https://forum.openzeppelin.com/c/contracts)

### aragonOS *Patterns for upgradeability & permission control.*
- [hack.aragon.org](https://hack.aragon.org/docs/aragonos-intro.html)
Expand Down Expand Up @@ -280,7 +286,7 @@ The Ethereum network is made up of many nodes who run compatible client software
- [DappUniversity.com](http://www.dappuniversity.com/)

### Ethernaut *Solidity based wargame where each level is a contract to be hacked*
- [ethernaut.zeppelin.solutions](https://ethernaut.zeppelin.solutions/)
- [ethernaut.openzeppelin.com](https://ethernaut.openzeppelin.com/)

## UI/UX
- [Challenge of UX in Ethereum](https://medium.com/ecf-review/challenge-of-ux-in-ethereum-122e1a33688d) *June 25, 2018 - Anna Rose*
Expand Down
5 changes: 5 additions & 0 deletions docs/learn/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ In addition to the information on this page, there are many community-built reso
New to Ethereum? These articles and resources are a good place to get started.

- [A Beginner’s Guide to Ethereum](https://blog.coinbase.com/a-beginners-guide-to-ethereum-46dd486ceecf) *Feb 23, 2017 - Linda Xie*
- [Video: What is Ether and Ethereum?](https://www.youtube.com/watch?v=fjnovGRQrRE) *April 25, 2019 - CME Group*
- [What is Ethereum?](https://education.district0x.io/general-topics/understanding-ethereum/what-is-ethereum/) *District0x*
- [What is Ether?](https://docs.ethhub.io/ethereum-basics/what-is-ether/) *Updated often - EthHub*
- [The Case for Ethereum](http://blog.eladgil.com/2018/01/the-case-for-ethereum.html) *Jan 30, 2018 - Elad Gil*
Expand Down Expand Up @@ -106,6 +107,10 @@ ETH 2.0 (also known as “Serenity”) refers to the next major upgrade of the c
- [Proof of Stake](https://docs.ethhub.io/ethereum-roadmap/ethereum-2.0/proof-of-stake/) *Updated often - EthHub*
- [Sharding](https://docs.ethhub.io/ethereum-roadmap/ethereum-2.0/sharding/) *Updated often - EthHub*
- [ETH 2.0 - The Road to Scaling Ethereum - Vitalik Buterin](https://youtu.be/kCVpDrlVesA) *(Video) November, 2018 - YouTube*
- [ETH 2.0 Researchers AMA Part 1](https://docs.ethhub.io/other/ethereum-2.0-ama/#part-1) *Jan 24, 2019 - EthHub*
- [ETH 2.0 Researchers AMA Part 2](https://docs.ethhub.io/other/ethereum-2.0-ama/#part-2) *Jul 15, 2019 - EthHub*
- [9 Things You Didn't Know About Ethereum 2.0](https://our.status.im/9-things-you-didnt-know-about-ethereum-2-0/) *July 18, 2019 - Bruno Škvorc*


## ETH 1.x

Expand Down
1 change: 0 additions & 1 deletion docs/use/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Here are just a few apps built on Ethereum - we rotate this list frequently!

- [Gitcoin](https://gitcoin.co), a network of incentivized open-source developers
- [Cent](https://beta.cent.co), a social network where you earn money by posting
- [Veil](https://app.veil.co), a trading platform that lets you place bets on real world events
- [CryptoKitties](https://www.cryptokitties.co), a game where you collect and breed digital collectible cats
- [DAI](https://makerdao.com/en/), a stable cryptocurrency that holds value at $1 USD

Expand Down

0 comments on commit 803c864

Please sign in to comment.