Skip to content

Commit

Permalink
Merge pull request #31 from eth-protocol-fellows/main
Browse files Browse the repository at this point in the history
Feb 20 deployement
  • Loading branch information
taxmeifyoucan authored Feb 20, 2024
2 parents 85bbb50 + 4060bb4 commit bc6f9ed
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ It **does not** cover onchain protocols/dapps, layer 2s/rollups or any other too

The wiki is supposed to cover all important parts of Ethereum core protocol and its development. The protocol architecture and related topics is reflected in the wiki format. The whole wiki lives under `/docs/wiki` and the [sidebar](_sidebar.md) defines the main documentation structure. High level areas are abstracted to directories which include all subtopics.

For contributors, we recommend focusing on specific topics contained in corresponding documents. It's best to own a single topic and work out all the details. Create a new document and add the topic to the sidebar if it's not there yet. Join the [discord server](https://discord.gg/HnCjCvCN), let others know what you are working on in the group channel and collaborate with other contributors writing about related topics. If you are working with multiple people on a significant piece of content, you can have a dedicated branch in the repo for easier coordination.
For contributors, we recommend focusing on specific topics contained in corresponding documents. It's best to own a single topic and work out all the details. Create a new document and add the topic to the sidebar if it's not there yet. Join the [discord server](https://discord.gg/epfsg), let others know what you are working on in the group channel and collaborate with other contributors writing about related topics. If you are working with multiple people on a significant piece of content, you can have a dedicated branch in the repo for easier coordination.

## Editing wiki

Expand Down
4 changes: 2 additions & 2 deletions docs/eps/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ The second part of the program offers two distinct tracks focused on development

The first instance of EPF study group is starting in February 2024. It's completely open and permissionless, and it is up to each participant as to how they want to approach it. Whether you want to learn as much as possible, focus only on certain topics or share your knowledge with others, you are welcomed. Although it's opened, [you can register](https://forms.gle/7TqmryC217EPwgqr9) to help us tailor the experience better.

> Join our community [Discord server](https://discord.gg/HnCjCvCN)
> Join our community [Discord server](https://discord.gg/epfsg)
Study group participants will collaboratively develop a comprehensive wiki, serving as an evolving knowledge base for current and future core developers. This will provide students with practical experience in contributing to open source resources, while gaining invaluable experience in documentation and community-driven development.

While this program is designed to act as a precursor to the Ethereum Protocol Fellowship, the study group is for anyone that is interested in learning more about the inner workings of the Ethereum Protocol. Those that have some general knowledge or use of Ethereum and/or blockchains as well as those that have some computer science, technical, or developer experience will get the most from this program.

## Important links

- Discord server: https://discord.gg/dqNM9zN5
- Discord server: https://discord.gg/epfsg
- Weekly calls: https://meet.ethquokkaops.io/EPFsg
- Sessions calendar: https://calendar.google.com/calendar/u/0?cid=ZXBmc3R1ZHlncm91cEBnbWFpbC5jb20 ([ics format](https://calendar.google.com/calendar/ical/epfstudygroup%40gmail.com/public/basic.ics))

Expand Down
3 changes: 3 additions & 0 deletions docs/eps/week0.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ First, please check out the [announcement blog post](https://blog.ethereum.org/2

The call discussed the program details, schedule and answer your questions. Recording can be found at https://streameth.org/watch?event=epf_study_group&session=65cf9aaa4097e3a08efd1a28.

[recording](https://streameth.org/embed/?playbackId=2cb7oln7ky57em6a&streamId=&playerName=EPF+Study+Group ':include :type=iframe width=100% height=520 frameborder="0" allow="fullscreen" allowfullscreen')


## Pre-reading

Before the program, you should be familiar with some general concepts from Ethereum and computer science. If you are not familiar with basics of using Ethereum or have non experience with software development, we recommend gaining at least some understanding of following:
Expand Down
4 changes: 3 additions & 1 deletion docs/eps/week1.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The first week of the study group is dedicated to a general introduction to the protocol and R&D ecosystem.

Come to see the presentation by Mário Havel on [Monday, February 19, 4PM UTC](https://savvytime.com/converter/utc-to-germany-berlin-united-kingdom-london-ny-new-york-city-ca-san-francisco-china-shanghai-japan-tokyo-australia-sydney/feb-12-2024/4pm). Join the call at this time at https://meet.ethquokkaops.io/EPFsg. The recording will be shared here.
Come to see the presentation by Mário Havel on [Thursday, February 22, 7AM UTC](https://savvytime.com/converter/utc-to-germany-berlin-united-kingdom-london-ny-new-york-city-ca-san-francisco-china-shanghai-japan-tokyo-australia-sydney/feb-22-2024/7am). *This talk will be conducted again in the same format as before*. We encourage you to join the talk if you haven't seen it already on Monday or if you are in easter time zones. The link to stream will be provided here and in [Discord group](https://discord.gg/epfsg).

## Pre-reading

Expand Down Expand Up @@ -57,6 +57,8 @@ The current research and development is summarized by the [roadmap](https://twit

> Simplified overview of the current Ethereum design can be found documentation on [node architecture](https://ethereum.org/developers/docs/nodes-and-clients/node-architecture) and in the week 1 presentation
As hinted above, the main high level components of Ethereum are execution and consensus layer. These are 2 networks which are connected and dependent on each other. Execution layer provides the execution engine, handles user transaction and all state (address, contract data) while consensus implements the proof-of-stake mechanism ensuring security and [fault tolerance](https://inevitableeth.com/home/concepts/bft).

## Implementations and Development

Everything mentioned above - the ideas, design and specifications comes down to the actual application here, in its implementation. An implementation of the execution layer (EL) or consensus layer (CL) is called a *client*. A computer running this client and connecting to the network is called a *node*. A node is therefore a pair of EL and CL clients actively participating in the network.
Expand Down
16 changes: 8 additions & 8 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<meta property="twitter:description" content="EPF Study Group Wiki">
<meta property="twitter:image" content="https://raw.githubusercontent.com/eth-protocol-fellows/protocol-studies/wiki-pages/docs/images/epfsg_hero.jpg">

<!-- Themeable Simple theme dark -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsify-themeable@0/dist/css/theme-simple-dark.css">

<!-- Themeable Simple light + dark theme (uncomment to use, and comment out the above loading of Simple theme) -->
<!-- <link rel="stylesheet" media="(prefers-color-scheme: light)"
href="https://cdn.jsdelivr.net/npm/docsify-themeable@0/dist/css/theme-simple.css"> -->
<!-- <link rel="stylesheet" media="(prefers-color-scheme: dark)"
href="https://cdn.jsdelivr.net/npm/docsify-themeable@0/dist/css/theme-simple-dark.css"> -->
<!-- Themeable Simple theme dark (use either this or the one below) -->
<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsify-themeable@0/dist/css/theme-simple-dark.css"> -->

<!-- Themeable Simple based on OS default (use either this or the one above) -->
<link rel="stylesheet" media="(prefers-color-scheme: light)"
href="https://cdn.jsdelivr.net/npm/docsify-themeable@0/dist/css/theme-simple.css">
<link rel="stylesheet" media="(prefers-color-scheme: dark)"
href="https://cdn.jsdelivr.net/npm/docsify-themeable@0/dist/css/theme-simple-dark.css">

<link rel="stylesheet" href="assets/css/theme.css">
<link rel="stylesheet" href="assets/css/custom.css">
Expand Down
2 changes: 1 addition & 1 deletion docs/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The protocol wiki is a collection of technical resources about the Ethereum prot

Ethereum Protocol Fellowship Study Group (EPSsg) is an open study program for anyone interested in learning about internals of the protocol.

Learn more about EPS in its [announcement blog](https://blog.ethereum.org/2024/02/07/epf-study-group). Join the community in our [Discord server](https://discord.gg/HnCjCvCN).
Learn more about EPS in its [announcement blog](https://blog.ethereum.org/2024/02/07/epf-study-group). Join the community in our [Discord server](https://discord.gg/epfsg).

## Contributing

Expand Down
Binary file added docs/week1.pdf
Binary file not shown.

0 comments on commit bc6f9ed

Please sign in to comment.