remove validator pubkey interface

multiversx · Dec 12, 2024 · 88843cb · 88843cb
1 parent 88d16ad
commit 88843cb
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,5 +13,6 @@
     },
     "files.insertFinalNewline": true,
     "files.trimTrailingWhitespace": true,
-    "python.languageServer": "Pylance"
+    "python.languageServer": "Pylance",
+    "black-formatter.args": ["--line-length=100"]
   }
diff --git a/multiversx_sdk/core/interfaces.py b/multiversx_sdk/core/interfaces.py
@@ -9,11 +9,6 @@ class INetworkConfig(Protocol):
     gas_price_modifier: float
 
 
-class IValidatorPublicKey(Protocol):
-    def hex(self) -> str:
-        ...
-
-
 class IAccount(Protocol):
     @property
     def address(self) -> Address:

diff --git a/multiversx_sdk/core/transaction_computer.py b/multiversx_sdk/core/transaction_computer.py
@@ -22,6 +22,7 @@ def __init__(self) -> None:
         pass
 
     def compute_transaction_fee(self, transaction: Transaction, network_config: INetworkConfig) -> int:
+        """`TransactionsFactoryConfig` can be used here as the `network_config`."""
         move_balance_gas = network_config.min_gas_limit + len(transaction.data) * network_config.gas_per_data_byte
         if move_balance_gas > transaction.gas_limit:
             raise NotEnoughGasError(transaction.gas_limit)

diff --git a/multiversx_sdk/delegation/delegation_controller.py b/multiversx_sdk/delegation/delegation_controller.py
@@ -3,14 +3,15 @@
 from multiversx_sdk.core import (Address, Transaction, TransactionComputer,
                                  TransactionOnNetwork,
                                  TransactionsFactoryConfig)
-from multiversx_sdk.core.interfaces import IAccount, IValidatorPublicKey
+from multiversx_sdk.core.interfaces import IAccount
 from multiversx_sdk.delegation.delegation_transactions_factory import \
     DelegationTransactionsFactory
 from multiversx_sdk.delegation.delegation_transactions_outcome_parser import \
     DelegationTransactionsOutcomeParser
 from multiversx_sdk.delegation.delegation_transactions_outcome_parser_types import \
     CreateNewDelegationContractOutcome
 from multiversx_sdk.network_providers.resources import AwaitingOptions
+from multiversx_sdk.wallet.validator_keys import ValidatorPublicKey
 
 
 class INetworkProvider(Protocol):
@@ -60,7 +61,7 @@ def create_transaction_for_adding_nodes(self,
                                             sender: IAccount,
                                             nonce: int,
                                             delegation_contract: Address,
-                                            public_keys: Sequence[IValidatorPublicKey],
+                                            public_keys: Sequence[ValidatorPublicKey],
                                             signed_messages: Sequence[bytes],
                                             guardian: Optional[Address] = None,
                                             relayer: Optional[Address] = None) -> Transaction:
@@ -82,7 +83,7 @@ def create_transaction_for_removing_nodes(self,
                                               sender: IAccount,
                                               nonce: int,
                                               delegation_contract: Address,
-                                              public_keys: Sequence[IValidatorPublicKey],
+                                              public_keys: Sequence[ValidatorPublicKey],
                                               guardian: Optional[Address] = None,
                                               relayer: Optional[Address] = None) -> Transaction:
         transaction = self.factory.create_transaction_for_removing_nodes(
@@ -102,7 +103,7 @@ def create_transaction_for_staking_nodes(self,
                                              sender: IAccount,
                                              nonce: int,
                                              delegation_contract: Address,
-                                             public_keys: Sequence[IValidatorPublicKey],
+                                             public_keys: Sequence[ValidatorPublicKey],
                                              guardian: Optional[Address] = None,
                                              relayer: Optional[Address] = None) -> Transaction:
         transaction = self.factory.create_transaction_for_staking_nodes(
@@ -122,7 +123,7 @@ def create_transaction_for_unbonding_nodes(self,
                                                sender: IAccount,
                                                nonce: int,
                                                delegation_contract: Address,
-                                               public_keys: Sequence[IValidatorPublicKey],
+                                               public_keys: Sequence[ValidatorPublicKey],
                                                guardian: Optional[Address] = None,
                                                relayer: Optional[Address] = None) -> Transaction:
         transaction = self.factory.create_transaction_for_unbonding_nodes(
@@ -142,7 +143,7 @@ def create_transaction_for_unstaking_nodes(self,
                                                sender: IAccount,
                                                nonce: int,
                                                delegation_contract: Address,
-                                               public_keys: Sequence[IValidatorPublicKey],
+                                               public_keys: Sequence[ValidatorPublicKey],
                                                guardian: Optional[Address] = None,
                                                relayer: Optional[Address] = None) -> Transaction:
         transaction = self.factory.create_transaction_for_unstaking_nodes(
@@ -162,7 +163,7 @@ def create_transaction_for_unjailing_nodes(self,
                                                sender: IAccount,
                                                nonce: int,
                                                delegation_contract: Address,
-                                               public_keys: Sequence[IValidatorPublicKey],
+                                               public_keys: Sequence[ValidatorPublicKey],
                                                amount: int,
                                                guardian: Optional[Address] = None,
                                                relayer: Optional[Address] = None) -> Transaction:

diff --git a/multiversx_sdk/delegation/delegation_transactions_factory.py b/multiversx_sdk/delegation/delegation_transactions_factory.py
@@ -6,10 +6,10 @@
 from multiversx_sdk.builders.transaction_builder import TransactionBuilder
 from multiversx_sdk.core import Address, Transaction
 from multiversx_sdk.core.constants import DELEGATION_MANAGER_SC_ADDRESS_HEX
-from multiversx_sdk.core.interfaces import IValidatorPublicKey
 from multiversx_sdk.core.transactions_factory_config import \
     TransactionsFactoryConfig
 from multiversx_sdk.delegation.errors import ListsLengthMismatchError
+from multiversx_sdk.wallet.validator_keys import ValidatorPublicKey
 
 
 class DelegationTransactionsFactory:
@@ -46,7 +46,7 @@ def create_transaction_for_new_delegation_contract(self,
     def create_transaction_for_adding_nodes(self,
                                             sender: Address,
                                             delegation_contract: Address,
-                                            public_keys: Sequence[IValidatorPublicKey],
+                                            public_keys: Sequence[ValidatorPublicKey],
                                             signed_messages: Sequence[bytes]) -> Transaction:
         if len(public_keys) != len(signed_messages):
             raise ListsLengthMismatchError("The number of public keys should match the number of signed messages")
@@ -75,7 +75,7 @@ def _compute_execution_gas_limit_for_nodes_management(self, num_nodes: int) -> i
     def create_transaction_for_removing_nodes(self,
                                               sender: Address,
                                               delegation_contract: Address,
-                                              public_keys: Sequence[IValidatorPublicKey]) -> Transaction:
+                                              public_keys: Sequence[ValidatorPublicKey]) -> Transaction:
         num_nodes = len(public_keys)
 
         parts = ["removeNodes"]
@@ -96,7 +96,7 @@ def create_transaction_for_removing_nodes(self,
     def create_transaction_for_staking_nodes(self,
                                              sender: Address,
                                              delegation_contract: Address,
-                                             public_keys: Sequence[IValidatorPublicKey]) -> Transaction:
+                                             public_keys: Sequence[ValidatorPublicKey]) -> Transaction:
         num_nodes = len(public_keys)
 
         parts = ["stakeNodes"]
@@ -118,7 +118,7 @@ def create_transaction_for_staking_nodes(self,
     def create_transaction_for_unbonding_nodes(self,
                                                sender: Address,
                                                delegation_contract: Address,
-                                               public_keys: Sequence[IValidatorPublicKey]) -> Transaction:
+                                               public_keys: Sequence[ValidatorPublicKey]) -> Transaction:
         num_nodes = len(public_keys)
 
         parts = ["unBondNodes"]
@@ -140,7 +140,7 @@ def create_transaction_for_unbonding_nodes(self,
     def create_transaction_for_unstaking_nodes(self,
                                                sender: Address,
                                                delegation_contract: Address,
-                                               public_keys: Sequence[IValidatorPublicKey]) -> Transaction:
+                                               public_keys: Sequence[ValidatorPublicKey]) -> Transaction:
         num_nodes = len(public_keys)
 
         parts = ["unStakeNodes"]
@@ -162,7 +162,7 @@ def create_transaction_for_unstaking_nodes(self,
     def create_transaction_for_unjailing_nodes(self,
                                                sender: Address,
                                                delegation_contract: Address,
-                                               public_keys: Sequence[IValidatorPublicKey],
+                                               public_keys: Sequence[ValidatorPublicKey],
                                                amount: int) -> Transaction:
         num_nodes = len(public_keys)
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
 pytest
 pytest-cov
 flake8
-autopep8
+black
 pre-commit
 ipykernel
 sphinx