This commit is contained in:
2024-02-29 06:22:31 +03:00
parent 239aeb73ac
commit dcd88ab917
162 changed files with 914 additions and 71 deletions

View File

@@ -4,10 +4,10 @@ FOLLOWING COMPANIES ARE RELATED PARTIES TO THREEFOLD, OUR TERMS AND CONDITIONS A
| THREEFOLD RELATED COMPANIES | Description |
| --------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
| [ThreeFold Dubai or ThreeFold Cloud](threefold:threefold_dubai.md) | Promotion of TFGrid + Delivery of ThreeFold Cloud |
| [Threefold_Tech](threefold:threefold_tech.md) | Belgium-based tech company owns IP (Intellectual Property.md) of tech, is open source |
| [ThreeFold_VZW](threefold:threefold_vzw.md) | Non for profit organization in BE, intented to be used for grants work. |
| [ThreeFold_AG](threefold:threefold_ag.md) | ThreeFold in Zug, Switzerland |
| [ThreeFold Dubai or ThreeFold Cloud](companies:threefold_dubai.md) | Promotion of TFGrid + Delivery of ThreeFold Cloud |
| [Threefold_Tech](companies:threefold_tech.md) | Belgium-based tech company owns IP (Intellectual Property.md) of tech, is open source |
| [ThreeFold_VZW](companies:threefold_vzw.md) | Non for profit organization in BE, intented to be used for grants work. |
| [ThreeFold_AG](companies:threefold_ag.md) | ThreeFold in Zug, Switzerland |
| TF Hub Limited | ThreeFold in BVI |
| Codescalers | Egypt-based software development team, creates a lot of code for ThreeFold |
@@ -15,8 +15,8 @@ FOLLOWING COMPANIES ARE RELATED PARTIES TO THREEFOLD, OUR TERMS AND CONDITIONS A
| FARMING COOPERATIVES | |
| ------------------------------------ | ------------------------------------------------ |
| [Mazraa](threefold:mazraa.md) | Farmer in Middle East (part of ThreeFold_Dubai .md) |
| [BetterToken](threefold:bettertoken.md) | Europe's first ThreeFold Farming Cooperative |
| [Mazraa](companies:mazraa.md) | Farmer in Middle East (part of ThreeFold_Dubai .md) |
| [BetterToken](companies:bettertoken.md) | Europe's first ThreeFold Farming Cooperative |
<br>
@@ -27,7 +27,7 @@ FOLLOWING COMPANIES ARE RELATED PARTIES TO THREEFOLD, OUR TERMS AND CONDITIONS A
| there are many more | ... |
> Please note, ThreeFold Grid 3.x operates as a DAO every party who wants to participate with the ThreeFold Grid uses the TFChain and our Forums.
> [Click here for more info about our DAO](threefold:tfdao.md)
> [Click here for more info about our DAO](tfgrid3:tfdao.md)
!!!time
!!core.time

View File

@@ -17,7 +17,7 @@ The ThreeFold Foundation (ThreeFold_Dubai) is a participant in the bigger ThreeF
We acknowledge and support the many people and organizations around the world who bring crucial support to the growth and adoption of the ThreeFold_Grid.
See [ThreeFold Dubai](threefold/threefold_dubai)
See [ThreeFold Dubai](companies:threefold_dubai)
> Work is ongoing to make the Foundation a global distributed concept with probably more than 1 legal entity.
@@ -27,7 +27,7 @@ TF TECH NV, a Belgian limited liability company, having its registered office at
TF Tech is a software tech company and is a major contributor to the software as used on the TFGrid.
See [TFTech](threefold/threefold_tech)
See [TFTech](companies:threefold_tech)
## Non For Profit
@@ -113,7 +113,7 @@ Atomic Swaps were difficult to use, this got resolved by switching to Stellar bl
## Cloud Units
Units of IT capacity as sold from the TF Grid to Users.
More info see [on our wiki](threefold:cloudunits)
More info see [on our wiki](tfgrid3:cloudunits)
## ThreeFold Farming Pool (FP)

View File

@@ -4,7 +4,7 @@ Our single source of truth for our legal docs is stored on [Github: https://gith
> You can see the history of each file on github, useful to see the right version of the file in relation to the date when you signed a document or contract which linked into one of the above documents.
!!!time
!!core.time
>>TODO: change link to new repo
!!core.todo descr:'change link to new repo'

View File

@@ -5,7 +5,7 @@ At all times during the Term of this Agreement or the period when Content is mai
1. You will comply with the terms of this Agreement, the [Generic Disclaimer](disclaimer), [ThreeFold Website Terms](terms_conditions_websites) and [Privacy Policy](privacypolicy) and any other terms and conditions required by in connection herewith, the Open Source Licenses, and the terms of all other agreements to which you are a party in connection with your performance under this Agreement including, without limitation, any agreement you have with a third-party Internet service provider.
2. You will operate the 3Node in strict compliance with terms of this Agreement and any applicable laws or regulations, and will not take any action not expressly authorized hereunder.
3. Without prejudice to your rights under any applicable Open Source license, you will not modify or attempt to modify the Software for any purpose including but not limited to attempting to circumvent the audit, bypass security, manipulate the performance of, or otherwise disrupt the ThreeFold_Grid for any reason, including but not limited to attempting to increase the amount of data stored or bandwidth utilized or the amount of Farmed TFTs, as defined herein, and you will not otherwise interfere with the operation of the ThreeFold_Grid.
4. You will provide and maintain the 3Node so that, at all times, it will meet the minimum requirements set out for either pre configured servers (certified hardware) or do-it-yourself servers [become_a_farmer](threefold:become_a_farmer)
4. You will provide and maintain the 3Node so that, at all times, it will meet the minimum requirements for being a good cloud provider (hoster of IT capacity).
5. You will implement and maintain adequate administrative, organizational, physical and technical safeguards to ensure the protection, confidentiality, security, and integrity of the 3Node and Content and shall take all reasonable steps to ensure that Content are not disclosed, accessed, used, modified, or distributed except as expressly authorized under this Agreement.
6. You acknowledge and agree that by running the Software on your hardware device and allowing IT Capacity to be made available on the TF Grid to the Users and TFCHAIN, you may act as a cloud service provider under certain circumstances and as such qualify as a processor or sub-processor under the General Data Processing Directive (Regulation (EU) 2016/679 of the European Parliament and of the Council of 27 April 2016 on the protection of natural persons with regard to the processing of personal data and on the free movement of such data, and repealing Directive 95/46/EC) (GDPR). You undertake to comply with any legal obligations which may possibly be applicable to you as a data processor under the GDPR and/or any other applicable data privacy regulations.
7. You acknowledge and agree that by running the Software on your hardware device and allowing IT Capacity to be made available on the TF Grid to the Users, your 3Node may be impacted due to additional constraints being placed on it by the Software and the processing of Content. In particular, but without limiting the generality of the foregoing, your 3Node may not operate as quickly as it would without running the Software and making IT Capacity available for use by Users.

View File

@@ -6,7 +6,7 @@ Farmers who connect 3Nodes on an ongoing basis to the ThreeFold_Grid by running
#### 8.2 Calculation of Farmed TFTs
The details of farming (minting of TFTs) are described on our [farming logic TFGrid 2](threefold:farming_reward2) and this location serves as master for the TFT Reward Process.
The details of farming (minting of TFTs) are described on our [farming logic TFGrid 2](tfgrid3:farming_reward2) and this location serves as master for the TFT Reward Process.
Farming for TFGrid 2.x is on https://library.threefold.me/info/threefold/#/farming_reward2

View File

@@ -6,7 +6,7 @@ Farmers who connect 3Nodes on an ongoing basis to the ThreeFold_Grid by running
#### 8.2 Calculation of Farmed TFTs
The details of farming (minting of TFTs) are described on our [farming logic](threefold:farming_reward) and this location serves as master for the TFT Reward Process. The wiki is version controlled (on github), so all changes can be followed.All connected IT Capacity gets registered on the TFChain, i.e. ThreeFolds blockchain software. Each month the TFChain issues new TFTs and transfers them to Farmers in respect of each 3Node that remained connected to the ThreeFold_Grid during the preceding month, using the following calculation in respect of each 3Node:
The details of farming (minting of TFTs) are described on our [farming logic](tfgrid3:farming_reward) and this location serves as master for the TFT Reward Process. The wiki is version controlled (on github), so all changes can be followed.All connected IT Capacity gets registered on the TFChain, i.e. ThreeFolds blockchain software. Each month the TFChain issues new TFTs and transfers them to Farmers in respect of each 3Node that remained connected to the ThreeFold_Grid during the preceding month, using the following calculation in respect of each 3Node:
The amount of TFTs that are Farmed hence depends on three variables:

View File

@@ -14,8 +14,8 @@ The reservation and use of the Farmers IT Capacity by the User is effected th
IT capacity is expressed in compute & storage units.
- CU = [Compute Units](threefold:cloudunits)
- SU = [Storage Units](threefold:cloudunits)
- CU = [Compute Units](tfgrid3:cloudunits)
- SU = [Storage Units](tfgrid3:cloudunits)
The pricing is expressed as follows:

View File

@@ -10,9 +10,9 @@ ThreeFold_Tokens (TFTs) are used to buy IT Capacity as delivered by the 3Nodes (
IT capacity is expressed in network, compute & storage units.
- CU = [Compute Units](threefold:cloudunits)
- SU = [Storage Units](threefold:cloudunits)
- NU = [Network Units](threefold:cloudunits)
- CU = [Compute Units](tfgrid3:cloudunits)
- SU = [Storage Units](tfgrid3:cloudunits)
- NU = [Network Units](tfgrid3:cloudunits)
TF Explorer is the inventory of all IT capacity available for consumption on the ThreeFold_Grid. See http://explorer.grid.tf/

View File

@@ -53,7 +53,7 @@ Two versions of ThreeFold_Tokens have been issued:
- A first version of the ThreeFold_Token was issued as from March 2018 on ThreeFolds initial blockchain called Rivine. These TFTs are also referred to as "TFTv1" or "TFTA". These tokens have now been migrated to the Stellar blockchain.
- A second version of the ThreeFold_Token was issued as from May 2020 on the Stellar blockchain. These TFTs are also referred to as "TFTv2". This token is available on multiple blockchains, the total amount of tokens farmed is the same independent of blockchain used, TFBridges are used to migrate TFTs between blockchain technology.
While the original TFTv1 kept all same properties and benefits, they are now called TFTA on the Stellar blockchain. Since the creation of the TFTv2, TFTAs have become ThreeFolds voluntary staking pool of Tokens, which means these TFTs can only be used to buy IT Capacity and cannot be traded otherwise. However any User can convert TFTAs into TFTs (i.e. TFTv2) by implementing a few simple migration steps which can be found [here](threefold:tfta_to_tft). Once converted, any TFTs can be traded or transferred by various means as the User deems fit, as further explain [here](threefold:how_to_buy).
While the original TFTv1 kept all same properties and benefits, they are now called TFTA on the Stellar blockchain. Since the creation of the TFTv2, TFTAs have become ThreeFolds voluntary staking pool of Tokens, which means these TFTs can only be used to buy IT Capacity and cannot be traded otherwise. However any User can convert TFTAs into TFTs (i.e. TFTv2) as explained on our wiki. Once converted, any TFTs can be traded or transferred by various means as the User deems fit.
The TF Foundation has chosen to use multiple blockchain technology for storing and managing the TFT. You can use any wallet that supports the chosen blockchain, including but not limited to the wallet included in the ThreeFold Connect app.

View File

@@ -2,7 +2,7 @@
THESE TERMS AND CONDITIONS (THE "**AGREEMENTS**") CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU ("TFGRID **USER**,""TFGRID **FARMER**," "**YOU**", OR "**YOURS**") AND [THREEFOLD COMPANIES](companies) or TFTECH ("**THREEFOLD**", "**COMPANY**," "**US**," "**WE**" OR "**OUR**"), GOVERNING THE TERMS OF YOUR PARTICIPATION AS A PARTNER, CUSTOMER, FARMER OR USER IN THE THREEFOLD GRID. YOU UNDERSTAND AND AGREE THAT BY ACCEPTING THE TERMS OF THIS AGREEMENT, EITHER BY CLICKING TO SIGNIFY ACCEPTANCE, OR BY TAKING ANY ONE OR MORE OF THE FOLLOWING ACTIONS DOWNLOADING, INSTALLING, RUNNING,/AND OR USING THE APPLICABLE SOFTWARE, YOU AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT EFFECTIVE AS OF THE DATE THAT YOU TAKE THE EARLIEST OF ONE OF THE FOREGOING ACTIONS. YOU REPRESENT AND WARRANT THAT YOU ARE 18 YEARS OLD OR OLDER AND HAVE THE RIGHT AND AUTHORITY TO ENTER INTO AND COMPLY WITH THE TERMS OF THIS AGREEMENT.
>> BY USING THE [TFGRID](threefold:threefold_grid) OR ANY OF THE THREEFOLD PROVIDED SOFTWARE OR SERVICES YOU ACCEPT FOLLOWING AGREEMENTS:
>> BY USING THE [TFGRID](tfgrid3:threefold_grid) OR ANY OF THE THREEFOLD PROVIDED SOFTWARE OR SERVICES YOU ACCEPT FOLLOWING AGREEMENTS:
- [X] [Terms & Conditions TFGrid Users TFGrid 3](terms_conditions_griduser)
- [X] [Terms & Conditions TFGrid Farmers TFGrid 3](terms_conditions_farmer3) : relevant if you are a TFGrid Farmer