diff --git a/Cargo.toml b/Cargo.toml index a4dcc849..5993b9d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace] resolver = "2" # Currently guest only exists for the workspace configuration not to break -members = ["methods/guest", "kairos-risc0-types", "kairos-delta-tree", "node"] -exclude = ["methods/native-cspr-tx"] +members = ["methods/native-cspr-tx", "methods/guest", "kairos-risc0-types", "kairos-delta-tree", "node", "layer-one-utils", "kairos-risc0-types", "kairos-delta-tree"] +exclude = ["contracts"] # Always optimize; building and running the guest takes much longer without optimization. [profile.dev] diff --git a/layer-one-utils/Cargo.toml b/layer-one-utils/Cargo.toml index bbaeff67..87df4423 100644 --- a/layer-one-utils/Cargo.toml +++ b/layer-one-utils/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -casper-client = {git="https://github.com/jonas089/casper-client-rs", branch="kairos-1.5.6"} -casper-types = {git="https://github.com/jonas089/casper-node", branch="kairos-1.5.6"} -casper-hashing = {git="https://github.com/jonas089/casper-node", branch="kairos-1.5.6"} +casper-client = {git="https://github.com/jonas089/casper-client-rs", branch="kairos-1.5.6-uni"} +casper-types = {git="https://github.com/jonas089/casper-node", branch="dev"} +casper-hashing = {git="https://github.com/jonas089/casper-node", branch="dev"} tokio = {version="1.36.0", features=["full"]} serde_json = "1.0.114" bincode = "1.3.3" diff --git a/sync-service/Cargo.toml b/sync-service/Cargo.toml deleted file mode 100644 index b68ef3c2..00000000 --- a/sync-service/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "sync-service" -version = "0.1.0" -edition = "2021" - -[dependencies] -kairos-risc0-types = {path="../kairos-risc0-types"} -tokio = {version="1.36.0", features=["full"]} -methods = { path = "../methods" } -risc0-zkvm = "0.20.1" -env_logger = "0.11.2" -serde = {version="1.0.197", features=["derive"]} -serde_json = "1.0.114" \ No newline at end of file diff --git a/sync-service/src/main.rs b/sync-service/src/main.rs deleted file mode 100644 index 9230a5ed..00000000 --- a/sync-service/src/main.rs +++ /dev/null @@ -1,37 +0,0 @@ -use methods::{ - NATIVE_CSPR_TX_ELF, NATIVE_CSPR_TX_ID -}; -use serde::{Serialize, Deserialize}; -use risc0_zkvm::{default_prover, ExecutorEnv, Receipt}; -use kairos_risc0_types::{hash_bytes, constants::{FORMATTED_COUNTER_UREF, FORMATTED_DEFAULT_ACCOUNT_STR, FORMATTED_DICT_UREF, NODE_ADDRESS, RPC_PORT}, CircuitArgs, CircuitJournal, HashableStruct, KairosDeltaTree, Transfer, Deposit, Withdrawal}; -// should be same as deposit. -use std::collections::HashMap; -use std::thread::sleep; -use core::time::Duration; - -/* Current development goal: - 1. Monitor Deposits on L1 and add them to the MockLayerTwoStorage - 2. Only process transactions with processed=False - 3. Flag those transactions that have been included in a batch with processed=True - - 4. Accept Transfers via CLI / Rest (without signatures) - reject if L2 Balance insufficient - 5. Generate proofs for Deposits & Transfers and mutate the L2 state - 6. Submit proofs to the L1 - - IDEA: For Demo purpose, trigger the batch submission manually, through a REST endpoint. - - 7. Implement Transfer signatures (not difficult, but pushed back due to it being a straight-forward process) -*/ - -async fn await_deposits(){ - loop{ - // sync deposits - sleep(Duration::from_millis(10000)); - // add some sort of timeout here - } -} - -#[tokio::main] -async fn main(){ - // start service -} \ No newline at end of file