Skip to content

Commit a81e3aa

Browse files
authored
Merge branch 'dev' into dev
2 parents 4c01b81 + 060c792 commit a81e3aa

File tree

1,954 files changed

+159665
-55283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,954 files changed

+159665
-55283
lines changed

.all-contributorsrc

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10172,6 +10172,44 @@
1017210172
"contributions": [
1017310173
"content"
1017410174
]
10175+
},
10176+
{
10177+
"login": "megatheikal",
10178+
"name": "megatheikal",
10179+
"avatar_url": "https://avatars.githubusercontent.com/u/64621442?v=4",
10180+
"profile": "https://megatheikal.com",
10181+
"contributions": [
10182+
"bug"
10183+
]
10184+
},
10185+
{
10186+
"login": "stephenfire",
10187+
"name": "Stephen Guo",
10188+
"avatar_url": "https://avatars.githubusercontent.com/u/17247036?v=4",
10189+
"profile": "https://github.com/stephenfire",
10190+
"contributions": [
10191+
"translation"
10192+
]
10193+
},
10194+
{
10195+
"login": "feuGeneA",
10196+
"name": "F. Eugene Aumson",
10197+
"avatar_url": "https://avatars.githubusercontent.com/u/7883777?v=4",
10198+
"profile": "http://aumson.org/gene",
10199+
"contributions": [
10200+
"bug",
10201+
"content"
10202+
]
10203+
},
10204+
{
10205+
"login": "rpalakkal",
10206+
"name": "Roshan",
10207+
"avatar_url": "https://avatars.githubusercontent.com/u/19766713?v=4",
10208+
"profile": "https://github.com/rpalakkal",
10209+
"contributions": [
10210+
"content",
10211+
"code"
10212+
]
1017510213
}
1017610214
],
1017710215
"contributorsPerLine": 7,
@@ -10180,5 +10218,6 @@
1018010218
"repoType": "github",
1018110219
"repoHost": "https://github.com",
1018210220
"skipCi": true,
10183-
"commitConvention": "angular"
10221+
"commitConvention": "angular",
10222+
"commitType": "docs"
1018410223
}

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
* @samajammin @wackerow @corwintines @pettinarip @minimalsm @jmcook1186 @nhsz
99

1010
# Owners of specific files
11-
/src/data/consensus-bounty-hunters.csv @djrtwo @JustinDrake @asanso @fredriksvantes
11+
/src/data/consensus-bounty-hunters.csv @djrtwo @asanso @fredriksvantes
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Suggest quiz
2+
description: Add, update, delete questions for a quiz on ethereum.osg
3+
title: Add/Update/Delete quiz question
4+
labels: ["feature :sparkles", "quiz :books:"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Before suggesting additions, updates, or deletions of quiz content, make sure you've read our [contributing guidelines for quizzes](https://ethereum.org/en/contributing/quizzes/).
10+
- type: input
11+
id: page
12+
attributes:
13+
label: Page URL
14+
description: URL for the page the quiz can be found on, or should be added to
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: question_content
19+
attributes:
20+
label: Question content
21+
description: Suggest questions to add, update, or delete based on contribution guideline
22+
validations:
23+
required: true
24+
- type: checkboxes
25+
id: work_on
26+
attributes:
27+
label: Would you like to work on this issue?
28+
options:
29+
- label: "Yes"
30+
required: false
31+
- label: "No"
32+
required: false
33+
validations:
34+
required: true

.github/ISSUE_TEMPLATE/suggest_staking_product.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,18 @@ body:
166166
- type: textarea
167167
id: staking_product_signing_keys
168168
attributes:
169-
label: If listing as staking-as-a-service, who holds the signing keys, and withdrawal keys?
169+
label: If listing as staking-as-a-service, who has access to the signing keys?
170170
description: What keys does the user maintain access to? What keys does the service gain access to?
171+
- type: textarea
172+
id: staking_product_withdrawal_credentials
173+
attributes:
174+
label: If a pooled staking service or SaaS provider, what type of withdrawal credentials are being utilized / who holds the withdrawal keys?
175+
description: Are withdrawal credentials utilizing `0x01` type credentials that point to an execution layer address? If so, is this an account chosen by the user, or a pre-determined smart contract?
171176
- type: textarea
172177
id: staking_product_supermajority
173178
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.
179+
label: If a pooled staking service or SaaS provider, what percent of node operators are running a super-majority client?
180+
description: As of last edit, Prysm and Lighthouse are the consensus clients being run by >75% of the node operators, and Geth is the execution client being run by >60% of node operators. This presents risks to the network. If there is currently a super-majority and this data is known, please list it here with a link to evidence.
176181
- type: textarea
177182
id: staking_product_consensus_layer_client_support
178183
attributes:

.github/workflows/docsearch-crawl.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/docsearchConfig.json

Lines changed: 0 additions & 123 deletions
This file was deleted.

.github/workflows/docsearchConfigScript.js

Lines changed: 0 additions & 63 deletions
This file was deleted.

.storybook/main.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ const { propNames } = require("@chakra-ui/react")
33
const { babelConfig } = require("./babel-storybook-config")
44

55
module.exports = {
6-
stories: [
7-
{
8-
directory: "../src/components",
9-
titlePrefix: "Components",
10-
files: "**/*.stories.tsx",
11-
},
12-
],
6+
stories: ["../src/components/**/*.stories.tsx"],
137
addons: [
148
"@storybook/addon-links",
159
"@storybook/addon-essentials",
@@ -18,6 +12,7 @@ module.exports = {
1812
"@storybook/addon-a11y",
1913
"@chakra-ui/storybook-addon",
2014
],
15+
staticDirs: ["../static"],
2116
babel: async (options) => ({
2217
...babelConfig,
2318
}),
@@ -87,7 +82,4 @@ module.exports = {
8782
},
8883
},
8984
},
90-
docs: {
91-
autodocs: true,
92-
},
9385
}

.storybook/manager.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import { addons } from "@storybook/addons"
22
import theme from "./theme"
3+
import favicon from "../src/assets/favicon.png"
34

45
addons.setConfig({
56
theme,
67
})
8+
9+
const link = document.createElement("link")
10+
link.setAttribute("rel", "shortcut icon")
11+
link.setAttribute("href", favicon)
12+
document.head.appendChild(link)

.storybook/preview.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ import { action } from "@storybook/addon-actions"
22

33
import theme from "../src/@chakra-ui/gatsby-plugin/theme"
44

5+
import "../static/fonts/inter-font-face.css"
6+
import "../static/fonts/ibm-plex-font-face.css"
7+
58
const chakraBreakpointArray = Object.entries(theme.breakpoints)
69

710
// Gatsby's Link overrides:
@@ -31,9 +34,13 @@ export const parameters = {
3134
date: /Date$/,
3235
},
3336
},
37+
backgrounds: {
38+
disable: true,
39+
},
3440
chakra: {
3541
theme,
3642
},
43+
layout: "centered",
3744
// Modify viewport selection to match Chakra breakpoints (or custom breakpoints)
3845
viewport: {
3946
viewports: chakraBreakpointArray.reduce((prevVal, currVal) => {

0 commit comments

Comments
 (0)