CR improvements

Author: jannotti

algosdk/transaction.py

@@ -2580,6 +2580,13 @@ def undictify(d):
             lsig.lmsig = Multisig.undictify(d["lmsig"])
         return lsig
 
+    def sig_count(self):
+        return (
+            int(self.sig is not None)
+            + int(self.msig is not None)
+            + int(self.lmsig is not None)
+        )
+
     def verify(self, public_key):
         """
         Verifies LogicSig against the transaction's sender address
@@ -2597,9 +2604,10 @@ def verify(self, public_key):
         except error.InvalidProgram:
             return False
 
+        if self.sig_count() > 1:
+            return False
+
         if self.sig:
-            if self.msig or self.lmsig:
-                return False
             verify_key = VerifyKey(public_key)
             try:
                 to_sign = constants.logic_prefix + self.logic
@@ -2609,14 +2617,10 @@ def verify(self, public_key):
                 return False
 
         if self.msig:
-            if self.sig or self.lmsig:
-                return False
             to_sign = constants.logic_prefix + self.logic
             return self.msig.verify(to_sign)
 
         if self.lmsig:
-            if self.sig or self.msig:
-                return False
             to_sign = (
                 constants.multisig_logic_prefix
                 + self.lmsig.address_bytes()
@@ -2790,6 +2794,15 @@ def verify(self) -> bool:
         addr = self.address()
         return self.lsig.verify(encoding.decode_address(addr))
 
+    def sig_count(self) -> int:
+        """
+        Returns the number of cryptographic signatures on the LogicSig
+
+        Returns:
+            int: The number of signatures. Should never exceed 1.
+        """
+        return self.lsig.sig_count()
+
     def address(self) -> str:
         """
         Get the address of this LogicSigAccount.
@@ -2800,6 +2813,9 @@ def address(self) -> str:
         If the LogicSig is not delegated to another account, this will return an
         escrow address that is the hash of the LogicSig's program code.
         """
+        if self.sig_count() > 1:
+            raise error.LogicSigOverspecifiedSignature
+
         if self.lsig.sig:
             if not self.sigkey:
                 raise error.LogicSigSigningKeyMissing

tests/unit_tests/test_logicsig.py

@@ -472,19 +472,17 @@ def test_LogicSig_single_delegated_different_sender(self):
         sender = TestLogicSigTransaction.otherAddr
         self._test_sign_txn(lsig, sender, None, False)
 
-    def test_LogicSig_msig_delegated(self):
+    def test_LogicSig_lmsig_delegated(self):
         lsig = transaction.LogicSigAccount(sampleProgram, sampleArgs).lsig
         lsig.sign(sampleAccount1, sampleMsig)
         lsig.append_to_multisig(sampleAccount2)
 
-        print(base64.b64encode(lsig.lmsig.subsigs[0].signature))
-        print(base64.b64encode(lsig.lmsig.subsigs[1].signature))
         sender = sampleMsig.address()
         # from: msgpacktool -e < tests/unit_tests/msig_delegated.txn | base64
         expected = "gqRsc2lng6NhcmeSxAEBxAICA6FsxAUBIAEBIqVsbXNpZ4Omc3Vic2lnk4KicGvEIBt+wLBL6mG3lpCX5sv0B+EIpwU1HQvJir6xIgmoq4F4oXPEQIwzZcSx0RNw8j9w13dGn+HZR3m/TY1kgXZJNe94TMx2V2zA4O/pwUb6YHba+s5V7przG3aOvDK07BosjD3AZwaConBrxCAJYzIJU3OJ8HVnEXc5kcfQPhtzyMT1K/av8BqiXPnCcaFzxEBPVtR92cCxahX1iGTp50PVMQkf969ssoHfNA0VOiNupdkXc9n/l2WO9+pj8Ddozf4ovorGgnrzca3ZhKc46uUNgaJwa8Qg5/D4TQaBHfnzHI2HixFV9GcdUaGFwgCQhmf0SVhwaKGjdGhyAqF2AaN0eG6Ko2FtdM0TiKNmZWXOAANPqKJmds4ADtbco2dlbq10ZXN0bmV0LXYzMS4womdoxCAmCyAJoJOohot5WHIvpeVG7eftF+TYXEx4r7BFJpDt0qJsds4ADtrEpG5vdGXECLRReTn8+tJxo3JjdsQgtMYiaKTDNVD1im3UuMojnJ8dELNBqn4aNuPOYfv8+Yqjc25kxCCNkrSJkAFzoE36Q1mjZmpq/OosQqBd2cH3PuulR4A36aR0eXBlo3BheQ=="
         self._test_sign_txn(lsig, sender, expected)
 
-    def test_LogicSig_msig_delegated_different_sender(self):
+    def test_LogicSig_lmsig_delegated_different_sender(self):
         lsig = transaction.LogicSigAccount(sampleProgram, sampleArgs).lsig
         lsig.sign(sampleAccount1, sampleMsig)
         lsig.append_to_multisig(sampleAccount2)