Merge branch 'dev' into ashiskumar-dev

Author: pettinarip

.all-contributorsrc

@@ -12015,6 +12015,24 @@
       "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"
+      ]
     }
   ],
   "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,10 @@ 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>
+    </tr>
   </tbody>
 </table>
 

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/evm/index.md

@@ -4,9 +4,7 @@ description: An introduction to the Ethereum virtual machine and how it relates
 lang: en
 ---
 
-The EVM’s physical instantiation can’t be described in the same way that one might point to a cloud or an ocean wave, but it does _exist_ as one single entity maintained by thousands of connected computers running an Ethereum client.
-
-The Ethereum protocol itself exists solely for the purpose of keeping the continuous, uninterrupted, and immutable operation of this special state machine. It's the environment in which all Ethereum accounts and smart contracts live. At any given block in the chain, Ethereum has one and only one 'canonical' state, and the EVM is what defines the rules for computing a new valid state from block to block.
+The Ethereum Virtual Machine (EVM) is a decentralized virtual environment that executes code consistently and securely across all Ethereum nodes. Nodes run the EVM to execute smart contracts, using "[gas](/gas/)" to measure the computational effort required for [operations](/developers/docs/evm/opcodes/), ensuring efficient resource allocation and network security.
 
 ## Prerequisites {#prerequisites}
 

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

public/content/developers/docs/standards/tokens/erc-4626/map-of-erc-4626.png

@@ -71,6 +71,7 @@ Some collaborative efforts to make Ethereum enterprise friendly have been made b
 - [Infura](https://infura.io/) - _scalable API access to the Ethereum and IPFS networks_
 - [Kaleido](https://kaleido.io/) - _an enterprise-focused development platform that offers simplified blockchain and digital asset applications_
 - [NodeReal](https://nodereal.io/) - _provides scalable blockchain infrastructure and API services provider for the Web3 ecosystem_
+- [Moralis](http://moralis.io/) - _enterprise grade APIs and Nodes with a SOC2 type 2 certification_
 - [Provide](https://provide.services/) - _enterprise zero-knowledge middleware_
 - [QuickNode](https://www.quicknode.com/) - _provides reliable and fast nodes with high-level APIs like NFT API, Token API, etc., while delivering a unified product suite and enterprise-grade solutions_
 - [Tenderly](https://tenderly.co) - _a Web3 development platform that provides debugging, observability, and infrastructure building blocks for developing, testing, monitoring, and operating smart contracts_

public/content/enterprise/index.md

@@ -12,6 +12,7 @@ const ButtonLink = ({ customEventOptions, ...props }: ButtonLinkProps) => {
   const handleClick = () => {
     customEventOptions && trackCustomEvent(customEventOptions)
   }
+
   return (
     <Button as={BaseLink} activeStyle={{}} {...props} onClick={handleClick} />
   )

src/components/Buttons/ButtonLink.tsx

@@ -330,14 +330,6 @@ const WalletTable = ({
               })
           }
 
-          const handleWalletWebsiteClick = (walletName: string) => {
-            trackCustomEvent({
-              eventCategory: "WalletExternalLinkList",
-              eventAction: "Tap main button",
-              eventName: `${walletName}`,
-            })
-          }
-
           return (
             <WalletContainer
               key={wallet.key}
@@ -350,10 +342,7 @@ const WalletTable = ({
                 }}
                 onClick={(e) => {
                   // Prevent expanding the wallet more info section when clicking on the "Visit website" button
-                  if (
-                    (e.target as HTMLElement).matches("a, a svg")
-                  )
-                    return
+                  if ((e.target as HTMLElement).matches("a, a svg")) return
                   showMoreInfo(wallet)
                 }}
               >
@@ -393,7 +382,11 @@ const WalletTable = ({
                           {hasPersonasLabels && (
                             <Flex gap={1.5} wrap="wrap">
                               {walletPersonas.map((persona) => (
-                                <Tag key={persona} label={t(persona)} variant="highContrast" />
+                                <Tag
+                                  key={persona}
+                                  label={t(persona)}
+                                  variant="highContrast"
+                                />
                               ))}
                             </Flex>
                           )}
@@ -445,9 +438,11 @@ const WalletTable = ({
                               w="auto"
                               isExternal
                               size="sm"
-                              onClick={() =>
-                                handleWalletWebsiteClick(wallet.name)
-                              }
+                              customEventOptions={{
+                                eventCategory: "WalletExternalLinkList",
+                                eventAction: "Tap main button",
+                                eventName: `${wallet.name}`,
+                              }}
                             >
                               {t("page-find-wallet-visit-website")}
                             </ButtonLink>
@@ -474,7 +469,11 @@ const WalletTable = ({
                       w="100%"
                       isExternal
                       size="sm"
-                      onClick={() => handleWalletWebsiteClick(wallet.name)}
+                      customEventOptions={{
+                        eventCategory: "WalletExternalLinkList",
+                        eventAction: "Tap main button",
+                        eventName: `${wallet.name}`,
+                      }}
                     >
                       {t("page-find-wallet-visit-website")}
                     </ButtonLink>