diff --git a/books/projectinca/SUMMARY.md b/books/projectinca/SUMMARY.md
index 889d442..b1d8957 100644
--- a/books/projectinca/SUMMARY.md
+++ b/books/projectinca/SUMMARY.md
@@ -6,15 +6,15 @@
- [Liquidity](projectinca/liquidity.md)
- [INCA](projectinca/inca.md)
- [TFT](projectinca/tft.md)
-- [Collaboration INCA Launch](projectinca/collab.md)
+- [INCA Launch Collaboration](projectinca/collab.md)
- [Remuneration](projectinca/remuneration.md)
- [Promotion Effort](tfgrid3/promotion.md)
- [Messaging](tfgrid3/messaging.md)
- [Teams](projectinca/teams.md)
-- [Grants](projectinca/grants.md)
- - [AI Boxes](projectinca/aiboxes.md)
- - [Cloud Boxes](projectinca/cloudboxes.md)
- - [Storage Boxes](projectinca/storageboxes.md)
+- [INCA Grants](projectinca/grants.md)
+ - [AI Blocks](projectinca/aiboxes.md)
+ - [Cloud Blocks](projectinca/cloudboxes.md)
+ - [Storage Blocks](projectinca/storageboxes.md)
- [INCA Marketplace](projectinca/marketplace_grant.md)
- [Contributor Rewards](projectinca/contributor_rewards.md)
- [Chapter Tanzania](projectinca/chapter_tanzania.md)
@@ -24,10 +24,24 @@
- [TFGrid 3.14](projectinca/grant_tf_3_14.md)
- [INCA marketplace](projectinca/marketplace.md)
- [TFGrid 4](projectinca/tfgrid4.md)
- - [AI Boxes](tfgrid4/aibox.md)
- - [Cloud Boxes](tfgrid4/cloudbox.md)
- - [Storage Boxes](tfgrid4/storagebox.md)
-- [Hero - Project Mycelium](projectinca/hero.md)
+ - [AI Blocks](tfgrid4/aibox.md)
+ - [Cloud Blocks](tfgrid4/cloudbox.md)
+ - [Storage Blocks](tfgrid4/storagebox.md)
+- [INCA Farming](projectinca/inca_farming.md)
+ - [Hero Hosts](projectinca/inca_nodes.md)
+ - [Mycelium Routers](projectinca/inca_routers.md)
+ - [Network Map](projectinca/networkmap.md)
+- [INCA Grid Utilization](partners_utilization/partners.md)
+ - [Hero - Project Mycelium](projectinca/hero.md)
+ - [Digital Freezone](partners_utilization/freezone.md)
+ - [Tanzania Internet](partners_utilization/tanzania.md)
+ - [Elestio](partners_utilization/elestio.md)
+ - [Earth Wallet](partners_utilization/earth_wallet.md)
+ - [Holochain](partners_utilization/holochain.md)
+ - [Sikana](partners_utilization/sikana.md)
+ - [vindo](partners_utilization/vindo.md)
+ - [vverse](partners_utilization/vverse.md)
+ - [Tier S Datacenter](partners_utilization/tier_s_datacenter.md)
- [Project Info](projectinca/proj_info.md)
- [About us](tfgrid3/who_are_we.md)
- [Utilization](partners_utilization/)
@@ -35,16 +49,6 @@
- [history c64](tech/history/c64.md)
- [too many layers](tech/history/layers.md)
- [Values](values/planet_people_first.md)
- - [TFGrid Utilization](partners_utilization/partners.md)
- - [Digital Freezone](partners_utilization/freezone.md)
- - [Tanzania Internet](partners_utilization/tanzania.md)
- - [Elestio](partners_utilization/elestio.md)
- - [Earth Wallet](partners_utilization/earth_wallet.md)
- - [Holochain](partners_utilization/holochain.md)
- - [Sikana](partners_utilization/sikana.md)
- - [vindo](partners_utilization/vindo.md)
- - [vverse](partners_utilization/vverse.md)
- - [Tier S Datacenter](partners_utilization/tier_s_datacenter.md)
- [Tech Key Innovations](tech/key_innovations_overview.md)
- [Mycelium Network](tech/mycelium_innovation.md)
- [Zero-OS](tech/zos_innovation.md)
diff --git a/books/projectmycelium/SUMMARY.md b/books/projectmycelium/SUMMARY.md
index 98a5586..285b0ea 100644
--- a/books/projectmycelium/SUMMARY.md
+++ b/books/projectmycelium/SUMMARY.md
@@ -1,6 +1,6 @@
- [Intro](projectmycelium/intro.md)
- - [What is Internet](bestkeptsecret/concept.md)
+- [What is Internet](bestkeptsecret/concept.md)
- [Internet is Broken](tech/internet_today.md)
- [Build Internet from Scratch](bestkeptsecret/we_have_all_needed.md)
- [Participants](projectmycelium/participants.md)
@@ -17,30 +17,28 @@
- [Digital Freezone Layer](hero/hero.md)
- [Solana Launch](projectmycelium/solana.md)
- [Lets have fun](bestkeptsecret/lets_have_fun.md)
- - [INCA Token](projectmycelium/inca.md)
- [TFGrid 4 New](projectmycelium/tfgrid4_new.md)
- [Farming](farming/farming.md)
- [TF Nodes](farming/tf_nodes.md)
- [TF Routers](farming/tf_routers.md)
- [Network Map](farming/networkmap.md)
+- [Planet and People First Values](values/planet_people_first.md)
+- [Appendix Internet/Cloud](projectmycelium/appendix.md)
+ - [ThreeFold Cloud in Nutshell](tfgrid3/who_are_we.md)
+ - [The Internet today](tech/internet_today.md)
+ - [history c64](tech/history/c64.md)
+ - [too many layers](tech/history/layers.md)
+ - [Why New Internet](why/why.md)
+ - [Cloud Too Centralized](why/current_cloud_too_centralized.md)
+ - [Countries don't have their Internet](why/countries_no_internet.md)
+ - [Human Right](why/internet_human_right.md)
+ - [Social Warming](why/social_warming.md)
+ - [Solutions to Problems](problems/problems.md)
+ - [painkillers and onions](problems/no_pain_killer.md)
+ - [Clouds are Complicated](problems/cd_issues_cloud_not_enough.md)
+ - [Content Delivery is Expensive](solutions/cdn_cost.md)
- [Governance](projectmycelium/governance.md)
- - [Guardian](tfgrid4/guardian.md)
- - [All Trust](tfgrid4/alltrust.md)
- - [Validators](inca_economy/validators.md)
- - [Proof of Authenticity](p2p/poa.md)
-- [Appendix](projectmycelium/appendix.md)
- - [INCA Economy](inca_economy/inca.md)
- - [INCA Reserve](inca_economy/incareserve.md)
- - [Why](why/why.md)
- - [Cloud Too Centralized](why/current_cloud_too_centralized.md)
- - [Countries don't have their Internet](why/countries_no_internet.md)
- - [Human Right](why/internet_human_right.md)
- - [Social Warming](why/social_warming.md)
- - [Solutions to Problems](problems/problems.md)
- - [painkillers and onions](problems/no_pain_killer.md)
- - [Clouds are Complicated](problems/cd_issues_cloud_not_enough.md)
- - [Content Delivery is Expensive](solutions/cdn_cost.md)
+ - [All Trust](tfgrid4/alltrust.md)
+ - [Proof of Authenticity](p2p/poa.md)
-
diff --git a/collections/bestkeptsecret/.done b/collections/bestkeptsecret/.done
new file mode 100644
index 0000000..e199fbe
--- /dev/null
+++ b/collections/bestkeptsecret/.done
@@ -0,0 +1,3 @@
+fun.png
+next_phase.png
+references.png
diff --git a/collections/bestkeptsecret/fun.png b/collections/bestkeptsecret/fun.png
index 1e2c17c..b13760e 100644
Binary files a/collections/bestkeptsecret/fun.png and b/collections/bestkeptsecret/fun.png differ
diff --git a/collections/bestkeptsecret/img/.done b/collections/bestkeptsecret/img/.done
index 58995eb..1fd11fd 100644
--- a/collections/bestkeptsecret/img/.done
+++ b/collections/bestkeptsecret/img/.done
@@ -3,3 +3,4 @@ cloud_close_to_use2.png
dc_old.png
top_depin.png
vr_streaming.png
+tfgrid4_new.png
diff --git a/collections/bestkeptsecret/img/tfgrid4_new.png b/collections/bestkeptsecret/img/tfgrid4_new.png
index 7072b8d..40b961a 100644
Binary files a/collections/bestkeptsecret/img/tfgrid4_new.png and b/collections/bestkeptsecret/img/tfgrid4_new.png differ
diff --git a/collections/bestkeptsecret/next_phase.png b/collections/bestkeptsecret/next_phase.png
index dac06f3..2d5dd09 100644
Binary files a/collections/bestkeptsecret/next_phase.png and b/collections/bestkeptsecret/next_phase.png differ
diff --git a/collections/earthhub/.done b/collections/earthhub/.done
new file mode 100644
index 0000000..1b045a0
--- /dev/null
+++ b/collections/earthhub/.done
@@ -0,0 +1 @@
+matrix.png
diff --git a/collections/earthhub/img/.done b/collections/earthhub/img/.done
new file mode 100644
index 0000000..096b32b
--- /dev/null
+++ b/collections/earthhub/img/.done
@@ -0,0 +1 @@
+earthhub0.png
diff --git a/collections/earthhub/img/earthhub0.png b/collections/earthhub/img/earthhub0.png
index c51f626..17d38fc 100644
Binary files a/collections/earthhub/img/earthhub0.png and b/collections/earthhub/img/earthhub0.png differ
diff --git a/collections/earthhub/matrix.png b/collections/earthhub/matrix.png
index 6cf6d83..026e3ec 100644
Binary files a/collections/earthhub/matrix.png and b/collections/earthhub/matrix.png differ
diff --git a/collections/projectinca/farming/img/.done b/collections/projectinca/farming/img/.done
new file mode 100644
index 0000000..dd6dd05
--- /dev/null
+++ b/collections/projectinca/farming/img/.done
@@ -0,0 +1,13 @@
+bl_7840.png
+bl_7840c.png
+bl_silver.png
+mnode.png
+mnode_2.png
+mnode_2b.png
+mnode_lr.png
+mnode_physical.png
+networkmap.png
+tfrouter.png
+tfrouter_2.png
+tfrouter_lr.png
+tfrouter_physical.png
diff --git a/collections/projectinca/farming/img/bl_7840.png b/collections/projectinca/farming/img/bl_7840.png
new file mode 100644
index 0000000..e74766a
Binary files /dev/null and b/collections/projectinca/farming/img/bl_7840.png differ
diff --git a/collections/projectinca/farming/img/bl_7840b.png b/collections/projectinca/farming/img/bl_7840b.png
new file mode 100644
index 0000000..97a4044
Binary files /dev/null and b/collections/projectinca/farming/img/bl_7840b.png differ
diff --git a/collections/projectinca/farming/img/bl_7840c.png b/collections/projectinca/farming/img/bl_7840c.png
new file mode 100644
index 0000000..409f395
Binary files /dev/null and b/collections/projectinca/farming/img/bl_7840c.png differ
diff --git a/collections/projectinca/farming/img/bl_silver.png b/collections/projectinca/farming/img/bl_silver.png
new file mode 100644
index 0000000..25fecf4
Binary files /dev/null and b/collections/projectinca/farming/img/bl_silver.png differ
diff --git a/collections/projectinca/farming/img/loran.png b/collections/projectinca/farming/img/loran.png
new file mode 100644
index 0000000..6c8fcc1
Binary files /dev/null and b/collections/projectinca/farming/img/loran.png differ
diff --git a/collections/projectinca/farming/img/networkmap.png b/collections/projectinca/farming/img/networkmap.png
new file mode 100644
index 0000000..3d3e314
Binary files /dev/null and b/collections/projectinca/farming/img/networkmap.png differ
diff --git a/collections/projectinca/farming/img/smallest_3node.png b/collections/projectinca/farming/img/smallest_3node.png
new file mode 100644
index 0000000..bb506b5
Binary files /dev/null and b/collections/projectinca/farming/img/smallest_3node.png differ
diff --git a/collections/projectinca/farming/img/tfrouter.png b/collections/projectinca/farming/img/tfrouter.png
new file mode 100644
index 0000000..783b8c6
Binary files /dev/null and b/collections/projectinca/farming/img/tfrouter.png differ
diff --git a/collections/projectinca/farming/img/tfrouter_2.png b/collections/projectinca/farming/img/tfrouter_2.png
new file mode 100644
index 0000000..b305b50
Binary files /dev/null and b/collections/projectinca/farming/img/tfrouter_2.png differ
diff --git a/collections/projectinca/farming/img/tfrouter_2b.png b/collections/projectinca/farming/img/tfrouter_2b.png
new file mode 100644
index 0000000..7fc9676
Binary files /dev/null and b/collections/projectinca/farming/img/tfrouter_2b.png differ
diff --git a/collections/projectinca/farming/img/tfrouter_lr.png b/collections/projectinca/farming/img/tfrouter_lr.png
new file mode 100644
index 0000000..29c42c3
Binary files /dev/null and b/collections/projectinca/farming/img/tfrouter_lr.png differ
diff --git a/collections/projectinca/farming/img/tfrouter_physical.png b/collections/projectinca/farming/img/tfrouter_physical.png
new file mode 100644
index 0000000..bf1059c
Binary files /dev/null and b/collections/projectinca/farming/img/tfrouter_physical.png differ
diff --git a/collections/projectinca/farming/inca_farming.md b/collections/projectinca/farming/inca_farming.md
new file mode 100644
index 0000000..d072bbd
--- /dev/null
+++ b/collections/projectinca/farming/inca_farming.md
@@ -0,0 +1,89 @@
+
+
+## INCA Farming = **Become a Cloud Service Provider**
+
+Farming means a person or company offers compute, storage and network capacity to the network
+
+- Farmers buy a INCA Node
+- A farmer connects the INCA Node(s) to internet and get rewards for providing capacity
+- A farmer earns rewards mainly for utilization but there are also lots of rewards available for providing capacity.
+- A farmer is helping his/her community to get access to sovereign Internet & Cloud applications on an unbreakabale co-owned Internet/Cloud.
+
+### Income for the Farmers: mainly based on Utilization
+
+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)
+ - 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.2-2 for Storage Box (100 GB of storage) (per month)
+
+- ** farmers can also make money with other services e.g.
+ - $0.01-0.2 for 1000 messages over LoraWAN (long range wifi)
+
+> 80% of these fees goes to farmer, 20% to the *TFCOOP, exception for a twin which is 50-50% split.
+
+### Farming Boosters = additional rewards for providing capacity
+
+Our aim is to have millions of nodes in the field to evingly create the biggest network of Cloud & Internet Capacity in the world.
+
+There are Farming Boosters (additional rewards) available for supporting special locations, providing more uptime & SLA's, ...
+
+Cell's get colors in line to need of service:
+
+- green (enough nodes, no rewards)
+- yellow (can use some extra nodes)
+- red (let's do it, this region needs help)
+
+For red cells the additional farming booster reward is highest.
+
+
+### How to become a farmer
+
+- buy a *INCA NODE (Compute/Storage/AI node) or *INCA ROUTER (Mycelium Network Node).
+- or assemble your own Node, our software makes it easy to get started (see threefold.io for version 3).
+
+### Rewards for being a Farmer
+
+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)
+
+### Farming Pools
+
+Some farmers will chose not to manage, market or operate their 3node, in that case they can join a farming pool.
+
+A Farming pool takes care of
+
+- marketing the capacity
+- giving support to the userbase (developers)
+- managing the best possible pricing
+- monitor all nodes and optimize uptime
+- monitor available bandwidth and make optimizations where possible.
+
+If a farmer uses a farming pool he/she will have to give a part of their reward to the farming pool, each farming pool can decide how much that needs to be.
+
+
+## Remarks
+
+### Network Rewards requires Unblocked Incoming Internet.
+
+"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."
+
+All traffic is end2end encrypted over the Mycelium network = our P2P Network which lives on top of current Internet.
+
+**There are 3 ways incoming traffic is possible.**
+
+- IPv6 public ip address available
+- IPv4 public ip address available (harder)
+- Portforwarding or hole punching support for UDP.
+
+Mycelium will try a lot of tricks to allow traffic to go to your network.
+
+
diff --git a/collections/projectinca/farming/inca_nodes.md b/collections/projectinca/farming/inca_nodes.md
new file mode 100644
index 0000000..d9f0adf
--- /dev/null
+++ b/collections/projectinca/farming/inca_nodes.md
@@ -0,0 +1,51 @@
+
+# Available TFNodes
+
+> TODO: explain we can create nodes ourselves
+
+### TFNode Silver
+
+
+
+- 16 GB Memory
+- 512 GB SSD
+- min 4 logical CPU cores
+
+Will cost less than 500 USD.
+
+### TFNode Gold
+
+
+
+- 32 GB Memory
+- 1000 GB SSD
+- min 8 logical CPU cores
+
+
+Will cost less than 1000 USD.
+
+### TFNode Platinum
+
+
+
+- 64 GB Memory
+- 2000 GB SSD
+- 4000 GB HDD
+- min 16 logical CPU cores
+
+
+Will cost less than 1800 USD.
+
+### TFNode Datacenter
+
+- put your own TFNode 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
+
+- 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.
+
+
+## Remarks
+
+We are still working on the exact logistics, the look and feel can be different, but minimal resources will be the same.
diff --git a/collections/projectinca/farming/inca_routers.md b/collections/projectinca/farming/inca_routers.md
new file mode 100644
index 0000000..5141472
--- /dev/null
+++ b/collections/projectinca/farming/inca_routers.md
@@ -0,0 +1,58 @@
+
+## TFRouters
+
+The TFRouters allow everyone to connect the users of our network with the *TFNODE
+
+### TFRouter 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.
+
+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 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), ...
+
+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.
+
+
+
+
+This TFRouter is super fast and has lots of connectivity.
+
+
+
+> This TFRouter can be bought right now.
+
+### TFRouter 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.
+
+Currently, we rely on fiber or existing internet connections to link between locations, but wouldn't it be cool if we could create our own long-range network connections?
+
+
+
+> We are looking for volunteers who will be rewarded to do reasearch and experiment with chosen equipment to test performance in real life situations, let us know if interest to help.
+
+
+
+
+## Lo-RAN
+
+
+
+
+!!task.add story:'TFRouter_selection' title:'describe loran on TFRouter'
\ No newline at end of file
diff --git a/collections/projectinca/farming/networkmap.md b/collections/projectinca/farming/networkmap.md
new file mode 100644
index 0000000..f3a927b
--- /dev/null
+++ b/collections/projectinca/farming/networkmap.md
@@ -0,0 +1,8 @@
+# network map
+
+
+
+Above network map is from helium see https://explorer.helium.com/ but ThreeFold aims to have a similar map to visualize all threefold nodes and routers and also devices from our partners like Helium.
+
+
+
diff --git a/collections/projectinca/grants/cloudboxes.md b/collections/projectinca/grants/cloudboxes.md
index 4cbbd5d..ebba036 100644
--- a/collections/projectinca/grants/cloudboxes.md
+++ b/collections/projectinca/grants/cloudboxes.md
@@ -1,6 +1,6 @@
# Cloud Boxes Grants
-The aim is to reward the creation of capacity for 100,000 storage boxes, each available cloudbox is rewarded as in the table below.
+The aim is to reward the creation of capacity for 100,000 Storage Blockes, each available cloudbox is rewarded as in the table below.
- terms
- 15m TFT for aggregated capacity
@@ -18,7 +18,7 @@ The aim is to reward the creation of capacity for 100,000 storage boxes, each av
- company info which manages the servers
- Hosting agreement signed with TF DMCC
- Utilization of INCA Marketplace
-- hoster provisions and makes [ComputeBoxes](tfgrid4:computebox.md) available
+- hoster provisions and makes [Storage Blocks](tfgrid4:Cloud Block.md) available
- Approved location, we are trying to expand good capacity in the world
!!wiki.include page:'projectinca:box_vesting_include.md'
diff --git a/collections/projectinca/grants/marketplace_requirements.md b/collections/projectinca/grants/marketplace_requirements.md
index 2ce53cc..06baa5d 100644
--- a/collections/projectinca/grants/marketplace_requirements.md
+++ b/collections/projectinca/grants/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 boxes
+- The marketplace needs to run a monitoring stack to independently verify the SLA of the cloud and Storage Blockes
- The UI needs to be made in Reflex or Flet and be opensource
-- Customers need to see their deployed CloudBoxes or ComputeBoxes
-- Customers can cancel their workloads: CloudBoxes or ComputeBoxes
-- Customers can see monitoring info of their workloads: CloudBoxes or ComputeBoxes
+- 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
diff --git a/collections/projectinca/grants/storageboxes.md b/collections/projectinca/grants/storageboxes.md
index b4e3010..6e6451d 100644
--- a/collections/projectinca/grants/storageboxes.md
+++ b/collections/projectinca/grants/storageboxes.md
@@ -1,6 +1,6 @@
# Storage Boxes Grant
-The aim is to reward the creation of capacity for 100,000 storage boxes, each available storagebox is rewarded as in the table below.
+The aim is to reward the creation of capacity for 100,000 Storage Blockes, each available storagebox is rewarded as in the table below.
- terms
- 5m TFT for aggregated capacity
diff --git a/collections/projectinca/plan/marketplace.md b/collections/projectinca/plan/marketplace.md
index 8e38dc7..1aa2bf2 100644
--- a/collections/projectinca/plan/marketplace.md
+++ b/collections/projectinca/plan/marketplace.md
@@ -15,7 +15,7 @@ The currency as used on the marketplace is INCA, there is a bridge between TFT a
- Easier to track utilization and expansion
- Can and will be extended to other Internet/Cloud Services
-## More info about our cloud & storage boxes.
+## More info about our cloud & Storage Blockes.
- [CloudBoxes](tfgrid4:cloudbox.md)
- [StorageBoxes](tfgrid4:storagebox.md)
diff --git a/collections/projectinca/plan/theplan_c.md b/collections/projectinca/plan/theplan_c.md
index 13cc407..472b0e9 100644
--- a/collections/projectinca/plan/theplan_c.md
+++ b/collections/projectinca/plan/theplan_c.md
@@ -10,7 +10,7 @@ ThreeFold is expanding to the Depin market.
- It's our commercialization token
- It will be used on the INCA marketplace
- During 2024 the price between INCA & TFT is fixed
- - 1 TFT buys 3 INCA
+ - 1 TFT buys 2 INCA
- From Jan 1 2025, the price is defined by market and will be in line to available INCA in liquidity pool.
## Two New Tokens on Solana
@@ -22,8 +22,8 @@ We launch 2 new tokens called INCA and INCA-G.
> INCA = INternet CApacity (is the token of buying/selling Internet/Cloud Capacity)
- 4 billion INCA will be created
- - 3 billion INCA can be bought by TFT holders transferring TFT to INCA (1 TFT buys 4 INCA)
- - 1 billion INCA will be used to launch the next generation of our grid in the DePIN ecosystem
+ - 2 billion INCA can be bought by TFT holders transferring TFT to INCA (1 TFT buys 2 INCA)
+ - 2 billion INCA will be used to launch the next generation of our grid in the DePIN ecosystem
@@ -97,6 +97,10 @@ The total supply of TFT is currently around 960 million TFT, while the max suppl
## 3 Tokens: TFT, INCA & INCA-G
+The 3 tokens co-exist within the TF ecosystem.
+
+TFT has a max supply of 1 billion, INCA has a max supply of 4 billions. INCA-G generates INCA over a given period of time.
+
#### Implementation
- TFT is a token on Stellar blockchain (the original farming token)
diff --git a/collections/projectinca/tokens/inca.md b/collections/projectinca/tokens/inca.md
index 59d761a..20d9816 100644
--- a/collections/projectinca/tokens/inca.md
+++ b/collections/projectinca/tokens/inca.md
@@ -3,18 +3,18 @@
There can never be more than 4 Billion INCA.
-- 3 Billion for TFT holders (1 TFT buys 3 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.
-- 0.5 Billion for expansion of farming capacity of the grid
+- 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.3 Billion for community expansion
+- 0.6 Billion for community expansion
- Promotion of the TFGrid
- Creation of technology on top of the TFGrid
- Peer2peer promotion program
-- 0.2 Billion for Depin ThreeFold Team with 24 months accelerated vesting
+- 0.4 Billion for Depin ThreeFold Team with 24 months accelerated vesting
- 5 % of total
- 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 +36,10 @@ option = {
type: 'pie',
radius: '70%',
data: [
- { value: 3, name: 'TF Original Farmers' },
- { value: 0.5, name: 'Farming Rewards' },
- { value: 0.3, name: 'Community Expansion' },
- { value: 0.2, name: 'Team' },
+ { value: 2, name: 'TF Original Farmers' },
+ { value: 1, name: 'Farming Rewards' },
+ { value: 0.6, name: 'Community Expansion' },
+ { value: 0.4, name: 'Team' },
],
emphasis: {
itemStyle: {
diff --git a/collections/projectmycelium/farming/.collection b/collections/projectmycelium/farming/.collection
deleted file mode 100644
index e69de29..0000000
diff --git a/collections/projectmycelium/farming/farming.md b/collections/projectmycelium/farming/farming.md
index f727e6e..77acfc1 100644
--- a/collections/projectmycelium/farming/farming.md
+++ b/collections/projectmycelium/farming/farming.md
@@ -62,22 +62,22 @@ A Farming pool takes care of
If a farmer uses a farming pool he/she will have to give a part of their reward to the farming pool, each farming pool can decide how much that needs to be.
-### Advanced: Compute Box
+### Advanced: Cloud Block
-The more advanced farmers can chose to define compute boxes in their node. A compute box is an amount of CPU, MEM, GPU, SSD as specified by farmer. When users select a node to deploy a VM on they can use one or more of these compute boxes.
+The more advanced farmers can chose to define Storage Blocks in their node. A Cloud Block is an amount of CPU, MEM, GPU, SSD as specified by farmer. When users select a node to deploy a VM on they can use one or more of these Storage Blocks.
Example a node with 64 GB or mem and 2 TB of SSD and 24 virtual cores.
-- 15 compute boxes each:
+- 15 Storage Blocks each:
- 4 GB of memory (60 GB total)
- 120 GB of SSD capacity
- 6.4 logical CPU core (oversubscription of 4, which means user can max use 4x CPU capacity if system allows)
-- when a user choses the full machine, then he/she will have reserved all compute boxes capacity which means the machine is now dedicated reserved for the user, the hoster specifies the discount for this typically 50%. On a dedicated machine the user has full access to the GPU.
+- when a user choses the full machine, then he/she will have reserved all Storage Blocks capacity which means the machine is now dedicated reserved for the user, the hoster specifies the discount for this typically 50%. On a dedicated machine the user has full access to the GPU.
- min 1GB always needs to be left as buffer for memory and 10% of SSD capacity
How does it work:
-- When a developer wants to deploy a virtual machine, he/she needs to define the required capacity and will be able to make a choice based on these compute boxes, each compute box has different base specs (mem, ssd, gpu, cpu) and reputation, the developer can now make a selection of how many of these compute boxes need to be given to the virtual machine. This defines the monthly price which will have to be paid as well as capacity available to the VM.
+- When a developer wants to deploy a virtual machine, he/she needs to define the required capacity and will be able to make a choice based on these Storage Blocks, each Cloud Block has different base specs (mem, ssd, gpu, cpu) and reputation, the developer can now make a selection of how many of these Storage Blocks need to be given to the virtual machine. This defines the monthly price which will have to be paid as well as capacity available to the VM.
## Remarks
diff --git a/collections/projectmycelium/governance.md b/collections/projectmycelium/governance.md
index 2360abe..3703a35 100644
--- a/collections/projectmycelium/governance.md
+++ b/collections/projectmycelium/governance.md
@@ -2,17 +2,3 @@
> to be completed
-## Treasury
-
-- Wisdom Council: of 9 members as delegated by (6 of 9 sign off)
- - 3 ThreeFold
- - 1 Sikana
- - 1 Holochain
- - 1 Georges
- - 3 TBD
-
-## Chapters
-
-Are regional groups which promote the project and expansion.
-
-- Chapter Wisdom Council: of 9 members as delegated by (6 of 9 sign off)
diff --git a/collections/tfgrid3/img/.done b/collections/tfgrid3/img/.done
new file mode 100644
index 0000000..c650b10
--- /dev/null
+++ b/collections/tfgrid3/img/.done
@@ -0,0 +1 @@
+whoweare_tf.png
diff --git a/collections/tfgrid3/img/whoweare_tf.png b/collections/tfgrid3/img/whoweare_tf.png
new file mode 100644
index 0000000..98d08b9
Binary files /dev/null and b/collections/tfgrid3/img/whoweare_tf.png differ
diff --git a/collections/tfgrid3/who_are_we.md b/collections/tfgrid3/who_are_we.md
index 0d2d236..789117b 100644
--- a/collections/tfgrid3/who_are_we.md
+++ b/collections/tfgrid3/who_are_we.md
@@ -1,4 +1,6 @@
-# About Us
+
+
+# ThreeFold Grid: About Us
## People
@@ -19,10 +21,10 @@ The purpose is to deliver a new infrastructure layer to build a new internet on
## Who Benefits The Most From The TFGrid's Capabilities?
-- CI/CD developers
- Countries: to deploy their own internet
-- The DePIN movement
+- The DePIN movement: a new wave of building co-owned infra
- Social Media Apps
+- Developers for Continuous Integration/Development
## The Project Key Achievements To Date
diff --git a/collections/tfgrid4/alltrust.md b/collections/tfgrid4/alltrust.md
index 177e054..0ec7826 100644
--- a/collections/tfgrid4/alltrust.md
+++ b/collections/tfgrid4/alltrust.md
@@ -1,48 +1,26 @@
-All Trust
-Table of Contents
+All Trust
- [A Paradigm of Trust](#a-paradigm-of-trust)
-- [Farmers: Investors in Shared Infrastructure](#farmers-investors-in-shared-infrastructure)
-- [Grid Services: Facilitating System Usage](#grid-services-facilitating-system-usage)
-- [Flexible Pricing Policies](#flexible-pricing-policies)
-- [IOUs Enable Trusted Transactions](#ious-enable-trusted-transactions)
- [Guardian Circles: Humans Ensuring Oversight](#guardian-circles-humans-ensuring-oversight)
-- [Summary](#summary)
+- [Everyone can be a Service Provider / Merchant](#everyone-can-be-a-service-provider--merchant)
+- [IOUs Enable Trusted Transactions = mutual credit](#ious-enable-trusted-transactions--mutual-credit)
+- [Farmers: Investors in Shared Internet/Cloud Infrastructure](#farmers-investors-in-shared-internetcloud-infrastructure)
+- [Shared Internet, Network \& AI Services](#shared-internet-network--ai-services)
***
## A Paradigm of Trust
-What if instead of distrusting others, we embrace a paradigm of trust? The *TFGRID 4.0 system is built on this principle of trust between all participants.
+What if instead of distrusting others, we embrace a paradigm of trust?
-The TFGrid 4.0 comprises different actors, each represented by a 3bot digital assistant. 3bots enable automated interactions between farmers, service providers, and consumers.
+Our system is built on this principle of trust between all participants.
-## Farmers: Investors in Shared Infrastructure
+Each actor is represented by a digital assistant (based on our Hero) who helps us to organize our collaboration, e-commerce flows, system administration tasks, ...
-- Farmers invest in hardware capacity like TFNodes or OurVerse-based services (web gateways, 5G, etc). Their investments fund the grid infrastructure.
-- Farmers can choose to actively manage their infrastructure using their 3bot. Or they can join a Farming Cooperative to simplify operations.
-- Either way, farmers earn profits when people purchase and utilize the infrastructure capacity they invested in. Their 3bots handle billing, monitoring, support issues, etc.
-
-## Grid Services: Facilitating System Usage
-
-- Hundreds of different grid services can exist, from storage and compute to telecom and networking.
-- These services track usage metrics like bandwidth, storage consumption, RPC requests, etc. Usage data is reported transparently to the relevant farming 3bot.
-- Consumers can interact directly with any service via the OurVerse message bus. Services deploy workloads, fulfill requests, provide monitoring, etc as needed.
-
-## Flexible Pricing Policies
-
-- Farming 3bots define customized pricing policies for their services based on usage. Costs may vary based on compute time, storage quantities, bandwidth, etc.
-- Pricing flexibility creates an open market. Farmers can price based on costs and desired profit margins. Consumers can shop for services based on performance, reliability, location, and price.
-
-## IOUs Enable Trusted Transactions
-
-- IOUs (I Owe You) represent agreements between farmers and consumers for grid usage.
-- Both parties digitally sign each IOU, ensuring consensus on the transaction details.
-- At regular intervals, farmers submit IOUs to the OurVerse Pay Bridge operated by a Guardian Circle. This aggregates IOUs and requests payment from the consumer 3bots.
-- Reputations are maintained on the blockchain to identify any bad actors abusing the system. But fundamentally, the system relies on trust between participants.
+A Human chain rather than a Blockchain has the capability to build/maintain a good governance system.
## Guardian Circles: Humans Ensuring Oversight
@@ -51,6 +29,34 @@ The TFGrid 4.0 comprises different actors, each represented by a 3bot digital as
- Their flexibility allows customization by each grid community based on local needs.
- Circles leverage tools like multisig wallets, OurVerse consensus, and VLang DSLs to codify logic while retaining human checks and balances.
-## Summary
-In summary, *TFGRID 4.0 demonstrates that with the right incentives and oversight, we can build shared digital ecosystems founded on trust and collaboration.
\ No newline at end of file
+## Everyone can be a Service Provider / Merchant
+
+- Farmers define their own pricing policies for their services based on usage. Costs may vary based on compute time, storage quantities, bandwidth, etc.
+- Pricing flexibility creates an open market. Farmers can price based on costs and desired profit margins. Consumers can shop for services based on performance, reliability, location, and price.
+
+## IOUs Enable Trusted Transactions = mutual credit
+
+- IOUs (I Owe You) represent agreements between farmers and consumers or for any other Internet / Hero Service
+- Both parties digitally sign each IOU, ensuring consensus on the transaction details.
+- At regular intervals, farmers submit IOUs to the Payment Bridges which are typically operated in a Digital Freezone. This aggregates IOUs and requests payment from the Hero's who represent the buyers.
+- Reputations are maintained on a decentralized ledfer to identify any bad actors abusing the system.
+- **Fundamentally, the system relies on trust between participants.**
+
+## Farmers: Investors in Shared Internet/Cloud Infrastructure
+
+- Farmers invest in hardware capacity for the Internet and Cloud (web gateways, 5G, etc). This capacity can be used for cloud workloads, AI, web2, web3 or hosting Hero's of project mycelium
+- Smaller farmers join a Farming Cooperative which helps with the commercial and operational duties if needed.
+- Farmers earn rewards when people purchase and utilize the infrastructure capacity they invested in. Their autonomous agents (hero) handle billing, monitoring, support issues, etc.
+
+## Shared Internet, Network & AI Services
+
+- People can collaborate (through their Hero's) to deploy shared services
+- Each of those services is co-owned by groups of people and managed through a circular governance system
+- Some examples
+ - AI Neural networks / Language Models
+ - Internet Connectivity Services
+ - Index & Search of Internet Content
+ - Oracles for pricing, weather, ...
+ - ...
+
diff --git a/collections/tfgrid4/boxes/box_intro.md b/collections/tfgrid4/boxes/box_intro.md
index c2f022e..9d5a153 100644
--- a/collections/tfgrid4/boxes/box_intro.md
+++ b/collections/tfgrid4/boxes/box_intro.md
@@ -1,7 +1,7 @@
-A Cloud, Storage or AI Box is a part of a server/computer (3Node) which delivers a service which has well defined properties in relation to capacity, pricing, serviceabity, capabilities.
+A Cloud, Storage or AI Box is a part of a server/computer (TF or INCA Node) which delivers a service which has well defined properties in relation to capacity, pricing, serviceabity, capabilities.
These Cloud, Storage or AI Boxes can be bought by the INCA/TF Community through the INCA marketplace.
-The boxes are hosted on 3Nodes.
+
diff --git a/collections/tfgrid4/boxes/cloudbox.md b/collections/tfgrid4/boxes/cloudbox.md
index d0e3671..5ef1ba7 100644
--- a/collections/tfgrid4/boxes/cloudbox.md
+++ b/collections/tfgrid4/boxes/cloudbox.md
@@ -1,5 +1,13 @@
# CloudBox Concepts
+Table of Contents
+
+- [CloudBox Concepts](#cloudbox-concepts)
+ - [CloudBox (CB)](#cloudbox-cb)
+ - [Cloud Hour (CH)](#cloud-hour-ch)
+ - [CloudBox Properties](#cloudbox-properties)
+
+
!!wiki.include page:'box_intro.md'
## CloudBox (CB)
@@ -24,9 +32,22 @@ Terms
- Min passmark per cloudbox is 500 passmark (CPU benchmark)
- At least 50 GB storage available, more is better
-## CloudHour (CH)
+**Example a node with 64 GB or mem and 2 TB of SSD and 24 virtual cores.**
-A cloudhour is like a kwatth unit for electricty: it represents a cloudbox being used for 1h and billed as such.
+- 15 Storage Blocks each:
+ - 4 GB of memory (60 GB total)
+ - 120 GB of SSD capacity
+ - 6.4 logical CPU core (oversubscription of 4, which means user can max use 4x CPU capacity if system allows)
+- when a user choses the full machine, then he/she will have reserved all Storage Blocks capacity which means the machine is now dedicated reserved for the user, the hoster specifies the discount for this typically 50%. On a dedicated machine the user has full access to the GPU.
+- min 2GB always needs to be left as buffer for memory and 10% of SSD capacity
+
+How does it work:
+
+- When a developer wants to deploy a virtual machine, he/she needs to define the required capacity and will be able to make a choice based on these CloudBlocks, each CloudBlock has different base specs (mem, ssd, gpu, cpu) and reputation, the developer can now make a selection of how many of these Storage Blocks need to be given to the virtual machine. This defines the monthly price which will have to be paid as well as capacity available to the VM.
+
+## Cloud Hour (CH)
+
+A cloudhour is like a kwatth unit for electricty: it represents a CloudBlock being used for 1h and billed as such.
INCA Hosts (our cloud providers) can price the CloudHour themselves in a chosen currency.
diff --git a/collections/tfgrid4/boxes/storagebox.md b/collections/tfgrid4/boxes/storagebox.md
index 057f2e2..2cf9761 100644
--- a/collections/tfgrid4/boxes/storagebox.md
+++ b/collections/tfgrid4/boxes/storagebox.md
@@ -25,7 +25,7 @@ The service provider (hoster) defines the following properties per StorageBox:
- Max bandwidth
- Min bandwidth (min 1 mbit/sec)
- Cost per GB bandwidth
-- Max aggregation size (how many of the storage boxes can be combined)
+- Max aggregation size (how many of the Storage Blockes can be combined)
- Link to support site if any (find info about hoster and service capabilities)
- If linked to Hosting Pool (company giving support on the machines)
- Location & type of location
diff --git a/docs/hero_mdbook_docker.md b/docs/hero_mdbook_docker.md
index 79034a5..5dcd865 100644
--- a/docs/hero_mdbook_docker.md
+++ b/docs/hero_mdbook_docker.md
@@ -13,27 +13,31 @@
We give the basic steps to use Hero on Docker to run and create mdBooks.
+You can then use a code editor, e.g. VSCodium, to change the files locally and use Hero docker to build and serve the book.
+
## Prerequisites
- Docker engine should be installed and running
- You need a git repository to work with (here we use **info_tfgrid**)
- - Clone the hero mdbook repo on your local machine and note the path
+ - Clone the hero mdbook repo on your local machine (i.e. the host) and note the path
## Steps
-In this setup, we will have two temrinal windows running. One window running the **docker run** command and the other running the **docker exec** command. Steps are shown in details.
+We show the steps to use Hero with Docker.
+
+Once you've set Hero Docker, you can adjust the files at the host path in a code editor and use the docker container to build and serve the book with Hero.
Note that you will need to adjust the local path of the git repo and the docker path of the git repo.
- On a terminal window, start Hero docker
```
- sudo docker run --name herodocker -v /local/machine/path/to/git/repo:/docker/path/to/git/repo/ ghcr.io/scottyeager/hero:latest
+ sudo docker run --name herodocker -d -v /local/machine/path/to/git/repo:/docker/path/to/git/repo/ ghcr.io/scottyeager/hero:latest
```
- In our case, the docker path to the repo is the following
```
/root/code/git.ourworld.tf/tfgrid/info_tfgrid/
```
-- Open a new terminal window and enter the following. We will be working on this window now.
+- Execute the Hero docker container
```
sudo docker exec -it herodocker bash
```
@@ -42,11 +46,6 @@ Note that you will need to adjust the local path of the git repo and the docker
```
git config --global --add safe.directory /root/code/git.ourworld.tf/tfgrid/info_tfgrid
```
- - Set your name and email to be able to push changes
- ```
- git config --global user.email "you@example.com"
- git config --global user.name "Your Name"
- ```
- You can now use Hero normally, e.g. with **projectinca**
- With a URL:
```
@@ -66,16 +65,19 @@ Note that you will need to adjust the local path of the git repo and the docker
```
http://172.17.0.2:3000/
```
-- To stop the container, exit the current window and run the following:
+- To stop the container, exit the Docker container with `exit` and run the following:
```
sudo docker stop herodocker
```
- - The first terminal window that was running **docker run** should now have exited Docker.
- To start Hero after having stopped the container, run the following:
```
sudo docker start herodocker
```
- You can now run the previous line **docker exec** and continue your work.
+- If you need to update the docker Hero image, run the following line:
+ ```
+ docker pull ghcr.io/scottyeager/hero:latest
+ ```
## Questions and Feedback
diff --git a/heroscript/projectmycelium/book_collections.md b/heroscript/projectmycelium/book_collections.md
index adb37aa..03aaf3a 100644
--- a/heroscript/projectmycelium/book_collections.md
+++ b/heroscript/projectmycelium/book_collections.md
@@ -6,7 +6,37 @@
url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/projectmycelium'
!!doctree.add
- url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections'
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/tfgrid3'
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/def'
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/tech'
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/projectinca'
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/projectmycelium'
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/partners_utilization'
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/why'
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/values'
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/p2p'
+
+
+!!doctree.add
+ url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/tfgrid4'
+
+
```