create a method to set transaction fields

Author: popenta

multiversx_sdk_cli/base_transactions_controller.py

@@ -23,6 +23,7 @@
 )
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
 from multiversx_sdk_cli.errors import BadUserInput
+from multiversx_sdk_cli.guardian_relayer_data import GuardianRelayerData
 from multiversx_sdk_cli.interfaces import IAccount
 
 logger = logging.getLogger("base_controller")
@@ -144,3 +145,19 @@ def ensure_even_length(self, string: str) -> str:
         if len(string) % 2 == 1:
             return "0" + string
         return string
+
+    def _set_transaction_fields(
+        self,
+        transaction: Transaction,
+        nonce: int,
+        version: int,
+        options: int,
+        gas_price: int,
+        guardian_and_relayer_data: GuardianRelayerData,
+    ):
+        transaction.nonce = nonce
+        transaction.version = version
+        transaction.options = options
+        transaction.gas_price = gas_price
+        transaction.guardian = guardian_and_relayer_data.guardian_address
+        transaction.relayer = guardian_and_relayer_data.relayer_address

multiversx_sdk_cli/governance.py

@@ -36,15 +36,16 @@ def create_transaction_for_new_proposal(
             end_vote_epoch=end_vote_epoch,
             native_token_amount=native_token_amount,
         )
-        tx.nonce = nonce
-        tx.version = version
-        tx.options = options
-        tx.gas_price = gas_price
-        tx.guardian = guardian_and_relayer_data.guardian_address
-        tx.relayer = guardian_and_relayer_data.relayer_address
+        self._set_transaction_fields(
+            transaction=tx,
+            nonce=nonce,
+            version=version,
+            options=options,
+            gas_price=gas_price,
+            guardian_and_relayer_data=guardian_and_relayer_data,
+        )
 
         self.add_extra_gas_limit_if_required(tx)
-
         if gas_limit:
             tx.gas_limit = gas_limit
 
@@ -76,15 +77,16 @@ def create_transaction_for_voting(
         tx = self.factory.create_transaction_for_voting(
             sender=sender.address, proposal_nonce=proposal_nonce, vote=vote_value
         )
-        tx.nonce = nonce
-        tx.version = version
-        tx.options = options
-        tx.gas_price = gas_price
-        tx.guardian = guardian_and_relayer_data.guardian_address
-        tx.relayer = guardian_and_relayer_data.relayer_address
+        self._set_transaction_fields(
+            transaction=tx,
+            nonce=nonce,
+            version=version,
+            options=options,
+            gas_price=gas_price,
+            guardian_and_relayer_data=guardian_and_relayer_data,
+        )
 
         self.add_extra_gas_limit_if_required(tx)
-
         if gas_limit:
             tx.gas_limit = gas_limit
 
@@ -111,15 +113,16 @@ def create_transaction_for_closing_proposal(
         guardian_and_relayer_data: GuardianRelayerData,
     ) -> Transaction:
         tx = self.factory.create_transaction_for_closing_proposal(sender=sender.address, proposal_nonce=proposal_nonce)
-        tx.nonce = nonce
-        tx.version = version
-        tx.options = options
-        tx.gas_price = gas_price
-        tx.guardian = guardian_and_relayer_data.guardian_address
-        tx.relayer = guardian_and_relayer_data.relayer_address
+        self._set_transaction_fields(
+            transaction=tx,
+            nonce=nonce,
+            version=version,
+            options=options,
+            gas_price=gas_price,
+            guardian_and_relayer_data=guardian_and_relayer_data,
+        )
 
         self.add_extra_gas_limit_if_required(tx)
-
         if gas_limit:
             tx.gas_limit = gas_limit
 
@@ -146,15 +149,16 @@ def create_transaction_for_clearing_ended_proposals(
         guardian_and_relayer_data: GuardianRelayerData,
     ) -> Transaction:
         tx = self.factory.create_transaction_for_clearing_ended_proposals(sender=sender.address, proposers=proposers)
-        tx.nonce = nonce
-        tx.version = version
-        tx.options = options
-        tx.gas_price = gas_price
-        tx.guardian = guardian_and_relayer_data.guardian_address
-        tx.relayer = guardian_and_relayer_data.relayer_address
+        self._set_transaction_fields(
+            transaction=tx,
+            nonce=nonce,
+            version=version,
+            options=options,
+            gas_price=gas_price,
+            guardian_and_relayer_data=guardian_and_relayer_data,
+        )
 
         self.add_extra_gas_limit_if_required(tx)
-
         if gas_limit:
             tx.gas_limit = gas_limit
 
@@ -180,15 +184,16 @@ def create_transaction_for_claiming_accumulated_fees(
         guardian_and_relayer_data: GuardianRelayerData,
     ) -> Transaction:
         tx = self.factory.create_transaction_for_claiming_accumulated_fees(sender=sender.address)
-        tx.nonce = nonce
-        tx.version = version
-        tx.options = options
-        tx.gas_price = gas_price
-        tx.guardian = guardian_and_relayer_data.guardian_address
-        tx.relayer = guardian_and_relayer_data.relayer_address
+        self._set_transaction_fields(
+            transaction=tx,
+            nonce=nonce,
+            version=version,
+            options=options,
+            gas_price=gas_price,
+            guardian_and_relayer_data=guardian_and_relayer_data,
+        )
 
         self.add_extra_gas_limit_if_required(tx)
-
         if gas_limit:
             tx.gas_limit = gas_limit
 
@@ -226,15 +231,16 @@ def create_transaction_for_changing_config(
             min_veto_threshold=min_veto_threshold,
             min_pass_threshold=min_pass_threshold,
         )
-        tx.nonce = nonce
-        tx.version = version
-        tx.options = options
-        tx.gas_price = gas_price
-        tx.guardian = guardian_and_relayer_data.guardian_address
-        tx.relayer = guardian_and_relayer_data.relayer_address
+        self._set_transaction_fields(
+            transaction=tx,
+            nonce=nonce,
+            version=version,
+            options=options,
+            gas_price=gas_price,
+            guardian_and_relayer_data=guardian_and_relayer_data,
+        )
 
         self.add_extra_gas_limit_if_required(tx)
-
         if gas_limit:
             tx.gas_limit = gas_limit