Skip to content

Commit 148cc69

Browse files
committed
Merge branch 'dev' into code-accordion
2 parents fe17054 + 71137cf commit 148cc69

File tree

286 files changed

+1063
-8315
lines changed

Some content is hidden

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

286 files changed

+1063
-8315
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12479,6 +12479,15 @@
1247912479
"contributions": [
1248012480
"content"
1248112481
]
12482+
},
12483+
{
12484+
"login": "nipunh",
12485+
"name": "Nipun Hedaoo",
12486+
"avatar_url": "https://avatars.githubusercontent.com/u/26524611?v=4",
12487+
"profile": "https://github.com/nipunh",
12488+
"contributions": [
12489+
"code"
12490+
]
1248212491
}
1248312492
],
1248412493
"contributorsPerLine": 7,

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1908,6 +1908,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19081908
<tr>
19091909
<td align="center" valign="top" width="14.28%"><a href="https://v2eth.com/"><img src="https://avatars.githubusercontent.com/u/7024451?v=4?s=100" width="100px;" alt="Mako Shan"/><br /><sub><b>Mako Shan</b></sub></a><br /><a href="#content-makoshan" title="Content">🖋</a></td>
19101910
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cratiu222"><img src="https://avatars.githubusercontent.com/u/156356273?v=4?s=100" width="100px;" alt="Christina"/><br /><sub><b>Christina</b></sub></a><br /><a href="#content-cratiu222" title="Content">🖋</a></td>
1911+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nipunh"><img src="https://avatars.githubusercontent.com/u/26524611?v=4?s=100" width="100px;" alt="Nipun Hedaoo"/><br /><sub><b>Nipun Hedaoo</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nipunh" title="Code">💻</a></td>
19111912
</tr>
19121913
</tbody>
19131914
</table>

public/content/about/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ lang: en
88

99
ethereum.org is a public, open-source resource for the Ethereum community that anyone can contribute to. We have a small core team dedicated to maintaining and developing the site with contributions from thousands of community members across the globe.
1010

11+
**Nobody from ethereum.org will ever contact you. Do not respond.**
12+
1113
## A note on names {#a-note-on-names}
1214

1315
It's common for people to confuse names within the Ethereum landscape, which can lead to poor mental models about how Ethereum works. Here's a quick explainer to clear things up:

public/content/community/support/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ lang: en
1010

1111
Are you looking for the official Ethereum support? The first thing you should know is that Ethereum is decentralized. This means no central organization, entity, or person owns Ethereum, and because of this, no official support channels exist.
1212

13-
Understanding the decentralized nature of Ethereum is vital because anyone claiming to be official support for Ethereum is probably trying to scam you! The best protection against scammers is educating yourself and taking security seriously.
13+
Understanding the decentralized nature of Ethereum is vital because **anyone claiming to be official support for Ethereum is probably trying to scam you!** The best protection against scammers is educating yourself and taking security seriously.
1414

1515
<DocLink href="/security/">
1616
Ethereum security and scam prevention

public/content/contributing/translation-program/content-buckets/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ Below is a breakdown of the website pages each content bucket contains.
341341
- [Set up web3.js to use the Ethereum blockchain in JavaScript](/developers/tutorials/set-up-web3js-to-use-ethereum-in-javascript/)
342342
- [Short ABIs for calldata optimization](/developers/tutorials/short-abi/)
343343
- [Smart contract security guidelines](/developers/tutorials/smart-contract-security-guidelines/)
344-
- [Solidity and Truffle continuous integration setup](/developers/tutorials/solidity-and-truffle-continuous-integration-setup/)
345344
- [Testing ERC-20 tokens with Waffle](/developers/tutorials/testing-erc-20-tokens-with-waffle/)
346345
- [Token integration checklist](/developers/tutorials/token-integration-checklist/)
347346
- [Using WebSockets](/developers/tutorials/using-websockets/)

public/content/dao/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Decentralized autonomous organizations (DAOs)
2+
title: What is a DAO? | Decentralized Autonomous Organizations
33
description: An overview of DAOs on Ethereum
44
lang: en
55
template: use-cases

public/content/defi/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Decentralized finance (DeFi)
2+
title: What is DeFi? | Benefits and Use of Decentralised Finance
33
description: An overview of DeFi on Ethereum
44
lang: en
55
template: use-cases

public/content/developers/docs/bridges/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ If a dapp goes down the route of integrating a bridge or an aggregator, there ar
103103

104104
### Deploying a dapp on multiple chains {#deploying-a-dapp-on-multiple-chains}
105105

106-
To deploy a dapp on multiple chains, developers can use development platforms like [Alchemy](https://www.alchemy.com/), [Hardhat](https://hardhat.org/), [Truffle](https://trufflesuite.com/), [Moralis](https://moralis.io/), etc. Typically, these platforms come with composable plugins that can enable dapps to go cross-chain. For instance, developers can use a deterministic deployment proxy offered by the [hardhat-deploy plugin](https://github.com/wighawag/hardhat-deploy).
106+
To deploy a dapp on multiple chains, developers can use development platforms like [Alchemy](https://www.alchemy.com/), [Hardhat](https://hardhat.org/), [Moralis](https://moralis.io/), etc. Typically, these platforms come with composable plugins that can enable dapps to go cross-chain. For instance, developers can use a deterministic deployment proxy offered by the [hardhat-deploy plugin](https://github.com/wighawag/hardhat-deploy).
107107

108108
#### Examples:
109109

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@ You _could_ [run a node](/developers/docs/nodes-and-clients/#running-your-own-no
2828

2929
**Note**: Most [development frameworks](/developers/docs/frameworks/) include a built-in development network. We recommend starting with a framework to [set up your local development environment](/developers/local-environment/).
3030

31-
### Ganache {#ganache}
32-
33-
Quickly fire up a personal Ethereum blockchain which you can use to run tests, execute commands, and inspect state while controlling how the chain operates.
34-
35-
Ganache provides both a desktop application (Ganache UI), as well as a command-line tool (`ganache-cli`). It is part of the Truffle suite of tools.
36-
37-
- [Website](https://www.trufflesuite.com/ganache)
38-
- [GitHub](https://github.com/trufflesuite/ganache)
39-
- [Documentation](https://www.trufflesuite.com/docs/ganache/overview)
40-
4131
### Hardhat Network {#hardhat-network}
4232

4333
A local Ethereum network designed for development. It allows you to deploy your contracts, run your tests and debug your code.

public/content/developers/docs/frameworks/index.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,6 @@ Before diving into frameworks, we recommend you first read through our introduct
113113
- [GitHub](https://github.com/eth-brownie/brownie)
114114
- **Brownie is currently unmaintained**
115115

116-
**Truffle -** **_A development environment, testing framework, build pipeline, and other tools._**
117-
118-
- [trufflesuite.com](https://www.trufflesuite.com/)
119-
- [GitHub](https://github.com/trufflesuite/truffle)
120-
- **Truffle development has ended** - [read more](https://twitter.com/trufflesuite/status/1704946902393860589?t=NlIWeLTbBSAaJmS5uUAhSA&s=19)
121-
122116
**OpenZeppelin SDK -** **_The Ultimate Smart Contract Toolkit: A suite of tools to help you develop, compile, upgrade, deploy and interact with smart contracts._**
123117

124118
- [OpenZeppelin SDK](https://openzeppelin.com/sdk/)

0 commit comments

Comments
 (0)