test: various fixes to get pox-5 integration tests working again

Author: brice-stacks

stacks-node/src/tests/nakamoto_integrations.rs

@@ -19580,6 +19580,11 @@ fn check_pox_5_stake_lifecycle() {
         &mut btc_regtest_controller,
     );
     info!("Bootstrapped to Epoch-3.0 boundary, starting nakamoto miner");
+    // boot_to_epoch_3 replaces signer_keys with the pox-4 signer; the pox-5
+    // staker below registers `signer_sk` and that key ends up in the reward
+    // set once pox-5 takes over signing. Add it now so blind_signer's clone
+    // can produce valid signatures across the pox-4 → pox-5 cycle boundary.
+    signers.signer_keys.push(signer_sk.clone());
     blind_signer(&naka_conf, &signers, &counters);
     wait_for_first_naka_block_commit(60, &counters.naka_submitted_commits);
 
@@ -19780,6 +19785,7 @@ fn check_pox_5_stake_lifecycle() {
         "pox-5",
         "stake-update",
         &[
+            Value::Principal(test_signer_principal.clone()),
             Value::Principal(test_signer_principal.clone()),
             Value::UInt(1),
             Value::UInt(extra),
@@ -19825,7 +19831,7 @@ fn check_pox_5_stake_lifecycle() {
             &pox_5_addr,
             "pox-5",
             "unstake",
-            &[],
+            &[Value::Principal(test_signer_principal.clone())],
         );
         let unstake_txid = submit_tx(&http_origin, &unstake_tx);
         info!("Submitted pox-5 unstake txid: {unstake_txid} (attempt {attempt})");
@@ -20017,6 +20023,11 @@ fn check_pox_5_register_for_bond_lifecycle() {
         &mut btc_regtest_controller,
     );
     info!("Bootstrapped to Epoch-3.0 boundary, starting nakamoto miner");
+    // boot_to_epoch_3 replaces signer_keys with the pox-4 signer; the pox-5
+    // staker below registers `signer_sk` and that key ends up in the reward
+    // set once pox-5 takes over signing. Add it now so blind_signer's clone
+    // can produce valid signatures across the pox-4 → pox-5 cycle boundary.
+    signers.signer_keys.push(signer_sk.clone());
     blind_signer(&naka_conf, &signers, &counters);
     wait_for_first_naka_block_commit(60, &counters.naka_submitted_commits);
 
@@ -20205,6 +20216,7 @@ fn check_pox_5_register_for_bond_lifecycle() {
             Value::UInt(100),
             Value::UInt(10000),
             Value::buff_from(vec![0u8; 683]).unwrap(),
+            Value::Principal(bond_admin_addr.clone().into()),
             allowlist_value,
         ],
     );
@@ -20360,7 +20372,7 @@ fn check_pox_5_register_for_bond_lifecycle() {
         &pox_5_addr,
         "pox-5",
         "unstake",
-        &[],
+        &[Value::Principal(test_signer_principal.clone())],
     );
     let unstake_txid = submit_tx(&http_origin, &unstake_tx);
     info!("Submitted pox-5 unstake (bond holder) txid: {unstake_txid}");
@@ -21439,6 +21451,7 @@ fn check_with_stacking_allowances_register_for_bond() {
             Value::UInt(100),
             Value::UInt(10000),
             Value::buff_from(vec![0u8; 683]).unwrap(),
+            Value::Principal(bond_admin_addr.clone().into()),
             allowlist_value,
         ],
     );

stackslib/src/chainstate/nakamoto/signer_set.rs

@@ -326,21 +326,21 @@ impl<'a, 'b, 'c> StakeEntryIteratorPox5<'a, 'b, 'c> {
             .clarity
             .eval_method_read_only(
                 &self.pox_contract,
-                "get-staker-set-next-item-for-cycle",
+                "get-signer-set-next-item-for-cycle",
                 &[lookup_signer.clone(), self.reward_cycle_clar.clone()],
             )
             .map_err(|e| PoxEntryParsingError::Abort(e.to_string()))?
             .expect_optional()
             .map_err(|_| {
                 PoxEntryParsingError::Abort(
-                    "get-staker-set-next-item-for-cycle did not return optional".into(),
+                    "get-signer-set-next-item-for-cycle did not return optional".into(),
                 )
             })?
             .map(|entry| entry.expect_principal())
             .transpose()
             .map_err(|_| {
                 PoxEntryParsingError::Abort(
-                    "get-staker-set-next-item-for-cycle did not return principal".into(),
+                    "get-signer-set-next-item-for-cycle did not return principal".into(),
                 )
             })?;
         self.current_signer = next_signer;
@@ -436,20 +436,20 @@ impl NakamotoSigners {
         let current_signer = clarity
             .eval_method_read_only(
                 &pox_contract,
-                "get-staker-set-first-item-for-cycle",
+                "get-signer-set-first-item-for-cycle",
                 &[reward_cycle_clar.clone()],
             )?
             .expect_optional()
             .map_err(|_| {
                 ChainstateError::Expects(
-                    "get-staker-set-first-item-for-cycle did not return optional".into(),
+                    "get-signer-set-first-item-for-cycle did not return optional".into(),
                 )
             })?
             .map(|value| value.expect_principal())
             .transpose()
             .map_err(|_| {
                 ChainstateError::Expects(
-                    "get-staker-set-first-item-for-cycle did not return optional principal".into(),
+                    "get-signer-set-first-item-for-cycle did not return optional principal".into(),
                 )
             })?;