Merge branch 'develop' of https://github.com/dashpay/dash into develop

Author: PastaPastaPasta

src/active/context.cpp

@@ -70,6 +70,7 @@ void ActiveContext::Start(CConnman& connman, PeerManager& peerman, int16_t worke
     cl_signer->Start();
     cl_signer->RegisterRecoveryInterface();
     is_signer->RegisterRecoveryInterface();
+    shareman->RegisterRecoveryInterface();
 
     RegisterValidationInterface(cl_signer.get());
 }
@@ -78,6 +79,7 @@ void ActiveContext::Stop()
 {
     UnregisterValidationInterface(cl_signer.get());
 
+    shareman->UnregisterRecoveryInterface();
     is_signer->UnregisterRecoveryInterface();
     cl_signer->UnregisterRecoveryInterface();
     cl_signer->Stop();

test/functional/p2p_instantsend.py

@@ -139,10 +139,7 @@ def test_instantsend_after_restart(self):
         receiver = self.nodes[self.receiver_idx]
         sender_addr = sender.getnewaddress()
         fund_id = self.nodes[0].sendtoaddress(sender_addr, 1)
-        self.bump_mocktime(30)
-        self.sync_mempools()
-        for node in self.nodes:
-            self.wait_for_instantlock(fund_id, node)
+        self.wait_for_instantlock(fund_id)
         tip = self.generate(self.nodes[0], 2)[-1]
         self.bump_mocktime(30)
         self.wait_for_chainlocked_block_all_nodes(tip)
@@ -199,10 +196,7 @@ def check_mn_peers(node=mn_node, my_hash=mn_info.proTxHash):
 
         # send a TX — needs IS lock from all restarted MNs, no new blocks mined
         is_id = sender.sendtoaddress(receiver_addr, 0.5)
-        self.bump_mocktime(30)
-        self.sync_mempools()
-        for node in self.nodes:
-            self.wait_for_instantlock(is_id, node)
+        self.wait_for_instantlock(is_id)
         self.log.info("InstantSend lock succeeded after full restart")
 
         # clean up