GITBOOK-89: No subject

stacks-network · Apr 11, 2024 · 6af9c73 · 6af9c73
1 parent eb48251
commit 6af9c73
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 40 deletions.
diff --git a/.gitbook/assets/Stacking Graphic (1).png b/.gitbook/assets/Stacking Graphic (1).png
diff --git a/.gitbook/assets/image (1) (1) (1) (1) (1) (1).png b/.gitbook/assets/image (1) (1) (1) (1) (1) (1).png
diff --git a/.gitbook/assets/image (1) (1) (1) (1) (1).png b/.gitbook/assets/image (1) (1) (1) (1) (1).png
diff --git a/.gitbook/assets/image (1) (1) (1) (1).png b/.gitbook/assets/image (1) (1) (1) (1).png
diff --git a/.gitbook/assets/image (1) (1) (1).png b/.gitbook/assets/image (1) (1) (1).png
diff --git a/.gitbook/assets/image (1).png b/.gitbook/assets/image (1).png
diff --git a/.gitbook/assets/image.png b/.gitbook/assets/image.png
diff --git a/nakamoto-upgrade/nakamoto-in-10-minutes.md b/nakamoto-upgrade/nakamoto-in-10-minutes.md
@@ -42,7 +42,7 @@ This elegant design creates a cooperative relationship between miners and stacke
 
 Here is a diagram outlining miner and signer behavior.
 
-<figure><img src="../.gitbook/assets/image (1) (1) (1) (1).png" alt=""><figcaption></figcaption></figure>
+<figure><img src="../.gitbook/assets/image (1) (1) (1) (1) (1).png" alt=""><figcaption></figcaption></figure>
 
 ### Bitcoin Finality
 

diff --git a/nakamoto-upgrade/nakamoto-rollout-plan/README.md b/nakamoto-upgrade/nakamoto-rollout-plan/README.md
@@ -7,7 +7,7 @@ description: >-
 
 # Nakamoto Rollout Plan
 
-The current projection for the Instantiation step of the Nakamoto rollout is \~April 15th at Bitcoin block 839,444. You can check the [real-time projection here](https://stacks-network.github.io/when-activation/2.5/). &#x20;
+The current projection for the Instantiation step of the Nakamoto rollout is \~April 22nd at Bitcoin block 840,360. You can check the [real-time projection here](https://stacks-network.github.io/when-activation/2.5/). &#x20;
 
 #### **TL;DR:**
 
@@ -46,6 +46,10 @@ This means that assuming there are no major bugs or issues, full Nakamoto featur
 
 ### Visualizing the rollout
 
-<figure><img src="../../.gitbook/assets/Screenshot 2024-04-10 141918.png" alt=""><figcaption></figcaption></figure>
+<div data-full-width="true">
+
+<figure><img src="../../.gitbook/assets/image.png" alt=""><figcaption></figcaption></figure>
+
+</div>
 
 **Note about sBTC Rollout:** Previous [updates](https://stacks.org/halving-on-horizon-nakamoto) mentioned targeting a launch of sBTC 2-3 months after Nakamoto Mainnet is live and stable. Once Nakamoto reaches Step 1 (Instantiation) in April, many Core Developers will turn their focus to sBTC and produce a more detailed rollout plan to share.
diff --git a/nakamoto-upgrade/nakamoto-rollout-plan/nakamoto-for-exchanges.md b/nakamoto-upgrade/nakamoto-rollout-plan/nakamoto-for-exchanges.md
@@ -45,7 +45,7 @@ You can learn more about the 2-step rollout structure here: [.](./ "mention") in
 
 There are two steps for Nakamoto rollout exchanges should be aware of:
 
-1. **Instantiation block:** The first hard fork occurs <mark style="color:orange;">at Bitcoin block 839,444</mark> which is currently projected for \~April 16**.** At this time, exchanges will need to upgrade to the latest node software or they will not process valid blocks and users will not be able to move funds on the network.
+1. **Instantiation block:** The first hard fork occurs <mark style="color:orange;">at Bitcoin block 840,360</mark> which is currently projected for \~April 22nd. You can check the [real-time projection here](https://stacks-network.github.io/when-activation/2.5/).  At this time, exchanges will need to upgrade to the latest node software or they will not process valid blocks and users will not be able to move funds on the network.
 2. **Activation block:** The second hard fork occurs between May 15 and 29th. At this time, the Nakamoto consensus rules will activate, meaning the new Nakamoto features will be made live. Exchanges will need to repeat the upgrade process at this time. Again, no genesis sync, just a download and restart.
 
 ### Other Recommendations:

diff --git a/nakamoto-upgrade/nakamoto-rollout-plan/nakamoto-for-stackers.md b/nakamoto-upgrade/nakamoto-rollout-plan/nakamoto-for-stackers.md
@@ -1,33 +1,17 @@
 # Nakamoto for Stackers
 
-The current projection for the Instantiation step of the Nakamoto rollout is \~April 15th at Bitcoin block 839,444. You can check the [real-time projection here](https://stacks-network.github.io/when-activation/2.5/). Remember that Nakamoto is being rolled out in two phases, and this represents the first phase.
+The current projection for the Instantiation step of the Nakamoto rollout is \~April 22nd at Bitcoin block 840,360. You can check the [real-time projection here](https://stacks-network.github.io/when-activation/2.5/).  Remember that Nakamoto is being rolled out in two phases, and this represents the first phase.
 
 ***
 
 Stackers, here’s what you need to be ready for the first of 2 forks that will [bring us the Nakamoto upgrade](https://docs.stacks.co/nakamoto-upgrade/nakamoto-rollout-plan)!
 
-* Your STX will automatically unlock at Bitcoin block 839,444 (approximately April 15th)
-* Despite your STX being unlocked before the end of Cycle 82, you will still earn the full rewards from the cycle.
+* Your STX will automatically unlock at Bitcoin block 840,360 (approximately April 22nd)
+* Despite your STX being unlocked for Cycle 83, you will still earn the full rewards from the cycle
 * There are no frozen cycles, so you can immediately re-Stack after the upgrade
-* Given the timing of the upgrade, you’ll only have about 3 days to initiate Stacking for Cycle 83.
-* The [tight turnaround](nakamoto-for-stackers.md#why-the-tight-turnaround-for-cycle-83) means that **not all Stacking providers will be ready to serve you**. Pools that will be ready for Cycle 83 will be listed here. Please message _signers@stacks.org_ if your pool will be avialable for users in Cycle 83.
-  * Coming soon
-  * Coming soon
-  * Coming soon
+* You will have all of Cycle 83 to initiate Stacking for Cycle 84. Follow updates from your Stacking provider/pool to be notified when they are ready to receive your new Stacking calls for Cycle 84
 
-<figure><img src="../../.gitbook/assets/Image from Skiff (1).png" alt=""><figcaption></figcaption></figure>
-
-#### Rewards in Cycle 83
-
-Unlike previous major updates, core developers have left Stackers a decent chance at not having any missed reward cycles. The determining factor for whether or not rewards will be paid in Cycle 83 is if enough STX (73M PoX minimum) can be locked in time. Whether or not that happens will be determined both by how quickly Stacking pools can upgrade to support the new pox contract and then if users are able to Stack enough total for the cycle. Core contributors and the Stacks Foundation have offered support to pools in hopes the minimum can be met for Cycle 83. If the minimum is not achieved, the upgrade will proceed much as those before it with a proof of burn cycle for Cycle 83. PoX and BTC rewards would then reactivate for the next cycle after which the 73M threshold is reached.
-
-<details>
-
-<summary>Why the tight turnaround for Cycle 83?</summary>
-
-While not ideal timing for pool operators, the chosen Bitcoin block was the earliest block within the Instantiation window the core developers felt comfortable with the release and consistent feedback from builders is that the faster Nakamoto can be shipped, the better. While it didn’t leave a lot of time for pools to be upgraded for Cycle 83, many have been working on testnet and can be ready. Considering all the factors, it’s likely the net benefit to the ecosystem for shipping sooner is much greater than the potential downside of one proof-of-burn cycle for the upgrade. Further, a missed cycle for major upgrades has been the expected standard - that there is a decent chance we may not skip one at all is a great bonus goal for the network to try and achieve.
-
-</details>
+<figure><img src="../../.gitbook/assets/Stacking Graphic (1).png" alt=""><figcaption></figcaption></figure>
 
 {% hint style="info" %}
 **Reminder:** The network does not _**depend**_ on Signers for block production until the second hard fork expected in May. Learn More: [https://docs.stacks.co/nakamoto-upgrade/nakamoto-rollout-plan](https://docs.stacks.co/nakamoto-upgrade/nakamoto-rollout-plan)

diff --git a/nakamoto-upgrade/nakamoto-rollout-plan/nakamoto-for-stacking-providers.md b/nakamoto-upgrade/nakamoto-rollout-plan/nakamoto-for-stacking-providers.md
@@ -1,6 +1,6 @@
 # Nakamoto for Stacking Providers
 
-The current projection for the Instantiation step of the Nakamoto rollout is \~April 15th at Bitcoin block 839,444. You can check the [real-time projection here](https://stacks-network.github.io/when-activation/2.5/). &#x20;
+The current projection for the Instantiation step of the Nakamoto rollout is \~April 22nd at Bitcoin block 840,360. You can check the [real-time projection here](https://stacks-network.github.io/when-activation/2.5/).
 
 ***
 
@@ -25,27 +25,21 @@ There are a few basic steps you'll need to follow to get your Stacking pool set
 
 ## Timing
 
-First, it's important to understand that on \~April 15th, at Bitcoin block 839,444, all STX will automatically unlock from the network as part of the hard fork. This is network wide.&#x20;
+First, it's important to understand that on \~April 22nd, at Bitcoin block 840,360, all STX will automatically unlock from the network as part of the hard fork. This is network wide.&#x20;
 
 As providers, you ultimately have as long as you need to make the Nakamoto upgrade, however, the faster you're able to upgrade, the fewer cycles your users will miss rewards for. Though there is a tight turnaround, you can actually upgrade fast enough such that users potentially miss zero cycles ([learn more](nakamoto-for-stacking-providers.md#rewards-in-cycle-83)). Some pools have been working with the [Nakamoto Testnet](../nakamoto/) in this interest, but it is not a requirement.&#x20;
 
-<figure><img src="../../.gitbook/assets/Image from Skiff (1).png" alt=""><figcaption><p>A timeline of Stacking from the Stackers perspective</p></figcaption></figure>
+<figure><img src="../../.gitbook/assets/Stacking Graphic (1).png" alt=""><figcaption></figcaption></figure>
 
-#### Cycle 83
+#### Cycle 84
 
-If you hope to have your Stacking pool ready for Cycle 83:&#x20;
+If you would like to avoid your users missing a Stacking cycle, you will need to upgrade your Stacking pool ahead of Cycle 84:&#x20;
 
 * You'll need to make sure that you follow the steps [outlined above](nakamoto-for-stacking-providers.md#upgrading-your-stacking-pool-or-service) as soon as possible.&#x20;
 * All Stacking now requires running a Signer, so you'll need to [follow the instructions](../signing-and-stacking/running-a-signer.md) to set it up. This is likely the newest or most difficult part, please reach out to your point of contact in the Stacks ecosystem for technical support as needed.&#x20;
-* You'll need to have your upgrades done AND give enough time for your users to re-delegate to your pool before the start of cycle 83 (\~April 20th).
+* You'll need to have your upgrades done AND give enough time for your users to re-delegate to your pool before the start of cycle 84 (\~May 6th).
 
-#### Rewards in Cycle 83
 
-Unlike previous major updates, core developers have left Stackers a decent chance at not having any missed reward cycles. The determining factor for whether or not rewards will be paid in Cycle 83 is if enough STX (73M PoX minimum) can be locked in time. Whether or not that happens will be determined both by how quickly Stacking pools can upgrade to support the new pox contract and then if users are able to Stack enough total for the cycle. Core contributors and the Stacks Foundation have offered support to pools in hopes the minimum can be met for Cycle 83. If the minimum is not achieved, the upgrade will proceed much as those before it with a proof of burn cycle for Cycle 83. PoX and BTC rewards would then reactivate for the next cycle after which the 73M threshold is reached.
-
-#### **Why the tight turnaround for Cycle 83?**&#x20;
-
-While not ideal timing for pool operators, the chosen Bitcoin block was the earliest block within the Instantiation window the core developers felt comfortable with the release and consistent feedback from builders is that the faster Nakamoto can be shipped, the better. While it didn’t leave a lot of time for pools to be upgraded for Cycle 83, many have been working on testnet and can be ready. Considering all the factors, it’s likely the net benefit to the ecosystem for shipping sooner is much greater than the potential downside of one proof-of-burn cycle for the upgrade. Further, a missed cycle for major upgrades has been the expected standard - that there is a decent chance we may not skip one at all is a great bonus goal for the network to try and achieve.
 
 {% hint style="info" %}
 **Reminder:** The network does not _**depend**_ on Signers for block production until the second hard fork expected in May. Learn More: [.](./ "mention")

diff --git a/nakamoto-upgrade/nakamoto/README.md b/nakamoto-upgrade/nakamoto/README.md
@@ -70,7 +70,7 @@ This testnet is what is covered in this doc.
 
 Here is graphic outlining the differeces, click to zoom.
 
-<img src="../../.gitbook/assets/image (1) (1).png" alt="" data-size="original">
+<img src="../../.gitbook/assets/image (1) (1) (1).png" alt="" data-size="original">
 
 </details>
 

diff --git a/nakamoto-upgrade/signing-and-stacking/running-a-signer.md b/nakamoto-upgrade/signing-and-stacking/running-a-signer.md
@@ -177,7 +177,7 @@ To make sure your signer is running successfully, run `docker ps` to list your r
 
 You should see something like this
 
-<figure><img src="../../.gitbook/assets/image.png" alt=""><figcaption></figcaption></figure>
+<figure><img src="../../.gitbook/assets/image (1).png" alt=""><figcaption></figcaption></figure>
 
 Now check the logs of that container by running:
 

diff --git a/stacks-101/post-conditions.md b/stacks-101/post-conditions.md
@@ -28,7 +28,7 @@ When you use a Stacks wallet like the Hiro web wallet and initiate a transaction
 
 Here's what that looks like:
 
-<figure><img src="../.gitbook/assets/image (1) (1) (1) (1) (1).png" alt=""><figcaption></figcaption></figure>
+<figure><img src="../.gitbook/assets/image (1) (1) (1) (1) (1) (1).png" alt=""><figcaption></figcaption></figure>
 
 In this example, if the smart contract does not transfer one fabulous-frog NFT and and take 50 STX from the user, the transaction will abort.