(fix) Fixed issues in the V2 messages with Coin parameters, to not add the extra digits in the amounts

Author: aarmoa

pyinjective/async_client.py

@@ -2481,11 +2481,6 @@ async def listen_chain_stream_updates(
         positions_filter: Optional[chain_stream_query.PositionsFilter] = None,
         oracle_price_filter: Optional[chain_stream_query.OraclePriceFilter] = None,
     ):
-        """
-        This method is deprecated and will be removed soon. Please use `listen_chain_stream_v2_updates` instead
-        """
-        warn("This method is deprecated. Use listen_chain_stream_v2_updates instead", DeprecationWarning, stacklevel=2)
-
         return await self.chain_stream_api.stream(
             callback=callback,
             on_end_callback=on_end_callback,

pyinjective/composer.py

@@ -369,9 +369,9 @@ def order_data(
         is_market_order: Optional[bool] = False,
     ) -> injective_exchange_tx_pb.OrderData:
         """
-        This method is deprecated and will be removed soon. Please use `create_v2_order_data` instead
+        This method is deprecated and will be removed soon. Please use `create_order_data_v2` instead
         """
-        warn("This method is deprecated. Use create_v2_order_data instead", DeprecationWarning, stacklevel=2)
+        warn("This method is deprecated. Use create_order_data_v2 instead", DeprecationWarning, stacklevel=2)
 
         order_mask = self._order_mask(is_conditional=is_conditional, is_buy=is_buy, is_market_order=is_market_order)
 
@@ -391,10 +391,10 @@ def order_data_without_mask(
         cid: Optional[str] = None,
     ) -> injective_exchange_tx_pb.OrderData:
         """
-        This method is deprecated and will be removed soon. Please use `create_v2_order_data_without_mask` instead
+        This method is deprecated and will be removed soon. Please use `create_order_data_without_mask_v2` instead
         """
         warn(
-            "This method is deprecated. Use create_v2_order_data_without_mask instead", DeprecationWarning, stacklevel=2
+            "This method is deprecated. Use create_order_data_without_mask_v2 instead", DeprecationWarning, stacklevel=2
         )
 
         return injective_exchange_tx_pb.OrderData(
@@ -452,9 +452,9 @@ def spot_order(
         trigger_price: Optional[Decimal] = None,
     ) -> injective_exchange_pb.SpotOrder:
         """
-        This method is deprecated and will be removed soon. Please use `create_v2_spot_order` instead
+        This method is deprecated and will be removed soon. Please use `create_spot_order_v2` instead
         """
-        warn("This method is deprecated. Use create_v2_spot_order instead", DeprecationWarning, stacklevel=2)
+        warn("This method is deprecated. Use create_spot_order_v2 instead", DeprecationWarning, stacklevel=2)
 
         market = self.spot_markets[market_id]
 
@@ -532,9 +532,9 @@ def derivative_order(
         trigger_price: Optional[Decimal] = None,
     ) -> injective_exchange_pb.DerivativeOrder:
         """
-        This method is deprecated and will be removed soon. Please use `create_v2_derivative_order` instead
+        This method is deprecated and will be removed soon. Please use `create_derivative_order_v2` instead
         """
-        warn("This method is deprecated. Use create_v2_derivative_order instead", DeprecationWarning, stacklevel=2)
+        warn("This method is deprecated. Use create_derivative_order_v2 instead", DeprecationWarning, stacklevel=2)
 
         market = self.derivative_markets[market_id]
 
@@ -597,9 +597,9 @@ def binary_options_order(
         denom: Optional[Denom] = None,
     ) -> injective_exchange_pb.DerivativeOrder:
         """
-        This method is deprecated and will be removed soon. Please use `create_v2_binary_options_order` instead
+        This method is deprecated and will be removed soon. Please use `create_binary_options_order_v2` instead
         """
-        warn("This method is deprecated. Use create_v2_binary_options_order instead", DeprecationWarning, stacklevel=2)
+        warn("This method is deprecated. Use create_binary_options_order_v2 instead", DeprecationWarning, stacklevel=2)
 
         market = self.binary_option_markets[market_id]
 
@@ -717,8 +717,7 @@ def MsgSend(self, from_address: str, to_address: str, amount: float, denom: str)
         )
 
     def msg_send(self, from_address: str, to_address: str, amount: int, denom: str):
-        chain_amount = Token.convert_value_to_extended_decimal_format(value=Decimal(str(amount)))
-        coin = self.coin(amount=int(chain_amount), denom=denom)
+        coin = self.coin(amount=int(amount), denom=denom)
 
         return cosmos_bank_tx_pb.MsgSend(
             from_address=from_address,
@@ -748,8 +747,7 @@ def msg_deposit(
     def msg_deposit_v2(
         self, sender: str, subaccount_id: str, amount: int, denom: str
     ) -> injective_exchange_tx_v2_pb.MsgDeposit:
-        chain_amount = Token.convert_value_to_extended_decimal_format(value=Decimal(str(amount)))
-        coin = self.coin(amount=int(chain_amount), denom=denom)
+        coin = self.coin(amount=int(amount), denom=denom)
 
         return injective_exchange_tx_v2_pb.MsgDeposit(
             sender=sender,
@@ -780,8 +778,7 @@ def msg_withdraw_v2(
         amount: int,
         denom: str,
     ) -> injective_exchange_tx_v2_pb.MsgWithdraw:
-        chain_amount = Token.convert_value_to_extended_decimal_format(value=Decimal(str(amount)))
-        coin = self.coin(amount=int(chain_amount), denom=denom)
+        coin = self.coin(amount=int(amount), denom=denom)
 
         return injective_exchange_tx_v2_pb.MsgWithdraw(
             sender=sender,
@@ -1894,8 +1891,7 @@ def msg_subaccount_transfer_v2(
         amount: int,
         denom: str,
     ) -> injective_exchange_tx_v2_pb.MsgSubaccountTransfer:
-        chain_amount = Token.convert_value_to_extended_decimal_format(value=Decimal(str(amount)))
-        amount_coin = self.coin(amount=int(chain_amount), denom=denom)
+        amount_coin = self.coin(amount=int(amount), denom=denom)
 
         return injective_exchange_tx_v2_pb.MsgSubaccountTransfer(
             sender=sender,
@@ -1934,8 +1930,7 @@ def msg_external_transfer_v2(
         amount: int,
         denom: str,
     ) -> injective_exchange_tx_v2_pb.MsgExternalTransfer:
-        chain_amount = Token.convert_value_to_extended_decimal_format(value=Decimal(str(amount)))
-        coin = self.coin(amount=int(chain_amount), denom=denom)
+        coin = self.coin(amount=int(amount), denom=denom)
 
         return injective_exchange_tx_v2_pb.MsgExternalTransfer(
             sender=sender,
@@ -2131,13 +2126,13 @@ def msg_decrease_position_margin_v2(
         market_id: str,
         amount: Decimal,
     ) -> injective_exchange_tx_v2_pb.MsgDecreasePositionMargin:
-        additional_margin = Token.convert_value_to_extended_decimal_format(value=amount)
+        margin_to_remove = Token.convert_value_to_extended_decimal_format(value=amount)
         return injective_exchange_tx_v2_pb.MsgDecreasePositionMargin(
             sender=sender,
             source_subaccount_id=source_subaccount_id,
             destination_subaccount_id=destination_subaccount_id,
             market_id=market_id,
-            amount=f"{additional_margin.normalize():f}",
+            amount=f"{margin_to_remove.normalize():f}",
         )
 
     def msg_update_spot_market(
@@ -2324,8 +2319,7 @@ def msg_create_insurance_fund(
         expiry: int,
         initial_deposit: int,
     ) -> injective_insurance_tx_pb.MsgCreateInsuranceFund:
-        chain_initial_deposit = Token.convert_value_to_extended_decimal_format(value=Decimal(str(initial_deposit)))
-        deposit = self.coin(amount=int(chain_initial_deposit), denom=quote_denom)
+        deposit = self.coin(amount=int(initial_deposit), denom=quote_denom)
 
         return injective_insurance_tx_pb.MsgCreateInsuranceFund(
             sender=sender,
@@ -2365,8 +2359,7 @@ def msg_underwrite(
         quote_denom: str,
         amount: int,
     ):
-        chain_amount = Token.convert_value_to_extended_decimal_format(value=Decimal(str(amount)))
-        coin = self.coin(amount=int(chain_amount), denom=quote_denom)
+        coin = self.coin(amount=int(amount), denom=quote_denom)
 
         return injective_insurance_tx_pb.MsgUnderwrite(
             sender=sender,
@@ -2426,10 +2419,8 @@ def MsgSendToEth(self, denom: str, sender: str, eth_dest: str, amount: float, br
         )
 
     def msg_send_to_eth(self, denom: str, sender: str, eth_dest: str, amount: int, bridge_fee: int):
-        chain_amount = Token.convert_value_to_extended_decimal_format(value=Decimal(str(amount)))
-        chain_bridge_fee = Token.convert_value_to_extended_decimal_format(value=Decimal(str(bridge_fee)))
-        amount_coin = self.coin(amount=int(chain_amount), denom=denom)
-        bridge_fee_coin = self.coin(amount=int(chain_bridge_fee), denom=denom)
+        amount_coin = self.coin(amount=int(amount), denom=denom)
+        bridge_fee_coin = self.coin(amount=int(bridge_fee), denom=denom)
 
         return injective_peggy_tx_pb.MsgSendToEth(
             sender=sender,
@@ -3029,9 +3020,9 @@ def _basic_derivative_order(
         chain_trigger_price: Optional[Decimal] = None,
     ) -> injective_exchange_pb.DerivativeOrder:
         """
-        This method is deprecated and will be removed soon. Please use `_basic_v2_derivative_order` instead
+        This method is deprecated and will be removed soon. Please use `_basic_derivative_order_v2` instead
         """
-        warn("This method is deprecated. Use _basic_v2_derivative_order instead", DeprecationWarning, stacklevel=2)
+        warn("This method is deprecated. Use _basic_derivative_order_v2 instead", DeprecationWarning, stacklevel=2)
 
         formatted_quantity = f"{chain_quantity.normalize():f}"
         formatted_price = f"{chain_price.normalize():f}"

pyinjective/constant.py

@@ -1,5 +1,5 @@
 GAS_PRICE = 160_000_000
-GAS_FEE_BUFFER_AMOUNT = 25_000
+GAS_FEE_BUFFER_AMOUNT = 30_000
 MAX_MEMO_CHARACTERS = 256
 ADDITIONAL_CHAIN_FORMAT_DECIMALS = 18
 TICKER_TOKENS_SEPARATOR = "/"

pyinjective/core/market.py

@@ -22,17 +22,17 @@ class SpotMarket:
     min_notional: Decimal
 
     def quantity_to_chain_format(self, human_readable_value: Decimal) -> Decimal:
-        chain_formatted_value = human_readable_value * Decimal(f"1e{self.base_token.decimals}")
-        quantized_value = chain_formatted_value // self.min_quantity_tick_size * self.min_quantity_tick_size
-        extended_chain_formatted_value = quantized_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
+        quantized_value = human_readable_value // self.min_quantity_tick_size * self.min_quantity_tick_size
+        chain_formatted_value = quantized_value * Decimal(f"1e{self.base_token.decimals}")
+        extended_chain_formatted_value = chain_formatted_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
         return extended_chain_formatted_value
 
     def price_to_chain_format(self, human_readable_value: Decimal) -> Decimal:
+        quantized_value = (human_readable_value // self.min_price_tick_size) * self.min_price_tick_size
         decimals = self.quote_token.decimals - self.base_token.decimals
-        chain_formatted_value = human_readable_value * Decimal(f"1e{decimals}")
-        quantized_value = (chain_formatted_value // self.min_price_tick_size) * self.min_price_tick_size
-        extended_chain_formatted_value = quantized_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
+        chain_formatted_value = quantized_value * Decimal(f"1e{decimals}")
+        extended_chain_formatted_value = chain_formatted_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
         return extended_chain_formatted_value
 
@@ -87,17 +87,17 @@ class DerivativeMarket:
 
     def quantity_to_chain_format(self, human_readable_value: Decimal) -> Decimal:
         # Derivative markets do not have a base market to provide the number of decimals
-        chain_formatted_value = human_readable_value
-        quantized_value = chain_formatted_value // self.min_quantity_tick_size * self.min_quantity_tick_size
-        extended_chain_formatted_value = quantized_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
+        quantized_value = human_readable_value // self.min_quantity_tick_size * self.min_quantity_tick_size
+        chain_formatted_value = quantized_value
+        extended_chain_formatted_value = chain_formatted_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
         return extended_chain_formatted_value
 
     def price_to_chain_format(self, human_readable_value: Decimal) -> Decimal:
+        quantized_value = (human_readable_value // self.min_price_tick_size) * self.min_price_tick_size
         decimals = self.quote_token.decimals
-        chain_formatted_value = human_readable_value * Decimal(f"1e{decimals}")
-        quantized_value = (chain_formatted_value // self.min_price_tick_size) * self.min_price_tick_size
-        extended_chain_formatted_value = quantized_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
+        chain_formatted_value = quantized_value * Decimal(f"1e{decimals}")
+        extended_chain_formatted_value = chain_formatted_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
         return extended_chain_formatted_value
 
@@ -107,15 +107,12 @@ def margin_to_chain_format(self, human_readable_value: Decimal) -> Decimal:
     def calculate_margin_in_chain_format(
         self, human_readable_quantity: Decimal, human_readable_price: Decimal, leverage: Decimal
     ) -> Decimal:
-        chain_formatted_quantity = human_readable_quantity
-        chain_formatted_price = human_readable_price * Decimal(f"1e{self.quote_token.decimals}")
-        margin = (chain_formatted_price * chain_formatted_quantity) / leverage
+        margin = (human_readable_price * human_readable_quantity) / leverage
         # We are using the min_quantity_tick_size to quantize the margin because that is the way margin is validated
         # in the chain (it might be changed to a min_notional in the future)
         quantized_margin = (margin // self.min_quantity_tick_size) * self.min_quantity_tick_size
-        extended_chain_formatted_margin = quantized_margin * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
-        return extended_chain_formatted_margin
+        return self.notional_to_chain_format(human_readable_value=quantized_margin)
 
     def notional_to_chain_format(self, human_readable_value: Decimal) -> Decimal:
         decimals = self.quote_token.decimals
@@ -178,18 +175,18 @@ def quantity_to_chain_format(self, human_readable_value: Decimal, special_denom:
         min_quantity_tick_size = (
             self.min_quantity_tick_size if special_denom is None else special_denom.min_quantity_tick_size
         )
-        chain_formatted_value = human_readable_value * Decimal(f"1e{decimals}")
-        quantized_value = chain_formatted_value // min_quantity_tick_size * min_quantity_tick_size
-        extended_chain_formatted_value = quantized_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
+        quantized_value = human_readable_value // min_quantity_tick_size * min_quantity_tick_size
+        chain_formatted_value = quantized_value * Decimal(f"1e{decimals}")
+        extended_chain_formatted_value = chain_formatted_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
         return extended_chain_formatted_value
 
     def price_to_chain_format(self, human_readable_value: Decimal, special_denom: Optional[Denom] = None) -> Decimal:
         decimals = self.quote_token.decimals if special_denom is None else special_denom.quote
         min_price_tick_size = self.min_price_tick_size if special_denom is None else special_denom.min_price_tick_size
-        chain_formatted_value = human_readable_value * Decimal(f"1e{decimals}")
-        quantized_value = (chain_formatted_value // min_price_tick_size) * min_price_tick_size
-        extended_chain_formatted_value = quantized_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
+        quantized_value = (human_readable_value // min_price_tick_size) * min_price_tick_size
+        chain_formatted_value = quantized_value * Decimal(f"1e{decimals}")
+        extended_chain_formatted_value = chain_formatted_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
         return extended_chain_formatted_value
 
@@ -198,9 +195,9 @@ def margin_to_chain_format(self, human_readable_value: Decimal, special_denom: O
         min_quantity_tick_size = (
             self.min_quantity_tick_size if special_denom is None else special_denom.min_quantity_tick_size
         )
-        chain_formatted_value = human_readable_value * Decimal(f"1e{decimals}")
-        quantized_value = (chain_formatted_value // min_quantity_tick_size) * min_quantity_tick_size
-        extended_chain_formatted_value = quantized_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
+        quantized_value = (human_readable_value // min_quantity_tick_size) * min_quantity_tick_size
+        chain_formatted_value = quantized_value * Decimal(f"1e{decimals}")
+        extended_chain_formatted_value = chain_formatted_value * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
         return extended_chain_formatted_value
 
@@ -211,19 +208,17 @@ def calculate_margin_in_chain_format(
         is_buy: bool,
         special_denom: Optional[Denom] = None,
     ) -> Decimal:
-        quantity_decimals = 0 if special_denom is None else special_denom.base
-        price_decimals = self.quote_token.decimals if special_denom is None else special_denom.quote
+        quote_decimals = self.quote_token.decimals if special_denom is None else special_denom.quote
         min_quantity_tick_size = (
             self.min_quantity_tick_size if special_denom is None else special_denom.min_quantity_tick_size
         )
         price = human_readable_price if is_buy else 1 - human_readable_price
-        chain_formatted_quantity = human_readable_quantity * Decimal(f"1e{quantity_decimals}")
-        chain_formatted_price = price * Decimal(f"1e{price_decimals}")
-        margin = chain_formatted_price * chain_formatted_quantity
+        margin = price * human_readable_quantity
         # We are using the min_quantity_tick_size to quantize the margin because that is the way margin is validated
         # in the chain (it might be changed to a min_notional in the future)
         quantized_margin = (margin // min_quantity_tick_size) * min_quantity_tick_size
-        extended_chain_formatted_margin = quantized_margin * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
+        chain_formatted_margin = quantized_margin * Decimal(f"1e{quote_decimals}")
+        extended_chain_formatted_margin = chain_formatted_margin * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
 
         return extended_chain_formatted_margin