Changed an error that made multisig p2sh txs error out, bumped versio…

…n, changed activation block for mpma on mainnet
CounterpartyXCP · Feb 2, 2020 · de878ec · de878ec
1 parent 08f645d
commit de878ec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/counterpartylib/lib/config.py b/counterpartylib/lib/config.py
@@ -8,7 +8,7 @@
 
 # Versions
 VERSION_MAJOR = 9
-VERSION_MINOR = 57
+VERSION_MINOR = 58
 VERSION_REVISION = 0
 VERSION_STRING = str(VERSION_MAJOR) + '.' + str(VERSION_MINOR) + '.' + str(VERSION_REVISION)
 

diff --git a/counterpartylib/lib/transaction_helper/p2sh_encoding.py b/counterpartylib/lib/transaction_helper/p2sh_encoding.py
@@ -154,8 +154,6 @@ def decode_data_redeem_script(redeemScript, p2sh_is_segwit=False):
                                 pos, npubkey = decode_data_push(redeemScript, pos)
                                 num_sigs += 1
                                 if redeemScript[pos] - bitcoinlib.core.script.OP_1 + 1 == num_sigs:
-                                    pubkey = npubkey
-                                    source = script.pubkey_to_pubkeyhash(pubkey)
                                     found_sigs = True
 
                             pos += 1

diff --git a/counterpartylib/protocol_changes.json b/counterpartylib/protocol_changes.json
@@ -211,9 +211,9 @@
   },
   "mpma_sends": {
     "minimum_version_major": 9,
-    "minimum_version_minor": 57,
+    "minimum_version_minor": 58,
     "minimum_version_revision": 0,
-    "block_index": 585538,
+    "block_index": 616614,
     "testnet_block_index": 1569194
   }
 }