Add SafeApiServiceTx class

safe-global · Jan 26, 2024 · 49ac4f4 · 49ac4f4
1 parent f4f4eb5
commit 49ac4f4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/gnosis/safe/api/__init__.py b/gnosis/safe/api/__init__.py
@@ -1,7 +1,8 @@
 # flake8: noqa F401
+from gnosis.safe.api.transaction_service_api import TransactionServiceApi
+
 from .base_api import SafeAPIException
 from .relay_service_api import RelayEstimation, RelaySentTransaction, RelayServiceApi
-from .transaction_service_api import TransactionServiceApi
 
 __all__ = [
     "SafeAPIException",

diff --git a/gnosis/safe/api/transaction_service_api/SafeApiServiceTx.py b/gnosis/safe/api/transaction_service_api/SafeApiServiceTx.py
@@ -0,0 +1,9 @@
+from eth_typing import ChecksumAddress
+
+from gnosis.safe import SafeTx
+
+
+class SafeApiServiceTx(SafeTx):
+    def __init__(self, proposer: ChecksumAddress, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.proposer = proposer
diff --git a/gnosis/safe/api/transaction_service_api/__init__.py b/gnosis/safe/api/transaction_service_api/__init__.py
@@ -0,0 +1,7 @@
+from gnosis.safe.api.transaction_service_api.transaction_service_api import (
+    TransactionServiceApi,
+)
+
+__all__ = [
+    "TransactionServiceApi",
+]
diff --git a/gnosis/safe/api/transaction_service_api.py → ...on_service_api/transaction_service_api.py b/gnosis/safe/api/transaction_service_api.py → ...on_service_api/transaction_service_api.py
@@ -9,8 +9,8 @@
 
 from gnosis.eth import EthereumNetwork
 from gnosis.safe import SafeTx
-
-from .base_api import SafeAPIException, SafeBaseAPI
+from gnosis.safe.api.base_api import SafeAPIException, SafeBaseAPI
+from gnosis.safe.api.transaction_service_api.SafeApiServiceTx import SafeApiServiceTx
 
 logger = logging.getLogger(__name__)
 
@@ -133,7 +133,8 @@ def get_safe_transaction(
             logger.warning(
                 "EthereumClient should be defined to get a executable SafeTx"
             )
-        safe_tx = SafeTx(
+        safe_tx = SafeApiServiceTx(
+            result["proposer"],
             self.ethereum_client,
             result["safe"],
             result["to"],

diff --git a/gnosis/safe/tests/api/test_transaction_service_api.py b/gnosis/safe/tests/api/test_transaction_service_api.py
@@ -4,8 +4,7 @@
 
 from gnosis.eth import EthereumClient, EthereumNetwork, EthereumNetworkNotSupported
 from gnosis.eth.tests.ethereum_test_case import EthereumTestCaseMixin
-
-from ...api.transaction_service_api import TransactionServiceApi
+from gnosis.safe.api.transaction_service_api import TransactionServiceApi
 
 
 class TestTransactionServiceAPI(EthereumTestCaseMixin, TestCase):