Merge pull request #124 from InjectiveLabs/f/refactor_order_hash

feat: add multi-subaccount support

Author: achilleas-kal

examples/chain_client/0_LocalOrderHash.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import asyncio
 import logging
 
@@ -20,8 +19,7 @@
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
 from pyinjective.wallet import PrivateKey
-from pyinjective.orderhash import OrderHashes
-
+from pyinjective.orderhash import OrderHashManager
 
 async def main() -> None:
     # select network: local, testnet, mainnet
@@ -37,7 +35,13 @@ 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)
+    subaccount_id_2 = address.get_subaccount_id(index=1)
+
+    order_hash_manager = OrderHashManager(
+        address=address,
+        network=network,
+        subaccount_indexes=[0,1,2,7]
+    )
 
     # prepare trade info
     spot_market_id = "0xa508cb32923323679f29a032c70342c147c17d0145625922b0ef22e955c844c0"
@@ -49,10 +53,10 @@ async def main() -> None:
             market_id=spot_market_id,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
-            price=1.524,
+            price=0.524,
             quantity=0.01,
             is_buy=True,
-            is_po=True
+            is_po=False
         ),
         composer.SpotOrder(
             market_id=spot_market_id,
@@ -70,7 +74,7 @@ async def main() -> None:
             market_id=deriv_market_id,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
-            price=25111,
+            price=10500,
             quantity=0.01,
             leverage=1.5,
             is_buy=True,
@@ -100,8 +104,7 @@ async def main() -> None:
     )
 
     # compute order hashes
-
-    order_hashes = OrderHashes.compute_order_hashes(spot_orders=spot_orders, derivative_orders=derivative_orders)
+    order_hashes = order_hash_manager.compute_order_hashes(spot_orders=spot_orders, derivative_orders=derivative_orders, subaccount_index=0)
 
     print("computed spot order hashes", order_hashes.spot)
     print("computed derivative order hashes", order_hashes.derivative)
@@ -145,8 +148,7 @@ async def main() -> None:
 
 
     # compute order hashes
-
-    order_hashes = OrderHashes.compute_order_hashes(spot_orders=spot_orders, derivative_orders=derivative_orders)
+    order_hashes = order_hash_manager.compute_order_hashes(spot_orders=spot_orders, derivative_orders=derivative_orders, subaccount_index=0)
 
     print("computed spot order hashes", order_hashes.spot)
     print("computed derivative order hashes", order_hashes.derivative)
@@ -188,6 +190,104 @@ async def main() -> None:
     print("gas wanted: {}".format(gas_limit))
     print("gas fee: {} INJ".format(gas_fee))
 
+    spot_orders = [
+        composer.SpotOrder(
+            market_id=spot_market_id,
+            subaccount_id=subaccount_id_2,
+            fee_recipient=fee_recipient,
+            price=1.524,
+            quantity=0.01,
+            is_buy=True,
+            is_po=True
+        ),
+        composer.SpotOrder(
+            market_id=spot_market_id,
+            subaccount_id=subaccount_id_2,
+            fee_recipient=fee_recipient,
+            price=27.92,
+            quantity=0.01,
+            is_buy=False,
+            is_po=False
+        ),
+    ]
+
+    derivative_orders = [
+        composer.DerivativeOrder(
+            market_id=deriv_market_id,
+            subaccount_id=subaccount_id_2,
+            fee_recipient=fee_recipient,
+            price=25111,
+            quantity=0.01,
+            leverage=1.5,
+            is_buy=True,
+            is_po=False
+        ),
+        composer.DerivativeOrder(
+            market_id=deriv_market_id,
+            subaccount_id=subaccount_id_2,
+            fee_recipient=fee_recipient,
+            price=65111,
+            quantity=0.01,
+            leverage=2,
+            is_buy=False,
+            is_reduce_only=False
+        ),
+    ]
+
+    # prepare tx msg
+    spot_msg = composer.MsgBatchCreateSpotLimitOrders(
+        sender=address.to_acc_bech32(),
+        orders=spot_orders
+    )
+
+    deriv_msg = composer.MsgBatchCreateDerivativeLimitOrders(
+        sender=address.to_acc_bech32(),
+        orders=derivative_orders
+    )
+
+    # compute order hashes
+    order_hashes = order_hash_manager.compute_order_hashes(spot_orders=spot_orders, derivative_orders=derivative_orders, subaccount_index=1)
+
+    print("computed spot order hashes", order_hashes.spot)
+    print("computed derivative order hashes", order_hashes.derivative)
+
+    # build sim tx 3
+    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))
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
     asyncio.get_event_loop().run_until_complete(main())

pyinjective/orderhash.py

@@ -35,69 +35,56 @@ class DerivativeOrder(EIP712Struct):
 domain_separator = EIP712_domain.hash_struct()
 order_type_dict = {0: '\x00', 1: '\x01', 2: '\x02', 3: '\x03', 4: '\x04', 5: '\x05', 6: '\x06', 7: '\x07', 8: '\x08'}
 
-class OrderHashes:
+class OrderHashResponse:
     def __init__(
             self,
             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]:
+
+class OrderHashManager:
+    def __init__(
+            self,
+            address,
+            network,
+            subaccount_indexes: [int] = None,
+    ):
+        self.address = address
+        self.subacc_nonces = dict()
+
+        for i in subaccount_indexes:
+            subaccount_id = address.get_subaccount_id(index=i)
+            url = network.lcd_endpoint + '/injective/exchange/v1beta1/exchange/' + subaccount_id
+            res = requests.get(url=url)
+            nonce = res.json()["nonce"]
+            self.subacc_nonces[i] = [subaccount_id, nonce + 1]
+
+    def compute_order_hashes(self, spot_orders, derivative_orders, subaccount_index) -> [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
+        order_hashes = OrderHashResponse(spot=[], derivative=[])
 
         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
+            msg = build_eip712_msg(o, self.subacc_nonces[subaccount_index][1])
+            order_hash = hash_order(msg)
+            order_hashes.spot.append(order_hash)
+            self.subacc_nonces[subaccount_index][1] += 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
+            msg = build_eip712_msg(o, self.subacc_nonces[subaccount_index][1])
+            order_hash = hash_order(msg)
+            order_hashes.derivative.append(order_hash)
+            self.subacc_nonces[subaccount_index][1] += 1
 
         return order_hashes
 
 def param_to_backend_go(param) -> int:
     go_param = Decimal(param) / pow(10, 18)
     return format(go_param, '.18f')
 
-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]
 
@@ -139,5 +126,9 @@ def build_eip712_msg(order, nonce):
             Margin=go_margin
         )
 
-# only support msgs from single subaccount
-
+def hash_order(msg):
+    typed_data_hash = msg.hash_struct()
+    typed_bytes = b'\x19\x01' + domain_separator + typed_data_hash
+    keccak256 = sha3.keccak_256()
+    keccak256.update(typed_bytes)
+    return '0x' + keccak256.hexdigest()