Skip to content

Commit

Permalink
Merge branch 'dev' into shadcn-footer-link
Browse files Browse the repository at this point in the history
  • Loading branch information
pettinarip committed Jul 29, 2024
2 parents 9b7223b + 1baf2d6 commit 64c444d
Show file tree
Hide file tree
Showing 28 changed files with 394 additions and 283 deletions.
12 changes: 11 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -12260,7 +12260,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/112751524?v=4",
"profile": "https://github.com/Shiva-Sai-ssb",
"contributions": [
"bug"
"bug",
"maintenance"
]
},
{
Expand Down Expand Up @@ -12343,6 +12344,15 @@
"contributions": [
"content"
]
},
{
"login": "0xV4L3NT1N3",
"name": "0xV4L3NT1N3",
"avatar_url": "https://avatars.githubusercontent.com/u/33112835?v=4",
"profile": "https://github.com/0xV4L3NT1N3",
"contributions": [
"tool"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest_wallet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ body:
- type: input
id: wallet_l2_support
attributes:
label: Does the wallet support Ethereum layer 2 networks?
label: Which Ethereum Layer 2 networks does the wallet support?
description: Please provide documentation on Ethereum layer 2 networks this wallet supports.
validations:
required: true
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/abonnaudet-ledger"><img src="https://avatars.githubusercontent.com/u/71646516?v=4?s=100" width="100px;" alt="abonnaudet-ledger"/><br /><sub><b>abonnaudet-ledger</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aabonnaudet-ledger" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JacobSharples"><img src="https://avatars.githubusercontent.com/u/45126111?v=4?s=100" width="100px;" alt="Jacob Sharples"/><br /><sub><b>Jacob Sharples</b></sub></a><br /><a href="#content-JacobSharples" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/omahs"><img src="https://avatars.githubusercontent.com/u/73983677?v=4?s=100" width="100px;" alt="omahs"/><br /><sub><b>omahs</b></sub></a><br /><a href="#translation-omahs" title="Translation">🌍</a> <a href="#maintenance-omahs" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a> <a href="#maintenance-Shiva-Sai-ssb" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://bsaurabh.xyz/"><img src="https://avatars.githubusercontent.com/u/39492927?v=4?s=100" width="100px;" alt="Saurabh Burade"/><br /><sub><b>Saurabh Burade</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=saurabhburade" title="Code">💻</a></td>
</tr>
<tr>
Expand All @@ -1887,6 +1887,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/krishchvn"><img src="https://avatars.githubusercontent.com/u/58606754?v=4?s=100" width="100px;" alt="Krishnakumar Chavan"/><br /><sub><b>Krishnakumar Chavan</b></sub></a><br /><a href="#content-krishchvn" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xV4L3NT1N3"><img src="https://avatars.githubusercontent.com/u/33112835?v=4?s=100" width="100px;" alt="0xV4L3NT1N3"/><br /><sub><b>0xV4L3NT1N3</b></sub></a><br /><a href="#tool-0xV4L3NT1N3" title="Tools">🔧</a></td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"@hookform/resolvers": "^3.8.0",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-navigation-menu": "^1.2.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-visually-hidden": "^1.1.0",
"@socialgouv/matomo-next": "^1.8.0",
Expand Down Expand Up @@ -121,7 +122,8 @@
"tsconfig-paths-webpack-plugin": "4.1.0",
"typescript": "^5.5.2",
"unified": "^10.0.0",
"unist-util-visit": "^5.0.0"
"unist-util-visit": "^5.0.0",
"usehooks-ts": "^3.1.0"
},
"resolutions": {
"jackspeak": "2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion public/content/defi/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ DeFi is an open-source movement. The DeFi protocols and applications are all ope
More on building dapps
</ButtonLink>

## Further reading {#futher-reading}
## Further reading {#further-reading}

### DeFi data {#defi-data}

Expand Down
3 changes: 3 additions & 0 deletions public/content/developers/docs/apis/backend/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ These libraries abstract away much of the complexity of interacting directly wit

- [cloudflare-eth.com](https://www.cloudflare.com/application-services/products/web3/)

**Etherscan - Block Explorer and Transaction APIs**
- [Documentation](https://docs.etherscan.io/)

**GetBlock-** **_Blockchain-as-a-service for Web3 development_**

- [GetBlock.io](https://getblock.io/)
Expand Down
3 changes: 3 additions & 0 deletions public/content/developers/docs/oracles/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@ There are multiple oracle applications you can integrate into your Ethereum dapp

**[Chainlink](https://chain.link/)** - _Chainlink decentralized oracle networks provide tamper-proof inputs, outputs, and computations to support advanced smart contracts on any blockchain._

**[Chronicle](https://chroniclelabs.org/)** - _Chronicle overcomes the current limitations of transferring data on-chain by developing truly scalable, cost-efficient, decentralized, and verifiable oracles._

**[Witnet](https://witnet.io/)** - _Witnet is a permissionless, decentralized, and censorship-resistant oracle helping smart contracts to react to real world events with strong crypto-economic guarantees._

**[UMA Oracle](https://uma.xyz)** - _UMA's optimistic oracle allows smart contracts to quickly and receive any kind of data for different applications, including insurance, financial derivatives, and prediction markets._
Expand Down Expand Up @@ -424,6 +426,7 @@ There are multiple oracle applications you can integrate into your Ethereum dapp
**Tutorials**

- [How to Fetch the Current Price of Ethereum in Solidity](https://blog.chain.link/fetch-current-crypto-price-data-solidity/)_Chainlink_
- [Consuming Oracle Data](https://docs.chroniclelabs.org/Developers/tutorials/Remix)_Chronicle_

**Example projects**

Expand Down
4 changes: 2 additions & 2 deletions public/content/roadmap/danksharding/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ KZG stands for Kate-Zaverucha-Goldberg - the names of the three [original author

The KZG ceremony was a way for many people from across the Ethereum community to collectively generate a secret random string of numbers that can be used to verify some data. It is very important that this string of numbers is not known and cannot be recreated by anyone. To ensure this, each person that participated in the ceremony received a string from the previous participant. They then created some new random values (e.g. by allowing their browser to measure the movement of their mouse) and mix it in with the previous value. They then sent the value on to the next participant and destroyed it from their local machine. As long as one person in the ceremony did this honestly, the final value will be unknowable to an attacker.

The EIP-4844 KZG ceremony was open to the public and tens of thousands of people participated to add their own entropy (randomness). In total there were over 140,000 contributions, making it the worlds largest ceremony of its kind. For the ceremony to be undermined, 100% of those participants would have to be actively dishonest. From the perspective of the participants, if they know they were honest, there is no need to trust anyone else because they know that they secured the ceremony (they individually satisfied the 1-out-of-N honest participant requirement).
The EIP-4844 KZG ceremony was open to the public and tens of thousands of people participated to add their own entropy (randomness). In total there were over 140,000 contributions, making it the world's largest ceremony of its kind. For the ceremony to be undermined, 100% of those participants would have to be actively dishonest. From the perspective of the participants, if they know they were honest, there is no need to trust anyone else because they know that they secured the ceremony (they individually satisfied the 1-out-of-N honest participant requirement).

<ExpandableCard title="What is the random number from the KZG ceremony used for?" eventCategory="/roadmap/danksharding" eventName="clicked why is the random number from the KZG ceremony used for?">

Expand All @@ -58,7 +58,7 @@ If someone knows the random locations used for the commitment, it is easy for th
</ExpandableCard>

<InfoBanner isWarning mb={8}>
Neither Danksharding nor Proto-Danksharding follow the traditional "sharding" model that aimed to split the blockchain into multiple parts. Shard chains are no longer part of the roadmap. Instead, Danksharding uses distributed data sampling across blobs to scale Ethereum. This is much simpler to implement. This model has sometimes been referred to as "data-sharding".
Neither Danksharding nor Proto-Danksharding follow the traditional "sharding" model that aims to split the blockchain into multiple parts. Shard chains are no longer part of the roadmap. Instead, Danksharding uses distributed data sampling across blobs to scale Ethereum. This is much simpler to implement. This model has sometimes been referred to as "data-sharding".
</InfoBanner>

## What is Danksharding? {#what-is-danksharding}
Expand Down
2 changes: 1 addition & 1 deletion public/content/roadmap/future-proofing/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Similarly, there are updates that can be made to other parts of present-day Ethe

## Current progress {#current-progress}

Most of the upgrades required for future-proofing Ethereum are **still in the research phase and may be several years away** from being implemented. Upgrades such as removing SELF-DESTRUCT and harmonizing the compression scheme used in the execution and consensus clients are likely to come sooner than quantum resistant cryptography.
Most of the upgrades required for future-proofing Ethereum are **still in the research phase and may be several years away** from being implemented. Upgrades such as removing SELFDESTRUCT and harmonizing the compression scheme used in the execution and consensus clients are likely to come sooner than quantum resistant cryptography.

**Further reading**

Expand Down
2 changes: 1 addition & 1 deletion public/content/roadmap/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ The roadmap is mostly the result of years of work by researchers and developers

**Yes—almost definitely**. The roadmap is the current plan for upgrading Ethereum, covering both near-term and future plans. We expect the roadmap to change as new information and technology become available.

Think of Ethereum's roadmap as a set of intentions for improving Ethereum; it is the core researchers' and developers' best hypothesize of Ethereum's most optimal path forward.
Think of Ethereum's roadmap as a set of intentions for improving Ethereum; it is the core researchers' and developers' best hypothesis of Ethereum's most optimal path forward.

## When will the roadmap be finished? {#when-will-the-roadmap-be-finished}

Expand Down
2 changes: 1 addition & 1 deletion public/content/roadmap/merge/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ For more information, check out this blog post by Tim Beiko on <a href="https://

## The Merge and energy consumption {#merge-and-energy}

The Merge marked the end of proof-of-work for Ethereum and start the era of a more sustainable, eco-friendly Ethereum. Ethereum's energy consumption dropped by an estimated 99.95%, making Ethereum a green blockchain. Learn more about [Ethereum energy consumption](/energy-consumption/).
The Merge marked the end of proof-of-work for Ethereum and started the era of a more sustainable, eco-friendly Ethereum. Ethereum's energy consumption dropped by an estimated 99.95%, making Ethereum a green blockchain. Learn more about [Ethereum energy consumption](/energy-consumption/).

## The Merge and scaling {#merge-and-scaling}

Expand Down
2 changes: 1 addition & 1 deletion public/content/roadmap/verkle-trees/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Verkle tree testnets are already up and running, but there are still substantial
- [Guillaume Ballet explain verkle trees at ETHGlobal](https://www.youtube.com/watch?v=f7bEtX3Z57o)
- ["How Verkle trees make Ethereum lean and mean" by Guillaume Ballet at Devcon 6](https://www.youtube.com/watch?v=Q7rStTKwuYs)
- [Piper Merriam on stateless clients from ETHDenver 2020](https://www.youtube.com/watch?v=0yiZJNciIJ4)
- [Dankrad Fiest explan Verkle trees and statelessness on Zero Knowledge podcast](https://zeroknowledge.fm/episode-202-stateless-ethereum-verkle-tries-with-dankrad-feist/)
- [Dankrad Fiest explains Verkle trees and statelessness on Zero Knowledge podcast](https://zeroknowledge.fm/episode-202-stateless-ethereum-verkle-tries-with-dankrad-feist/)
- [Vitalik Buterin on Verkle trees](https://vitalik.eth.limo/general/2021/06/18/verkle.html)
- [Dankrad Feist on Verkle trees](https://dankradfeist.de/ethereum/2021/06/18/verkle-trie-for-eth1.html)
- [Verkle tree EIP documentation](https://notes.ethereum.org/@vbuterin/verkle_tree_eip#Illustration)
103 changes: 51 additions & 52 deletions src/components/FeedbackWidget/FixedDot.tsx
Original file line number Diff line number Diff line change
@@ -1,61 +1,60 @@
import { forwardRef } from "react"
import { useTranslation } from "next-i18next"
import { Button, ButtonProps, ScaleFade, Text } from "@chakra-ui/react"
import type { ButtonHTMLAttributes } from "react"

import { cn } from "@/lib/utils/cn"

import { FeedbackGlyphIcon } from "../icons"

type FixedDotProps = ButtonProps & {
bottomOffset: number
import { Button } from "@/../tailwind/ui/buttons/Button"

type FixedDotProps = ButtonHTMLAttributes<HTMLButtonElement> & {
isExpanded: boolean
offsetBottom?: boolean
suppressScale?: boolean
}
const FixedDot = ({ bottomOffset, isExpanded, ...props }: FixedDotProps) => {
const { t } = useTranslation("common")
const size = "12"
return (
<Button
data-testid="feedback-widget-button"
h={size}
w={{ base: size, lg: isExpanded ? "15rem" : size }}
borderRadius="full"
boxShadow="tableItemBox"
position="sticky"
bottom={{ base: `${bottomOffset + 1}rem`, lg: 4 }}
color="white"
ms="auto"
me="4"
mt={{ lg: "inherit" }}
zIndex={98} /* Below the mobile menu */
display="flex"
alignItems="center"
_hover={{
transform: "scale(1.1)",
transition: "transform 0.2s ease-in-out",
}}
transition="transform 0.2s ease-in-out, width 0.25s ease-in-out,
border-radius 0.25s linear"
aria-label={t("feedback-widget")}
leftIcon={<FeedbackGlyphIcon color="white" />}
iconSpacing={{ base: 0, lg: "3" }}
sx={{
".chakra-button__icon": {
me: !isExpanded ? 0 : undefined,
},
}}
{...props}
>
<ScaleFade in={isExpanded} delay={0.25}>
<Text
as="span"
fontWeight="bold"
noOfLines={2}
height="100%"
alignItems="center"
display={{ base: "none", lg: isExpanded ? "flex" : "none" }}

const FixedDot = forwardRef<HTMLButtonElement, FixedDotProps>(
({ offsetBottom, isExpanded, suppressScale, className, ...props }, ref) => {
const { t } = useTranslation("common")
return (
<Button
ref={ref}
data-testid="feedback-widget-button"
aria-label={t("feedback-widget")}
className={cn(
"lg:mt-inherit sticky bottom-4 z-20 me-4 ms-auto flex size-12 items-center gap-0 rounded-full text-white shadow-table-item-box",
"transition-all duration-200 hover:shadow-none hover:transition-transform hover:duration-200",
!suppressScale && "hover:scale-110",
offsetBottom && "bottom-31 lg:bottom-4",
isExpanded ? "lg:w-60 lg:gap-3" : "lg:w-12",
className
)}
{...props}
>
<FeedbackGlyphIcon
className={cn("text-white", !isExpanded && "-mx-1")}
/>
<div
className={cn(
"duration-250 transform transition-all",
isExpanded ? "scale-100 opacity-100" : "scale-95 opacity-0"
)}
>
{t("feedback-widget-prompt")}
</Text>
</ScaleFade>
</Button>
)
}
<span
className={cn(
"line-clamp-2 hidden h-full items-center font-bold text-white",
isExpanded && "lg:flex"
)}
>
{t("feedback-widget-prompt")}
</span>
</div>
</Button>
)
}
)

FixedDot.displayName = "FixedDot"

export default FixedDot
Loading

0 comments on commit 64c444d

Please sign in to comment.