Merge pull request #207 from InjectiveLabs/feat/synchro_dev_with_master_0630

Feat/synchro dev with master 0.6.3.0

Author: aarmoa

Makefile

@@ -19,8 +19,17 @@ gen-client: copy-proto
 copy-proto:
 	rm -rf pyinjective/proto
 	mkdir -p proto/exchange
+	buf export buf.build/cosmos/cosmos-sdk:v0.47.0 --output=third_party
+	buf export https://github.com/cosmos/ibc-go.git --exclude-imports --output=third_party
+	buf export https://github.com/tendermint/tendermint.git --exclude-imports --output=third_party
+	buf export https://github.com/CosmWasm/wasmd.git --exclude-imports --output=./third_party
+	buf export https://github.com/cosmos/ics23.git --exclude-imports --output=./third_party
+
 	cp -r ../injective-core/proto/injective proto/
-	cp -r ../injective-core/third_party/proto/* proto/
+	cp -r ./third_party/* proto/
+
+	rm -rf ./third_party
+
 	@for file in $(EXCHANGE_PROTO_FILES); do \
 		cp "$${file}" proto/exchange/; \
   done

Pipfile

@@ -19,10 +19,11 @@ eip712_structs = "*"
 coincurve = "*"
 aiocron = "*"
 websockets = "*"
+urllib3 = "<2"
 
 [dev-packages]
 pytest = "*"
 pytest-asyncio = "*"
 
 [requires]
-python_version = "3"
+python_version = "3.9"

Pipfile.lock

@@ -87,11 +87,14 @@ make tests
 ```
 
 ### Changelogs
-**0.6.3**(change before release)
+**0.6.4**(change before release)
 * Change logging logic to use different loggers for each module and class
 * Solved issue preventing requesting spot and derivative historical orders for more than one market_id
 * Add `pytest` as a development dependency to implement and run unit tests
 
+**0.6.3.1**
+* Update the code to the new structure of transaction simulation responses
+
 **0.6.2.7**
 * Fix margin calculation in utils
 

README.md

@@ -132,7 +132,7 @@ async def main() -> None:
         print(sim_res)
         return
 
-    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res.result.data, simulation=True)
+    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res, simulation=True)
     print("---Simulation Response---")
     print(sim_res_msg)
 

examples/chain_client/17_MsgBatchUpdateOrders.py

@@ -63,8 +63,8 @@ async def main() -> None:
         print(sim_res)
         return
 
-    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res.result.data, simulation=True)
-    data=(str(sim_res_msg[0]).replace("results:", ''))
+    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res, simulation=True)
+    data=sim_res_msg[0]
     unpacked_msg_res = ProtoMsgComposer.UnpackMsgExecResponse(
         msg_type=msg0.__class__.__name__,
         data=data

examples/chain_client/20_MsgExec.py

@@ -62,7 +62,7 @@ async def main() -> None:
         print(sim_res)
         return
 
-    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res.result.data, simulation=True)
+    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res, simulation=True)
     print("---Simulation Response---")
     print(sim_res_msg)
 

examples/chain_client/31_MsgCreateBinaryOptionsLimitOrder.py

@@ -57,7 +57,7 @@ async def main() -> None:
         print(sim_res)
         return
 
-    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res.result.data, simulation=True)
+    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res, simulation=True)
     print("---Simulation Response---")
     print(sim_res_msg)
 

examples/chain_client/32_MsgCreateBinaryOptionsMarketOrder.py

@@ -53,7 +53,7 @@ async def main() -> None:
         print(sim_res)
         return
 
-    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res.result.data, simulation=True)
+    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res, simulation=True)
     print("---Simulation Response---")
     print(sim_res_msg)
 

examples/chain_client/33_MsgCancelBinaryOptionsOrder.py

@@ -58,7 +58,7 @@ async def main() -> None:
         print(sim_res)
         return
 
-    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res.result.data, simulation=True)
+    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res, simulation=True)
     print("---Simulation Response---")
     print(sim_res_msg)