Auto calculate max_fee

src/nile/core/types/account.py

@@ -101,17 +101,20 @@ async def deploy(self, salt=None, max_fee=None, abi=None):
             predicted_address=predicted_address,
             overriding_path=NILE_ARTIFACTS_PATH,
             calldata=calldata,
-            max_fee=max_fee,
+            max_fee=max_fee or 0,
             network=self.network,
         )
 
-        return DeployAccountTxWrapper(
+        tx_wrapper = DeployAccountTxWrapper(
             tx=transaction,
             account=self,
             alias=self.alias,
             abi=abi,
         )
 
+        await _set_estimated_fee_if_none(max_fee, tx_wrapper)
+        return tx_wrapper
+
     async def send(
         self,
         address_or_alias,
@@ -133,16 +136,19 @@ async def send(
         transaction = InvokeTransaction(
             account_address=self.address,
             calldata=execute_calldata,
-            max_fee=max_fee,
+            max_fee=max_fee or 0,
             nonce=nonce,
             network=self.network,
         )
 
-        return InvokeTxWrapper(
+        tx_wrapper = InvokeTxWrapper(
             tx=transaction,
             account=self,
         )
 
+        await _set_estimated_fee_if_none(max_fee, tx_wrapper)
+        return tx_wrapper
+
     async def declare(
         self,
         contract_name,
@@ -163,18 +169,21 @@ async def declare(
         transaction = DeclareTransaction(
             account_address=self.address,
             contract_to_submit=contract_name,
-            max_fee=max_fee,
+            max_fee=max_fee or 0,
             nonce=nonce,
             network=self.network,
             overriding_path=overriding_path,
         )
 
-        return DeclareTxWrapper(
+        tx_wrapper = DeclareTxWrapper(
             tx=transaction,
             account=self,
             alias=alias,
         )
 
+        await _set_estimated_fee_if_none(max_fee, tx_wrapper)
+        return tx_wrapper
+
     async def deploy_contract(
         self,
         contract_name,
@@ -204,12 +213,12 @@ async def deploy_contract(
             unique=unique,
             calldata=calldata,
             deployer_address=deployer_address,
-            max_fee=max_fee,
+            max_fee=max_fee or 0,
             nonce=nonce,
             overriding_path=overriding_path,
         )
 
-        return DeployContractTxWrapper(
+        tx_wrapper = DeployContractTxWrapper(
             tx=transaction,
             account=self,
             alias=alias,
@@ -219,6 +228,9 @@ async def deploy_contract(
             abi=abi,
         )
 
+        await _set_estimated_fee_if_none(max_fee, tx_wrapper)
+        return tx_wrapper
+
     def _get_target_address(self, address_or_alias):
         if not is_alias(address_or_alias):
             target_address = normalize_number(address_or_alias)
@@ -233,7 +245,8 @@ def _get_target_address(self, address_or_alias):
         return target_address
 
     async def _process_arguments(self, max_fee, nonce, calldata=None):
-        max_fee = 0 if max_fee is None else int(max_fee)
+        if max_fee is not None:
+            max_fee = int(max_fee)
 
         if nonce is None:
             nonce = await get_nonce(self.address, self.network)
@@ -255,6 +268,13 @@ def _get_signer_and_alias(signer, predeployed_info):
     return signer, alias
 
 
+async def _set_estimated_fee_if_none(max_fee, tx):
+    """Estimate max_fee for transaction if max_fee is None."""
+    if max_fee is None:
+        estimated_fee = await tx.estimate_fee()
+        tx.update_fee(estimated_fee)
+
+
 async def try_get_account(
     signer,
     network,

src/nile/core/types/transactions.py

@@ -67,7 +67,7 @@ def __post_init__(self):
         # Validate the transaction object
         self._validate()
 
-    async def execute(self, signer, max_fee=None, watch_mode=None, **kwargs):
+    async def execute(self, signer, watch_mode=None, **kwargs):
         """Execute the transaction."""
         sig_r, sig_s = signer.sign(message_hash=self.hash)
 

tests/core/types/test_account.py

@@ -112,8 +112,9 @@ async def test_deploy(
 @patch("nile.core.types.account.get_counterfactual_address", return_value=MOCK_ADDRESS)
 @patch("nile.core.types.transactions.get_class_hash", return_value=CLASS_HASH)
 @patch("nile.core.deploy.accounts.register")
+@patch("nile.core.types.account._set_estimated_fee_if_none")
 async def test_deploy_accounts_register(
-    mock_register, mock_hash, mock_address, mock_deploy
+    mock_set_fee, mock_register, mock_hash, mock_address, mock_deploy
 ):
     account = await Account(KEY, NETWORK)
 
@@ -187,9 +188,16 @@ async def test_declare(
 @patch("nile.core.types.transactions.get_contract_class", return_value="ContractClass")
 @patch("nile.core.types.account.DeclareTransaction", return_value="tx")
 @patch("nile.core.types.account.DeclareTxWrapper")
+@patch("nile.core.types.account._set_estimated_fee_if_none")
 async def test_declare_account(
-    mock_tx_wrapper, mock_tx, mock_contract_class, nile_account, overriding_path
+    mock_set_fee,
+    mock_tx_wrapper,
+    mock_tx,
+    mock_contract_class,
+    nile_account,
+    overriding_path,
 ):
+    # mock_tx_wrapper = AsyncMock()
     account = await MockAccount(KEY, NETWORK)
 
     contract_name = "Account"

tests/core/types/test_transactions.py

@@ -65,7 +65,7 @@ async def test_invoke_transaction_init(
         assert tx.entry_point == entry_point
         assert tx.calldata == calldata
         assert tx.account_address == account_address
-        assert tx.max_fee == max_fee
+        assert tx.max_fee == max_fee or 0
         assert tx.nonce == nonce
         assert tx.network == network
         assert tx.version == version
@@ -118,7 +118,7 @@ async def test_declare_transaction_init(
         assert tx.contract_class == "ContractClass"
         assert tx.overriding_path == overriding_path
         assert tx.account_address == account_address
-        assert tx.max_fee == max_fee
+        assert tx.max_fee == max_fee or 0
         assert tx.nonce == nonce
         assert tx.network == network
         assert tx.version == version
@@ -175,7 +175,7 @@ async def test_deploy_account_transaction_init(
         assert tx.class_hash == 777
         assert tx.overriding_path == overriding_path
         assert tx.account_address == account_address
-        assert tx.max_fee == max_fee
+        assert tx.max_fee == max_fee or 0
         assert tx.nonce == nonce
         assert tx.network == network
         assert tx.version == version

tests/core/types/test_udc_helpers.py

@@ -64,7 +64,7 @@ async def test_create_udc_deploy_transaction(
             unique,
             calldata,
             deployer_address,
-            max_fee,
+            max_fee or 0,
             nonce=nonce,
         )