diff --git a/books/projectinca/SUMMARY.md b/books/projectinca/SUMMARY.md
index 5eba44c..a9d83f2 100644
--- a/books/projectinca/SUMMARY.md
+++ b/books/projectinca/SUMMARY.md
@@ -9,9 +9,9 @@
- [TFT](projectinca/tft.md)
- [INCA Grants](projectinca/grants.md)
- [v3.x Grants](projectinca/grants_tft.md)
- - [Deploy AI Blocks](projectinca/grant_aiblock.md)
- - [Deploy Cloud Blocks](projectinca/grant_cloudblock.md)
- - [Deploy Storage Blocks](projectinca/grant_storageblock.md)
+ - [Deploy AISlices](projectinca/grant_aislice.md)
+ - [Deploy CloudSlices](projectinca/grant_cloudslice.md)
+ - [Deploy StorageSlices](projectinca/grant_storageslice.md)
- [Develop INCA Marketplace](projectinca/marketplace_grant.md)
- [Contributor Rewards](projectinca/contributor_rewards.md)
- [Chapter Tanzania](projectinca/chapter_tanzania.md)
@@ -24,11 +24,14 @@
- [Grant Voting Process](projectinca/grant_voting_process.md)
- [INCA Marketplace](projectinca/marketplace.md)
- [Pricing](projectinca/marketplace_pricing.md)
- - [AI Blocks](tfgrid4/aiblock.md)
- - [Cloud Blocks](tfgrid4/cloudblock.md)
- - [Storage Blocks](tfgrid4/storageblock.md)
+ - [AI Slices](tfgrid4/aislice.md)
+ - [Cloud Slices](tfgrid4/cloudslice.md)
+ - [Storage Slices](tfgrid4/storageslice.md)
- [INCA Farming](projectinca/inca_farming.md)
- - [INCA Hosts](projectinca/inca_nodes.md)
+ - [INCA Nodes](projectinca/inca_nodes.md)
+ - [INCA Node Silver](projectinca/inca_node_silver.md)
+ - [INCA Node Platinum](projectinca/inca_node_platinum.md)
+ - [INCA Node AI](projectinca/inca_node_ai.md)
- [INCA Routers](projectinca/inca_routers.md)
- [INCA Network Map](projectinca/networkmap.md)
- [Reward Simulation](projectinca/inca_farming_reward.md)
@@ -37,6 +40,8 @@
- [Promotion Effort](tfgrid3/promotion.md)
- [Messaging](tfgrid3/messaging.md)
- [Teams](projectinca/teams.md)
+- [INCA Stories](projectinca/stories.md)
+ - [INCA App Spec](projectinca/inca_app.md)
- [INCA Grid Utilization](partners_utilization/partners.md)
- [Hero - Project Mycelium](projectinca/hero.md)
- [Digital Freezone](partners_utilization/freezone.md)
@@ -88,7 +93,6 @@
- [Mycelium](tech/mycelium.md)
- [Web Gateway](tech/webgw.md)
- [Appendix](projectinca/appendix.md)
- - [TFConnect NG Spec](projectinca/tfconnect.md)
- [Tokenomics TFGrid 3.14](tfgrid3/tokenomics.md)
- [Farming Reward TFGrid 3](tfgrid3/farming_reward.md)
- [Tokens Overview TFGrid 3](tfgrid3/tokens_overview.md)
diff --git a/books/projectmycelium/SUMMARY.md b/books/projectmycelium/SUMMARY.md
deleted file mode 100644
index 8f5a14e..0000000
--- a/books/projectmycelium/SUMMARY.md
+++ /dev/null
@@ -1,93 +0,0 @@
-
-- [Introduction](projectmycelium/intro.md)
-- [Positioning](hero/positioning.md)
-- [Product Vision](projectmycelium/product_slides.md)
-- [Tokenomics](projectmycelium/tokenomics.md)
- - [Tokens](projectmycelium/tokens.md)
- - [Solana Launch](projectmycelium/solana.md)
-- [Internet revolution](web4/internet_evolution.md)
-- [Values](values/planet_people_first.md)
-- [Mycelium Routers & Nodes](projectmycelium/farming.md)
- - [Mycelium Nodes](projectmycelium/mycelium_nodes.md)
- - [Mycelium Routers](projectmycelium/mycelium_routers.md)
- - [Network Map](projectinca/networkmap.md)
-- [Hero Architecture](hero/architecture.md)
- - [hero DB](hero/hero_architecture.md)
- - [NFT Example](tech/nft_storage.md)
-- [hero Tech](hero/tech.md)
- - [Post Quantum Storage](hero/qsss.md)
- - [Post Quantum Network](hero/mycelium.md)
- - [Global Content Delivery](hero/fungistor.md)
-- [Hero and AI - 4D](hero4d/intro.md)
- - [Humans are Beautiful](hero4d/humans_are_unique.md)
- - [3 Axes](hero4d/3axes.md)
- - [Emotions](hero4d/emotions.md)
- - [IQ EQ SQ](hero4d/iq_eq_sq.md)
- - [AI](hero4d/ai.md)
- - [AI pathways](hero4d/ai_paths.md)
- - [AI for good](hero4d/ai_for_good.md)
- - [**The Choice**](hero4d/the_choice.md)
- - [Tech Revolutions](hero4d/revolutions.md)
- - [BioTech](hero4d/bio_revolution.md)
- - [Quantum](hero4d/quantum.md)
- - [New Energy](hero4d/new_energy_systems.md)
- - [AI Automation](hero4d/ai_automation.md)
- - [We cant ignore](hero4d/we_cant_ignore.md)
- - [We know everything](hero4d/we_know_everything.md)
- - [The Solution](hero4d/solution.md)
-- [TF/INCA Tech](hero/tf_tech.md)
- - [Key Innovations](tech/key_innovations_overview.md)
- - [Mycelium Network](tech/mycelium_innovation.md)
- - [Zero-OS](tech/zos_innovation.md)
- - [Quantum Safe Storage](tech/zstor_innovation.md)
- - [Quantum Safe Filesystem](tech/qsfs_innovation.md)
- - [FList: better OS Images](tech/flist_innovation.md)
- - [FungiStor](tech/fungistor_innovation.md)
- - [Network Wall](tech/network_wall_innovation.md)
- - [Technology](tech/technology.md)
- - [Architecture](tech/architecture.md)
- - [Energy Efficient](tech/energy_efficient.md)
- - [TFGrid Core Capabilities](tech/features.md)
- - [Compute](tech/compute.md)
- - [Zero-OS](tech/zos.md)
- - [Infrastructure As Code](tech/smartcontract_iac.md)
- - [CoreX](tech/corex.md)
- - [Storage](tech/qsss_home.md)
- - [Quantum Safe Storage Algo](tech/qss_algorithm.md)
- - [Zero Knowledge proof](tech/qss_zero_knowledge_proof.md)
- - [NFT Storage](tech/nft_storage.md)
- - [S3 Storage](tech/s3_interface)
- - [File System](tech/qss_filesystem.md)
- - [Network](tech/networking.md)
- - [Planetary Network](tech/mycelium.md)
- - [Web Gateway](tech/webgw.md)
-- [TF/INCA Grid](projectinca/project_info.md)
- - [The Internet today](tech/internet_today.md)
- - [history c64](tech/history/c64.md)
- - [too many layers](tech/history/layers.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)
- - [Why TFGrid](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)
-- [Appendix](hero/appendix.md)
- - [Hero Social Protocols](hero/social_media_protocols.md)
- - [activity pub](social_media_protocols/activitypub.md)
- - [nostr](social_media_protocols/nostr.md)
- - [others](social_media_protocols/protocols.md)
- - [Background: What is Internet](bestkeptsecret/concept.md)
- - [The Internet is Broken](tech/internet_today.md)
- - [Build Internet from Scratch](bestkeptsecret/we_have_all_needed.md)
-- [Governance](projectmycelium/governance.md)
- - [All Trust](tfgrid4/alltrust.md)
- - [Proof of Authenticity](p2p/poa.md)
diff --git a/books/projectmycelium/sync_production.sh b/books/projectmycelium/sync_production.sh
deleted file mode 100755
index d320bec..0000000
--- a/books/projectmycelium/sync_production.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -ex
-export NAME=projectmycelium
-hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript/$NAME
-rsync -rv ~/hero/www/info/$NAME/ root@info.ourworld.tf:/root/hero/www/info/$NAME/
diff --git a/books/tfgrid4specs/SUMMARY.md b/books/tfgrid4specs/SUMMARY.md
new file mode 100644
index 0000000..6434085
--- /dev/null
+++ b/books/tfgrid4specs/SUMMARY.md
@@ -0,0 +1,45 @@
+- [Introduction](bestkeptsecret/home.md)
+- [Why](why/why.md)
+ - [Cloud Too Centralized](why/current_cloud_too_centralized.md)
+ - [Countries Don't Have Their Own Internet](why/countries_no_internet.md)
+ - [Human Right](why/internet_human_right.md)
+ - [Social Warming](why/social_warming.md)
+- [Farming](farming_v4/farming.md)
+ - [TF Nodes](farming_v4/tf_nodes.md)
+ - [TF Routers](farming_v4/tf_routers.md)
+ - [Network Map](farming_v4/networkmap.md)
+- [Grid Economy](economy/economy.md)
+ - [INCA](economy/inca.md)
+ - [INCA Reserve](economy/incareserve.md)
+ - [TFT](economy/tft.md)
+ - [Mutual Credit](p2p/mutualcredit.md)
+ - [Proof of Authenticity](p2p/poa.md)
+- [Partners Utilization](partners_utilization/partners.md)
+ - [Sikana](partners_utilization/sikana.md)
+ - [Vindo](partners_utilization/vindo.md)
+ - [Mkondo](partners_utilization/mkondo.md)
+ - [Vverse](partners_utilization/vverse.md)
+ - [Earth Wallet](partners_utilization/earth_wallet.md)
+ - [Elestio](partners_utilization/elestio.md)
+ - [OW Freezone](partners_utilization/freezone.md)
+ - [Helium](partners_utilization/helium.md)
+ - [Holochain](partners_utilization/holochain.md)
+ - [TZG](partners_utilization/tanzania.md)
+ - [Tier-S DC](partners_utilization/tier_s_datacenter.md)
+- [Solutions](solutions/solutions.md)
+ - [Decentralized Cloud](solutions/cloud/cloud.md)
+ - [Content Providers](solutions/content_providers/content_providers.md)
+ - [Web4](web4/web4.md)
+- [Technology](tech/technology.md)
+ - [Key Innovations](tech/key_innovations.md)
+- [Vision](values/values.md)
+ - [Planet and People First](values/planet_people_first.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)
+- [How You Can Participate](dy_intro/how_you_can_participate/participate.md)
+ - [Host a Node](dy_intro/how_you_can_participate/host_a_node.md)
+ - [Build on Top of Tanzania's Decentralised Internet](dy_intro/how_you_can_participate/build.md)
+ - [Join Our Coding Academy](dy_intro/how_you_can_participate/coding_participate.md)
+ - [Join Our Community](dy_intro/how_you_can_participate/community_participate.md)
\ No newline at end of file
diff --git a/collections/dashboard/solutions/algorand.md b/collections/dashboard/solutions/algorand.md
index 5660fbd..e2dd285 100644
--- a/collections/dashboard/solutions/algorand.md
+++ b/collections/dashboard/solutions/algorand.md
@@ -60,7 +60,7 @@ The next step accourding to the [docs](https://developer.algorand.org/docs/run-a
## Run Participant Node
-Participation means participation in the Algorand consensus protocol. An account that participates in the Algorand consensus protocol is eligible and available to be selected to propose and vote on new blocks in the Algorand blockchain.
+Participation means participation in the Algorand consensus protocol. An account that participates in the Algorand consensus protocol is eligible and available to be selected to propose and vote on new slice in the Algorand blockchain.
Participation node is responsible for hosting participation keys for one or more online accounts.
What you need?
@@ -76,7 +76,7 @@ What you need?
![partdep](./img/algorand_partdep.png)
-after the deployment is done. `ssh` to the node and run `goal node status` to see the status of the node. you see it do catchup. and the fast catchup is to make the node sync with the latest block faster by only fetch the last 1k blocks. after it done it will start create the participation keys.
+after the deployment is done. `ssh` to the node and run `goal node status` to see the status of the node. you see it do catchup. and the fast catchup is to make the node sync with the latest block faster by only fetch the last 1k slice. after it done it will start create the participation keys.
![partstatus](./img/algorand_partstatus.png)
now if you check the explorer you can see the status of the account turned to Online
diff --git a/collections/dashboard/solutions/subsquid.md b/collections/dashboard/solutions/subsquid.md
index 5a59b44..5cd19f6 100644
--- a/collections/dashboard/solutions/subsquid.md
+++ b/collections/dashboard/solutions/subsquid.md
@@ -10,7 +10,7 @@
## Introduction
-[Subsquid](https://www.subsquid.io/) indexer is a piece of software that reads all the blocks from a Substrate based blockchain, decodes and stores them for processing in a later stage.
+[Subsquid](https://www.subsquid.io/) indexer is a piece of software that reads all the slice from a Substrate based blockchain, decodes and stores them for processing in a later stage.
## Prerequisites
diff --git a/collections/developers/flist/flist_case_studies/flist_nextcloud_case_study.md b/collections/developers/flist/flist_case_studies/flist_nextcloud_case_study.md
index 78b9897..52fb9be 100644
--- a/collections/developers/flist/flist_case_studies/flist_nextcloud_case_study.md
+++ b/collections/developers/flist/flist_case_studies/flist_nextcloud_case_study.md
@@ -179,7 +179,7 @@ We can see in the first section (`trusted_proxies static`) that we set a range o
After the global config at the top, the line `{$DOMAIN}:{$PORT}` defines the port that Caddy will listen to and the domain that we are using for our site. This is important, because in the case that port `443` is specified, Caddy will handle SSL certificates automatically.
-The following blocks define behavior for different URL paths that users might try to access.
+The following slice define behavior for different URL paths that users might try to access.
To begin, we have `/aio*`. This is how we place the AIO management app in a "subfolder" of our main domain. To accomplish that we need a few rules that rewrite the contents of the returned pages to correct the links. We also add some text replacements here to accomplish the enhancements mentioned earlier, like automatically filling the domain entry field.
diff --git a/collections/developers/internals/zos/internals/network/deploy_network_v2.md b/collections/developers/internals/zos/internals/network/deploy_network_v2.md
index 59a04d9..35b817b 100644
--- a/collections/developers/internals/zos/internals/network/deploy_network_v2.md
+++ b/collections/developers/internals/zos/internals/network/deploy_network_v2.md
@@ -36,7 +36,7 @@ But we need to stress the importance of IPv6 availability when you're running a
grid is boldly claiming to be a new Internet, we should make sure we adhere to the new protocols that are future-proof.
Hence: IPv6 is the base, and IPv4 is just there to accomodate the transition.
-Nowadays, RIPE can't even hand out consecutive /22 IPv4 blocks any more for new LIRs, so you'll be bound to market to
+Nowadays, RIPE can't even hand out consecutive /22 IPv4 slice any more for new LIRs, so you'll be bound to market to
get IPv4, mostly at rates of 10-15 Euro per IP. Things tend to get costly that way.
So anyway, IPv6 is not an afterthought in 0-OS, we're starting with it.
diff --git a/collections/developers/internals/zos/internals/network/network_v2.md b/collections/developers/internals/zos/internals/network/network_v2.md
index 59e16ae..cebfd68 100644
--- a/collections/developers/internals/zos/internals/network/network_v2.md
+++ b/collections/developers/internals/zos/internals/network/network_v2.md
@@ -36,7 +36,7 @@ But we need to stress the importance of IPv6 availability when you're running a
grid is boldly claiming to be a new Internet, we should make sure we adhere to the new protocols that are future-proof.
Hence: IPv6 is the base, and IPv4 is just there to accomodate the transition.
-Nowadays, RIPE can't even hand out consecutive /22 IPv4 blocks any more for new LIRs, so you'll be bound to market to
+Nowadays, RIPE can't even hand out consecutive /22 IPv4 slice any more for new LIRs, so you'll be bound to market to
get IPv4, mostly at rates of 10-15 Euro per IP. Things tend to get costly that way.
So anyway, IPv6 is not an afterthought in 0-OS, we're starting with it.
diff --git a/collections/developers/tfchain/farming_policies.md b/collections/developers/tfchain/farming_policies.md
index e997b8f..fb4e1d4 100644
--- a/collections/developers/tfchain/farming_policies.md
+++ b/collections/developers/tfchain/farming_policies.md
@@ -63,7 +63,7 @@ A council member can create a Farming Policy (DAO) in the following way:
6: Select an actions `tfgridModule` -> `createFarmingPolicy` and fill in all the fields.
7: Create a forum post with the details of the farming policy and fill in the link of that post in the `link` field
8: Give it some good `description`.
-9: Duration is optional (by default it's 7 days). A proposal cannot be closed before the duration is "expired". If you wish to set a duration, the duration should be expressed in number of blocks from `now`. For example, 2 hours is equal to 1200 blocks (blocktime is 6 seconds) in this case, the duration should be filled in as `1200`.
+9: Duration is optional (by default it's 7 days). A proposal cannot be closed before the duration is "expired". If you wish to set a duration, the duration should be expressed in number of slice from `now`. For example, 2 hours is equal to 1200 slice (blocktime is 6 seconds) in this case, the duration should be filled in as `1200`.
10: If all the fields are filled in, click `Propose`, now Farmers can vote. A proposal can be closed manually once there are enough votes AND the proposal is expired. To close go to extrinsics -> `dao` -> `close` -> fill in proposal hash and index (both can be found in chainstate).
All (su, cu, nu, ipv4) values should be expressed in units USD. Minimal uptime should be expressed as integer that represents an percentage (example: `95`).
@@ -86,7 +86,7 @@ First identify the policy ID to link to a farm. You can check for farming polici
6: Limits contains a `farming_policy_id` (Required) and cu, su, end, node count (which are all optional). It also contains `node_certification`, if this is set to true only certified nodes can have this policy.
7: Create a forum post with the details of why we want to link that farm to that policy and fill in the link of that post in the `link` field
8: Give it some good `description`.
-9: Duration is optional (by default it's 7 days). A proposal cannot be closed before the duration is "expired". If you wish to set a duration, the duration should be expressed in number of blocks from `now`. For example, 2 hours is equal to 1200 blocks (blocktime is 6 seconds) in this case, the duration should be filled in as `1200`.
+9: Duration is optional (by default it's 7 days). A proposal cannot be closed before the duration is "expired". If you wish to set a duration, the duration should be expressed in number of slice from `now`. For example, 2 hours is equal to 1200 slice (blocktime is 6 seconds) in this case, the duration should be filled in as `1200`.
10: If all the fields are filled in, click `Propose`, now Farmers can vote. A proposal can be closed manually once there are enough votes AND the proposal is expired. To close go to extrinsics -> `dao` -> `close` -> fill in proposal hash and index (both can be found in chainstate).
For reference:
diff --git a/collections/faq/faq.md b/collections/faq/faq.md
index 8051352..7c76185 100644
--- a/collections/faq/faq.md
+++ b/collections/faq/faq.md
@@ -888,7 +888,7 @@ The ThreeFold Grid is basically agnostic when it comes to how you structure your
If you want to put all your storage and compute on one node and lose everything if it goes down, you can do so.
-If you want a highly distributed and fault tolerant system with high availability where data is never lost, you can also do so. You could build an architecture with single nodes running single workloads as the building blocks.
+If you want a highly distributed and fault tolerant system with high availability where data is never lost, you can also do so. You could build an architecture with single nodes running single workloads as the building slice.
Containerized micro service architectures running on e.g. Kubernetes are basically the way that compute is being "sharded" already in the mainstream of IT, especially at large scales. Such applications fit well on the ThreeFold Grid today, since they account for the possibility that individual nodes may fail. However, many applications aren't built this way and it takes work to adapt them.
diff --git a/collections/farmers/advanced_networking/network_setup.md b/collections/farmers/advanced_networking/network_setup.md
index 2d8ffac..7a729e2 100644
--- a/collections/farmers/advanced_networking/network_setup.md
+++ b/collections/farmers/advanced_networking/network_setup.md
@@ -48,7 +48,7 @@ But we need to stress the importance of IPv6 availability when you're running a
grid is boldly claiming to be a new Internet, we should make sure we adhere to the new protocols that are future-proof.
Hence: IPv6 is the base, and IPv4 is just there to accomodate the transition.
-Nowadays, RIPE can't even hand out consecutive /22 IPv4 blocks any more for new LIRs, so you'll be bound to market to
+Nowadays, RIPE can't even hand out consecutive /22 IPv4 slice any more for new LIRs, so you'll be bound to market to
get IPv4, mostly at rates of 10-15 Euro per IP. Things tend to get costly that way.
So anyway, IPv6 is not an afterthought in 0-OS, we're starting with it.
diff --git a/collections/farmers/advanced_networking/networking_overview.md b/collections/farmers/advanced_networking/networking_overview.md
index 8a9f68f..ec0cb15 100644
--- a/collections/farmers/advanced_networking/networking_overview.md
+++ b/collections/farmers/advanced_networking/networking_overview.md
@@ -22,7 +22,7 @@ In this section, we provide advanced networking tips for farms with public IPs a
For farmers who have public IPs, extra considerations are needed in setting up the network of the farm. We will go through the main considerations in this section.
-First, we must acknowledge that by the open-source and design of ThreeFold farming, a farm can range from a simple [single 3Node](3node_building.md) setup, to a multi-rack farm hosted in a typical data center, and everything in-between, from the farmer experiencing with public IP blocks, to the entrepreneur who builds their own data center at home.
+First, we must acknowledge that by the open-source and design of ThreeFold farming, a farm can range from a simple [single 3Node](3node_building.md) setup, to a multi-rack farm hosted in a typical data center, and everything in-between, from the farmer experiencing with public IP slice, to the entrepreneur who builds their own data center at home.
There are thus many types of farms and each will have varying configurations. The simplest way to set up a farm has been extensively discussed in the first steps of creating a farm. But what are the other more complex configurations possible? Let's go through some of those:
@@ -42,7 +42,7 @@ There are thus many types of farms and each will have varying configurations. Th
## Overall Requirements
-There are overall requirements for any 3Node farm using IP address blocks in a data centere or at home:
+There are overall requirements for any 3Node farm using IP address slice in a data centere or at home:
- There must be at least one interface that provide DHCP to each node
- Public IPs must be routable from at least one interface
diff --git a/collections/farming/certified/farming_certification_benefits_user.md b/collections/farming/certified/farming_certification_benefits_user.md
index 980d57c..73bbf09 100644
--- a/collections/farming/certified/farming_certification_benefits_user.md
+++ b/collections/farming/certified/farming_certification_benefits_user.md
@@ -44,7 +44,7 @@ The TF_Farmer has to promise to keep the farm operational till the end as specif
### TFGrid User Can Have Support
-All support inquiries will be handled through blocks of 15 minutes which are paid for in ThreeFold Support Tokens(TFTS).
+All support inquiries will be handled through slice of 15 minutes which are paid for in ThreeFold Support Tokens(TFTS).
Any TFGrid user can ask for support but only for certified farms.
diff --git a/collections/projectinca/.done b/collections/projectinca/.done
index 25fa2e9..5ea2ccf 100644
--- a/collections/projectinca/.done
+++ b/collections/projectinca/.done
@@ -2,3 +2,4 @@ intro.png
p2ppromotion.png
theplan.png
remuneration.png
+currency_of_future.png
diff --git a/collections/projectinca/collab/.done b/collections/projectinca/collab/.done
new file mode 100644
index 0000000..a8c0696
--- /dev/null
+++ b/collections/projectinca/collab/.done
@@ -0,0 +1 @@
+remuneration.png
diff --git a/collections/projectinca/collab.md b/collections/projectinca/collab/collab.md
similarity index 100%
rename from collections/projectinca/collab.md
rename to collections/projectinca/collab/collab.md
diff --git a/collections/projectinca/remuneration.md b/collections/projectinca/collab/remuneration.md
similarity index 100%
rename from collections/projectinca/remuneration.md
rename to collections/projectinca/collab/remuneration.md
diff --git a/collections/projectinca/remuneration.png b/collections/projectinca/collab/remuneration.png
similarity index 100%
rename from collections/projectinca/remuneration.png
rename to collections/projectinca/collab/remuneration.png
diff --git a/collections/projectinca/teams.md b/collections/projectinca/collab/teams.md
similarity index 100%
rename from collections/projectinca/teams.md
rename to collections/projectinca/collab/teams.md
diff --git a/collections/projectinca/currency_of_future.png b/collections/projectinca/currency_of_future.png
new file mode 100644
index 0000000..1b13cc0
Binary files /dev/null and b/collections/projectinca/currency_of_future.png differ
diff --git a/collections/projectinca/farming/inca_farming.md b/collections/projectinca/farming/inca_farming.md
index 2cf3458..4d97033 100644
--- a/collections/projectinca/farming/inca_farming.md
+++ b/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 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)
+- $0.1-10 for AISlice Capacity (GPU Nodes with lots of memory, cpu for AI workloads) (per hour)
+- $0.005-4 for CloudSlice 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 Block Capacity (VM, Containers, Kubernetes, ...) (per hour)
+- $0.005-4 for CloudSlice 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.
diff --git a/collections/projectinca/farming/inca_farming_reward.md b/collections/projectinca/farming/inca_farming_reward.md
index f2bc1ac..6ac9371 100644
--- a/collections/projectinca/farming/inca_farming_reward.md
+++ b/collections/projectinca/farming/inca_farming_reward.md
@@ -1,5 +1,5 @@
# Farming Reward Calculation
-We have created a [simulation sheet](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100) which allows you to estimate farming rewards based on utilization.
+We have created a [simulation sheet](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit) which allows you to estimate farming rewards based on utilization.
> Note: There are other rewards in relation to uptime, performance and location. Your reward might be much higher compared to utilization only.
\ No newline at end of file
diff --git a/collections/projectinca/farming/inca_node_ai/.done b/collections/projectinca/farming/inca_node_ai/.done
new file mode 100644
index 0000000..5064a37
--- /dev/null
+++ b/collections/projectinca/farming/inca_node_ai/.done
@@ -0,0 +1,2 @@
+node_ai_1.png
+node_ai_2.png
diff --git a/collections/projectinca/farming/inca_node_ai/inca_node_ai.md b/collections/projectinca/farming/inca_node_ai/inca_node_ai.md
new file mode 100644
index 0000000..f86fe51
--- /dev/null
+++ b/collections/projectinca/farming/inca_node_ai/inca_node_ai.md
@@ -0,0 +1,30 @@
+
+| | |
+|--------------------------|--------------------------|
+| ![alt text](node_ai_1.png) | ![alt text](node_ai_2.png) |
+
+# INCA Node AI
+
+* <200 watt avg out
+* 16 Cores Up to 4.5GHz
+* 64GB RAM,
+* 4 TB SSD (2x 2 TB)
+* 2 x gbit network cards + 1 wireless
+* 1-2x GeForce RTX 4090
+* liquid cooling for cpu/gpu
+* low noise design
+
+Focus on
+
+* AI workloads
+
+Pricing
+
+* +-4000 EUR
+* Pricing without transport & tax (starts from Dubai)
+
+
+
+
+
+
\ No newline at end of file
diff --git a/collections/projectinca/farming/inca_node_ai/node_ai_1.png b/collections/projectinca/farming/inca_node_ai/node_ai_1.png
new file mode 100644
index 0000000..a0ba955
Binary files /dev/null and b/collections/projectinca/farming/inca_node_ai/node_ai_1.png differ
diff --git a/collections/projectinca/farming/inca_node_ai/node_ai_2.png b/collections/projectinca/farming/inca_node_ai/node_ai_2.png
new file mode 100644
index 0000000..8398304
Binary files /dev/null and b/collections/projectinca/farming/inca_node_ai/node_ai_2.png differ
diff --git a/collections/projectinca/farming/inca_node_platinum/inca_node_platinum.md b/collections/projectinca/farming/inca_node_platinum/inca_node_platinum.md
new file mode 100644
index 0000000..772b086
--- /dev/null
+++ b/collections/projectinca/farming/inca_node_platinum/inca_node_platinum.md
@@ -0,0 +1,30 @@
+
+
+![](bl_7840c.png)
+
+# INCA Node Platinum
+
+* <100 watt avg out
+* 24 Cores
+* 64GB RAM,
+* 2 TB SSD (2x 1 TB)
+* 10 TB HDD
+* 2 x gbit network cards + 1 wireless
+* low noise design
+
+Focus on
+
+* Hero Workloads & generic purpose cloud
+
+Pricing
+
+* +-2000 EUR
+* Pricing without transport & tax (starts from Dubai)
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/collections/projectinca/farming/inca_node_silver/.done b/collections/projectinca/farming/inca_node_silver/.done
new file mode 100644
index 0000000..0e4a209
--- /dev/null
+++ b/collections/projectinca/farming/inca_node_silver/.done
@@ -0,0 +1,4 @@
+inca_node_silver_0.png
+inca_node_silver_1.png
+inca_node_silver_3.png
+inca_node_silver_4.png
diff --git a/collections/projectinca/farming/inca_node_silver/inca_node_silver.md b/collections/projectinca/farming/inca_node_silver/inca_node_silver.md
new file mode 100644
index 0000000..afe2402
--- /dev/null
+++ b/collections/projectinca/farming/inca_node_silver/inca_node_silver.md
@@ -0,0 +1,37 @@
+![alt text](inca_node_silver_2.png)
+
+
+# INCA Node Silver
+
+* <20-25 watt
+* 4 Cores Up to 3.4GHz
+* 16GB RAM,
+* 1 TB SSD (2x 0.5 TB)
+* 2 x gbit network cards + 1 wireless
+* UPS (optional)
+* WIFI router (optional)
+* Nice programmable LCD we can use for e.g. power usage, bandwidth, farming capacity, …
+
+Focus on
+
+* end user utilization: The Unbreakable Internet
+
+* Content Delivery + Names
+
+Pricing
+
+* +-400 EUR without wireless and UPS, 2x 500GB SSD
+* +-500 EUR with wireless & UPS of + 1h, 2x 500GB SSD
+* +150 EUR for 2x 1TB SSD (reward need to reflect that people want this)
+* Pricing without transport & tax (starts from Dubai)
+
+This will be the first node as accepted on TFGrid 4.0
+
+![image alt text](inca_node_silver_0.png)
+
+![alt text](inca_node_silver_3.png)
+
+![alt text](inca_node_silver_4.png)
+
+![image alt text](inca_node_silver_1.png)
+
diff --git a/collections/projectinca/farming/inca_node_silver/inca_node_silver_0.png b/collections/projectinca/farming/inca_node_silver/inca_node_silver_0.png
new file mode 100644
index 0000000..be2c9ad
Binary files /dev/null and b/collections/projectinca/farming/inca_node_silver/inca_node_silver_0.png differ
diff --git a/collections/projectinca/farming/inca_node_silver/inca_node_silver_1.png b/collections/projectinca/farming/inca_node_silver/inca_node_silver_1.png
new file mode 100644
index 0000000..664389e
Binary files /dev/null and b/collections/projectinca/farming/inca_node_silver/inca_node_silver_1.png differ
diff --git a/collections/projectinca/farming/inca_node_silver/inca_node_silver_2.png b/collections/projectinca/farming/inca_node_silver/inca_node_silver_2.png
new file mode 100644
index 0000000..113fbc6
Binary files /dev/null and b/collections/projectinca/farming/inca_node_silver/inca_node_silver_2.png differ
diff --git a/collections/projectinca/farming/inca_node_silver/inca_node_silver_3.png b/collections/projectinca/farming/inca_node_silver/inca_node_silver_3.png
new file mode 100644
index 0000000..9251941
Binary files /dev/null and b/collections/projectinca/farming/inca_node_silver/inca_node_silver_3.png differ
diff --git a/collections/projectinca/farming/inca_node_silver/inca_node_silver_4.png b/collections/projectinca/farming/inca_node_silver/inca_node_silver_4.png
new file mode 100644
index 0000000..0b824a0
Binary files /dev/null and b/collections/projectinca/farming/inca_node_silver/inca_node_silver_4.png differ
diff --git a/collections/projectinca/farming/inca_nodes.md b/collections/projectinca/farming/inca_nodes.md
index 7121ac7..2a43ec7 100644
--- a/collections/projectinca/farming/inca_nodes.md
+++ b/collections/projectinca/farming/inca_nodes.md
@@ -3,20 +3,19 @@
### INCA Node Silver
-![](img/smallest_3node.png)
+![alt text](inca_node_silver_2.png)
-- 16 GB Memory
-- 512 GB SSD
-- min 4 logical CPU cores
+Almost ready to go
+
+> see [INCA Node Silver](inca_node_silver.md)
-It will cost less than 500 USD.
### INCA Node Gold
![](img/bl_silver.png)
- 32 GB Memory
-- 1000 GB SSD
+- 2000 GB SSD
- min 8 logical CPU cores
@@ -28,11 +27,25 @@ It will cost less than 1000 USD.
- 64 GB Memory
- 2000 GB SSD
-- 4000 GB HDD
+- 10000 GB HDD
- min 16 logical CPU cores
-It will cost less than 1800 USD.
+It will cost less than 2000 USD.
+
+### INCA Node AI
+
+| | |
+|--------------------------|--------------------------|
+| ![alt text](node_ai_1.png) | ![alt text](node_ai_2.png) |
+
+
+- 64 GB Memory
+- 4000 GB SSD
+- 10000 GB HDD
+- RTX 4900 GPU (1 or 2)
+
+
### INCA Node Datacenter
diff --git a/collections/projectinca/funding.md b/collections/projectinca/funding.md
index c6108d5..9d0a9d8 100644
--- a/collections/projectinca/funding.md
+++ b/collections/projectinca/funding.md
@@ -1,14 +1,12 @@
![](p2ppromotion.png)
+# Funding Through Project Mycelium and/or OurWorld
+
+Our partner projects are fundraising and do need a lot of capacity, they are planning to buy a lot of TFT/INCA.
+
# Funding INCA-G
Funding INCA-G needs to be explored further. Selling INCA-G NFT tokens through entities such as SwissBorg might be a good option.
-# Funding Through Project Mycelium (HERO)
-There will be a new project called Project Mycelium. This project will be focused on the Hero AI assistant and tool. This will run on multiple clouds and we will also publish our own cloud versions.
-
-The first narrative version can be found [in this doc](https://docs.google.com/document/d/1H24yGqXi3pX9xljTviFPS9tI4hX1r6cSB3hBa0BTtCI). This project aims to fundraise +40m EUR and will also buy TFT. See the section about deploying 100,000 HERO's to have an overview of the demand for grid resources this project would generate.
-
-Project Mycelium will actively buy TFT and a lot of TFT will be needed to run and expand the Project Mycelium.
\ No newline at end of file
diff --git a/collections/projectinca/grants/grants_tft.md b/collections/projectinca/grants/grants_tft.md
index e6396c1..4461b36 100644
--- a/collections/projectinca/grants/grants_tft.md
+++ b/collections/projectinca/grants/grants_tft.md
@@ -18,9 +18,9 @@ option = {
type: 'pie',
radius: '70%',
data: [
- { value: 10, name: 'Deploy AI Blocks' },
- { value: 15, name: 'Deploy Cloud Blocks' },
- { value: 5, name: 'Deploy Storage Blocks' },
+ { value: 10, name: 'Deploy AISlices' },
+ { value: 15, name: 'Deploy CloudSlices' },
+ { value: 5, name: 'Deploy StorageSlices' },
{ value: 5, name: 'Code INCA Marketplace' },
{ value: 20, name: 'Contributor Rewards' },
{ value: 5, name: 'Chapter Tanzania' },
@@ -56,9 +56,9 @@ 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
+- [Deploy AISlices](projectinca/grant_aislice.md) : 10m TFT
+- [Deploy CloudSlices](projectinca/grant_cloudslice.md) : 15m TFT
+- [Deploy StorageSlices](projectinca/grant_storageslice.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
diff --git a/collections/projectinca/grants/tf3/grant_aiblock.md b/collections/projectinca/grants/tf3/grant_aiblock.md
index e82b3fa..d7a5d24 100644
--- a/collections/projectinca/grants/tf3/grant_aiblock.md
+++ b/collections/projectinca/grants/tf3/grant_aiblock.md
@@ -1,6 +1,6 @@
-# AI Blocks Grants
+# AISlices Grants
-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 aim is to reward the creation of capacity for 1,000 AISlices, each available AISlice 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 Blocks](tfgrid4:aiblock.md) available
+- hoster provisions and makes [Ai slice](tfgrid4:aislice.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:cloudblock'
\ No newline at end of file
+!!wiki.include page:'tfgrid4:cloudslice'
\ No newline at end of file
diff --git a/collections/projectinca/grants/tf3/grant_cloudblock.md b/collections/projectinca/grants/tf3/grant_cloudblock.md
index 82f78eb..4314570 100644
--- a/collections/projectinca/grants/tf3/grant_cloudblock.md
+++ b/collections/projectinca/grants/tf3/grant_cloudblock.md
@@ -1,6 +1,6 @@
-# Cloud Blocks Grants
+# CloudSlices Grants
-The aim is to reward the creation of capacity for 100,000 Storage Blocks, each available cloudblock is rewarded as in the table below.
+The aim is to reward the creation of capacity for 100,000 StorageSlices, each available cloudslice 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 Blocks, each a
- company info which manages the servers
- Hosting agreement signed with TF DMCC
- Utilization of INCA Marketplace
-- hoster provisions and makes [Storage Blocks](tfgrid4:Cloud Block.md) available
+- hoster provisions and makes [StorageSlices](tfgrid4:CloudSlice.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:cloudblock'
\ No newline at end of file
+!!wiki.include page:'tfgrid4:cloudslice'
\ No newline at end of file
diff --git a/collections/projectinca/grants/tf3/grant_storageblock.md b/collections/projectinca/grants/tf3/grant_storageblock.md
index 0a5b229..b18f056 100644
--- a/collections/projectinca/grants/tf3/grant_storageblock.md
+++ b/collections/projectinca/grants/tf3/grant_storageblock.md
@@ -1,6 +1,6 @@
-# Storage Blocks Grant
+# StorageSlices Grant
-The aim is to reward the creation of capacity for 100,000 Storage Blocks, each available storageblock is rewarded as in the table below.
+The aim is to reward the creation of capacity for 100,000 StorageSlices, each available storageslice 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 Blocks, each a
- company info which manages the servers
- Hosting agreement signed with TF DMCC
- Utilization of INCA Marketplace
- - hoster provisions and makes [StorageBlocks](tfgrid4:storageblock.md) available
+ - hoster provisions and makes [StorageSlices](tfgrid4:storageslice.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:storageblock'
\ No newline at end of file
+!!wiki.include page:'tfgrid4:storageslice'
\ No newline at end of file
diff --git a/collections/projectinca/grants/tf3/marketplace_grant.md b/collections/projectinca/grants/tf3/marketplace_grant.md
index a4e3537..0402f48 100644
--- a/collections/projectinca/grants/tf3/marketplace_grant.md
+++ b/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
-- [CloudBlocks](tfgrid4:cloudblock.md)
-- [StorageBlocks](tfgrid4:storageblock.md)
+- [CloudSlices](tfgrid4:cloudslice.md)
+- [StorageSlices](tfgrid4:storageslice.md)
But many more services will be added.
diff --git a/collections/projectinca/grants/tf3/marketplace_requirements.md b/collections/projectinca/grants/tf3/marketplace_requirements.md
index bbd3d76..36dd7af 100644
--- a/collections/projectinca/grants/tf3/marketplace_requirements.md
+++ b/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 Blocks
+- The marketplace needs to run a monitoring stack to independently verify the SLA of the cloud and StorageSlices
- The UI needs to be made in Reflex or Flet and be opensource
-- 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
+- Customers need to see their deployed CloudSlices or StorageSlices
+- Customers can cancel their workloads: CloudSlices or StorageSlices
+- Customers can see monitoring info of their workloads: CloudSlices or StorageSlices
diff --git a/collections/projectinca/intro.md b/collections/projectinca/intro.md
index 06c152d..5452a0a 100644
--- a/collections/projectinca/intro.md
+++ b/collections/projectinca/intro.md
@@ -1,15 +1,17 @@
-> CONFIDENTIAL INFORMATION
-![alt text](intro.png)
+# Compute is currency of future
-# ThreeFold DePIN Launch: Project INCA
+![alt text](currency_of_future.png)
-## A New Phase for ThreeFold
+
+## ThreeFold DePIN Launch: Project INCA
Welcome to the Project INCA by ThreeFold.
With the project INCA, we want to create a decentralized future for ThreeFold by means of a launch in the DePIN ecosystem on top of Solana.
+*Please do note the name INCA will prob still change.*
+
## Contributing to DePIN community
The current marketcap of the project is under 40 million USD, while other DePIN projects have marketcaps of 1 billion USD and more.
@@ -18,6 +20,11 @@ We believe that ThreeFold is ready and has rock solid technology to offer to the
ThreeFold now has the necessary support from a lot of parties. We are entering a new exciting phase: Project INCA.
+
## Learn More
-Read this ebook to learn more about the project and how you can participate to this phase.
\ No newline at end of file
+Read this ebook to learn more about the project and how you can participate to this phase.
+
+> CONFIDENTIAL INFORMATION
+
+
diff --git a/collections/projectinca/marketplace/marketplace.md b/collections/projectinca/marketplace/marketplace.md
index d0e242b..84a6496 100644
--- a/collections/projectinca/marketplace/marketplace.md
+++ b/collections/projectinca/marketplace/marketplace.md
@@ -15,14 +15,14 @@ We have reached a sizeable grid and want to promote commercialization.
- Easier to track utilization and expansion
- Can and will be extended to other Internet/cloud Services
-## More info about our cloud & storage blocks
+## More info about our cloud & storage slice
-Read the next sections for more information on the block concept.
+Read the next sections for more information on the slices concept.
!!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)
\ No newline at end of file
+- [Development CloudSlices](projectinca:grant_cloudslice.md)
+- [Development StorageSlices](projectinca:grant_storageslice.md)
+- [Development AISlices](projectinca:grant_aislice.md)
\ No newline at end of file
diff --git a/collections/projectinca/marketplace/marketplace_pricing.md b/collections/projectinca/marketplace/marketplace_pricing.md
index bcc313a..ed9b9f0 100644
--- a/collections/projectinca/marketplace/marketplace_pricing.md
+++ b/collections/projectinca/marketplace/marketplace_pricing.md
@@ -11,6 +11,6 @@
To see average prices you can look at [cloudorado](https://www.cloudorado.com/)
-
+> see [this spreadsheet](https://docs.google.com/spreadsheets/d/1E6MpGs15h1_flyT5AtyKp1TixH1ILuGo5tzHdmjeYdQ/edit#gid=1821201540)
diff --git a/collections/projectinca/marketplace/marketplace_pricing0.md b/collections/projectinca/marketplace/marketplace_pricing0.md
index 611eb43..d8764a4 100644
--- a/collections/projectinca/marketplace/marketplace_pricing0.md
+++ b/collections/projectinca/marketplace/marketplace_pricing0.md
@@ -4,5 +4,5 @@ Each farmer can decide on their own price but between the min and max as specifi
![](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, etc.
+As a consumer you have the capability to look for the slice which are of interest to you in relation to its properties like SLA, location, price, reputation, etc.
diff --git a/collections/projectinca/plan/tfgrid4.md b/collections/projectinca/plan/tfgrid4.md
index 4d956af..66838b0 100644
--- a/collections/projectinca/plan/tfgrid4.md
+++ b/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 [CloudBlocks](tfgrid4:cloudblock.md) & [StorageBlocks](tfgrid4:storageblock.md)
+- Simplified concept of [CloudSlices](tfgrid4:cloudslice.md) & [StorageSlices](tfgrid4:storageslice.md)
- SLA management
- More strict enforcement about suportability from a farming perspective
- All farmers can set their pricing
diff --git a/collections/projectinca/project_info.md b/collections/projectinca/project_info.md
index 1ce8f47..1fd9dc3 100644
--- a/collections/projectinca/project_info.md
+++ b/collections/projectinca/project_info.md
@@ -1,5 +1,8 @@
-![alt text](theplan.png)
+![alt text](plan/theplan.png)
# Project INCA
-In this section, we provide general information on the Project INCA.
\ No newline at end of file
+In this section, we provide general information on the Project INCA.
+
+> Please do note the name will prob still change.
+
diff --git a/collections/projectinca/stories/tfconnect.md b/collections/projectinca/stories/inca_app.md
similarity index 57%
rename from collections/projectinca/stories/tfconnect.md
rename to collections/projectinca/stories/inca_app.md
index 529e074..6258f5c 100644
--- a/collections/projectinca/stories/tfconnect.md
+++ b/collections/projectinca/stories/inca_app.md
@@ -2,14 +2,20 @@
A new version of TFConnect
-- Civic identification
-- SSO for websites (like we did with previous version, but now based on Solana Account)
-- Support for more than 1 Solana Account, can switch accounts
-- Referral support, see who invited, see who installed, see reward...
+- Civic identification or other form of auithentication
+- KYC
- Support Stellar to Solana Swap (one way bridge)
-- Buy 3Node (through NFT), see the 3Node NFT's owned
- Sign T&C when starting
+
+# INCA APP 3.14 Specs
+
+Name to be changed
+
+- Support for more than 1 Solana/Stellar Account, can switch accounts
+- Referral support, see who invited, see who installed, see reward...
+- Buy 3Node (through NFT), see the 3Node NFT's owned
+
## Technical Remarks
- Flutter based
diff --git a/collections/projectinca/stories/stories.md b/collections/projectinca/stories/stories.md
new file mode 100644
index 0000000..1340f8b
--- /dev/null
+++ b/collections/projectinca/stories/stories.md
@@ -0,0 +1,7 @@
+# Stories
+
+- [circle issues](https://git.ourworld.tf/tfgrid/circle_projectinca/issues)
+- [kanban view](https://git.ourworld.tf/tfgrid/-/projects/68)
+
+> TODO: we need to udpate our issues and track our work
+
diff --git a/collections/projectinca/tokens/img/release_schedule.png b/collections/projectinca/tokens/img/release_schedule.png
deleted file mode 100644
index e808f07..0000000
Binary files a/collections/projectinca/tokens/img/release_schedule.png and /dev/null differ
diff --git a/collections/projectinca/tokens/img/release_schedule2.png b/collections/projectinca/tokens/img/release_schedule2.png
deleted file mode 100644
index a79d8ef..0000000
Binary files a/collections/projectinca/tokens/img/release_schedule2.png and /dev/null differ
diff --git a/collections/projectinca/tokens/img/tokens_release.png b/collections/projectinca/tokens/img/tokens_release.png
new file mode 100644
index 0000000..c3b5c57
Binary files /dev/null and b/collections/projectinca/tokens/img/tokens_release.png differ
diff --git a/collections/projectinca/tokens/inca.md b/collections/projectinca/tokens/inca.md
index 0eb7330..cef8853 100644
--- a/collections/projectinca/tokens/inca.md
+++ b/collections/projectinca/tokens/inca.md
@@ -5,12 +5,12 @@ There can never be more than 4 Billion INCA.
- 50% of supply for Farming
- People expanding the network with Router & Node capacity over the multiple releases
-- 16.5% Million for community grants
+- 14% 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
+- 1.5% Million for community expansion specifically for INCA
- Promotion of the TFGrid
-- 3.3% For liquidity providing (DEX, marketmakers, ...)
-- 11.5% for the technology creators
+- 5.5% 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)
@@ -34,10 +34,10 @@ option = {
radius: '70%',
data: [
{ value: 2000, name: 'Farming Rewards' },
- { value: 130, name: 'Liquidity' },
- { value: 660, name: 'Community Grants' },
+ { value: 229, name: 'Liquidity' },
+ { value: 560, name: 'Community Grants' },
{ value: 460, name: 'Original Technology Acquisition' },
- { value: 50, name: 'Community Expansion' },
+ { value: 60, name: 'Community Expansion' },
{ value: 700, name: 'Team' },
],
emphasis: {
@@ -54,17 +54,14 @@ option = {
## Release Schedule
-
-![](img/release_schedule2.png)
-
-
-
-![](img/release_schedule.png)
-
+![alt text](img/tokens_release.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 USD 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](tft.md).
\ No newline at end of file
+For more information about our gen3 token see [here](tft.md).
+
+
+
\ No newline at end of file
diff --git a/collections/projectinca/tokens/tokens.md b/collections/projectinca/tokens/tokens.md
index 3d5c15f..70e08b8 100644
--- a/collections/projectinca/tokens/tokens.md
+++ b/collections/projectinca/tokens/tokens.md
@@ -9,7 +9,7 @@ The INCA token is the result of our 4 generations of product releases.
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, ...)
+- +70% of all tokens over both generation net's is for the community (farming, grants, liquidity providing ...)
- 11.5% was for the original technology acquisition
- 17.5% is for the team and contributors
diff --git a/collections/projectmycelium/.done b/collections/projectmycelium/.done
deleted file mode 100644
index ba901b9..0000000
--- a/collections/projectmycelium/.done
+++ /dev/null
@@ -1 +0,0 @@
-myceliumproject.png
diff --git a/collections/projectmycelium/SUMMARY.md b/collections/projectmycelium/SUMMARY.md
deleted file mode 120000
index 637d6a1..0000000
--- a/collections/projectmycelium/SUMMARY.md
+++ /dev/null
@@ -1 +0,0 @@
-../../books/projectmycelium/SUMMARY.md
\ No newline at end of file
diff --git a/collections/projectmycelium/appendix.md b/collections/projectmycelium/appendix.md
deleted file mode 100644
index 0b87edd..0000000
--- a/collections/projectmycelium/appendix.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Link with ThreeFold Cloud
-
-Next to the capacity as provided by our Hero Hosts we also want to partner with other decentralized cloud providers.
-
-ThreeFold is one of the Decentralized Clouds we will be using to deploy HERO's on (see www.threefold.io)
-
-This section gives some more information about the ThreeFold Grid.
-
-
-> Note: the technology we use to allow us to become a host is from ThreeFold
\ No newline at end of file
diff --git a/collections/projectmycelium/ecosystem/participants_todo.md b/collections/projectmycelium/ecosystem/participants_todo.md
deleted file mode 100644
index fbe1117..0000000
--- a/collections/projectmycelium/ecosystem/participants_todo.md
+++ /dev/null
@@ -1 +0,0 @@
-> TODO
\ No newline at end of file
diff --git a/collections/projectmycelium/ecosystem/threefoldcloud.md b/collections/projectmycelium/ecosystem/threefoldcloud.md
deleted file mode 100644
index 30cd368..0000000
--- a/collections/projectmycelium/ecosystem/threefoldcloud.md
+++ /dev/null
@@ -1,4 +0,0 @@
- # ThreeFold Cloud
-
-
- > see [Technology](https://info.ourworld.tf/tech)
\ No newline at end of file
diff --git a/collections/projectmycelium/farming/farming.md b/collections/projectmycelium/farming/farming.md
deleted file mode 100644
index 3ec9427..0000000
--- a/collections/projectmycelium/farming/farming.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Become a Hero Host
-
-You can become a Hero host by deploying Mycelium nodes and/or routers.
-
-- As a host, you connect the router(s) and/or node(s) to internet and get rewards for providing compute, AI and network capacity. By doing this, you are helping your community to provide capacity to the network.
-
-## Income for the Hosts
-
-Our aim is to have millions of routers and nodes in the field. Via our Network Map, we will map where cells displaying information on the the necessity to deploy more routers and/or nodes.
-
-The cells will show urgency via its colorzied code.
-
-- Green (enough nodes, no rewards)
-- Yellow (can use some extra nodes)
-- Red (let's do it, this region needs help)
-
-For red cells the reward is the highest.
-
-## A Whole Ecosystem
-
-We are also hosting on other networks like ThreeFold which is using the same underlying tech. This means that the ThreeFold Grid and the Mycelium network can co-exist and build on each other.
-
-## How to Become a Host
-
-Becoming a Mycelium host is highly accessible.
-
-- Buy a *NODE (Compute/Storage node) or a *ROUTER (Mycelium Network Node).
-- Connect it to the Internet
-- Become part of a Hosting Pool
-
-## Hosting Rewards
-
-Typically a host can earn the investment of their node back 2 to 5 times over 5 years if successful. This is not a financial advice and we recommend anyone to do their own research before proceeding in any project of the sort.
-
-## Hosting Pool
-
-A Hosting pool takes care of many things.
-
-- Marketing the capacity and capabilities
-- Giving support to the userbase (developers)
-- Managing the best possible pricing
-- Monitor all nodes, routers and optimize uptime
-- Monitor available bandwidth and make optimizations where possible.
-
-If a host uses a Hosting Pool, they will have to give a part of their reward to the hosting pool. Each hosting pool can decide how much that needs to be and hosts will be invited to select the hosting pool that most fits their needs.
-
diff --git a/collections/projectmycelium/farming/img/.done b/collections/projectmycelium/farming/img/.done
deleted file mode 100644
index dd6dd05..0000000
--- a/collections/projectmycelium/farming/img/.done
+++ /dev/null
@@ -1,13 +0,0 @@
-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/projectmycelium/farming/img/bl_7840.png b/collections/projectmycelium/farming/img/bl_7840.png
deleted file mode 100644
index e74766a..0000000
Binary files a/collections/projectmycelium/farming/img/bl_7840.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/bl_7840b.png b/collections/projectmycelium/farming/img/bl_7840b.png
deleted file mode 100644
index 97a4044..0000000
Binary files a/collections/projectmycelium/farming/img/bl_7840b.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/bl_7840c.png b/collections/projectmycelium/farming/img/bl_7840c.png
deleted file mode 100644
index 409f395..0000000
Binary files a/collections/projectmycelium/farming/img/bl_7840c.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/bl_silver.png b/collections/projectmycelium/farming/img/bl_silver.png
deleted file mode 100644
index 25fecf4..0000000
Binary files a/collections/projectmycelium/farming/img/bl_silver.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/loran.png b/collections/projectmycelium/farming/img/loran.png
deleted file mode 100644
index 6c8fcc1..0000000
Binary files a/collections/projectmycelium/farming/img/loran.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/networkmap.png b/collections/projectmycelium/farming/img/networkmap.png
deleted file mode 100644
index 3d3e314..0000000
Binary files a/collections/projectmycelium/farming/img/networkmap.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/smallest_3node.png b/collections/projectmycelium/farming/img/smallest_3node.png
deleted file mode 100644
index bb506b5..0000000
Binary files a/collections/projectmycelium/farming/img/smallest_3node.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/tfrouter.png b/collections/projectmycelium/farming/img/tfrouter.png
deleted file mode 100644
index 783b8c6..0000000
Binary files a/collections/projectmycelium/farming/img/tfrouter.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/tfrouter_2.png b/collections/projectmycelium/farming/img/tfrouter_2.png
deleted file mode 100644
index b305b50..0000000
Binary files a/collections/projectmycelium/farming/img/tfrouter_2.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/tfrouter_2b.png b/collections/projectmycelium/farming/img/tfrouter_2b.png
deleted file mode 100644
index 7fc9676..0000000
Binary files a/collections/projectmycelium/farming/img/tfrouter_2b.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/tfrouter_lr.png b/collections/projectmycelium/farming/img/tfrouter_lr.png
deleted file mode 100644
index 29c42c3..0000000
Binary files a/collections/projectmycelium/farming/img/tfrouter_lr.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/img/tfrouter_physical.png b/collections/projectmycelium/farming/img/tfrouter_physical.png
deleted file mode 100644
index bf1059c..0000000
Binary files a/collections/projectmycelium/farming/img/tfrouter_physical.png and /dev/null differ
diff --git a/collections/projectmycelium/farming/mycelium_nodes.md b/collections/projectmycelium/farming/mycelium_nodes.md
deleted file mode 100644
index 9163bb0..0000000
--- a/collections/projectmycelium/farming/mycelium_nodes.md
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# Myclium Nodes
-
-## Silver
-
-![](img/smallest_3node.png)
-
-- 16 GB Memory
-- 512 GB SSD
-- min 4 logical CPU cores
-
-It will cost less than 500 USD.
-
-## Gold
-
-![](img/bl_silver.png)
-
-- 32 GB Memory
-- 1000 GB SSD
-- min 8 logical CPU cores
-
-It will cost less than 1000 USD.
-
-## Platinum
-
-![](img/bl_7840c.png)
-
-- 64 GB Memory
-- 2000 GB SSD
-- 4000 GB HDD
-- min 16 logical CPU cores
-
-It will cost less than 1800 USD.
-
-## 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/projectmycelium/farming/mycelium_routers.md b/collections/projectmycelium/farming/mycelium_routers.md
deleted file mode 100644
index ffc4dd3..0000000
--- a/collections/projectmycelium/farming/mycelium_routers.md
+++ /dev/null
@@ -1,46 +0,0 @@
-
-## Mycelium Routers
-
-The Mycelium Routers allow everyone to connect the users of our network with each other.
-
-### Mycelium 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 Mycelium 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 one node can be installed in a larger office, hotel, home, etc., and they will automatically mesh together.
-
-![](tfrouter_physical.png)
-
-
-### Mycelium Router Edge
-
-The Mycelium 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, etc.).
-
-Mycelium ensures that the shortest and fastest path is always used, and all communication is end-to-end encrypted between an Mycelium Router or even your mobile or computer if you have the Mycelium agent installed.
-
-![](img/TFRouter_2.png)
-
-This Router is super fast and has lots of connectivity.
-
-![](img/TFRouter_2b.png)
-
-> This Router can be bought right now.
-
-### Mycelium 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.
-
-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?
-
-![](img/TFRouter_lr.png)
-
-> 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
-
-![](img/loran.png)
diff --git a/collections/projectmycelium/farming/networkmap.md b/collections/projectmycelium/farming/networkmap.md
deleted file mode 100644
index f3a927b..0000000
--- a/collections/projectmycelium/farming/networkmap.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# network map
-
-![](img/networkmap.png)
-
-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/projectmycelium/governance.md b/collections/projectmycelium/governance.md
deleted file mode 100644
index 4ebc9ff..0000000
--- a/collections/projectmycelium/governance.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Governance
-
-This section provides the essential information concerning the Project Mycelium governance.
\ No newline at end of file
diff --git a/collections/projectmycelium/img/.done b/collections/projectmycelium/img/.done
deleted file mode 100644
index a6269dd..0000000
--- a/collections/projectmycelium/img/.done
+++ /dev/null
@@ -1 +0,0 @@
-solana.png
diff --git a/collections/projectmycelium/img/solana.png b/collections/projectmycelium/img/solana.png
deleted file mode 100644
index 27cb2ad..0000000
Binary files a/collections/projectmycelium/img/solana.png and /dev/null differ
diff --git a/collections/projectmycelium/inca.md b/collections/projectmycelium/inca.md
deleted file mode 100644
index e812632..0000000
--- a/collections/projectmycelium/inca.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# INCA
-
-## INCA Tokens
-
-- 4 billion INCA on Solana (INCA = INternet CApacity)
-- 1 INCA can be bought with 3 TFT or other digital currencies on the INCA DEX.
-- the other 1 billion INCA will be used for airdrops which are managed by a strict [governance process](governance.md).
-
-## INCA Fair Launch (1 month, starting April 10)
-
-- INCA will be released as a fair launch at April 10.
-- During the first month, each existing TFT Farmer can buy INCA.
-- Each Farmer will be verified by Civic (which is a nice identity management system also on Solana) and TFChain (the ThreeFold Blockchain).
-- For the fair launch, these INCA can only be bought using TFT.
-- Each TFT used to buy an INCA will get burned.
-- The Fair Launch buyers have a lock up of 3 months before they can sell their INCA.
-
-## INCA Swiss Launch through Swissborg
-
-> complete
-
-## INCA Public Launch
-
-Use INCA Dex to start with.
-
-> TODO: what could be the right way how to do this, or should we just leave it open?
-
diff --git a/collections/projectmycelium/intro.md b/collections/projectmycelium/intro.md
deleted file mode 100644
index dbe82cf..0000000
--- a/collections/projectmycelium/intro.md
+++ /dev/null
@@ -1,15 +0,0 @@
-![](myceliumproject.png)
-
-# Project Mycelium
-
-The Project Mycelium aims at building a conscious collective intelligence by enabling everyone to become the center of their own digital world.
-
-We want to redefine how to create and deploy on the Internet by means of a personal intelligent digital alter ego which allows us to create a collective intelligence.
-
-This project will supercharge our digital life, where we all have the opportunity to learn, partake and succeed with unlimited access to all digital tools required.
-
-## Why
-
-There is an urgent need for a cloud and AI infrastructure upgrade.
-
-We need local infrastructure that ensures data locality and security. We need to have complete control over our own data. This data also needs to be close to us and unbreakable. There is a need to decentralize the data. Our system allows to disperse the data and workloads to avoid centralization and increase security. We need further security in the IT world. Our project proposes multi-layered security architectures to keep communication, data and compute safe.
\ No newline at end of file
diff --git a/collections/projectmycelium/myceliumproject.png b/collections/projectmycelium/myceliumproject.png
deleted file mode 100644
index dec145a..0000000
Binary files a/collections/projectmycelium/myceliumproject.png and /dev/null differ
diff --git a/collections/projectmycelium/next_phase.md b/collections/projectmycelium/next_phase.md
deleted file mode 100644
index c2f2700..0000000
--- a/collections/projectmycelium/next_phase.md
+++ /dev/null
@@ -1,56 +0,0 @@
-
-## We are ready to go to our next phase
-
-### Phase 1: We made the technology work
-
-#### ThreeFold Grid is alive and the most incredible technology has been proven to work.
-
-We had to achieve what seemed impossible. Can we develop a new foundational layer that could serve as the base layer for any web2 or web3 project in the world to deploy upon? Can we tackle and potentially resolve some of the most challenging issues for the infrastructure layer that empowers our digital life?
-
-We needed to develop a sort of super cloud as an alternative to the centralized clouds like Amazon and Google. This supercloud can grow to planetary scale and can be provided by everyone without technical knowledge. It can run autonomously and it has the potential to run any Internet web2 and web3 workloads.
-
-It has taken us over 20 years to prove that:
-
-* A new Physical Server Operating System can be developed, which is autonomous and can be deployed by anyone, anywhere, establishing a new foundation on top of which applications can run.
-* A new Storage System can be created which is more efficient, hyper scalable and cannot be hacked, not even by quantum computers.
-* A new Network System can be created which has the power to let us communicate over any possible medium (5G, fiber, satellite), is end-to-end encrypted, is capable of restoring any broken connection in real time, and is always looking for the shortest path between participants on this network.
-
-#### To arrive at this point:
-
-* Over the past two decades, 7 companies have been created with the goal of tackling some of these challenging problems. These companies have since been acquired by larger corporations, and their technology is widely used today, significantly contributing to the Internet.
-* Within ThreeFold itself, $50,000,000 has been invested by our community members, TF farmers, and technology companies. The TFT token symbolizes the collective effort of our ecosystem.
-* The TFT has played a crucial role in enabling the funding and growth of this highly ambitious project. The maximum supply of TFT is set at 1,000,000,000 TFT, which we anticipate reaching in the coming months. Currently, our market capitalization stands at just $15,000,000.
-* A venture creator has been established in Mauritius with a focus on emerging countries to deploy this new type of Internet system, and two countries have already signed up for it.
-* We have developed additional incredible technologies to address the challenges associated with this radically new approach.
-
-### Phase 2: We go viral
-
-> let's buy our tokens back and deploy +10,000 additional nodes
-
-It's now time to go viral, we want to use the power of human networks to expand and grow our project before going mainstream in phase 3.
-
-Our aim for phase 2:
-
-* Deploy +10,000 additional nodes in the field. Already today, we have probably the biggest network of compute and storage capacity in the world. That being said, we want to grow this 50x.
-* Create a network of +10,000 like minded souls who will be the base of this revolution which has the power to reshape how we communicate and build our future digital life.
-* Buy as many TFT as we can to have them when we enter Phase 3.
-
-We now have the capability to truly build our own Internet where we build our own communication, compute, storage and network layer. Imagine the possibilities: true freedom.
-
-### Phase 3: We go mainstream = ThreeFold will be launched on a global base.
-
-It's now time to go mainstream, we are looking for a team who will bring our project forward and make sure the world knows about it. In parallel to Phase 2, fundraising is going on to empower our global commercial launch. This team will make sure the world knows about ThreeFold and the importance of our project.
-
-This phase will be mainly in parallel to Phase 2 and we expect Phase 3 to start within 3 to 6 months from now.
-
-DePIN is happening and growing right now,
-
-![image alt text](img/top_depin.png)
-
-In our opinion, we are just at the beginning of the journey for DePIN. ThreeFold has more alive compute and storage capacity and more foundational relevant technology compared to any projects displayed above.
-
-We are not a competitor: we deliver a layer which is needed by all those projects. We are a true decentralized cloud layer which can serve as a basis for all those projects.
-
-**Each of the players above can be deployed on top of ThreeFold, while ThreeFold can not live on top of them. **
-
-**With appropriate team and funding, we have all it takes to be a top 10 player.**
diff --git a/collections/projectmycelium/participants.md b/collections/projectmycelium/participants.md
deleted file mode 100644
index 66d7c2e..0000000
--- a/collections/projectmycelium/participants.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# An Ecosystem to Thrive
-
-![alt text](participants.png)
-
-The following parties or solutions make up our ecosystem:
-
-- Hero (our own product)
-- Digital FreeZone
- - Possibility to attach a sovereign personal company to our hero
-- Mycelium Routers & Nodes (our own way how to provide capacity)
-- [ThreeFold](https://threefold.io/)
- - A decentralized grid we want to work with to have access to more capacity
- - Uses simular tech as Mycelium Routers & Nodes
-- HoloChain
- - Very close partner we are working with for a future of mutual credit currencies
-- RainLanguage
- - An amazing language for doing decentralized DEX orders, and provide liquidity
-- Solana
- - The most scalable blockchain today
- - The standard for the DePIN world
-
-
diff --git a/collections/projectmycelium/participants.png b/collections/projectmycelium/participants.png
deleted file mode 100644
index 0750516..0000000
Binary files a/collections/projectmycelium/participants.png and /dev/null differ
diff --git a/collections/projectmycelium/participants/digital_freezone_layer.md b/collections/projectmycelium/participants/digital_freezone_layer.md
deleted file mode 100644
index af0b50f..0000000
--- a/collections/projectmycelium/participants/digital_freezone_layer.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Digital Freezone Layer
-
-The Digital Freezone layer of the Project Mycelium will provide many possibilities for its users, e.g. the possibility to attach a sovereign personal company to a Hero key.
\ No newline at end of file
diff --git a/collections/projectmycelium/participants/hero_layer.md b/collections/projectmycelium/participants/hero_layer.md
deleted file mode 100644
index 5b7a11d..0000000
--- a/collections/projectmycelium/participants/hero_layer.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Hero Layer
-
-The Hero layer of the Project Mycelium consists of a highly versatile and secure AI assistant and much more.
\ No newline at end of file
diff --git a/collections/projectmycelium/participants/mycelium_layer.md b/collections/projectmycelium/participants/mycelium_layer.md
deleted file mode 100644
index 0083bf3..0000000
--- a/collections/projectmycelium/participants/mycelium_layer.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Mycelium Layer
-
-The Mycelium layer of the Project Mycelium consists of the innovative Mycelium Network, an end-to-end encrypted IPv6 overlay network.
\ No newline at end of file
diff --git a/collections/projectmycelium/participants/transactional_layer.md b/collections/projectmycelium/participants/transactional_layer.md
deleted file mode 100644
index 2d795af..0000000
--- a/collections/projectmycelium/participants/transactional_layer.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Transactional Layer
-
-The Transactional layer of the Project Mycelium will provide the needed layer to do transactions within the whole Project Mycelium ecosystem.
\ No newline at end of file
diff --git a/collections/projectmycelium/presentations/img/.done b/collections/projectmycelium/presentations/img/.done
deleted file mode 100644
index d92f7ee..0000000
--- a/collections/projectmycelium/presentations/img/.done
+++ /dev/null
@@ -1 +0,0 @@
-prodslides.png
diff --git a/collections/projectmycelium/presentations/img/prodslides.png b/collections/projectmycelium/presentations/img/prodslides.png
deleted file mode 100644
index f798f81..0000000
Binary files a/collections/projectmycelium/presentations/img/prodslides.png and /dev/null differ
diff --git a/collections/projectmycelium/presentations/product_slides.md b/collections/projectmycelium/presentations/product_slides.md
deleted file mode 100644
index 524271c..0000000
--- a/collections/projectmycelium/presentations/product_slides.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-![](img/prodslides.png)
-
-# Our Hero Journey
-
-We prepared the following presentation to provide an overview of the [Project Mycelium](https://docs.google.com/presentation/d/1pB1ILqKnLMsjpkYRjIdAWY3mxgO6qJiExavNbAf6DWw/edit#slide=id.g2cfd347b7cd_0_994).
-
-In this presentation, we present the Hero personal AI assistant. Hero is possible thanks to the network Mycelium we built.
\ No newline at end of file
diff --git a/collections/projectmycelium/solana.md b/collections/projectmycelium/solana.md
deleted file mode 100644
index ec2f897..0000000
--- a/collections/projectmycelium/solana.md
+++ /dev/null
@@ -1,9 +0,0 @@
-![alt text](img/solana.png)
-
-## Solana
-
-Solana is a very scalable and important blockchain in the DePIN space. Project Mycelium will launch its tokens in this ecosystem to allow for a large audience to learn about Project Mycelium and participate within the ecosystem.
-
-We will provide more information on the project launch.
-
-
diff --git a/collections/projectmycelium/tfgrid4_new.md b/collections/projectmycelium/tfgrid4_new.md
deleted file mode 100644
index 3b34df3..0000000
--- a/collections/projectmycelium/tfgrid4_new.md
+++ /dev/null
@@ -1,38 +0,0 @@
-![](img/tfgrid4_new.png)
-
-The TF Grid (our next generation of our decentralized cloud) has some incredible new features
-
-## TF Router
-
-A new capability is being introduced called the TF Router, which is a 5G, Meshed Wireless and Satellite Router which allows everyone to become a Network Service Provider. The TF Router will always look for the shortest path between all our participants and has the capability to use any of the physical internet connections to provide best performance and uptime. The INCA Routers can even build a meshed wireless network which means we can bring the internet to the most remote areas in the world.
-
-
-## INCA Generator provides passive income
-
-Combination of Cloud, Internet & Electricity
-
-An INCA Generator provides Cloud, Internet and Electricity to the people around and is the combination of one or more TF Routers, TF Nodes, and optional solar electricity production. The INCA Generator provides a passive income in INCA for the owner.
-
-## INCA Fuel
-
-INCA Fuel is our peer2peer mutual credit currency which is the result of people buying/selling Services (cloud, internet bandwidth, energy, …) on the TF Grid.
-
-The only way INCA Fuel can be bought is through INCA. We partner with Holochain to realize this capability. INCA Fuel will make us unlimitedly scalable and will work even when connections to the main global Internet are not too slow or not available e.g. in a remote area.
-
-
-## New Features in Zero-OS
-
-Our Zero-OS which is our underlying close to metal Operating System gets new features
-
-- Zero-OS natively supports GPU and other AI workloads.
-- Zero-OS can be run in a Virtual Machine, which will allow faster expansion.
-- Zero-OS will be able to run Full VM, Thin VM and now also Containers directly in Zero-OS.
-- Zero-OS will support a new faster storage system for virtual mounts (SSD/HDD)
-
-## INCA Marketplace
-
-We introduce our INCA Marketplace which will allow people to buy our TF Grid products and services using credit cards, digital currencies, … Underneath of course everything goes back to INCA as the reserve currency.
-
-The INCA Marketplace will have a simplified API which allows our partners to buy and sell services more easily and of course in line with all required regulations.
-
-Every farmer will be able to price their product and services.
diff --git a/collections/projectmycelium/tokens/tokenomics.md b/collections/projectmycelium/tokens/tokenomics.md
deleted file mode 100644
index ae1c467..0000000
--- a/collections/projectmycelium/tokens/tokenomics.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Tokenomics
-
-This section will be expanded as we develop the Project Mycelium tokenomics.
-
-For now, we provide the template for the Hero tokens and keys.
-
-## Inspiration
-
-We love how [Flare Network](https://flare.network/tokenomics-flr-updated/) developed a tokenomics aimed at the community and collaboration. We will draw inspiration from their work.
\ No newline at end of file
diff --git a/collections/projectmycelium/tokens/tokens.md b/collections/projectmycelium/tokens/tokens.md
deleted file mode 100644
index 3281559..0000000
--- a/collections/projectmycelium/tokens/tokens.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Hero Tokens and Keys
-
-## Hero Token
-
-The HERO token is our digital currency. There will be a given amount of Hero tokens (X,000,000,000 HERO tokens). This will be determined in the near future.
-
-The large majority of HERO tokens will be to reward community expansion (technology and reach).
-
-## Hero Key
-
-The Hero key is a crucial part of the Hero journey.
-
-The Hero key is your autonomous sovereign digital self, with a slot for a unique name. It can be connected to a legal entity (i.e. a company) in a digital freezone.
-
-Your Hero key is unique and has unique properties like the numbers of names slots linked to it, the capacity of storage, compute, bandwidth, possible locations for hosting, capabilities, and much more.
-
-We can buy and re-sell our key, the Hero key, once deployed, is always personal and linked to our Identity. If we sell the Hero key, then our personallity gets disconnected.
-
-
-
-
-
diff --git a/collections/system_administrators/pulumi/pulumi_deployment_details.md b/collections/system_administrators/pulumi/pulumi_deployment_details.md
index 282fd49..81b11a0 100644
--- a/collections/system_administrators/pulumi/pulumi_deployment_details.md
+++ b/collections/system_administrators/pulumi/pulumi_deployment_details.md
@@ -360,7 +360,7 @@ outputs:
ygg_ip: ${kubernetes.master_computed.ygg_ip}
```
-Now, we define the Kubernetes resource `grid:internal:Kubernetes` that has master and workers blocks. You define almost everything like a normal VM except for the FLiist. Also note that the token is the `cluster token`. This will ensure that the workers and the master communicate properly.
+Now, we define the Kubernetes resource `grid:internal:Kubernetes` that has master and workers slice. You define almost everything like a normal VM except for the FLiist. Also note that the token is the `cluster token`. This will ensure that the workers and the master communicate properly.
## Creating a Domain
diff --git a/collections/tech/grid/concepts/cloudunits.md b/collections/tech/grid/concepts/cloudunits.md
index 04a6afd..0f5cc29 100644
--- a/collections/tech/grid/concepts/cloudunits.md
+++ b/collections/tech/grid/concepts/cloudunits.md
@@ -8,6 +8,6 @@ Cloud units are the basis for buying & selling capacity on the ThreeFold Grid (f
References:
-- Cloud units the the building blocks for any Cloud / IT workload. See definition [here](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__resource_units_calc_cloudunits)
+- Cloud units the the building slice for any Cloud / IT workload. See definition [here](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__resource_units_calc_cloudunits)
- Cloud units are also used to determine commercial pricing for utilisation. See definition [here](https://library.threefold.me/info/threefold#/cloud/threefold__pricing?id=discount-levels)
- Low level primitive [cloud functions](https://library.threefold.me/info/threefold/#/technology/threefold__tfgrid_primitives)
\ No newline at end of file
diff --git a/collections/tech/history/layers.md b/collections/tech/history/layers.md
index 43cb81f..acdd0d1 100644
--- a/collections/tech/history/layers.md
+++ b/collections/tech/history/layers.md
@@ -31,7 +31,7 @@ Context switches are essential for multitasking, but they come with overhead tha
3. **Resource Contentions**: Context switches can exacerbate resource contention issues, especially in systems with limited CPU cores. If multiple processes are frequently contending for CPU time, the overhead of context switches can further delay process execution.
-4. **Fragmentation**: Frequent context switches can lead to memory fragmentation, as processes are loaded and unloaded into memory. This fragmentation can degrade system performance over time, as it becomes more challenging to find contiguous blocks of memory for new processes.
+4. **Fragmentation**: Frequent context switches can lead to memory fragmentation, as processes are loaded and unloaded into memory. This fragmentation can degrade system performance over time, as it becomes more challenging to find contiguous slice of memory for new processes.
While context switches are necessary for multitasking, excessive context switching can indeed lead to a significant loss of execution power by introducing overhead and resource contention in the system.
diff --git a/collections/tech/qsss/qsss2_home.md b/collections/tech/qsss/qsss2_home.md
index d62400a..09cfb69 100644
--- a/collections/tech/qsss/qsss2_home.md
+++ b/collections/tech/qsss/qsss2_home.md
@@ -10,7 +10,7 @@ Imagine a storage system with the following benefits
Our storage architecture follows the true peer-to-peer design of the TF grid. Any participating node only stores small incomplete parts of objects (files, photos, movies, databases...) by offering a slice of the present (local) storage devices. Managing the storage and retrieval of all of these distributed fragments is done by a software that creates development or end-user interfaces for this storage algorithm. We call this '**dispersed storage**'.
-Peer-to-peer provides the unique proposition of selecting storage providers that match your application and service of business criteria. For example, you might be looking to store data for your application in a certain geographic area (for governance and compliance) reasons. Also, you might want to use different "storage policies" for different types of data. Examples are live versus archived data. All of these uses cases are possible with this storage architecture and could be built by using the same building blocks produced by farmers and consumed by developers or end-users.
+Peer-to-peer provides the unique proposition of selecting storage providers that match your application and service of business criteria. For example, you might be looking to store data for your application in a certain geographic area (for governance and compliance) reasons. Also, you might want to use different "storage policies" for different types of data. Examples are live versus archived data. All of these uses cases are possible with this storage architecture and could be built by using the same building slice produced by farmers and consumed by developers or end-users.
!!!include:qsss_toc
diff --git a/collections/tech/qsss/qsss_home.md b/collections/tech/qsss/qsss_home.md
index d2955a3..130fc2a 100644
--- a/collections/tech/qsss/qsss_home.md
+++ b/collections/tech/qsss/qsss_home.md
@@ -24,7 +24,7 @@ The cloud user can mix and match storage technologies as are required for their
## Peer2Peer Advantages
-Peer2peer provides the unique proposition of selecting storage providers that match your application and service of business criteria. For example, you might be looking to store data for your application in a certain geographic area (for governance and compliance) reasons. You might also want to use different "storage policies" for different types of data. Examples are live versus archived data. All of these uses cases are possible with this storage architecture, and could be built by using the same building blocks produced by farmers and consumed by developers or end-users.
+Peer2peer provides the unique proposition of selecting storage providers that match your application and service of business criteria. For example, you might be looking to store data for your application in a certain geographic area (for governance and compliance) reasons. You might also want to use different "storage policies" for different types of data. Examples are live versus archived data. All of these uses cases are possible with this storage architecture, and could be built by using the same building slice produced by farmers and consumed by developers or end-users.
> There is 100% control over where the data is positioned and the security is incredible.
diff --git a/collections/tfgrid4/boxes/block_intro.md b/collections/tfgrid4/boxes/block_intro.md
deleted file mode 100644
index 2a42b37..0000000
--- a/collections/tfgrid4/boxes/block_intro.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-A Cloud, Storage or AI Block 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 Blocks can be bought by the INCA/TF Community through the INCA marketplace.
-
-
-
diff --git a/collections/tfgrid4/boxes/cloudblock_tech.md b/collections/tfgrid4/boxes/cloudblock_tech.md
deleted file mode 100644
index e69de29..0000000
diff --git a/collections/tfgrid4/boxes/aiblock.md b/collections/tfgrid4/slices/aislice.md
similarity index 72%
rename from collections/tfgrid4/boxes/aiblock.md
rename to collections/tfgrid4/slices/aislice.md
index f9e303c..b0259b0 100644
--- a/collections/tfgrid4/boxes/aiblock.md
+++ b/collections/tfgrid4/slices/aislice.md
@@ -1,6 +1,6 @@
-# AI Block (AB)
+# AI Slice
-!!wiki.include page:'block_intro.md'
+!!wiki.include page:'slice_intro.md'
An AI box is a unit of AI capacity (GPU or future TPU driven).
@@ -10,13 +10,13 @@ An AI box can be launched in our Zero-OS and can enable any possible AI workload
## AI Hour (AH)
-AI hour (AH) is like a kwatth unit for electricty: it represents a AI Block being used for 1h and billed as such.
+AI hour (AH) is like a kwatth unit for electricty: it represents a AISlice being used for 1h and billed as such.
INCA Hosts (our cloud providers) can price the AI Hour themselves in a chosen currency.
-## AI Block Properties
+## AISlice Properties
-The service provider (hoster) defines the following properties per AI Block:
+The service provider (hoster) defines the following properties per AISlice:
- Type of GPU
- Price per hour
@@ -24,10 +24,10 @@ The service provider (hoster) defines the following properties per AI Block:
- Max bandwidth
- Min bandwidth (min 1 mbit/sec)
- Cost per GB bandwidth if any
-- Max aggregation size (how many of the AI Blocks can be combined in one node if relevant)
+- Max aggregation size (how many of the AISlices can be combined in one node if relevant)
- 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
-Each AI Block has unique ID and can be looked at through a portal (or found).
+Each AISlice has unique ID and can be looked at through a portal (or found).
diff --git a/collections/tfgrid4/boxes/cloudblock.md b/collections/tfgrid4/slices/cloudslice.md
similarity index 61%
rename from collections/tfgrid4/boxes/cloudblock.md
rename to collections/tfgrid4/slices/cloudslice.md
index 78a08c4..bfd3213 100644
--- a/collections/tfgrid4/boxes/cloudblock.md
+++ b/collections/tfgrid4/slices/cloudslice.md
@@ -1,17 +1,17 @@
-