Skip to content

Commit f643201

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into migrate/stablecoins
2 parents d388b42 + 5403acd commit f643201

File tree

431 files changed

+8730
-1962
lines changed

Some content is hidden

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

431 files changed

+8730
-1962
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12661,6 +12661,15 @@
1266112661
"contributions": [
1266212662
"code"
1266312663
]
12664+
},
12665+
{
12666+
"login": "JoeChenJ",
12667+
"name": "JoeChenJ",
12668+
"avatar_url": "https://avatars.githubusercontent.com/u/171761102?v=4",
12669+
"profile": "https://github.com/JoeChenJ",
12670+
"contributions": [
12671+
"content"
12672+
]
1266412673
}
1266512674
],
1266612675
"contributorsPerLine": 7,

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,6 +1938,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19381938
</tr>
19391939
<tr>
19401940
<td align="center" valign="top" width="14.28%"><a href="https://growthepie.xyz"><img src="https://avatars.githubusercontent.com/u/32496674?v=4?s=100" width="100px;" alt="Matthias Seidl"/><br /><sub><b>Matthias Seidl</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mseidlx" title="Code">💻</a></td>
1941+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JoeChenJ"><img src="https://avatars.githubusercontent.com/u/171761102?v=4?s=100" width="100px;" alt="JoeChenJ"/><br /><sub><b>JoeChenJ</b></sub></a><br /><a href="#content-JoeChenJ" title="Content">🖋</a></td>
19411942
</tr>
19421943
</tbody>
19431944
</table>

next.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ module.exports = (phase, { defaultConfig }) => {
6363
trailingSlash: true,
6464
images: {
6565
deviceSizes: [640, 750, 828, 1080, 1200, 1504, 1920],
66+
remotePatterns: [
67+
{
68+
protocol: "https",
69+
hostname: "crowdin-static.downloads.crowdin.com",
70+
},
71+
],
6672
},
6773
}
6874

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "9.3.0",
3+
"version": "9.4.1",
44
"license": "MIT",
55
"private": true,
66
"scripts": {
@@ -45,6 +45,7 @@
4545
"@radix-ui/react-portal": "^1.1.1",
4646
"@radix-ui/react-progress": "^1.1.0",
4747
"@radix-ui/react-radio-group": "^1.2.0",
48+
"@radix-ui/react-scroll-area": "^1.2.2",
4849
"@radix-ui/react-select": "^2.1.1",
4950
"@radix-ui/react-slot": "^1.1.0",
5051
"@radix-ui/react-switch": "^1.1.0",
@@ -66,7 +67,7 @@
6667
"lodash.merge": "^4.6.2",
6768
"lodash.shuffle": "^4.2.0",
6869
"lodash.union": "^4.6.0",
69-
"next": "^14.2.15",
70+
"next": "^14.2.21",
7071
"next-i18next": "^14.0.3",
7172
"next-mdx-remote": "^3.0.8",
7273
"next-sitemap": "^4.2.3",

public/content/contributing/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ We have low barrier to entry issues on our GitHub repository specifically design
9090

9191
If your contribution gets merged into ethereum.org, you will have a chance to claim a special badge on [Galxe](https://app.galxe.com/quest/ethereumorg). An Onchain Achievement Token (OAT) is a proof that you helped make the ecosystem a little more awesome.
9292

93-
[More on OATs](https://help.galxe.com/en/articles/7067290-galxe-oats-reward-and-celebrate-achievements)
93+
[More on OATs](https://help.galxe.com/en/articles/9645630-create-quest-rewards#h_1c5d63ba03)
9494

9595
### How to claim
9696
1. Join our [Discord server](https://discord.gg/ethereum-org).

public/content/developers/docs/data-availability/blockchain-data-storage-strategies/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Calldata refers to the bytes sent as part of the transaction. It is stored as pa
6363

6464
This is the cheapest method to permanently put data in the blockchain. The cost per byte is either 4 execution gas (if the byte is zero) or 16 gas (any other value). If the data is compressed, which is standard practice, then every byte value is equally likely, so the average cost is approximately 15.95 gas per byte.
6565

66-
At writing the prices are 12 gwei/gas and 2300 $/ETH, which means the cost is appoximately 45 cents per kilobyte. Because this was the cheapest method prior to EIP-4844, this is the method rollups used to store transaction information, which need to be available for [fault challenges](https://docs.optimism.io/stack/protocol/overview#fault-proofs), but do not need to be accessible directly onchain.
66+
At writing the prices are 12 gwei/gas and 2300 $/ETH, which means the cost is approximately 45 cents per kilobyte. Because this was the cheapest method prior to EIP-4844, this is the method rollups used to store transaction information, which need to be available for [fault challenges](https://docs.optimism.io/stack/protocol/overview#fault-proofs), but do not need to be accessible directly onchain.
6767

6868
Here are the addresses to see the transactions posted by some famous rollups.
6969

public/content/developers/docs/design-and-ux/heuristics-for-web3/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ People care deeply about their data. Safety is often a primary concern for users
5353
**Example:**
5454
Include your audits in the footer, at a prominent size.
5555

56-
![Audits refernced in the website footer](./Image2.png)
56+
![Audits referenced in the website footer](./Image2.png)
5757

5858
### 3. The most important info is obvious {#the-most-important-info-is-obvious}
5959

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Having multiple independent client implementations enhances the resilience and d
8282

8383
If one client experiences issues or vulnerabilities, other clients can continue to operate smoothly, preventing a single point of failure. Additionally, diverse client implementations foster innovation and competition, driving improvements and reducing monoculture risk within the ecosystem.
8484

85-
## Further reading {#futher-reading}
85+
## Further reading {#further-reading}
8686

8787
- [The Portal Network (Piper Merriam at Devcon Bogota)](https://www.youtube.com/watch?v=0stc9jnQLXA).
8888
- [The Portal Network discord](https://discord.gg/CFFnmE7Hbs)

public/content/developers/docs/smart-contracts/security/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ contract MutexPattern {
346346
require(balances[msg.sender] >= _amount, "No balance to withdraw.");
347347
348348
balances[msg.sender] -= _amount;
349-
bool (success, ) = msg.sender.call{value: _amount}("");
349+
(bool success, ) = msg.sender.call{value: _amount}("");
350350
require(success);
351351
352352
return true;

public/content/payments/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: Ethereum Payments
3+
metaTitle: Payments on Ethereum
34
description: An overview of payments on Ethereum
45
lang: en
56
template: use-cases

0 commit comments

Comments
 (0)