add OP_TRUE OP_FALSE and small edits

Author: SachinMeier

.DS_Store

@@ -308,7 +308,7 @@ class CMutableTxOut(CTxOut):
 
     @classmethod
     def from_txout(cls, txout):
-        """Create a fullly mutable copy of an existing TxOut"""
+        """Create a fully mutable copy of an existing TxOut"""
         return cls(txout.nValue, txout.scriptPubKey)
 
 

bitcoin/core/__init__.py

@@ -375,12 +375,14 @@ def __new__(cls, n):
 
 OPCODES_BY_NAME = {
     'OP_0': OP_0,
+    'OP_FALSE': OP_0,
     'OP_PUSHDATA1': OP_PUSHDATA1,
     'OP_PUSHDATA2': OP_PUSHDATA2,
     'OP_PUSHDATA4': OP_PUSHDATA4,
     'OP_1NEGATE': OP_1NEGATE,
     'OP_RESERVED': OP_RESERVED,
     'OP_1': OP_1,
+    'OP_TRUE': OP_1,
     'OP_2': OP_2,
     'OP_3': OP_3,
     'OP_4': OP_4,

bitcoin/core/script.py

@@ -387,7 +387,7 @@ def getblockheader(self, block_hash, verbose=False):
             try:
                 block_hash = b2lx(block_hash)
             except TypeError:
-                raise TypeError('%s.getblockheader(): block_hash must be bytes; got %r instance' %
+                raise TypeError('%s.getblockheader(): block_hash must be bytes or str; got %r instance' %
                         (self.__class__.__name__, block_hash.__class__))
         try:
             r = self._call('getblockheader', block_hash, verbose)
@@ -418,7 +418,6 @@ def getblockfilter(self, block_hash, filter_type="basic"):
         Default filter_type must be changed
         #UNTESTED
         """
-        # ALLOWED FOR str blockhash as well
         if type(block_hash) != str:
             try:
                 block_hash = b2lx(block_hash)
@@ -476,9 +475,9 @@ def getblockstats(self, hash_or_height, *args):
         # On clients before PR #17831, passing hash as bytes will result in Block not found
         """Return a JSON object containing block stats"""
 
-        try:
+        if isinstance(hash_or_height, bytes): 
             hval = b2lx(hash_or_height)
-        except TypeError:
+        else: #int or str of block_hash or height
             hval = hash_or_height
         try:
             r = self._call('getblockstats', hval, args)
@@ -517,7 +516,6 @@ def getmempoolancestors(self, txid, verbose=False):
 
     def getmempooldescendants(self, txid, verbose=False):
         """Returns a list of txids for descendant transactions"""
-        # Added str capacity
         if type(txid) != str:
             try:
                 txid = b2lx(txid)
@@ -561,12 +559,11 @@ def getrawmempool(self, verbose=False):
 
     def gettxout(self, outpoint, includemempool=True):
         """Return details about an unspent transaction output.
-
+        outpoint - COutPoint or tuple (<txid>, n)
         Raises IndexError if outpoint is not found or was spent.
 
         includemempool - Include mempool txouts
         """
-        # CHANGED TO ALLOW TUPLE (str(<txid>), n)
         if isinstance(outpoint, COutPoint): 
             r = self._call('gettxout', b2lx(outpoint.hash), outpoint.n, includemempool)
         else:
@@ -737,7 +734,6 @@ def submitblock(self, block, params=None):
         params is optional and is currently ignored by bitcoind. See
         https://en.bitcoin.it/wiki/BIP_0022 for full specification.
         """
-        # Allow for hex directly
         if type(block) == str:
             hexblock = block
         else:
@@ -858,7 +854,7 @@ def createpsbt(self, vins, vouts, data="", locktime=0, replaceable=False):
                 vout = i.prevout.n
                 sequence = i.nSequence
                 ins.append({"txid": txid, "vout": vout, "sequence": sequence})
-            vins = ins #Allow for JSON data to be passed straight to vins
+            vins = ins
         if isinstance(vouts[0], COutPoint):
             outs = []
             for o in vouts:
@@ -931,7 +927,6 @@ def getrawtransaction(self, txid, verbose=False, block_hash=None):
         enabled the transaction may not be available.
         """
         #Timeout issues depending on tx / machine
-        # Allow handling strings. Desirable?
         if type(txid) != str:
             txid = b2lx(txid)
         if type(block_hash) != str:
@@ -1043,12 +1038,11 @@ def signrawtransactionwithkey(self, tx, privkeys, prevtxs=None, sighashtype=None
         prevtxs - JSON object containing info
         sighashtype - numeric sighashtype default=SIGHASH_ALL
         """
-        # THIS ALLOWS FOR str, bytes, and CBitcoinSecret. desirable?
         if type(tx) != str:
             tx = hexlify(tx.serialize())
-        if isinstance(privkeys[0], CBitcoinSecret): # IS THIS CORRECT
+        if isinstance(privkeys[0], CBitcoinSecret):
             privkeys = [str(sk) for sk in privkeys]
-        elif isinstance(privkeys[0], bytes): # ALLOW FOR BYTES
+        elif isinstance(privkeys[0], bytes):
             privkeys = [sk.hex() for sk in privkeys]
         r = self._call('signrawtransactionwithkey', privkeys, prevtxs, )
         r['tx'] = CTransaction.deserialize(unhexlify(r['hex']))
@@ -1098,12 +1092,11 @@ def deriveaddresses(self, descriptor, _range=None):
         """Returns addresses from descriptor
 
         """
-        #TODODescriptors need Implementing
+        #TODO Descriptors need Implementing
         return self._call('deriveaddresses', descriptor, _range)
 
     def estimatesmartfee(self, conf_target, estimate_mode=None):
         """Returns a JSON object with feerate, errors, and block estimate
-        #Fix description?
         conf_target - attempted number of blocks from current tip to place tx
         estimate_mode:
         "UNSET"
@@ -1150,7 +1143,6 @@ def addmultisigaddress(self, nrequired, keys, label=None, address_type=None):
         #TODO see if CPubKey.__str__() is used elsewhere or can be changed.
         if isinstance(keys[0], CBitcoinAddress): 
             keys = [str(k) for k in keys]
-        #included CPubKey for clarity. Could possibly remove
         elif isinstance(keys[0], (CPubKey, bytes)):  
             keys = [k.hex() for k in keys]
         r = self._call('addmultisigaddress', nrequired, keys, label, address_type)

bitcoin/rpc.py

@@ -0,0 +1,5 @@
+
+
+
+
+