Merge remote-tracking branch 'core/release/3.2.0.0.0-rc1' into feat/sip31-boot-contract-tests

Author: hstove

stacks-node/src/tests/nakamoto_integrations.rs

@@ -12639,7 +12639,7 @@ fn write_signer_update(
 /// Test SIP-031 activation
 ///
 /// - check epoch 3.2 is active
-/// - check sip031 boot contract has a balance of 200_000_000 STX (TODO)
+/// - check sip031 boot contract has a balance of 200_000_000 STX
 #[test]
 #[ignore]
 fn test_sip_031_activation() {
@@ -12721,7 +12721,29 @@ fn test_sip_031_activation() {
 
     wait_for_first_naka_block_commit(60, &commits_submitted);
 
-    // mine until epooch 3.2 height
+    // retrieve current liquidity
+    let last_block_id = StacksBlockId::from_hex(
+        &test_observer::get_blocks()
+            .last()
+            .unwrap()
+            .get("index_block_hash")
+            .unwrap()
+            .as_str()
+            .unwrap()[2..],
+    )
+    .unwrap();
+
+    let sip_031_initial_total_liquid_ustx = chainstate
+        .with_read_only_clarity_tx(
+            &sortdb
+                .index_handle_at_block(&chainstate, &last_block_id)
+                .unwrap(),
+            &last_block_id,
+            |conn| conn.with_clarity_db_readonly(|db| db.get_total_liquid_ustx().unwrap()),
+        )
+        .unwrap();
+
+    // mine until epoch 3.2 height
     loop {
         let commits_before = commits_submitted.load(Ordering::SeqCst);
         next_block_and_process_new_stacks_block(&mut btc_regtest_controller, 60, &coord_channel)
@@ -12798,6 +12820,19 @@ fn test_sip_031_activation() {
         }))
     );
 
+    // check liquidity has been updated accordingly
+    let sip_031_total_liquid_ustx = chainstate
+        .with_read_only_clarity_tx(
+            &sortdb
+                .index_handle_at_block(&chainstate, &latest_stacks_block_id)
+                .unwrap(),
+            &latest_stacks_block_id,
+            |conn| conn.with_clarity_db_readonly(|db| db.get_total_liquid_ustx().unwrap()),
+        )
+        .unwrap();
+
+    assert!(sip_031_total_liquid_ustx - sip_031_initial_total_liquid_ustx >= SIP_031_INITIAL_MINT);
+
     // check if the coinbase activation block receipt has the mint event
     let mut mint_event_found: Option<serde_json::Value> = None;
     let mut coinbase_txid: Option<String> = None;
@@ -12846,7 +12881,7 @@ fn test_sip_031_activation() {
             .unwrap()
             .as_str()
             .unwrap(),
-        "200000000000000"
+        SIP_031_INITIAL_MINT.to_string()
     );
 
     // check the recipient

stackslib/src/clarity_vm/clarity.rs

@@ -1635,7 +1635,7 @@ impl<'a> ClarityBlockConnection<'a, '_> {
             };
 
             let boot_code_address = boot_code_addr(mainnet);
-            let boot_code_auth = boot_code_tx_auth(boot_code_address.clone());
+            let boot_code_auth = boot_code_tx_auth(boot_code_address);
 
             // SIP-031 setup (deploy of the boot contract, minting and transfer to the boot contract)
             let sip_031_contract_id = boot_code_id(SIP_031_NAME, mainnet);
@@ -1654,28 +1654,28 @@ impl<'a> ClarityBlockConnection<'a, '_> {
 
             let mut sip_031_initialization_receipt = self.as_transaction(|tx_conn| {
                 // initialize with a synthetic transaction
-                debug!("Instantiate {} contract", &sip_031_contract_id);
+                info!("Instantiate {} contract", &sip_031_contract_id);
                 let receipt = StacksChainState::process_transaction_payload(
                     tx_conn,
                     &sip_031_contract_tx,
                     &boot_code_account,
                     ASTRules::PrecheckSize,
                     None,
                 )
-                .expect("FATAL: Failed to process .sip031 contract initialization");
+                .expect("FATAL: Failed to process .sip-031 contract initialization");
                 receipt
             });
 
             if sip_031_initialization_receipt.result != Value::okay_true()
                 || sip_031_initialization_receipt.post_condition_aborted
             {
                 panic!(
-                    "FATAL: Failure processing sip031 contract initialization: {:#?}",
+                    "FATAL: Failure processing sip-031 contract initialization: {:#?}",
                     &sip_031_initialization_receipt
                 );
             }
 
-            let recipient = PrincipalData::Contract(boot_code_id(SIP_031_NAME, mainnet));
+            let recipient = PrincipalData::Contract(sip_031_contract_id);
 
             self.as_transaction(|tx_conn| {
                 tx_conn