Remove aurora specific config from SDK

Author: flopez7

packages/sdk/python/human-protocol-sdk/human_protocol_sdk/escrow/escrow_client.py

@@ -71,7 +71,7 @@ def get_w3_with_priv_key(priv_key: str):
 from web3.middleware import ExtraDataToPOAMiddleware
 from web3.types import TxParams
 
-from human_protocol_sdk.utils import validate_url, apply_tx_defaults
+from human_protocol_sdk.utils import validate_url
 from human_protocol_sdk.decorators import requires_signer
 
 LOG = logging.getLogger("human_protocol_sdk.escrow")
@@ -263,7 +263,7 @@ def get_w3_with_priv_key(priv_key: str):
         try:
             tx_hash = self.factory_contract.functions.createEscrow(
                 token_address, job_requester_id
-            ).transact(apply_tx_defaults(self.w3, tx_options))
+            ).transact(tx_options)
             receipt = self.w3.eth.wait_for_transaction_receipt(tx_hash)
             event = next(
                 (
@@ -362,7 +362,7 @@ def get_w3_with_priv_key(priv_key: str):
                 escrow_config.exchange_oracle_fee,
                 escrow_config.manifest,
                 escrow_config.hash,
-            ).transact(apply_tx_defaults(self.w3, tx_options))
+            ).transact(tx_options)
             receipt = self.w3.eth.wait_for_transaction_receipt(tx_hash)
             event = next(
                 (
@@ -450,7 +450,7 @@ def get_w3_with_priv_key(priv_key: str):
                     escrow_config.manifest,
                     escrow_config.hash,
                 )
-                .transact(apply_tx_defaults(self.w3, tx_options))
+                .transact(tx_options)
             )
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
@@ -515,7 +515,7 @@ def get_w3_with_priv_key(priv_key: str):
         try:
             tx_hash = token_contract.functions.transfer(
                 escrow_address, amount
-            ).transact(apply_tx_defaults(self.w3, tx_options))
+            ).transact(tx_options)
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
             handle_error(e, EscrowClientError)
@@ -592,10 +592,10 @@ def get_w3_with_priv_key(priv_key: str):
             if funds_to_reserve is not None:
                 tx_hash = contract.functions.storeResults(
                     url, hash, funds_to_reserve
-                ).transact(apply_tx_defaults(self.w3, tx_options))
+                ).transact(tx_options)
             else:
                 tx_hash = contract.functions.storeResults(url, hash).transact(
-                    apply_tx_defaults(self.w3, tx_options)
+                    tx_options
                 )
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
@@ -657,7 +657,7 @@ def get_w3_with_priv_key(priv_key: str):
             tx_hash = (
                 self._get_escrow_contract(escrow_address)
                 .functions.complete()
-                .transact(apply_tx_defaults(self.w3, tx_options))
+                .transact(tx_options)
             )
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
@@ -749,7 +749,7 @@ def get_w3_with_priv_key(priv_key: str):
                     final_results_hash,
                     payout_id,
                     force_complete,
-                ).transact(apply_tx_defaults(self.w3, tx_options))
+                ).transact(tx_options)
             else:
                 tx_id = payout_id
                 tx_hash = contract.functions.bulkPayOut(
@@ -759,7 +759,7 @@ def get_w3_with_priv_key(priv_key: str):
                     final_results_hash,
                     tx_id,
                     force_complete,
-                ).transact(apply_tx_defaults(self.w3, tx_options))
+                ).transact(tx_options)
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
             error_text = str(e) or ""
@@ -987,7 +987,7 @@ def get_w3_with_priv_key(priv_key: str):
             tx_hash = (
                 self._get_escrow_contract(escrow_address)
                 .functions.requestCancellation()
-                .transact(apply_tx_defaults(self.w3, tx_options))
+                .transact(tx_options)
             )
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
@@ -1046,7 +1046,7 @@ def get_w3_with_priv_key(priv_key: str):
             tx_hash = (
                 self._get_escrow_contract(escrow_address)
                 .functions.cancel()
-                .transact(apply_tx_defaults(self.w3, tx_options))
+                .transact(tx_options)
             )
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
@@ -1114,7 +1114,7 @@ def get_w3_with_priv_key(priv_key: str):
             tx_hash = (
                 self._get_escrow_contract(escrow_address)
                 .functions.withdraw(token_address)
-                .transact(apply_tx_defaults(self.w3, tx_options))
+                .transact(tx_options)
             )
             receipt = self.w3.eth.wait_for_transaction_receipt(tx_hash)
 

packages/sdk/python/human-protocol-sdk/human_protocol_sdk/kvstore/kvstore_client.py

@@ -52,7 +52,6 @@ def get_w3_with_priv_key(priv_key: str):
 """
 
 import logging
-import os
 from typing import List, Optional
 
 import requests
@@ -63,7 +62,6 @@ def get_w3_with_priv_key(priv_key: str):
     get_kvstore_interface,
     handle_error,
     validate_url,
-    apply_tx_defaults,
 )
 from web3 import Web3
 from web3.middleware import ExtraDataToPOAMiddleware
@@ -160,7 +158,7 @@ def get_w3_with_priv_key(priv_key: str):
 
         try:
             tx_hash = self.kvstore_contract.functions.set(key, value).transact(
-                apply_tx_defaults(self.w3, tx_options)
+                tx_options
             )
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
@@ -217,7 +215,7 @@ def get_w3_with_priv_key(priv_key: str):
 
         try:
             tx_hash = self.kvstore_contract.functions.setBulk(keys, values).transact(
-                apply_tx_defaults(self.w3, tx_options)
+                tx_options
             )
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
@@ -276,7 +274,7 @@ def get_w3_with_priv_key(priv_key: str):
         try:
             tx_hash = self.kvstore_contract.functions.setBulk(
                 [key, key + "_hash"], [url, content_hash]
-            ).transact(apply_tx_defaults(self.w3, tx_options))
+            ).transact(tx_options)
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
             handle_error(e, KVStoreClientError)

packages/sdk/python/human-protocol-sdk/human_protocol_sdk/staking/staking_client.py

@@ -68,7 +68,6 @@ def get_w3_with_priv_key(priv_key: str):
     get_factory_interface,
     get_staking_interface,
     handle_error,
-    apply_tx_defaults,
 )
 
 LOG = logging.getLogger("human_protocol_sdk.staking")
@@ -176,7 +175,7 @@ def get_w3_with_priv_key(priv_key: str):
         try:
             tx_hash = self.hmtoken_contract.functions.approve(
                 self.network["staking_address"], amount
-            ).transact(apply_tx_defaults(self.w3, tx_options))
+            ).transact(tx_options)
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
             handle_error(e, StakingClientError)
@@ -227,9 +226,7 @@ def get_w3_with_priv_key(priv_key: str):
         if amount <= 0:
             raise StakingClientError("Amount to stake must be greater than 0")
         try:
-            tx_hash = self.staking_contract.functions.stake(amount).transact(
-                apply_tx_defaults(self.w3, tx_options)
-            )
+            tx_hash = self.staking_contract.functions.stake(amount).transact(tx_options)
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
             handle_error(e, StakingClientError)
@@ -279,7 +276,7 @@ def get_w3_with_priv_key(priv_key: str):
             raise StakingClientError("Amount to unstake must be greater than 0")
         try:
             tx_hash = self.staking_contract.functions.unstake(amount).transact(
-                apply_tx_defaults(self.w3, tx_options)
+                tx_options
             )
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
@@ -324,9 +321,7 @@ def get_w3_with_priv_key(priv_key: str):
         """
 
         try:
-            tx_hash = self.staking_contract.functions.withdraw().transact(
-                apply_tx_defaults(self.w3, tx_options)
-            )
+            tx_hash = self.staking_contract.functions.withdraw().transact(tx_options)
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
             handle_error(e, StakingClientError)
@@ -395,7 +390,7 @@ def get_w3_with_priv_key(priv_key: str):
         try:
             tx_hash = self.staking_contract.functions.slash(
                 slasher, staker, escrow_address, amount
-            ).transact(apply_tx_defaults(self.w3, tx_options))
+            ).transact(tx_options)
             self.w3.eth.wait_for_transaction_receipt(tx_hash)
         except Exception as e:
             handle_error(e, StakingClientError)

packages/sdk/python/human-protocol-sdk/human_protocol_sdk/utils.py

@@ -324,22 +324,3 @@ def validate_json(data: str) -> bool:
         return True
     except (ValueError, TypeError):
         return False
-
-
-def apply_tx_defaults(w3: Web3, tx_options: Optional[TxParams]) -> TxParams:
-    """Apply network specific default transaction parameters.
-
-    Aurora networks enforce a fixed gas price. We always override any user supplied
-    gasPrice with DEFAULT_AURORA_GAS_PRICE when on Aurora Testnet.
-    EIP-1559 fields are removed to avoid conflicts.
-
-    :param w3: Web3 instance (used to read chain id)
-    :param tx_options: Original transaction options (can be None)
-    :return: Mutated tx options with enforced defaults
-    """
-    opts: TxParams = dict(tx_options) if tx_options else {}
-    if w3.eth.chain_id == ChainId.AURORA_TESTNET.value:
-        opts["gasPrice"] = DEFAULT_AURORA_GAS_PRICE
-        opts.pop("maxFeePerGas", None)
-        opts.pop("maxPriorityFeePerGas", None)
-    return opts

packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/escrow/test_escrow_client.py

@@ -384,7 +384,7 @@ def test_create_escrow(self):
         self.escrow.factory_contract.functions.createEscrow.assert_called_once_with(
             token_address, job_requester_id
         )
-        mock_create.transact.assert_called_once_with({})
+        mock_create.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -500,7 +500,7 @@ def test_create_fund_and_setup_escrow(self):
             escrow_config.manifest,
             escrow_config.hash,
         )
-        mock_create.transact.assert_called_once_with({})
+        mock_create.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -647,7 +647,7 @@ def test_setup(self):
             escrow_config.manifest,
             escrow_config.hash,
         )
-        mock_setup.transact.assert_called_once_with({})
+        mock_setup.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -828,7 +828,7 @@ def test_fund(self):
         mock_token_contract.functions.transfer.assert_called_once_with(
             escrow_address, amount
         )
-        mock_transfer.transact.assert_called_once_with({})
+        mock_transfer.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -909,7 +909,7 @@ def test_store_results(self):
 
         self.escrow._get_escrow_contract.assert_called_once_with(escrow_address)
         mock_contract.functions.storeResults.assert_called_once_with(url, hash)
-        mock_store.transact.assert_called_once_with({})
+        mock_store.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -1038,7 +1038,7 @@ def test_store_results_with_funds_to_reserve_positive(self):
         mock_contract.functions.storeResults.assert_called_once_with(
             url, hash, funds_to_reserve
         )
-        mock_store.transact.assert_called_once_with({})
+        mock_store.transact.assert_called_once_with(None)
 
     def test_store_results_with_funds_to_reserve_zero_allows_empty(self):
         mock_contract = MagicMock()
@@ -1119,7 +1119,7 @@ def test_bulk_payout(self):
         mock_contract.functions.bulkPayOut.assert_called_once_with(
             recipients, amounts, final_results_url, final_results_hash, txId, True
         )
-        mock_bulk.transact.assert_called_once_with({})
+        mock_bulk.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -1580,7 +1580,7 @@ def test_complete(self):
 
         self.escrow._get_escrow_contract.assert_called_once_with(escrow_address)
         mock_contract.functions.complete.assert_called_once_with()
-        mock_complete.transact.assert_called_once_with({})
+        mock_complete.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -1675,7 +1675,7 @@ def test_request_cancellation(self):
 
         self.escrow._get_escrow_contract.assert_called_once_with(escrow_address)
         mock_contract.functions.requestCancellation.assert_called_once_with()
-        mock_request.transact.assert_called_once_with({})
+        mock_request.transact.assert_called_once_with(None)
         self.assertIsNone(result)
 
     def test_request_cancellation_invalid_address(self):
@@ -1759,7 +1759,7 @@ def test_cancel(self):
         self.assertIsNone(result)
         self.escrow._get_escrow_contract.assert_called_once_with(escrow_address)
         mock_contract.functions.cancel.assert_called_once_with()
-        mock_cancel.transact.assert_called_once_with({})
+        mock_cancel.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -1869,7 +1869,7 @@ def test_withdraw(self):
 
         self.escrow._get_escrow_contract.assert_called_once_with(escrow_address)
         mock_contract.functions.withdraw.assert_called_once_with(token_address)
-        mock_withdraw.transact.assert_called_once_with({})
+        mock_withdraw.transact.assert_called_once_with(None)
         self.escrow.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )

packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/kvstore/test_kvstore_client.py

@@ -78,7 +78,7 @@ def test_set(self):
         self.kvstore.set(key, value)
 
         self.kvstore.kvstore_contract.functions.set.assert_called_once_with(key, value)
-        mock_set.transact.assert_called_once_with({})
+        mock_set.transact.assert_called_once_with(None)
         self.kvstore.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -140,7 +140,7 @@ def test_set_bulk(self):
         self.kvstore.kvstore_contract.functions.setBulk.assert_called_once_with(
             keys, values
         )
-        mock_set_bulk.transact.assert_called_once_with({})
+        mock_set_bulk.transact.assert_called_once_with(None)
         self.kvstore.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
             "tx_hash"
         )
@@ -226,7 +226,7 @@ def test_set_file_url_and_hash(self):
             self.kvstore.kvstore_contract.functions.setBulk.assert_called_once_with(
                 ["url", "url_hash"], [url, content_hash]
             )
-            mock_set_bulk.transact.assert_called_once_with({})
+            mock_set_bulk.transact.assert_called_once_with(None)
             self.kvstore.w3.eth.wait_for_transaction_receipt.assert_called_once_with(
                 "tx_hash"
             )
@@ -255,7 +255,7 @@ def test_set_file_url_and_hash_with_key(self):
                 ["linkedin_url", "linkedin_url_hash"], [url, content_hash]
             )
 
-            mock_set_bulk.transact.assert_called_once_with({})
+            mock_set_bulk.transact.assert_called_once_with(None)
             self.kvstore.w3.eth.wait_for_transaction_receipt.assert_called_once_with
 
     def test_set_file_url_and_hash_invalid_url(self):