Merge pull request #117 from InjectiveLabs/f/refactor_local_order_hash

feat: refactor local order hash computation

Author: nhannamsiu

examples/chain_client/0_LocalOrderHash.py

@@ -20,7 +20,7 @@
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
 from pyinjective.wallet import PrivateKey
-from pyinjective.orderhash import compute_order_hashes
+from pyinjective.orderhash import OrderHashes
 
 
 async def main() -> None:
@@ -37,6 +37,7 @@ async def main() -> None:
     pub_key = priv_key.to_public_key()
     address = await pub_key.to_address().async_init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
+    OrderHashes.get_subaccount_nonce(network=network, subaccount_id=subaccount_id)
 
     # prepare trade info
     spot_market_id = "0xa508cb32923323679f29a032c70342c147c17d0145625922b0ef22e955c844c0"
@@ -48,7 +49,7 @@ async def main() -> None:
             market_id=spot_market_id,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
-            price=3.524,
+            price=1.524,
             quantity=0.01,
             is_buy=True,
             is_po=True
@@ -99,12 +100,58 @@ async def main() -> None:
     )
 
     # compute order hashes
-    order_hashes = compute_order_hashes(network, spot_orders=spot_orders, derivative_orders=derivative_orders)
+
+    order_hashes = OrderHashes.compute_order_hashes(spot_orders=spot_orders, derivative_orders=derivative_orders)
+
+    print("computed spot order hashes", order_hashes.spot)
+    print("computed derivative order hashes", order_hashes.derivative)
+
+    # build sim tx 1
+    tx = (
+        Transaction()
+        .with_messages(spot_msg, deriv_msg)
+        .with_sequence(address.get_sequence())
+        .with_account_num(address.get_number())
+        .with_chain_id(network.chain_id)
+    )
+    sim_sign_doc = tx.get_sign_doc(pub_key)
+    sim_sig = priv_key.sign(sim_sign_doc.SerializeToString())
+    sim_tx_raw_bytes = tx.get_tx_data(sim_sig, pub_key)
+
+    # simulate tx
+    (sim_res, success) = await client.simulate_tx(sim_tx_raw_bytes)
+    if not success:
+        print(sim_res)
+        return
+
+    # build tx
+    gas_price = 500000000
+    gas_limit = sim_res.gas_info.gas_used + 20000  # add 20k for gas, fee computation
+    gas_fee = '{:.18f}'.format((gas_price * gas_limit) / pow(10, 18)).rstrip('0')
+    fee = [composer.Coin(
+        amount=gas_price * gas_limit,
+        denom=network.fee_denom,
+    )]
+    tx = tx.with_gas(gas_limit).with_fee(fee).with_memo('').with_timeout_height(client.timeout_height)
+    sign_doc = tx.get_sign_doc(pub_key)
+    sig = priv_key.sign(sign_doc.SerializeToString())
+    tx_raw_bytes = tx.get_tx_data(sig, pub_key)
+
+    # broadcast tx: send_tx_async_mode, send_tx_sync_mode, send_tx_block_mode
+    res = await client.send_tx_sync_mode(tx_raw_bytes)
+    print(res)
+    print("gas wanted: {}".format(gas_limit))
+    print("gas fee: {} INJ".format(gas_fee))
+
+
+    # compute order hashes
+
+    order_hashes = OrderHashes.compute_order_hashes(spot_orders=spot_orders, derivative_orders=derivative_orders)
 
     print("computed spot order hashes", order_hashes.spot)
     print("computed derivative order hashes", order_hashes.derivative)
 
-    # build sim tx
+    # build sim tx 2
     tx = (
         Transaction()
         .with_messages(spot_msg, deriv_msg)

pyinjective/orderhash.py

@@ -38,20 +38,65 @@ class DerivativeOrder(EIP712Struct):
 class OrderHashes:
     def __init__(
             self,
-            spot: [str],
-            derivative: [str],
+            spot: [str] = None,
+            derivative: [str] = None,
+            nonce: str = None
     ):
         self.spot = spot
         self.derivative = derivative
+        self.nonce = nonce
+
+    @classmethod
+    def get_subaccount_nonce(self, network, subaccount_id) -> int:
+        url = network.lcd_endpoint + '/injective/exchange/v1beta1/exchange/' + subaccount_id
+        res = requests.get(url = url)
+        nonce = res.json()["nonce"]
+        self.nonce = nonce + 1
+        return self.nonce
+
+    @classmethod
+    def compute_order_hashes(self, spot_orders, derivative_orders) -> [str]:
+        if len(spot_orders) + len(derivative_orders) == 0:
+            return []
+
+        order_hashes = OrderHashes(spot=[], derivative=[])
+
+        subaccount_id = None
+        if len(spot_orders) > 0:
+            subaccount_id = spot_orders[0].order_info.subaccount_id
+        else:
+            subaccount_id = derivative_orders[0].order_info.subaccount_id
+
+        for o in spot_orders:
+            msg = build_eip712_msg(o, self.nonce)
+            typed_data_hash = msg.hash_struct()
+            typed_bytes = b'\x19\x01' + domain_separator + typed_data_hash
+            keccak256 = sha3.keccak_256()
+            keccak256.update(typed_bytes)
+            order_hash = keccak256.hexdigest()
+            order_hashes.spot.append('0x' + order_hash)
+            self.nonce += 1
+
+        for o in derivative_orders:
+            msg = build_eip712_msg(o, self.nonce)
+            typed_data_hash = msg.hash_struct()
+            typed_bytes = b'\x19\x01' + domain_separator + typed_data_hash
+            keccak256 = sha3.keccak_256()
+            keccak256.update(typed_bytes)
+            order_hash = keccak256.hexdigest()
+            order_hashes.derivative.append('0x' + order_hash)
+            self.nonce += 1
+
+        return order_hashes
 
 def param_to_backend_go(param) -> int:
     go_param = Decimal(param) / pow(10, 18)
     return format(go_param, '.18f')
 
-def get_subaccount_nonce(network, subaccount_id) -> int:
-    url = network.lcd_endpoint + '/injective/exchange/v1beta1/exchange/' + subaccount_id
-    res = requests.get(url = url)
-    return res.json()["nonce"]
+def increment_nonce(self):
+    current_nonce = self.nonce
+    self.nonce += 1
+    return current_nonce
 
 def parse_order_type(order):
     return order_type_dict[order.order_type]
@@ -95,40 +140,4 @@ def build_eip712_msg(order, nonce):
         )
 
 # only support msgs from single subaccount
-def compute_order_hashes(network, spot_orders, derivative_orders) -> [str]:
-    if len(spot_orders) + len(derivative_orders) == 0:
-        return []
-
-    order_hashes = OrderHashes(spot=[], derivative=[])
-
-    subaccount_id = None
-    if len(spot_orders) > 0:
-        subaccount_id = spot_orders[0].order_info.subaccount_id
-    else:
-        subaccount_id = derivative_orders[0].order_info.subaccount_id
-
-    # get starting nonce
-    nonce = get_subaccount_nonce(network, subaccount_id)
-    nonce += 1
-
-    for o in spot_orders:
-        msg = build_eip712_msg(o, nonce)
-        typed_data_hash = msg.hash_struct()
-        typed_bytes = b'\x19\x01' + domain_separator + typed_data_hash
-        keccak256 = sha3.keccak_256()
-        keccak256.update(typed_bytes)
-        order_hash = keccak256.hexdigest()
-        order_hashes.spot.append('0x' + order_hash)
-        nonce += 1
-
-    for o in derivative_orders:
-        msg = build_eip712_msg(o, nonce)
-        typed_data_hash = msg.hash_struct()
-        typed_bytes = b'\x19\x01' + domain_separator + typed_data_hash
-        keccak256 = sha3.keccak_256()
-        keccak256.update(typed_bytes)
-        order_hash = keccak256.hexdigest()
-        order_hashes.derivative.append('0x' + order_hash)
-        nonce += 1
-
-    return order_hashes
+