Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,132 changes: 1,108 additions & 24 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ hex = "0.4"
http = "1.3.1"
pin-project-lite = "0.2.16"
reqwest = "0.12.15"
risc0-zkvm = "3.0.3"
rusqlite = "0.37.0"
serde = "1.0.219"
serde_json = "1.0.140"
Expand Down
18 changes: 9 additions & 9 deletions apps/transfers/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,26 @@ pub trait AppProofs {

impl AppStateRef for App {
fn get_balance(&self, user: Address, token: Address) -> Balance {
self.balance_tree.get(user, token)
self.balance_tree.get(user, token).unwrap()
}
}
impl AppState for App {
fn insert_balance(&mut self, user: Address, token: Address, new_balance: Balance) {
self.balance_tree.insert(user, token, new_balance);
self.balance_tree.insert(user, token, new_balance).unwrap();
}

fn insert_burn(&mut self, withdrawal_id: B256, burn: Burn) {
self.burn_tree.insert_raw(withdrawal_id, burn);
self.burn_tree.insert_raw(withdrawal_id, burn).unwrap();
}
}

impl AppProofs for App {
fn balance_root(&self) -> B256 {
self.balance_tree.root()
self.balance_tree.root().unwrap()
}

fn burn_merkle_proof(&self, withdrawal_id: B256) -> MerkleProof {
self.burn_tree.generate_proof_raw(withdrawal_id)
self.burn_tree.generate_proof_raw(withdrawal_id).unwrap()
}
}

Expand Down Expand Up @@ -282,8 +282,8 @@ pub fn handle_withdrawal_request(
impl Default for App {
fn default() -> Self {
Self {
balance_tree: GenericSparseMerkleTree::new(),
burn_tree: GenericSparseMerkleTree::new(),
balance_tree: GenericSparseMerkleTree::new_in_memory(),
burn_tree: GenericSparseMerkleTree::new_in_memory(),
}
}
}
Expand Down Expand Up @@ -325,8 +325,8 @@ impl ProofConversions for Proof {
match store {
void_app_node::storage::DataStorage::Db(_) => todo!(),
void_app_node::storage::DataStorage::Memory(mem) => {
let balance_root = mem.balance_tree.root();
let burn_root = mem.burn_tree.root();
let balance_root = mem.balance_tree.root()?;
let burn_root = mem.burn_tree.root()?;

Ok(Proof {
balance_root: *balance_root,
Expand Down
4 changes: 2 additions & 2 deletions apps/transfers/tests/balance_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use void_toolkit::merkle::generic_sparse_merkle::GenericSparseMerkleTree;
#[test]
fn test_balance_newtype() {
let mut state = App {
balance_tree: GenericSparseMerkleTree::new(),
burn_tree: GenericSparseMerkleTree::new(),
balance_tree: GenericSparseMerkleTree::new_in_memory(),
burn_tree: GenericSparseMerkleTree::new_in_memory(),
};

let alice = Address::from([1u8; 20]);
Expand Down
12 changes: 6 additions & 6 deletions apps/transfers/tests/panic_safety_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ fn test_zero_amount_protection() {
use void_toolkit::merkle::generic_sparse_merkle::GenericSparseMerkleTree;

let mut state = App {
balance_tree: GenericSparseMerkleTree::new(),
burn_tree: GenericSparseMerkleTree::new(),
balance_tree: GenericSparseMerkleTree::new_in_memory(),
burn_tree: GenericSparseMerkleTree::new_in_memory(),
};

let user = Address::from([1u8; 20]);
Expand Down Expand Up @@ -110,8 +110,8 @@ fn test_self_transfer_protection() {
use void_toolkit::merkle::generic_sparse_merkle::GenericSparseMerkleTree;

let mut state = App {
balance_tree: GenericSparseMerkleTree::new(),
burn_tree: GenericSparseMerkleTree::new(),
balance_tree: GenericSparseMerkleTree::new_in_memory(),
burn_tree: GenericSparseMerkleTree::new_in_memory(),
};

let user = Address::from([1u8; 20]);
Expand All @@ -133,8 +133,8 @@ fn test_graceful_error_propagation() {
use void_toolkit::merkle::generic_sparse_merkle::GenericSparseMerkleTree;

let mut state = App {
balance_tree: GenericSparseMerkleTree::new(),
burn_tree: GenericSparseMerkleTree::new(),
balance_tree: GenericSparseMerkleTree::new_in_memory(),
burn_tree: GenericSparseMerkleTree::new_in_memory(),
};

// Create a mock deposit event with overflow amount
Expand Down
3 changes: 2 additions & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ futures.workspace = true
http.workspace = true
pin-project-lite.workspace = true
reqwest.workspace = true
risc0-zkvm.workspace = true
rusqlite.workspace = true
serde.workspace = true
serde_json.workspace = true
Expand All @@ -26,7 +27,7 @@ tokio.workspace = true
tokio-util.workspace = true
tower-http.workspace = true
tracing-subscriber.workspace = true
void-toolkit = { workspace = true, features = ["merkle", "app", "hash", "network-channel", "oracle-sqlite", "oracle", "oracle-decoder"] }
void-toolkit = { workspace = true, features = ["merkle", "app", "hash", "network-channel", "oracle-sqlite", "oracle", "oracle-decoder", "proof-host"] }

[dev-dependencies]
alloy = { workspace = true, features = [ "node-bindings", "rlp", "signer-mnemonic" ] }
Expand Down
Loading
Loading