opinion-clob-sdk 0.1.9__py3-none-any.whl → 0.4.2__py3-none-any.whl

opinion_clob_sdk/__init__.py

@@ -2,7 +2,7 @@
 
 from opinion_clob_sdk.sdk import (
     Client,
-    CHAIN_ID_BASE_MAINNET,
+    CHAIN_ID_BNB_MAINNET,
     SUPPORTED_CHAIN_IDS
 )
 from opinion_clob_sdk.model import TopicStatus, TopicType, TopicStatusFilter
@@ -12,13 +12,13 @@ from opinion_clob_sdk.chain.exception import (
     InsufficientGasBalance
 )
 
-__version__ = "0.1.9"
+__version__ = "0.4.2"
 __all__ = [
     "Client",
     "TopicStatus",
     "TopicType",
     "TopicStatusFilter",
-    "CHAIN_ID_BASE_MAINNET",
+    "CHAIN_ID_BNB_MAINNET",
     "SUPPORTED_CHAIN_IDS",
     "BalanceNotEnough",
     "NoPositionsToRedeem",

opinion_clob_sdk/chain/contract_caller.py

@@ -8,6 +8,13 @@ from web3 import Web3
 from web3.contract import Contract
 from web3.providers import HTTPProvider
 
+# Handle both old and new web3.py versions
+try:
+    from web3.middleware import ExtraDataToPOAMiddleware
+    geth_poa_middleware = ExtraDataToPOAMiddleware
+except ImportError:
+    from web3.middleware import geth_poa_middleware
+
 from .exception import BalanceNotEnough, NoPositionsToRedeem, InsufficientGasBalance
 from .safe.constants import NULL_HASH
 from .safe.multisend import MultiSendTx, MultiSendOperation
@@ -19,7 +26,7 @@ from .safe.utils import get_empty_tx_params
 class ContractCaller:
     def __init__(self, rpc_url='', private_key: HexStr = '', multi_sig_addr: ChecksumAddress = '',
                  conditional_tokens_addr: ChecksumAddress = '', multisend_addr: ChecksumAddress = '',
-                 enable_trading_check_interval=3600):
+                 fee_manager_addr: ChecksumAddress = '', enable_trading_check_interval=3600):
         """
         Initialize ContractCaller for blockchain interactions.
 
@@ -29,6 +36,7 @@ class ContractCaller:
             multi_sig_addr: Multi-signature wallet address
             conditional_tokens_addr: Conditional tokens contract address
             multisend_addr: Multisend contract address
+            fee_manager_addr: Fee manager contract address
             enable_trading_check_interval: Time interval (in seconds) to cache enable_trading checks.
                 Default is 3600 (1 hour). Within this interval, enable_trading() will return
                 immediately without checking blockchain state, improving performance significantly.
@@ -39,7 +47,11 @@ class ContractCaller:
         self.multi_sig_addr = multi_sig_addr
         self.conditional_tokens_addr = conditional_tokens_addr
         self.multisend_addr = multisend_addr
+        self.fee_manager_addr = fee_manager_addr
         w3 = Web3(HTTPProvider(rpc_url))
+        # Inject POA middleware to handle BNB Chain (BSC) which is a Proof of Authority chain
+        # BNB Chain includes extra validator data in block headers (280 bytes instead of 32)
+        w3.middleware_onion.inject(geth_poa_middleware, layer=0)
         self.w3 = w3
         self.safe = Safe(w3, private_key, multi_sig_addr, multisend_addr)
         self.__enable_trading_check_interval: int = enable_trading_check_interval
@@ -52,6 +64,11 @@ class ContractCaller:
         from .contracts.conditional_tokens import abi
         return self.w3.eth.contract(self.conditional_tokens_addr, abi=abi)
 
+    @property
+    def fee_manager(self) -> Contract:
+        from .py_order_utils.abi.FeeManager import abi
+        return self.w3.eth.contract(self.fee_manager_addr, abi=abi)
+
     def get_erc20_contract(self, address: ChecksumAddress):
         from .contracts.erc20 import abi
         return self.w3.eth.contract(address, abi=abi)
@@ -288,7 +305,9 @@ class ContractCaller:
 
             # Used for trading on ctf_exchange
             min_threshold = 1000000000 * 10**decimals
-            allowance_to_update = 2*1000000000 * 10**decimals
+            # Use unlimited approval (max uint256) - industry standard for trusted contracts
+            # This eliminates need for re-approval and saves gas long-term
+            allowance_to_update = 2**256 - 1
             if allowance < min_threshold:
                 # DH1 Fix: Reset approval to 0 first (required for some tokens like USDT)
                 # to prevent approval race condition attack
@@ -319,6 +338,7 @@ class ContractCaller:
                     value=0,
                     data=data,
                 ))
+                logging.info(f'Approving unlimited allowance for {erc20_address} -> {ctf_exchange_address}')
 
             # Used for splitting
             allowance = erc20_contract.functions.allowance(self.multi_sig_addr, self.conditional_tokens_addr).call()
@@ -351,6 +371,7 @@ class ContractCaller:
                     value=0,
                     data=data,
                 ))
+                logging.info(f'Approving unlimited allowance for {erc20_address} -> {self.conditional_tokens_addr}')
 
             # Approve ctf_exchange for using conditional tokens
             is_approved_for_all = self.conditional_tokens.functions.isApprovedForAll(
@@ -388,3 +409,36 @@ class ContractCaller:
             parent_condition_id, condition_id, index_set).call()
 
         return self.conditional_tokens.functions.getPositionId(collateral_token, collection_id).call()
+
+    def get_fee_rate_settings(self, token_id: int) -> dict:
+        """
+        Get fee rate settings from FeeManager contract.
+
+        Args:
+            token_id: The token ID to query fee rates for
+
+        Returns:
+            Dictionary containing:
+                - maker_max_fee_rate: Maker maximum fee rate as decimal (e.g., 0.02 = 2%)
+                - taker_max_fee_rate: Taker maximum fee rate as decimal (e.g., 0.02 = 2%)
+                - enabled: Whether fee is enabled
+        """
+        try:
+            result = self.fee_manager.functions.getFeeRateSettings(token_id).call()
+            maker_fee_rate_bps = result[0]
+            taker_fee_rate_bps = result[1]
+
+            # Convert basis points to max fee rate percentage
+            # Formula: fee_rate_bps * 0.25 / 10000
+            # Example: 800 * 0.25 / 10000 = 0.02 (2%)
+            maker_max_fee_rate = maker_fee_rate_bps * 0.25 / 10000
+            taker_max_fee_rate = taker_fee_rate_bps * 0.25 / 10000
+
+            return {
+                "maker_max_fee_rate": maker_max_fee_rate,
+                "taker_max_fee_rate": taker_max_fee_rate,
+                "enabled": result[2]
+            }
+        except Exception as e:
+            logging.error(f"Failed to get fee rate settings for token {token_id}: {e}")
+            raise

opinion_clob_sdk/chain/contracts/erc20.py

@@ -29,6 +29,27 @@ abi = """
     "outputs": [{ "name": "", "type": "uint256", "internalType": "uint256" }],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "decimals",
+    "inputs": [],
+    "outputs": [{ "name": "", "type": "uint8", "internalType": "uint8" }],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "name",
+    "inputs": [],
+    "outputs": [{ "name": "", "type": "string", "internalType": "string" }],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "symbol",
+    "inputs": [],
+    "outputs": [{ "name": "", "type": "string", "internalType": "string" }],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "totalSupply",