Browse Source

docs: fix conflicts

feat/new-clarity-onboarding
Alexander Graebe 4 years ago
committed by Alexander Graebe
parent
commit
073cc60482
  1. 8
      src/pages/understand-stacks/integrate-stacking.md
  2. 8
      src/pages/understand-stacks/stacking.md

8
src/pages/understand-stacks/integrate-stacking.md

@ -331,8 +331,10 @@ Stacking delegation requires you to implement a different flow. Until the provid
Below is a description of contract calls required to integrate delegation:
1. Account holders call the [`delegate-stx`](/references/stacking-contract#delegate-stx) method and provide the delegator address, the amount accessible to the delegator, the address rewards should be sent to, and the burn height at which the delegation relationship should be terminated
2. For each delegation relationship that was created, the delegator calls the [`delegator-stack-stx`](/references/stacking-contract#delegate-stack-stx) method to lock up the STX token from the account holder. This method must be called until the delegator locked up enough STX tokens required to participate in Stacking
1. Account holders call the [`delegate-stx`](/references/stacking-contract#delegate-stx) method and provide the delegator address, the amount accessible to the delegator, the address rewards should be send to, and the burn height at which the delegation relationship should be terminated. This needs to happen only once. The account holder can specify a delegation amount that is higher that their balance
2. For each delegation relationship that was created, the delegator calls the [`delegate-stack-stx`](/references/stacking-contract#delegate-stack-stx) method to lock up the STX token from the account holder. This method must be called during each cycle (unless specified for multiple cycles) and until the delegator locked up enough STX tokens required to participate in Stacking. This method will check the account balances. Once successfully executed, the STX tokens in the account will be locked up
3. With pooling being completed and the minimum STX token threshold reached, the delegator calls the [`stack-aggregation-commit`](/references/stacking-contract#stack-aggregation-commit) to confirm participation in the next cycle(s)
In case STX token holders want to terminate the delegation relationship before it terminates as planned, they can call the [`revoke-delegate-stx`](http://localhost:3000/references/stacking-contract#revoke-delegate-stx) method
In case STX token holders want to terminate the delegation relationship before it terminates as planned, they can call the [`revoke-delegate-stx`](http://localhost:3000/references/stacking-contract#revoke-delegate-stx) method.
-> A delegator doesn't need to _own_ a minimum amount ot STX token to reach the threshold. However, they need funds to pay for transaction fees on the network.

8
src/pages/understand-stacks/stacking.md

@ -7,8 +7,6 @@ images:
## Introduction
!> The Stacking implementation is still in development and could change in the coming weeks
Stacking rewards Stacks (STX) token holders with bitcoin for providing a valuable service to the network by locking up their tokens for a certain time.
Stacking is a built-in action, required by the "proof-of-transfer" (PoX) mechanism. The PoX mechanism is executed by every miner on the Stacks 2.0 network.
@ -25,11 +23,13 @@ The Stacking mechanism can be presented as a flow of actions:
2. For a specific Stacks account, confirm eligibility
3. Confirm the BTC reward address and the lockup duration
4. The transaction is broadcasted and the Stacks (STX) tokens will be locked-up
5. The Stacking mechanism executes reward cycles and sends out rewards to the set BTC reward address
5. The Stacking mechanism executes reward cycles. With each mined block, it sends out rewards to 2 BTC reward addresses. With 1000 blocks in each cycle, that's 2000 rewards per cycle.
6. During the lockup period, details about unlocking timing, rewards and more can be obtained
7. Once the lockup period is passed, the tokens are released and accessible again
8. Display reward history, including details like earnings for previous reward cycles
-> Keep in mind that the target duration for a reward cycles is ~2 weeks. This duration is based on the target block time of the network (10 minutes) and can be higher at times due to [confirmation time variances](https://www.blockchain.com/charts/median-confirmation-time) of the bitcoin network.
If you would like to implement this flow in your own wallet, exchange, or any other application, please have a look at this tutorial:
[@page-reference | inline]
@ -74,7 +74,7 @@ Miners have to run a software (mining client, aka "miner") on their machines to
Stacks (STX) token holders do not automatically receive Stacking rewards. Instead, they must:
- Commit to participation before a reward cycle begins
- Hold ~94,000 Stacks (STX) tokens (or pool with others to reach the minimum)
- Hold ~94,000 Stacks (STX) tokens (at the moment of writing; increases over time)
- Lock up Stacks (STX) tokens for a specified period
- Set a Bitcoin address to receive rewards

Loading…
Cancel
Save