Merge pull request #261 from Cyfrin/dev

dev --> main

courses/advanced-foundry/4-merkle-airdrop/2-project-setup/+page.md

@@ -38,13 +38,13 @@ contract BagelToken is ERC20, Ownable {
 
 ### MerkleAirdrop
 
-We can then create a new file named `MarkleAirdrop.sol`, where we will have a list of addresses and someone from that list who can claim ERC20 tokens.
+We can then create a new file named `MerkleAirdrop.sol`, where we will have a list of addresses and someone from that list who can claim ERC20 tokens.
 
 ```js
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-contract MerkleAirdrop is EIP712 {
+contract MerkleAirdrop {
     // list of addresses that can receive tokens
     // allow someone in the list to claim some tokens
 }

courses/advanced-foundry/4-merkle-airdrop/4-base-airdrop-contract/+page.md

@@ -8,7 +8,7 @@ _Follow along with the video_
 
 ### Introduction
 
-In this lesson, we are going to implement Merkle proofs and Merkle trees in our `MerkleTree.sol` contract by setting up the _constructor_ and creating a _claim_ function.
+In this lesson, we are going to implement Merkle proofs and Merkle trees in our `MerkleAirdrop.sol` contract by setting up the _constructor_ and creating a _claim_ function.
 
 ### Constructor
 

courses/advanced-foundry/4-merkle-airdrop/8-deployment-script/+page.md

@@ -16,10 +16,10 @@ Inside the `script` directory, we can start coding the deployment contract by im
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import "MerkleAirdrop.sol";
-import "BagelToken.sol";
-import "forge-std/Script.sol";
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {MerkleAirdrop} from "src/MerkleAirdrop.sol";
+import {BagelToken} from "src/BagelToken.sol";
+import {Script} from "forge-std/Script.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 ```
 
 Next, create the deployment function to deploy the contracts, mint tokens, and transfer them to the airdrop contract:

courses/foundry/1-foundry-simple-storage/10-create-a-new-foundry-project/+page.md

@@ -0,0 +1,86 @@
+---
+title: Create a new Foundry project
+---
+
+_Follow along with this video:_
+
+---
+
+### More setup
+
+Make sure we are in the folder we created in the previous lesson.
+
+**Reminder**: We ran the following commands
+
+```
+mkdir foundry-f23
+cd foundry-f23
+```
+
+Now type the following commands:
+
+```
+mkdir foundry-simple-storage-f23
+cd foundry-simple-storage-f23
+```
+
+You can always make the `cd` command faster by pressing the `Tab` key after you type the first couple of letters from the destination name. `Tab` lets you autocomplete a lot of commands/paths.
+
+If you type `code .` a new instance of VS Code will open, having the `foundry-simple-storage-f23` as the default path.
+
+You can see the contents of this folder on the left sidebar. Try the following command:
+
+```
+touch randomFile.txt
+```
+
+This will create a `randomFile.txt`
+
+If you want to delete it type:
+
+```
+rm randomFile.txt
+```
+
+The terminal is pretty slick when it comes to moving/opening/creating directories/files, changing paths and generally running things. I recommend going through [this tutorial](https://ubuntu.com/tutorials/command-line-for-beginners#1-overview) if you want to learn how to move extra fast.
+
+### Creating a New Project
+
+The way you [create a new Foundry project](https://book.getfoundry.sh/projects/creating-a-new-project) is by running the `forge init` command. This will create a new Foundry project in your current working directory.
+
+If you want Foundry to create the new project in a new folder type `forge init nameOfNewFolder`.
+
+Keep in mind that by default `forge init` expects an empty folder. If your folder is not empty you must run `forge init --force .`
+
+Be sure to configure your username and email if you encounter errors related to Git configuration.
+
+```
+git config --global user.email "[email protected]"
+git config --global user.name "yourUsername"
+```
+
+And that's it, your folder should look as follows:
+
+::image{src='/foundry-simply-storage/7-create-a-new-foundry-project/Image1.PNG' style='width: 75%; height: auto;'}
+
+**But what does all this mean?**
+
+`lib` is the folder where all your dependencies are installed, here you'll find things like:
+
+- `forge-std` (the forge library used for testing and scripting)
+- `openzeppelin-contracts` is the most battle-tested library of smart contracts
+- and many more, depending on what you need/install
+
+`scripts` is a folder that houses all your scripts
+
+`src` is the folder where you put all your smart contracts
+
+`test` is the folder that houses all your tests
+
+`foundry.toml` - gives configuration parameters for Foundry
+
+More on these folders and files later.
+
+Please right-click `src`, click on `New File` and name it `SimpleStorage.sol`. Copy the code available [here](https://github.com/Cyfrin/foundry-simple-storage-f23/blob/main/src/SimpleStorage.sol).
+
+One last thing, please delete `Counter.s.sol`, `Counter.sol` and `Counter.t.sol`. These files are a set of basic smart contracts that Foundry provides as a default when you create a new Foundry project.

courses/foundry/1-foundry-simple-storage/11-create-a-new-foundry-project-wsl/+page.md

@@ -0,0 +1,31 @@
+---
+title: WSL setup
+---
+
+_Follow along with the video_
+
+---
+
+### Introduction
+
+Hallo 👋🏻, I'm Vasily and I'll be your instructor for all Windows development. You'll see me frequently as I guide you through installing, running, and configuring various Windows tools.
+
+### WSL setup
+
+Microsoft has significantly improved its development environment support in recent years. However, for _smart contract development_, installing dependencies can sometimes be tricky. To streamline this process, we will use the **Windows Subsystem for Linux (WSL)**: this is a better option because it enables a full-fledged _unix-like console_ on your Windows machine, simplifying the use of tools and utilities commonly found in unix-based environments. This setup ensures compatibility with all the code that runs on unix-based systems like macOS and Linux.
+
+To install WSL, you can begin by opening the Windows terminal. On Windows 11, press the Windows key, type "terminal," and hit `enter`. On Windows 10, you need to install the Windows terminal from the Microsoft Store (select the official app from Microsoft Corporation).
+
+Once installed, open the terminal and type `wsl --install`. This command will initiate the installation process. Afterward, restart your computer. Upon reboot, the terminal will appear again, prompting you to select a Unix username and set a password. WSL will be then successfully installed ✅.
+
+### Visual Studio Code
+
+After installing WSL, we need to install a code editor. We will use Visual Studio Code (VS Code), and there are three different methods to install it:
+
+1. **Using the Terminal**: Utilize `winget`, a package manager pre-installed on Windows 11. Open the terminal and type `winget search VS Code` to find the desired package. Then, execute `winget install Microsoft.VisualStudioCode` to install VS Code.
+
+2. **Via Web Browser**: Search for "Visual Studio Code" in your web browser, select the official Microsoft link and download the installer. Follow the prompts, accept the user agreement and customize all the installation options.
+
+3. **Using VSCodium**: For those who prefer more independence and privacy, there is an open-source alternative called **VSCodium**. It is similar to VS Code but without Microsoft's telemetry. Download the [VSCodium installer](https://github.com/VSCodium/vscodium/releases) from GitHub and follow its similar installation steps.
+
+Choose the method that best suits your needs. For this course, I will use the official Visual Studio Code from Microsoft.

courses/foundry/1-foundry-simple-storage/12-vscode-solidity-setup/+page.md

@@ -0,0 +1,64 @@
+---
+title: VSCode Solidity setup
+---
+
+_Follow along with this video:_
+
+---
+
+### Improving Code Format in Visual Studio Code
+
+When you first start, your code might just look like a whole bunch of dull, lifeless, white text.
+
+This can be easily fixed by using one of the `Solidity` extensions. Out of all the Solidity extensions available in the Extensions tab (CTRL/CMD + SHIFT + X) the following are worth mentioning:
+
+1. [Solidity by Juan Blanco](https://marketplace.visualstudio.com/items?itemName=JuanBlanco.solidity), the most used Solidity extension out there.
+2. [Solidity by Nomic Foundation](https://marketplace.visualstudio.com/items?itemName=NomicFoundation.hardhat-solidity) is Patrick's favorite Solidity extension. The rest of the course will be displaying this extension.
+3. [Solidity Visual Developer](https://marketplace.visualstudio.com/items?itemName=tintinweb.solidity-visual-auditor) is another popular choice.
+
+**NOTE**: If the code remains unhighlighted despite having installed the extension, there's a quick solution to that. Press `Command + Shift + P`, or `Control + Shift + P` on Windows. This opens up the command bar. In the command bar, type in "Settings" and select "Preferences: Open User Settings (JSON)". 
+
+If you have nothing in there, create a new setting by typing in:
+
+```
+{
+  "editor.defaultFormatter": "NomicFoundation.hardhat"
+}
+```
+
+Use:
+
+`"editor.defaultFormatter": "tintinweb.solidity-visual-auditor"` for Solidity Visual Developer
+
+or
+
+`"editor.defaultFormatter": "JuanBlanco.solidity"` for Solidity by Juan Blanco
+
+### Other interesting extensions
+
+In the previous lesson, we mentioned a file called `foundry.toml`. This also has an extension that formats it to make it easier to read. Please install [Even Better TOML](https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml).
+
+Another indispensable extension is [Inline Bookmarks](https://marketplace.visualstudio.com/items?itemName=tintinweb.vscode-inline-bookmarks).
+
+The Inline Bookmarks plugin facilitates bookmarking the actual code. The extension can be used for document review, auditing, log analysis, and keeping track of development notes and to-do lists. You may share your notes and bookmarks with others with ease because they are saved with your files.
+
+The following default trigger words/tags are configured by default:
+```
+@todo - (blue) General ToDo remark.
+@note - (blue) General remark.
+@remind - (blue) General remark.
+@follow-up - (blue) General remark.
+@audit - (red) General bookmark for potential issues.
+@audit-info - (blue) General bookmark for information to be noted for later use.
+@audit-ok - (green) Add a note that a specific line is not an issue even though it might look like.
+@audit-issue - (purple) Reference a code location an issue was filed for.
+```
+
+You can fully customize the colors!
+
+Remember these! They will be very handy in developing and especially in auditing projects.
+
+More details are available [here](https://github.com/tintinweb/vscode-inline-bookmarks).
+
+Next comes the fun part! Let's compile our contract using Foundry!
+

courses/foundry/1-foundry-simple-storage/13-compile-a-smart-contract-using-foundry/+page.md

@@ -0,0 +1,29 @@
+---
+title: Compile a smart contract using Foundry
+---
+
+_Follow along with this video:_
+
+---
+
+### Compiling Smart Contracts: A Guide to the Foundry Console Compilation Process
+
+Open a new terminal. Type in `forge build` or `forge compile` to compile the smart contracts in your project.
+
+Once the compiling is finished, you'll see some new folders in the Explorer tab on the left side. One of them is a folder called `out`. Here you'll be able to find the [ABI](https://docs.soliditylang.org/en/latest/abi-spec.html) of the smart contract together with the [Bytecode](https://www.geeksforgeeks.org/introduction-to-bytecode-and-opcode-in-solidity/) and a lot of useful information. 
+
+The `cache` folder also appears. Generally, this folder is used to store temporary system files facilitating the compilation process. But for this course, you can safely ignore it.
+
+### More terminal wizardry
+
+Throughout your solidity development/audit journey you will type a lot of terminal commands, every time to make a change that you want tested you'll probably have to rerun the `forge build` then maybe you test it with `forge test` or run a script with `forge script` and many more. Typing all these over and over again is inefficient and time-consuming. The better way is to use the `up` and `down` arrow keys. Type the following commands:
+
+```
+echo "I like Foundry"
+echo "I love Cyfrin"
+echo "Auditing is great"
+```
+
+Now press the `up` and `down` arrow keys to cycle through the 3 commands.
+
+Ok, cool! We learned how to compile a contract, but how does one deploy a smart contract?

courses/foundry/1-foundry-simple-storage/14-deploy-a-smart-contract-locally-using-ganache/+page.md

@@ -0,0 +1,93 @@
+---
+title: Deploy a smart contract locally using Ganache
+---
+
+_Follow along with this video:_
+
+
+### Deploying a smart contract
+
+There are multiple ways and multiple places where you could deploy a smart contract.
+
+While developing using the Foundry framework the easiest and most readily available place for deployment is Anvil.
+
+Anvil is a local testnet node shipped with Foundry. You can use it for testing your contracts from frontends or for interacting over RPC.
+
+To run Anvil you simply have to type `anvil` in the terminal.
+
+::image{src='/foundry-simply-storage/10-deploy-a-smart-contract-locally-using-ganache/Image1.PNG' style='width: 75%; height: auto;'}
+
+You now have access to 10 test addresses funded with 10_000 ETH each, with their associated private keys.
+
+This testnet node always listens on `127.0.0.1:8545` this will be our `RPC_URL` parameter when we deploy smart contracts here. More on this later!
+
+More info about Anvil is available [here](https://book.getfoundry.sh/reference/anvil/).
+
+Please press `Ctrl/CMD + C` to close Anvil.
+
+Anvil will be used throughout the course to deploy and test our smart contracts, but before that, let's quickly check an intermediary step.
+
+### Ganache
+
+_Ganache is a glaze, icing, sauce, or filling for pastries usually made by heating equal parts weight of cream and chopped chocolate, warming the cream first, then pouring it over the chocolate._
+
+Wait, not that ganache! The other ganache:
+
+Ganache is a personal blockchain for rapid Ethereum and Filecoin distributed application development. You can use Ganache across the entire development cycle; enabling you to develop, deploy, and test your dApps in a safe and deterministic environment.
+
+Better!
+
+Please download Ganache from [here](https://archive.trufflesuite.com/ganache/).
+
+For people using Windows WSL please read [this](https://github.com/Cyfrin/foundry-simple-storage-f23?tab=readme-ov-file#windows-wsl--ganache). Using Ganache in this environment is not the easiest thing to do. We are not going to use this in the future, so don't worry if you can't configure it properly.
+
+Hit `Quickstart Ethereum`. Voila! A brand new blockchain. We get some addresses, that have balances and private keys.
+
+### Configuring MetaMask
+
+To deploy to a custom network (like your localhost), you'll need MetaMask. MetaMask is a popular cryptocurrency wallet and browser extension that allows users to interact with the Ethereum blockchain and its ecosystem. If you don't have it download it from [here](https://metamask.io/download/)
+
+Follow these steps:
+
+1. Open MetaMask.
+
+2. Click the three little dots and select 'Expand View'.
+
+3. Go to 'Settings', then 'Networks'.
+
+4. Here, you'll see the list of networks (Ethereum, Mainnet, etc.) with plenty of details about each one. Locate the RPC URL - this is key.
+
+The RPC URL is essentially the endpoint we make API calls to when sending transactions. For every blockchain transaction you execute, you're making an API to whatever is in here.
+To send a transaction to your custom blockchain, you need to add it as a network:
+
+1. Click on 'Add a Network'
+
+2. Scroll to the bottom of the list of networks.
+
+3. Hit 'Add a Network manually'.
+
+4. Enter the details of your local network
+
+   Network name: `Localhost`
+
+   New RPC URL: Ganache`http://127.0.0.1:7545` or Anvil `http://127.0.0.1:8545` (make sure you always add `http://`) - these two could differ on your machine, please consult the Ganache UI or Anvil terminal for the exact RPC URL.
+
+   Chain ID: Ganache `5777`(sometimes `1337`) or Anvil `31337` - these two could differ on your machine, please consult the Ganache UI or Anvil terminal for the exact Chain ID.
+
+   Currency symbol: ETH
+
+   Block explorer URL: - (we don't have a block explorer for our newly created blockchain, which will most likely disappear when we close the VS Code / Ganache app)
+
+Great! Now that we configured our local network, the next step is to add one of the accounts available in Ganche or Anvil into our MetaMask. [This is done as follows](https://support.metamask.io/hc/en-us/articles/360015489331-How-to-import-an-account#h_01G01W07NV7Q94M7P1EBD5BYM4):
+
+1. Click the account selector at the top of your wallet.
+
+2. Click `Add account or hardware wallet`.
+
+3. Click `Import account`
+
+4. You will be directed to the Import page. Paste your Ganache/Anvil private key. Click `Import`.
+
+**NOTE: Do not use this account for anything else, do not interact with it or send things to it on mainnet or any other real blockchain, use it locally, for testing purposes. Everyone has access to it.**
+
+Next up we shall talk more about adding a new network to MetaMask.

courses/foundry/1-foundry-simple-storage/15-how-to-add-a-new-network-to-metamask/+page.md

@@ -0,0 +1,24 @@
+---
+title: How to add a new network to Metamask
+---
+
+_Follow along with this video:_
+
+---
+
+### Adding New Networks Using MetaMask
+
+Conveniently, MetaMask provides an easy way to add EVM-compatible chains. By pre-configuring a host of them, you can add a chain such as the Arbitrum One by simply clicking on the `Networks` button on the top left, then `Add Network` and proceeding to `Add`. The pleasing part is that MetaMask does all the grunt work, filling in all the necessary information for you. A click on Approve Network ensures the successful addition of the network.
+
+Steps:
+
+1. Click on the Networks button on the top left
+2. Click on Add Network
+3. Choose your desired EVM-compatible chain
+4. Click on Add
+5. After ensuring all necessary information is already filled in, click on Approve Network
+
+But what can you do if the chain you want to add is not pre-configured?
+
+Simple! You employ the same process we just used to add our new Ganache local chain in the [previous lesson](https://updraft.cyfrin.io/courses/foundry/foundry-simple-storage/deploy-smart-contract-locally)
+