Skip to content

Commit

Permalink
Merge pull request #449 from threefoldtech/development
Browse files Browse the repository at this point in the history
dev to master update
  • Loading branch information
Mik-TF committed Mar 12, 2024
2 parents 03c871d + 2c2eae0 commit 0629530
Show file tree
Hide file tree
Showing 18 changed files with 79 additions and 37 deletions.
1 change: 1 addition & 0 deletions src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@
- [Genesis Pool Details](knowledge_base/about/genesis_block_pool_details.md)
- [ThreeFold Tech](knowledge_base/about/threefold_tech.md)
- [Organisation Structure](knowledge_base/about/orgstructure.md)
- [Governance](knowledge_base/about/governance.md)
- [ThreeFold Companies](knowledge_base/about/threefold_companies.md)
- [ThreeFold Dubai](knowledge_base/about/threefold_dubai.md)
- [ThreeFold VZW](knowledge_base/about/threefold_vzw.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

## Introduction

Backups of the TFGrid are available on websites such as [ThreeFold Ninja backup](https://dashboard.bknd1.ninja.tf/) and anyone can host an instance of the ThreeFold Grid. Concretely, this means that you can participate in the ThreeFold ecosystem by hosting your own instance of the complete set of all ThreeFold services on your own domain!
Anyone can host an instance of the ThreeFold Grid by deploying grid backups. Concretely, this means that you can participate in the ThreeFold ecosystem by hosting your own instance of the complete set of all ThreeFold services on your own domain!

Trusted guardians of the ThreeFold Grid can then be listed in the ThreeFold Manual, thus providing to users around the world different instances of the ThreeFold Grid in multiple locations, ensuring a resilient system that is highly decentralized and truly open-source.

Expand Down
5 changes: 0 additions & 5 deletions src/documentation/developers/grid_deployment/tfgrid_stacks.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@


- [Introduction](#introduction)
- [Concrete Example](#concrete-example)
- [Advantages](#advantages)
- [Run Your Own Stack](#run-your-own-stack)

Expand All @@ -18,10 +17,6 @@ This means that you could host your own instance of the ThreeFold Dashboard at `

The process is actually very straightforward and we even provide a script to streamline the process.

## Concrete Example

For example, there is a TFGrid backend at this URL: [https://dashboard.bknd1.ninja.tf/](https://dashboard.bknd1.ninja.tf/).

## Advantages

Setting such instances of the TFGrid ensures resiliency and decentralization of the ThreeFold ecosystem.
Expand Down
14 changes: 0 additions & 14 deletions src/documentation/farmers/3node_building/2_bootstrap_image.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
- [Burn the Zero-OS Bootstrap Image](#burn-the-zero-os-bootstrap-image)
- [CD/DVD BIOS](#cddvd-bios)
- [USB Key BIOS+UEFI](#usb-key-biosuefi)
- [Bootstrap Image for Certified 3Node](#bootstrap-image-for-certified-3node)
- [Expert Mode](#expert-mode)
- [Use a Specific Kernel](#use-a-specific-kernel)
- [Disable GPU](#disable-gpu)
Expand All @@ -21,8 +20,6 @@

We will now learn how to create a Zero-OS bootstrap image in order to boot a DIY 3Node.

Note: For certified 3Nodes, read [this section](#bootstrap-image-for-certified-3node).

## Download the Zero-OS Bootstrap Image

Let's download the Zero-OS bootstrap image.
Expand Down Expand Up @@ -93,17 +90,6 @@ For Windows, if you are using the "dd" able image, instead of writing command li



## Bootstrap Image for Certified 3Node

After creating a farm, to enable the certified farming status on your 3Node, you need to provide your farm ID and your farm name to the ThreeFold Support. You can do this by either using the [ThreeFold live chat](https://threefoldfaq.crisp.help/en/) or by sending an email at [info@threefold.io](mailto:info@threefold.io). The ThreeFold team will then send you a bootstrap image for your certified 3Node. You will need to replace the existing bootstrap image present on the USB key attached to the 3Node with this new bootstrap image for certified 3Node. Simply follow the steps below:

* Download the zip file containing your new bootstrap image.
* When you unzip the file, you’ll see a file named `BOOTX64.EFI` within the `BOOT/EFI` directory.
* Simply copy this file onto the USB key within the same directories that exist there, to overwrite the existing `BOOTX64.EFI` file.
* Insert the USB key in the 3Node and boot it again.

Your 3Node has now a bootstrap image for certified 3Node.

## Expert Mode

You can use the [expert mode](https://v3.bootstrap.grid.tf/expert) to generate specific Zero-OS bootstrap images.
Expand Down
2 changes: 1 addition & 1 deletion src/documentation/system_administrators/gpu/gpu.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ To use a GPU on the TFGrid, users need to rent a dedicated node. Once they have

## Filter and Reserve a GPU Node

You can filter and reserve a GPU node using the [Dedicated Nodes section](https://dashboard.grid.tf/portal/account-nodes) of the **ThreeFold Portal**.
You can filter and reserve a GPU node using the [Dedicated Nodes section](../../dashboard/deploy/dedicated_machines.md) of the **ThreeFold Dashboard**.

### Filter Nodes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ We first need to decide on which 3Nodes we will be deploying our workload.

We thus start by finding two 3Nodes with sufficient resources. For this current MariaDB guide, we will be using 1 CPU, 2 GB of RAM and 50 GB of storage. We are also looking for a 3Node with a public IPv4 address.

* Go to the ThreeFold Grid's [Explorer](https://dashboard.grid.tf/explorer/nodes) (Main Net)
* Go to the ThreeFold Grid [Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) (Main Net)
* Find a 3Node with suitable resources for the deployment and take note of its node ID on the leftmost column `ID`
* For proper understanding, we give further information on some relevant columns:
* `ID` refers to the node ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ We present a quick way to install Nextcloud All-in-One on the TFGrid. This guide

## Deploy a Full VM

* Deploy a Full VM with the [TF Dashboard](https://www.manual.grid.tf/getstarted/ssh_guide/ssh_openssh.html) or [Terraform](https://www.manual.grid.tf/terraform/terraform_full_vm.html)
* Deploy a Full VM with the [TF Dashboard](../../getstarted/ssh_guide/ssh_openssh.md) or [Terraform](../terraform_full_vm.md)
* Minimum specs:
* IPv4 Address
* 2 vcores
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ We first need to decide on which 3Nodes we will be deploying our workload.

We thus start by finding two 3Nodes with sufficient resources. For this current Nextcloud guide, we will be using 1 CPU, 2 GB of RAM and 50 GB of storage. We are also looking for 3Nodes with each a public IPv4 address.

* Go to the ThreeFold Grid's [Explorer](https://dashboard.grid.tf/explorer/nodes) (Main Net)
* Go to the ThreeFold Grid [Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) (Main Net)
* Find two 3Nodes with suitable resources for the deployment and take note of their node IDs on the leftmost column `ID`
* For proper understanding, we give further information on some relevant columns:
* `ID` refers to the node ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ We first need to decide on which 3Node we will be deploying our workload.

We thus start by finding a 3Node with sufficient resources. For this current Nextcloud guide, we will be using 1 CPU, 2 GB of RAM and 50 GB of storage. We are also looking for a 3Node with a public IPv4 address.

* Go to the ThreeFold Grid's [Explorer](https://dashboard.grid.tf/explorer/nodes) (Main Net)
* Go to the ThreeFold Grid [Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) (Main Net)
* Find a 3Node with suitable resources for the deployment and take note of its node ID on the leftmost column `ID`
* For proper understanding, we give further information on some relevant columns:
* `ID` refers to the node ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ We now set a daily cron job that will make a backup between the Nextcloud VM and

> Note: By default, the Nextcloud automatic backup is set at 4:00 UTC. For this reason, we set the Rsync daily backup at 8:00 UTC.
> Note: To set Rsync with a script, [read this documentation](https://manual.grid.tf/computer_it_basics/cli_scripts_basics.html#automate-backup-with-rsync).
> Note: To set Rsync with a script, [read this documentation](../../computer_it_basics/file_transfer.md#automate-backup-with-rsync).
# Future Projects

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ We want to find a proper 3Node to deploy our workload. For this guide, we want a

We show here how to find a suitable 3Node using the ThreeFold Explorer.

* Go to the ThreeFold Grid's [Nodes Explorer](https://dashboard.grid.tf/explorer/nodes) (Main Net) to find a 3Node
* Go to the ThreeFold Grid [Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) (Main Net) to find a 3Node
* Find a 3Node with suitable resources for the deployment and take note of its node ID on the leftmost column `ID`
* For proper understanding, we give further information on some relevant columns:
* `ID` refers to the node ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ We want to find a proper 3Node to deploy our workload. For this guide, we want a

We show here how to find a suitable 3Node using the ThreeFold Explorer.

* Go to the ThreeFold Grid's [Explorer](https://dashboard.grid.tf/explorer/nodes) (Main Net)
* Go to the ThreeFold Grid [Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) (Main Net)
* Find a 3Node with suitable resources for the deployment and take note of its node ID on the leftmost column `ID`
* For proper understanding, we give further information on some relevant columns:
* `ID` refers to the node ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ We want to find a proper 3Node to deploy our workload. For this guide, we want a

We show here how to find a suitable 3Node using the ThreeFold Explorer.

* Go to the ThreeFold Grid's [Explorer](https://dashboard.grid.tf/explorer/nodes) (Main Net)
* Go to the ThreeFold Grid [Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) (Main Net)
* Find a 3Node with suitable resources for the deployment and take note of its node ID on the leftmost column `ID`
* For proper understanding, we give further information on some relevant columns:
* `ID` refers to the node ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Using the TFGrid scheduler can be very efficient depending on what you are tryin

We show here how to find a suitable 3Node using the ThreeFold Explorer.

- Go to the ThreeFold Grid's [Explorer](https://dashboard.grid.tf/explorer/nodes) (Main Net)
- Go to the ThreeFold Grid [Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) (Main Net)
- Find a 3Node with suitable resources for the deployment and take note of its node ID on the leftmost column `ID`
- For proper understanding, we give further information on some relevant columns:
- `ID` refers to the node ID
Expand Down
61 changes: 61 additions & 0 deletions src/knowledge_base/about/governance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<h1> Governance </h1>

<h2>Table of Contents</h2>

- [Introduction](#introduction)
- [Project History](#project-history)
- [Type of Token](#type-of-token)
- [Use of Funds](#use-of-funds)
- [Organic Growth](#organic-growth)
- [Genesis Pool](#genesis-pool)

***

## Introduction

We introduce the governance of ThreeFold and give some context around ThreeFold in general.

## Project History

The project is grateful of the support of its community and of the commercial entity TFTech.

ThreeFold is fundamentally a decentralized initiative. Within this framework, ThreeFold Dubai plays a pivotal role in championing and advancing the ThreeFold Grid and the broader movement.

Our founders have largely retained their tokens, with only minimal sales, if any. Their intent is clear: they plan to hold onto their tokens until the grid achieves global recognition and the token value surpasses 0.2 USD.

Some people have claimed that some ThreeFold founders sold tokens and dumped the price, this is not true and can be verified using our blockchain. The ThreeFold founders have invested millions of USD in the project so far. Lots of our team work on reduced salary, some even without any salary.

## Type of Token

The regulators and legal advisors believe that we are a payment token with some flavor of a utility token (hybrid).

We conducted research and obtained legal counsel in multiple jurisdictions:

- Switzerland
- Belgium
- Dubai
- Singapore

For more information, [read the legal opinions](https://drive.google.com/file/d/1kNu2cFjMkgqdadrOOQTTC5FPAM4OgKEb/view?usp=drive_link).

## Use of Funds

We have different tools and features to make sure that all our funds are used properly, such as multi-signature wallets, the [ThreeFold DAO](./dao/tfdao.md) and the [ThreeFold Forum](https://forum.threefold.io/).

## Organic Growth

As a group, we have invested more than 10m USD in cash and time.

We never organized a pump and dump or any other synthetic mechanism to boost the token price and benefit from this. We believe in organic growth and the TFT going up as result of utilization and expansion.

## Genesis Pool

The Genesis pool was based on real hardware located in Dubai and Ghent.

The tokens out of this pool are safe and well managed. We are acquiring a lot of them with ThreeFold Cloud (ThreeFold Dubai).

For more information on the Genesis pool, [read this section](./genesis_pool.md).




1 change: 1 addition & 0 deletions src/knowledge_base/about/orgstructure.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<h2>Table of Contents</h2>

- [Governance](./governance.md)
- [ThreeFold Companies](./threefold_companies.md)
- [ThreeFold Dubai](./threefold_dubai.md)
- [ThreeFold VZW](./threefold_vzw.md)
Expand Down
4 changes: 2 additions & 2 deletions src/knowledge_base/farming/farming_reward.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The Proof-of-Capacity records Internet resources from the 3Node:

The ThreeFold Blockchain (TFChain) uses work algorythm called "Proof-of-Capacity" to verify the Internet capacity provided by 3Nodes. Put simply, PoC verifies, on an ongoing basis, that farms are honestly representing the Internet capacity they provide to the network.

**See Proof-of-Capacity in action** by visiting the [ThreeFold Grid Capacity Explorer](https://dashboard.grid.tf/explorer/nodes) which represents the best resource to view POC-related data.
**See Proof-of-Capacity in action** by visiting the [ThreeFold Grid Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) which represents the best resource to view POC-related data.

## What is proof-of-capacity?

Expand Down Expand Up @@ -56,7 +56,7 @@ The main advantage of PoC to farmers it makes it really easy to run a 3Node. It
3. Zero-OS reports used IT capacity towards TFChain
4. TFChain and TFDAO will calculate rewards as required for the farmer (TFGrid 3.1.x)
5. TFChain will mint the required TFT and send them to account on TFChain of TFFarmer.
6. Everyone can use the [ThreeFold Explorer](https://dashboard.grid.tf/explorer/nodes) to see where capacity is available. This info comes from the TFChain.
6. Everyone can use the [ThreeFold Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) to see where capacity is available. This info comes from the TFChain.


## TFT Rewards for TFGrid Mainnet
Expand Down
8 changes: 3 additions & 5 deletions src/knowledge_base/farming/proof_of_capacity.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@

## Introduction

The ThreeFold Blockchain (TFChain) uses work algorythm called "Proof-of-Capacity" to verify the Internet capacity provided by 3Nodes. Put simply, PoC verifies, on an ongoing basis, that farms are honestly representing the Internet capacity they provide to the network.

**See Proof-of-Capacity in action** by visiting the [ThreeFold Grid Capacity Explorer](https://dashboard.grid.tf/explorer/statistics) which represents the best resource to view POC-related data.
The ThreeFold Blockchain (TFChain) uses work algorythm called "Proof-of-Capacity" to verify the Internet capacity provided by 3Nodes. Put simply, PoC verifies, on an ongoing basis, that farms are honestly representing the Internet capacity they provide to the network.

## What is proof-of-capacity?

Expand Down Expand Up @@ -45,7 +43,7 @@ The main advantage of PoC to farmers it makes it really easy to run a 3Node. It
3. Zero-OS reports used IT capacity towards TFChain
4. TFChain and TFDAO will calculate rewards as required for the farmer (TFGrid 3.1.x)
5. TFChain will mint the required TFT and send them to account on TFChain of TFFarmer.
6. Everyone can use the [ThreeFold Explorer](https://dashboard.grid.tf/explorer/statistics) to see where capacity is available. This info comes from the TFChain.
6. Everyone can use the [ThreeFold Node Finder](https://dashboard.grid.tf/#/deploy/node-finder/) to see where capacity is available. This info comes from the TFChain.


## PoC Rewards
Expand Down Expand Up @@ -94,4 +92,4 @@ The below table expands on CU, SU, NU and IPAddr and their farming rewards:

> **The rewards above are calculated according to the current TFT to USD price in TFChain of 0.08. TFDAO is responsible to change this price in accordance to current marketsituation and liquidity.**
The above farming rewards apply for 3Nodes registered in TFChain for ThreeFold Grid v3. Anyone can calculate their potential rewards using the [Farming Reward Calculator](https://dashboard.grid.tf/calculator/simulator). The same CU, SU, NU and IPAddr principles apply to the sales of Internet capacity in the form of [cloud units](../cloud/cloudunits.md).
The above farming rewards apply for 3Nodes registered in TFChain for ThreeFold Grid v3. Anyone can calculate their potential rewards using the [Farming Reward Simulator](https://dashboard.grid.tf/#/farms/simulator/). The same CU, SU, NU and IPAddr principles apply to the sales of Internet capacity in the form of [cloud units](../cloud/cloudunits.md).

0 comments on commit 0629530

Please sign in to comment.