Skip to content

Cess develop #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2022
Merged

Cess develop #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b03375d
refactor: optimize random challenges
ytqaljn Jul 13, 2022
f27a384
fix: treatment of miners after being kicked out
ytqaljn Jul 15, 2022
8e72854
style: ccg
ytqaljn Jul 15, 2022
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
170 changes: 117 additions & 53 deletions c-pallets/file-bank/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ pub mod pallet {
LengthExceedsLimit,

Declarated,

BugInvalid,
}
#[pallet::storage]
#[pallet::getter(fn next_unsigned_at)]
Expand Down Expand Up @@ -316,6 +318,22 @@ pub mod pallet {
#[pallet::getter(fn lock_time)]
pub(super) type LockTime<T: Config> = StorageValue<_, BlockNumberOf<T>, ValueQuery>;

#[pallet::storage]
#[pallet::getter(fn file_keys_map)]
pub(super) type FileKeysMap<T: Config> = CountedStorageMap<_, Blake2_128Concat, u32, (bool, BoundedString<T>)>;

#[pallet::storage]
#[pallet::getter(fn file_index_count)]
pub(super) type FileIndexCount<T: Config> = StorageValue<_, u32, ValueQuery>;

#[pallet::storage]
#[pallet::getter(fn filler_keys_map)]
pub(super) type FillerKeysMap<T: Config> = CountedStorageMap<_, Blake2_128Concat, u32, (AccountOf<T>, BoundedString<T>)>;

#[pallet::storage]
#[pallet::getter(fn filler_index_count)]
pub(super) type FillerIndexCount<T: Config> = StorageValue<_, u32, ValueQuery>;

#[pallet::pallet]
#[pallet::generate_store(pub(super) trait Store)]
pub struct Pallet<T>(PhantomData<T>);
Expand Down Expand Up @@ -423,16 +441,20 @@ pub mod pallet {
Ok(())
})?;
} else {
let count = <FileIndexCount<T>>::get().checked_add(1).ok_or(Error::<T>::Overflow)?;
<File<T>>::insert(
&file_hash_bound,
FileInfo::<T>{
file_size: 0,
index: count,
file_state: "pending".as_bytes().to_vec().try_into().map_err(|_| Error::<T>::BoundedVecError)?,
user: vec![sender.clone()].try_into().map_err(|_| Error::<T>::BoundedVecError)?,
file_name: vec![file_name_bound].try_into().map_err(|_| Error::<T>::BoundedVecError)?,
slice_info: Default::default(),
},
);
<FileIndexCount<T>>::put(count);
<FileKeysMap<T>>::insert(count, (false, file_hash_bound.clone()));
}
Self::deposit_event(Event::<T>::UploadDeclaration { acc: sender, file_hash: file_hash, file_name: file_name });
Ok(())
Expand All @@ -459,7 +481,7 @@ pub mod pallet {
Self::update_user_space(user.clone(), 1, file_size.into())?;

<File<T>>::try_mutate(&file_hash_bounded, |s_opt| -> DispatchResult {
let s = s_opt.as_mut().unwrap();
let s = s_opt.as_mut().ok_or(Error::<T>::FileNonExistent)?;
if !s.user.contains(&user) {
Err(Error::<T>::UserNotDeclared)?;
}
Expand All @@ -469,6 +491,11 @@ pub mod pallet {
s.file_size = file_size;
s.slice_info = slice_info.clone().try_into().map_err(|_| Error::<T>::BoundedVecError)?;
s.file_state = "active".as_bytes().to_vec().try_into().map_err(|_| Error::<T>::BoundedVecError)?;
<FileKeysMap<T>>::try_mutate(s.index, |v_opt| -> DispatchResult{
let v = v_opt.as_mut().ok_or(Error::<T>::FileNonExistent)?;
v.0 = true;
Ok(())
})?;
Ok(())
})?;

Expand All @@ -484,7 +511,7 @@ pub mod pallet {

//The filler upload interface can only be called by scheduling, and the list has a maximum
// length limit
#[pallet::weight(1_000)]
#[pallet::weight(<T as pallet::Config>::WeightInfo::upload_filler(filler_list.len() as u32))]
pub fn upload_filler(
origin: OriginFor<T>,
miner: AccountOf<T>,
Expand All @@ -501,12 +528,18 @@ pub mod pallet {
if !(miner_state == "positive".as_bytes().to_vec()) {
Err(Error::<T>::NotQualified)?;
}
let mut count: u32 = <FillerIndexCount<T>>::get();
for i in filler_list.iter() {
count = count.checked_add(1).ok_or(Error::<T>::Overflow)?;
if <FillerMap<T>>::contains_key(&miner, i.filler_id.clone()) {
Err(Error::<T>::FileExistent)?;
}
<FillerMap<T>>::insert(miner.clone(), i.filler_id.clone(), i);
let mut value = i.clone();
value.index = count;
<FillerMap<T>>::insert(miner.clone(), i.filler_id.clone(), value);
<FillerKeysMap<T>>::insert(count, (miner.clone(), i.filler_id.clone()));
}
<FillerIndexCount<T>>::put(count);

let power = M_BYTE
.checked_mul(8)
Expand Down Expand Up @@ -714,6 +747,10 @@ pub mod pallet {
if state != "exit".as_bytes().to_vec() {
Err(Error::<T>::NotQualified)?;
}
for (_, value) in FillerMap::<T>::iter_prefix(&sender) {
<FillerKeysMap<T>>::remove(value.index);
}

let _ = FillerMap::<T>::remove_prefix(&sender, Option::None);
Ok(())
}
Expand Down Expand Up @@ -934,7 +971,7 @@ pub mod pallet {
let mut data: Vec<(AccountOf<T>, Vec<u8>, Vec<u8>, u64, u8)> = Vec::new();
for v in filler_list {
let length = v.block_num;
let number_list = Self::get_random_numberlist(length, 1)?;
let number_list = Self::get_random_numberlist(length, 3, length)?;
let miner_acc = v.miner_address.clone();
let filler_id = v.filler_id.clone().to_vec();
let file_size = v.filler_size.clone();
Expand All @@ -947,15 +984,15 @@ pub mod pallet {

let file_list = Self::get_random_file()?;
for (_, file) in file_list {
let slice_number_list = Self::get_random_numberlist(file.slice_info.len() as u32, 1)?;
let slice_number_list = Self::get_random_numberlist(file.slice_info.len() as u32, 3, file.slice_info.len() as u32)?;
for slice_index in slice_number_list.iter() {
let miner_id = T::MinerControl::get_miner_id(file.slice_info[*slice_index as usize].miner_acc.clone())?;
if file.slice_info[*slice_index as usize].miner_id != miner_id {
continue;
}
let mut block_list: Vec<u8> = Vec::new();
let length = file.slice_info[*slice_index as usize].block_num;
let number_list = Self::get_random_numberlist(length, 1)?;
let number_list = Self::get_random_numberlist(length, 3, length)?;
let file_hash = file.slice_info[*slice_index as usize].shard_id.to_vec();
let miner_acc = file.slice_info[*slice_index as usize].miner_acc.clone();
let slice_size = file.slice_info[*slice_index as usize].shard_size;
Expand All @@ -971,47 +1008,44 @@ pub mod pallet {
//Get random file block list
fn get_random_filler() -> Result<Vec<FillerInfo<T>>, DispatchError> {
let length = Self::get_fillermap_length()?;
let number_list = Self::get_random_numberlist(length, 1)?;
let limit = <FillerIndexCount<T>>::get();
let number_list = Self::get_random_numberlist(length, 1, limit)?;
let mut filler_list: Vec<FillerInfo<T>> = Vec::new();
for i in number_list.iter() {
let mut counter: u32 = 0;
for (_, _, value) in <FillerMap<T>>::iter() {
if counter == *i {
filler_list.push(value);
break
}
counter = counter.checked_add(1).ok_or(Error::<T>::Overflow)?;
}
let result = <FillerKeysMap<T>>::get(i);
let (acc, filler_id) = match result {
Some(x) => x,
None => {
Err(Error::<T>::BugInvalid)?
},
};
let filler = <FillerMap<T>>::try_get(acc, filler_id).map_err(|_e| Error::<T>::BugInvalid)?;
filler_list.push(filler);
}
Ok(filler_list)
}

fn get_random_file() -> Result<Vec<(BoundedString<T>, FileInfo<T>)>, DispatchError> {
let length = Self::get_file_map_length()?;
//Extract according to the probability of 4.6% * 3
let number_list = Self::get_random_numberlist(length, 1)?;
let limit = <FileIndexCount<T>>::get();
let number_list = Self::get_random_numberlist(length, 2, limit)?;
let mut file_list: Vec<(BoundedString<T>, FileInfo<T>)> = Vec::new();
for i in number_list.iter() {
let mut counter: u32 = 0;
for (key, value) in <File<T>>::iter() {
if value.file_state.to_vec() == "active".as_bytes().to_vec() {
if counter == *i {
file_list.push(
(
key,
value,
)
);
break
}
counter = counter.checked_add(1).ok_or(Error::<T>::Overflow)?;
}
let file_id = <FileKeysMap<T>>::try_get(i).map_err(|_e| Error::<T>::FileNonExistent)?.1;
let value = <File<T>>::try_get(&file_id).map_err(|_e| Error::<T>::FileNonExistent)?;
if value.file_state.to_vec() == "active".as_bytes().to_vec() {
file_list.push(
(
file_id.clone(),
value,
)
);
}
}
Ok(file_list)
}

fn get_random_numberlist(length: u32, random_type: u8) -> Result<Vec<u32>, DispatchError> {
fn get_random_numberlist(length: u32, random_type: u8, limit: u32) -> Result<Vec<u32>, DispatchError> {
let mut seed: u32 = <frame_system::Pallet<T>>::block_number().saturated_into();
if length == 0 {
return Ok(Vec::new())
Expand All @@ -1025,7 +1059,7 @@ pub mod pallet {
.checked_add(1)
.ok_or(Error::<T>::Overflow)?,
2 => length
.checked_mul(46 * 3)
.checked_mul(46)
.ok_or(Error::<T>::Overflow)?
.checked_div(1000)
.ok_or(Error::<T>::Overflow)?
Expand All @@ -1049,31 +1083,57 @@ pub mod pallet {
break
}
}
let random = Self::generate_random_number(seed)? % length;
let random = Self::generate_random_number(seed)? % limit;
let result: bool = match random_type {
1 => Self::judge_filler_exist(random),
2 => Self::judge_file_exist(random),
_ => true,
};
if !result {
//Start the next cycle if the file does not exist
continue;
}
log::info!("List addition: {}", random);
number_list.push(random);
}
Ok(number_list)
}

fn judge_file_exist(index: u32) -> bool {
let result = <FileKeysMap<T>>::get(index);
let result = match result {
Some(x) => x.0,
None => false,
};
result
}

fn judge_filler_exist(index: u32) -> bool {
let result = <FillerKeysMap<T>>::get(index);
let result = match result {
Some(_x) => true,
// Some(x) => {
// let result2 = <FillerMap<T>>::get(x.0, x.1);
// let result2 = match result2 {
// Some(_v) => true,
// None => false,
// };
// result2
// },
None => false,
};
result
}

//Get storagemap filler length
fn get_fillermap_length() -> Result<u32, DispatchError> {
let mut length: u32 = 0;
for _ in <FillerMap<T>>::iter() {
length = length.checked_add(1).ok_or(Error::<T>::Overflow)?;
}
Ok(length)
let count = <FillerKeysMap<T>>::count();
Ok(count)
}

//Get Storage FillerMap Length
fn get_file_map_length() -> Result<u32, DispatchError> {
let mut length: u32 = 0;
for (_, v) in <File<T>>::iter() {
if v.file_state.to_vec() == "active".as_bytes().to_vec() {
length = length.checked_add(1).ok_or(Error::<T>::Overflow)?;
}
}
Ok(length)
Ok(<FileKeysMap<T>>::count())
}

//Get random number
Expand All @@ -1097,6 +1157,8 @@ pub mod pallet {
if !<FillerMap<T>>::contains_key(&miner_acc, filler_boud.clone()) {
Err(Error::<T>::FileNonExistent)?;
}
let value = <FillerMap<T>>::try_get(&miner_acc, filler_boud.clone()).map_err(|_e| Error::<T>::FileNonExistent)?;
<FillerKeysMap<T>>::remove(value.index);
<FillerMap<T>>::remove(miner_acc, filler_boud.clone());

Ok(())
Expand All @@ -1110,7 +1172,12 @@ pub mod pallet {
for user in file.user.iter() {
Self::update_user_space(user.clone(), 2, file.file_size.into())?;
}
for slice in file.slice_info.iter() {
Self::add_invalid_file(slice.miner_acc.clone(), slice.shard_id.to_vec())?;
T::MinerControl::sub_space(slice.miner_acc.clone(), slice.shard_size.into())?;
}
<File<T>>::remove(file_hash_bounded);
<FileKeysMap<T>>::remove(file.index);
Ok(())
}

Expand Down Expand Up @@ -1139,12 +1206,7 @@ pub mod pallet {
Ok(())
})?;
} else {
<File<T>>::remove(&file_hash);
for slice in file.slice_info.iter() {
Self::add_invalid_file(slice.miner_acc.clone(), slice.shard_id.to_vec())?;
T::MinerControl::sub_space(slice.miner_acc.clone(), slice.shard_size.into())?;
}

Self::clear_file(file_hash.clone().to_vec())?;
}

<UserHoldFileList<T>>::try_mutate(&user, |s| -> DispatchResult {
Expand Down Expand Up @@ -1179,7 +1241,6 @@ pub mod pallet {
}

fn replace_file(miner_acc: AccountOf<T>, file_size: u64) -> DispatchResult {

let (power, space) = T::MinerControl::get_power_and_space(miner_acc.clone())?;
//Judge whether the current miner's remaining is enough to store files
if power > space {
Expand Down Expand Up @@ -1313,6 +1374,9 @@ impl<T: Config> RandomFileList<<T as frame_system::Config>::AccountId> for Palle
}

fn delete_miner_all_filler(miner_acc: AccountOf<T>) -> DispatchResult {
for (_, value) in FillerMap::<T>::iter_prefix(&miner_acc) {
<FillerKeysMap<T>>::remove(value.index);
}
let _ = FillerMap::<T>::remove_prefix(&miner_acc, Option::None);
Ok(())
}
Expand Down
2 changes: 2 additions & 0 deletions c-pallets/file-bank/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ type BlockNumberOf<T> = <T as frame_system::Config>::BlockNumber;
#[codec(mel_bound())]
pub struct FileInfo<T: pallet::Config> {
pub(super) file_size: u64,
pub(super) index: u32,
pub(super) file_state: BoundedVec<u8, T::StringLimit>,
pub(super) user: BoundedVec<AccountOf<T>, T::StringLimit>,
pub(super) file_name: BoundedVec<BoundedVec<u8, T::StringLimit>, T::StringLimit>,
Expand Down Expand Up @@ -46,6 +47,7 @@ pub struct SpaceInfo<T: pallet::Config> {
#[codec(mel_bound())]
pub struct FillerInfo<T: pallet::Config> {
pub filler_size: u64,
pub index: u32,
pub block_num: u32,
pub segment_size: u32,
pub scan_size: u32,
Expand Down
Loading