Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
88ea4f01
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,发现更多精彩内容 >>
提交
88ea4f01
编写于
6月 17, 2019
作者:
W
Wang Zhi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
new data structure for new BP election algorithm --- add producer public key
上级
5812c402
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
11 deletion
+22
-11
contracts/eosio.system/eosio.system.abi
contracts/eosio.system/eosio.system.abi
+1
-0
contracts/eosio.system/eosio.system.hpp
contracts/eosio.system/eosio.system.hpp
+7
-6
contracts/eosio.system/voting.cpp
contracts/eosio.system/voting.cpp
+14
-5
未找到文件。
contracts/eosio.system/eosio.system.abi
浏览文件 @
88ea4f01
...
...
@@ -37,6 +37,7 @@
"fields": [
{"name":"owner", "type":"account_name"},
{"name":"total_votes", "type":"float64"},
{"name":"producer_key", "type":"public_key"},
{"name":"all_stake", "type":"int64"},
{"name":"is_active", "type":"bool"}
]
...
...
contracts/eosio.system/eosio.system.hpp
浏览文件 @
88ea4f01
...
...
@@ -103,10 +103,11 @@ namespace eosiosystem {
struct
prod_meta
{
account_name
owner
;
double
total_votes
=
0
;
eosio
::
public_key
producer_key
;
/// a packed public key object
int64_t
all_stake
=
0
;
bool
is_active
=
true
;
EOSLIB_SERIALIZE
(
prod_meta
,
(
owner
)(
total_votes
)(
all_stake
)(
is_active
)
)
EOSLIB_SERIALIZE
(
prod_meta
,
(
owner
)(
total_votes
)(
producer_key
)(
all_stake
)(
is_active
)
)
};
struct
producers_seq
{
...
...
@@ -263,11 +264,9 @@ namespace eosiosystem {
void
add_producer_seq
(
const
account_name
producer
,
uint16_t
seq
,
uint8_t
level
);
void
active_producer_seq
(
const
account_name
producer
,
bool
isactive
);
void
active_producer_seq
(
const
account_name
producer
,
const
eosio
::
public_key
&
producer_key
,
bool
isactive
);
void
update_producers_seq_totalvotes
(
uint16_t
seq_num
,
account_name
owner
,
double
total_votes
);
void
update_producers_seq_totalvotes
(
uint16_t
seq_num
,
account_name
owner
,
double
total_votes
);
//##YTA-Change end:
void
setram
(
uint64_t
max_ram_size
);
...
...
@@ -288,7 +287,9 @@ namespace eosiosystem {
void
bidname
(
account_name
bidder
,
account_name
newname
,
asset
bid
);
private:
void
update_elected_producers
(
block_timestamp
timestamp
);
//##YTA-Change start:
void
update_elected_producers_yta
(
block_timestamp
timestamp
);
//##YTA-Change end:
// Implementation details:
...
...
contracts/eosio.system/voting.cpp
浏览文件 @
88ea4f01
...
...
@@ -49,7 +49,7 @@ namespace eosiosystem {
info
.
location
=
location
;
});
active_producer_seq
(
producer
,
true
);
active_producer_seq
(
producer
,
producer_key
,
true
);
}
else
{
_producers
.
emplace
(
producer
,
[
&
](
producer_info
&
info
){
info
.
owner
=
producer
;
...
...
@@ -71,7 +71,7 @@ namespace eosiosystem {
info
.
deactivate
();
});
active_producer_seq
(
producer
,
false
);
active_producer_seq
(
producer
,
public_key
(),
false
);
}
//##YTA-Change start:
void
system_contract
::
clsprods2
()
{
...
...
@@ -119,6 +119,7 @@ namespace eosiosystem {
_prodseq
.
modify
(
ps_itr
,
_self
,
[
&
](
producers_seq
&
info
){
if
(
info
.
prods_l1
.
owner
==
producer
)
{
info
.
prods_l1
.
owner
=
0
;
info
.
prods_l1
.
producer_key
=
public_key
();
info
.
prods_l1
.
all_stake
=
0
;
info
.
prods_l1
.
total_votes
=
0
;
info
.
prods_l1
.
is_active
=
false
;
...
...
@@ -153,6 +154,7 @@ namespace eosiosystem {
//need retrive from system producers table
const
auto
&
prod
=
_producers
.
get
(
producer
,
"producer not found"
);
prodm
.
owner
=
producer
;
prodm
.
producer_key
=
prod
.
producer_key
;
prodm
.
all_stake
=
0
;
prodm
.
total_votes
=
prod
.
total_votes
;
prodm
.
is_active
=
prod
.
is_active
;
...
...
@@ -184,7 +186,7 @@ namespace eosiosystem {
}
}
void
system_contract
::
active_producer_seq
(
const
account_name
producer
,
bool
isactive
)
{
void
system_contract
::
active_producer_seq
(
const
account_name
producer
,
const
eosio
::
public_key
&
producer_key
,
bool
isactive
)
{
auto
it
=
_producers2
.
find
(
producer
);
if
(
it
==
_producers2
.
end
())
...
...
@@ -199,11 +201,13 @@ namespace eosiosystem {
_prodseq
.
modify
(
ps_itr
,
_self
,
[
&
](
producers_seq
&
info
){
if
(
info
.
prods_l1
.
owner
==
producer
)
{
info
.
prods_l1
.
is_active
=
isactive
;
info
.
prods_l1
.
producer_key
=
producer_key
;
}
for
(
auto
it2
=
info
.
prods_l2
.
begin
();
it2
!=
info
.
prods_l2
.
end
();
it2
++
)
{
if
(
it2
->
owner
==
producer
)
{
it2
->
is_active
=
isactive
;
it2
->
producer_key
=
producer_key
;
break
;
}
}
...
...
@@ -211,6 +215,7 @@ namespace eosiosystem {
for
(
auto
it3
=
info
.
prods_l3
.
begin
();
it3
!=
info
.
prods_l3
.
end
();
it3
++
)
{
if
(
it3
->
owner
==
producer
)
{
it3
->
is_active
=
isactive
;
it3
->
producer_key
=
producer_key
;
break
;
}
}
...
...
@@ -218,6 +223,7 @@ namespace eosiosystem {
for
(
auto
itall
=
info
.
prods_all
.
begin
();
itall
!=
info
.
prods_all
.
end
();
itall
++
)
{
if
(
itall
->
owner
==
producer
)
{
itall
->
is_active
=
isactive
;
itall
->
producer_key
=
producer_key
;
break
;
}
}
...
...
@@ -263,8 +269,11 @@ namespace eosiosystem {
});
}
//##YTA-Change ens:
void
system_contract
::
update_elected_producers_yta
(
block_timestamp
block_time
)
{
_gstate
.
last_producer_schedule_update
=
block_time
;
}
//##YTA-Change end:
void
system_contract
::
update_elected_producers
(
block_timestamp
block_time
)
{
_gstate
.
last_producer_schedule_update
=
block_time
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录