diff --git a/docs_website/docs/introduction.md b/docs_website/docs/introduction.md index a7fe022..167dda6 100644 --- a/docs_website/docs/introduction.md +++ b/docs_website/docs/introduction.md @@ -22,4 +22,4 @@ Imagine a system which... This dream has come true: ThreeFold is a decentralized platform for unbreakable data, peer-to-peer network, and autonomous cloud. Read forward to learn more about this innovative system. -> Note: We are still defining the V4 specs. Feel free to write your feedback on the [ThreeFold Forum](https://forum.threefold.io). \ No newline at end of file +> Note: We are still defining the V4 specs. Things are subject to change. Feel free to write your feedback on the [ThreeFold Forum](https://forum.threefold.io). \ No newline at end of file diff --git a/docs_website/docs/legal/_category_.json b/docs_website/docs/legal/_category_.json index 953ec94..42b445a 100644 --- a/docs_website/docs/legal/_category_.json +++ b/docs_website/docs/legal/_category_.json @@ -1,6 +1,6 @@ { "label": "Legal", - "position": 7, + "position": 8, "link": { "type": "generated-index", } diff --git a/docs_website/docs/references/marketplace/_category_.json b/docs_website/docs/marketplace/_category_.json similarity index 87% rename from docs_website/docs/references/marketplace/_category_.json rename to docs_website/docs/marketplace/_category_.json index 22535e3..23cbd8d 100644 --- a/docs_website/docs/references/marketplace/_category_.json +++ b/docs_website/docs/marketplace/_category_.json @@ -1,6 +1,6 @@ { "label": "Marketplace", - "position": 4, + "position": 6, "link": { "type": "generated-index", "description": "Offer and Use Resources via the Marketplace" diff --git a/docs_website/docs/references/marketplace/farming_pools.md b/docs_website/docs/marketplace/farming_pools.md similarity index 100% rename from docs_website/docs/references/marketplace/farming_pools.md rename to docs_website/docs/marketplace/farming_pools.md diff --git a/docs_website/docs/references/marketplace/img/devops.png b/docs_website/docs/marketplace/img/devops.png similarity index 100% rename from docs_website/docs/references/marketplace/img/devops.png rename to docs_website/docs/marketplace/img/devops.png diff --git a/docs_website/docs/references/marketplace/img/distribution.png b/docs_website/docs/marketplace/img/distribution.png similarity index 100% rename from docs_website/docs/references/marketplace/img/distribution.png rename to docs_website/docs/marketplace/img/distribution.png diff --git a/docs_website/docs/references/marketplace/img/image1.png b/docs_website/docs/marketplace/img/image1.png similarity index 100% rename from docs_website/docs/references/marketplace/img/image1.png rename to docs_website/docs/marketplace/img/image1.png diff --git a/docs_website/docs/references/marketplace/img/image4.png b/docs_website/docs/marketplace/img/image4.png similarity index 100% rename from docs_website/docs/references/marketplace/img/image4.png rename to docs_website/docs/marketplace/img/image4.png diff --git a/docs_website/docs/references/marketplace/img/qsss_overview.png b/docs_website/docs/marketplace/img/qsss_overview.png similarity index 100% rename from docs_website/docs/references/marketplace/img/qsss_overview.png rename to docs_website/docs/marketplace/img/qsss_overview.png diff --git a/docs_website/docs/references/marketplace/img/redundant_net.jpg b/docs_website/docs/marketplace/img/redundant_net.jpg similarity index 100% rename from docs_website/docs/references/marketplace/img/redundant_net.jpg rename to docs_website/docs/marketplace/img/redundant_net.jpg diff --git a/docs_website/docs/references/marketplace/img/release_schedule.png b/docs_website/docs/marketplace/img/release_schedule.png similarity index 100% rename from docs_website/docs/references/marketplace/img/release_schedule.png rename to docs_website/docs/marketplace/img/release_schedule.png diff --git a/docs_website/docs/references/marketplace/img/smartcontract3_flow.jpg b/docs_website/docs/marketplace/img/smartcontract3_flow.jpg similarity index 100% rename from docs_website/docs/references/marketplace/img/smartcontract3_flow.jpg rename to docs_website/docs/marketplace/img/smartcontract3_flow.jpg diff --git a/docs_website/docs/references/marketplace/img/storage_today.png b/docs_website/docs/marketplace/img/storage_today.png similarity index 100% rename from docs_website/docs/references/marketplace/img/storage_today.png rename to docs_website/docs/marketplace/img/storage_today.png diff --git a/docs_website/docs/references/marketplace/img/token_release.png b/docs_website/docs/marketplace/img/token_release.png similarity index 100% rename from docs_website/docs/references/marketplace/img/token_release.png rename to docs_website/docs/marketplace/img/token_release.png diff --git a/docs_website/docs/references/marketplace/img/token_release_stacked.png b/docs_website/docs/marketplace/img/token_release_stacked.png similarity index 100% rename from docs_website/docs/references/marketplace/img/token_release_stacked.png rename to docs_website/docs/marketplace/img/token_release_stacked.png diff --git a/docs_website/docs/references/marketplace/img/tokenomics.png b/docs_website/docs/marketplace/img/tokenomics.png similarity index 100% rename from docs_website/docs/references/marketplace/img/tokenomics.png rename to docs_website/docs/marketplace/img/tokenomics.png diff --git a/docs_website/docs/references/marketplace/img/track_record.png b/docs_website/docs/marketplace/img/track_record.png similarity index 100% rename from docs_website/docs/references/marketplace/img/track_record.png rename to docs_website/docs/marketplace/img/track_record.png diff --git a/docs_website/docs/references/marketplace/img/webgateway.jpg b/docs_website/docs/marketplace/img/webgateway.jpg similarity index 100% rename from docs_website/docs/references/marketplace/img/webgateway.jpg rename to docs_website/docs/marketplace/img/webgateway.jpg diff --git a/docs_website/docs/references/marketplace/img/webgw_scaling.jpg b/docs_website/docs/marketplace/img/webgw_scaling.jpg similarity index 100% rename from docs_website/docs/references/marketplace/img/webgw_scaling.jpg rename to docs_website/docs/marketplace/img/webgw_scaling.jpg diff --git a/docs_website/docs/references/marketplace/img/word_records.png b/docs_website/docs/marketplace/img/word_records.png similarity index 100% rename from docs_website/docs/references/marketplace/img/word_records.png rename to docs_website/docs/marketplace/img/word_records.png diff --git a/docs_website/docs/references/marketplace/img/world_record.png b/docs_website/docs/marketplace/img/world_record.png similarity index 100% rename from docs_website/docs/references/marketplace/img/world_record.png rename to docs_website/docs/marketplace/img/world_record.png diff --git a/docs_website/docs/references/marketplace/img/zero_knowledge_proof.png b/docs_website/docs/marketplace/img/zero_knowledge_proof.png similarity index 100% rename from docs_website/docs/references/marketplace/img/zero_knowledge_proof.png rename to docs_website/docs/marketplace/img/zero_knowledge_proof.png diff --git a/docs_website/docs/references/marketplace/offer_resources.md b/docs_website/docs/marketplace/offer_resources.md similarity index 79% rename from docs_website/docs/references/marketplace/offer_resources.md rename to docs_website/docs/marketplace/offer_resources.md index 9c1de14..b2ccaec 100644 --- a/docs_website/docs/references/marketplace/offer_resources.md +++ b/docs_website/docs/marketplace/offer_resources.md @@ -6,7 +6,7 @@ sidebar_position: 3 ## Pricing -Farmers and farming pools can decide on their own price but between the min and max as specified below. +Farmers and farming pools decide on their own price as long as it stays between the range specified in the [Use Resources](./use_resources.md) section. ## Utilization Rewards Distribution @@ -29,7 +29,7 @@ The following rewards are guaranteed for a 18-month period starting from activat | Components | Rewards (INCA/month) | |---|---| | GB Memory | 8.0 | -| GPU GB | 10 | +| GPU Model | TBD | | TB SSD | 31.5 | | TB HDD | 7.0 | | TB Network | 30.0 | @@ -40,6 +40,8 @@ The tokens received as rewards are locked up for 24 months, or until 40% used of - The minimum CPU passmark per GB of memory is 200 - The minimum GB of memory is 16GB -- The minimum TB of SSd is 2TB +- The minimum TB of SSD is 2TB -> Note: This is subject to change. We are still working on the marketplace specs. +## Host Nodes + +Read the [Nodes](/docs/category/nodes) section to learn more about the process of hosting a node. \ No newline at end of file diff --git a/docs_website/docs/references/marketplace/overview.md b/docs_website/docs/marketplace/overview.md similarity index 100% rename from docs_website/docs/references/marketplace/overview.md rename to docs_website/docs/marketplace/overview.md diff --git a/docs_website/docs/marketplace/use_resources.md b/docs_website/docs/marketplace/use_resources.md new file mode 100644 index 0000000..918e209 --- /dev/null +++ b/docs_website/docs/marketplace/use_resources.md @@ -0,0 +1,24 @@ +--- +sidebar_position: 2 +--- + +# Use Resources + +Resources on the ThreeFold Grid V4 are available in slices via our pay-per-slice model. + +## Pay Per Slice + +The pay-per-slice model lets you only pay for what you use, making it flexible and cost-effective. + +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. + +| Type | Description | Hourly Min | Hourly Max | Monthly Min | Monthly Max | +|---|---|---|---|---|---| +| Cloud | Core: 4GB, 2 vcpu, 1 mbit, 50GB | $0.0139 | $0.0556 | $5 | $40 | +| Cloud | GB Bandwidth | $0.000028 | $0.000028 | $0.02 | $0.02 | +| Cloud | GB SSD Storage extra | $0.000011 | $0.0069 | $0.004 | $0.02 | +| Cloud | IP address | $0 | $0.0069 | $0 | $5 | +| Storage | Core: 100GB, 100B transfer included | $0.0006 | $0.0028 | $0.2 | $2 | +| Storage | GB Bandwidth | $0.000014 | $0.000028 | $0.005 | $0.02 | +| AI | AI GPU, 100GB transfer included | $0.1 | $20 | $72 | $14400 | +| AI | GB Bandwidth | $0.000014 | $0 | $0.005 | $0 | \ No newline at end of file diff --git a/docs_website/docs/references/_category_.json b/docs_website/docs/references/_category_.json index e5110c0..5904b96 100644 --- a/docs_website/docs/references/_category_.json +++ b/docs_website/docs/references/_category_.json @@ -1,6 +1,6 @@ { "label": "References", - "position": 6, + "position": 7, "link": { "type": "generated-index" } diff --git a/docs_website/docs/references/marketplace/use_resources.md b/docs_website/docs/references/marketplace/use_resources.md deleted file mode 100644 index 7d156c1..0000000 --- a/docs_website/docs/references/marketplace/use_resources.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -sidebar_position: 2 ---- - -# Use Resources - -Resources on the ThreeFold Grid V4 are available in slices. - -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. - -Farmers can set the price for the slices. There are minimum and maximum values that can be chosen. - -| Slice | Description | Minimum USD (Hourly \| Monthly) | Maximum USD (Hourly \| Monthly) | -| ------- | ---------------------------------------------- | ------------------------ | ------------------------ | -| Cloud | Core: 4GB, 2 vcpu, 1 mbit, 50GB | 0.0139 \| 5 | 0.0556 \| 40 | -| | GB Bandwidth | 0.000028 \| 0.02 | 0.000028 \| 0.02 | -| | GB SSD Storage extra | 0.000011 \| 0.004 | 0.0069 \| 0.02 | -| | IP address | 0 \| 0 | 0.0069 \| 5 | -| Storage | Core: 100GB, 100B transfer included | 0.0006 \| 0.2 | 0.0028 \| 2 | -| | GB Bandwidth | 0.000014 \| 0.005 | 0.000028 \| 0.02 | -| AI | AI GPU, 100GB transfer included | 0.1 \| 72 | 20 \| 14400 | -| | GB Bandwidth | 0.000014 \| 0.005 | 0 \| 0 | \ No newline at end of file