From 764669398c5546e2020b07aa6f458bbad9ef97a0 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 16:45:55 -0500 Subject: [PATCH 01/11] node_rpc fix warnings --- node_rpc/src/process.rs | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/node_rpc/src/process.rs b/node_rpc/src/process.rs index ef0a99e..38b5843 100644 --- a/node_rpc/src/process.rs +++ b/node_rpc/src/process.rs @@ -11,27 +11,19 @@ use rpc_primitives::{ }; use storage::transaction::ActionData; -use crate::{ - rpc_error_responce_inverter, - types::{ - err_rpc::cast_seq_client_error_into_rpc_error, - rpc_structs::{ - ExecuteScenarioMultipleSendRequest, ExecuteScenarioMultipleSendResponse, - ExecuteScenarioSplitRequest, ExecuteScenarioSplitResponse, ExecuteSubscenarioRequest, - ExecuteSubscenarioResponse, GetBlockDataRequest, GetBlockDataResponse, - GetLastBlockRequest, GetLastBlockResponse, RegisterAccountRequest, - RegisterAccountResponse, SendTxRequest, ShowAccountPublicBalanceRequest, - ShowAccountPublicBalanceResponse, ShowAccountUTXORequest, ShowAccountUTXOResponse, - ShowTransactionRequest, ShowTransactionResponse, UTXOShortEssentialStruct, - WriteDepositPublicBalanceRequest, WriteDepositPublicBalanceResponse, - WriteMintPrivateUTXOMultipleAssetsRequest, WriteMintPrivateUTXOMultipleAssetsResponse, - WriteMintPrivateUTXORequest, WriteMintPrivateUTXOResponse, - WriteSendDeshieldedBalanceRequest, WriteSendDeshieldedUTXOResponse, - WriteSendPrivateUTXORequest, WriteSendPrivateUTXOResponse, - WriteSendShieldedUTXORequest, WriteSendShieldedUTXOResponse, - WriteSendSplitUTXOResponse, WriteSplitUTXORequest, - }, - }, +use crate::types::rpc_structs::{ + ExecuteScenarioMultipleSendRequest, ExecuteScenarioMultipleSendResponse, + ExecuteScenarioSplitRequest, ExecuteScenarioSplitResponse, ExecuteSubscenarioRequest, + ExecuteSubscenarioResponse, GetBlockDataRequest, GetBlockDataResponse, GetLastBlockRequest, + GetLastBlockResponse, RegisterAccountRequest, RegisterAccountResponse, + ShowAccountPublicBalanceRequest, ShowAccountPublicBalanceResponse, ShowAccountUTXORequest, + ShowAccountUTXOResponse, ShowTransactionRequest, ShowTransactionResponse, + UTXOShortEssentialStruct, WriteDepositPublicBalanceRequest, WriteDepositPublicBalanceResponse, + WriteMintPrivateUTXOMultipleAssetsRequest, WriteMintPrivateUTXOMultipleAssetsResponse, + WriteMintPrivateUTXORequest, WriteMintPrivateUTXOResponse, WriteSendDeshieldedBalanceRequest, + WriteSendDeshieldedUTXOResponse, WriteSendPrivateUTXORequest, WriteSendPrivateUTXOResponse, + WriteSendShieldedUTXORequest, WriteSendShieldedUTXOResponse, WriteSendSplitUTXOResponse, + WriteSplitUTXORequest, }; use super::{respond, types::err_rpc::RpcErr, JsonHandler}; From 67bb04c6c25866bb0a5afdc54143b6bc12924d33 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 16:49:41 -0500 Subject: [PATCH 02/11] private_exec fix warnings --- node_core/src/executions/private_exec.rs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/node_core/src/executions/private_exec.rs b/node_core/src/executions/private_exec.rs index 2661458..1919617 100644 --- a/node_core/src/executions/private_exec.rs +++ b/node_core/src/executions/private_exec.rs @@ -1,22 +1,13 @@ use bincode; use k256::Scalar; use monotree::hasher::Blake3; -use monotree::{Hasher, Monotree, Proof}; -use rand::thread_rng; -use secp256k1_zkp::{ - compute_adaptive_blinding_factor, verify_commitments_sum_to_equal, CommitmentSecrets, - Generator, PedersenCommitment, Tag, Tweak, SECP256K1, -}; -use serde::{Deserialize, Serialize}; +use monotree::{Hasher, Monotree}; use sha2::{Digest, Sha256}; use storage::{ commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree, nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree, }; -use utxo::{ - utxo_core::{UTXOPayload, UTXO}, - utxo_tree::UTXOSparseMerkleTree, -}; +use utxo::utxo_core::UTXO; fn hash(input: &[u8]) -> Vec { Sha256::digest(input).to_vec() @@ -106,6 +97,7 @@ pub fn validate_nullifiers_proof( .is_none() } +#[allow(unused)] fn private_kernel( root_commitment: &[u8], root_nullifier: [u8; 32], From c693ad434a9bfd55b6799ce41acb816e0c138eec Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 16:49:47 -0500 Subject: [PATCH 03/11] de fix warnings --- node_core/src/executions/de.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/node_core/src/executions/de.rs b/node_core/src/executions/de.rs index 662bb25..c2ddd59 100644 --- a/node_core/src/executions/de.rs +++ b/node_core/src/executions/de.rs @@ -1,23 +1,17 @@ use bincode; use k256::Scalar; use monotree::hasher::Blake3; -use monotree::{Hasher, Monotree, Proof}; +use monotree::{Hasher, Monotree}; use rand::thread_rng; -use secp256k1_zkp::{ - compute_adaptive_blinding_factor, verify_commitments_sum_to_equal, CommitmentSecrets, - Generator, PedersenCommitment, Tag, Tweak, SECP256K1, -}; -use serde::{Deserialize, Serialize}; +use secp256k1_zkp::{CommitmentSecrets, Generator, PedersenCommitment, Tag, Tweak, SECP256K1}; use sha2::{Digest, Sha256}; use storage::{ commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree, nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree, }; -use utxo::{ - utxo_core::{UTXOPayload, UTXO}, - utxo_tree::UTXOSparseMerkleTree, -}; +use utxo::utxo_core::UTXO; +#[allow(unused)] fn commitment_secrets_random(value: u64) -> CommitmentSecrets { CommitmentSecrets { value, @@ -160,6 +154,7 @@ pub fn verify_commitment( commitment == *pedersen_commitment } +#[allow(unused)] fn de_kernel( root_commitment: &[u8], root_nullifier: [u8; 32], From 360981b77d479e9e484f7e929cad998b603c76fc Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 16:49:53 -0500 Subject: [PATCH 04/11] se fix warnings --- node_core/src/executions/se.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/node_core/src/executions/se.rs b/node_core/src/executions/se.rs index 5ae5a1d..71d88cc 100644 --- a/node_core/src/executions/se.rs +++ b/node_core/src/executions/se.rs @@ -1,23 +1,17 @@ use bincode; use k256::Scalar; use monotree::hasher::Blake3; -use monotree::{Hasher, Monotree, Proof}; +use monotree::{Hasher, Monotree}; use rand::thread_rng; -use secp256k1_zkp::{ - compute_adaptive_blinding_factor, verify_commitments_sum_to_equal, CommitmentSecrets, - Generator, PedersenCommitment, Tag, Tweak, SECP256K1, -}; -use serde::{Deserialize, Serialize}; +use secp256k1_zkp::{CommitmentSecrets, Generator, PedersenCommitment, Tag, Tweak, SECP256K1}; use sha2::{Digest, Sha256}; use storage::{ commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree, nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree, }; -use utxo::{ - utxo_core::{UTXOPayload, UTXO}, - utxo_tree::UTXOSparseMerkleTree, -}; +use utxo::utxo_core::UTXO; +#[allow(unused)] fn commitment_secrets_random(value: u64) -> CommitmentSecrets { CommitmentSecrets { value, @@ -162,6 +156,7 @@ pub fn verify_commitment( commitment == *pedersen_commitment } +#[allow(unused)] fn se_kernel( root_commitment: &[u8], root_nullifier: [u8; 32], From 2670fb1b4fc2d916f729a16a569e557244041a24 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 16:50:00 -0500 Subject: [PATCH 05/11] lib.rs fix warnings --- node_core/src/lib.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/node_core/src/lib.rs b/node_core/src/lib.rs index 2f1469f..68c3692 100644 --- a/node_core/src/lib.rs +++ b/node_core/src/lib.rs @@ -5,10 +5,7 @@ use std::sync::{ use k256::elliptic_curve::group::GroupEncoding; -use ::storage::{ - nullifier::UTXONullifier, - transaction::{Transaction, TransactionPayload, TxKind}, -}; +use ::storage::transaction::{Transaction, TransactionPayload, TxKind}; use accounts::account_core::{Account, AccountAddress}; use anyhow::Result; use config::NodeConfig; @@ -23,7 +20,7 @@ use sequencer_client::{json::SendTxResponse, SequencerClient}; use serde::{Deserialize, Serialize}; use storage::NodeChainStore; use tokio::{sync::RwLock, task::JoinHandle}; -use utxo::utxo_core::{Asset, UTXO}; +use utxo::utxo_core::UTXO; use zkvm::{ prove_mint_utxo, prove_mint_utxo_multiple_assets, prove_send_utxo, prove_send_utxo_deshielded, prove_send_utxo_multiple_assets_one_receiver, prove_send_utxo_shielded, ExecutionFailureKind, From b98de3d99295e79fa754d1d739dadd81a1d24a7e Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 17:01:39 -0500 Subject: [PATCH 06/11] var naming --- storage/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/src/lib.rs b/storage/src/lib.rs index 47b4397..f67cb5e 100644 --- a/storage/src/lib.rs +++ b/storage/src/lib.rs @@ -96,8 +96,8 @@ impl RocksDBIO { let mut cf_opts = Options::default(); cf_opts.set_max_write_buffer_number(16); //ToDo: Add more column families for different data - let cfb = ColumnFamilyDescriptor::new(CF_BLOCK_NAME, cf_opts.clone()); - let cfmeta = ColumnFamilyDescriptor::new(CF_META_NAME, cf_opts.clone()); + let _cfb = ColumnFamilyDescriptor::new(CF_BLOCK_NAME, cf_opts.clone()); + let _cfmeta = ColumnFamilyDescriptor::new(CF_META_NAME, cf_opts.clone()); let mut db_opts = Options::default(); db_opts.create_missing_column_families(true); From 7ee5f0d448104382e95826722713235874b2cb38 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 17:01:50 -0500 Subject: [PATCH 07/11] account_core fix --- accounts/src/account_core/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/src/account_core/mod.rs b/accounts/src/account_core/mod.rs index 699806c..b478550 100644 --- a/accounts/src/account_core/mod.rs +++ b/accounts/src/account_core/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use anyhow::Result; use k256::AffinePoint; use log::info; -use serde::{Deserialize, Serialize}; +use serde::Serialize; use storage::{merkle_tree_public::TreeHashType, nullifier::UTXONullifier}; use utxo::{ utxo_core::{UTXOPayload, UTXO}, From 37938a022c233c16022a794a686628b326c83770 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 17:02:08 -0500 Subject: [PATCH 08/11] sequencer_rpc fix warnings --- sequencer_rpc/src/process.rs | 2 +- sequencer_rpc/src/types/rpc_structs.rs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sequencer_rpc/src/process.rs b/sequencer_rpc/src/process.rs index f6db7b2..a39ceca 100644 --- a/sequencer_rpc/src/process.rs +++ b/sequencer_rpc/src/process.rs @@ -1,6 +1,6 @@ use actix_web::Error as HttpError; use sequencer_core::{ - sequecer_store::accounts_store::AccountPublicData, TransactionMalformationErrorKind, + sequecer_store::accounts_store::AccountPublicData, }; use serde_json::Value; diff --git a/sequencer_rpc/src/types/rpc_structs.rs b/sequencer_rpc/src/types/rpc_structs.rs index 4a57588..1c95fb8 100644 --- a/sequencer_rpc/src/types/rpc_structs.rs +++ b/sequencer_rpc/src/types/rpc_structs.rs @@ -6,8 +6,6 @@ use sequencer_core::transaction_mempool::TransactionMempool; use serde::{Deserialize, Serialize}; use serde_json::Value; use storage::block::Block; -use storage::block::BlockId; -use storage::transaction::Transaction; #[derive(Serialize, Deserialize, Debug)] pub struct HelloRequest {} From 98ba83e0a4c8800419151c88dde25df1f3ca4146 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 17:02:17 -0500 Subject: [PATCH 09/11] storage fix warnings --- storage/src/commitments_sparse_merkle_tree.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/storage/src/commitments_sparse_merkle_tree.rs b/storage/src/commitments_sparse_merkle_tree.rs index 96f7eac..3182275 100644 --- a/storage/src/commitments_sparse_merkle_tree.rs +++ b/storage/src/commitments_sparse_merkle_tree.rs @@ -4,7 +4,6 @@ use monotree::{Hasher, Monotree, Proof}; use crate::commitment::Commitment; use crate::merkle_tree_public::CommitmentHashType; -use crate::nullifier::UTXONullifier; pub struct CommitmentsSparseMerkleTree { pub curr_root: Option, From ec702ddc0588efaa9a6afbcc261f666159116aea Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 17:02:32 -0500 Subject: [PATCH 10/11] build scripts now check for warnings --- ci_scripts/build-macos.sh | 2 +- ci_scripts/build-ubuntu.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci_scripts/build-macos.sh b/ci_scripts/build-macos.sh index e3332f6..49fa103 100644 --- a/ci_scripts/build-macos.sh +++ b/ci_scripts/build-macos.sh @@ -1,4 +1,4 @@ set -e curl -L https://risczero.com/install | bash /Users/runner/.risc0/bin/rzup install -cargo build \ No newline at end of file +RUSTFLAGS="-D warnings" cargo build \ No newline at end of file diff --git a/ci_scripts/build-ubuntu.sh b/ci_scripts/build-ubuntu.sh index bf71a72..3d25e5a 100644 --- a/ci_scripts/build-ubuntu.sh +++ b/ci_scripts/build-ubuntu.sh @@ -1,4 +1,4 @@ set -e curl -L https://risczero.com/install | bash /home/runner/.risc0/bin/rzup install -cargo build \ No newline at end of file +RUSTFLAGS="-D warnings" cargo build \ No newline at end of file From 2f9ce0c5cf913a20512ea32a0726504d87bebe71 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 31 Jan 2025 17:02:44 -0500 Subject: [PATCH 11/11] fmt --- sequencer_rpc/src/process.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sequencer_rpc/src/process.rs b/sequencer_rpc/src/process.rs index a39ceca..294878e 100644 --- a/sequencer_rpc/src/process.rs +++ b/sequencer_rpc/src/process.rs @@ -1,7 +1,5 @@ use actix_web::Error as HttpError; -use sequencer_core::{ - sequecer_store::accounts_store::AccountPublicData, -}; +use sequencer_core::sequecer_store::accounts_store::AccountPublicData; use serde_json::Value; use rpc_primitives::{