tfgrid

collections/projectinca/engineering/engineering.md

@@ -0,0 +1,3 @@
+# Engineering
+
+> TODO: specify more

collections/projectinca/farming/img/.done

@@ -7,7 +7,8 @@ mnode_2b.png
 mnode_lr.png
 mnode_physical.png
 networkmap.png
-tfrouter.png
+INCA Router.png
 tfrouter_2.png
 tfrouter_lr.png
 tfrouter_physical.png
+tfrouter.png

collections/projectinca/farming/inca_farming.md

@@ -15,11 +15,11 @@ The farmers make capacity available and specify their price.
 
 The recommended pricing is:
 
-- $0.1-10 for AI Box Capacity (GPU Nodes with lots of memory, cpu for AI workloads) (per hour)
-- $0.005-4 for Cloud Box Capacity  (VM, Containers, Kubernetes, ...) (per hour)
+- $0.1-10 for AI Block Capacity (GPU Nodes with lots of memory, cpu for AI workloads) (per hour)
+- $0.005-4 for Cloud Block Capacity  (VM, Containers, Kubernetes, ...) (per hour)
   - Options: $0.005-0.02 for 1 GB Storage (per month)
   - Options: $0.01-0.2 for 1 GB Transfer (bandwidth)
-- $0.005-4 for Cloud Box Capacity  (VM, Containers, Kubernetes, ...) (per hour)
+- $0.005-4 for Cloud Block Capacity  (VM, Containers, Kubernetes, ...) (per hour)
 - $0.2-2 for Storage Box (100 GB of storage) (per month)
 
 - ** farmers can also make money with other services e.g.
@@ -51,7 +51,7 @@ For red cells the additional farming booster reward is highest.
 
 Typically a Farmer can earn the investment of their node back 2 to 10 times over 5 years if succesful.
 
-> For a [simulation based on twins with storage and bandwidth check here](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100)
+> For a [simulation](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100)
 
 ### Farming Pools
 
@@ -74,7 +74,7 @@ If a farmer uses a farming pool he/she will have to give a part of their reward
 
 "Incoming internet traffic should be enabled to earn rewards from network bandwidth.
 
-If a farmer lacks this capability, their TFNode will connect to a neighboring TFNode with good internet connectivity and public incoming access. In this case, the neighbor farmer will earn money from the internet traffic, while the farmer will continue to earn rewards for compute and storage."
+If a farmer lacks this capability, their INCA Node will connect to a neighboring INCA Node with good internet connectivity and public incoming access. In this case, the neighbor farmer will earn money from the internet traffic, while the farmer will continue to earn rewards for compute and storage."
 
 All traffic is end2end encrypted over the Mycelium network = our P2P Network which lives on top of current Internet.
 

collections/projectinca/farming/inca_farming_reward.md

@@ -0,0 +1,8 @@
+# Farming Reward Calculation
+
+We have created a simulation sheet which allows you to estimate farming rewards based on utilization:
+
+For a [simulation](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100)
+
+
+> Do note, there are other rewards in relation to uptime, performance & location, you're reward might be much higher compared to utilization only.

collections/projectinca/farming/inca_nodes.md

@@ -1,9 +1,7 @@
 
-# Available TFNodes
+# Available  INCA Nodes
 
-> TODO: explain we can create nodes ourselves
-
-### TFNode Silver
+### INCA Node Silver
 
 ![](img/smallest_3node.png)
 
@@ -13,7 +11,7 @@
 
 Will cost less than 500 USD.
 
-### TFNode Gold
+### INCA Node Gold
 
 ![](img/bl_silver.png)
 
@@ -24,7 +22,7 @@ Will cost less than 500 USD.
 
 Will cost less than 1000 USD.
 
-### TFNode Platinum
+### INCA Node Platinum
 
 ![](img/bl_7840c.png)
 
@@ -36,12 +34,12 @@ Will cost less than 1000 USD.
 
 Will cost less than 1800 USD.
 
-### TFNode Datacenter
+### INCA Node Datacenter
 
-- put your own TFNode in a datacenter of choice, make sure you have great and cost effective reliable connectivity to internet.
+- put your own INCA Node in a datacenter of choice, make sure you have great and cost effective reliable connectivity to internet.
 - The Farmer buys their own hardware, ThreeFold supports the farmer to get up and running.
 
-### TFNode Dedicated Rental
+### INCA Node Dedicated Rental
 
 - rent a node in a dacenter, make sure you have good capacity in that datacenter. Companies like OVH and Hetzner come to mind as reliable and cost effective.
 

collections/projectinca/farming/inca_routers.md

@@ -1,43 +1,38 @@
 
-## TFRouters
+## INCA Routers
 
-The TFRouters allow everyone to connect the users of our network with the *TFNODE
+The INCA Routers allow everyone to connect the users of our network with the INCA Node
 
-### TFRouter Indoor
+### INCA Router Indoor
 
 We are partnering with WiFi device vendors to extend the Mycelium Network in a full peer-to-peer fashion.
 
-WiFi 6 is now a reality and a native capacity from our first chosen node. The TFRouter Indoor can be purchased starting now. 
+WiFi 6 is now a reality and a native capacity from our first chosen node. The INCA Router Indoor can be purchased starting now. 
 
 It's an exciting node with a reasonable price point and enough CPU capacity to run the Mycelium Network stack within the node itself.
 
 More than 1 node can be installed in a larger office, hotel, home, etc., and they will automatically mesh together.
 
-Each node runs our *ZNET Operating System, allowing for native integration into the TFGrid network.
-
-[Zero-OS](def:zos) Nodes are seamlessly integrated with the Zero-Net nodes by design, requiring minimal configuration. They are part of our Autonomous Zero-OS Stack.
-
 ![](tfrouter_physical.png)
 
 
-### TFRouter Edge
+### INCA Router Edge
 
-The TFRouter Edge is a powerhouse, equipped with a strong CPU and lots of memory to run edge network functions. This router can be connected to multiple uplinks (satellite, cable, fiber, 5G), ...
+The INCA Router Edge is a powerhouse, equipped with a strong CPU and lots of memory to run edge network functions. This router can be connected to multiple uplinks (satellite, cable, fiber, 5G), ...
 
-Mycelium ensures that the shortest and fastest path is always used, and all communication is end-to-end encrypted between an TFRouter or even your mobile or computer if you have the Mycelium agent installed.
-
-The integrated antennas are powerful, with a long range, and are controlled independently. The Zero-Net Software manages the accounting and mutual credit billing system.
+Mycelium ensures that the shortest and fastest path is always used, and all communication is end-to-end encrypted between an INCA Router or even your mobile or computer if you have the Mycelium agent installed.
 
+The integrated antennas are powerful, with a long range, and are controlled independently. 
 
 ![](img/TFRouter_2.png)
 
-This TFRouter is super fast and has lots of connectivity.
+This INCA Router is super fast and has lots of connectivity.
 
 ![](img/TFRouter_2b.png)
 
-> This TFRouter can be bought right now.
+> This INCA Router can be bought right now.
 
-### TFRouter Outdoor + Long Range
+### INCA Router Outdoor + Long Range
 
 We are in the process of selecting the appropriate network equipment to bridge between two locations and enable the creation of meshed wireless networks at the lowest cost.
 
@@ -55,4 +50,4 @@ Currently, we rely on fiber or existing internet connections to link between loc
 ![](img/loran.png)
 
 
-!!task.add story:'TFRouter_selection' title:'describe loran on TFRouter'
+!!task.add story:'TFRouter_selection' title:'describe loran on INCA Router'

collections/projectinca/funding.md

@@ -5,7 +5,7 @@
 
 Funding INCA-G needs to be explored further. Selling INCA-G NFT tokens through entities such as SwissBorg might be good option.
 
-# Funding Through Project Mycelium
+# Funding Through Project Mycelium (HERO)
 
 There will be a new project called Project Mycelium. This project will be focused on the Hero super-tool. This will run on multiple clouds and we will also publish our own cloud versions.
 

collections/projectinca/grants/grant_versions.md

@@ -0,0 +1,4 @@
+We believe in the power of grants to together with the community build the necessary components or reward the community to further develop the project.
+
+- 1,2,3.X series are called TFGrid and can be followed on www.threefold.io
+- 4.x series called INCA (INternet CApacity), tbd website

collections/projectinca/grants/grant_voting_process.md

@@ -0,0 +1,17 @@
+## Voting Process
+
+The voting process is as follows:
+
+- Go to INCA Connect
+- See the projects
+- Vote + or -
+- Vote requests for projects need to be live for a minimum of 2 weeks
+- Votes are not free min 5 USD, but preferred 10 or more, the proceeds of votes go back to treasury
+- Each project defines
+  - min nr of votes, voting fee, if dedicated account, proper description, vesting scheme
+- Everyone can see the projects on https://projectinca.info/projects and comment if logged in and accepted as commenter or moderator
+- We need simple majority to have positive vote
+- Once positive vote the money goes in account created per project, there can be vesting on it, with acceleration
+- Supported chains
+  - We start by supporting Stellar
+  - Then we will also support Solana

collections/projectinca/grants/grants.md

@@ -1,85 +1,3 @@
-# TFT Grants
-
-
-```echarts
-option = {
-  title: {
-    text: 'Grants',
-    subtext: 'Distribution',
-    left: 'center'
-  },
-  tooltip: {
-    trigger: 'item'
-  },
-  series: [
-    {
-      name: 'Distribution',
-      type: 'pie',
-      radius: '70%',
-      data: [
-        { value: 10, name: 'AI Boxes' },
-        { value: 15, name: 'Cloud Boxes' },
-        { value: 5, name: 'Storage Boxes' },
-        { value: 5, name: 'INCA Marketplace' },
-        { value: 20, name: 'Contributor Rewards' },
-        { value: 5, name: 'Chapter Tanzania' },
-        { value: 5, name: 'Chapter Brazil' },
-        { value: 10, name: 'Biz dev rewards' },
-        { value: 10, name: 'TFGrid 3.13' },
-        { value: 5, name: 'TFGrid 3.14' },
-        { value: 5, name: 'Thorchain DEX Launch' },
-      ],
-      emphasis: {
-        itemStyle: {
-          shadowBlur: 10,
-          shadowOffsetX: 0,
-          shadowColor: 'rgba(0, 0, 0, 0.5)'
-        }
-      }
-    }
-  ]
-};
-```
-
-## TFT Grants Treasury
-
-- At least 180,000,000 TFT is available for Grants
-  - projects defined below 
-    - in future on https://projectinca.info/projects  (To Be Done, link not working yet)
-  - voting through INCA Connect
-- <10m  in locked pool (dead wallets)
-  
-## Voting Process
-
-The voting process is as follows:
-
-- Go to INCA Connect
-- See the projects
-- Vote + or -
-- Vote requests for projects need to be live for a minimum of 2 weeks
-- Votes are not free min 5 USD, but preferred 10 or more, the proceeds of votes go back to treasury
-- Each project defines
-  - min nr of votes, voting fee, if dedicated account, proper description, vesting scheme
-- Everyone can see the projects on https://projectinca.info/projects and comment if logged in and accepted as commenter or moderator
-- We need simple majority to have positive vote
-- Once positive vote the money goes in account created per project, there can be vesting on it, with acceleration
-- Supported chains
-  - We start by supporting Stellar
-  - Then we will also support Solana
-
-## Reward Projects
-
-Initial projects are listed below.
-
-> Remark: all TFT are with vesting and have min execution price 0.1 USD per TFT or higher !
-
-- [AIBoxes](aiboxes.md) : 10m TFT
-- [CloudBoxes](cloudboxes.md) : 15m TFT
-- [StorageBoxes](storageboxes.md) : 5m TFT
-- [INCA Marketplace](marketplace_grant.md) : 5m TFT
-- [Contributor Rewards](contributor_rewards.md): rewards for contributors (10-25m TFT)
-- [Chapter Tanzania](chapter_tanzania.md) & [Chapter Brazil](chapter_brazil.md) : 4,000 per 3Node, 10,000 TFT per hackathon
-- [Biz dev rewards](biz_dev_rewards.md): 5% of raised token sales or other investments in TFT at 0.1 USD per TFT or higher.
-- [TFGrid 3.13](projectinca/grant_tf_3_13.md): 10m TFT
-- [TFGrid 3.14](projectinca/grant_tf_3_14.md): 5m TFT
-- [Thorchain DEX Launch](projectinca/grant_thorchain.md): 5m TFT
+# Grants
+
+!!wiki.include page:'projectinca:grant_versions.md'

collections/projectinca/grants/grants_inca.md

@@ -0,0 +1,48 @@
+# Project INCA Grants
+
+!!wiki.include page:'projectinca:grant_versions.md'
+
+There are no grants defined yet for our INCA release.
+
+Please contact us to let us know on which projects you would like to work, below you can see a suggested Distrubution of grants.
+
+```echarts
+option = {
+  title: {
+    text: 'Grants',
+    subtext: 'Distribution',
+    left: 'center'
+  },
+  tooltip: {
+    trigger: 'item'
+  },
+  series: [
+    {
+      name: 'Distribution',
+      type: 'pie',
+      radius: '70%',
+      data: [
+        { value: 20, name: 'Community Expansion Projects' },
+        { value: 20, name: 'Development of Hardware for INCA' },
+        { value: 10, name: 'Organization of Rewards for Hackathlons' },
+        { value: 15, name: 'Organization of Localized Chapters' },
+        { value: 30, name: 'Development of Code' },
+        { value: 5, name: 'Training, Product Marketing' },
+      ],
+      emphasis: {
+        itemStyle: {
+          shadowBlur: 10,
+          shadowOffsetX: 0,
+          shadowColor: 'rgba(0, 0, 0, 0.5)'
+        }
+      }
+    }
+  ]
+};
+```
+
+## TFT Grants Treasury
+
+- **660,000,000 INCA is available for Grants (over all releases)**
+  
+!!wiki.include page:'projectinca:grant_voting_process.md'

collections/projectinca/grants/grants_tft.md

@@ -0,0 +1,73 @@
+# TFGrid 3.x Grants
+
+!!wiki.include page:'projectinca:grant_versions.md'
+
+Below you can find the grants as are open and being executed on for the 3.x version of our project.
+
+```echarts
+option = {
+  title: {
+    text: 'Grants',
+    subtext: 'Distribution',
+    left: 'center'
+  },
+  tooltip: {
+    trigger: 'item'
+  },
+  series: [
+    {
+      name: 'Distribution',
+      type: 'pie',
+      radius: '70%',
+      data: [
+        { value: 10, name: 'Deploy AI Blocks' },
+        { value: 15, name: 'Deploy Cloud Blocks' },
+        { value: 5, name: 'Deploy Storage Blocks' },
+        { value: 5, name: 'Code INCA Marketplace' },
+        { value: 20, name: 'Contributor Rewards' },
+        { value: 5, name: 'Chapter Tanzania' },
+        { value: 5, name: 'Chapter Brazil' },
+        { value: 10, name: 'Biz dev rewards' },
+        { value: 10, name: 'Code TFGrid 3.13' },
+        { value: 5, name: 'Code TFGrid 3.14' },
+        { value: 5, name: 'Deploy Thorchain DEX Launch' },
+      ],
+      emphasis: {
+        itemStyle: {
+          shadowBlur: 10,
+          shadowOffsetX: 0,
+          shadowColor: 'rgba(0, 0, 0, 0.5)'
+        }
+      }
+    }
+  ]
+};
+```
+
+## TFT Grants Treasury
+
+- At least 180,000,000 TFT (which si 360,000,000 INCA) is available for Grants
+  - projects defined below 
+    - in future on https://projectinca.info/projects  (To Be Done, link not working yet)
+  - voting through INCA Connect
+- <10m  in locked pool (dead wallets)
+  
+## Reward Projects
+
+Initial projects are listed below.
+
+> Remark: all TFT are with vesting and have min execution price 0.1 USD per TFT or higher !
+
+- [Deploy AI Blocks](projectinca/grant_aiblock.md) : 10m TFT
+- [Deploy Cloud Blocks](projectinca/grant_cloudblock.md) : 15m TFT
+- [Deploy Storage Blocks](projectinca/grant_storageblock.md) : 5m TFT
+- [Develop INCA Marketplace](projectinca/marketplace_grant.md) : 5m TFT
+- [Contributor Rewards](projectinca/contributor_rewards.md) : rewards for contributors (10-25m TFT)
+- [Chapter Tanzania](projectinca/chapter_tanzania.md) : 4,000 per 3Node, 10,000 TFT per hackathon
+- [Chapter Brazil](projectinca/chapter_brazil.md) : 4,000 per 3Node, 10,000 TFT per hackathon
+- [Biz dev rewards](projectinca/biz_dev_rewards.md) : 5% of raised token sales or other investments in TFT at 0.1 USD per TFT or higher.
+- [Code TFGrid 3.13](projectinca/grant_tf_3_13.md) : 10m TFT
+- [Code TFGrid 3.14](projectinca/grant_tf_3_14.md) : 5m TFT
+- [Establish Thorchain DEX](projectinca/grant_thorchain.md) : 5m TFT
+
+!!wiki.include page:'projectinca:grant_voting_process.md'

collections/projectinca/grants/tf3/grant_aiblock.md

@@ -1,6 +1,6 @@
-# AI Boxes Grants
+# AI Blocks Grants
 
-The aim is to reward the creation of capacity for 1,000 AI Boxes, each available AI Box is rewarded as in the table below.
+The aim is to reward the creation of capacity for 1,000 AI Blocks, each available AI Block is rewarded as in the table below.
 
 The total size of the grant is 10m TFT but can be expended later.
 
@@ -19,7 +19,7 @@ The total size of the grant is 10m TFT but can be expended later.
   - company info which manages the servers
 - Hosting agreement signed with TF DMCC
 - Utilization of INCA Marketplace
-- hoster provisions and makes [Ai Boxes](tfgrid4:aibox.md) available
+- hoster provisions and makes [Ai Blocks](tfgrid4:aiblock.md) available
 - Approved location, we are trying to expand good capacity in the world
 
 !!wiki.include page:'projectinca:box_vesting_include.md'
@@ -30,4 +30,4 @@ We believe the current minimal real price of TFT is at least 0.1 or 0.2, not the
 
 ![](img/cloudbox_grant.png)
 
-!!wiki.include page:'tfgrid4:cloudbox'
+!!wiki.include page:'tfgrid4:cloudblock'

collections/projectinca/grants/tf3/grant_cloudblock.md

@@ -1,6 +1,6 @@
-# Cloud Boxes Grants
+# Cloud Blocks Grants
 
-The aim is to reward the creation of capacity for 100,000 Storage Blockes, each available cloudbox is rewarded as in the table below.
+The aim is to reward the creation of capacity for 100,000 Storage Blocks, each available cloudblock is rewarded as in the table below.
 
 - terms
   - 15m TFT for aggregated capacity
@@ -29,4 +29,4 @@ We believe the minimal real price of TFT is at least 0.1 or 0.2, not the current
 
 ![](img/cloudbox_grant.png)
 
-!!wiki.include page:'tfgrid4:cloudbox'
+!!wiki.include page:'tfgrid4:cloudblock'

collections/projectinca/grants/tf3/grant_storageblock.md

@@ -1,6 +1,6 @@
-# Storage Boxes Grant
+# Storage Blocks Grant
 
-The aim is to reward the creation of capacity for 100,000 Storage Blockes, each available storagebox is rewarded as in the table below.
+The aim is to reward the creation of capacity for 100,000 Storage Blocks, each available storageblock is rewarded as in the table below.
 
 - terms
   - 5m TFT for aggregated capacity
@@ -18,7 +18,7 @@ The aim is to reward the creation of capacity for 100,000 Storage Blockes, each
   - company info which manages the servers
 - Hosting agreement signed with TF DMCC
 - Utilization of INCA Marketplace
-  - hoster provisions and makes [StorageBoxes](tfgrid4:storagebox.md) available
+  - hoster provisions and makes [StorageBlocks](tfgrid4:storageblock.md) available
 - Approved location, we are trying to expand good capacity in the world
 
 !!wiki.include page:'projectinca:box_vesting_include.md'
@@ -29,4 +29,4 @@ We believe the minimal real price of TFT is at least 0.1 or 0.2, not the current
 
 ![](img/cloudbox_grant.png)
 
-!!wiki.include page:'tfgrid4:storagebox'
+!!wiki.include page:'tfgrid4:storageblock'

collections/projectinca/grants/tf3/marketplace_grant.md

@@ -6,8 +6,8 @@ ThreeFold DMCC and TF COOP will host such a market place.
 
 The marketplace will intitially be used to sell
 
-- [CloudBoxes](cloudboxes.md)
-- [StorageBoxes](storageboxes.md)
+- [CloudBlocks](cloudblock.md)
+- [StorageBlocks](storageblock.md)
 
 But many more services will be added.
 

collections/projectinca/grants/tf3/marketplace_requirements.md

@@ -9,8 +9,8 @@
 - There needs to be a python SDK
 - The marketplace needs to accept credit cards as well as major crypto currencies 
 - The marketplace needs to do KYC for users doing more than 1k USD per month
-- The marketplace needs to run a monitoring stack to independently verify the SLA of the cloud and Storage Blockes
+- The marketplace needs to run a monitoring stack to independently verify the SLA of the cloud and Storage Blocks
 - The UI needs to be made in Reflex or Flet and be opensource
-- Customers need to see their deployed CloudBoxes or Storage Blocks
-- Customers can cancel their workloads: CloudBoxes or Storage Blocks
-- Customers can see monitoring info of their workloads: CloudBoxes or Storage Blocks
+- Customers need to see their deployed CloudBlocks or Storage Blocks
+- Customers can cancel their workloads: CloudBlocks or Storage Blocks
+- Customers can see monitoring info of their workloads: CloudBlocks or Storage Blocks

collections/projectinca/marketplace/marketplace.md

@@ -0,0 +1,31 @@
+# INCA Marketplace
+
+We have reached a sizeable grid and want to promote commercialization.
+
+- We are introducing a market place and our next generation grid v4.0 (INCA).
+- This will make it a lot more easy for 3rd parties to use our infrastructure.
+- The currency as used on the marketplace is INCA, there will be a bridge between TFT and INCA.
+
+## Benefits
+
+- Better utilization of hardware capacity.
+- Farmers can define their own price, means market mechanism define price in relation to quality and supply
+- Easier for users to find right priced service
+- Easier to monitor and enforce SLA's
+- Easier to track utilization and expansion
+- Can and will be extended to other Internet/Cloud Services
+
+## More info about our cloud & Storage Blocks.
+
+- [Cloud Blocks](tfgrid4:cloudblock.md)
+- [AI Blocks](tfgrid4:aiblock.md)
+- [Storage Blocks](tfgrid4:storageblock.md)
+
+!!wiki.include page:'marketplace_pricing0.md'
+
+## See grants in relation to our marketplace
+
+- [Development Cloud Blocks](grant_cloudblock.md)
+- [Development Storage Blocks](grant_storageblock.md)
+- [Development AI Blocks](grant_aiblock.md)
+- [Development Marketplace](marketplace.md)

collections/projectinca/marketplace/marketplace_pricing.md

@@ -0,0 +1,16 @@
+# MarketPlace Pricing
+
+!!wiki.include page:'marketplace_pricing0.md'
+
+## Example & Calculator
+
+![](img/inca_pricing.png)
+
+- The Farmers set pricing but the sheet above shows you have the INCA Grid is super competive.
+- In the calculation above the user has enough INCA in his wallet to get 50% discount.
+
+To see average prices you can look at [cloudorado](https://www.cloudorado.com/)
+
+
+
+

collections/projectinca/marketplace/marketplace_pricing0.md

@@ -0,0 +1,11 @@
+
+### Possible Marketplace Pricing
+
+Each farmer can decide on their own price but between the min and max as specified below.
+
+
+![](img/marketplace_pricing.png)
+
+As a consumer you have the capability to look for the Blocks which are of interest to you in relation to its properties like SLA, location, price, reputation, ...
+
+

collections/projectinca/plan/marketplace.md

@@ -1,33 +0,0 @@
-# INCA Marketplace
-
-We have reached a sizeable grid and want to promote commercialization for this we are introducing a market place and our next generation farming called TFGrid 4.0.
-
-This will make it a lot more easy for 3rd parties to use our infrastructure.
-
-The currency as used on the marketplace is INCA, there is a bridge between TFT and INCA.
-
-## Benefits
-
-- The hardware will be better used
-- Farmers can define their own price, means market mechanism define price in relation to quality and supply
-- Easier for users to find right priced service
-- Easier to monitor and enforce SLA's
-- Easier to track utilization and expansion
-- Can and will be extended to other Internet/Cloud Services
-
-## More info about our cloud & Storage Blockes.
-
-- [CloudBoxes](tfgrid4:cloudbox.md)
-- [StorageBoxes](tfgrid4:storagebox.md)
-
-!!wiki.include page:'marketplace_pricing.md'
-
-!!wiki.include page:'projectinca:marketplace_requirements.md'
-
-## See grants in relation to our marketplace
-
-> Please do note that all TFT are with vesting and have a minimum execution price of 0.1 USD per TFT or higher !!!
-
-- [CloudBoxes](cloudboxes.md)
-- [StorageBoxes](storageboxes.md)
-- [Marketplace Cloud & Storage Boxes](marketplace.md)

collections/projectinca/plan/marketplace_pricing.md

@@ -1,6 +0,0 @@
-
-### Possible Marketplace Pricing
-
-Each farmer can decide on their own price but between the min and max as specified below.
-
-![](img/marketplace_pricing.png)

collections/projectinca/plan/tfgrid4.md

@@ -5,7 +5,7 @@ The network of 3Nodes running Zero-OS will use a marketplace as its front end.
 
 ## NEW
 
-- Simplified concept of [CloudBoxes](tfgrid4:cloudboxes.md) & [StorageBoxes](tfgrid4:storageboxes.md)
+- Simplified concept of [CloudBlocks](tfgrid4:cloudblock.md) & [StorageBlocks](tfgrid4:storageblock.md)
 - SLA management
 - More strict enforcement about suportability from a farming perspective
 - All farmers can set their pricing

collections/projectinca/tokens/inca.md

@@ -3,19 +3,16 @@
 
 There can never be more than 4 Billion INCA.
 
-- 2 Billion for TFT holders (1 TFT buys 2 INCA)
-  - Will be sold uniquely to TFT Holders (the founders, creators and farmers of the current TFGrid)
-  - We expect to never fully get to this amount, each TFT converted to INCA gets burned (destroyed).
-  - Jan 1 2025, the price between INCA & TFT will be defined by the market by means of a liquidity pool. 
-- 1 Billion for expansion of farming capacity of the grid
-  - Farming rewards
-  - Can also be sold through partners e.g. SwissBorg (through INCA-G) and others...
-- 0.6 Billion for community expansion
+- 50% of supply for Farming
+  - People expanding the network with Router & Node capacity over the multiple releases
+- 16.5% Million for community grants
+  - we want to expand and build our project in first place together with the community
+- 1.3% Million for community expansion specifically for INCA
   - Promotion of the TFGrid
-  - Creation of technology on top of the TFGrid
-  - Peer2peer promotion program
-- 0.4 Billion for Depin ThreeFold Team with 24 months accelerated vesting
-  - 5 % of total
+- 3.3% For liquidity providing (DEX, marketmakers, ...)
+-  11.5% for the technology creators
+  - ThreeFold and INCA is the result of technology developed in a teh company, which got acquired many years ago, this resulted in a token grant for the stakeholders of that company
+-  17.5% for team and contributor rewards
   - It's for people who help to expand the Grid (starting now)
   - A lot of it is to reward our partners to help launch the INCA Tokens & the TFGrid
 
@@ -36,10 +33,12 @@ option = {
       type: 'pie',
       radius: '70%',
       data: [
-        { value: 2, name: 'TF Original Farmers' },
-        { value: 1, name: 'Farming Rewards' },
-        { value: 0.6, name: 'Community Expansion' },
-        { value: 0.4, name: 'Team' },
+        { value: 2000, name: 'Farming Rewards' },
+        { value: 130, name: 'Liquidity' },
+        { value: 660, name: 'Community Grants' },
+        { value: 460, name: 'Original Technology Acquisition' },
+        { value: 50, name: 'Community Expansion' },
+        { value: 700, name: 'Team' },
       ],
       emphasis: {
         itemStyle: {
@@ -53,4 +52,19 @@ option = {
 };
 ```
 
-*Accelerated Vesting means: if INCA gets above 0.5 CHF per INCA (50%), the vesting accelerates in proportion to the percentage (e.g. 0.6 CHF per INCA = 60$ acceleration). At 1 CHF per INCA (100%) and more, the acceleration is 100%.*
+## Release Schedule
+
+
+![](img/release_schedule2.png)
+
+<br>
+
+![](img/release_schedule.png)
+
+
+The following table shows planned release, some of the mechanisms and details are still being worked on.
+
+<!-- *Accelerated Vesting means: if INCA gets above 0.5 CHF per INCA (50%), the vesting accelerates in proportion to the percentage (e.g. 0.6 CHF per INCA = 60$ acceleration). At 1 CHF per INCA (100%) and more, the acceleration is 100%.* -->
+
+
+For more information about our gen3 token see [here called TFT](tft.md)

collections/projectinca/tokens/tft.md

@@ -1,11 +1,17 @@
 ## TFT main stats
 
-Right now about 5 million TFT are farmed (mined) per month. This number wil increase as more nodes are being added. About 294,000,000 TFT have been farmed so far.
+TFT is the token on stellar as was used on our previous grids (v 1,2,3)
+
+- **The TFT is our Creator Token, it has established and proven the technology**
+- Right now about 5 million TFT are farmed (mined) per month.
+- About 294,000,000 TFT have been farmed so far.
+- Farming of TFT will stop at 1 Billion TFT
+
 
 ```echarts
 option = {
   title: {
-    text: 'TFT Token',
+    text: 'TFT Token Version 3.x',
     subtext: 'Distribution',
     left: 'center'
   },
@@ -18,13 +24,11 @@ option = {
       type: 'pie',
       radius: '70%',
       data: [
-        { value: 294, name: 'Farming Done' },        
-        { value: 180, name: 'Grants' },
-        { value: 40, name: 'Liquidity' },
-        { value: 230, name: 'Technology Acquisition' },
-        { value: 200, name: 'Advisors, Founders & Team' },
-        { value: 60, name: 'Planned Farming 2024' },
-        { value: 2915, name: 'Future Farming 2025+' },
+        { value: 700, name: 'Farming Done' },        
+        { value: 80, name: 'Liquidity' },
+        { value: 360, name: 'Grants' },
+        { value: 460, name: 'Technology Acquisition' },
+        { value: 400, name: 'Advisors, Founders & Team' },
         ],
       emphasis: {
         itemStyle: {
@@ -41,63 +45,10 @@ option = {
 - Rivine-minted TFT: 112,862,249
 - Stellar-minted TFT: 181,262,054
 
-### TFT Supply Over 1 Billion Changes!!!
+### On v3.x of our Grid TFT Farming limited to 1 Billion
 
-From 1 Billion TFT the farming rules will change to make sure that each farming capacity is used by real users in the field, we don't just want to burn energy.
-
-The rules from Jan 1 2025 or 1 billion TFT whatever is first will be as follows:
-
-- 2 year lockup of farmed tokens
-- after 6 months, accelerated vesting (means tokens unlock) once utilization is 30% for more than 3 months 
-- Utilization is done on INCA Portal, so we know they are real customers with real needs
-- The farming reward will be expressed in chosen stable coin e.g. EUR or Gold, but rewarded in TFT
-- SLA's and uptime will be monitored carefully, if not achieved, there will be no farming
-- Farmer is part of farming pool or is a certified farmer themselves (with SAL, T&C signed, etc.)
-
-This will make sure that:
-
-- There is no fake capacity and the quality is good
-- The nodes are used properly by real customers
-- There is minimal sales pressure on the TFT
-
-### Active tokens
-
-View is as planned for end 2024:
-
-```echarts
-option = {
-  title: {
-    text: 'TFT Token',
-    subtext: 'Existing Supply',
-    left: 'center'
-  },
-  tooltip: {
-    trigger: 'item'
-  },
-  series: [
-    {
-      name: 'Distribution',
-      type: 'pie',
-      radius: '70%',
-      data: [
-        { value: 294, name: 'Farming Done' },        
-        { value: 180, name: 'Grants' },
-        { value: 40, name: 'Liquidity' },
-        { value: 230, name: 'Technology Acquisition' },
-        { value: 200, name: 'Advisors, Founders & Team' },
-        { value: 60, name: 'Planned Farming 2024' },
-      ],
-      emphasis: {
-        itemStyle: {
-          shadowBlur: 10,
-          shadowOffsetX: 0,
-          shadowColor: 'rgba(0, 0, 0, 0.5)'
-        }
-      }
-    }
-  ]
-};
-```
+- Farming on TFGrid (our v3 release), stops at 1 Billion.
+- Farming continues (over v4 release), total will be 50% of the total supply (1,2,3 and 4 release)
 
 *The values above are estimate in some cases as we don't have full visibility and details for all wallets, but of course the totals are correct.*
 

collections/projectinca/tokens/tokens.md

@@ -0,0 +1,48 @@
+# Tokens Distribution
+
+The INCA token is the result of our 4 generations of product releases.
+
+- v 1,2,3 goes under the name of TFT and was minted on Stellar (max 2 Billion)
+- INCA supercedes and integrates TFT, and is our v4 Token on Solana
+- INCA will be on many DEXes
+- The INCA will be bridged to other major blockchains and we aim to have INCA available on Exchanges.
+
+We are a community driven project and that shows in our tokenomics, over the both generations:
+
+- 67,7% of all tokens over both generation net's is for the community (farming, grants, ...)
+- 11.5% was for the original technology acquisition
+- 17.5% is for the team and contributors
+
+```echarts
+option = {
+  title: {
+    text: 'INCA Token',
+    subtext: 'Distribution',
+    left: 'center'
+  },
+  tooltip: {
+    trigger: 'item'
+  },
+  series: [
+    {
+      name: 'Distribution',
+      type: 'pie',
+      radius: '70%',
+      data: [
+        { value: 2710, name: 'Community Rewards: Farming + grants' },
+        { value: 130, name: 'Liquidity' },
+        { value: 460, name: 'Original Technology Acquisition' },
+        { value: 700, name: 'Team' },
+      ],
+      emphasis: {
+        itemStyle: {
+          shadowBlur: 10,
+          shadowOffsetX: 0,
+          shadowColor: 'rgba(0, 0, 0, 0.5)'
+        }
+      }
+    }
+  ]
+};
+```
+