Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
d71bc4ac
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,发现更多精彩内容 >>
提交
d71bc4ac
编写于
12月 15, 2019
作者:
W
wangxxzhiyy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update contracts
上级
4ad559c7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
6 deletion
+29
-6
contracts/hdddeposit/hdddeposit.cpp
contracts/hdddeposit/hdddeposit.cpp
+1
-1
contracts/hddpool/hddpool.cpp
contracts/hddpool/hddpool.cpp
+8
-1
contracts/hddpool/hddpool.hpp
contracts/hddpool/hddpool.hpp
+20
-4
未找到文件。
contracts/hdddeposit/hdddeposit.cpp
浏览文件 @
d71bc4ac
...
...
@@ -274,7 +274,7 @@ void hdddeposit::mchgdepacc(uint64_t minerid, name new_depacc) {
eosio_assert
(
acc_new
.
deposit_free
.
amount
>=
miner
.
dep_total
.
amount
,
"new deposit user free deposit not enough"
);
eosio_assert
(
hddpool
::
get_miner_pool
(
minerid
)
==
new_depacc
,
"minerid not exist in new_depacc's storepool "
);
eosio_assert
(
hddpool
::
get_miner_pool
_owner
(
minerid
)
==
new_depacc
,
"minerid not exist in new_depacc's storepool "
);
//变更原抵押账户的押金数量
...
...
contracts/hddpool/hddpool.cpp
浏览文件 @
d71bc4ac
...
...
@@ -732,7 +732,7 @@ void hddpool::mchgstrpool(uint64_t minerid, name new_poolid)
auto
itstorepool
=
_storepool
.
find
(
new_poolid
.
value
);
eosio_assert
(
itstorepool
!=
_storepool
.
end
(),
"storepool not registered"
);
//
require_auth(itminerinfo->admin);
require_auth
(
itminerinfo
->
admin
);
require_auth
(
itstorepool
->
pool_owner
);
//归还旧矿池空间
...
...
@@ -773,6 +773,9 @@ void hddpool::mchgspace(uint64_t minerid, uint64_t max_space)
require_auth
(
itminerinfo
->
admin
);
name
pool_owner
=
get_miner_pool_owner
(
minerid
);
require_auth
(
pool_owner
);
//--- check miner deposit and max_space
asset
deposit
=
hdddeposit
(
hdd_deposit
).
get_miner_deposit
(
minerid
);
eosio_assert
(
hdddeposit
(
hdd_deposit
).
is_deposit_enough
(
deposit
,
max_space
),
"deposit not enough for miner's max_space -- addm2pool"
);
...
...
@@ -837,6 +840,10 @@ void hddpool::mchgowneracc(uint64_t minerid, name new_owneracc)
eosio_assert
(
itmaccount_old
!=
_maccount_old
.
end
(),
"minerid not register"
);
uint64_t
space
=
itmaccount_old
->
space
;
name
pool_owner
=
get_miner_pool_owner
(
minerid
);
require_auth
(
pool_owner
);
uint64_t
tmp_t
=
current_time
();
//结算旧owner账户当前的收益
...
...
contracts/hddpool/hddpool.hpp
浏览文件 @
d71bc4ac
...
...
@@ -215,15 +215,31 @@ public:
return
0
;
}
static
name
get_miner_pool
(
uint64_t
minerid
)
static
name
get_miner_pool
_id
(
uint64_t
minerid
)
{
name
pool
;
name
pool
_id
;
minerinfo_table
_minerinfo
(
N
(
hddpool12345
)
,
N
(
hddpool12345
)
);
auto
itminerinfo
=
_minerinfo
.
find
(
minerid
);
if
(
itminerinfo
!=
_minerinfo
.
end
())
{
pool
=
itminerinfo
->
owner
;
pool
_id
=
itminerinfo
->
pool_id
;
}
return
pool
;
return
pool_id
;
}
static
name
get_miner_pool_owner
(
uint64_t
minerid
)
{
name
pool_owner
;
minerinfo_table
_minerinfo
(
N
(
hddpool12345
)
,
N
(
hddpool12345
)
);
auto
itminerinfo
=
_minerinfo
.
find
(
minerid
);
if
(
itminerinfo
!=
_minerinfo
.
end
())
{
storepool_index
_storepool
(
N
(
hddpool12345
)
,
N
(
hddpool12345
));
auto
itstorepool
=
_storepool
.
find
(
itminerinfo
->
pool_id
);
if
(
itstorepool
!=
_storepool
.
end
())
{
pool_owner
=
itstorepool
->
pool_owner
;
}
}
return
pool_owner
;
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录