From 27423c06dd1e3dad6e297c92d9cdbc20da667a31 Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 13:48:33 -0400 Subject: [PATCH 1/8] manual temp fix for include, static number --- books/manual/SUMMARY.md | 1 - collections/about/token_overview/token_overview.md | 5 ++--- collections/cloud/pricing/pricing.md | 14 ++++++++------ ...rx423zfuykkfdn66xp2kmsbzfqse2psndz6edvqtrlsu.md | 2 +- collections/manual/values/0.02 | 1 + collections/manual/values/cu_mtft_hour.md | 2 +- collections/manual/values/dname_mtft_hour.md | 2 +- collections/manual/values/ip_mtft_hour.md | 2 +- collections/manual/values/name_mtft_hour.md | 2 +- collections/manual/values/nu_mtft_hour.md | 2 +- collections/manual/values/su_mtft_hour.md | 2 +- collections/manual/values/tft_marketcap.md | 2 +- collections/manual/values/tft_value.md | 2 +- 13 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 collections/manual/values/0.02 diff --git a/books/manual/SUMMARY.md b/books/manual/SUMMARY.md index 8b6da45..5c63322 100644 --- a/books/manual/SUMMARY.md +++ b/books/manual/SUMMARY.md @@ -304,7 +304,6 @@ - [TFGrid v3.0.0 Alpha-2](about/roadmap/releasenotes/tfgrid_release_3_0_a2.md) - [TFGrid v3.0.0](about/roadmap/releasenotes/tfgrid_release_3_0.md) - [ThreeFold Token](about/token_overview/token_overview.md) - - [Special Wallets](about/token_overview/special_wallets/stats_special_wallets.md) - [Technology](tech/technology_toc.md) - [Introduction](tech/technology.md) - [The Internet Today](tech/internet_today.md) diff --git a/collections/about/token_overview/token_overview.md b/collections/about/token_overview/token_overview.md index 73d509b..e6233c0 100644 --- a/collections/about/token_overview/token_overview.md +++ b/collections/about/token_overview/token_overview.md @@ -69,8 +69,8 @@ The TFT market price and marketcap are as follows: | **Description** | **Value** | | ------------------------- | ------------- | -| TFT Market Price | !!wiki.include page:'manual:tft_value.md' USD | -| TFT Market Cap | !!wiki.include page:'manual:tft_marketcap.md' USD | +| TFT Market Price | 0.028 USD | +| TFT Market Cap | 21,840,000 USD | The market cap is equal to the product of the TFT market price and the circulating supply. @@ -82,7 +82,6 @@ The values here are subject to change. Check the current market conditions. - [ThreeFold History](threefold_history.md) - [Token History](token_history.md) -- [Special Wallets](stats_special_wallets.md) ## Disclaimer diff --git a/collections/cloud/pricing/pricing.md b/collections/cloud/pricing/pricing.md index e09c1aa..b6e48f6 100644 --- a/collections/cloud/pricing/pricing.md +++ b/collections/cloud/pricing/pricing.md @@ -16,20 +16,22 @@ - The current prices are for resources usage on mainnet (testnet get 50% discount) - A month is considered as 30 days (720 hours) +- We are considering a TFT market price of 0.028 | Cloud Units | Description | mUSD | mTFT | | ----------------- | ------------------------------------------------ | ------------------ | ------------------ | -| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | !!wiki.include page:'manual:su_musd_hour.md' | !!wiki.include page:'manual:cu_mtft_hour.md' | -| Storage Unit (SU) | typically 1 TB of netto usable storage (*) | !!wiki.include page:'manual:cu_musd_hour.md' | !!wiki.include page:'manual:su_mtft_hour.md' | -| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | !!wiki.include page:'manual:nu_musd_hour.md' | !!wiki.include page:'manual:nu_mtft_hour.md' | +| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 30.56/hour | 1091.43/hour | +| Storage Unit (SU) | typically 1 TB of netto usable storage (*) | 19.44/hour | 694.29/hour | +| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00/hour | 1785.71/hour + |
| Network Addressing | Description | mUSD | mTFT | | ------------------ | ------------------------------------------ | --------------------- | --------------------- | -| IPv4 Address | Public Ip Address as used by a TFGrid user | !!wiki.include page:'manual:ip_musd_hour.md' | !!wiki.include page:'manual:ip_mtft_hour.md' | -| Unique Name | Usable as name on webgateways | !!wiki.include page:'manual:name_musd_hour.md' | !!wiki.include page:'manual:name_mtft_hour.md' | -| Unique Domain Name | Usable as dns name on webgateways | !!wiki.include page:'manual:dname_musd_hour.md' | !!wiki.include page:'manual:dname_mtft_hour.md' | +| IPv4 Address | Public Ip Address as used by a TFGrid user | 6.94/hour | 247.86/hour | +| Unique Name | Usable as name on webgateways | 1.39 | 49.64/hour | +| Unique Domain Name | Usable as dns name on webgateways | 2.78/hour | 99.29/hour | - mUSD = 1/1000 of USD, mTFT = 1/1000 of TFT - TFT pricing pegged to USD (pricing changes in line with TFT/USD rate) diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/gdijy6k2bbrirx423zfuykkfdn66xp2kmsbzfqse2psndz6edvqtrlsu.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/gdijy6k2bbrirx423zfuykkfdn66xp2kmsbzfqse2psndz6edvqtrlsu.md index 76e10f5..5fb9b72 100644 --- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/gdijy6k2bbrirx423zfuykkfdn66xp2kmsbzfqse2psndz6edvqtrlsu.md +++ b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/gdijy6k2bbrirx423zfuykkfdn66xp2kmsbzfqse2psndz6edvqtrlsu.md @@ -1 +1 @@ -10110962.98 \ No newline at end of file +10595751.89 \ No newline at end of file diff --git a/collections/manual/values/0.02 b/collections/manual/values/0.02 new file mode 100644 index 0000000..d0e6ec6 --- /dev/null +++ b/collections/manual/values/0.02 @@ -0,0 +1 @@ +0.000 \ No newline at end of file diff --git a/collections/manual/values/cu_mtft_hour.md b/collections/manual/values/cu_mtft_hour.md index a424ed6..2872a6f 100644 --- a/collections/manual/values/cu_mtft_hour.md +++ b/collections/manual/values/cu_mtft_hour.md @@ -1 +1 @@ -1608.42 \ No newline at end of file +1528.00 \ No newline at end of file diff --git a/collections/manual/values/dname_mtft_hour.md b/collections/manual/values/dname_mtft_hour.md index 9a79ccf..4f9e53a 100644 --- a/collections/manual/values/dname_mtft_hour.md +++ b/collections/manual/values/dname_mtft_hour.md @@ -1 +1 @@ -146.32 \ No newline at end of file +139.00 \ No newline at end of file diff --git a/collections/manual/values/ip_mtft_hour.md b/collections/manual/values/ip_mtft_hour.md index 6582fc3..325a076 100644 --- a/collections/manual/values/ip_mtft_hour.md +++ b/collections/manual/values/ip_mtft_hour.md @@ -1 +1 @@ -365.26 \ No newline at end of file +347.00 \ No newline at end of file diff --git a/collections/manual/values/name_mtft_hour.md b/collections/manual/values/name_mtft_hour.md index 34a2a43..bf1a7d6 100644 --- a/collections/manual/values/name_mtft_hour.md +++ b/collections/manual/values/name_mtft_hour.md @@ -1 +1 @@ -73.16 \ No newline at end of file +69.50 \ No newline at end of file diff --git a/collections/manual/values/nu_mtft_hour.md b/collections/manual/values/nu_mtft_hour.md index 1bb11cd..a1031b2 100644 --- a/collections/manual/values/nu_mtft_hour.md +++ b/collections/manual/values/nu_mtft_hour.md @@ -1 +1 @@ -2631.58 \ No newline at end of file +2500.00 \ No newline at end of file diff --git a/collections/manual/values/su_mtft_hour.md b/collections/manual/values/su_mtft_hour.md index 7141994..7c41110 100644 --- a/collections/manual/values/su_mtft_hour.md +++ b/collections/manual/values/su_mtft_hour.md @@ -1 +1 @@ -1023.16 \ No newline at end of file +972.00 \ No newline at end of file diff --git a/collections/manual/values/tft_marketcap.md b/collections/manual/values/tft_marketcap.md index 2dc47f5..c227083 100644 --- a/collections/manual/values/tft_marketcap.md +++ b/collections/manual/values/tft_marketcap.md @@ -1 +1 @@ -14,820,000 \ No newline at end of file +0 \ No newline at end of file diff --git a/collections/manual/values/tft_value.md b/collections/manual/values/tft_value.md index 213e592..d0e6ec6 100644 --- a/collections/manual/values/tft_value.md +++ b/collections/manual/values/tft_value.md @@ -1 +1 @@ -0.019 \ No newline at end of file +0.000 \ No newline at end of file From 81591faa063bfa0f24f708fcf0bd7718a086326b Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 13:52:41 -0400 Subject: [PATCH 2/8] manual cloud update --- collections/cloud/pricing/pricing.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/collections/cloud/pricing/pricing.md b/collections/cloud/pricing/pricing.md index b6e48f6..0e91cf0 100644 --- a/collections/cloud/pricing/pricing.md +++ b/collections/cloud/pricing/pricing.md @@ -18,20 +18,20 @@ - A month is considered as 30 days (720 hours) - We are considering a TFT market price of 0.028 -| Cloud Units | Description | mUSD | mTFT | +| Cloud Units | Description | mUSD (per hour) | mTFT (per hour) | | ----------------- | ------------------------------------------------ | ------------------ | ------------------ | -| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 30.56/hour | 1091.43/hour | -| Storage Unit (SU) | typically 1 TB of netto usable storage (*) | 19.44/hour | 694.29/hour | -| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00/hour | 1785.71/hour +| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 30.56 | 1091.43 | +| Storage Unit (SU) | typically 1 TB of netto usable storage (*) | 19.44 | 694.29 | +| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00 | 1785.71 |
-| Network Addressing | Description | mUSD | mTFT | +| Network Addressing | Description | mUSD (per hour) | mTFT (per hour) | | ------------------ | ------------------------------------------ | --------------------- | --------------------- | -| IPv4 Address | Public Ip Address as used by a TFGrid user | 6.94/hour | 247.86/hour | -| Unique Name | Usable as name on webgateways | 1.39 | 49.64/hour | -| Unique Domain Name | Usable as dns name on webgateways | 2.78/hour | 99.29/hour | +| IPv4 Address | Public Ip Address as used by a TFGrid user | 6.94 | 247.86 | +| Unique Name | Usable as name on webgateways | 1.39 | 49.64 | +| Unique Domain Name | Usable as dns name on webgateways | 2.78 | 99.29 | - mUSD = 1/1000 of USD, mTFT = 1/1000 of TFT - TFT pricing pegged to USD (pricing changes in line with TFT/USD rate) @@ -42,12 +42,12 @@ ## Pricing Expressed Per Month -| Cloud Units | description | USD NO DISCOUNT | USD 60% DISCOUNT | +| Cloud Units | Description | USD NO DISCOUNT | USD 60% DISCOUNT | | ----------------- | ------------------------------------------------ | ------------------- | ---------------------------- | -| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 22.00/month | 8.80/month | -| Storage Unit (SU) | typically 1 TB of netto usable storage | 14.00/month | 5.60/month | +| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 22.00\/month | 8.80\/month | +| Storage Unit (SU) | typically 1 TB of netto usable storage | 14.00\/month | 5.60\/month | | Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 0.05/GB | 0.03/GB | -| IPv4 Address | Public Ip Address as used by a TFGrid user | 5.00/month | 3.00/month | +| IPv4 Address | Public Ip Address as used by a TFGrid user | 5.00\/month | 3.00\/month | ## Operation Fees From d8ff2ee54424a931828e036f42b732838c190b6e Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 13:53:24 -0400 Subject: [PATCH 3/8] manual cloud update --- collections/cloud/pricing/pricing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collections/cloud/pricing/pricing.md b/collections/cloud/pricing/pricing.md index 0e91cf0..6fed110 100644 --- a/collections/cloud/pricing/pricing.md +++ b/collections/cloud/pricing/pricing.md @@ -46,7 +46,7 @@ | ----------------- | ------------------------------------------------ | ------------------- | ---------------------------- | | Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 22.00\/month | 8.80\/month | | Storage Unit (SU) | typically 1 TB of netto usable storage | 14.00\/month | 5.60\/month | -| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 0.05/GB | 0.03/GB | +| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 0.05\/GB | 0.03\/GB | | IPv4 Address | Public Ip Address as used by a TFGrid user | 5.00\/month | 3.00\/month | ## Operation Fees From 0447c68059bd8939c900c4a1c40908c02eb6f351 Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 13:53:57 -0400 Subject: [PATCH 4/8] manual cloud update --- collections/cloud/pricing/pricing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collections/cloud/pricing/pricing.md b/collections/cloud/pricing/pricing.md index 6fed110..831d6ca 100644 --- a/collections/cloud/pricing/pricing.md +++ b/collections/cloud/pricing/pricing.md @@ -22,7 +22,7 @@ | ----------------- | ------------------------------------------------ | ------------------ | ------------------ | | Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 30.56 | 1091.43 | | Storage Unit (SU) | typically 1 TB of netto usable storage (*) | 19.44 | 694.29 | -| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00 | 1785.71 +| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00 | 1785.71 | |
From da783febb28e72ee3c3f71de593bba765e75d5df Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 13:54:25 -0400 Subject: [PATCH 5/8] manual cloud update --- collections/cloud/pricing/pricing.md | 1 - 1 file changed, 1 deletion(-) diff --git a/collections/cloud/pricing/pricing.md b/collections/cloud/pricing/pricing.md index 831d6ca..ae8f838 100644 --- a/collections/cloud/pricing/pricing.md +++ b/collections/cloud/pricing/pricing.md @@ -23,7 +23,6 @@ | Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 30.56 | 1091.43 | | Storage Unit (SU) | typically 1 TB of netto usable storage (*) | 19.44 | 694.29 | | Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00 | 1785.71 | - |
From 01707211fa11b7e94d0c22e8dd15f07e83cb2e5c Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 13:59:05 -0400 Subject: [PATCH 6/8] manual update links --- books/manual/SUMMARY.md | 2 +- collections/cloud/pricing/pricing.md | 1 - collections/dashboard/solutions/{vm.md => microvm.md} | 0 collections/dashboard/solutions/vm_intro.md | 4 ++-- 4 files changed, 3 insertions(+), 4 deletions(-) rename collections/dashboard/solutions/{vm.md => microvm.md} (100%) diff --git a/books/manual/SUMMARY.md b/books/manual/SUMMARY.md index 5c63322..7ef28da 100644 --- a/books/manual/SUMMARY.md +++ b/books/manual/SUMMARY.md @@ -12,7 +12,7 @@ - [Virtual Machines](dashboard/solutions/vm_intro.md) - [Micro and Full VM Differences ](dashboard/solutions/vm_differences.md) - [Full Virtual Machine](dashboard/solutions/fullVm.md) - - [Micro Virtual Machine](dashboard/solutions/vm.md) + - [Micro Virtual Machine](dashboard/solutions/microvm.md) - [Nixos MicroVM](dashboard/solutions/nixos_micro.md) - [Add a Domain](dashboard/solutions/add_domain.md) - [Orchestrators](dashboard/deploy/orchestrators.md) diff --git a/collections/cloud/pricing/pricing.md b/collections/cloud/pricing/pricing.md index ae8f838..6249209 100644 --- a/collections/cloud/pricing/pricing.md +++ b/collections/cloud/pricing/pricing.md @@ -34,7 +34,6 @@ - mUSD = 1/1000 of USD, mTFT = 1/1000 of TFT - TFT pricing pegged to USD (pricing changes in line with TFT/USD rate) -- The current TFT to USD price is !!wiki.include page:'manual:tft_value.md' USD - pricing is calculated per hour for the TFGrid 3.0 > Please check our [Cloud Pricing for utilization sheet](https://docs.google.com/spreadsheets/d/1E6MpGs15h1_flyT5AtyKp1TixH1ILuGo5tzHdmjeYdQ/edit#gid=2014089775) for more details. diff --git a/collections/dashboard/solutions/vm.md b/collections/dashboard/solutions/microvm.md similarity index 100% rename from collections/dashboard/solutions/vm.md rename to collections/dashboard/solutions/microvm.md diff --git a/collections/dashboard/solutions/vm_intro.md b/collections/dashboard/solutions/vm_intro.md index be0bf5f..b3544d3 100644 --- a/collections/dashboard/solutions/vm_intro.md +++ b/collections/dashboard/solutions/vm_intro.md @@ -5,7 +5,7 @@ On the TFGrid, you can deploy both micro and full virtual machines.

Table of Contents

- [Micro and Full VM Differences ](vm_differences.md) -- [Full Virtual Machine](fullVm.md) -- [Micro Virtual Machine](vm.md) +- [Full Virtual Machine](fullvm.md) +- [Micro Virtual Machine](microvm.md) - [Nixos MicroVM](nixos_micro.md) - [Add a Domain](add_domain.md) \ No newline at end of file From fa0a583ec1bc44d83b2e9e6e22f3c8cbef8ac026 Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 14:01:18 -0400 Subject: [PATCH 7/8] manual cloud update table --- collections/cloud/pricing/pricing.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/collections/cloud/pricing/pricing.md b/collections/cloud/pricing/pricing.md index 6249209..60db428 100644 --- a/collections/cloud/pricing/pricing.md +++ b/collections/cloud/pricing/pricing.md @@ -18,15 +18,15 @@ - A month is considered as 30 days (720 hours) - We are considering a TFT market price of 0.028 -| Cloud Units | Description | mUSD (per hour) | mTFT (per hour) | +| Cloud Units | Description | mUSD | mTFT | | ----------------- | ------------------------------------------------ | ------------------ | ------------------ | -| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 30.56 | 1091.43 | -| Storage Unit (SU) | typically 1 TB of netto usable storage (*) | 19.44 | 694.29 | -| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00 | 1785.71 | +| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 30.56\/hour | 1091.43\/hour | +| Storage Unit (SU) | typically 1 TB of netto usable storage (*) | 19.44\/hour | 694.29\/hour | +| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00\/hour | 1785.71\/hour |
-| Network Addressing | Description | mUSD (per hour) | mTFT (per hour) | +| Network Addressing | Description | mUSD | mTFT | | ------------------ | ------------------------------------------ | --------------------- | --------------------- | | IPv4 Address | Public Ip Address as used by a TFGrid user | 6.94 | 247.86 | | Unique Name | Usable as name on webgateways | 1.39 | 49.64 | From 119a84e5f83382c9441eb743b926d0426bf5dfea Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 14 May 2024 14:02:17 -0400 Subject: [PATCH 8/8] manual cloud update table --- collections/cloud/pricing/pricing.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/collections/cloud/pricing/pricing.md b/collections/cloud/pricing/pricing.md index 60db428..d2eae09 100644 --- a/collections/cloud/pricing/pricing.md +++ b/collections/cloud/pricing/pricing.md @@ -28,9 +28,9 @@ | Network Addressing | Description | mUSD | mTFT | | ------------------ | ------------------------------------------ | --------------------- | --------------------- | -| IPv4 Address | Public Ip Address as used by a TFGrid user | 6.94 | 247.86 | -| Unique Name | Usable as name on webgateways | 1.39 | 49.64 | -| Unique Domain Name | Usable as dns name on webgateways | 2.78 | 99.29 | +| IPv4 Address | Public Ip Address as used by a TFGrid user | 6.94\/hour | 247.86\/hour | +| Unique Name | Usable as name on webgateways | 1.39\/hour | 49.64\/hour | +| Unique Domain Name | Usable as dns name on webgateways | 2.78\/hour | 99.29\/hour | - mUSD = 1/1000 of USD, mTFT = 1/1000 of TFT - TFT pricing pegged to USD (pricing changes in line with TFT/USD rate) @@ -40,7 +40,7 @@ ## Pricing Expressed Per Month -| Cloud Units | Description | USD NO DISCOUNT | USD 60% DISCOUNT | +| Cloud Units | Description | USD - No Discount | USD - 60% Discount | | ----------------- | ------------------------------------------------ | ------------------- | ---------------------------- | | Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 22.00\/month | 8.80\/month | | Storage Unit (SU) | typically 1 TB of netto usable storage | 14.00\/month | 5.60\/month |