Merge branch 'master' into feat/vote_with_address_for_proposal

DeFiCh · Feb 3, 2023 · 5c903ac · 5c903ac
2 parents ed8cbe9 + faaad56
commit 5c903ac
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/masternodes/mn_rpc.cpp b/src/masternodes/mn_rpc.cpp
@@ -583,10 +583,12 @@ UniValue setgov(const JSONRPCRequest& request) {
     CCoinControl coinControl;
 
     // Set change to selected foundation address
-    CTxDestination dest;
-    ExtractDestination(*auths.cbegin(), dest);
-    if (IsValidDestination(dest)) {
-        coinControl.destChange = dest;
+    if (!auths.empty()) {
+        CTxDestination dest;
+        ExtractDestination(*auths.cbegin(), dest);
+        if (IsValidDestination(dest)) {
+            coinControl.destChange = dest;
+        }
     }
 
     fund(rawTx, pwallet, optAuthTx, &coinControl);
@@ -673,10 +675,12 @@ UniValue unsetgov(const JSONRPCRequest& request) {
     CCoinControl coinControl;
 
     // Set change to selected foundation address
-    CTxDestination dest;
-    ExtractDestination(*auths.cbegin(), dest);
-    if (IsValidDestination(dest)) {
-        coinControl.destChange = dest;
+    if (!auths.empty()) {
+        CTxDestination dest;
+        ExtractDestination(*auths.cbegin(), dest);
+        if (IsValidDestination(dest)) {
+            coinControl.destChange = dest;
+        }
     }
 
     fund(rawTx, pwallet, optAuthTx, &coinControl);
@@ -767,10 +771,12 @@ UniValue setgovheight(const JSONRPCRequest& request) {
     CCoinControl coinControl;
 
     // Set change to selected foundation address
-    CTxDestination dest;
-    ExtractDestination(*auths.cbegin(), dest);
-    if (IsValidDestination(dest)) {
-        coinControl.destChange = dest;
+    if (!auths.empty()) {
+        CTxDestination dest;
+        ExtractDestination(*auths.cbegin(), dest);
+        if (IsValidDestination(dest)) {
+            coinControl.destChange = dest;
+        }
     }
 
     fund(rawTx, pwallet, optAuthTx, &coinControl);

diff --git a/test/functional/feature_on_chain_government_voting_scenarios.py b/test/functional/feature_on_chain_government_voting_scenarios.py
@@ -20,7 +20,7 @@ def set_test_params(self):
         self.num_nodes = 1
         self.setup_clean_chain = True
         self.extra_args = [
-            ['-jellyfish_regtest=1', '-dummypos=0', '-txnotokens=0', '-amkheight=50', '-bayfrontheight=51', '-eunosheight=80', '-fortcanningheight=82', '-fortcanninghillheight=84', '-fortcanningroadheight=86', '-fortcanningcrunchheight=88', '-fortcanningspringheight=90', '-fortcanninggreatworldheight=94', '-grandcentralheight=101', '-simulatemainnet=1'],
+            ['-jellyfish_regtest=1', '-dummypos=0', '-txnotokens=0', '-amkheight=50', '-bayfrontheight=51', '-eunosheight=80', '-fortcanningheight=82', '-fortcanninghillheight=84', '-fortcanningroadheight=86', '-fortcanningcrunchheight=88', '-fortcanningspringheight=90', '-fortcanninggreatworldheight=94', '-grandcentralheight=101', '-rpc-governance-accept-neutral=1', '-simulatemainnet=1'],
         ]
 
     def setup_masternodes(self, nMasternodes = 19):