merge from master

Author: DrunkRandomWalker

examples/sync/chain_client/20_MsgExec.py

@@ -58,6 +58,16 @@ async def main() -> None:
         print(sim_res)
         return
 
+    # We need to unpack 2 layers of response when using MsgExec
+    # response bytes -> response msgs
+    # exec msg response -> grantee msg response
+    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res.result.data, simulation=True)
+    unpacked_msg_res = ProtoMsgComposer.UnpackMsgExecResponse(
+        msg_type=msg0.__class__.__name__,
+        data=sim_res_msg[0].grantee
+    )
+    print(unpacked_msg_res)
+
     # build tx
     gas_price = 500000000
     gas_limit = sim_res.gas_info.gas_used + 15000  # add 15k for gas, fee computation

pyinjective/composer.py

@@ -371,6 +371,7 @@ def MsgGrant(self, granter: str, grantee: str, msg_type: str, expire_in: int):
 
     def MsgExec(self, grantee: str, msgs: List):
         any_msgs: List[any_pb2.Any] = []
+
         for msg in msgs:
             any_msg = any_pb2.Any()
             any_msg.Pack(msg, type_url_prefix="")
@@ -409,8 +410,9 @@ def MsgResponses(data, simulation=False):
             "/injective.exchange.v1beta1.MsgIncreasePositionMargin": injective_exchange_tx_pb.MsgIncreasePositionMarginResponse,
             "/injective.auction.v1beta1.MsgBid": injective_auction_tx_pb.MsgBidResponse,
             "/cosmos.bank.v1beta1.MsgSend": cosmos_bank_tx_pb.MsgSendResponse,
-            "/cosmos.authz.v1beta1.MsgGrant": cosmos_authz_tx_pb.MsgGrantResponse,
-            "/cosmos.authz.v1beta1.MsgRevoke": cosmos_authz_tx_pb.MsgRevokeResponse,
+            "/cosmos.authz.v1beta1.MsgGrant": cosmos_authz_tx_pb.MsgGrant,
+            "/cosmos.authz.v1beta1.MsgExec": cosmos_authz_tx_pb.MsgExec,
+            "/cosmos.authz.v1beta1.MsgRevoke": cosmos_authz_tx_pb.MsgRevoke,
         }
 
         response = tx_response_pb.TxResponseData.FromString(data)
@@ -419,3 +421,27 @@ def MsgResponses(data, simulation=False):
             msgs.append(header_map[msg.header].FromString(msg.data))
 
         return msgs
+
+    @staticmethod
+    def UnpackMsgExecResponse(msg_type, data):
+        header_map = {
+            "MsgCreateSpotLimitOrder": injective_exchange_tx_pb.MsgCreateSpotLimitOrderResponse,
+            "MsgCreateSpotMarketOrder": injective_exchange_tx_pb.MsgCreateSpotMarketOrderResponse,
+            "MsgCreateDerivativeLimitOrder": injective_exchange_tx_pb.MsgCreateDerivativeLimitOrderResponse,
+            "MsgCreateDerivativeMarketOrder": injective_exchange_tx_pb.MsgCreateDerivativeMarketOrderResponse,
+            "MsgCancelSpotOrder": injective_exchange_tx_pb.MsgCancelSpotOrderResponse,
+            "MsgCancelDerivativeOrder": injective_exchange_tx_pb.MsgCancelDerivativeOrderResponse,
+            "MsgBatchCancelSpotOrders": injective_exchange_tx_pb.MsgBatchCancelSpotOrdersResponse,
+            "MsgBatchCancelDerivativeOrders": injective_exchange_tx_pb.MsgBatchCancelDerivativeOrdersResponse,
+            "MsgBatchCreateSpotLimitOrders": injective_exchange_tx_pb.MsgBatchCreateSpotLimitOrdersResponse,
+            "MsgBatchCreateDerivativeLimitOrders": injective_exchange_tx_pb.MsgBatchCreateDerivativeLimitOrdersResponse,
+            "MsgBatchUpdateOrders": injective_exchange_tx_pb.MsgBatchUpdateOrdersResponse,
+            "MsgDeposit": injective_exchange_tx_pb.MsgDepositResponse,
+            "MsgWithdraw": injective_exchange_tx_pb.MsgWithdrawResponse,
+            "MsgSubaccountTransfer": injective_exchange_tx_pb.MsgSubaccountTransferResponse,
+            "MsgLiquidatePosition": injective_exchange_tx_pb.MsgLiquidatePositionResponse,
+            "MsgIncreasePositionMargin": injective_exchange_tx_pb.MsgIncreasePositionMarginResponse,
+            "MsgBid": injective_auction_tx_pb.MsgBidResponse,
+        }
+
+        return header_map[msg_type].FromString(bytes(data, "utf-8"))