Merge pull request #110 from InjectiveLabs/f/decouple_web3

Decouple SendToCosmos from the composer

Author: achilleas-kal

Pipfile

@@ -15,7 +15,6 @@ pysha3 = "*"
 protobuf = "*"
 grpcio-tools = "*"
 bip32 = "*"
-web3 = "*"
 json = "*"
 requests = "*"
 eip712_structs = "*"

README.md

@@ -84,8 +84,10 @@ Note that the [sync client](https://github.com/InjectiveLabs/sdk-python/blob/mas
 * Add automatic session renewal for K8S
 * Add MsgDelegate and MsgWithdrawDelegatorReward in the composer
 * Add typed authz support in the composer
+* Decouple SendToCosmos from the composer and remove web3 dependency
 * Re-gen ini files
 
+
 **0.5.6.5**
 * Add MsgRelayPriceFeedPrice in the composer
 * Add Post-only orders in the composer

examples/SendToCosmos.py

@@ -5,15 +5,15 @@
 import logging
 
 from pyinjective.constant import Network
-from pyinjective.composer import Composer as ProtoMsgComposer
+from pyinjective.sendtocosmos import Peggo
 
 import importlib.resources as pkg_resources
 import pyinjective
 
 async def main() -> None:
     # select network: testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
+    peggo_composer = Peggo(network=network.string())
 
     private_key = "f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3"
     ethereum_endpoint = "https://kovan.infura.io/v3/c518f454950e48aeab12161c49f26e30"
@@ -28,7 +28,7 @@ async def main() -> None:
     import_peggo = pkg_resources.read_text(pyinjective, 'Peggo_ABI.json')
     peggo_abi = json.loads(import_peggo)
 
-    composer.SendToCosmos(ethereum_endpoint=ethereum_endpoint, private_key=private_key, token_contract=token_contract,
+    peggo_composer.SendToCosmos(ethereum_endpoint=ethereum_endpoint, private_key=private_key, token_contract=token_contract,
                  receiver=receiver, amount=amount, maxFeePerGas=maxFeePerGas_Gwei, maxPriorityFeePerGas=maxPriorityFeePerGas_Gwei, peggo_abi=peggo_abi)
 
 if __name__ == "__main__":

pyinjective/composer.py

@@ -29,10 +29,6 @@
 from .utils import *
 from typing import List
 
-from .wallet import Address
-
-from web3 import Web3, HTTPProvider
-
 class Composer:
     def __init__(self, network: str):
         self.network = network
@@ -538,60 +534,6 @@ def MsgWithdrawDelegatorReward(
             validator_address=validator_address
         )
 
-    def SendToCosmos(self, ethereum_endpoint: str, private_key: str, token_contract: str, receiver: str, amount: int, maxFeePerGas: int,  maxPriorityFeePerGas: int, peggo_abi: str, decimals=18):
-        if self.network == 'testnet':
-            peggy_proxy_address = "0xd6Da9dA014806Fdb64bF39b48fcA386AE3420d21"
-        elif self.network == 'mainnet':
-            peggy_proxy_address = "0xF955C57f9EA9Dc8781965FEaE0b6A2acE2BAD6f3"
-        else:
-            print("SendToCosmos is only supported on Mainnet & Testnet")
-        web3 = Web3(Web3.HTTPProvider(ethereum_endpoint))
-        contract = web3.eth.contract(address=peggy_proxy_address, abi=peggo_abi)
-
-        token_contract_address = web3.toChecksumAddress(token_contract)
-
-        receiver_address = Address.from_acc_bech32(receiver)
-        receiver_ethereum_address = Address.get_ethereum_address(receiver_address)
-        receiver_address_checksum = web3.toChecksumAddress(receiver_ethereum_address)
-        receiver_slice = receiver_address_checksum[2:]
-        receiver_padded_address = '0x' + receiver_slice.zfill(64)
-
-        destination = web3.toBytes(hexstr=receiver_padded_address)
-
-        sender_ethereum_address = web3.eth.account.privateKeyToAccount(private_key).address
-        sender_address_checksum = web3.toChecksumAddress(sender_ethereum_address)
-        nonce = web3.eth.get_transaction_count(sender_address_checksum)
-
-        amount_to_send = int(amount * pow(10, decimals))
-
-        gas = contract.functions.sendToCosmos(
-            token_contract_address,
-            destination,
-            amount_to_send,
-        ).estimateGas({'from': sender_address_checksum})
-
-        transaction_body = {
-            'nonce': nonce,
-            'gas': gas,
-            'maxFeePerGas': web3.toWei(maxFeePerGas, 'gwei'),
-            'maxPriorityFeePerGas': web3.toWei(maxPriorityFeePerGas, 'gwei'),
-        }
-
-        tx = contract.functions.sendToCosmos(
-            token_contract_address,
-            destination,
-            amount_to_send,
-        ).buildTransaction(transaction_body)
-
-        signed_tx = web3.eth.account.signTransaction(tx, private_key=private_key)
-
-        try:
-            tx_hash = web3.eth.send_raw_transaction(signed_tx.rawTransaction)
-            print("Transferred {} {} from {} to {}".format(amount, token_contract, sender_ethereum_address, receiver))
-            print("Transaction hash:", web3.toHex(tx_hash))
-        except Exception as e:
-            print("Transaction failed", e)
-
     # data field format: [request-msg-header][raw-byte-msg-response]
     # you need to figure out this magic prefix number to trim request-msg-header off the data
     # this method handles only exchange responses

pyinjective/sendtocosmos.py

@@ -0,0 +1,61 @@
+from web3 import Web3
+
+from .wallet import Address
+
+class Peggo:
+    def __init__(self, network: str):
+        self.network = network
+    def SendToCosmos(self, ethereum_endpoint: str, private_key: str, token_contract: str, receiver: str, amount: int,
+                     maxFeePerGas: int, maxPriorityFeePerGas: int, peggo_abi: str, decimals=18):
+        if self.network == 'testnet':
+            peggy_proxy_address = "0xd6Da9dA014806Fdb64bF39b48fcA386AE3420d21"
+        elif self.network == 'mainnet':
+            peggy_proxy_address = "0xF955C57f9EA9Dc8781965FEaE0b6A2acE2BAD6f3"
+        else:
+            print("SendToCosmos is only supported on Mainnet & Testnet")
+        web3 = Web3(Web3.HTTPProvider(ethereum_endpoint))
+        contract = web3.eth.contract(address=peggy_proxy_address, abi=peggo_abi)
+
+        token_contract_address = web3.toChecksumAddress(token_contract)
+
+        receiver_address = Address.from_acc_bech32(receiver)
+        receiver_ethereum_address = Address.get_ethereum_address(receiver_address)
+        receiver_address_checksum = web3.toChecksumAddress(receiver_ethereum_address)
+        receiver_slice = receiver_address_checksum[2:]
+        receiver_padded_address = '0x' + receiver_slice.zfill(64)
+
+        destination = web3.toBytes(hexstr=receiver_padded_address)
+
+        sender_ethereum_address = web3.eth.account.privateKeyToAccount(private_key).address
+        sender_address_checksum = web3.toChecksumAddress(sender_ethereum_address)
+        nonce = web3.eth.get_transaction_count(sender_address_checksum)
+
+        amount_to_send = int(amount * pow(10, decimals))
+
+        gas = contract.functions.sendToCosmos(
+            token_contract_address,
+            destination,
+            amount_to_send,
+        ).estimateGas({'from': sender_address_checksum})
+
+        transaction_body = {
+            'nonce': nonce,
+            'gas': gas,
+            'maxFeePerGas': web3.toWei(maxFeePerGas, 'gwei'),
+            'maxPriorityFeePerGas': web3.toWei(maxPriorityFeePerGas, 'gwei'),
+        }
+
+        tx = contract.functions.sendToCosmos(
+            token_contract_address,
+            destination,
+            amount_to_send,
+        ).buildTransaction(transaction_body)
+
+        signed_tx = web3.eth.account.signTransaction(tx, private_key=private_key)
+
+        try:
+            tx_hash = web3.eth.send_raw_transaction(signed_tx.rawTransaction)
+            print("Transferred {} {} from {} to {}".format(amount, token_contract, sender_ethereum_address, receiver))
+            print("Transaction hash:", web3.toHex(tx_hash))
+        except Exception as e:
+            print("Transaction failed", e)

setup.py

@@ -31,7 +31,6 @@
     "protobuf",
     "grpcio-tools",
     "bip32",
-    "web3",
     "json",
     "requests",
     "eip712_structs",