Merge pull request #568 from kjeom/dev

added exception handling when dummy feepayer signature is in

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_account_update_transaction.py

@@ -383,12 +383,10 @@ def feepayer_payload(self) -> bytes:
 
         # when signing at first time
         transaction_with_signatures = transaction_without_signature_fields
-        if 'feePayerSignatures' not in transaction_without_signature_fields:
+        if 'feePayerSignatures' not in transaction_without_signature_fields or transaction_with_signatures['feePayerSignatures'][0]['v'] == 1:
             transaction_with_signatures = merge(transaction_without_signature_fields, {'feePayerSignatures':[]})
 
-        if vrs != {} and vrs not in transaction_with_signatures['signatures']:
-            transaction_with_signatures['feePayerSignatures'].append(vrs)
-
+        transaction_with_signatures['feePayerSignatures'].append(vrs)
         transaction_with_signatures = pipe(
             transaction_with_signatures,
             apply_formatters_to_dict(KLAYTN_TYPED_TRANSACTION_FORMATTERS),

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_cancel_transaction.py

@@ -343,7 +343,7 @@ def feepayer_payload(self) -> bytes:
 
         # when signing at first time
         transaction_with_signatures = transaction_without_signature_fields
-        if 'feePayerSignatures' not in transaction_without_signature_fields:
+        if 'feePayerSignatures' not in transaction_without_signature_fields or transaction_with_signatures['feePayerSignatures'][0]['v'] == 1:
             transaction_with_signatures = merge(transaction_without_signature_fields, {'feePayerSignatures':[]})
 
         transaction_with_signatures['feePayerSignatures'].append(vrs)

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_chaindata_anchoring_transaction.py

@@ -349,12 +349,10 @@ def feepayer_payload(self) -> bytes:
 
         # when signing at first time
         transaction_with_signatures = transaction_without_signature_fields
-        if 'feePayerSignatures' not in transaction_without_signature_fields:
+        if 'feePayerSignatures' not in transaction_without_signature_fields or transaction_with_signatures['feePayerSignatures'][0]['v'] == 1:
             transaction_with_signatures = merge(transaction_without_signature_fields, {'feePayerSignatures':[]})
 
-        if vrs != {} and vrs not in transaction_with_signatures['signatures']:
-            transaction_with_signatures['feePayerSignatures'].append(vrs)
-
+        transaction_with_signatures['feePayerSignatures'].append(vrs)
         transaction_with_signatures = pipe(
             transaction_with_signatures,
             apply_formatters_to_dict(KLAYTN_TYPED_TRANSACTION_FORMATTERS),

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_smart_contract_deploy_transaction.py

@@ -348,12 +348,10 @@ def payload(self) -> bytes:
 
         # when signing at first time
         transaction_with_signatures = transaction_without_signature_fields
-        if 'signatures' not in transaction_with_signatures:
-            transaction_with_signatures = merge(transaction_with_signatures, {'signatures':[]})
+        if 'feePayerSignatures' not in transaction_without_signature_fields or transaction_with_signatures['feePayerSignatures'][0]['v'] == 1:
+            transaction_with_signatures = merge(transaction_without_signature_fields, {'feePayerSignatures':[]})
 
-        if vrs != {} and vrs not in transaction_with_signatures['signatures']:
-            transaction_with_signatures['signatures'].append(vrs)
-
+        transaction_with_signatures['feePayerSignatures'].append(vrs)
         transaction_with_signatures = pipe(
             transaction_with_signatures,
             apply_formatters_to_dict(KLAYTN_TYPED_TRANSACTION_FORMATTERS),

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_smart_contract_execution_transaction.py

@@ -392,7 +392,7 @@ def feepayer_payload(self) -> bytes:
 
         # when signing at first time
         transaction_with_signatures = transaction_without_signature_fields
-        if 'feePayerSignatures' not in transaction_without_signature_fields:
+        if 'feePayerSignatures' not in transaction_without_signature_fields or transaction_with_signatures['feePayerSignatures'][0]['v'] == 1:
             transaction_with_signatures = merge(transaction_without_signature_fields, {'feePayerSignatures':[]})
 
         transaction_with_signatures['feePayerSignatures'].append(vrs)

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_value_transfer_transaction.py

@@ -351,7 +351,7 @@ def feepayer_payload(self) -> bytes:
 
         # when signing at first time
         transaction_with_signatures = transaction_without_signature_fields
-        if 'feePayerSignatures' not in transaction_without_signature_fields:
+        if 'feePayerSignatures' not in transaction_without_signature_fields or transaction_with_signatures['feePayerSignatures'][0]['v'] == 1:
             transaction_with_signatures = merge(transaction_without_signature_fields, {'feePayerSignatures':[]})
 
         transaction_with_signatures['feePayerSignatures'].append(vrs)

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_value_transfer_with_memo_transaction.py

@@ -356,7 +356,7 @@ def feepayer_payload(self) -> bytes:
 
         # when signing at first time
         transaction_with_signatures = transaction_without_signature_fields
-        if 'feePayerSignatures' not in transaction_without_signature_fields:
+        if 'feePayerSignatures' not in transaction_without_signature_fields or transaction_with_signatures['feePayerSignatures'][0]['v'] == 1:
             transaction_with_signatures = merge(transaction_without_signature_fields, {'feePayerSignatures':[]})
 
         transaction_with_signatures['feePayerSignatures'].append(vrs)