Merge pull request #218 from InjectiveLabs/release/staging_v07

Release/staging v0.7

Author: aarmoa

Makefile

@@ -21,7 +21,7 @@ copy-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/cometbft/cometbft.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
 

Pipfile

@@ -4,26 +4,28 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-protobuf = "*"
-grpcio-tools = "*"
-grpcio = "*"
-asyncio = "*"
+aiocron = "*"
 aiohttp = "*"
-ecdsa = "*"
+asyncio = "*"
 bech32 = "*"
-mnemonic = "*"
-hdwallets = "*"
 bip32 = "*"
-requests = "*"
-eip712_structs = "*"
 coincurve = "*"
-aiocron = "*"
-websockets = "*"
+ecdsa = "*"
+eip712 = "*"
+grpcio = "*"
+grpcio-tools = "*"
+hdwallets = "*"
+mnemonic = "*"
+protobuf = "*"
+requests = "*"
+safe-pysha3 = "*"
 urllib3 = "<2"
+websockets = "*"
 
 [dev-packages]
 pytest = "*"
 pytest-asyncio = "*"
+requests-mock = "*"
 
 [requires]
-python_version = "3.9"
+python_version = "3"

Pipfile.lock

@@ -87,6 +87,10 @@ make tests
 ```
 
 ### Changelogs
+**0.7**
+* Removed references to pysha3 library (and also eip712-struct that required it) and replaced it with other implementation to allow the project to work with Python 3.11
+* Updated sentry nodes LCD URL, for each sentry node to use its own service
+
 **0.6.5**
 * Removed `k8s` from the list of supported mainnet nodes (`lb` should be used instead)
 

README.md

@@ -124,7 +124,7 @@ def mainnet(cls, node='lb'):
             grpc_exchange_endpoint = 'k8s.global.mainnet.exchange.grpc.injective.network:443'
             grpc_explorer_endpoint = 'k8s.global.mainnet.explorer.grpc.injective.network:443'
         else:
-            lcd_endpoint='https://lcd.injective.network'
+            lcd_endpoint=f'http://{node}.injective.network:10337'
             tm_websocket_endpoint=f'ws://{node}.injective.network:26657/websocket'
             grpc_endpoint=f'{node}.injective.network:9900'
             grpc_exchange_endpoint=f'{node}.injective.network:9910'

pyinjective/constant.py

@@ -1,38 +1,48 @@
-import sha3
 import requests
 from decimal import Decimal
-from eip712_structs import make_domain, EIP712Struct, String
-
-class OrderInfo(EIP712Struct):
-    SubaccountId = String()
-    FeeRecipient = String()
-    Price = String()
-    Quantity = String()
-
-class SpotOrder(EIP712Struct):
-    MarketId = String()
-    OrderInfo = OrderInfo
-    Salt = String()
-    OrderType = String()
-    TriggerPrice = String()
-
-class DerivativeOrder(EIP712Struct):
-    MarketId = String()
-    OrderInfo = OrderInfo
-    OrderType = String()
-    Margin = String()
-    TriggerPrice = String()
-    Salt = String()
-
-EIP712_domain = make_domain(
-    name='Injective Protocol',
-    version='2.0.0',
-    chainId=888,
-    verifyingContract='0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
-    salt='0x0000000000000000000000000000000000000000000000000000000000000000'
-)
-
-domain_separator = EIP712_domain.hash_struct()
+
+from eip712.messages import EIP712Message, EIP712Type
+from eth_account.messages import _hash_eip191_message as hash_eip191_message
+from hexbytes import HexBytes
+
+
+class OrderInfo(EIP712Type):
+    SubaccountId: "string"
+    FeeRecipient: "string"
+    Price: "string"
+    Quantity: "string"
+
+
+class SpotOrder(EIP712Message):
+    _name_ = "Injective Protocol"
+    _version_ = "2.0.0"
+    _chainId_ = 888
+    _verifyingContract_ = "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+    _salt_ = HexBytes("0x0000000000000000000000000000000000000000000000000000000000000000")
+
+    MarketId: "string"
+    OrderInfo: OrderInfo
+    Salt: "string"
+    OrderType: "string"
+    TriggerPrice: "string"
+
+
+class DerivativeOrder(EIP712Message):
+    _name_ = "Injective Protocol"
+    _version_ = "2.0.0"
+    _chainId_ = 888
+    _verifyingContract_ = "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+    _salt_ = HexBytes("0x0000000000000000000000000000000000000000000000000000000000000000")
+
+    MarketId: "string"
+    OrderInfo: OrderInfo
+    OrderType: "string"
+    Margin: "string"
+    TriggerPrice: "string"
+    Salt: "string"
+
+
+# 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 OrderHashResponse:
@@ -127,8 +137,6 @@ def build_eip712_msg(order, nonce):
         )
 
 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()
+    signable_message = msg.signable_message
+    hex_digest = hash_eip191_message(signable_message=signable_message).hex()
+    return "0x" + hex_digest