DO NOT SUBMIT - activate segwit-light early and fix tests

Author: domob1812

divi/qa/rpc-tests/mempool_coinbase_spends.py

@@ -29,7 +29,8 @@ def setup_network(self):
         self.sync_all
 
     def create_tx(self, from_txid, to_address, amount):
-        inputs = [{ "txid" : from_txid, "vout" : 0}]
+        btxid = self.nodes[0].getrawtransaction(from_txid, 1)["baretxid"]
+        inputs = [{ "txid" : btxid, "vout" : 0}]
         outputs = { to_address : amount }
         rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
         signresult = self.nodes[0].signrawtransaction(rawtx)

divi/qa/rpc-tests/mempool_resurrect_test.py

@@ -25,7 +25,8 @@ def setup_network(self):
         self.is_network_split = False
 
     def create_tx(self, from_txid, to_address, amount):
-        inputs = [{ "txid" : from_txid, "vout" : 0}]
+        btxid = self.nodes[0].getrawtransaction(from_txid, 1)["baretxid"]
+        inputs = [{ "txid" : btxid, "vout" : 0}]
         outputs = { to_address : amount }
         rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
         signresult = self.nodes[0].signrawtransaction(rawtx)

divi/qa/rpc-tests/mempool_spendcoinbase.py

@@ -30,7 +30,8 @@ def setup_network(self):
         self.is_network_split = False
 
     def create_tx(self, from_txid, to_address, amount):
-        inputs = [{ "txid" : from_txid, "vout" : 0}]
+        btxid = self.nodes[0].getrawtransaction(from_txid, 1)["baretxid"]
+        inputs = [{ "txid" : btxid, "vout" : 0}]
         outputs = { to_address : amount }
         rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
         signresult = self.nodes[0].signrawtransaction(rawtx)

divi/qa/rpc-tests/op_meta.py

@@ -65,7 +65,7 @@ def build_op_meta_tx (self, utxos, payload, fee):
         assert_equal (signed["complete"], True)
         data = self.node.decoderawtransaction (signed["hex"])
         self.node.sendrawtransaction (signed["hex"])
-        inp["txid"] = data["txid"]
+        inp["txid"] = data["baretxid"]
         inp["vout"] = 0
         inp["amount"] = change
 

divi/qa/rpc-tests/smartfees.py

@@ -20,7 +20,7 @@ def find_output(node, txid, amount):
     txdata = node.getrawtransaction(txid, 1)
     for i in range(len(txdata["vout"])):
         if txdata["vout"][i]["value"] == amount:
-            return {"txid": txdata["txid"], "vout": i}
+            return {"txid": txdata["baretxid"], "vout": i}
     raise RuntimeError("find_output txid %s : %s not found"%(txid,str(amount)))
 
 def send_zeropri_transaction(from_node, to_node, amount, fee):

divi/qa/rpc-tests/vaultfork.py

@@ -35,7 +35,7 @@ def fund_vault (self, owner, staker, amount):
         outputs = data["vout"]
         for n in range (len (outputs)):
             if outputs[n]["scriptPubKey"]["type"] == "vault":
-                return {"txid": data["txid"], "vout": n}
+                return {"txid": data["baretxid"], "vout": n}
 
         raise AssertionError ("constructed transaction has no vault output")
 

divi/src/ForkActivation.cpp

@@ -29,7 +29,7 @@ const std::unordered_map<Fork, int64_t,std::hash<int>> ACTIVATION_TIMES = {
   {Fork::UniformLotteryWinners, unixTimestampForDec31stMidnight},
   /* FIXME: Set real activation time for segwit light.  It is after
      staking vaults.  */
-  {Fork::SegwitLight, 2000000000},
+  {Fork::SegwitLight, 1500000000},
 };
 
 } // anonymous namespace