Skip to content

Commit c6b7c03

Browse files
committed
Merge branch 'dev' into rtl-patches
2 parents 2115a00 + f08e001 commit c6b7c03

File tree

31 files changed

+231
-284
lines changed

31 files changed

+231
-284
lines changed

.all-contributorsrc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12497,6 +12497,43 @@
1249712497
"contributions": [
1249812498
"doc"
1249912499
]
12500+
},
12501+
{
12502+
"login": "r4f4ss",
12503+
"name": "rafaelss",
12504+
"avatar_url": "https://avatars.githubusercontent.com/u/5679073?v=4",
12505+
"profile": "https://github.com/r4f4ss",
12506+
"contributions": [
12507+
"content"
12508+
]
12509+
},
12510+
{
12511+
"login": "preetjdp",
12512+
"name": "Preet Parekh",
12513+
"avatar_url": "https://avatars.githubusercontent.com/u/27439197?v=4",
12514+
"profile": "https://preetjdp.dev/",
12515+
"contributions": [
12516+
"content"
12517+
]
12518+
},
12519+
{
12520+
"login": "ludamad",
12521+
"name": "ludamad",
12522+
"avatar_url": "https://avatars.githubusercontent.com/u/163993?v=4",
12523+
"profile": "https://www.linkedin.com/in/adamdomurad/",
12524+
"contributions": [
12525+
"content"
12526+
]
12527+
},
12528+
{
12529+
"login": "MaryNfs",
12530+
"name": "MaryNfs",
12531+
"avatar_url": "https://avatars.githubusercontent.com/u/52598322?v=4",
12532+
"profile": "https://github.com/MaryNfs",
12533+
"contributions": [
12534+
"content",
12535+
"bug"
12536+
]
1250012537
}
1250112538
],
1250212539
"contributorsPerLine": 7,

.eslintrc.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@
6565
"varsIgnorePattern": "^_$"
6666
}
6767
],
68-
"unused-imports/no-unused-imports-ts": "warn"
68+
"unused-imports/no-unused-imports-ts": "warn",
69+
"no-restricted-imports": [
70+
"warn",
71+
{
72+
"paths": [
73+
{
74+
"name": "react-i18next",
75+
"message": "Please use next-i18next instead of react-i18next."
76+
}
77+
]
78+
}
79+
]
6980
}
7081
}

.storybook/i18next.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import i18n, { Resource } from "i18next"
2+
// eslint-disable-next-line no-restricted-imports
23
import { initReactI18next } from "react-i18next"
34

45
export const baseLocales = {

.storybook/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// eslint-disable-next-line no-restricted-imports
12
import { getI18n } from "react-i18next"
23

34
import { ns as exposedNs } from "./i18next"

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,6 +1910,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19101910
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cratiu222"><img src="https://avatars.githubusercontent.com/u/156356273?v=4?s=100" width="100px;" alt="Christina"/><br /><sub><b>Christina</b></sub></a><br /><a href="#content-cratiu222" title="Content">🖋</a></td>
19111911
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nipunh"><img src="https://avatars.githubusercontent.com/u/26524611?v=4?s=100" width="100px;" alt="Nipun Hedaoo"/><br /><sub><b>Nipun Hedaoo</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nipunh" title="Code">💻</a></td>
19121912
<td align="center" valign="top" width="14.28%"><a href="https://github.com/chenjiali-april"><img src="https://avatars.githubusercontent.com/u/132745538?v=4?s=100" width="100px;" alt="april"/><br /><sub><b>april</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=chenjiali-april" title="Documentation">📖</a></td>
1913+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/r4f4ss"><img src="https://avatars.githubusercontent.com/u/5679073?v=4?s=100" width="100px;" alt="rafaelss"/><br /><sub><b>rafaelss</b></sub></a><br /><a href="#content-r4f4ss" title="Content">🖋</a></td>
1914+
<td align="center" valign="top" width="14.28%"><a href="https://preetjdp.dev/"><img src="https://avatars.githubusercontent.com/u/27439197?v=4?s=100" width="100px;" alt="Preet Parekh"/><br /><sub><b>Preet Parekh</b></sub></a><br /><a href="#content-preetjdp" title="Content">🖋</a></td>
1915+
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/adamdomurad/"><img src="https://avatars.githubusercontent.com/u/163993?v=4?s=100" width="100px;" alt="ludamad"/><br /><sub><b>ludamad</b></sub></a><br /><a href="#content-ludamad" title="Content">🖋</a></td>
1916+
</tr>
1917+
<tr>
1918+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MaryNfs"><img src="https://avatars.githubusercontent.com/u/52598322?v=4?s=100" width="100px;" alt="MaryNfs"/><br /><sub><b>MaryNfs</b></sub></a><br /><a href="#content-MaryNfs" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AMaryNfs" title="Bug reports">🐛</a></td>
19131919
</tr>
19141920
</tbody>
19151921
</table>

public/content/developers/docs/apis/json-rpc/index.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"eth_syncing","params":[],"id":1}
387387

388388
Returns the client coinbase address.
389389

390+
> **Note:** This method has been deprecated as of **v1.14.0** and is no longer supported. Attempting to use this method will result in a "Method not supported" error.
391+
390392
**Parameters**
391393

392394
None
@@ -1671,10 +1673,10 @@ geth --http --dev console 2>>geth.log
16711673
16721674
This will start the HTTP RPC interface on `http://localhost:8545`.
16731675

1674-
We can verify that the interface is running by retrieving the Coinbase address and balance using [curl](https://curl.se). Please note that data in these examples will differ on your local node. If you want to try these commands, replace the request params in the second curl request with the result returned from the first.
1676+
We can verify that the interface is running by retrieving the coinbase address (by obtaining the first address from the array of accounts) and balance using [curl](https://curl.se). Please note that data in these examples will differ on your local node. If you want to try these commands, replace the request params in the second curl request with the result returned from the first.
16751677

16761678
```bash
1677-
curl --data '{"jsonrpc":"2.0","method":"eth_coinbase", "id":1}' -H "Content-Type: application/json" localhost:8545
1679+
curl --data '{"jsonrpc":"2.0","method":"eth_accounts","params":[]", "id":1}' -H "Content-Type: application/json" localhost:8545
16781680
{"id":1,"jsonrpc":"2.0","result":["0x9b1d35635cc34752ca54713bb99d38614f63c955"]}
16791681
16801682
curl --data '{"jsonrpc":"2.0","method":"eth_getBalance", "params": ["0x9b1d35635cc34752ca54713bb99d38614f63c955", "latest"], "id":2}' -H "Content-Type: application/json" localhost:8545

public/content/developers/docs/networking-layer/portal-network/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The Portal Network clients are:
7676
- [Trin](https://github.com/ethereum/trin): written in Rust
7777
- [Fluffy](https://nimbus.team/docs/fluffy.html): written in Nim
7878
- [Ultralight](https://github.com/ethereumjs/ultralight): written in Typescript
79-
- [Shisui](https://github.com/GrapeBaBa/shisui): written in Go
79+
- [Shisui](https://github.com/optimism-java/shisui): written in Go
8080

8181
Having multiple independent client implementations enhances the resilience and decentralization of the Ethereum network.
8282

public/content/developers/docs/nodes-and-clients/bootnodes/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ When a new node joins the Ethereum network it needs to connect to nodes that are
88

99
## Connect to a bootnode {#connect-to-a-bootnode}
1010

11-
Most clients have a list of bootnodes build in, but you might also want to run your own bootnode, or use one that is not part of the client's hardcoded list. In this case, you can specify them when starting your client, as follows (example is for Geth, please check your client's documentation):
11+
Most clients have a list of bootnodes builtin, but you might also want to run your own bootnode, or use one that is not part of the client's hardcoded list. In this case, you can specify them when starting your client, as follows (example is for Geth, please check your client's documentation):
1212

1313
```
1414
geth --bootnodes "enode://<node ID>@<IP address>:<port>"

public/content/translations/ca/roadmap/beacon-chain/index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,3 @@ Les cadenes de fragments només poden entrar de forma segura a l'ecosistema Ethe
6262
</ButtonLink>
6363

6464
<Divider />
65-
66-
## Interactuar amb la cadena de balisa {#interact-with-beacon-chain}
67-
68-
<BeaconChainActions />

public/content/translations/nl/roadmap/beacon-chain/index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,3 @@ Shardketens kunnen alleen op een veilige manier in het Ethereum-netwerk komen al
6262
</ButtonLink>
6363

6464
<Divider />
65-
66-
## Heb interactie met de Beacon Chain {#interact-with-beacon-chain}
67-
68-
<BeaconChainActions />

0 commit comments

Comments
 (0)