write every new json, seal and journal to new directory, skip proving if seal already exists

Author: CblPOK-git

.gitignore

@@ -13,6 +13,7 @@ tests/Elf.sol
 cli/addresses/local
 
 # Data from binance
+data/
 stripped_prices.json
 response.json
 

apps/src/bin/publisher.rs

@@ -30,6 +30,7 @@ use risc0_ethereum_contracts::encode_seal;
 use risc0_zkvm::{default_prover, ExecutorEnv, ProverOpts, VerifierContext};
 use url::Url;
 use std::fs;
+use std::path::Path;
 
 // `IDataFeedFeeder` interface automatically generated via the alloy `sol!` macro.
 alloy::sol!(
@@ -56,10 +57,6 @@ struct Args {
     /// Application's contract address on Ethereum
     #[clap(long)]
     contract: Address,
-
-    /// Path to json
-    #[clap(long)]
-    json_path: String,
 }
 
 fn main() -> Result<()> {
@@ -74,31 +71,62 @@ fn main() -> Result<()> {
         .wallet(wallet)
         .on_http(args.rpc_url);
 
-    // path to json file where information about prices is stored
-    let json_path = args.json_path;
-    let json_string = fs::read_to_string(json_path).expect("Unable to read file");
 
-    let guest_input = GuestInputType {
-        json_string: String::from(json_string),
-        currency_pairs: vec![String::from("ETHBTC"), String::from("BTCUSDT"), String::from("ETHUSDT"), String::from("ETHUSDC")],
-    };
+    let data_storage_path = Path::new("data/");
+
+    let mut max_number = 0;
+
+    if data_storage_path.is_dir() {
+        for entry in fs::read_dir(data_storage_path)? {
+            let entry = entry?;
+            if let Some(folder_name) = entry.file_name().to_str() {
+                if let Ok(number) = folder_name.parse::<u32>() {
+                    if number > max_number {
+                        max_number = number;
+                    }
+                }
+            }
+        }
+    }
+
+    let max_folder_path = data_storage_path.join(format!("{}", max_number));
+    let seal_path = max_folder_path.join("seal.bin");
+    let journal_path = max_folder_path.join("journal.bin");
+    let json_path = max_folder_path.join("prover_input.json");
+
+    let already_proven = seal_path.exists() && journal_path.exists();
+
+    if !already_proven {
+        let json_string = fs::read_to_string(json_path).expect("Unable to read file");
+
+        let guest_input = GuestInputType {
+            json_string: String::from(json_string),
+            currency_pairs: vec![String::from("ETHBTC"), String::from("BTCUSDT"), String::from("ETHUSDT"), String::from("ETHUSDC")],
+        };
 
-    let env = ExecutorEnv::builder().write(&guest_input).unwrap().build()?;
+        let env = ExecutorEnv::builder().write(&guest_input).unwrap().build()?;
 
-    let receipt = default_prover()
-        .prove_with_ctx(
-            env,
-            &VerifierContext::default(),
-            JSON_PARSER_ELF,
-            &ProverOpts::groth16(),
-        )?
-        .receipt;
+        let receipt = default_prover()
+            .prove_with_ctx(
+                env,
+                &VerifierContext::default(),
+                JSON_PARSER_ELF,
+                &ProverOpts::groth16(),
+            )?
+            .receipt;
 
-    // Encode the seal with the selector.
-    let seal = encode_seal(&receipt)?;
+        // Encode the seal with the selector.
+        let seal = encode_seal(&receipt)?;
+
+        // Extract the journal from the receipt.
+        let journal = receipt.journal.bytes.clone();
+
+        fs::write(seal_path.clone(), &seal)?;
+        fs::write(journal_path.clone(), &journal)?;
+    }
 
-    // Extract the journal from the receipt.
-    let journal = receipt.journal.bytes.clone();
+    let seal = fs::read(seal_path.clone())?;
+    let journal = fs::read(journal_path.clone())?;
 
     // Decode Journal: Upon receiving the proof, the application decodes the journal to extract
     // the verified numbers. This ensures that the numbers being submitted to the blockchain match

cli/feed_feeder.py

@@ -3,24 +3,40 @@
 from utils.network import *
 
 
-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)
+def prepare_json (_binance_flag, test_data_1, test_data_2):
+
+    latest_data = -1
+
+    os.makedirs("data/", exist_ok=True)
+
+    existing_data = os.listdir("data/")
+    for d in existing_data:
+        if (d.isdigit() == True):
+            latest_data = max(latest_data, int(d))
 
-    test_input_file = "test_inputs/0" + str(_test_set_nr) + ".json"
+    new_data_dir = "data/" + str(latest_data + 1) + "/"
+    os.makedirs(new_data_dir)
 
-    if _binance_flag:
+    files = ["prover_input.json", "seal.bin", "journal.bin"]
+
+    if test_data_1 == True:
+        for f in files:
+            run_subprocess(["cp", "test_data_1/0/" + f, new_data_dir + f], "copy" + " test_data_1/0/" + f + " to" + new_data_dir + f)
+
+    elif test_data_2 == True:
+        for f in files:
+            run_subprocess(["cp", "test_data_2/0/" + f, new_data_dir + f], "copy" + " test_data_2/0/" + f + " to " + new_data_dir + f)
+
+    elif _binance_flag == True:
         run_subprocess(["python3", "data-provider/script.py"], "request from binance")
+        run_subprocess(["cp", "stripped_prices.json", new_data_dir + "prover_input.json"], "copy binance data to " + new_data_dir)
 
-    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")
+    else:
+        print("expected either --test-data-1 or --test-data-2 or --binance flag")
+        sys.exit(1)
 
 
-def feed_data(net, binance_json_file):
+def feed_data(net):
     command = [
         "cargo",
         "run",
@@ -29,8 +45,7 @@ def feed_data(net, binance_json_file):
         "--",
         chain_id(net),
         rpc_url(net),
-        "--contract=" + get_feeder_address(net.value),
-        "--json-path=" + binance_json_file
+        "--contract=" + get_feeder_address(net.value)
     ]
 
     run_subprocess(command, "DataFeeder feeding")
@@ -41,12 +56,12 @@ def feed_data(net, binance_json_file):
 
 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')
+data_source_group.add_argument('--test-data-1', action='store_true', help='Take dataset from test_data_1/')
+data_source_group.add_argument('--test-data-2', action='store_true', help='Take dataset from test_data_2')
 
 args = parser.parse_args()
 
 
-binance_json_file = "stripped_prices.json"
-prepare_json(args.binance, args.test_set_nr, binance_json_file)
-feed_data(args.network, binance_json_file)
+prepare_json(args.binance, args.test_data_1, args.test_data_2)
+feed_data(args.network)
 

cli/utils/network.py

@@ -20,6 +20,7 @@ def parse_pairname(value):
 class network_enum(enum.Enum):
     LOCAL = "local"
     SEPOLIA = "sepolia"
+    NEON_DEVNET = "neon_devnet"
     ETH_MAINNET = "eth_mainnet"
 
 def parse_network(value):
@@ -62,6 +63,8 @@ def chain_id(net):
             return "--chain-id=31337"
         case network_enum.SEPOLIA:
             return "--chain-id=11155111"
+        case network_enum.NEON_DEVNET:
+            return "--chain-id=245022926"
         case network_enum.ETH_MAINNET:
             return "--chain-id=1"
 
@@ -74,5 +77,7 @@ def rpc_url(net):
             return "--rpc-url=http://localhost:8545"
         case network_enum.SEPOLIA:
             return "--rpc-url=https://eth-sepolia.g.alchemy.com/v2/" + alchemy_api_key
+        case network_enum.NEON_DEVNET:
+            return "--rpc-url=https://devnet.neonevm.org"
         case network_enum.ETH_MAINNET:
             return "--rpc-url=https://eth-mainnet.g.alchemy.com/v2/" + alchemy_api_key

test_data_1/0/journal.bin

@@ -0,0 +1,3 @@
+P�iu��E�H�	D�-u@:�i��@�(1u��]�*ٸ���~����i2�j.c�B���3��f���&4\�
+P%�{G�+�3�b�H��01j3��
�
Ǚާ7
+���E�vW,�_�6�k��We��%E'�?0 Ľ��*�����ڝ6�72r�[�?����/��C�˥b�fncN�i�+-��Sl���#͞����� mB�Ї54� �;7�{��'�v>h4c�ᯗm�E���Z2\]�-