Merge branch 'master' into f/sdk47

Author: achilleas-kal

Pipfile

@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-protobuf = "==3.19.1"
-grpcio-tools = "==1.42.0"
+protobuf = "*"
+grpcio-tools = "*"
 grpcio = "*"
 asyncio = "*"
 aiohttp = "*"

Pipfile.lock

@@ -78,6 +78,12 @@ Note that the [sync client](https://github.com/InjectiveLabs/sdk-python/blob/mas
 
 
 ### Changelogs
+**0.6.2.7**
+* Fix margin calculation in utils
+
+**0.6.2.1**
+* Remove version deps from Pipfile
+
 **0.6.2.0**
 * Add MsgUnderwrite, MsgRequestRedemption in Composer
 

README.md

@@ -119,8 +119,8 @@ min_display_quantity_tick_size = 0.001
 description = 'Mainnet Spot WETH/USDT'
 base = 18
 quote = 6
-min_price_tick_size = 0.00000000000001
-min_display_price_tick_size = 0.01
+min_price_tick_size = 0.0000000000001
+min_display_price_tick_size = 0.1
 min_quantity_tick_size = 1000000000000000
 min_display_quantity_tick_size = 0.001
 
@@ -389,17 +389,17 @@ min_display_quantity_tick_size = 0.1
 description = 'Mainnet Derivative BTC/USDT PERP'
 base = 0
 quote = 6
-min_price_tick_size = 100000
-min_display_price_tick_size = 0.1
+min_price_tick_size = 1000000
+min_display_price_tick_size = 1.0
 min_quantity_tick_size = 0.0001
 min_display_quantity_tick_size = 0.0001
 
 [0x54d4505adef6a5cef26bc403a33d595620ded4e15b9e2bc3dd489b714813366a]
 description = 'Mainnet Derivative ETH/USDT PERP'
 base = 0
 quote = 6
-min_price_tick_size = 10000
-min_display_price_tick_size = 0.01
+min_price_tick_size = 100000
+min_display_price_tick_size = 0.1
 min_quantity_tick_size = 0.01
 min_display_quantity_tick_size = 0.01
 
@@ -502,6 +502,15 @@ min_display_price_tick_size = 1e-10
 min_quantity_tick_size = 0.1
 min_display_quantity_tick_size = 0.1
 
+[0xcd0c859a99f26bb3530e21890937ed77d20754aa7825a599c71710514fc125ef]
+description = 'Mainnet Derivative 1MPEPE/USDT PERP'
+base = 0
+quote = 6
+min_price_tick_size = 100
+min_display_price_tick_size = 0.0001
+min_quantity_tick_size = 1
+min_display_quantity_tick_size = 1
+
 [WETH]
 peggy_denom = peggy0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2
 decimals = 18
@@ -578,6 +587,10 @@ decimals = 6
 peggy_denom = peggy0x4d224452801ACEd8B2F0aebE155379bb5D594381
 decimals = 18
 
+[PUG]
+peggy_denom = peggy0xf9a06dE3F6639E6ee4F079095D5093644Ad85E8b
+decimals = 18
+
 [HUAHUA]
 peggy_denom = ibc/E7807A46C0B7B44B350DA58F51F278881B863EC4DCA94635DAB39E52C30766CB
 decimals = 6
@@ -645,3 +658,4 @@ decimals = 8
 [wMATIC]
 peggy_denom = factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj1dxv423h8ygzgxmxnvrf33ws3k94aedfdevxd8h
 decimals = 8
+

pyinjective/denoms_mainnet.ini

@@ -196,11 +196,11 @@ peggy_denom = peggy0x87aB3B4C8661e07D6372361211B96ed4Dc36B1B5
 decimals = 6
 
 [USDC]
-peggy_denom = peggy0xf9152067989BDc8783fF586624124C05A529A5D1
+peggy_denom = peggy0x07865c6E87B9F70255377e024ace6630C1Eaa37F
 decimals = 6
 
 [USDCfr]
-peggy_denom = peggy0x07865c6E87B9F70255377e024ace6630C1Eaa37F
+peggy_denom = peggy0xf9152067989BDc8783fF586624124C05A529A5D1
 decimals = 6
 
 [APE]

pyinjective/denoms_testnet.ini

@@ -1,5 +1,6 @@
 from decimal import Decimal
 from math import floor
+from typing import Union
 
 """
 One thing you may need to pay more attention to is how to deal with decimals on the Injective Exchange.
@@ -56,9 +57,13 @@ def binary_options_quantity_to_backend(quantity, denom) -> int:
     return int(exchange_quantity)
 
 def derivative_margin_to_backend(price, quantity, leverage, denom) -> int:
-    price_tick_size = Decimal(denom.min_price_tick_size) / pow(10, denom.quote)
-    margin = (price * quantity) / leverage
-    exchange_margin = floor_to(margin, float(price_tick_size)) * pow(10, 18 + denom.quote)
+    chain_format_price = Decimal(str(price)) * Decimal(f"1e{denom.quote}")
+    chain_format_quantity = Decimal(str(quantity)) * Decimal(f"1e{denom.base}")
+    decimal_leverage = Decimal(str(leverage))
+    margin = (chain_format_price * chain_format_quantity) / decimal_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)
+    exchange_margin = floor_to(margin, denom.min_quantity_tick_size) * Decimal(f"1e18")
     return int(exchange_margin)
 
 def binary_options_buy_margin_to_backend(price, quantity, denom) -> int:
@@ -82,7 +87,7 @@ def amount_to_backend(amount, decimals) -> int:
     be_amount = amount * pow(10, decimals)
     return int(be_amount)
 
-def floor_to(value: float, target: float) -> Decimal:
+def floor_to(value: Union[float, Decimal], target: Union[float, Decimal]) -> Decimal:
     value_tmp = Decimal(str(value))
     target_tmp = Decimal(str(target))
     result = int(floor(value_tmp / target_tmp)) * target_tmp