try-catch on client

client/client.py

@@ -1,9 +1,15 @@
 import json
-from starknet_py.contract import Contract
+import logging
+import time
 from typing import Union
+
 from client_tools import fetch_coinbase, fetch_okx, prepare_contract_call_args
-from empiric.core.base_client import EmpiricBaseClient, EmpiricAccountClient
+from empiric.core.base_client import EmpiricAccountClient, EmpiricBaseClient
 from empiric.core.types import HEX_STR
+from starknet_py.contract import Contract
+from starknet_py.net.client_errors import ClientError
+
+logger = logging.getLogger(__name__)
 
 
 class OpenOracleClient(EmpiricBaseClient):
@@ -62,9 +68,7 @@ async def publish_open_oracle_entries_okx_sequential(self, assets: list):
  }
  return results
 
- async def publish_open_oracle_entries_coinbase(
- self, assets=["btc", "eth", "dai"]
- ) -> hex:
+ async def publish_open_oracle_entries_coinbase(self, assets: list) -> hex:
  coinbase_oracle_data = fetch_coinbase(assets=assets)
  calls = [
  self.open_oracle_contract.functions["publish_entry"].prepare(
@@ -75,26 +79,23 @@ async def publish_open_oracle_entries_coinbase(
 
  return await self.send_transactions(calls=calls)
 
- async def publish_open_oracle_entries_coinbase_sequential(
- self, assets=["btc", "eth"]
- ):
+ async def publish_open_oracle_entries_coinbase_sequential(self, assets: list):
  coinbase_oracle_data = fetch_coinbase(assets=assets)
  calls = [
  self.open_oracle_contract.functions["publish_entry"].prepare(
  prepare_contract_call_args(*oracle_data)
  )
  for oracle_data in coinbase_oracle_data
  ]
+
  results = {
  "Coinbase:"
  + asset_call[0].upper(): await self.send_transactions(calls=[asset_call[1]])
  for asset_call in zip(assets, calls)
  }
  return results
 
- async def publish_open_oracle_entries_all_publishers(
- self, assets=["btc", "eth", "dai"]
- ) -> hex:
+ async def publish_open_oracle_entries_all_publishers(self, assets: list) -> hex:
  okx_oracle_data = fetch_okx(assets=assets)
  coinbase_oracle_data = fetch_coinbase(assets=assets)
  all_data = okx_oracle_data + coinbase_oracle_data
@@ -108,9 +109,33 @@ async def publish_open_oracle_entries_all_publishers(
  return await self.send_transactions(calls=calls)
 
  async def publish_open_oracle_entries_all_publishers_sequential(
- self, assets: list
+ self, assets: list, n_retries=3
  ) -> hex:
- results_okx = await self.publish_open_oracle_entries_okx_sequential(assets)
- results_cb = await self.publish_open_oracle_entries_coinbase_sequential(assets)
+ results_okx = {}
+ for attempt in range(n_retries):
+ try:
+ results_okx = await self.publish_open_oracle_entries_okx_sequential(
+ assets
+ )
+ break
+ except ClientError as e:
+ logger.warning(
+ f"Client error {e} at {attempt} attempt for OKX, retrying"
+ )
+ time.sleep(10)
+
+ results_cb = {}
+ for attempt in range(n_retries):
+ try:
+ results_cb = await self.publish_open_oracle_entries_coinbase_sequential(
+ assets
+ )
+ break
+ except ClientError as e:
+ logger.warning(
+ f"Client error {e} at {attempt} attempt for Coinbase, retrying"
+ )
+ time.sleep(10)
+
  results = {**results_okx, **results_cb}
  return results

client/client_tools.py

@@ -1,11 +1,12 @@
-import os
 import base64
 import datetime
 import hmac
-import requests
-from hashlib import sha256
-from typing import Tuple, List
 import logging
+import os
+from hashlib import sha256
+from typing import List, Tuple
+
+import requests
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger()

client/main.py

@@ -1,13 +1,13 @@
 import asyncio
-from client import OpenOracleClient
+import logging
 import os
-import time
+
 from dotenv import load_dotenv
-from starknet_py.net.client_errors import ClientError
-import logging
+
+from client import OpenOracleClient
 
 logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger()
+logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
 load_dotenv("client/.env")
@@ -29,18 +29,9 @@ async def main():
  )
 
  assets = ["btc", "eth", "dai"]
-
- for attempt in range(3):
- try:
- results = await c.publish_open_oracle_entries_all_publishers_sequential(
- assets
- )
- except ClientError as e:
- logger.warning(f"Client error {e} at {attempt} attempt, retrying")
- time.sleep(10)
-
- else:
- break
+ results = await c.publish_open_oracle_entries_all_publishers_sequential(
+ assets, n_retries=3
+ )
 
  for k in results:
  print(f"Published latest Open Oracle {k} data with tx: {results[k]}")

contracts/account/private_key_gen.py

@@ -1,8 +1,5 @@
-from starkware.crypto.signature.signature import (
- get_random_private_key,
- private_to_stark_key,
-)
-
+from starkware.crypto.signature.signature import (get_random_private_key,
+ private_to_stark_key)
 
 prk = get_random_private_key()
 print(f"STARKNET_PRIVATE_KEY : {prk}")