Merge pull request #455 from threefoldtech/development_supply

updated token supply info

src/documentation/developers/grid_deployment/grid_deployment_full_vm.md

@@ -7,6 +7,7 @@
 - [DNS Settings](#dns-settings)
   - [DNS Verification](#dns-verification)
 - [Prepare the VM](#prepare-the-vm)
+- [Set the Firewall](#set-the-firewall)
 - [Launch the Script](#launch-the-script)
 - [Access the Grid Services](#access-the-grid-services)
 - [Manual Commands](#manual-commands)
@@ -18,7 +19,7 @@
 
 We present the steps to deploy a network instance of the TFGrid on a full VM. 
 
-For this guide, we will be deploying a devnet instance. While the steps are similar for testnet and mainnet, you will have to adjust your deployment depending on which network you use.
+For this guide, we will be deploying a mainnet instance. While the steps are similar for testnet and devnet, you will have to adjust your deployment depending on which network you use.
 
 ## Prerequisites
 
@@ -53,13 +54,13 @@ You can use tools such as [DNSChecker](https://dnschecker.org/) or [dig](https:/
 - Download the ThreeFold Tech `grid_deployment` repository
     ```
     git clone https://github.com/threefoldtech/grid_deployment
-    cd grid_deployment/docker-compose/devnet
+    cd grid_deployment/docker-compose/mainnet
     ```
 - Generate a TFChain node key with `subkey`
     ```
-    echo .subkey_devnet >> .gitignore
-    ../subkey generate-node-key > .nodekey_devnet
-    cat .nodekey_devnet
+    echo .subkey_mainnet >> .gitignore
+    ../subkey generate-node-key > .nodekey_mainnet
+    cat .nodekey_mainnet
     ```
 - Create and the set environment variables file
     ```
@@ -70,16 +71,30 @@ You can use tools such as [DNSChecker](https://dnschecker.org/) or [dig](https:/
     nano .secrets.env
     ```
 - To adjust the `.secrets.env` file, take into account the following:
-  - **DOMAIN**
-    - Write your own domain (e.g. example.com)
-  - **TFCHAIN_NODE_KEY**
-    - Write the output of the command `cat .nodekey_devnet`
-  - **ACTIVATION_SERVICE_MNEMONIC**
-    - Write the seed phrase of an account on devnet with at least 10 TFT in the wallet
-  - **GRID_PROXY_MNEMONIC**
-    - Write the seed phrase of an account on devnet with at least 10 TFT in the wallet and a registered twin ID\*
-
-> \*Note: If you've created an account using the ThreeFold Dashboard on devnet, the twin ID is automatically registered.
+  - **DOMAIN**="example.com"
+    - Write your own domain
+  - **TFCHAIN_NODE_KEY**="abc123"
+    - Write the output of the command `cat .nodekey_mainnet`
+  - **ACTIVATION_SERVICE_MNEMONIC**="word1 word2 ... word24"
+    - Write the seed phrase of an account on mainnet with at least 10 TFT in the wallet
+  - **GRID_PROXY_MNEMONIC**="word1 word2 ... word24"
+    - Write the seed phrase of an account on mainnet with at least 10 TFT in the wallet and a registered twin ID\*
+
+> \*Note: If you've created an account using the ThreeFold Dashboard on mainnet, the twin ID is automatically registered.
+
+## Set the Firewall
+
+You can use UFW to set the firewall:
+
+```
+ufw allow 80/tcp
+ufw allow 443/tcp
+ufw allow 30333/tcp
+ufw allow 22/tcp
+ufw enable
+ufw status
+```
+
 ## Launch the Script
 
 Once you've prepared the VM, you can simply run the script to install the grid stack and deploy it online.
@@ -88,7 +103,7 @@ Once you've prepared the VM, you can simply run the script to install the grid s
 sh install_grid_bknd.sh
 ```
 
-This will take a few minutes since you are downloading the whole devnet grid snapshots.
+This will take some time since you are downloading the whole mainnet grid snapshots.
 
 ## Access the Grid Services
 
@@ -129,7 +144,7 @@ This can be helpful to troubleshoot errors.
 
 ## Update the Deployment
 
-Go into the folder of the proper network, e.g. devnet, and run the following commands:
+Go into the folder of the proper network, e.g. mainnet, and run the following commands:
 
 ```
 git pull -r

src/documentation/farmers/farmerbot/farmerbot_information.md

@@ -35,6 +35,7 @@
   - [Change manually the power target of a 3Node](#change-manually-the-power-target-of-a-3node)
   - [Properly reboot the node if power target "Down" doesn't work](#properly-reboot-the-node-if-power-target-down-doesnt-work)
   - [Add a 3Node to a running Farmerbot](#add-a-3node-to-a-running-farmerbot)
+  - [Update the Farmerbot with a new release](#update-the-farmerbot-with-a-new-release)
 - [Questions and Feedback](#questions-and-feedback)
 
 ***
@@ -404,6 +405,32 @@ If the Farmerbot is running and you want to add a new 3Node to your farm, you ca
   systemctl restart farmerbot
   ```
 
+## Update the Farmerbot with a new release
+
+There are only a few steps needed to update the Farmerbot to a new release.
+
+- Download the latest [ThreeFold tfgrid-sdk-go release](https://github.com/threefoldtech/tfgrid-sdk-go/releases) and extract the farmerbot for your specific setup (here we use `x86_64`). On the line `wget ...`, make sure to replace `<latest_release>` with the latest Farmerbot release.
+    ```
+    wget https://github.com/threefoldtech/tfgrid-sdk-go/releases/download/<latest_release>/tfgrid-sdk-go_Linux_x86_64.tar.gz
+    tar xf tfgrid-sdk-go_Linux_x86_64.tar.gz farmerbot
+    ```
+- Make a copy of the old version in case you need it in the future:
+    ```
+    mv /usr/local/bin/farmerbot /usr/local/bin/farmerbot_archive
+    ```
+- Move the new Farmerbot to the local bin
+    ```
+    mv farmerbot /usr/local/bin
+    ```
+- Restart the bot
+  ```
+  systemctl restart farmerbot
+  ```
+- Remove the tar file
+  ```
+  rm tfgrid-sdk-go_Linux_x86_64.tar.gz
+  ```
+
 # Questions and Feedback
 
 If you have questions concerning the Farmerbot, feel free to ask for help on the [ThreeFold Forum](https://forum.threefold.io/) or on the [ThreeFold Farmer chat](https://t.me/threefoldfarmers).

src/documentation/farmers/farmerbot/farmerbot_quick.md

@@ -13,6 +13,7 @@
   - [Run the Farmerbot](#run-the-farmerbot)
   - [Set a systemd Service](#set-a-systemd-service)
   - [Check the Farmerbot Logs](#check-the-farmerbot-logs)
+  - [Stop the Farmerbot](#stop-the-farmerbot)
 - [Farmerbot Files](#farmerbot-files)
   - [Configuration File Template (config.yml)](#configuration-file-template-configyml)
   - [Environment Variables File Template (.env)](#environment-variables-file-template-env)
@@ -88,17 +89,19 @@ We present the different steps to run the Farmerbot using the binaries.
 
 ### Download the Farmerbot Binaries
 
-- Download and Extract the latest [ThreeFold tfgrid-sdk-go release](https://github.com/threefoldtech/tfgrid-sdk-go/releases) for your specific setup (here we use `x86_64`). On the line `wget ...`, make sure to replace `<latest_release>` with the latest Farmerbot release.
+- Download the latest [ThreeFold tfgrid-sdk-go release](https://github.com/threefoldtech/tfgrid-sdk-go/releases) and extract the farmerbot for your specific setup (here we use `x86_64`). On the line `wget ...`, make sure to replace `<latest_release>` with the latest Farmerbot release.
     ```
-    mkdir tfgrid-sdk-go
-    cd tfgrid-sdk-go
     wget https://github.com/threefoldtech/tfgrid-sdk-go/releases/download/<latest_release>/tfgrid-sdk-go_Linux_x86_64.tar.gz
-    tar -xvf tfgrid-sdk-go_Linux_x86_64.tar.gz
+    tar xf tfgrid-sdk-go_Linux_x86_64.tar.gz farmerbot
     ```
 - Move the Farmerbot
     ```
     mv farmerbot /usr/local/bin
     ```
+- Remove the tar file
+  ```
+  rm tfgrid-sdk-go_Linux_x86_64.tar.gz
+  ```
 
 ### Create the Farmerbot Files
 
@@ -193,6 +196,20 @@ Thus, you can get more details on the operation of the Farmerbot by inspecting t
   tac ~/farmerbotfiles/farmerbot.log | grep -B5000 -m1 "Nodes report" | tac
   ```
 
+### Stop the Farmerbot
+
+You can stop the farmerbot with the following command:
+
+```
+systemctl stop farmerbot
+```
+
+After stopping the farmerbot, any nodes in standby mode will remain in standby. To bring them online, use this command:
+
+```
+farmerbot start all -e /root/farmerbotfiles/.env --farm <farm_id>
+```
+
 ## Farmerbot Files
 
 ### Configuration File Template (config.yml)

src/knowledge_base/about/token_overview/token_overview.md

@@ -49,19 +49,18 @@ The supply distribution of TFT is as follows:
 
 | Supply Distribution | Qty (Millions) |
 | ------------------- | -------------- |
-| Current supply      | 942            |
-| Circulating supply  | 942          |
+| Total supply      | 942            |
+| TF Foundation Supply      | 162            |
+| Circulating supply  | 780          |
 | Maximum supply      | 1000           |
 
-> Note: The current supply and the circulating supply are the same, i.e. 942 million TFT. This means that all TFT supply is liquid and circulating. In other words, no TFT supply is locked or not in circulation.
+The total supply of TFT is distributed as follows:
 
-The current supply of TFT is distributed as follows:
-
-| Current Supply Distribution                | Qty (Millions) |
+| Total Supply Distribution                | Qty (Millions) |
 | ------------------------------------------- | -------------- |
-| Ecosystem Grants                            | 22             |
-| Promotion & Marketing Effort                | 100            |
-| Ecosystem Contribution & Liquidity Exchanges | 40             |
+| TF Foundation: Ecosystem Grants                            | 22             |
+| TF Foundation: Promotion & Marketing Effort                | 100            |
+| TF Foundation: Ecosystem Contribution & Liquidity Exchanges | 40             |
 | Genesis Pool & Farming Rewards             | 780            |
 
 ## TFT Marketcap and Market Price

src/values/tft_supply.md

@@ -1 +1 @@
-942000000
+780000000