logos-blockchain/lssa
1
0
Fork 0
mirror of https://github.com/logos-blockchain/lssa.git synced 2026-01-03 13:53:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from vacp2p/fix_warnings

Browse Source 
Fix warnings
This commit is contained in:
tyshko-rostyslav 2025-02-05 17:45:01 -05:00 committed by GitHub
commit 86c12d13a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 34 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/src/account_core/mod.rs
View File

@ -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},

2
ci_scripts/build-macos.sh
View File

@ -1,4 +1,4 @@
set -e
curl -L https://risczero.com/install | bash
/Users/runner/.risc0/bin/rzup install
cargo build
RUSTFLAGS="-D warnings" cargo build

2
ci_scripts/build-ubuntu.sh
View File

@ -1,4 +1,4 @@
set -e
curl -L https://risczero.com/install | bash
/home/runner/.risc0/bin/rzup install
cargo build
RUSTFLAGS="-D warnings" cargo build

15
node_core/src/executions/de.rs
View File

@ -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],

14
node_core/src/executions/private_exec.rs
View File

@ -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<u8> {
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],

15
node_core/src/executions/se.rs
View File

@ -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],

7
node_core/src/lib.rs
View File

@ -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,

34
node_rpc/src/process.rs
View File

@ -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};

4
sequencer_rpc/src/process.rs
View File

@ -1,7 +1,5 @@
use actix_web::Error as HttpError;
use sequencer_core::{
sequecer_store::accounts_store::AccountPublicData, TransactionMalformationErrorKind,
};
use sequencer_core::sequecer_store::accounts_store::AccountPublicData;
use serde_json::Value;
use rpc_primitives::{

2
sequencer_rpc/src/types/rpc_structs.rs
View File

@ -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 {}

1
storage/src/commitments_sparse_merkle_tree.rs
View File

@ -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<CommitmentHashType>,

4
storage/src/lib.rs
View File

@ -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);