Skip to content

Commit 8867091

Browse files
committed
Merge branch 'dev' into post-merge
2 parents 7db51cd + a2bee0f commit 8867091

11 files changed

+256
-133
lines changed

.all-contributorsrc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8751,7 +8751,8 @@
87518751
"avatar_url": "https://avatars.githubusercontent.com/u/74294202?v=4",
87528752
"profile": "https://github.com/MahendraBishnoi29",
87538753
"contributions": [
8754-
"ideas"
8754+
"ideas",
8755+
"code"
87558756
]
87568757
},
87578758
{
@@ -8816,6 +8817,15 @@
88168817
"contributions": [
88178818
"doc"
88188819
]
8820+
},
8821+
{
8822+
"login": "joonspoon",
8823+
"name": "June Clarke ",
8824+
"avatar_url": "https://avatars.githubusercontent.com/u/302478?v=4",
8825+
"profile": "jointheleague.org",
8826+
"contributions": [
8827+
"doc"
8828+
]
88198829
}
88208830
],
88218831
"contributorsPerLine": 7,

.github/ISSUE_TEMPLATE/suggest_staking_product.md

Lines changed: 0 additions & 126 deletions
This file was deleted.
Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
name: Suggest a staking product or service
2+
description: Suggest a staking product or service to list on ethereum.org
3+
title: Suggest a staking product or service
4+
labels: ["feature :sparkles:", "content :fountain_pen:"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Before suggesting a staking product or service, make sure you've read [our listing policy](https://ethereum.org/en/contributing/adding-staking-products/).
10+
- type: markdown
11+
attributes:
12+
value: |
13+
Only continue with the issue if the staking product meets the criteria listed there.
14+
- type: markdown
15+
attributes:
16+
value: |
17+
If it does, complete the following information which we need to accurately list the product/service.
18+
- type: markdown
19+
id: staking_project_info
20+
attributes:
21+
value: "## Project info"
22+
- type: input
23+
id: staking_project_name
24+
attributes:
25+
label: Project name
26+
description: Provide the official name of product or service
27+
validations:
28+
required: true
29+
- type: dropdown
30+
id: staking_product_type
31+
attributes:
32+
label: Product type
33+
description: Which category best fits the product or service?
34+
options:
35+
- "Node/client tooling"
36+
- "Key management"
37+
- "Staking as a service"
38+
- "Staking pool"
39+
- "Other: (describe)"
40+
validations:
41+
required: true
42+
- type: input
43+
id: staking_product_type_other
44+
attributes:
45+
label: If other product type, please describe
46+
- type: textarea
47+
id: staking_product_logo
48+
attributes:
49+
label: Logo
50+
description: |
51+
Please provide an SVG or hi-res transparent PNG
52+
Tip: You can attach images by clicking this area to highlight it and then dragging files in
53+
validations:
54+
required: true
55+
- type: textarea
56+
id: staking_product_description
57+
attributes:
58+
label: Description
59+
description: Provide a 1-2 sentence (240 character max) of the products or service
60+
validations:
61+
required: true
62+
- type: input
63+
id: staking_product_url
64+
attributes:
65+
label: Website
66+
description: Provide a URL to the website for the product or service
67+
validations:
68+
required: true
69+
- type: dropdown
70+
id: staking_product_open_source
71+
attributes:
72+
label: If software is involved, is everything open source?
73+
description: Select one option, providing any available links to repositories
74+
options:
75+
- "Yes, everything is open source: provide link(s) to project repo(s)"
76+
- "Portions of code are open source: provide link(s) to project repo(s)"
77+
- "No, code is closed source"
78+
- "N/A, no custom software is involved"
79+
validations:
80+
required: true
81+
- type: dropdown
82+
id: staking_product_fork
83+
attributes:
84+
label: Is the project a fork? If yes, which project was forked?
85+
description: Provide information about if the project is a fork
86+
options:
87+
- "Yes"
88+
- "No"
89+
validations:
90+
required: true
91+
- type: textarea
92+
id: staking_product_development
93+
attributes:
94+
label: Is the product out of beta development?
95+
description: Provide information as to where the product is in the development lifecycle
96+
validations:
97+
required: true
98+
- type: input
99+
id: staking_product_wallet_support
100+
attributes:
101+
label: What wallets support the product or service?
102+
description: List wallets that directly support the product or service
103+
- type: textarea
104+
id: staking_product_eth_requirements
105+
attributes:
106+
label: If the product or service enables staking with <32 ETH, what is the minimum ETH required to stake?
107+
description: Provide any details related to ETH requirements, any other staking requirements, and any fees related to the service
108+
- type: textarea
109+
id: staking_product_fees
110+
attributes:
111+
label: If a service, what are the fees associated with using the service?
112+
description: Is there a monthly fee for the service? Or a percentage of earnings? Any additional staking requirements?
113+
- type: textarea
114+
id: staking_product_liquidity_token
115+
attributes:
116+
label: If the product or service involved a liquidity token, what are the tokens involved?
117+
description: Include token abbreviation and contract address for any tokens involved
118+
- type: input
119+
id: staking_product_live_date
120+
attributes:
121+
label: What date did the project or service go live?
122+
description: Provide proof to substantiate the date of when the product or service became available to the public
123+
validations:
124+
required: true
125+
- type: textarea
126+
id: staking_product_external_audit
127+
attributes:
128+
label: Has the project undergone an external security audit?
129+
description: Provide a link to a report or repo. If none, are there plans to have an external security audit?
130+
validations:
131+
required: true
132+
- type: textarea
133+
id: staking_product_bug_bounties
134+
attributes:
135+
label: Has the project undergone any security bug bounties?
136+
description: Provide a link to a report or repo. If none, are there plans to hold a bug bounty?
137+
validations:
138+
required: true
139+
- type: dropdown
140+
id: staking_product_active_development_team
141+
attributes:
142+
label: Is the project being actively maintained?
143+
description: Is there an active team developing the project?
144+
options:
145+
- "Yes"
146+
- "No"
147+
validations:
148+
required: true
149+
- type: textarea
150+
id: staking_product_third_parties
151+
attributes:
152+
label: Is the product or service free of trusted/human intermediaries?
153+
description: Disclose any steps in a stakers journey that depend on trusting humans with the keys to their funds or distribution of rewards
154+
validations:
155+
required: true
156+
- type: textarea
157+
id: staking_product_permission_nodes
158+
attributes:
159+
label: If a pooled staking service, can users participate as a node operator without permission?
160+
description: Is permission to run a node controlled by an individual, company, or DAO?
161+
- type: textarea
162+
id: staking_product_sign_up
163+
attributes:
164+
label: If listing a staking-as-a-service, are users required to sign-up for an account?
165+
description: List any permissions needed for a user to access the service
166+
- type: textarea
167+
id: staking_product_signing_keys
168+
attributes:
169+
label: If listing as staking-as-a-service, who holds the signing keys, and withdrawal keys?
170+
description: What keys does the user maintain access to? What keys does the service gain access to?
171+
- type: textarea
172+
id: staking_product_supermajority
173+
attributes:
174+
label: If a pooled staking service, what percent of node operators are running a super-majority consensus layer client?
175+
description: As of last edit, Prysm is the consensus layer client being run by a super-majority of the node operators, which is dangerous for the network. If there is currently a super-majority and this data is known, please list it here with a link to evidence.
176+
- type: textarea
177+
id: staking_product_consensus_layer_client_support
178+
attributes:
179+
label: If listing node or client tooling, which consensus layer clients (Lighthouse, Teku, Nimbus, or Prysm) are supported?
180+
description: Which clients are supported Does the software provide an easy way to switch between clients?
181+
- type: input
182+
id: staking_product_platform_support
183+
attributes:
184+
label: What platforms are supported?
185+
description: ie. Linux, macOS, Windows, iOS, Android, etc
186+
- type: input
187+
id: staking_product_interface
188+
attributes:
189+
label: What user interfaces are supported?
190+
description: ie. browser app, desktop app, mobile app, CLI app, etc
191+
- type: textarea
192+
id: staking_product_socials
193+
attributes:
194+
label: Social media links
195+
description: List available social media links. ie. Discord, Twitter, Telegram, Reddit

.github/workflows/docsearchConfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
"default_value": "en"
113113
}
114114
},
115-
"selectors_exclude": ["aside", "nav", "footer"],
115+
"selectors_exclude": ["aside", "nav", "footer", "style"],
116116
"strip_chars": " .,;:#",
117117
"custom_settings": {
118118
"attributesForFaceting": ["lang", "content"],

.github/workflows/docsearchConfigScript.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var config = {
4242
default_value: "en",
4343
},
4444
},
45-
selectors_exclude: ["aside", "nav", "footer"],
45+
selectors_exclude: ["aside", "nav", "footer", "style"],
4646
strip_chars: " .,;:#",
4747
custom_settings: {
4848
attributesForFaceting: ["lang", "content"],

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
13881388
<td align="center"><a href="https://carllippert.com"><img src="https://avatars.githubusercontent.com/u/16457876?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Carl Lippert</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=carllippert" title="Documentation">📖</a></td>
13891389
<td align="center"><a href="https://github.com/tymtam2"><img src="https://avatars.githubusercontent.com/u/1097613?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tymek Majewski</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=tymtam2" title="Documentation">📖</a></td>
13901390
<td align="center"><a href="http://cryptolibertarian.id"><img src="https://avatars.githubusercontent.com/u/108990005?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cryptolibertarian.id</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Cryptolibertarian-id" title="Documentation">📖</a></td>
1391-
<td align="center"><a href="https://github.com/MahendraBishnoi29"><img src="https://avatars.githubusercontent.com/u/74294202?v=4?s=100" width="100px;" alt=""/><br /><sub><b>browny</b></sub></a><br /><a href="#ideas-MahendraBishnoi29" title="Ideas, Planning, & Feedback">🤔</a></td>
1391+
<td align="center"><a href="https://github.com/MahendraBishnoi29"><img src="https://avatars.githubusercontent.com/u/74294202?v=4?s=100" width="100px;" alt=""/><br /><sub><b>browny</b></sub></a><br /><a href="#ideas-MahendraBishnoi29" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=MahendraBishnoi29" title="Code">💻</a></td>
13921392
</tr>
13931393
<tr>
13941394
<td align="center"><a href="https://github.com/sandakersmann"><img src="https://avatars.githubusercontent.com/u/6118832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marius Kjærstad</b></sub></a><br /><a href="#ideas-sandakersmann" title="Ideas, Planning, & Feedback">🤔</a></td>
@@ -1399,6 +1399,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
13991399
<td align="center"><a href="https://github.com/MHMasoon"><img src="https://avatars.githubusercontent.com/u/63204823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MohammadHosein Masoon</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=MHMasoon" title="Documentation">📖</a></td>
14001400
<td align="center"><a href="https://www.xcubicle.com"><img src="https://avatars.githubusercontent.com/u/381050?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Patoshi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=patoshii" title="Documentation">📖</a></td>
14011401
</tr>
1402+
<tr>
1403+
<td align="center"><a href="jointheleague.org"><img src="https://avatars.githubusercontent.com/u/302478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>June Clarke </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=joonspoon" title="Documentation">📖</a></td>
1404+
</tr>
14021405
</tbody>
14031406
</table>
14041407

0 commit comments

Comments
 (0)