Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
db612027
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,发现更多精彩内容 >>
提交
db612027
编写于
4月 24, 2018
作者:
K
Kevin Heifner
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'slim' of
https://github.com/EOSIO/eos
into slim
上级
83361e6e
f88705ca
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
3 deletion
+8
-3
libraries/chain/controller.cpp
libraries/chain/controller.cpp
+4
-0
libraries/chain/include/eosio/chain/block.hpp
libraries/chain/include/eosio/chain/block.hpp
+3
-2
libraries/chain/include/eosio/chain/controller.hpp
libraries/chain/include/eosio/chain/controller.hpp
+1
-1
未找到文件。
libraries/chain/controller.cpp
浏览文件 @
db612027
...
...
@@ -522,6 +522,9 @@ struct controller_impl {
auto
mtrx
=
std
::
make_shared
<
transaction_metadata
>
(
pt
);
push_transaction
(
mtrx
);
}
else
if
(
receipt
.
trx
.
contains
<
transaction_id_type
>
()
)
{
self
.
push_scheduled_transaction
(
receipt
.
trx
.
get
<
transaction_id_type
>
()
);
}
}
finalize_block
();
...
...
@@ -858,6 +861,7 @@ void controller::push_next_scheduled_transaction( fc::time_point deadline ) {
my
->
push_scheduled_transaction
(
*
idx
.
begin
(),
deadline
);
}
void
controller
::
push_scheduled_transaction
(
const
transaction_id_type
&
trxid
,
fc
::
time_point
deadline
)
{
FC_ASSERT
(
!
"not implemented"
);
/// lookup scheduled trx and then apply it...
}
...
...
libraries/chain/include/eosio/chain/block.hpp
浏览文件 @
db612027
...
...
@@ -14,7 +14,8 @@ namespace eosio { namespace chain {
executed
=
0
,
///< succeed, no error handler executed
soft_fail
=
1
,
///< objectively failed (not executed), error handler executed
hard_fail
=
2
,
///< objectively failed and error handler objectively failed thus no state change
delayed
=
3
///< transaction delayed/deferred/scheduled for future execution
delayed
=
3
,
///< transaction delayed/deferred/scheduled for future execution
expired
=
4
///< transaction expired and storage space refuned to user
};
transaction_receipt_header
()
:
status
(
hard_fail
){}
...
...
@@ -65,7 +66,7 @@ namespace eosio { namespace chain {
}
}
/// eosio::chain
FC_REFLECT_ENUM
(
eosio
::
chain
::
transaction_receipt
::
status_enum
,
(
executed
)(
soft_fail
)(
hard_fail
)(
delayed
)
)
(
executed
)(
soft_fail
)(
hard_fail
)(
delayed
)
(
expired
)
)
FC_REFLECT
(
eosio
::
chain
::
transaction_receipt_header
,
(
status
)(
kcpu_usage
)(
net_usage_words
)
)
FC_REFLECT_DERIVED
(
eosio
::
chain
::
transaction_receipt
,
(
eosio
::
chain
::
transaction_receipt_header
),
(
trx
)
)
...
...
libraries/chain/include/eosio/chain/controller.hpp
浏览文件 @
db612027
...
...
@@ -85,7 +85,7 @@ namespace eosio { namespace chain {
*
*/
void
push_scheduled_transaction
(
const
transaction_id_type
&
scheduled
,
fc
::
time_point
deadline
=
fc
::
time_point
::
maximum
()
);
fc
::
time_point
deadline
=
fc
::
time_point
::
maximum
()
);
/**
* Attempt to execute the oldest unexecuted deferred transaction
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录