main into dev #50

Merged
mik-tf merged 64 commits from main into development 2024-05-10 10:46:13 +00:00
4 changed files with 5 additions and 5 deletions
Showing only changes of commit 9fa59f9cb0 - Show all commits

View File

@ -13,7 +13,7 @@ No connection is made with the Internet. The ZNet is a single tenant network and
### Redundancy
As integrated with [Web Gateway (WebGW)](webgw):
As integrated with [Web Gateway (WebGW)](webgw.md)
![alt text](net2.png)

View File

@ -108,4 +108,4 @@ Here are the details of this proposition:
3. Note: the current option to add an additional contract on top of the current one means unequal competition. So not ideal.
5. Adjust 30-min wakeup rule slashing: adjust slashing up until the day of violation instead of for the whole minting period
Note: This is based on community feedback over many discussions. Ideally, we can integrate those points here with the ongoing 3.14 plan as shared by Kristof at the top of this page. [Link to 3.14 ebook](https://threefold.info/tfgrid3/tfgrid3/intro.html)
Note: This is based on community feedback over many discussions. Ideally, we can integrate those points here with the ongoing 3.14 and 3.15 plans.

View File

@ -25,8 +25,8 @@ More information [in our manual](https://manual.grid.tf/knowledge_base/farming/f
### 2. Proof Of Utilization
- 50% of utilized capacity which comes over the portal from *TFCOOP will be given to the farmer
- 40% of utilized capacity goes to *TFCOOP
- 50% of utilized capacity which comes over the portal from the TFCOOP will be given to the farmer
- 40% of utilized capacity goes to the TFCOOP
- 10% of utilized capacity goes to Stakers on the Validators
<br>

View File

@ -8,4 +8,4 @@
## More info
- [Farming rewards](farming_reward.md)
- [Token overview](token_overview.md)
- [Token overview](tokens_overview.md)