Proxies module additions.

RichHorrocks · RichHorrocks · commit b15381bf4feb · 2019-03-01T19:53:01.000Z
diff --git a/etherscan/client.py b/etherscan/client.py
@@ -48,7 +48,7 @@ class Client(object):
     TO = '&to='
     VALUE = '&value='
     DATA = '&data='
-    POSITION = '&='
+    POSITION = '&position='
     HEX = '&hex='
     GAS_PRICE = '&gasPrice='
     GAS = '&gas='
diff --git a/etherscan/client.ropsten.py b/etherscan/client.ropsten.py
@@ -47,7 +47,7 @@ class Client(object):
     TO = '&to='
     VALUE = '&value='
     DATA = '&data='
-    POSITION = '&='
+    POSITION = '&position='
     HEX = '&hex='
     GAS_PRICE = '&gasPrice='
     GAS = '&gas='
diff --git a/etherscan/proxies.py b/etherscan/proxies.py
@@ -74,3 +74,27 @@ def get_transaction_receipt(self, tx_hash: str):
         self.build_url()
         req = self.connect()
         return req['result']
+
+    def get_code(self, address: str):
+        self.url_dict[self.ACTION] = 'eth_getCode'
+        self.url_dict[self.ADDRESS] = address
+        self.url_dict[self.TAG] = 'latest'
+        self.build_url()
+        req = self.connect()
+        return req['result']
+
+    def get_storage_at(self, address: str, position: Union[str, int]):
+        self.url_dict[self.ACTION] = 'eth_getStorageAt'
+        self.url_dict[self.ADDRESS] = address
+        self.url_dict[self.POSITION] = position if type(
+            position) is str else hex(position)
+        self.url_dict[self.TAG] = 'latest'
+        self.build_url()
+        req = self.connect()
+        return req['result']
+
+    def gas_price(self):
+        self.url_dict[self.ACTION] = 'eth_gasPrice'
+        self.build_url()
+        req = self.connect()
+        return req['result']
diff --git a/examples/proxies/gas_price.py b/examples/proxies/gas_price.py
@@ -0,0 +1,9 @@
+from etherscan.proxies import Proxies
+import json
+
+with open('../../api_key.json', mode='r') as key_file:
+    key = json.loads(key_file.read())['key']
+
+api = Proxies(api_key=key)
+price = api.gas_price()
+print(price)
diff --git a/examples/proxies/get_code.py b/examples/proxies/get_code.py
@@ -0,0 +1,9 @@
+from etherscan.proxies import Proxies
+import json
+
+with open('../../api_key.json', mode='r') as key_file:
+    key = json.loads(key_file.read())['key']
+
+api = Proxies(api_key=key)
+code = api.get_code('0xf75e354c5edc8efed9b59ee9f67a80845ade7d0c')
+print(code)
diff --git a/examples/proxies/get_storage_at.py b/examples/proxies/get_storage_at.py
@@ -0,0 +1,9 @@
+from etherscan.proxies import Proxies
+import json
+
+with open('../../api_key.json', mode='r') as key_file:
+    key = json.loads(key_file.read())['key']
+
+api = Proxies(api_key=key)
+value = api.get_storage_at('0x6e03d9cce9d60f3e9f2597e13cd4c54c55330cfd', 0x0)
+print(value)
diff --git a/tests/test_accounts.py b/tests/test_accounts.py
@@ -9,10 +9,10 @@
     '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a',
 ]
 MULTI_BALANCE = [
-    {'account': '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a', 
+    {'account': '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a',
      'balance': '40807178566070000000000'},
-    {'account': '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a', 
-    'balance': '40807178566070000000000'}
+    {'account': '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a',
+     'balance': '40807178566070000000000'}
 ]
 API_KEY = 'YourAPIkey'
 
diff --git a/tests/test_blocks.py b/tests/test_blocks.py
@@ -14,4 +14,5 @@ def test_get_block_reward(self):
         api = Blocks(api_key=(API_KEY))
         reward_object = api.get_block_reward(BLOCK)
         self.assertEqual(reward_object['blockReward'], BLOCK_REWARD)
-        self.assertEqual(reward_object['uncleInclusionReward'], UNCLE_INCLUSION_REWARD)
+        self.assertEqual(reward_object['uncleInclusionReward'],
+                         UNCLE_INCLUSION_REWARD)
diff --git a/tests/test_proxies.py b/tests/test_proxies.py
@@ -4,15 +4,91 @@
 from etherscan.proxies import Proxies
 
 API_KEY = 'YourAPIkey'
+BLOCK_NUMBER = 2165403
+BLOCK_DIFFICULTY = 67858873048710
+UNCLE_INDEX = 0
+UNCLE_DIFFICULTY = 67858872000134
+TX_COUNT = 4
+TX_HASH = "0xed57e2434ddab54526620cbb4dcdaa0c6965027e2cb8556ef4750ed1eafa48c2"
+TX_INDEX = 0
+TX_ADDRESS = "0x2910543af39aba0cd09dbb2d50200b3e800a63d2"
+STORAGE_ADDRESS = "0x6e03d9cce9d60f3e9f2597e13cd4c54c55330cfd"
+STORAGE_POS = 0
+STORAGE_CONTENTS = "0x0000000000000000000000003d0768d" \
+                "a09ce77d25e2d998e6a7b6ed4b9116c2d"
+CODE_ADDRESS = "0xf75e354c5edc8efed9b59ee9f67a80845ade7d0c"
+CODE_CONTENTS = "0x3660008037602060003660003473273930d21e01ee25e4c219b6" \
+                "3259d214872220a261235a5a03f21560015760206000f3"
 
 
 class ProxiesTestCase(unittest.TestCase):
 
     def test_get_most_recent_block(self):
         api = Proxies(api_key=API_KEY)
-        # currently raises an exception even though it should not, see:
-        # https://github.com/corpetty/py-etherscan-api/issues/32
         most_recent = int(api.get_most_recent_block(), 16)
         print(most_recent)
         p = re.compile('^[0-9]{7}$')
         self.assertTrue(p.match(str(most_recent)))
+
+    def test_get_block_by_number(self):
+        api = Proxies(api_key=API_KEY)
+        block = api.get_block_by_number(BLOCK_NUMBER)
+        print(block)
+        self.assertEqual(block['difficulty'], hex(BLOCK_DIFFICULTY))
+
+    def test_get_uncle_by_blocknumber_index(self):
+        api = Proxies(api_key=API_KEY)
+        uncle = api.get_uncle_by_blocknumber_index(BLOCK_NUMBER, UNCLE_INDEX)
+        print(uncle)
+        self.assertEqual(uncle['difficulty'], hex(UNCLE_DIFFICULTY))
+
+    def test_get_block_transaction_count_by_number(self):
+        api = Proxies(api_key=API_KEY)
+        tx_count = api.get_block_transaction_count_by_number(BLOCK_NUMBER)
+        print(tx_count)
+        self.assertEqual(tx_count, hex(TX_COUNT))
+
+    def test_get_transaction_by_hash(self):
+        api = Proxies(api_key=API_KEY)
+        tx = api.get_transaction_by_hash(TX_HASH)
+        print(tx)
+        self.assertEqual(tx['blockNumber'], hex(BLOCK_NUMBER))
+
+    def test_get_transaction_by_blocknumber_index(self):
+        api = Proxies(api_key=API_KEY)
+        tx = api.get_transaction_by_blocknumber_index(BLOCK_NUMBER,
+                                                      TX_INDEX)
+        print(tx)
+        self.assertEqual(tx['hash'], TX_HASH)
+
+    def test_get_transaction_count(self):
+        api = Proxies(api_key=API_KEY)
+        tx_count = int(api.get_transaction_count(TX_ADDRESS), 16)
+        print(tx_count)
+        p = re.compile('^[0-9]*$')
+        self.assertTrue(p.match(str(tx_count)))
+
+    def test_get_transaction_receipt(self):
+        api = Proxies(api_key=API_KEY)
+        tx_receipt = api.get_transaction_receipt(TX_HASH)
+        print(tx_receipt)
+        self.assertEqual(tx_receipt['blockNumber'], hex(BLOCK_NUMBER))
+
+    def test_get_code(self):
+        api = Proxies(api_key=API_KEY)
+        code_contents = api.get_code(CODE_ADDRESS)
+        print(code_contents)
+        self.assertEqual(code_contents, CODE_CONTENTS)
+
+    def test_get_storage_at(self):
+        api = Proxies(api_key=API_KEY)
+        storage_contents = api.get_storage_at(STORAGE_ADDRESS, STORAGE_POS)
+        print(storage_contents)
+        self.assertEqual(storage_contents, STORAGE_CONTENTS)
+
+    def test_gas_price(self):
+        api = Proxies(api_key=API_KEY)
+        price = int(api.gas_price(), 16)
+        print(price)
+        p = re.compile('^[0-9]*$')
+        self.assertTrue(p.match(str(price)))
diff --git a/tests/test_transactions.py b/tests/test_transactions.py
@@ -3,19 +3,20 @@
 from etherscan.transactions import Transactions
 
 API_KEY = 'YourAPIkey'
-TX_HASH_1 = '0x15f8e5ea1079d9a0bb04a4c58ae5fe7654b5b2b4463375ff7ffb490aa0032f3a'
-TX_HASH_2 = '0x513c1ba0bebf66436b5fed86ab668452b7805593c05073eb2d51d3a52f480a76'
+TX_1 = '0x15f8e5ea1079d9a0bb04a4c58ae5fe7654b5b2b4463375ff7ffb490aa0032f3a'
+TX_2 = '0x513c1ba0bebf66436b5fed86ab668452b7805593c05073eb2d51d3a52f480a76'
 ERROR_STRING = 'Bad jump destination'
 
+
 class TransactionsTestCase(unittest.TestCase):
 
     def test_get_status(self):
         api = Transactions(api_key=(API_KEY))
-        status = api.get_status(TX_HASH_1)
+        status = api.get_status(TX_1)
         self.assertEqual(status['isError'], '1')
         self.assertEqual(status['errDescription'], ERROR_STRING)
 
     def test_get_tx_receipt_status(self):
         api = Transactions(api_key=(API_KEY))
-        receipt_status = api.get_tx_receipt_status(TX_HASH_2)
+        receipt_status = api.get_tx_receipt_status(TX_2)
         self.assertEqual(receipt_status['status'], '1')

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@`
`9`	`9`	`'0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a',`
`10`	`10`	`]`
`11`	`11`	`MULTI_BALANCE = [`
`12`		`- {'account': '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a',`
	`12`	`+ {'account': '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a',`
`13`	`13`	`'balance': '40807178566070000000000'},`
`14`		`- {'account': '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a',`
`15`		`- 'balance': '40807178566070000000000'}`
	`14`	`+ {'account': '0xddbd2b932c763ba5b1b7ae3b362eac3e8d40121a',`
	`15`	`+ 'balance': '40807178566070000000000'}`
`16`	`16`	`]`
`17`	`17`	`API_KEY = 'YourAPIkey'`
`18`	`18`