Skip to content

Fix: ensure scaled decimal values are integer strings to avoid unmars… #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ayaanoncrypto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: ensure scaled decimal values are integer strings to avoid unmars… #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions pyinjective/composer_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,9 @@ def spot_order(
trigger_price = trigger_price or Decimal(0)
expiration_block = expiration_block or 0
chain_order_type = self._resolve_order_type(order_type)
chain_quantity = f"{Token.convert_value_to_extended_decimal_format(value=quantity).normalize():f}"
chain_price = f"{Token.convert_value_to_extended_decimal_format(value=price).normalize():f}"
chain_trigger_price = f"{Token.convert_value_to_extended_decimal_format(value=trigger_price).normalize():f}"
chain_quantity = str(int(Token.convert_value_to_extended_decimal_format(value=quantity)))
chain_price = str(int(Token.convert_value_to_extended_decimal_format(value=price)))
chain_trigger_price = str(int(Token.convert_value_to_extended_decimal_format(value=trigger_price)))

return injective_order_v2_pb.SpotOrder(
market_id=market_id,
Expand Down Expand Up @@ -599,12 +599,12 @@ def msg_instant_spot_market_launch(
quote_decimals: int,
) -> injective_exchange_tx_v2_pb.MsgInstantSpotMarketLaunch:
chain_min_price_tick_size = (
f"{Token.convert_value_to_extended_decimal_format(value=min_price_tick_size).normalize():f}"
str(int(Token.convert_value_to_extended_decimal_format(value=min_price_tick_size)))
)
chain_min_quantity_tick_size = (
f"{Token.convert_value_to_extended_decimal_format(value=min_quantity_tick_size).normalize():f}"
str(int(Token.convert_value_to_extended_decimal_format(value=min_quantity_tick_size)))
)
chain_min_notional = f"{Token.convert_value_to_extended_decimal_format(value=min_notional).normalize():f}"
chain_min_notional = str(int(Token.convert_value_to_extended_decimal_format(value=min_notional)))

return injective_exchange_tx_v2_pb.MsgInstantSpotMarketLaunch(
sender=sender,
Expand Down Expand Up @@ -655,14 +655,14 @@ def msg_instant_perpetual_market_launch_v2(
oracle_quote=oracle_quote,
oracle_scale_factor=oracle_scale_factor,
oracle_type=self._resolve_oracle_type(oracle_type),
maker_fee_rate=f"{chain_maker_fee_rate.normalize():f}",
taker_fee_rate=f"{chain_taker_fee_rate.normalize():f}",
initial_margin_ratio=f"{chain_initial_margin_ratio.normalize():f}",
maintenance_margin_ratio=f"{chain_maintenance_margin_ratio.normalize():f}",
reduce_margin_ratio=f"{chain_reduce_margin_ratio.normalize():f}",
min_price_tick_size=f"{chain_min_price_tick_size.normalize():f}",
min_quantity_tick_size=f"{chain_min_quantity_tick_size.normalize():f}",
min_notional=f"{chain_min_notional.normalize():f}",
maker_fee_rate=str(int(chain_maker_fee_rate)),
taker_fee_rate=str(int(chain_taker_fee_rate)),
initial_margin_ratio=str(int(chain_initial_margin_ratio)),
maintenance_margin_ratio=str(int(chain_maintenance_margin_ratio)),
reduce_margin_ratio=str(int(chain_reduce_margin_ratio)),
min_price_tick_size=str(int(chain_min_price_tick_size)),
min_quantity_tick_size=str(int(chain_min_quantity_tick_size)),
min_notional=str(int(chain_min_notional)),
open_notional_cap=open_notional_cap,
cross_margin_eligible=cross_margin_eligible,
)
Expand Down Expand Up @@ -706,14 +706,14 @@ def msg_instant_expiry_futures_market_launch_v2(
oracle_scale_factor=oracle_scale_factor,
oracle_type=self._resolve_oracle_type(oracle_type),
expiry=expiry,
maker_fee_rate=f"{chain_maker_fee_rate.normalize():f}",
taker_fee_rate=f"{chain_taker_fee_rate.normalize():f}",
initial_margin_ratio=f"{chain_initial_margin_ratio.normalize():f}",
maintenance_margin_ratio=f"{chain_maintenance_margin_ratio.normalize():f}",
reduce_margin_ratio=f"{chain_reduce_margin_ratio.normalize():f}",
min_price_tick_size=f"{chain_min_price_tick_size.normalize():f}",
min_quantity_tick_size=f"{chain_min_quantity_tick_size.normalize():f}",
min_notional=f"{chain_min_notional.normalize():f}",
maker_fee_rate=str(int(chain_maker_fee_rate)),
taker_fee_rate=str(int(chain_taker_fee_rate)),
initial_margin_ratio=str(int(chain_initial_margin_ratio)),
maintenance_margin_ratio=str(int(chain_maintenance_margin_ratio)),
reduce_margin_ratio=str(int(chain_reduce_margin_ratio)),
min_price_tick_size=str(int(chain_min_price_tick_size)),
min_quantity_tick_size=str(int(chain_min_quantity_tick_size)),
min_notional=str(int(chain_min_notional)),
open_notional_cap=open_notional_cap,
cross_margin_eligible=cross_margin_eligible,
)
Expand Down Expand Up @@ -970,15 +970,15 @@ def msg_instant_binary_options_market_launch(
oracle_provider=oracle_provider,
oracle_type=self._resolve_oracle_type(oracle_type),
oracle_scale_factor=oracle_scale_factor,
maker_fee_rate=f"{chain_maker_fee_rate.normalize():f}",
taker_fee_rate=f"{chain_taker_fee_rate.normalize():f}",
maker_fee_rate=str(int(chain_maker_fee_rate)),
taker_fee_rate=str(int(chain_taker_fee_rate)),
expiration_timestamp=expiration_timestamp,
settlement_timestamp=settlement_timestamp,
admin=admin,
quote_denom=quote_denom,
min_price_tick_size=f"{chain_min_price_tick_size.normalize():f}",
min_quantity_tick_size=f"{chain_min_quantity_tick_size.normalize():f}",
min_notional=f"{chain_min_notional.normalize():f}",
min_price_tick_size=str(int(chain_min_price_tick_size)),
min_quantity_tick_size=str(int(chain_min_quantity_tick_size)),
min_notional=str(int(chain_min_notional)),
open_notional_cap=open_notional_cap,
)

Expand Down Expand Up @@ -1173,7 +1173,7 @@ def msg_admin_update_binary_options_market(

if settlement_price is not None:
chain_settlement_price = Token.convert_value_to_extended_decimal_format(value=settlement_price)
message.settlement_price = f"{chain_settlement_price.normalize():f}"
message.settlement_price = str(int(chain_settlement_price))

return message

Expand All @@ -1191,7 +1191,7 @@ def msg_decrease_position_margin(
source_subaccount_id=source_subaccount_id,
destination_subaccount_id=destination_subaccount_id,
market_id=market_id,
amount=f"{margin_to_remove.normalize():f}",
amount=str(int(margin_to_remove)),
)

def msg_update_spot_market(
Expand All @@ -1211,9 +1211,9 @@ def msg_update_spot_market(
admin=admin,
market_id=market_id,
new_ticker=new_ticker,
new_min_price_tick_size=f"{chain_min_price_tick_size.normalize():f}",
new_min_quantity_tick_size=f"{chain_min_quantity_tick_size.normalize():f}",
new_min_notional=f"{chain_min_notional.normalize():f}",
new_min_price_tick_size=str(int(chain_min_price_tick_size)),
new_min_quantity_tick_size=str(int(chain_min_quantity_tick_size)),
new_min_notional=str(int(chain_min_notional)),
)

def msg_update_derivative_market(
Expand Down Expand Up @@ -1243,12 +1243,12 @@ def msg_update_derivative_market(
admin=admin,
market_id=market_id,
new_ticker=new_ticker,
new_min_price_tick_size=f"{chain_min_price_tick_size.normalize():f}",
new_min_quantity_tick_size=f"{chain_min_quantity_tick_size.normalize():f}",
new_min_notional=f"{chain_min_notional.normalize():f}",
new_initial_margin_ratio=f"{chain_initial_margin_ratio.normalize():f}",
new_maintenance_margin_ratio=f"{chain_maintenance_margin_ratio.normalize():f}",
new_reduce_margin_ratio=f"{chain_reduce_margin_ratio.normalize():f}",
new_min_price_tick_size=str(int(chain_min_price_tick_size)),
new_min_quantity_tick_size=str(int(chain_min_quantity_tick_size)),
new_min_notional=str(int(chain_min_notional)),
new_initial_margin_ratio=str(int(chain_initial_margin_ratio)),
new_maintenance_margin_ratio=str(int(chain_maintenance_margin_ratio)),
new_reduce_margin_ratio=str(int(chain_reduce_margin_ratio)),
new_open_notional_cap=new_open_notional_cap,
cross_margin_eligibility=cross_margin_eligibility,
)
Expand Down Expand Up @@ -1284,7 +1284,7 @@ def open_notional_cap(self, value: Decimal) -> injective_market_v2_pb.OpenNotion
chain_value = Token.convert_value_to_extended_decimal_format(value=value)
return injective_market_v2_pb.OpenNotionalCap(
capped=injective_market_v2_pb.OpenNotionalCapCapped(
value=f"{chain_value.normalize():f}",
value=str(int(chain_value)),
),
)

Expand Down Expand Up @@ -1364,7 +1364,7 @@ def msg_relay_provider_prices(

for price in prices:
scale_price = Decimal(price * pow(10, 18))
price_to_bytes = bytes(str(scale_price), "utf-8")
price_to_bytes = bytes(str(int(scale_price)), "utf-8")
oracle_prices.append(price_to_bytes)

return injective_oracle_tx_pb.MsgRelayProviderPrices(
Expand Down Expand Up @@ -1967,10 +1967,10 @@ def _basic_derivative_order(
trigger_price = trigger_price or Decimal(0)
expiration_height = expiration_block or 0

chain_quantity = f"{Token.convert_value_to_extended_decimal_format(value=quantity).normalize():f}"
chain_price = f"{Token.convert_value_to_extended_decimal_format(value=price).normalize():f}"
chain_margin = f"{Token.convert_value_to_extended_decimal_format(value=margin).normalize():f}"
chain_trigger_price = f"{Token.convert_value_to_extended_decimal_format(value=trigger_price).normalize():f}"
chain_quantity = str(int(Token.convert_value_to_extended_decimal_format(value=quantity)))
chain_price = str(int(Token.convert_value_to_extended_decimal_format(value=price)))
chain_margin = str(int(Token.convert_value_to_extended_decimal_format(value=margin)))
chain_trigger_price = str(int(Token.convert_value_to_extended_decimal_format(value=trigger_price)))
chain_order_type = self._resolve_order_type(order_type)

return injective_order_v2_pb.DerivativeOrder(
Expand Down