Skip to content

Commit 05de0db

Browse files
committed
Merge branch 'dev' of github.com:ethereum/ethereum-org-website into find-wallet-revamp
2 parents 127e8f2 + 0df8836 commit 05de0db

File tree

39 files changed

+742
-1046
lines changed

39 files changed

+742
-1046
lines changed

.all-contributorsrc

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11359,6 +11359,34 @@
1135911359
"contributions": [
1136011360
"bug"
1136111361
]
11362+
},
11363+
{
11364+
"login": "allwin199",
11365+
"name": "Prince Allwin",
11366+
"avatar_url": "https://avatars.githubusercontent.com/u/127643894?v=4",
11367+
"profile": "https://allwin-portfolio.vercel.app/",
11368+
"contributions": [
11369+
"content"
11370+
]
11371+
},
11372+
{
11373+
"login": "ryanpwaldon",
11374+
"name": "Ryan Waldon",
11375+
"avatar_url": "https://avatars.githubusercontent.com/u/12480362?v=4",
11376+
"profile": "https://github.com/ryanpwaldon",
11377+
"contributions": [
11378+
"content",
11379+
"code"
11380+
]
11381+
},
11382+
{
11383+
"login": "4everlandorg",
11384+
"name": "4EVERLAND",
11385+
"avatar_url": "https://avatars.githubusercontent.com/u/89854839?v=4",
11386+
"profile": "https://www.4everland.org",
11387+
"contributions": [
11388+
"tool"
11389+
]
1136211390
}
1136311391
],
1136411392
"contributorsPerLine": 7,

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,6 +1766,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
17661766
<td align="center" valign="top" width="14.28%"><a href="https://github.com/adeolu98"><img src="https://avatars.githubusercontent.com/u/39372980?v=4?s=100" width="100px;" alt="dCRYPT"/><br /><sub><b>dCRYPT</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aadeolu98" title="Bug reports">🐛</a></td>
17671767
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sourabupadhya123"><img src="https://avatars.githubusercontent.com/u/64914231?v=4?s=100" width="100px;" alt="Sourab"/><br /><sub><b>Sourab</b></sub></a><br /><a href="#security-sourabupadhya123" title="Security">🛡️</a></td>
17681768
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ykaravas"><img src="https://avatars.githubusercontent.com/u/6537956?v=4?s=100" width="100px;" alt="ykaravas"/><br /><sub><b>ykaravas</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aykaravas" title="Bug reports">🐛</a></td>
1769+
<td align="center" valign="top" width="14.28%"><a href="https://allwin-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/127643894?v=4?s=100" width="100px;" alt="Prince Allwin"/><br /><sub><b>Prince Allwin</b></sub></a><br /><a href="#content-allwin199" title="Content">🖋</a></td>
1770+
</tr>
1771+
<tr>
1772+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ryanpwaldon"><img src="https://avatars.githubusercontent.com/u/12480362?v=4?s=100" width="100px;" alt="Ryan Waldon"/><br /><sub><b>Ryan Waldon</b></sub></a><br /><a href="#content-ryanpwaldon" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=ryanpwaldon" title="Code">💻</a></td>
1773+
<td align="center" valign="top" width="14.28%"><a href="https://www.4everland.org"><img src="https://avatars.githubusercontent.com/u/89854839?v=4?s=100" width="100px;" alt="4EVERLAND"/><br /><sub><b>4EVERLAND</b></sub></a><br /><a href="#tool-4everlandorg" title="Tools">🔧</a></td>
17691774
</tr>
17701775
</tbody>
17711776
</table>

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"@emotion/styled": "^11.11.0",
2828
"@radix-ui/react-navigation-menu": "^1.1.4",
2929
"@socialgouv/matomo-next": "^1.8.0",
30-
"clipboard": "^2.0.11",
3130
"embla-carousel-react": "^7.0.0",
3231
"ethereum-blockies-base64": "^1.0.2",
3332
"focus-trap-react": "^10.2.3",

public/content/community/research/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ One particular area of layer 2 that requires more research and development is sa
134134

135135
Sharding Ethereum's blockchain has long been part of the development roadmap. However, new scaling solutions such as "Danksharding" are currently taking center stage.
136136

137+
The precursor to full Danksharding known as Proto-Danksharding went live with the Cancun-Deneb ("Dencun") network upgrade.
138+
139+
[More about the Dencun upgrade](/roadmap/dencun/)
140+
137141
#### Background reading {#background-reading-4}
138142

139143
- [Proto-Danksharding notes](https://notes.ethereum.org/@vbuterin/proto_danksharding_faq)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ contract Greeter {
3333
PUSH1 0x80 PUSH1 0x40 MSTORE PUSH1 0x4 CALLDATASIZE LT PUSH2 0x41 JUMPI PUSH1 0x0 CALLDATALOAD PUSH29 0x100000000000000000000000000000000000000000000000000000000 SWAP1 DIV PUSH4 0xFFFFFFFF AND DUP1 PUSH4 0xCFAE3217 EQ PUSH2 0x46 JUMPI JUMPDEST PUSH1 0x0 DUP1 REVERT JUMPDEST CALLVALUE DUP1 ISZERO PUSH2 0x52 JUMPI PUSH1 0x0 DUP1 REVERT JUMPDEST POP PUSH2 0x5B PUSH2 0xD6 JUMP JUMPDEST PUSH1 0x40 MLOAD DUP1 DUP1 PUSH1 0x20 ADD DUP3 DUP2 SUB DUP3 MSTORE DUP4 DUP2 DUP2 MLOAD DUP2 MSTORE PUSH1 0x20 ADD SWAP2 POP DUP1 MLOAD SWAP1 PUSH1 0x20 ADD SWAP1 DUP1 DUP4 DUP4 PUSH1 0x0 JUMPDEST DUP4 DUP2 LT ISZERO PUSH2 0x9B JUMPI DUP1 DUP3 ADD MLOAD DUP2 DUP5 ADD MSTORE PUSH1 0x20 DUP2 ADD SWAP1 POP PUSH2 0x80 JUMP JUMPDEST POP POP POP POP SWAP1 POP SWAP1 DUP2 ADD SWAP1 PUSH1 0x1F AND DUP1 ISZERO PUSH2 0xC8 JUMPI DUP1 DUP3 SUB DUP1 MLOAD PUSH1 0x1 DUP4 PUSH1 0x20 SUB PUSH2 0x100 EXP SUB NOT AND DUP2 MSTORE PUSH1 0x20 ADD SWAP2 POP JUMPDEST POP SWAP3 POP POP POP PUSH1 0x40 MLOAD DUP1 SWAP2 SUB SWAP1 RETURN JUMPDEST PUSH1 0x60 PUSH1 0x40 DUP1 MLOAD SWAP1 DUP2 ADD PUSH1 0x40 MSTORE DUP1 PUSH1 0x5 DUP2 MSTORE PUSH1 0x20 ADD PUSH32 0x48656C6C6F000000000000000000000000000000000000000000000000000000 DUP2 MSTORE POP SWAP1 POP SWAP1 JUMP STOP LOG1 PUSH6 0x627A7A723058 KECCAK256 SLT 0xec 0xe 0xf5 0xf8 SLT 0xc7 0x2d STATICCALL ADDRESS SHR 0xdb COINBASE 0xb1 BALANCE 0xe8 0xf8 DUP14 0xda 0xad DUP13 LOG1 0x4c 0xb4 0x26 0xc2 DELEGATECALL PUSH7 0x8994D3E002900
3434
```
3535

36+
These are called **opcodes**. EVM opcodes are the low-level instructions that the Ethereum Virtual Machine (EVM) can execute. Each opcode represents a specific operation, such as arithmetic operations, logical operations, data manipulation, control flow, etc.
37+
38+
[More on opcodes](/developers/docs/evm/opcodes/)
39+
3640
## Web applications {#web-applications}
3741

3842
The compiler will also produce the **Application Binary Interface (ABI)** which you need in order for your application to understand the contract and call the contract's functions.

public/content/enterprise/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Some collaborative efforts to make Ethereum enterprise friendly have been made b
5858

5959
### Products and services {#products-and-services}
6060

61+
- [4EVERLAND](https://www.4everland.org/) - _provides APIs, RPC services and tools for hosting decentralized applications and enabling decentralized storage on Ethereum_
6162
- [Alchemy](https://www.alchemy.com/) - _provides API services and tools for building and monitoring applications on Ethereum_
6263
- [Blast](https://blastapi.io/) - _an API platform that provides RPC/WSS APIs for Ethereum Archive Mainnet and Testnets._
6364
- [Blockapps](https://blockapps.net/) - _implementation of the Enterprise Ethereum protocol, tooling and APIs that form the STRATO platform_

public/content/history/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ EIP-7514 brings a tightening to the issuance of ETH by capping the "churn" rate
119119
</ExpandableCard>
120120

121121
- [Read the Deneb upgrade specifications](https://github.com/ethereum/consensus-specs/blob/dev/specs/deneb/)
122+
- [Cancun-Deneb ("Dencun") FAQ](/roadmap/dencun/)
122123

123124
<Divider />
124125

public/content/roadmap/danksharding/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Data availability sampling is required for validators to quickly and efficiently
8181

8282
### Current progress {#current-progress}
8383

84-
Full Danksharding is several years away. In the meantime, the KZG ceremony has concluded with over 140,000 contributions, and the [EIP](https://eips.ethereum.org/EIPS/eip-4844) for Proto-Danksharding has matured, with an agreed upon production-ready specification already being tested on testnets. This upgrade is set to go live on Ethereum Mainnet in March 2024 as part of the Deneb + Cancun upgrade. You can keep up to date using the [EIP 4844 readiness checklist](https://github.com/ethereum/pm/blob/master/Dencun/4844-readiness-checklist.md).
84+
Full Danksharding is several years away. In the meantime, the KZG ceremony has concluded with over 140,000 contributions, and the [EIP](https://eips.ethereum.org/EIPS/eip-4844) for Proto-Danksharding has matured. This proposal has been fully implemented in all testnets, and went live on Mainnet with the Cancun-Deneb ("Dencun") network upgrade in March 2024.
8585

8686
### Further reading {#further-reading}
8787

public/content/roadmap/scaling/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ This second step is known as [“Danksharding”](/roadmap/danksharding/). **It
4444

4545
## Current progress {#current-progress}
4646

47-
Proto-Danksharding is the first of these roadmap items to be implemented as part of the Deneb + Cancun network upgrade in March of 2024.
47+
Proto-Danksharding is the first of these roadmap items to be implemented as part of the Cancun-Deneb ("Dencun") network upgrade in March of 2024.
4848
**Full Danksharding is likely several years away**, as it relies upon several other roadmap items being completed first. Decentralizing rollup infrastructure is likely to be a gradual process - there are many different rollups that are building slightly different systems and will fully decentralize at different rates.
4949

50+
[More on the Dencun network upgrade](/roadmap/dencun/)
51+
5052
<QuizWidget quizKey="scaling" />

src/@chakra-ui/components/Avatar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { pick } from "lodash"
1+
import pick from "lodash/pick"
22
import { avatarAnatomy } from "@chakra-ui/anatomy"
33
import {
44
createMultiStyleConfigHelpers,

0 commit comments

Comments
 (0)