Skip to content

Commit b19d47a

Browse files
committed
Merge branch 'dev' into hreflang
2 parents e92856f + 76d6930 commit b19d47a

File tree

138 files changed

+3430
-2283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+3430
-2283
lines changed

next-i18next.config.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ const locales = BUILD_LOCALES
99
/** @type {import('next-i18next').UserConfig} */
1010
module.exports = {
1111
i18n: {
12-
defaultLocale: "en",
12+
// "default" locale is a hack to always display the locale prefix in the
13+
// url. Ref: https://nextjs.org/docs/pages/building-your-application/routing/internationalization#prefixing-the-default-locale
14+
defaultLocale: "default",
1315
// supported locales defined in `i18n.config.json`
14-
locales,
16+
locales: ["default", ...locales],
17+
localeDetection: false,
1518
},
1619
// define custom location for intl files, otherwise default to public/locales (https://github.com/i18next/next-i18next#2-translation-content)
1720
localePath: "./src/intl",

next.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ module.exports = (phase, { defaultConfig }) => {
3434
return config
3535
},
3636
i18n,
37+
trailingSlash: true,
3738
images: {
3839
deviceSizes: [640, 750, 828, 1080, 1200, 1504, 1920],
3940
},

public/_redirects

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/en/ / 301!
2-
31
/discord https://discord.gg/ethereum-org 301!
42

53
/*/discord https://discord.gg/ethereum-org 301!
@@ -175,5 +173,3 @@
175173
/*/staking/withdraws /:splat/staking/withdrawals/ 301!
176174

177175
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!
178-
179-
/en/stablecoins /stablecoins 301!

public/content/developers/docs/development-networks/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ There are also two maintained public test implementations of Ethereum: Goerli an
6666

6767
Kurtosis is a build system for multi-container test environments which enables developers to locally spin up reproducible instances of blockchain networks.
6868

69-
The Ethereum Kurtosis package can be used to quickly instantiate a parameterizable, highly scaleable, and private Ethereum testnet over Docker or Kubernetes. The package supports all major Execution Layer (EL) and Consensus Layer (CL) clients. Kurtosis gracefully handles all local port mappings and service connections for a representative network to be used in validation and testing workflows relating to Etheruem core infrastructure.
69+
The Ethereum Kurtosis package can be used to quickly instantiate a parameterizable, highly scalable, and private Ethereum testnet over Docker or Kubernetes. The package supports all major Execution Layer (EL) and Consensus Layer (CL) clients. Kurtosis gracefully handles all local port mappings and service connections for a representative network to be used in validation and testing workflows relating to Ethereum core infrastructure.
7070

7171
- [Ethereum network package](https://github.com/kurtosis-tech/ethereum-package)
7272
- [Website](https://www.kurtosis.com/)

public/content/developers/tutorials/erc20-with-safety-rails/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you want to see the complete source code:
2323

2424
## Creating an ERC-20 contract {#creating-an-erc-20-contract}
2525

26-
Before we can add the safety rail functionality we need an ERC-20 contract. In this article we'll use [the OpenZeppelin Contracts Wizard](https://docs.openzeppelin.com/contracts/4.x/wizard). Open it in another browser and follow these instructions:
26+
Before we can add the safety rail functionality we need an ERC-20 contract. In this article we'll use [the OpenZeppelin Contracts Wizard](https://docs.openzeppelin.com/contracts/5.x/wizard). Open it in another browser and follow these instructions:
2727

2828
1. Select **ERC20**.
2929
2. Enter these settings:
@@ -92,7 +92,7 @@ We want to add these requirements to the function:
9292

9393
- The `to` address cannot equal `address(this)`, the address of the ERC-20 contract itself.
9494
- The `to` address cannot be empty, it has to be either:
95-
- An externally owned accounts (EOA). We can't check if an address is an EOA directly, but we can check an address's ETH balance. EOAs almost always have a balance, even if they are no longer used - it's difficult to clear them to the last wei.
95+
- An externally owned account (EOA). We can't check if an address is an EOA directly, but we can check an address's ETH balance. EOAs almost always have a balance, even if they are no longer used - it's difficult to clear them to the last wei.
9696
- A smart contract. Testing if an address is a smart contract is a bit harder. There is an opcode that checks the external code length, called [`EXTCODESIZE`](https://www.evm.codes/#3b), but it is not available directly in Solidity. We have to use [Yul](https://docs.soliditylang.org/en/v0.8.15/yul.html), which is EVM assembly, for it. There are other values we could use from Solidity ([`<address>.code` and `<address>.codehash`](https://docs.soliditylang.org/en/v0.8.15/units-and-global-variables.html#members-of-address-types)), but they cost more.
9797

9898
Lets go over the new code line by line:
@@ -209,4 +209,4 @@ This is a cleanup function, so presumably we don't want to leave any tokens. Ins
209209

210210
## Conclusion {#conclusion}
211211

212-
This is not a perfect solution - there is no perfect solution for the "user made a mistake" problem. However, using these kind of checks can at least prevent some mistakes. The ability to freeze accounts, while dangerous, can be used to limit the damage of certain hacks by denying the hacker the stolen funds.
212+
This is not a perfect solution - there is no perfect solution for the "user made a mistake" problem. However, using these kinds of checks can at least prevent some mistakes. The ability to freeze accounts, while dangerous, can be used to limit the damage of certain hacks by denying the hacker the stolen funds.

public/content/translations/fr/developers/tutorials/erc20-with-safety-rails/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Si vous souhaitez consulter le code source complet :
2424

2525
## Création d'un contrat ERC-20 {#creating-an-erc-20-contract}
2626

27-
Avant de pouvoir ajouter la fonctionnalité de sécurité, nous avons besoin d'un contrat ERC-20. Dans cet article, nous utiliserons [l'assistant de contrats OpenZeppelin](https://docs.openzeppelin.com/contracts/4.x/wizard). Ouvrez-le dans un autre navigateur et suivez ces instructions :
27+
Avant de pouvoir ajouter la fonctionnalité de sécurité, nous avons besoin d'un contrat ERC-20. Dans cet article, nous utiliserons [l'assistant de contrats OpenZeppelin](https://docs.openzeppelin.com/contracts/5.x/wizard). Ouvrez-le dans un autre navigateur et suivez ces instructions :
2828

2929
1. Sélectionnez **ERC20**.
3030
2. Entrez ces paramètres :

public/content/translations/it/developers/tutorials/erc20-with-safety-rails/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Se desideri visualizzare il codice sorgente completo:
2424

2525
## Creare un contratto ERC-20 {#creating-an-erc-20-contract}
2626

27-
Prima di poter aggiungere la funzionalità della barriera di sicurezza, ci occorre un contratto ERC-20. In questo articolo utilizzeremo [la procedura guidata dei contratti di OpenZeppelin](https://docs.openzeppelin.com/contracts/4.x/wizard). Aprila in un altro browser e segui queste istruzioni:
27+
Prima di poter aggiungere la funzionalità della barriera di sicurezza, ci occorre un contratto ERC-20. In questo articolo utilizzeremo [la procedura guidata dei contratti di OpenZeppelin](https://docs.openzeppelin.com/contracts/5.x/wizard). Aprila in un altro browser e segui queste istruzioni:
2828

2929
1. Seleziona **ERC20**.
3030
2. Inserisci queste impostazioni:

public/content/translations/pt-br/developers/docs/consensus-mechanisms/pow/mining/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Para conhecer ainda mais a rentabilidade da mineração, use uma calculadora de
4343

4444
O seguinte fornece uma visão geral de como as transações foram mineradas na prova de trabalho Ethereum. Uma descrição análoga deste processo para a prova de participação Ethereum pode ser encontrada [aqui](/developers/docs/consensus-mechanisms/pos/#transaction-execution-ethereum-pos).
4545

46-
1. Um usuário escreve e assina uma solicitação de [transação](/developers/docs/transactions/) com a chave privada de alguma [ conta ](/developers/docs/accounts/).
46+
1. Um usuário escreve e assina uma solicitação de [transação](/developers/docs/transactions/) com a chave privada de alguma [conta](/developers/docs/accounts/).
4747
2. O usuário transmite a solicitação de transação para toda a rede Ethereum de algum [](/developers/docs/nodes-and-clients/).
4848
3. Ao ouvir tomar conhecimento da nova solicitação de transação, cada nó na rede Ethereum adiciona a solicitação ao seu mempool local, uma lista de todas as solicitações de transação sobre as quais eles têm conhecimento que ainda não foram confirmadas na blockchain em um bloco.
4949
4. Em algum ponto, um nó de mineração agrega várias dezenas ou centenas de solicitações de transação a um [bloco](/developers/docs/blocks/) potencial, de uma forma que maximiza as [taxas de transação](/developers/docs/gas/) que eles ganham enquanto ainda estão abaixo do limite de gás de bloco. Então, o nó de mineração:

public/content/translations/pt-br/developers/tutorials/erc20-with-safety-rails/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Se você quiser ver o código-fonte completo:
2424

2525
## Criando um contrato ERC-20 {#creating-an-erc-20-contract}
2626

27-
Antes que nós possamos adicionar funcionalidade de trilhos de segurança, nós precisamos de um contrato ERC-20. Neste artigo, usaremos o [o Assistente de contratos da OpenZeppelin](https://docs.openzeppelin.com/contracts/4.x/wizard). Abra-o em outro navegador e siga estas instruções:
27+
Antes que nós possamos adicionar funcionalidade de trilhos de segurança, nós precisamos de um contrato ERC-20. Neste artigo, usaremos o [o Assistente de contratos da OpenZeppelin](https://docs.openzeppelin.com/contracts/5.x/wizard). Abra-o em outro navegador e siga estas instruções:
2828

2929
1. Selecione **ERC20**.
3030
2. Entre estas configurações:

public/content/translations/tr/developers/tutorials/erc20-with-safety-rails/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Bütün kaynak kodunu görmek isterseniz:
2424

2525
## ERC-20 sözleşmesi oluşturma {#creating-an-erc-20-contract}
2626

27-
Güvenlik önlemi işlevini eklemeden önce bize bir ERC-20 sözleşmesi lazım. Bu makalede [OpenZeppelin'in Sözleşme Sihirbazı'nı](https://docs.openzeppelin.com/contracts/4.x/wizard) kullanacağız. Başka bir sekmede açın ve şu yönergeleri izleyin:
27+
Güvenlik önlemi işlevini eklemeden önce bize bir ERC-20 sözleşmesi lazım. Bu makalede [OpenZeppelin'in Sözleşme Sihirbazı'nı](https://docs.openzeppelin.com/contracts/5.x/wizard) kullanacağız. Başka bir sekmede açın ve şu yönergeleri izleyin:
2828

2929
1. **ERC20**'yi seçin.
3030
2. Bu ayarları girin:

0 commit comments

Comments
 (0)