Skip to content

Commit

Permalink
Merge branch 'dev' into walletTableAbstraction
Browse files Browse the repository at this point in the history
  • Loading branch information
corwintines committed Sep 19, 2024
2 parents 3a1983c + 80db1a9 commit 591e9fb
Show file tree
Hide file tree
Showing 52 changed files with 279 additions and 623 deletions.
2 changes: 1 addition & 1 deletion README.md → Adding that improves clarity README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ git push
- In your PR description, reference the issue it resolves (see [linking a pull request to an issue using a keyword](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- ex. `Updates out of date content [Fixes #1234]`
- Netlify (our hosting service for build previews) deploys all PRs to a publicly accessible preview URL, e.g.: ![Netlify deploy preview](public/images/preview-deploy.png)
- _Confirm your Netlify preview deploy looks & functions as expected_
- _Confirm that your Netlify preview deploy looks and functions as expected_
- Why not say hi and draw attention to your PR in [our discord server](https://discord.gg/ethereum-org)?

### 6. Wait for review
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ethereum-org-website",
"version": "8.10.1",
"version": "9.0.0",
"license": "MIT",
"private": true,
"scripts": {
Expand Down Expand Up @@ -56,7 +56,6 @@
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"embla-carousel-react": "^7.0.0",
"ethereum-blockies-base64": "^1.0.2",
"framer-motion": "^10.13.0",
"gray-matter": "^4.0.3",
Expand All @@ -65,7 +64,7 @@
"lodash.merge": "^4.6.2",
"lodash.shuffle": "^4.2.0",
"lodash.union": "^4.6.0",
"next": "^14.2.3",
"next": "^14.2.10",
"next-i18next": "^14.0.3",
"next-mdx-remote": "^3.0.8",
"next-sitemap": "^4.2.3",
Expand Down
2 changes: 1 addition & 1 deletion public/content/dao/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: What is a DAO? | Decentralized Autonomous Organizations
title: Decentralized autonomous organizations (DAOs)
description: An overview of DAOs on Ethereum
lang: en
template: use-cases
Expand Down
2 changes: 1 addition & 1 deletion public/content/defi/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: What is DeFi? | Benefits and Use of Decentralised Finance
title: Decentralized finance (DeFi)
description: An overview of DeFi on Ethereum
lang: en
template: use-cases
Expand Down
2 changes: 1 addition & 1 deletion public/content/developers/docs/gas/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Ethereum gas and fees: technical overview"
title: Gas and fees
description:
lang: en
---
Expand Down
1 change: 1 addition & 0 deletions public/content/developers/docs/mev/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ Below is an overview of how the Builder API works:
5. A validator using the Builder API is still expected to build a block locally in case the block builder fails to respond promptly, so they don't miss out on block proposal rewards. However, validator cannot create another block using either the now-revealed transactions or another set, as it would amount to _equivocation_ (signing two blocks within the same slot), which is a slashable offense.

An example implementation of the Builder API is [MEV Boost](https://github.com/flashbots/mev-boost), an improvement on the [Flashbots auction mechanism](https://docs.flashbots.net/Flashbots-auction/overview/) designed to curb the negative externalities of MEV on Ethereum. Flashbots auction allows validators in proof-of-stake to outsource the work of building profitable blocks to specialized parties called **searchers**.
![A diagram showing the MEV flow in detail](./mev.png)

Searchers look for lucrative MEV opportunities and send transaction bundles to block proposers along with a [sealed-price bid](https://en.wikipedia.org/wiki/First-price_sealed-bid_auction) for inclusion in the block. The validator running mev-geth, a forked version of the go-ethereum (Geth) client only has to choose the bundle with the most profit and include it as part of the new block. To protect block proposers (validators) from spam and invalid transactions, transaction bundles pass through **relayers** for validation before getting to the proposer.

Expand Down
Binary file added public/content/developers/docs/mev/mev.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/content/guides/how-to-use-a-wallet/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: How to use Ethereum Wallets | Step by Step
title: How to use a wallet
description: A guide explaining how to send, receive tokens and connect to web3 projects.
lang: en
---
Expand Down
2 changes: 1 addition & 1 deletion public/content/nft/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: What are NFTs? | Benefits and use
title: Non-fungible tokens (NFT)
description: An overview of NFTs on Ethereum
lang: en
template: use-cases
Expand Down
2 changes: 1 addition & 1 deletion public/content/smart-contracts/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Smart contracts: What are they and benefits"
title: Smart contracts
description: A non-technical introduction to smart contracts
lang: en
---
Expand Down
2 changes: 0 additions & 2 deletions src/@chakra-ui/components/components.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const {
Checkbox: checkboxDefaultTheme,
CloseButton: closeButtonDefaultTheme,
Code: codeDefaultTheme,
Divider: dividerDefaultTheme,
Drawer: drawerDefaultTheme,
Form: formDefaultTheme,
FormLabel: formLabelDefaultTheme,
Expand Down Expand Up @@ -37,7 +36,6 @@ export {
checkboxDefaultTheme,
closeButtonDefaultTheme,
codeDefaultTheme,
dividerDefaultTheme,
drawerDefaultTheme,
formDefaultTheme,
formLabelDefaultTheme,
Expand Down
2 changes: 0 additions & 2 deletions src/@chakra-ui/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Checkbox } from "./Checkbox"
import {
closeButtonDefaultTheme,
codeDefaultTheme,
dividerDefaultTheme,
drawerDefaultTheme,
formDefaultTheme,
formLabelDefaultTheme,
Expand Down Expand Up @@ -39,7 +38,6 @@ export default {
Checkbox,
CloseButton: closeButtonDefaultTheme,
Code: codeDefaultTheme,
Divider: dividerDefaultTheme,
Drawer: drawerDefaultTheme,
Form: formDefaultTheme,
FormLabel: formLabelDefaultTheme,
Expand Down
2 changes: 1 addition & 1 deletion src/components/BigNumber/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const BigNumber = ({
>
{value ? (
<>
<div className="text-5xl font-bold">{value}</div>
<div className="text-4xl font-bold sm:text-5xl">{value}</div>
<div className="text-sm">
{children}
{sourceName && sourceUrl && (
Expand Down
5 changes: 1 addition & 4 deletions src/components/MdComponents/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import LocaleDateTime from "../LocaleDateTime"
import MainArticle from "../MainArticle"
import { StandaloneQuizWidget } from "../Quiz/QuizWidget"
import { ButtonLink } from "../ui/buttons/Button"
import { Divider } from "../ui/divider"
import { Flex } from "../ui/flex"
import { ListItem, OrderedList, UnorderedList } from "../ui/list"
import { mdxTableComponents } from "../ui/Table"
Expand Down Expand Up @@ -180,10 +181,6 @@ export const MobileButtonDropdown = ({
<StyledButtonDropdown className={cn("mb-0", className)} {...props} />
)

export const Divider = () => (
<div className="my-16 h-1 w-[10%] bg-primary-high-contrast" />
)

// All custom React components
export const reactComponents = {
Badge,
Expand Down
4 changes: 2 additions & 2 deletions src/components/Nav/Desktop/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const DesktopNavMenu = ({ toggleColorMode }: DesktopNavMenuProps) => {
aria-label={themeIconAriaLabel}
variant="ghost"
isSecondary
className="group px-2 xl:px-3 [&>svg]:transition-all [&>svg]:duration-500 [&>svg]:hover:rotate-12 [&>svg]:hover:text-primary-hover"
className="group px-2 xl:px-3 [&>svg]:transition-transform [&>svg]:duration-500 [&>svg]:hover:rotate-12 [&>svg]:hover:text-primary-hover"
onClick={toggleColorMode}
>
<ThemeIcon className="transform-transform duration-500 group-hover:rotate-12 group-hover:transition-transform group-hover:duration-500" />
Expand All @@ -64,7 +64,7 @@ const DesktopNavMenu = ({ toggleColorMode }: DesktopNavMenuProps) => {
name={DESKTOP_LANGUAGE_BUTTON_NAME}
ref={languagePickerRef}
variant="ghost"
className="gap-0 px-2 text-body transition-colors duration-500 active:bg-primary-low-contrast active:text-primary-hover data-[state='open']:bg-primary-low-contrast data-[state='open']:text-primary-hover xl:px-3 [&_svg]:transition-transform [&_svg]:duration-500 [&_svg]:hover:rotate-12"
className="gap-0 px-2 text-body transition-transform duration-500 active:bg-primary-low-contrast active:text-primary-hover data-[state='open']:bg-primary-low-contrast data-[state='open']:text-primary-hover xl:px-3 [&_svg]:transition-transform [&_svg]:duration-500 [&_svg]:hover:rotate-12"
>
<BsTranslate className="me-2 align-middle text-2xl" />
<span className="hidden lg:inline-block">
Expand Down
3 changes: 1 addition & 2 deletions src/components/Search/SearchButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ const SearchButton = forwardRef<HTMLButtonElement, ButtonProps>(
ref={ref}
aria-label={t("aria-toggle-search-button")}
className={cn(
"px-2 ease-in-out [&>svg]:transition-all [&>svg]:duration-500 [&>svg]:hover:rotate-12 [&>svg]:hover:text-primary-hover",
"group me-3 border border-disabled hover:border-primary-hover",
"group px-2 ease-in-out [&>svg]:transition-all [&>svg]:duration-500 [&>svg]:hover:rotate-12 [&>svg]:hover:text-primary-hover",
className
)}
variant="ghost"
Expand Down
109 changes: 0 additions & 109 deletions src/components/Slider/Slider.stories.tsx

This file was deleted.

Loading

0 comments on commit 591e9fb

Please sign in to comment.