Merge remote-tracking branch 'origin/dev' into feat/chromatic-story-modes

Author: TylerAPfledderer

.all-contributorsrc

@@ -12015,6 +12015,33 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "raxhvl",
+      "name": "rahul",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10168946?v=4",
+      "profile": "https://github.com/raxhvl",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "professorabhay",
+      "name": "Abhay Gupta ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/76243309?v=4",
+      "profile": "https://abhayporwals.live/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "somethingstup",
+      "name": "somethingstup",
+      "avatar_url": "https://avatars.githubusercontent.com/u/166286712?v=4",
+      "profile": "https://github.com/somethingstup",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/non-english-warning.yml

@@ -0,0 +1,74 @@
+name: Check for non-English updates outside of Crowdin
+
+on:
+  pull_request:
+    paths:
+      - "public/content/translations/**/*.md"
+      - "src/intl/**/*.json"
+      - "!src/intl/en/**
+
+jobs:
+  check_branch_name:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Exit early if branch name contains 'crowdin'
+        run: |
+          if [[ "${{ github.head_ref }}" == *crowdin* ]]; then
+            echo "Branch name contains 'crowdin', stopping workflow"
+            exit 1
+          fi
+
+  check_changes:
+    needs: check_branch_name
+    runs-on: ubuntu-latest
+    outputs:
+      all_changes_include_href: ${{ steps.check.outputs.all_changes_include_href }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Check changes
+        id: check
+        run: |
+          git fetch origin ${{ github.base_ref }}
+          DIFF=$(git diff --no-ext-diff --unified=0 origin/${{ github.base_ref }}..${{ github.head_ref }} -- 'public/content/translations/**/*.md' 'src/intl/**/*.json' '!src/intl/en/**' | grep -E -v '^[-+]href=')
+          if [[ -z "$DIFF" ]]; then
+            echo "ALL_CHANGES_INCLUDE_HREF=true" >> $GITHUB_ENV
+          else
+            echo "ALL_CHANGES_INCLUDE_HREF=false" >> $GITHUB_ENV
+          fi
+          echo "::set-output name=all_changes_include_href::$ALL_CHANGES_INCLUDE_HREF"
+
+  add_label_and_comment:
+    needs: check_changes
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add label and comment
+        uses: actions/github-script@v5
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const prNumber = context.issue.number;
+            const repo = context.repo;
+            const prAuthor = context.payload.pull_request.user.login;
+            const allChangesIncludeHref = '${{ needs.check_changes.outputs.all_changes_include_href }}' === 'true';
+            const status = allChangesIncludeHref ? 'question ❓' : 'blocked 🛑';
+            await github.rest.issues.addLabels({
+              ...repo,
+              issue_number: prNumber,
+              labels: [status, 'non-crowdin translation updates']
+            });
+            const commentWithoutHrefs = `This pull request contains changes to non-English content, which must also be handled through the Crowdin platform instead of only on GitHub.`
+            const commentWithHrefs = `This pull request contains changes to non-English content files, which may also need to be handled through the Crowdin platform instead of only on GitHub.
+            await github.rest.issues.createComment({
+              ...repo,
+              issue_number: prNumber,
+              body: `
+              Thank you for your contribution, @${prAuthor}!
+              
+              ${allChangesIncludeHref ? commentWithHrefs : commentWithoutHrefs}
+              
+              We value your suggestion, and for any non-English content updates we request that you check out [how to help us translate](https://ethereum.org/en/contributing/translation-program/#help-us-translate), and suggest these updates directly in [our Crowdin project](https://crowdin.com/project/ethereum-org) if possible, where they can be properly reviewed.
+              
+              Please post here or join [our Discord](https://ethereum.org/discord) if you have questions!
+              `
+            });

README.md

@@ -1840,6 +1840,11 @@ 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/ksdumont"><img src="https://avatars.githubusercontent.com/u/51958351?v=4?s=100" width="100px;" alt="Keith Dumont"/><br /><sub><b>Keith Dumont</b></sub></a><br /><a href="#content-ksdumont" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ecabras"><img src="https://avatars.githubusercontent.com/u/126670074?v=4?s=100" width="100px;" alt="ecabras"/><br /><sub><b>ecabras</b></sub></a><br /><a href="#content-ecabras" title="Content">🖋</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/raxhvl"><img src="https://avatars.githubusercontent.com/u/10168946?v=4?s=100" width="100px;" alt="rahul"/><br /><sub><b>rahul</b></sub></a><br /><a href="#content-raxhvl" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://abhayporwals.live/"><img src="https://avatars.githubusercontent.com/u/76243309?v=4?s=100" width="100px;" alt="Abhay Gupta "/><br /><sub><b>Abhay Gupta </b></sub></a><br /><a href="#content-professorabhay" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/somethingstup"><img src="https://avatars.githubusercontent.com/u/166286712?v=4?s=100" width="100px;" alt="somethingstup"/><br /><sub><b>somethingstup</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=somethingstup" title="Documentation">📖</a></td>
+    </tr>
   </tbody>
 </table>
 

netlify.toml

@@ -41,12 +41,14 @@
 [functions]
 
   [functions.___netlify-odb-handler]
+    external_node_modules = ["sharp"]
     included_files = [
       "./src/intl/**/*",
       "!./public/**/*",
       "node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/router-context*",
       "node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/amp-context*",
       "node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/head-manager-context*",
+      "node_modules/sharp/**/*",
     ]
 
   [functions.___netlify-handler]

public/content/community/events/index.md

@@ -11,7 +11,7 @@ hideEditButton: true
 
 <UpcomingEventsList/>
 
-This is a non-exhaustive list maintained by our community. Know of an upcoming Ethereum event to add to this list? [Please add it](https://github.com/ethereum/ethereum-org-website/blob/dev/src/data/community-events.ts)!
+This is a non-exhaustive list maintained by our community. Know of an upcoming Ethereum event to add to this list? [Please add it](https://github.com/ethereum/ethereum-org-website/blob/dev/src/data/community-events.json)!
 
 ## Ethereum meetups {#meetups}
 

public/content/community/get-involved/index.md

@@ -38,6 +38,7 @@ Do you have a background in mathematics, cryptography, or economics? You might b
 - [Ethresear.ch](https://ethresear.ch) - Ethereum’s primary forum for research, and the world’s most influential forum for cryptoeconomics
 - [EF Research AMA](https://old.reddit.com/r/ethereum/comments/vrx9xe/ama_we_are_ef_research_pt_8_07_july_2022) - An ongoing Q&A series with researchers. As each next part opens, anyone can post questions.
 - [Ecosystem Support Program's wishlist](https://esp.ethereum.foundation/wishlist/) - research areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
+- [AllWalletDevs](allwallet.dev) - a forum for Ethereum developers, designers, and interested users to come together regularly and discuss wallets
 
 [Explore more active areas of research](/community/research/).
 

public/content/community/language-resources/index.md

@@ -32,6 +32,7 @@ If you are bilingual and want to help us reach more people, you can also get inv
 - [Cointelegraph](http://cointelegraph.com.br/category/analysis) - Brazilian version of Cointelegraph, a major cryptocurrency news outlet
 - [Livecoins](http://www.livecoins.com.br/ethereum) - cryptocurrency news and tools
 - [Seudinheiro](http://www.seudinheiro.com/criptomoedas/) - cryptocurrency news and reports
+- [Modular Crypto](https://modularcrypto.xyz/) - cryptocurrency news and educational articles
 
 **Education**
 

public/content/developers/docs/intro-to-ether/index.md

@@ -40,7 +40,7 @@ As well as creating ether through block rewards, ether can be destroyed through
 
 Ether burn occurs in every transaction on Ethereum. When users pay for their transactions, a base gas fee, set by the network according to transactional demand, gets destroyed. This, coupled with variable block sizes and a maximum gas fee, simplifies transaction fee estimation on Ethereum. When network demand is high, [blocks](https://etherscan.io/block/12965263) can burn more ether than they mint, effectively offsetting ether issuance.
 
-Burning the base fee hinders a block producers ability to manipulate transactions. For example, if block producers received the base fee, they could include their own transactions for free and raise the base fee for everyone else. Alternatively, they could refund the base fee to some users off-chain, leading to a more opaque and complex transaction fee market.
+Burning the base fee hinders a block producer's ability to manipulate transactions. For example, if block producers received the base fee, they could include their own transactions for free and raise the base fee for everyone else. Alternatively, they could refund the base fee to some users off-chain, leading to a more opaque and complex transaction fee market.
 
 ## Denominations of ether {#denominations}
 

public/content/developers/docs/standards/tokens/erc-4626/index.md

@@ -27,7 +27,7 @@ To better understand this page, we recommend you first read about [token standar
 #### asset {#asset}
 
 ```solidity
-function asset() public view returns (address)
+function asset() public view returns (address assetTokenAddress)
 ```
 
 This function returns the address of the underlying token used for the vault for accounting, depositing, withdrawing.
@@ -59,15 +59,15 @@ This function returns the amount of `assets` that would be exchanged by the vaul
 #### maxDeposit {#maxdeposit}
 
 ```solidity
-function maxDeposit(address receiver) public view returns (uint256)
+function maxDeposit(address receiver) public view returns (uint256 maxAssets)
 ```
 
 This function returns the maximum amount of underlying assets that can be deposited in a single [`deposit`](#deposit) call by the `receiver`.
 
 #### previewDeposit {#previewdeposit}
 
 ```solidity
-function previewDeposit(uint256 assets) public view returns (uint256)
+function previewDeposit(uint256 assets) public view returns (uint256 shares)
 ```
 
 This function allows users to simulate the effects of their deposit at the current block.
@@ -83,15 +83,15 @@ This function deposits `assets` of underlying tokens into the vault and grants o
 #### maxMint {#maxmint}
 
 ```solidity
-function maxMint(address receiver) public view returns (uint256)
+function maxMint(address receiver) public view returns (uint256 maxShares)
 ```
 
 This function returns the maximum amount of shares that can be minted in a single [`mint`](#mint) call by the `receiver`.
 
 #### previewMint {#previewmint}
 
 ```solidity
-function previewMint(uint256 shares) public view returns (uint256)
+function previewMint(uint256 shares) public view returns (uint256 assets)
 ```
 
 This function allows users to simulate the effects of their mint at the current block.
@@ -107,15 +107,15 @@ This function mints exactly `shares` vault shares to `receiver` by depositing `a
 #### maxWithdraw {#maxwithdraw}
 
 ```solidity
-function maxWithdraw(address owner) public view returns (uint256)
+function maxWithdraw(address owner) public view returns (uint256 maxAssets)
 ```
 
 This function returns the maximum amount of underlying assets that can be withdrawn from the `owner` balance with a single [`withdraw`](#withdraw) call.
 
 #### previewWithdraw {#previewwithdraw}
 
 ```solidity
-function previewWithdraw(uint256 assets) public view returns (uint256)
+function previewWithdraw(uint256 assets) public view returns (uint256 shares)
 ```
 
 This function allows users to simulate the effects of their withdrawal at the current block.
@@ -131,15 +131,15 @@ This function burns `shares` from `owner` and send exactly `assets` token from t
 #### maxRedeem {#maxredeem}
 
 ```solidity
-function maxRedeem(address owner) public view returns (uint256)
+function maxRedeem(address owner) public view returns (uint256 maxShares)
 ```
 
 This function returns the maximum amount of shares that can be redeemed from the `owner` balance through a [`redeem`](#redeem) call.
 
 #### previewRedeem {#previewredeem}
 
 ```solidity
-function previewRedeem(uint256 shares) public view returns (uint256)
+function previewRedeem(uint256 shares) public view returns (uint256 assets)
 ```
 
 This function allows users to simulate the effects of their redemption at the current block.
@@ -168,6 +168,10 @@ function balanceOf(address owner) public view returns (uint256)
 
 Returns the total amount of vault shares the `owner` currently has.
 
+### Map of the interface {#mapOfTheInterface}
+
+![Map of the ERC-4626 interface](./map-of-erc-4626.png)
+
 ### Events {#events}
 
 #### Deposit Event