Skip to content

Commit f9b7282

Browse files
committed
Merge branch 'dev' into migrate-SideNav.tsx-to-Shadcn/Tailwind
2 parents c105780 + ecca401 commit f9b7282

File tree

326 files changed

+21951
-1714
lines changed

Some content is hidden

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

326 files changed

+21951
-1714
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>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "9.4.0",
3+
"version": "9.4.1",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

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/contributing/translation-program/content-buckets/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ Below is a breakdown of the website pages each content bucket contains.
101101
- [Account abstraction](/roadmap/account-abstraction/)
102102
- [Verkle trees](/roadmap/verkle-trees/)
103103
- [Statelessness, state expiry and history expiry](/roadmap/statelessness/)
104-
- [How The Merge impacted ETH supply](/roadmap/merge/issuance/)
105104

106105
## 10) Community pages {#community-pages}
107106

public/content/developers/docs/data-and-analytics/block-explorers/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Block explorers have become a common place for people to track the progress of t
9595
- Gas limit - The maximum numbers of gas units this transaction can consume
9696
- Gas used - The actual amount of gas units the transaction consumed
9797
- Gas price - The price set per gas unit
98-
- Nonce - The transaction number for the `from` address (bear in mind this starts at 0 so a nonce of `100` would actually be the 101st transaction submitted by this account
98+
- Nonce - The transaction number for the `from` address (bear in mind this starts at 0 so a nonce of `100` would actually be the 101st transaction submitted by this account)
9999
- Input data - Any extra information required by the transaction
100100

101101
### Accounts {#accounts}

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/data-structures-and-encoding/patricia-merkle-trie/index.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,33 @@ There is a difference between looking something up in the 'trie' and the underly
3434
The update and delete operations for radix tries can be defined as follows:
3535

3636
```
37-
def update(node,path,value):
38-
curnode = db.get(node) if node else [ NULL ] * 17
37+
def update(node_hash, path, value):
38+
curnode = db.get(node_hash) if node_hash else [ NULL ] * 17
3939
newnode = curnode.copy()
4040
if path == '':
4141
newnode[-1] = value
4242
else:
43-
newindex = update(curnode[path[0]],path[1:],value)
43+
newindex = update(curnode[path[0]], path[1:], value)
4444
newnode[path[0]] = newindex
45-
db.put(hash(newnode),newnode)
45+
db.put(hash(newnode), newnode)
4646
return hash(newnode)
4747
48-
def delete(node,path):
49-
if node is NULL:
48+
def delete(node_hash, path):
49+
if node_hash is NULL:
5050
return NULL
5151
else:
52-
curnode = db.get(node)
52+
curnode = db.get(node_hash)
5353
newnode = curnode.copy()
5454
if path == '':
5555
newnode[-1] = NULL
5656
else:
57-
newindex = delete(curnode[path[0]],path[1:])
57+
newindex = delete(curnode[path[0]], path[1:])
5858
newnode[path[0]] = newindex
5959
6060
if all(x is NULL for x in newnode):
6161
return NULL
6262
else:
63-
db.put(hash(newnode),newnode)
63+
db.put(hash(newnode), newnode)
6464
return hash(newnode)
6565
```
6666

@@ -137,10 +137,10 @@ Examples:
137137
Here is the extended code for getting a node in the Merkle Patricia trie:
138138

139139
```
140-
def get_helper(node,path):
141-
if path == []: return node
142-
if node = '': return ''
143-
curnode = rlp.decode(node if len(node) < 32 else db.get(node))
140+
def get_helper(node_hash,path):
141+
if path == []: return node_hash
142+
if node_hash == '': return ''
143+
curnode = rlp.decode(node_hash if len(node_hash) < 32 else db.get(node_hash))
144144
if len(curnode) == 2:
145145
(k2, v2) = curnode
146146
k2 = compact_decode(k2)
@@ -151,13 +151,13 @@ Here is the extended code for getting a node in the Merkle Patricia trie:
151151
elif len(curnode) == 17:
152152
return get_helper(curnode[path[0]],path[1:])
153153
154-
def get(node,path):
154+
def get(node_hash,path):
155155
path2 = []
156156
for i in range(len(path)):
157157
path2.push(int(ord(path[i]) / 16))
158158
path2.push(ord(path[i]) % 16)
159159
path2.push(16)
160-
return get_helper(node,path2)
160+
return get_helper(node_hash,path2)
161161
```
162162

163163
### Example Trie {#example-trie}

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)

0 commit comments

Comments
 (0)