Skip to content

Commit 8d4e1fa

Browse files
committed
Merge branch 'dev' of github.com:ethereum/ethereum-org-website into chainlabo_staking_10281
2 parents c1e2218 + 22de241 commit 8d4e1fa

34 files changed

+33978
-25177
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10568,6 +10568,15 @@
1056810568
"contributions": [
1056910569
"content"
1057010570
]
10571+
},
10572+
{
10573+
"login": "keccers",
10574+
"name": "Katherine Champagne",
10575+
"avatar_url": "https://avatars.githubusercontent.com/u/770277?v=4",
10576+
"profile": "https://github.com/keccers",
10577+
"contributions": [
10578+
"content"
10579+
]
1057110580
}
1057210581
],
1057310582
"contributorsPerLine": 7,

.storybook/preview.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { action } from "@storybook/addon-actions"
33

44
import i18n, { baseLocales } from "./i18next"
55
import theme from "../src/@chakra-ui/gatsby-plugin/theme"
6+
import "../static/fonts/inter-font-face.css"
67

78
const chakraBreakpointArray = Object.entries(theme.breakpoints)
89

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,6 +1655,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16551655
<td align="center" valign="top" width="14.28%"><a href="https://ilanolkies.com"><img src="https://avatars.githubusercontent.com/u/36084092?v=4?s=100" width="100px;" alt="Ilan"/><br /><sub><b>Ilan</b></sub></a><br /><a href="#content-ilanolkies" title="Content">🖋</a></td>
16561656
<td align="center" valign="top" width="14.28%"><a href="https://mirror.xyz/umede.eth"><img src="https://avatars.githubusercontent.com/u/122288558?v=4?s=100" width="100px;" alt="umede"/><br /><sub><b>umede</b></sub></a><br /><a href="#content-umededoteth" title="Content">🖋</a></td>
16571657
<td align="center" valign="top" width="14.28%"><a href="http://taminobaumann.com"><img src="https://avatars.githubusercontent.com/u/48290617?v=4?s=100" width="100px;" alt="Tamino"/><br /><sub><b>Tamino</b></sub></a><br /><a href="#content-taminobaumann" title="Content">🖋</a></td>
1658+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/keccers"><img src="https://avatars.githubusercontent.com/u/770277?v=4?s=100" width="100px;" alt="Katherine Champagne"/><br /><sub><b>Katherine Champagne</b></sub></a><br /><a href="#content-keccers" title="Content">🖋</a></td>
16581659
</tr>
16591660
</tbody>
16601661
</table>

src/assets/layer-2/starknet.png

9.07 KB
Loading

src/assets/wallets/XDEFI.png

13.2 KB
Loading

src/assets/wallets/phantom.png

3.01 KB
Loading

src/components/icons/Icons.stories.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import {
5353
OpenSourceStakingIcon,
5454
PermissionlessIcon,
5555
RocketPoolGlyphIcon,
56+
RockXGlyphIcon,
5657
SelfCustodyIcon,
5758
StafiGlyphIcon,
5859
StakefishGlyphIcon,
@@ -138,6 +139,7 @@ const iconsDefinitions = [
138139
OpenSourceStakingIcon,
139140
PermissionlessIcon,
140141
RocketPoolGlyphIcon,
142+
RockXGlyphIcon,
141143
SelfCustodyIcon,
142144
StafiGlyphIcon,
143145
StakefishGlyphIcon,
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import React from "react"
2+
import { createIcon } from "@chakra-ui/react"
3+
import { commonIconDefaultProps } from "../utils"
4+
5+
export const RockXGlyphIcon = createIcon({
6+
displayName: "RockXGlyphIcon",
7+
viewBox: "0 0 32 32",
8+
defaultProps: {
9+
width: "32px",
10+
height: "32px",
11+
fillRule: "evenodd",
12+
clipRule: "evenodd",
13+
...commonIconDefaultProps,
14+
},
15+
path: [
16+
<path
17+
d="M19.0337 19.0337C20.7092 17.3583 20.7092 14.6417 19.0337 12.9663L7.32408 1.25661C5.64859 -0.41888 2.93207 -0.418859 1.25661 1.25661C-0.418859 2.93207 -0.41888 5.64859 1.25661 7.32408L9.93253 16L4.09187 21.8406C2.41641 23.5161 2.41639 26.2326 4.09187 27.9081C5.76736 29.5836 8.48388 29.5836 10.1593 27.9081L19.0337 19.0337Z"
18+
fill="#F0F0F0"
19+
/>,
20+
<path
21+
d="M12.9675 12.9662C11.2921 14.6417 11.2921 17.3582 12.9675 19.0337L24.6772 30.7433C26.3527 32.4188 29.0692 32.4188 30.7447 30.7433C32.4201 29.0679 32.4202 26.3513 30.7447 24.6759L22.0688 15.9999L27.9094 10.1593C29.5849 8.48382 29.5849 5.7673 27.9094 4.09181C26.2339 2.41633 23.5174 2.41635 21.8419 4.09181L12.9675 12.9662Z"
22+
fill="#FFFFFF"
23+
/>,
24+
<path
25+
d="M19.035 12.9664C20.7105 14.6418 20.7105 17.3584 19.035 19.0338L16.0013 22.0676L12.9675 19.0338C11.2921 17.3583 11.2921 14.6418 12.9675 12.9664L16.0013 9.93262L19.035 12.9664Z"
26+
fill="#E0E0E0"
27+
/>,
28+
],
29+
})

src/components/icons/staking/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export * from "./MultiClientIcon"
2121
export * from "./OpenSourceStakingIcon"
2222
export * from "./PermissionlessIcon"
2323
export * from "./RocketPoolGlyphIcon"
24+
export * from "./RockXGlyphIcon"
2425
export * from "./BedrockGlyphIcon"
2526
export * from "./SelfCustodyIcon"
2627
export * from "./SquidGlyphIcon"

src/content/developers/docs/networks/index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,14 @@ A testnet for [Optimism](https://www.optimism.io/).
114114
- [Paradigm faucet](https://faucet.paradigm.xyz/)
115115
- [Coinbase Wallet Faucet | Optimism Goerli](https://coinbase.com/faucets/optimism-goerli-faucet)
116116

117+
#### Starknet Goerli {#starknet-goerli}
118+
119+
A testnet for [Starknet](https://www.starknet.io).
120+
121+
##### Faucets
122+
123+
- [Starknet faucet](https://faucet.goerli.starknet.io)
124+
117125
## Private networks {#private-networks}
118126

119127
An Ethereum network is a private network if its nodes are not connected to a public network (i.e. Mainnet or a testnet). In this context, private only means reserved or isolated, rather than protected or secure.

0 commit comments

Comments
 (0)