Skip to content

Commit dfe74c3

Browse files
authored
Merge pull request #9995 from ethereum/dev
Deploy v7.10.1
2 parents 357d8ad + 5040a0f commit dfe74c3

File tree

15 files changed

+307
-415
lines changed

15 files changed

+307
-415
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "7.10.0",
3+
"version": "7.10.1",
44
"description": "Website of ethereum.org",
55
"main": "index.js",
66
"repository": "git@github.com:ethereum/ethereum-org-website.git",

src/components/UpgradeArticles.tsx

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/content/contributing/design/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Ultimately, this is a great way to build a diverse and impressive portfolio that
1616

1717
We sometimes need a help testing our raw ideas. This is a great way how to contribute without any technical knowledge.
1818

19-
1. The design team will share a mockup design on Discord and on GitHub.
19+
1. The design team will share a mockup design on [Discord](https://discord.com/invite/CetY6Y4) and on [GitHub](https://github.com/ethereum/ethereum-org-website/labels/design%20required%20%F0%9F%8E%A8).
2020
2. You will be guided through the designs to provide feedback via comments function.
2121
3. The outcome will be shared in the GitHub issue and then closed by the team.
2222

@@ -33,7 +33,7 @@ Provide feedback on our website by:
3333
Ethereum.org is a fast growing website with many features and content. Some of the UI can easily become obsolete or could be improved. If you encounter any such instance, please report it so that it gets our attention.
3434

3535
1. Go through the website and pay attention to its design.
36-
2. Take screenshots and notes If you see any visual or UX issues.
36+
2. Take screenshots and notes if you see any visual or UX issues.
3737
3. Report the found issues using a [bug report](https://github.com/ethereum/ethereum-org-website/issues/new/choose).
3838

3939
### <Emoji text=":four:" size={1} /> Propose design changes {#propose-design-changes}

src/content/developers/docs/apis/backend/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ These libraries abstract away much of the complexity of interacting directly wit
3232
- [blockcypher.com](https://www.blockcypher.com/)
3333
- [Documentation](https://www.blockcypher.com/dev/ethereum/)
3434

35-
**Blast by Bware Labs -** **_Decentralized APIs for Ethereum Mainnet ant Testnets._**
35+
**Blast by Bware Labs -** **_Decentralized APIs for Ethereum Mainnet and Testnets._**
3636

3737
- [blastapi.io](https://blastapi.io/)
3838
- [Documentation](https://docs.blastapi.io)

src/content/developers/docs/data-structures-and-encoding/patricia-merkle-trie/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In a basic radix trie, every node looks as follows:
2323

2424
Where `i_0 ... i_n` represent the symbols of the alphabet (often binary or hex), `value` is the terminal value at the node, and the values in the `i_0, i_1 ... i_n` slots are either `NULL` or pointers to (in our case, hashes of) other nodes. This forms a basic `(key, value)` store.
2525

26-
Say you wanted to use a radix tree data structure for persisting an order over a set of key value pairs. To find the value currently mapped to the key `dog` in the trie, you would first convert `dog` into letters of the alphabet (giving `64 6f 67`), and then descend the trie following that path until you find the value. That is, you start by looking up the root hash in a flat key/value DB to find the root node of the trie. It is represented as an array of keys pointing to other nodes. You would use the value at index `6` as a key and look it up in the flat key/value DB to get the node one level down. Then pick index `4` to look up the next value, then pick index `6`, and so on, until, once you followed the path: `root -> 6 -> 4 -> 6 -> 15 -> 6 -> 7`, you look would up the value of the node and return the result.
26+
Say you wanted to use a radix tree data structure for persisting an order over a set of key value pairs. To find the value currently mapped to the key `dog` in the trie, you would first convert `dog` into letters of the alphabet (giving `64 6f 67`), and then descend the trie following that path until you find the value. That is, you start by looking up the root hash in a flat key/value DB to find the root node of the trie. It is represented as an array of keys pointing to other nodes. You would use the value at index `6` as a key and look it up in the flat key/value DB to get the node one level down. Then pick index `4` to look up the next value, then pick index `6`, and so on, until, once you followed the path: `root -> 6 -> 4 -> 6 -> 15 -> 6 -> 7`, you would look up the value of the node and return the result.
2727

2828
There is a difference between looking something up in the 'trie' and the underlying flat key/value 'DB'. They both define key/values arrangements, but the underlying DB can do a traditional 1 step lookup of a key. Looking up a key in the trie requires multiple underlying DB lookups to get to the final value described above. Let's refer to the latter as a `path` to eliminate ambiguity.
2929

src/content/nft/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ Security issues relating to NFTs are most often related to phishing scams, smart
341341

342342
## Build with NFTs {#build-with-nfts}
343343

344-
Most NFTs are built using a consistent standard known as [ERC-721](/developers/docs/standards/tokens/erc-721/). However there are other standards that you might want to look into. The [ERC-1155](https://blog.enjincoin.io/erc-1155-the-crypto-item-standard-ac9cf1c5a226) standard allows for semi-fungible tokens which is particularly useful in the realm of gaming. And more recently, [EIP-2309](https://eips.ethereum.org/EIPS/eip-2309) has been proposed to make minting NFTs a lot more efficient. This standard lets you mint as many as you like in one transaction!
344+
Most NFTs are built using a consistent standard known as [ERC-721](/developers/docs/standards/tokens/erc-721/). However there are other standards that you might want to look into. The [ERC-1155](/developers/docs/standards/tokens/erc-1155/) standard allows for semi-fungible tokens which is particularly useful in the realm of gaming. And more recently, [EIP-2309](https://eips.ethereum.org/EIPS/eip-2309) has been proposed to make minting NFTs a lot more efficient. This standard lets you mint as many as you like in one transaction!
345345

346346
## Further reading {#further-reading}
347347

src/content/roadmap/scaling/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Rollups collect large numbers of transactions, execute them and submit the resul
2424

2525
### Proto-Danksharding {#proto-danksharding}
2626

27-
Rollup data is stored on Ethereum permanently, which is expensive. Over 90% of the transaction cost users pay on rollups is due to this data storage. To reduce transaction costs, we can move the data into a new temporary 'blob' storage. Blobs are cheaper because they are not permanent; they get deleted from Ethereum once they are no longer needed. Storing rollup data long term becomes the responsibility of the poeple that need it, such as rollup operators, exchanges, indexing services etc. Adding blob transactions to Ethereum is part of an upgrade known as "Proto-Danksharding". It is expected to be shipped relatively soon—perhaps in late 2023.
27+
Rollup data is stored on Ethereum permanently, which is expensive. Over 90% of the transaction cost users pay on rollups is due to this data storage. To reduce transaction costs, we can move the data into a new temporary 'blob' storage. Blobs are cheaper because they are not permanent; they get deleted from Ethereum once they are no longer needed. Storing rollup data long term becomes the responsibility of the people that need it, such as rollup operators, exchanges, indexing services etc. Adding blob transactions to Ethereum is part of an upgrade known as "Proto-Danksharding". It is expected to be shipped relatively soon—perhaps in late 2023.
2828

2929
After blob transactions have become part of the Ethereum protocol through Proto-Danksharding, it will be possible to add many blobs to Ethereum blocks. This will be another substantial (>100x) scale-up to Ethereum’s throughput and scale-down to transaction costs.
3030

src/content/translations/es/developers/docs/standards/tokens/erc-1155/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Una interfaz para contratos que administran múltiples tipos de tokens. Un solo
1010

1111
**¿Qué se entiende por estándar multitoken?**
1212

13-
La idea es simple y busca crear una interfaz de contrato inteligente que pueda representar y controlar cualquier cantidad y tipo de token fungible y no fungible. De esta manera, los tokens ERC-1155 pueden hacer las mismas funciones que los tokens [ERC-20](/developers/docs/standards/tokens/erc-20/) y los tokens [ERC-721](/developers/docs/standards/tokens/erc-721/), e incluso ambas al mismo tiempo. Y lo mejor de todo, mejorar la funcionalidad de ambos estándares, haciendolos más eficientes y corrigiendo errores evidentes en la implementación de los estándares ERC-20 y ERC-721.
13+
La idea es simple y busca crear una interfaz de contrato inteligente que pueda representar y controlar cualquier cantidad y tipo de token fungible y no fungible. De esta manera, los tokens ERC-1155 pueden hacer las mismas funciones que los tokens [ERC-20](/developers/docs/standards/tokens/erc-20/) y los tokens [ERC-721](/developers/docs/standards/tokens/erc-721/), e incluso ambas al mismo tiempo. Y lo mejor de todo, mejorar la funcionalidad de ambos estándares, haciéndolos más eficientes y corrigiendo errores evidentes en la implementación de los estándares ERC-20 y ERC-721.
1414

1515
El token ERC-1155 se describe completamente en [EIP-1155](https://eips.ethereum.org/EIPS/eip-1155).
1616

@@ -21,15 +21,15 @@ Para una mejor comprensión de esta página, recomendamos que primero lea acerca
2121
## Características y funciones de ERC-1155: {#body}
2222

2323
- [Transferencia en lotes](#batch_transfers): transfiera múltiples activos en una sola llamada.
24-
- [Saldos en lote](#batch_balance): obtenga saldos de multiples activos en una sola llamada.
24+
- [Saldos en lote](#batch_balance): obtenga saldos de múltiples activos en una sola llamada.
2525
- [Aprobación en lote](#batch_approval): apruebe todos los tokens en una dirección.
2626
- [Hooks](#recieve_hook): reciba hooks de tokens.
2727
- [Compatibilidad con NFT](#nft_support): si el suministro solo es 1, trátelo como un NFT.
2828
- [Reglas de transferencia segura](#safe_transfer_rule): conjunto de reglas para una transferencia segura.
2929

3030
### Transferencias en lote {#batch-transfers}
3131

32-
Las tranferencias en lote funcionan de manera muy similar a las transferencias regulares ERC-20. Veamos la función regular de transferencia de ERC-20 transferFrom:
32+
Las transferencias en lote funcionan de manera muy similar a las transferencias regulares ERC-20. Veamos la función regular de transferencia de ERC-20 `transferFrom`:
3333

3434
```solidity
3535
// ERC-20
@@ -136,7 +136,7 @@ Ya hemos hablado un poco acerca de algunas reglas de transferencia segura en exp
136136
3. cualquier balance(s) del tenedor(es) del token(s) en `_ids` es menor(es) que el monto (los montos) respectivo(s) en `_values` enviado al destinatario.
137137
4. ocurre cualquier otro error.
138138

139-
_Nota_: Todas las funciones de lote, incluyendo hook, también existen como versiones sin lote. Esto se hace para la eficiencia del gas, considerando que la transferencia de un solo activo probablemente siga siendo la manera más comúnmente utilizada. Las hemos dejado de lado para mayor simplicidad en las explicaciones, incluidas las reglas de transferencia segura. Los nombres son identicos, solo quite el lote ("Batch").
139+
_Nota_: Todas las funciones de lote, incluyendo hook, también existen como versiones sin lote. Esto se hace para la eficiencia del gas, considerando que la transferencia de un solo activo probablemente siga siendo la manera más comúnmente utilizada. Las hemos dejado de lado para mayor simplicidad en las explicaciones, incluidas las reglas de transferencia segura. Los nombres son idénticos, solo quite el lote ("Batch").
140140

141141
## Más información {#further-reading}
142142

src/content/translations/es/developers/docs/standards/tokens/erc-777/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ERC-777 proporciona las siguientes mejoras sobre ERC-20.
1818

1919
### Hooks {#hooks}
2020

21-
Los hooks son una función descrita en el código de los contratos inteligentes. Se recurre a ellos cuando se envían o reciben tokens a través de un contrato. Esto permite que un contato inteligente reaccione a tokens entrantes o salientes.
21+
Los hooks son una función descrita en el código de los contratos inteligentes. Se recurre a ellos cuando se envían o reciben tokens a través de un contrato. Esto permite que un contrato inteligente reaccione a tokens entrantes o salientes.
2222

2323
Los hooks se registran y descubren usando el estándar [ERC-1820](https://eips.ethereum.org/EIPS/eip-1820).
2424

@@ -30,7 +30,7 @@ Los hooks se registran y descubren usando el estándar [ERC-1820](https://eips.e
3030

3131
### Decimales {#decimals}
3232

33-
El estándar támbien resuelve la confusión en torno a ` decimales` causada en ERC-20. Esta claridad mejora la experiencia del desarrollador.
33+
El estándar también resuelve la confusión en torno a ` decimales` causada en ERC-20. Esta claridad mejora la experiencia del desarrollador.
3434

3535
### Compatibilidad con versiones anteriores de ERC-20 {#backwards-compatibility-with-erc-20}
3636

src/data/community-events.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,15 @@
232232
"description": "ETHGlobal is heading back to Waterloo, where it all began. This humble city on the outskirts of Toronto is home to both Ethereum and ETHGlobal.",
233233
"startDate": "2023-06-23",
234234
"endDate": "2023-06-25"
235+
},
236+
{
237+
"title": "ETHMilan",
238+
"to": "https://ethmilan.xyz/",
239+
"sponsor": null,
240+
"location": "Milan, Italy",
241+
"description": "The conference will take place in the heart of Milan, in a location rich in history and culture. Join us to discuss all things Ethereum, DeFi, Account Abstraction, DAOs & NFTs.",
242+
"startDate": "2023-10-05",
243+
"endDate": "2023-10-06"
235244
},
236245
{
237246
"title": "ETHToronto",

0 commit comments

Comments
 (0)