improve cli, deploy demo contracts to eth sepolia and add addresses to cli/addresses/sepolia

Author: CblPOK-git

.gitignore

@@ -10,7 +10,11 @@ contracts/ImageID.sol
 tests/Elf.sol
 
 # Autogenerated addresses
-cli/addresses
+cli/addresses/local
+
+# Data from binance
+stripped_prices.json
+response.json
 
 # Dotenv file
 .env

cli/addresses/sepolia/BTCUSDT.txt

@@ -0,0 +1 @@
+0x0E6fCA9871cc802cBC22c491B1Fb50574dE00dA7

cli/addresses/sepolia/ETHBTC.txt

@@ -0,0 +1 @@
+0x62E4901444BcA98974d36F9633339A4Bd9292448

cli/addresses/sepolia/ETHUSDC.txt

@@ -0,0 +1 @@
+0xf406556Ec65bA5f45293ad56eF85c64E2188c4cC

cli/addresses/sepolia/ETHUSDT.txt

@@ -0,0 +1 @@
+0xe08756b621eaC34BDFBD21B63B1D06d7a0f3C7e1

cli/addresses/sepolia/feeder.txt

@@ -0,0 +1 @@
+0x61fF66e21F37F13C87985f95f33C9e22736D7797

cli/deploy_feeder.py

@@ -1,79 +1,63 @@
-key_file =  open('cli/anvil_private_key.txt', 'r')
-private_key = key_file.readline().strip()
-key_file.close()
-
 import subprocess
 import sys
 import os
+from utils.network import *
+
+def deploy_data_feeder(net):
 
-if not os.path.exists("cli/addresses/feeder"):
-    os.makedirs("cli/addresses/feeder")
-
-def deploy_data_feeder(what, command):
-    print("===================================")
-    result = subprocess.run(command, capture_output=True, text=True)
-    exit_code = result.returncode
-    print("stdout:")
-    print(result.stdout)
-    print("stderr:")
-    print(result.stderr)
-    if (exit_code == 0):
-        print(what, "SUCCESSFUL!")
+    if net == network_enum.LOCAL:
+        print("deploying DataFeedFeeder to", net.value)
     else:
-        print(what, "FAILED!")
+        while(True):
+            user_input = input("You are deploying DataFeeder to " + net.value + " network. Are you sure? [y/n]: ").lower()
+            if user_input == 'y':
+                break
+            elif user_input == 'n':
+                print("cancelled execution", file=sys.stderr)
+                sys.exit(1)
+            else:
+                print("Please enter 'y' or 'n'.")
+                continue
+
+
+    deployment_command = ["forge", "script", rpc_url(net), chain_id(net), "--broadcast", "script/Deploy.s.sol"]
+    result = run_subprocess(deployment_command, "DataFeedFeeder deployment")
+    data_feeder_address = result.split("Deployed DataFeedFeeder to ")[1].split("\n")[0].strip()
+
+    if (data_feeder_address.find('0x') != 0 or len(data_feeder_address) != 42):
+        print("Deployment was successfull, but address parsing from server response FAILED", file=sys.stderr)
+        print("expected address afrer \"Deployed DataFeedFeeder to\"\n", file=sys.stderr)
+        print("response:", result, file=sys.stderr)
         sys.exit(1)
-    print("===================================")
 
-    data_feeder_address = result.stdout.split("Deployed DataFeedFeeder to ")[1].split("\n")[0]
-    file = open('cli/addresses/feeder/address.txt', 'w')
+    if not os.path.exists(os.path.dirname(address_path(net.value, "feeder"))):
+        os.makedirs(os.path.dirname(address_path(net.value, "feeder")))
+
+    file = open(address_path(net.value, "feeder"), 'w')
     file.write(data_feeder_address)
+    print("wrote address to", address_path(net.value, "feeder"), "\n======================================")
+    file.close()
+
     file.close()
 
 
-def request_storage_addresses(pair_name):
-    file = open('cli/addresses/feeder/address.txt', 'r')
-    data_feeder_address = file.readline().strip()
+def request_storage_addresses(net, pair_name):
+    command = [ "cast", "call", rpc_url(net), get_feeder_address(net.value), "getPairStorageAddress(string)(address)", pair_name]
+    result = run_subprocess(command, "request DataFeedStorage address for " + pair_name + " ")
+
+    file = open(address_path(net.value, pair_name), 'w')
+    print("wrote address to", address_path(net.value, pair_name), "\n======================================")
+    file.write(result.strip())
     file.close()
 
-    command = [
-        "cast",
-        "call",
-        "--rpc-url",
-        "http://localhost:8545",
-        data_feeder_address,
-        "getPairStorageAddress(string)(address)",
-        pair_name
-    ]
-
-    result = subprocess.run(command, capture_output=True, text=True)
-
-    exit_code = result.returncode
-
-    if (exit_code == 0):
-        print("Successfully requested DataFeedStorage address for", pair_name, ":", result.stdout)
-        file = open('cli/addresses/' + pair_name + ".txt", 'w')
-        file.write(result.stdout)
-        file.close()
-    else:
-        print("DataFeedStorage address request for", pair_name, " has FAILED!")
-        print(result.stderr)
-        sys.exit(1)
-    print("===================================")
 
+parser = argparse.ArgumentParser(description="Data feeder parameters")
+parser.add_argument('-n', '--network', type=parse_network, required=True, help="Choose network (local, sepolia, eth_mainnet)")
 
+args = parser.parse_args()
 
-deployment_command = [
-    "forge",
-    "script",
-    "--rpc-url",
-    "http://localhost:8545",
-    "--broadcast",
-    "script/Deploy.s.sol"
-    ]
 
-deploy_data_feeder("DataFeedFeeder deployment", deployment_command)
+deploy_data_feeder(args.network)
 
-request_storage_addresses("ETHBTC")
-request_storage_addresses("BTCUSDT")
-request_storage_addresses("ETHUSDT")
-request_storage_addresses("ETHUSDC")
+for p in pair_name_enum:
+    request_storage_addresses(args.network, p.value)

cli/feed_feeder.py

@@ -1,38 +1,52 @@
-import subprocess
 import sys
+import argparse
+from utils.network import *
 
-def feed_test_data(test_input_nr):
-    file = open('cli/addresses/feeder/address.txt', 'r')
-    data_feeder_address = file.readline().strip()
-    file.close()
 
+def prepare_json (_binance_flag, _test_set_nr, binance_json_file):
+    if ((not _binance_flag) and (_test_set_nr is None)) == True:
+        print("Use ether the --binance or --test-set-nr=1 or --test-set-nr=2 flag")
+        sys.exit(1)
+
+    test_input_file = "test_inputs/0" + str(_test_set_nr) + ".json"
+
+    if _binance_flag:
+        run_subprocess(["python3", "data-provider/script.py"], "request from binance")
+
+    if _test_set_nr is not None:
+        if not os.path.isfile(test_input_file):
+            print(test_input_file, "file does not exist")
+            sys.exit(1)
+        run_subprocess(["cp", test_input_file, binance_json_file], "copy test input to prover input dir")
+
+
+def feed_data(net, binance_json_file):
     command = [
         "cargo",
         "run",
         "--bin",
         "publisher",
         "--",
-        "--chain-id=31337",
-        "--rpc-url=http://localhost:8545",
-        "--contract=" + data_feeder_address,
-        "--json-path=test_inputs/0" + str(test_input_nr) + ".json"]
+        chain_id(net),
+        rpc_url(net),
+        "--contract=" + get_feeder_address(net.value),
+        "--json-path=" + binance_json_file
+    ]
 
-    result = subprocess.run(command, capture_output=True, text=True)
+    run_subprocess(command, "DataFeeder feeding")
 
-    exit_code = result.returncode
 
-    if (exit_code == 0):
-        print("Successfully feeded data_feeder")
-        print(result.stdout)
-    else:
-        print("Data feeder feeding has FAILED!")
-        print(result.stderr)
-        sys.exit(1)
-    print("===================================")
+parser = argparse.ArgumentParser(description="Data feeder parameters")
+parser.add_argument('-n', '--network', type=parse_network, required=True, help="Choose network (local, sepolia, eth_mainnet)")
+
+data_source_group = parser.add_mutually_exclusive_group()
+data_source_group.add_argument('--binance', action='store_true', help='Request data from binance and feed')
+data_source_group.add_argument('-nr', '--test-set-nr', action='store', type=int, help='Take dataset from test_inputs/, possible values: 1,2')
+
+args = parser.parse_args()
+
 
-if len(sys.argv) > 1:
-    number = int(sys.argv[1])
-    feed_test_data(number)
-else:
-    print("Enter number of the test file you want to prove (1, 2)")
+binance_json_file = "stripped_prices.json"
+prepare_json(args.binance, args.test_set_nr, binance_json_file)
+feed_data(args.network, binance_json_file)
 

cli/request_storage.py

@@ -1,57 +1,71 @@
 import subprocess
 import sys
+from datetime import datetime
+from utils.network import *
 
-def get(pair_name, request_name):
-    file = open('cli/addresses/' + pair_name + '.txt', 'r')
+
+class method_enum(enum.Enum):
+    DECIMALS = "decimals"
+    DESCRIPTION = "description"
+    LATEST_ANSWER = "latestAnswer"
+    LATEST_ROUND = "latestRound"
+    LATEST_ROUND_DATA = "latestRoundData"
+
+def parse_request(value):
+    try:
+        return method_enum(value)
+    except ValueError:
+        raise argparse.ArgumentTypeError(f"Invalid network: {value}. Possible valies: {[n.value for n in method_enum]}")
+
+def get_request_signature(req):
+    match req:
+        case method_enum.DECIMALS:
+            return "decimals()(uint8)"
+        case method_enum.DESCRIPTION:
+            return "description()(string)"
+        case method_enum.LATEST_ANSWER:
+            return "latestAnswer()(uint256)"
+        case method_enum.LATEST_ROUND:
+            return "latestRound()(uint256)"
+        case method_enum.LATEST_ROUND_DATA:
+            return "latestRoundData()(uint80, uint256, uint256, uint256, uint80)"
+
+def do_request(pair, net, req):
+    file = open('cli/addresses/' + net.value + '/' + pair.value + '.txt', 'r')
     storage_address = file.readline().strip()
     file.close()
 
-    match request_name:
-        case "decimals":
-            request_prod = 'decimals()(uint8)'
-        case "description":
-            request_prod = 'description()(string)'
-        case "latestAnswer":
-            request_prod = 'latestAnswer()(uint256)'
-        case "latestRound":
-            request_prod = 'latestRound()(uint256)'
-        case _:
-            request_prod = 'latestRoundData()(uint80, uint256, uint256, uint256, uint80)'
-
-    print("requesting method", request_prod)
-
-    command = ["cast", "call", "--rpc-url", "http://localhost:8545", storage_address, request_prod]
-
-
-    result = subprocess.run(command, capture_output=True, text=True)
-
-    exit_code = result.returncode
-
-    if (exit_code == 0):
-        print("Successfully requested data from storage")
-        if (request_prod != 'latestRoundData()(uint80, uint256, uint256, uint256, uint80)'):
-            print(result.stdout)
-        else:
-            res = result.stdout
-            res = res.split("\n")
-            print("round number:", res[0])
-            print("answer:", res[1], "(price:", int(res[1].split(" [")[0]) / 100000, ")")
-            print("timestamp:", res[2])
+    print("requesting method", req.value)
+
+    command = [
+        "cast",
+        "call",
+        rpc_url(net),
+        storage_address,
+        get_request_signature(req)
+    ]
+
+    result = run_subprocess(command, "request method '" + req.value + "' for " + pair.value)
+
+    if req == method_enum.LATEST_ROUND_DATA:
+        result = result.split("\n")
+        print("round number:", result[0])
+        print("answer:", result[1], "(price:", int(result[1].split(" [")[0]) / 100000, ")")
+
+        timestamp = int(int(result[2].split(" [")[0]) / 1000)
+        readable_date = datetime.fromtimestamp(timestamp).strftime('%Y-%m-%d %H:%M:%S')
+        print("timestamp:", timestamp, "(human readable:)", readable_date)
     else:
-        print("Storage request has failed")
-        print(result.stderr)
-        sys.exit(1)
+        print("result:", result)
     print("===================================")
 
-if len(sys.argv) == 2:
-    pair = sys.argv[1]
-    get(pair, "")
-elif len(sys.argv) > 2:
-    pair = sys.argv[1]
-    request = sys.argv[2]
-    get(pair, request)
-else:
-    print("Enter pair name and request")
 
+parser = argparse.ArgumentParser(description="Storage request parameters")
+parser.add_argument('-n', '--network', type=parse_network, required=True, help="Choose network (local, sepolia, eth_mainnet)")
+parser.add_argument('-p', '--pair', type=parse_pairname, required=True, help="Choose pair (ETHBTC, BTCUSDT, ETHUSDT, ETHUSDC)")
+parser.add_argument('-m', '--method', type=parse_request, required=True,
+    help="Choose request (decimals, description, latestAnswer, latestRound, latestRoundData)")
 
+args = parser.parse_args()
 
+do_request(args.pair, args.network, args.method)