update neptuneprivacy directory

This commit is contained in:
Anh Minh 2025-12-01 08:58:28 +07:00
parent 257330cc1b
commit f63dbd7d6f
4 changed files with 6 additions and 8 deletions

4
Cargo.lock generated
View File

@ -1967,7 +1967,7 @@ dependencies = [
[[package]] [[package]]
name = "neptune-privacy" name = "neptune-privacy"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.softly.com/Softly/tuna?rev=602667d9ee1c1fbcd7739c78e8816062f2645a5f#602667d9ee1c1fbcd7739c78e8816062f2645a5f" source = "git+https://github.com/neptuneprivacy/xnt-core?rev=9afe0af60097454a39c21d009669bb6af74f7839#9afe0af60097454a39c21d009669bb6af74f7839"
dependencies = [ dependencies = [
"aead", "aead",
"aes-gcm", "aes-gcm",
@ -4532,7 +4532,7 @@ checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
[[package]] [[package]]
name = "xnt-rpc-macros" name = "xnt-rpc-macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.softly.com/Softly/tuna?rev=602667d9ee1c1fbcd7739c78e8816062f2645a5f#602667d9ee1c1fbcd7739c78e8816062f2645a5f" source = "git+https://github.com/neptuneprivacy/xnt-core?rev=9afe0af60097454a39c21d009669bb6af74f7839#9afe0af60097454a39c21d009669bb6af74f7839"
dependencies = [ dependencies = [
"convert_case", "convert_case",
"quote", "quote",

View File

@ -64,7 +64,7 @@ arbitrary = "1.4.2"
proptest-arbitrary-interop = "0.1.0" proptest-arbitrary-interop = "0.1.0"
[patch.crates-io] [patch.crates-io]
neptune-privacy = { git = "https://git.softly.com/Softly/tuna", rev = "602667d9ee1c1fbcd7739c78e8816062f2645a5f" } neptune-privacy = { git = "https://github.com/neptuneprivacy/xnt-core", rev = "9afe0af60097454a39c21d009669bb6af74f7839" }
[features] [features]
mock = ["dep:blake3", "dep:rand"] mock = ["dep:blake3", "dep:rand"]

View File

@ -31,7 +31,7 @@ pub struct Config {
pub listen_port: u16, pub listen_port: u16,
/// Sets the neptune-core rpc server address to connect to. /// Sets the neptune-core rpc server address to connect to.
#[clap(long, default_value = "9799", value_name = "port")] #[clap(long, default_value = "9899", value_name = "port")]
pub neptune_rpc_port: u16, pub neptune_rpc_port: u16,
/// Sets interval in seconds to ping neptune-core rpc connection /// Sets interval in seconds to ping neptune-core rpc connection

View File

@ -1,7 +1,6 @@
use neptune_privacy::api::export::BlockHeight; use neptune_privacy::api::export::BlockHeight;
use neptune_privacy::api::export::NativeCurrencyAmount; use neptune_privacy::api::export::NativeCurrencyAmount;
use neptune_privacy::protocol::consensus::block::block_height::BLOCKS_PER_GENERATION; use neptune_privacy::protocol::consensus::block::block_height::BLOCKS_PER_GENERATION;
use neptune_privacy::protocol::consensus::block::block_height::NUM_BLOCKS_SKIPPED_BECAUSE_REBOOT;
use neptune_privacy::protocol::consensus::block::Block; use neptune_privacy::protocol::consensus::block::Block;
use neptune_privacy::protocol::consensus::block::PREMINE_MAX_SIZE; use neptune_privacy::protocol::consensus::block::PREMINE_MAX_SIZE;
@ -13,10 +12,9 @@ pub(crate) fn monetary_supplies(
) -> (NativeCurrencyAmount, NativeCurrencyAmount) { ) -> (NativeCurrencyAmount, NativeCurrencyAmount) {
let block_height: u64 = block_height.into(); let block_height: u64 = block_height.into();
let generation_0_subsidy = Block::block_subsidy(BlockHeight::genesis().next()); let generation_0_subsidy = Block::block_subsidy(BlockHeight::genesis().next());
let effective_block_height = block_height + NUM_BLOCKS_SKIPPED_BECAUSE_REBOOT;
let (num_generations, num_blocks_in_curr_gen): (u64, u32) = ( let (num_generations, num_blocks_in_curr_gen): (u64, u32) = (
effective_block_height / BLOCKS_PER_GENERATION, block_height / BLOCKS_PER_GENERATION,
(effective_block_height % BLOCKS_PER_GENERATION) (block_height % BLOCKS_PER_GENERATION)
.try_into() .try_into()
.expect("There are fewer than u32::MAX blocks per generation"), .expect("There are fewer than u32::MAX blocks per generation"),
); );