Skip to content

Commit

Permalink
emit new block, function finalized
Browse files Browse the repository at this point in the history
  • Loading branch information
@YeahNotSewerSide
YeahNotSewerSide committed May 4, 2024
1 parent 3ec132e commit 39b4fc0
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 71 deletions.
4 changes: 2 additions & 2 deletions src/block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ impl BasicInfo {
index += 33;

// parsing height
let (height, height_size) = tools::load_u256(&data[index..])
let (height, _) = tools::load_u256(&data[index..])
.change_context(BlockError::BasicInfo(BasicInfoErrorKind::Parse))?;
index += height_size + 1;
//index += height_size + 1;

Ok(BasicInfo {
timestamp,
Expand Down
114 changes: 50 additions & 64 deletions src/blockchaintree.rs
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,22 @@
use std::{collections::HashMap, path::Path};
use std::{collections::HashMap, path::Path, sync::Arc};

use crate::{
block::{self, BlockArc, TransactionBlock},
chain,
errors::{BCTreeErrorKind, BlockChainTreeError},
merkletree, tools,
merkletree,
static_values::{
AMMOUNT_SUMMARY, BLOCKS_PER_EPOCH, GAS_SUMMARY, OLD_AMMOUNT_SUMMARY, OLD_GAS_SUMMARY,
},
tools,
transaction::Transaction,
txpool,
types::Hash,
};
use error_stack::{Report, ResultExt};
use primitive_types::U256;
use sled::Db;

static BLOCKCHAIN_DIRECTORY: &str = "./BlockChainTree/";

static AMMOUNT_SUMMARY: &str = "./BlockChainTree/SUMMARY/";
static OLD_AMMOUNT_SUMMARY: &str = "./BlockChainTree/SUMMARYOLD/";

static GAS_SUMMARY: &str = "./BlockChainTree/GASSUMMARY/";
static OLD_GAS_SUMMARY: &str = "./BlockChainTree/GASSUMMARYOLD/";

static MAIN_CHAIN_DIRECTORY: &str = "./BlockChainTree/MAIN/";

static DERIVATIVE_CHAINS_DIRECTORY: &str = "./BlockChainTree/DERIVATIVES/";
static CHAINS_FOLDER: &str = "CHAINS/";

static BLOCKS_FOLDER: &str = "BLOCKS/";
static REFERENCES_FOLDER: &str = "REF/";
static TRANSACTIONS_FOLDER: &str = "TRANSACTIONS/";

static CONFIG_FILE: &str = "Chain.config";
static LOOKUP_TABLE_FILE: &str = "LookUpTable.dat";
static TRANSACTIONS_POOL: &str = "TRXS_POOL.pool";

pub static BEGINNING_DIFFICULTY: [u8; 32] = [
0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
];
static MAX_DIFFICULTY: [u8; 32] = [
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 128,
];

pub static FEE_STEP: u64 = 1000000;

pub static ROOT_PRIVATE_ADDRESS: [u8; 32] = [1u8; 32];
pub static ROOT_PUBLIC_ADDRESS: [u8; 33] = [
3, 27, 132, 197, 86, 123, 18, 100, 64, 153, 93, 62, 213, 170, 186, 5, 101, 215, 30, 24, 52, 96,
72, 25, 255, 156, 23, 245, 233, 213, 221, 7, 143,
];
pub static BLOCKS_PER_EPOCH: u64 = 100000;
pub static INCEPTION_TIMESTAMP: u64 = 1597924800;

pub struct BlockChainTree {
pub main_chain: chain::MainChain,
pub derivative_chains: HashMap<[u8; 32], chain::DerivativeChain>,
Expand Down Expand Up @@ -352,9 +317,9 @@ impl BlockChainTree {
&self,
pow: [u8; 32],
founder: [u8; 33],
transactions: &[Transaction],
transactions: &[Hash],
timestamp: u64,
) -> Result<[u8; 32], Report<BlockChainTreeError>> {
) -> Result<block::BlockArc, Report<BlockChainTreeError>> {
let last_block = self.main_chain.get_last_block().await?.unwrap(); // practically cannot fail
let prev_hash = last_block
.hash()
Expand All @@ -364,33 +329,54 @@ impl BlockChainTree {
if !tools::check_pow(&prev_hash, &last_block.get_info().difficulty, &pow) {
return Err(BlockChainTreeError::BlockChainTree(BCTreeErrorKind::WrongPow).into());
};

let mut difficulty = last_block.get_info().difficulty;
tools::recalculate_difficulty(last_block.get_info().timestamp, timestamp, &mut difficulty);
let fee = tools::recalculate_fee(&difficulty);
let default_info = block::BasicInfo {
timestamp,
pow,
previous_hash: prev_hash,
height: last_block.get_info().height,
difficulty: last_block.get_info().difficulty,
difficulty,
founder,
};
if ((last_block.get_info().height + 1) % BLOCKS_PER_EPOCH).is_zero() {
if transactions.len() != 0 {
return Err(BlockChainTreeError::BlockChainTree(
BCTreeErrorKind::SummarizeBlockWrongTransactionsAmount,
)
.into());
}

let summarized_hash = self.summarize()?;

//let merkle_tree = merkletree::MerkleTree::build_tree()
//block::SummarizeBlock {
// default_info,
// merkle_tree_root: todo!(),
//};
}

todo!()
let new_block: block::BlockArc =
if ((last_block.get_info().height + 1) % BLOCKS_PER_EPOCH).is_zero() {
if transactions.len() != 0 {
return Err(BlockChainTreeError::BlockChainTree(
BCTreeErrorKind::SummarizeBlockWrongTransactionsAmount,
)
.into());
}

let merkle_tree_root = self.summarize()?;

let summarize_block = Arc::new(block::SummarizeBlock {
default_info,
merkle_tree_root,
});

summarize_block
} else {
if transactions.len() == 0 {
return Err(BlockChainTreeError::BlockChainTree(
BCTreeErrorKind::CreateMainChainBlock,
)
.into());
}

let merkle_tree = merkletree::MerkleTree::build_tree(transactions);
let transaction_block = Arc::new(block::TransactionBlock::new(
fee,
default_info,
*merkle_tree.get_root(),
Vec::from_iter(transactions.iter().cloned()),
));
transaction_block
};

self.main_chain.add_block(new_block.clone()).await?;
Ok(new_block)
}

pub async fn flush(&self) -> Result<(), Report<BlockChainTreeError>> {
Expand Down
19 changes: 15 additions & 4 deletions src/static_values.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ pub static BLOCKCHAIN_DIRECTORY: &str = "./BlockChainTree/";
pub static AMMOUNT_SUMMARY: &str = "./BlockChainTree/SUMMARY/";
pub static OLD_AMMOUNT_SUMMARY: &str = "./BlockChainTree/SUMMARYOLD/";

pub static GAS_SUMMARY: &str = "./BlockChainTree/GASSUMMARY/";
pub static OLD_GAS_SUMMARY: &str = "./BlockChainTree/GASSUMMARYOLD/";

pub static MAIN_CHAIN_DIRECTORY: &str = "./BlockChainTree/MAIN/";

pub static DERIVATIVE_CHAINS_DIRECTORY: &str = "./BlockChainTree/DERIVATIVES/";
pub static CHAINS_FOLDER: &str = "CHAINS/";
//static DERIVATIVE_DB_DIRECTORY: BlockChainTreeError = "./BlockChainTree/DERIVATIVE/DB/";

pub static BLOCKS_FOLDER: &str = "BLOCKS/";
pub static REFERENCES_FOLDER: &str = "REF/";
Expand All @@ -25,11 +27,20 @@ pub static BEGINNING_DIFFICULTY: [u8; 32] = [
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
];

pub static ROOT_PUBLIC_ADDRESS: [u8; 33] = [0; 33];
pub static MAX_DIFFICULTY: [u8; 32] = [
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 128,
];

pub static ROOT_PRIVATE_ADDRESS: [u8; 32] = [1u8; 32];
pub static ROOT_PUBLIC_ADDRESS: [u8; 33] = [
3, 27, 132, 197, 86, 123, 18, 100, 64, 153, 93, 62, 213, 170, 186, 5, 101, 215, 30, 24, 52, 96,
72, 25, 255, 156, 23, 245, 233, 213, 221, 7, 143,
];

pub static INCEPTION_TIMESTAMP: u64 = 1597924800;

pub static BLOCKS_PER_ITERATION: usize = 12960;
pub static BLOCKS_PER_EPOCH: usize = 1000000;

pub static TIME_PER_BLOCK: u64 = 600;

Expand All @@ -38,5 +49,5 @@ lazy_static! {
pub static ref INITIAL_FEE: U256 = U256::from_dec_str("25000000000000000").unwrap(); // 100_000_000//4
pub static ref FEE_STEP: U256 = U256::from_dec_str("625000000000").unwrap(); // 100_000_000//255
pub static ref MAIN_CHAIN_PAYMENT: U256 = *INITIAL_FEE;
pub static ref COINS_PER_CYCLE: U256 = (*MAIN_CHAIN_PAYMENT*2000usize*BLOCKS_PER_ITERATION) + *COIN_FRACTIONS*10000usize;
pub static ref COINS_PER_CYCLE: U256 = (*MAIN_CHAIN_PAYMENT*2000usize*BLOCKS_PER_EPOCH) + *COIN_FRACTIONS*10000usize;
}
8 changes: 7 additions & 1 deletion src/tools.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::errors::*;
use crate::static_values::TIME_PER_BLOCK;
use crate::static_values::{FEE_STEP, TIME_PER_BLOCK};
use crate::types::Hash;
use error_stack::{Report, Result, ResultExt};
use num_bigint::BigUint;
Expand Down Expand Up @@ -236,6 +236,12 @@ pub fn recalculate_difficulty(prev_timestamp: u64, timestamp: u64, prev_difficul
}
}

pub fn recalculate_fee(current_difficulty: &Hash) -> U256 {
let leading_zeros = count_leading_zeros(current_difficulty);

FEE_STEP.clone() * leading_zeros
}

#[cfg(test)]
mod tests {

Expand Down

0 comments on commit 39b4fc0

Please sign in to comment.