keep 1

Author: balogh.adam@icloud.com

docs/opengradient/client/llm.md

@@ -21,7 +21,7 @@ Supports both streaming and non-streaming responses.
 All request methods (``chat``, ``completion``) are async.
 
 Before making LLM requests, ensure your wallet has approved sufficient
-OPG tokens for Permit2 spending by calling ``ensure_opg_allowance`` or ``approve_opg``.
+OPG tokens for Permit2 spending by calling ``ensure_opg_allowance``.
 
 #### Constructor
 
@@ -58,32 +58,6 @@ resolves TEEs from the on-chain registry.
 
 ---
 
-#### `approve_opg()`
-
-```python
-def approve_opg(self, opg_amount: float) ‑> [Permit2ApprovalResult](./opg_token)
-```
-Approve Permit2 to spend ``opg_amount`` OPG tokens.
-
-Always sends an approval transaction regardless of the current allowance.
-
-**Arguments**
-
-* **`opg_amount`**: Number of OPG tokens to approve (e.g. ``0.1``
-        for 0.1 OPG). Must be at least 0.01 OPG.
-
-**Returns**
-
-Permit2ApprovalResult: Contains ``allowance_before``,
-    ``allowance_after``, and ``tx_hash``.
-
-**Raises**
-
-* **`ValueError`**: If the OPG amount is less than 0.01.
-* **`RuntimeError`**: If the approval transaction fails.
-
----
-
 #### `chat()`
 
 ```python

integrationtest/llm/test_llm_chat.py

@@ -99,7 +99,7 @@ def llm_client():
     print("Account funded with ETH and OPG")
 
     llm = og.LLM(private_key=account.key.hex())
-    llm.approve_opg(opg_amount=OPG_FUND_AMOUNT)
+    llm.ensure_opg_allowance(min_allowance=OPG_FUND_AMOUNT, approve_amount=OPG_FUND_AMOUNT)
     print("Permit2 approval complete")
 
     # Wait for the approval to propagate on-chain

src/opengradient/client/llm.py

@@ -15,7 +15,7 @@
 from x402.mechanisms.evm.upto.register import register_upto_evm_client
 
 from ..types import TEE_LLM, StreamChoice, StreamChunk, StreamDelta, TextGenerationOutput, x402SettlementMode
-from .opg_token import Permit2ApprovalResult, approve_opg, ensure_opg_allowance
+from .opg_token import Permit2ApprovalResult, ensure_opg_allowance
 from .tee_connection import RegistryTEEConnection, StaticTEEConnection, TEEConnectionInterface
 from .tee_registry import TEERegistry
 
@@ -58,7 +58,7 @@ class LLM:
     All request methods (``chat``, ``completion``) are async.
 
     Before making LLM requests, ensure your wallet has approved sufficient
-    OPG tokens for Permit2 spending by calling ``ensure_opg_allowance`` or ``approve_opg``.
+    OPG tokens for Permit2 spending by calling ``ensure_opg_allowance``.
 
     Usage:
         # Via on-chain registry (default)
@@ -182,27 +182,6 @@ async def _call_with_tee_retry(
 
     # ── Public API ──────────────────────────────────────────────────────
 
-    def approve_opg(self, opg_amount: float) -> Permit2ApprovalResult:
-        """Approve Permit2 to spend ``opg_amount`` OPG tokens.
-
-        Always sends an approval transaction regardless of the current allowance.
-
-        Args:
-            opg_amount: Number of OPG tokens to approve (e.g. ``0.1``
-                for 0.1 OPG). Must be at least 0.01 OPG.
-
-        Returns:
-            Permit2ApprovalResult: Contains ``allowance_before``,
-                ``allowance_after``, and ``tx_hash``.
-
-        Raises:
-            ValueError: If the OPG amount is less than 0.01.
-            RuntimeError: If the approval transaction fails.
-        """
-        if opg_amount < 0.01:
-            raise ValueError("OPG amount must be at least 0.01.")
-        return approve_opg(self._wallet_account, opg_amount)
-
     def ensure_opg_allowance(
         self,
         min_allowance: float,

src/opengradient/client/opg_token.py

@@ -39,6 +39,13 @@
         "stateMutability": "nonpayable",
         "type": "function",
     },
+    {
+        "inputs": [{"name": "account", "type": "address"}],
+        "name": "balanceOf",
+        "outputs": [{"name": "", "type": "uint256"}],
+        "stateMutability": "view",
+        "type": "function",
+    },
 ]
 
 
@@ -137,35 +144,6 @@ def _get_web3_and_contract():
     return w3, token, spender
 
 
-def approve_opg(wallet_account: LocalAccount, opg_amount: float) -> Permit2ApprovalResult:
-    """Approve Permit2 to spend ``opg_amount`` OPG tokens.
-
-    Always sends an approval transaction regardless of the current allowance.
-
-    Example::
-
-        result = approve_opg(wallet, 5.0)
-
-    Args:
-        wallet_account: The wallet account to approve from.
-        opg_amount: Number of OPG tokens to approve (e.g. ``5.0`` for 5 OPG).
-            Converted to base units (18 decimals) internally.
-
-    Returns:
-        Permit2ApprovalResult: Contains ``allowance_before``,
-            ``allowance_after``, and ``tx_hash``.
-
-    Raises:
-        RuntimeError: If the approval transaction fails.
-    """
-    amount_base = int(opg_amount * 10**18)
-
-    w3, token, spender = _get_web3_and_contract()
-    owner = Web3.to_checksum_address(wallet_account.address)
-
-    return _send_approve_tx(wallet_account, w3, token, owner, spender, amount_base)
-
-
 def ensure_opg_allowance(
     wallet_account: LocalAccount,
     min_allowance: float,
@@ -222,6 +200,15 @@ def ensure_opg_allowance(
             allowance_after=allowance_before,
         )
 
+    balance = token.functions.balanceOf(owner).call()
+    if approve_base > balance:
+        logger.warning(
+            "Requested approve_amount (%.6f OPG) exceeds wallet balance (%.6f OPG), capping approval to wallet balance",
+            approve_amount,
+            balance / 10**18,
+        )
+        approve_base = balance
+
     logger.info(
         "Permit2 allowance below minimum threshold (%s < %s), approving %s base units",
         allowance_before,

tests/llm_test.py

@@ -488,17 +488,6 @@ async def test_tools_with_stream_falls_back_to_single_chunk(self, fake_http):
         assert chunks[0].choices[0].finish_reason == "tool_calls"
 
 
-# ── approve_opg tests ────────────────────────────────────────
-
-
-class TestEnsureOpgApproval:
-    def test_rejects_amount_below_minimum(self, fake_http):
-        llm = _make_llm()
-
-        with pytest.raises(ValueError, match="at least"):
-            llm.approve_opg(opg_amount=0.01)
-
-
 # ── Lifecycle tests ──────────────────────────────────────────────────