Skip to content

Commit c4ec882

Browse files
committed
Merge branch 'dev' into pr/pete-vielhaber/16528
2 parents 132e37a + 77bd515 commit c4ec882

File tree

10 files changed

+68
-59
lines changed

10 files changed

+68
-59
lines changed

.all-contributorsrc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@
13051305
},
13061306
{
13071307
"login": "wslyvh",
1308-
"name": "Wesley van Heije",
1308+
"name": "Wesley",
13091309
"avatar_url": "https://avatars2.githubusercontent.com/u/25974464?v=4",
13101310
"profile": "https://twitter.com/wslyvh",
13111311
"contributions": [
@@ -13770,6 +13770,15 @@
1377013770
"contributions": [
1377113771
"tool"
1377213772
]
13773+
},
13774+
{
13775+
"login": "baiwfg2",
13776+
"name": "Lewis Chan",
13777+
"avatar_url": "https://avatars.githubusercontent.com/u/5157680?v=4",
13778+
"profile": "https://github.com/baiwfg2",
13779+
"contributions": [
13780+
"content"
13781+
]
1377313782
}
1377413783
],
1377513784
"contributorsPerLine": 7,

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
399399
<td align="center" valign="top" width="14.28%"><a href="https://www.yazkhoury.com"><img src="https://avatars2.githubusercontent.com/u/9094204?v=4?s=100" width="100px;" alt="Yaz Khoury"/><br /><sub><b>Yaz Khoury</b></sub></a><br /><a href="#content-YazzyYaz" title="Content">🖋</a></td>
400400
<td align="center" valign="top" width="14.28%"><a href="http://yos.io"><img src="https://avatars3.githubusercontent.com/u/1084226?v=4?s=100" width="100px;" alt="Yos Riady"/><br /><sub><b>Yos Riady</b></sub></a><br /><a href="#content-yosriady" title="Content">🖋</a></td>
401401
<td align="center" valign="top" width="14.28%"><a href="http://infura.io"><img src="https://avatars2.githubusercontent.com/u/1210802?v=4?s=100" width="100px;" alt="Andrew Cohen"/><br /><sub><b>Andrew Cohen</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aandrewjcohen" title="Bug reports">🐛</a></td>
402-
<td align="center" valign="top" width="14.28%"><a href="https://twitter.com/wslyvh"><img src="https://avatars2.githubusercontent.com/u/25974464?v=4?s=100" width="100px;" alt="Wesley van Heije"/><br /><sub><b>Wesley van Heije</b></sub></a><br /><a href="#content-wslyvh" title="Content">🖋</a> <a href="#infra-wslyvh" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
402+
<td align="center" valign="top" width="14.28%"><a href="https://twitter.com/wslyvh"><img src="https://avatars2.githubusercontent.com/u/25974464?v=4?s=100" width="100px;" alt="Wesley"/><br /><sub><b>Wesley</b></sub></a><br /><a href="#content-wslyvh" title="Content">🖋</a> <a href="#infra-wslyvh" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
403403
</tr>
404404
<tr>
405405
<td align="center" valign="top" width="14.28%"><a href="https://github.com/gr0uch0dev"><img src="https://avatars1.githubusercontent.com/u/17497722?v=4?s=100" width="100px;" alt="gr0uch0dev"/><br /><sub><b>gr0uch0dev</b></sub></a><br /><a href="#content-gr0uch0dev" title="Content">🖋</a></td>
@@ -2131,6 +2131,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
21312131
</tr>
21322132
<tr>
21332133
<td align="center" valign="top" width="14.28%"><a href="https://github.com/trikunai"><img src="https://avatars.githubusercontent.com/u/46504155?v=4?s=100" width="100px;" alt="trikunai"/><br /><sub><b>trikunai</b></sub></a><br /><a href="#tool-trikunai" title="Tools">🔧</a></td>
2134+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/baiwfg2"><img src="https://avatars.githubusercontent.com/u/5157680?v=4?s=100" width="100px;" alt="Lewis Chan"/><br /><sub><b>Lewis Chan</b></sub></a><br /><a href="#content-baiwfg2" title="Content">🖋</a></td>
21342135
</tr>
21352136
</tbody>
21362137
</table>

public/content/decentralized-identity/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ There are many ambitious projects using Ethereum as a foundation for decentraliz
160160
- **[Ethereum Name Service (ENS)](https://ens.domains/)** - _A decentralized naming system for onchain, machine-readable identifiers, like, Ethereum wallet addresses, content hashes, and metadata._
161161
- **[Sign in with Ethereum (SIWE)](https://siwe.xyz/)** - _Open standard for authentication with Ethereum accounts._
162162
- **[SpruceID](https://www.spruceid.com/)** - _A decentralized identity project which allows users to control digital identity with Ethereum accounts and ENS profiles instead of relying on third-party services._
163-
- **[Ethereum Attestation Service (EAS)](https://attest.sh/)** - _A decentralized ledger/protocol for making onchain or offchain attestations about anything._
163+
- **[Ethereum Attestation Service (EAS)](https://attest.org/)** - _A decentralized ledger/protocol for making onchain or offchain attestations about anything._
164164
- **[Proof of Humanity](https://www.proofofhumanity.id)** - _Proof of Humanity (or PoH) is a social identity verification system built on Ethereum._
165165
- **[BrightID](https://www.brightid.org/)** - _A decentralized, open-source social identity network seeking to reform identity verification through the creation and analysis of a social graph._
166166
- **[walt.id](https://walt.id)**_Open source decentralized identity and wallet infrastructure that enables developers and organizations to leverage self-sovereign identity and NFTs/SBTs._

public/content/developers/docs/apis/backend/index.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ These libraries abstract away much of the complexity of interacting directly wit
2525
**Alchemy -** **_Ethereum Development Platform._**
2626

2727
- [alchemy.com](https://www.alchemy.com/)
28-
- [Documentation](https://docs.alchemy.com/)
28+
- [Documentation](https://www.alchemy.com/docs/)
2929
- [GitHub](https://github.com/alchemyplatform)
3030
- [Discord](https://discord.com/invite/alchemyplatform)
3131

@@ -61,7 +61,7 @@ These libraries abstract away much of the complexity of interacting directly wit
6161
**GetBlock-** **_Blockchain-as-a-service for Web3 development_**
6262

6363
- [GetBlock.io](https://getblock.io/)
64-
- [Documentation](https://getblock.io/docs/)
64+
- [Documentation](https://docs.getblock.io/)
6565

6666
**Infura -** **_The Ethereum API as a service._**
6767

@@ -77,7 +77,7 @@ These libraries abstract away much of the complexity of interacting directly wit
7777
**NOWNodes - _Full Nodes and Block Explorers._**
7878

7979
- [NOWNodes.io](https://nownodes.io/)
80-
- [Documentation](https://documenter.getpostman.com/view/13630829/TVmFkLwy#intro)
80+
- [Documentation](https://nownodes.gitbook.io/documentation)
8181

8282
**QuickNode -** **_Blockchain Infrastructure as a Service._**
8383

@@ -114,7 +114,7 @@ These libraries abstract away much of the complexity of interacting directly wit
114114

115115
**Python Tooling -** **_Variety of libraries for Ethereum interaction via Python._**
116116

117-
- [py.ethereum.org](https://python.ethereum.org/)
117+
- [py.ethereum.org](https://snakecharmers.ethereum.org/)
118118
- [web3.py GitHub](https://github.com/ethereum/web3.py)
119119
- [web3.py Chat](https://gitter.im/ethereum/web3.py)
120120

@@ -152,8 +152,8 @@ These libraries abstract away much of the complexity of interacting directly wit
152152

153153
**Coinbase Cloud Node -** **_Blockchain Infrastructure API._**
154154

155-
- [Coinbase Cloud Node](https://www.coinbase.com/cloud)
156-
- [Documentation](https://docs.cloud.coinbase.com/)
155+
- [Coinbase Cloud Node](https://www.coinbase.com/developer-platform)
156+
- [Documentation](https://docs.cdp.coinbase.com/)
157157

158158
**DataHub by Figment -** **_Web3 API services with Ethereum Mainnet and testnets._**
159159

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"eth_accounts","params":[],"id":1
565565

566566
### eth_blockNumber {#eth_blocknumber}
567567

568-
Returns the number of most recent block.
568+
Returns the number of the most recent block.
569569

570570
<ButtonLink size="sm" variant="outline" href="https://ethereum-json-rpc.com/?method=eth_blockNumber">
571571
Try endpoint in playground
@@ -594,7 +594,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id
594594

595595
### eth_getBalance {#eth_getbalance}
596596

597-
Returns the balance of the account of given address.
597+
Returns the balance of the account at a given address.
598598

599599
<ButtonLink size="sm" variant="outline" href="https://ethereum-json-rpc.com/?method=eth_getBalance">
600600
Try endpoint in playground
@@ -658,7 +658,7 @@ contract Storage {
658658
}
659659
```
660660

661-
Retrieving the value of pos0 is straight forward:
661+
Retrieving the value of pos0 is straightforward:
662662

663663
```js
664664
curl -X POST --data '{"jsonrpc":"2.0", "method": "eth_getStorageAt", "params": ["0x295a70b2de5e3953354a6a8344e616ed314d7251", "0x0", "latest"], "id": 1}' localhost:8545
@@ -720,7 +720,7 @@ params: [
720720

721721
**Returns**
722722

723-
`QUANTITY` - integer of the number of transactions send from this address.
723+
`QUANTITY` - integer of the number of transactions sent from this address.
724724

725725
**Example**
726726

@@ -1102,7 +1102,7 @@ Generates and returns an estimate of how much gas is necessary to allow the tran
11021102

11031103
**Parameters**
11041104

1105-
See [eth_call](#eth_call) parameters, except that all properties are optional. If no gas limit is specified geth uses the block gas limit from the pending block as an upper bound. As a result the returned estimate might not be enough to executed the call/transaction when the amount of gas is higher than the pending block gas limit.
1105+
See [eth_call](#eth_call) parameters, except that all properties are optional. If no gas limit is specified geth uses the block gas limit from the pending block as an upper bound. As a result the returned estimate might not be enough to execute the call/transaction when the amount of gas is higher than the pending block gas limit.
11061106

11071107
**Returns**
11081108

@@ -1172,10 +1172,9 @@ params: [
11721172
curl -X POST --data '{"jsonrpc":"2.0","method":"eth_getBlockByHash","params":["0xdc0818cf78f21a8e70579cb46a43643f78291264dda342ae31049421c82d21ae", false],"id":1}'
11731173
// Result
11741174
{
1175-
{
1176-
"jsonrpc": "2.0",
1177-
"id": 1,
1178-
"result": {
1175+
"jsonrpc": "2.0",
1176+
"id": 1,
1177+
"result": {
11791178
"difficulty": "0x4ea3f27bc",
11801179
"extraData": "0x476574682f4c5649562f76312e302e302f6c696e75782f676f312e342e32",
11811180
"gasLimit": "0x1388",
@@ -1198,7 +1197,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"eth_getBlockByHash","params":["0
11981197
"transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
11991198
"uncles": [
12001199
]
1201-
}
1200+
}
12021201
}
12031202
```
12041203

@@ -1394,7 +1393,7 @@ params: ["0x85d995eba9763907fdf35cd2034144dd9d53ce32cbec21349d4b12823c6860c5"]
13941393

13951394
It also returns _either_ :
13961395

1397-
- `root` : `DATA` 32 bytes of post-transaction stateroot (pre Byzantium)
1396+
- `root` : `DATA` 32 bytes of post-transaction state root (pre Byzantium)
13981397
- `status`: `QUANTITY` either `1` (success) or `0` (failure)
13991398

14001399
**Example**
@@ -1431,7 +1430,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"eth_getTransactionReceipt","para
14311430

14321431
### eth_getUncleByBlockHashAndIndex {#eth_getunclebyblockhashandindex}
14331432

1434-
Returns information about a uncle of a block by hash and uncle index position.
1433+
Returns information about an uncle of a block by hash and uncle index position.
14351434

14361435
<ButtonLink size="sm" variant="outline" href="https://ethereum-json-rpc.com/?method=eth_getUncleByBlockHashAndIndex">
14371436
Try endpoint in playground
@@ -1465,7 +1464,7 @@ Result see [eth_getBlockByHash](#eth_getblockbyhash)
14651464

14661465
### eth_getUncleByBlockNumberAndIndex {#eth_getunclebyblocknumberandindex}
14671466

1468-
Returns information about a uncle of a block by number and uncle index position.
1467+
Returns information about an uncle of a block by number and uncle index position.
14691468

14701469
<ButtonLink size="sm" variant="outline" href="https://ethereum-json-rpc.com/?method=eth_getUncleByBlockNumberAndIndex">
14711470
Try endpoint in playground
@@ -1777,7 +1776,7 @@ This will start the HTTP RPC interface on `http://localhost:8545`.
17771776
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.
17781777

17791778
```bash
1780-
curl --data '{"jsonrpc":"2.0","method":"eth_accounts","params":[]", "id":1}' -H "Content-Type: application/json" localhost:8545
1779+
curl --data '{"jsonrpc":"2.0","method":"eth_accounts","params":[], "id":1}' -H "Content-Type: application/json" localhost:8545
17811780
{"id":1,"jsonrpc":"2.0","result":["0x9b1d35635cc34752ca54713bb99d38614f63c955"]}
17821781

17831782
curl --data '{"jsonrpc":"2.0","method":"eth_getBalance", "params": ["0x9b1d35635cc34752ca54713bb99d38614f63c955", "latest"], "id":2}' -H "Content-Type: application/json" localhost:8545
@@ -1793,7 +1792,7 @@ web3.fromWei("0x1639e49bba16280000", "ether")
17931792

17941793
Now that there is some ether on our private development chain, we can deploy the contract. The first step is to compile the Multiply7 contract to byte code that can be sent to the EVM. To install solc, the Solidity compiler, follow the [Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html). (You might want to use an older `solc` release to match [the version of compiler used for our example](https://github.com/ethereum/solidity/releases/tag/v0.4.20).)
17951794

1796-
The next step is to compile the Multiply7 contract to byte code that can be send to the EVM.
1795+
The next step is to compile the Multiply7 contract to byte code that can be sent to the EVM.
17971796

17981797
```bash
17991798
echo 'pragma solidity ^0.4.16; contract Multiply7 { event Print(uint); function multiply(uint input) public returns (uint) { Print(input * 7); return input * 7; } }' | solc --bin

public/content/developers/docs/blocks/index.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,36 +50,36 @@ There is a lot of information contained within a block. At the highest level a b
5050

5151
The block `body` contains several fields of its own:
5252

53-
| Field | Description |
54-
| :------------------- | :------------------------------------------------- |
55-
| `randao_reveal` | a value used to select the next block proposer |
56-
| `eth1_data` | information about the deposit contract |
57-
| `graffiti` | arbitrary data used to tag blocks |
58-
| `proposer_slashings` | list of validators to be slashed |
59-
| `attester_slashings` | list of attesters to be slashed |
60-
| `attestations` | list of attestations in favor of the current block |
61-
| `deposits` | list of new deposits to the deposit contract |
62-
| `voluntary_exits` | list of validators exiting the network |
63-
| `sync_aggregate` | subset of validators used to serve light clients |
64-
| `execution_payload` | transactions passed from the execution client |
53+
| Field | Description |
54+
| :------------------- | :----------------------------------------------- |
55+
| `randao_reveal` | a value used to select the next block proposer |
56+
| `eth1_data` | information about the deposit contract |
57+
| `graffiti` | arbitrary data used to tag blocks |
58+
| `proposer_slashings` | list of validators to be slashed |
59+
| `attester_slashings` | list of attesters to be slashed |
60+
| `attestations` | list of attestations made against previous slots |
61+
| `deposits` | list of new deposits to the deposit contract |
62+
| `voluntary_exits` | list of validators exiting the network |
63+
| `sync_aggregate` | subset of validators used to serve light clients |
64+
| `execution_payload` | transactions passed from the execution client |
6565

6666
The `attestations` field contains a list of all the attestations in the block. Attestations have their own data type that contains several pieces of data. Each attestation contains:
6767

68-
| Field | Description |
69-
| :----------------- | :---------------------------------------------------------- |
70-
| `aggregation_bits` | a list of which validators participated in this attestation |
71-
| `data` | a container with multiple subfields |
72-
| `signature` | aggregate signature of all attesting validators |
68+
| Field | Description |
69+
| :----------------- | :------------------------------------------------------------- |
70+
| `aggregation_bits` | a list of which validators participated in this attestation |
71+
| `data` | a container with multiple subfields |
72+
| `signature` | aggregate signature of a set of validators against `data` part |
7373

7474
The `data` field in the `attestation` contains the following:
7575

76-
| Field | Description |
77-
| :------------------ | :------------------------------------------------------- |
78-
| `slot` | the slot the attestation relates to |
79-
| `index` | indices for attesting validators |
80-
| `beacon_block_root` | the root hash of the Beacon block containing this object |
81-
| `source` | the last justified checkpoint |
82-
| `target` | the latest epoch boundary block |
76+
| Field | Description |
77+
| :------------------ | :-------------------------------------------------------------- |
78+
| `slot` | the slot the attestation relates to |
79+
| `index` | indices for attesting validators |
80+
| `beacon_block_root` | the root hash of the Beacon block seen as the head of the chain |
81+
| `source` | the last justified checkpoint |
82+
| `target` | the latest epoch boundary block |
8383

8484
Executing the transactions in the `execution_payload` updates the global state. All clients re-execute the transactions in the `execution_payload` to ensure the new state matches that in the new block `state_root` field. This is how clients can tell that a new block is valid and safe to add to their blockchain. The `execution payload` itself is an object with several fields. There is also an `execution_payload_header` that contains important summary information about the execution data. These data structures are organized as follows:
8585

public/content/developers/docs/data-availability/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The core Ethereum protocol is primarily concerned with data availability, not da
7373
## Further reading {#further-reading}
7474

7575
- [WTF is Data Availability?](https://medium.com/blockchain-capital-blog/wtf-is-data-availability-80c2c95ded0f)
76-
- [What Is Data Availability?](https://coinmarketcap.com/alexandria/article/what-is-data-availability)
76+
- [What Is Data Availability?](https://coinmarketcap.com/academy/article/what-is-data-availability)
7777
- [A primer on data availability checks](https://dankradfeist.de/ethereum/2019/12/20/data-availability-checks.html)
7878
- [An explanation of the sharding + DAS proposal](https://hackmd.io/@vbuterin/sharding_proposal#ELI5-data-availability-sampling)
7979
- [A note on data availability and erasure coding](https://github.com/ethereum/research/wiki/A-note-on-data-availability-and-erasure-coding#can-an-attacker-not-circumvent-this-scheme-by-releasing-a-full-unavailable-block-but-then-only-releasing-individual-bits-of-data-as-clients-query-for-them)

src/components/StartWithEthereumFlow/LetUseSomeApps/index.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import { Tag } from "@/components/ui/tag"
99
import { trackCustomEvent } from "@/lib/utils/matomo"
1010

1111
import AaveImage from "@/public/images/dapps/aave.png"
12+
import FarcasterImage from "@/public/images/dapps/farcaster.png"
1213
import OpenSeaImage from "@/public/images/dapps/opensea.png"
1314
import UniswapImage from "@/public/images/dapps/uni.png"
14-
import WarpcastImage from "@/public/images/dapps/warpcast.png"
1515

1616
const LetUseSomeApps = ({
1717
stepIndex,
@@ -24,8 +24,8 @@ const LetUseSomeApps = ({
2424

2525
const dappsList = [
2626
{
27-
name: "Warpcast",
28-
description: t("page-start-apps-warpcast-description"),
27+
name: "Farcaster",
28+
description: t("page-start-apps-farcaster-description"),
2929
tag: (
3030
<Tag
3131
status="tag"
@@ -35,8 +35,8 @@ const LetUseSomeApps = ({
3535
{t("page-start-apps-socials-tag")}
3636
</Tag>
3737
),
38-
url: "https://warpcast.com/",
39-
image: WarpcastImage,
38+
url: "https://www.farcaster.xyz/",
39+
image: FarcasterImage,
4040
},
4141
{
4242
name: "Aave",

src/components/UpcomingEventsList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const UpcomingEventsList = () => {
9696
})
9797
}
9898

99-
if (Object.keys(monthGroupedEvents)?.length) {
99+
if (Object.keys(monthGroupedEvents)?.length === 0) {
100100
return (
101101
<Alert variant="update">
102102
<AlertEmoji text=":information_source:" />

0 commit comments

Comments
 (0)