Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
7ffa7e72
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7ffa7e72
编写于
12月 16, 2019
作者:
W
wangxxzhiyy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update hddpool
上级
04b8edce
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
96 deletion
+40
-96
contracts/hddpool/hddpool.cpp
contracts/hddpool/hddpool.cpp
+38
-96
contracts/hddpool/hddpool.hpp
contracts/hddpool/hddpool.hpp
+2
-0
未找到文件。
contracts/hddpool/hddpool.cpp
浏览文件 @
7ffa7e72
...
...
@@ -106,6 +106,37 @@ void hddpool::calcprofit(name user)
});
}
void
hddpool
::
chg_owner_space
(
userhdd_index
&
userhdd
,
name
minerowner
,
uint64_t
space_delta
,
bool
is_increase
,
bool
is_calc
,
uint64_t
ct
)
{
auto
userhdd_itr
=
userhdd
.
find
(
minerowner
.
value
);
eosio_assert
(
userhdd_itr
!=
userhdd
.
end
(),
"no owner exists in userhdd table"
);
userhdd
.
modify
(
userhdd_itr
,
_self
,
[
&
](
auto
&
row
)
{
if
(
is_calc
)
{
int64_t
tmp_last_balance
=
userhdd_itr
->
hdd_minerhdd
;
int64_t
new_balance
;
if
(
calculate_balance
(
tmp_last_balance
,
0
,
userhdd_itr
->
hdd_per_cycle_profit
,
userhdd_itr
->
last_hddprofit_time
,
ct
,
new_balance
))
{
eosio_assert
(
is_hdd_amount_within_range
(
new_balance
),
"magnitude of new_balance must be less than 2^62"
);
row
.
hdd_minerhdd
=
new_balance
;
row
.
last_hddprofit_time
=
ct
;
}
}
uint64_t
newspace
=
0
;
if
(
is_increase
)
{
newspace
=
row
.
hdd_space_profit
+
space_delta
;
}
else
{
if
(
row
.
hdd_space_profit
>
space_delta
)
{
newspace
=
row
.
hdd_space_profit
-
space_delta
;
}
}
row
.
hdd_space_profit
=
newspace
;
row
.
hdd_per_cycle_profit
=
(
int64_t
)(((
double
)(
newspace
*
data_slice_size
)
/
(
double
)
one_gb
)
*
((
double
)
fee_cycle
/
(
double
)
seconds_in_one_year
)
*
100000000
);
});
}
void
hddpool
::
getbalance
(
name
user
,
uint8_t
acc_type
,
name
caller
)
{
...
...
@@ -400,22 +431,7 @@ void hddpool::addmprofit(name owner, uint64_t minerid, uint64_t space, name call
});
userhdd_index
_userhdd
(
_self
,
owner
.
value
);
auto
userhdd_itr
=
_userhdd
.
find
(
owner
.
value
);
eosio_assert
(
userhdd_itr
!=
_userhdd
.
end
(),
"no owner exists in userhdd table"
);
_userhdd
.
modify
(
userhdd_itr
,
_self
,
[
&
](
auto
&
row
)
{
int64_t
tmp_last_balance
=
userhdd_itr
->
hdd_minerhdd
;
int64_t
new_balance
;
if
(
calculate_balance
(
tmp_last_balance
,
0
,
userhdd_itr
->
hdd_per_cycle_profit
,
userhdd_itr
->
last_hddprofit_time
,
tmp_t
,
new_balance
))
{
eosio_assert
(
is_hdd_amount_within_range
(
new_balance
),
"magnitude of new_balance must be less than 2^62"
);
row
.
hdd_minerhdd
=
new_balance
;
row
.
last_hddprofit_time
=
tmp_t
;
}
uint64_t
newspace
=
row
.
hdd_space_profit
+
space
;
row
.
hdd_space_profit
=
newspace
;
row
.
hdd_per_cycle_profit
=
(
int64_t
)(((
double
)(
newspace
*
data_slice_size
)
/
(
double
)
one_gb
)
*
((
double
)
fee_cycle
/
(
double
)
seconds_in_one_year
)
*
100000000
);
});
chg_owner_space
(
_userhdd
,
owner
,
space
,
true
,
true
,
tmp_t
);
}
void
hddpool
::
calcmbalance
(
name
owner
,
uint64_t
minerid
)
...
...
@@ -456,7 +472,6 @@ void hddpool::delminer(uint64_t minerid, uint8_t acc_type, name caller)
require_auth
(
N
(
hddpooladmin
));
}
action
(
permission_level
{
N
(
hddpooladmin
),
active_permission
},
hdd_deposit
,
N
(
delminer
),
...
...
@@ -469,20 +484,10 @@ void hddpool::delminer(uint64_t minerid, uint8_t acc_type, name caller)
auto
itmaccount
=
_maccount
.
find
(
minerid
);
if
(
itmaccount
!=
_maccount
.
end
())
{
_maccount
.
erase
(
itmaccount
);
userhdd_index
_userhdd
(
_self
,
itminerinfo
->
owner
.
value
);
auto
userhdd_itr
=
_userhdd
.
find
(
itminerinfo
->
owner
.
value
);
eosio_assert
(
userhdd_itr
!=
_userhdd
.
end
(),
"no owner exists in userhdd table"
);
_userhdd
.
modify
(
userhdd_itr
,
_self
,
[
&
](
auto
&
row
)
{
uint64_t
newspace
=
0
;
if
(
row
.
hdd_space_profit
>=
itmaccount
->
space
)
{
newspace
=
row
.
hdd_space_profit
-
itmaccount
->
space
;
}
row
.
hdd_space_profit
=
newspace
;
row
.
hdd_per_cycle_profit
=
(
int64_t
)(((
double
)(
newspace
*
data_slice_size
)
/
(
double
)
one_gb
)
*
((
double
)
fee_cycle
/
(
double
)
seconds_in_one_year
)
*
100000000
);
});
chg_owner_space
(
_userhdd
,
itminerinfo
->
owner
,
itmaccount
->
space
,
false
,
false
,
current_time
());
_maccount
.
erase
(
itmaccount
);
}
}
...
...
@@ -529,24 +534,7 @@ void hddpool::mdeactive(name owner, uint64_t minerid, name caller)
});
userhdd_index
_userhdd
(
_self
,
owner
.
value
);
auto
userhdd_itr
=
_userhdd
.
find
(
owner
.
value
);
eosio_assert
(
userhdd_itr
!=
_userhdd
.
end
(),
"no owner exists in userhdd table"
);
_userhdd
.
modify
(
userhdd_itr
,
_self
,
[
&
](
auto
&
row
)
{
int64_t
tmp_last_balance
=
userhdd_itr
->
hdd_minerhdd
;
int64_t
new_balance
;
if
(
calculate_balance
(
tmp_last_balance
,
0
,
userhdd_itr
->
hdd_per_cycle_profit
,
userhdd_itr
->
last_hddprofit_time
,
tmp_t
,
new_balance
))
{
eosio_assert
(
is_hdd_amount_within_range
(
new_balance
),
"magnitude of new_balance must be less than 2^62"
);
row
.
hdd_minerhdd
=
new_balance
;
row
.
last_hddprofit_time
=
tmp_t
;
}
uint64_t
newspace
=
0
;
if
(
row
.
hdd_space_profit
>=
space
)
{
newspace
=
row
.
hdd_space_profit
-
space
;
}
row
.
hdd_space_profit
=
newspace
;
row
.
hdd_per_cycle_profit
=
(
int64_t
)(((
double
)(
newspace
*
data_slice_size
)
/
(
double
)
one_gb
)
*
((
double
)
fee_cycle
/
(
double
)
seconds_in_one_year
)
*
100000000
);
});
chg_owner_space
(
_userhdd
,
owner
,
space
,
false
,
true
,
tmp_t
);
}
void
hddpool
::
mactive
(
name
owner
,
uint64_t
minerid
,
name
caller
)
...
...
@@ -571,23 +559,7 @@ void hddpool::mactive(name owner, uint64_t minerid, name caller)
});
userhdd_index
_userhdd
(
_self
,
owner
.
value
);
auto
userhdd_itr
=
_userhdd
.
find
(
owner
.
value
);
eosio_assert
(
userhdd_itr
!=
_userhdd
.
end
(),
"no owner exists in userhdd table"
);
_userhdd
.
modify
(
userhdd_itr
,
_self
,
[
&
](
auto
&
row
)
{
int64_t
tmp_last_balance
=
userhdd_itr
->
hdd_minerhdd
;
int64_t
new_balance
;
if
(
calculate_balance
(
tmp_last_balance
,
0
,
userhdd_itr
->
hdd_per_cycle_profit
,
userhdd_itr
->
last_hddprofit_time
,
tmp_t
,
new_balance
))
{
eosio_assert
(
is_hdd_amount_within_range
(
new_balance
),
"magnitude of new_balance must be less than 2^62"
);
row
.
hdd_minerhdd
=
new_balance
;
row
.
last_hddprofit_time
=
tmp_t
;
}
uint64_t
newspace
=
0
;
newspace
=
row
.
hdd_space_profit
+
space
;
row
.
hdd_space_profit
=
newspace
;
row
.
hdd_per_cycle_profit
=
(
int64_t
)(((
double
)(
newspace
*
data_slice_size
)
/
(
double
)
one_gb
)
*
((
double
)
fee_cycle
/
(
double
)
seconds_in_one_year
)
*
100000000
);
});
chg_owner_space
(
_userhdd
,
owner
,
space
,
true
,
true
,
tmp_t
);
}
void
hddpool
::
newminer
(
uint64_t
minerid
,
name
adminacc
,
name
dep_acc
,
asset
dep_amount
)
...
...
@@ -868,24 +840,7 @@ void hddpool::mchgowneracc(uint64_t minerid, name new_owneracc)
//结算旧owner账户当前的收益
userhdd_index
_userhdd_old
(
_self
,
itminerinfo
->
owner
.
value
);
auto
userhdd_old_itr
=
_userhdd_old
.
find
(
itminerinfo
->
owner
.
value
);
eosio_assert
(
userhdd_old_itr
!=
_userhdd_old
.
end
(),
"old owner not exists in userhdd table"
);
_userhdd_old
.
modify
(
userhdd_old_itr
,
_self
,
[
&
](
auto
&
row
)
{
int64_t
tmp_last_balance
=
userhdd_old_itr
->
hdd_minerhdd
;
int64_t
new_balance
;
if
(
calculate_balance
(
tmp_last_balance
,
0
,
userhdd_old_itr
->
hdd_per_cycle_profit
,
userhdd_old_itr
->
last_hddprofit_time
,
tmp_t
,
new_balance
))
{
eosio_assert
(
is_hdd_amount_within_range
(
new_balance
),
"magnitude of new_balance must be less than 2^62"
);
row
.
hdd_minerhdd
=
new_balance
;
row
.
last_hddprofit_time
=
tmp_t
;
}
uint64_t
newspace
=
0
;
if
(
row
.
hdd_space_profit
>=
space
)
{
newspace
=
row
.
hdd_space_profit
-
space
;
}
row
.
hdd_space_profit
=
newspace
;
row
.
hdd_per_cycle_profit
=
(
int64_t
)(((
double
)(
newspace
*
data_slice_size
)
/
(
double
)
one_gb
)
*
((
double
)
fee_cycle
/
(
double
)
seconds_in_one_year
)
*
100000000
);
});
chg_owner_space
(
_userhdd_old
,
itminerinfo
->
owner
,
space
,
false
,
true
,
tmp_t
);
//结算新owner账户当前的收益
userhdd_index
_userhdd_new
(
_self
,
new_owneracc
.
value
);
...
...
@@ -895,20 +850,7 @@ void hddpool::mchgowneracc(uint64_t minerid, name new_owneracc)
new_user_hdd
(
_userhdd_new
,
new_owneracc
,
0
,
_self
);
userhdd_new_itr
=
_userhdd_new
.
find
(
new_owneracc
.
value
);
}
_userhdd_new
.
modify
(
userhdd_new_itr
,
_self
,
[
&
](
auto
&
row
)
{
int64_t
tmp_last_balance
=
userhdd_new_itr
->
hdd_minerhdd
;
int64_t
new_balance
;
if
(
calculate_balance
(
tmp_last_balance
,
0
,
userhdd_new_itr
->
hdd_per_cycle_profit
,
userhdd_new_itr
->
last_hddprofit_time
,
tmp_t
,
new_balance
))
{
eosio_assert
(
is_hdd_amount_within_range
(
new_balance
),
"magnitude of new_balance must be less than 2^62"
);
row
.
hdd_minerhdd
=
new_balance
;
row
.
last_hddprofit_time
=
tmp_t
;
}
uint64_t
newspace
=
0
;
newspace
=
row
.
hdd_space_profit
+
space
;
row
.
hdd_space_profit
=
newspace
;
row
.
hdd_per_cycle_profit
=
(
int64_t
)(((
double
)(
newspace
*
data_slice_size
)
/
(
double
)
one_gb
)
*
((
double
)
fee_cycle
/
(
double
)
seconds_in_one_year
)
*
100000000
);
});
chg_owner_space
(
_userhdd_new
,
new_owneracc
,
space
,
true
,
true
,
tmp_t
);
maccount_index
_maccount_new
(
_self
,
new_owneracc
.
value
);
auto
itmaccount_new
=
_maccount_new
.
find
(
minerid
);
...
...
contracts/hddpool/hddpool.hpp
浏览文件 @
7ffa7e72
...
...
@@ -194,6 +194,8 @@ private:
void
new_user_hdd
(
userhdd_index
&
userhdd
,
name
user
,
int64_t
balance
,
account_name
payer
);
void
chg_owner_space
(
userhdd_index
&
userhdd
,
name
minerowner
,
uint64_t
space_delta
,
bool
is_increase
,
bool
is_calc
,
uint64_t
ct
);
public:
static
bool
is_miner_exist
(
uint64_t
minerid
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录