Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
8120d517
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,发现更多精彩内容 >>
提交
8120d517
编写于
4月 03, 2018
作者:
A
Anton Perkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove max_generated_transaction_size #1030
上级
180c6bf2
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
2 addition
and
17 deletion
+2
-17
contracts/eosio.system/eosio.system.abi
contracts/eosio.system/eosio.system.abi
+0
-1
contracts/eosio.system/voting.hpp
contracts/eosio.system/voting.hpp
+0
-4
contracts/eosiolib/privileged.hpp
contracts/eosiolib/privileged.hpp
+1
-3
libraries/chain/include/eosio/chain/chain_config.hpp
libraries/chain/include/eosio/chain/chain_config.hpp
+1
-4
libraries/chain/include/eosio/chain/contracts/genesis_state.hpp
...ies/chain/include/eosio/chain/contracts/genesis_state.hpp
+0
-1
libraries/chain/wasm_interface.cpp
libraries/chain/wasm_interface.cpp
+0
-2
tests/wasm_tests/eosio.system_tests.cpp
tests/wasm_tests/eosio.system_tests.cpp
+0
-2
未找到文件。
contracts/eosio.system/eosio.system.abi
浏览文件 @
8120d517
...
...
@@ -102,7 +102,6 @@
{"name":"max_authority_depth", "type":"uint16"},
{"name":"max_inline_depth", "type":"uint16"},
{"name":"max_inline_action_size", "type":"uint32"},
{"name":"max_generated_transaction_size", "type":"uint32"},
{"name":"max_generated_transaction_count", "type":"uint32"},
{"name":"percent_of_max_inflation_rate", "type":"uint32"},
{"name":"storage_reserve_ratio", "type":"uint32"}
...
...
contracts/eosio.system/voting.hpp
浏览文件 @
8120d517
...
...
@@ -257,7 +257,6 @@ namespace eosiosystem {
std
::
array
<
uint32_t
,
21
>
max_transaction_exec_time
;
std
::
array
<
uint16_t
,
21
>
max_inline_depth
;
std
::
array
<
uint32_t
,
21
>
max_inline_action_size
;
std
::
array
<
uint32_t
,
21
>
max_generated_transaction_size
;
std
::
array
<
uint32_t
,
21
>
max_generated_transaction_count
;
std
::
array
<
uint32_t
,
21
>
percent_of_max_inflation_rate
;
std
::
array
<
uint32_t
,
21
>
storage_reserve_ratio
;
...
...
@@ -287,7 +286,6 @@ namespace eosiosystem {
max_transaction_exec_time
[
n
]
=
it
->
prefs
.
max_transaction_exec_time
;
max_inline_depth
[
n
]
=
it
->
prefs
.
max_inline_depth
;
max_inline_action_size
[
n
]
=
it
->
prefs
.
max_inline_action_size
;
max_generated_transaction_size
[
n
]
=
it
->
prefs
.
max_generated_transaction_size
;
max_generated_transaction_count
[
n
]
=
it
->
prefs
.
max_generated_transaction_count
;
storage_reserve_ratio
[
n
]
=
it
->
prefs
.
storage_reserve_ratio
;
...
...
@@ -314,7 +312,6 @@ namespace eosiosystem {
std
::
sort
(
max_authority_depth
.
begin
(),
max_authority_depth
.
begin
()
+
n
);
std
::
sort
(
max_inline_depth
.
begin
(),
max_inline_depth
.
begin
()
+
n
);
std
::
sort
(
max_inline_action_size
.
begin
(),
max_inline_action_size
.
begin
()
+
n
);
std
::
sort
(
max_generated_transaction_size
.
begin
(),
max_generated_transaction_size
.
begin
()
+
n
);
std
::
sort
(
max_generated_transaction_count
.
begin
(),
max_generated_transaction_count
.
begin
()
+
n
);
std
::
sort
(
storage_reserve_ratio
.
begin
(),
storage_reserve_ratio
.
begin
()
+
n
);
std
::
sort
(
percent_of_max_inflation_rate
.
begin
(),
percent_of_max_inflation_rate
.
begin
()
+
n
);
...
...
@@ -343,7 +340,6 @@ namespace eosiosystem {
parameters
.
max_authority_depth
=
max_authority_depth
[
median
];
parameters
.
max_inline_depth
=
max_inline_depth
[
median
];
parameters
.
max_inline_action_size
=
max_inline_action_size
[
median
];
parameters
.
max_generated_transaction_size
=
max_generated_transaction_size
[
median
];
parameters
.
max_generated_transaction_count
=
max_generated_transaction_count
[
median
];
parameters
.
storage_reserve_ratio
=
storage_reserve_ratio
[
median
];
parameters
.
percent_of_max_inflation_rate
=
percent_of_max_inflation_rate
[
median
];
...
...
contracts/eosiolib/privileged.hpp
浏览文件 @
8120d517
...
...
@@ -21,7 +21,6 @@ namespace eosio {
uint16_t
max_authority_depth
;
uint16_t
max_inline_depth
;
uint32_t
max_inline_action_size
;
uint32_t
max_generated_transaction_size
;
uint32_t
max_generated_transaction_count
;
EOSLIB_SERIALIZE
(
blockchain_parameters
,
...
...
@@ -30,8 +29,7 @@ namespace eosio {
(
context_free_discount_cpu_usage_num
)(
context_free_discount_cpu_usage_den
)
(
max_transaction_cpu_usage
)(
max_transaction_net_usage
)
(
max_transaction_lifetime
)(
max_transaction_exec_time
)(
max_authority_depth
)
(
max_inline_depth
)(
max_inline_action_size
)(
max_generated_transaction_size
)
(
max_generated_transaction_count
)
(
max_inline_depth
)(
max_inline_action_size
)(
max_generated_transaction_count
)
)
};
...
...
libraries/chain/include/eosio/chain/chain_config.hpp
浏览文件 @
8120d517
...
...
@@ -35,7 +35,6 @@ struct chain_config {
uint16_t
max_authority_depth
;
uint16_t
max_inline_depth
;
uint32_t
max_inline_action_size
;
uint32_t
max_generated_transaction_size
;
uint32_t
max_generated_transaction_count
;
static
chain_config
get_median_values
(
vector
<
chain_config
>
votes
);
...
...
@@ -55,7 +54,6 @@ struct chain_config {
<<
"Max Authority Depth: "
<<
c
.
max_authority_depth
<<
", "
<<
"Max Inline Depth: "
<<
c
.
max_inline_depth
<<
", "
<<
"Max Inline Action Size: "
<<
c
.
max_inline_action_size
<<
", "
<<
"Max Generated Transaction Size: "
<<
c
.
max_generated_transaction_size
<<
","
<<
"Max Generated Transaction Count: "
<<
c
.
max_generated_transaction_count
<<
"
\n
"
;
}
};
...
...
@@ -74,6 +72,5 @@ FC_REFLECT(eosio::chain::chain_config,
(
context_free_discount_cpu_usage_num
)(
context_free_discount_cpu_usage_den
)
(
max_transaction_cpu_usage
)(
max_transaction_net_usage
)
(
max_transaction_lifetime
)(
max_transaction_exec_time
)(
max_authority_depth
)
(
max_inline_depth
)(
max_inline_action_size
)(
max_generated_transaction_size
)
(
max_generated_transaction_count
)
(
max_inline_depth
)(
max_inline_action_size
)(
max_generated_transaction_count
)
)
libraries/chain/include/eosio/chain/contracts/genesis_state.hpp
浏览文件 @
8120d517
...
...
@@ -32,7 +32,6 @@ struct genesis_state_type {
.
max_authority_depth
=
config
::
default_max_auth_depth
,
.
max_inline_depth
=
config
::
default_max_inline_depth
,
.
max_inline_action_size
=
config
::
default_max_inline_action_size
,
.
max_generated_transaction_size
=
config
::
default_max_gen_trx_size
,
.
max_generated_transaction_count
=
config
::
default_max_gen_trx_count
};
...
...
libraries/chain/wasm_interface.cpp
浏览文件 @
8120d517
...
...
@@ -1059,8 +1059,6 @@ class transaction_api : public context_aware_api {
try
{
fc
::
uint128_t
sender_id
(
val
>>
64
,
uint64_t
(
val
)
);
const
auto
&
gpo
=
context
.
controller
.
get_global_properties
();
FC_ASSERT
(
data_len
<
gpo
.
configuration
.
max_generated_transaction_size
,
"generated transaction too big"
);
deferred_transaction
dtrx
;
fc
::
raw
::
unpack
<
transaction
>
(
data
,
data_len
,
dtrx
);
...
...
tests/wasm_tests/eosio.system_tests.cpp
浏览文件 @
8120d517
...
...
@@ -107,7 +107,6 @@ public:
(
"max_authority_depth"
,
6
+
n
)
(
"max_inline_depth"
,
4
+
n
)
(
"max_inline_action_size"
,
4096
+
n
)
(
"max_generated_transaction_size"
,
64
*
1024
+
n
)
(
"max_generated_transaction_count"
,
10
+
n
)
(
"percent_of_max_inflation_rate"
,
50
+
n
)
(
"storage_reserve_ratio"
,
100
+
n
);
...
...
@@ -1386,7 +1385,6 @@ fc::mutable_variant_object config_to_variant( const eosio::chain::chain_config&
(
"max_authority_depth"
,
config
.
max_authority_depth
)
(
"max_inline_depth"
,
config
.
max_inline_depth
)
(
"max_inline_action_size"
,
config
.
max_inline_action_size
)
(
"max_generated_transaction_size"
,
config
.
max_generated_transaction_size
)
(
"max_generated_transaction_count"
,
config
.
max_generated_transaction_count
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录