Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
c2305ef4
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,发现更多精彩内容 >>
提交
c2305ef4
编写于
2月 24, 2018
作者:
A
Alessandro Siniscalchi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev_binaryen_into_source' into dev_cmake_using_finds
上级
403222d6
91e5133b
变更
10
展开全部
隐藏空白更改
内联
并排
Showing
10 changed file
with
385 addition
and
136 deletion
+385
-136
.gitmodules
.gitmodules
+3
-0
CMakeLists.txt
CMakeLists.txt
+2
-0
external/CMakeLists.txt
external/CMakeLists.txt
+1
-0
external/binaryen
external/binaryen
+1
-0
libraries/chain/chain_controller.cpp
libraries/chain/chain_controller.cpp
+4
-0
libraries/chain/include/eosio/chain/chain_controller.hpp
libraries/chain/include/eosio/chain/chain_controller.hpp
+3
-1
libraries/chain/include/eosio/chain/config.hpp
libraries/chain/include/eosio/chain/config.hpp
+0
-2
plugins/mongo_db_plugin/mongo_db_plugin.cpp
plugins/mongo_db_plugin/mongo_db_plugin.cpp
+362
-130
programs/eosioc/main.cpp
programs/eosioc/main.cpp
+2
-2
tests/testUtils.py
tests/testUtils.py
+7
-1
未找到文件。
.gitmodules
浏览文件 @
c2305ef4
...
@@ -17,3 +17,6 @@
...
@@ -17,3 +17,6 @@
path = contracts/libc++/upstream
path = contracts/libc++/upstream
url = https://github.com/EOSIO/libcxx.git
url = https://github.com/EOSIO/libcxx.git
branch = eosio
branch = eosio
[submodule "external/binaryen"]
path = external/binaryen
url = https://github.com/WebAssembly/binaryen.git
CMakeLists.txt
浏览文件 @
c2305ef4
...
@@ -164,6 +164,8 @@ if(ENABLE_COVERAGE_TESTING)
...
@@ -164,6 +164,8 @@ if(ENABLE_COVERAGE_TESTING)
find_program
(
GENHTML_PATH NAMES genhtml
)
find_program
(
GENHTML_PATH NAMES genhtml
)
endif
()
endif
()
add_subdirectory
(
external
)
include
(
wasm
)
include
(
wasm
)
if
(
WASM_TOOLCHAIN_FOUND
)
if
(
WASM_TOOLCHAIN_FOUND
)
message
(
STATUS
"Using WASM clang => "
${
WASM_CLANG
}
)
message
(
STATUS
"Using WASM clang => "
${
WASM_CLANG
}
)
...
...
external/CMakeLists.txt
0 → 100644
浏览文件 @
c2305ef4
add_subdirectory
(
binaryen
)
binaryen
@
7179572c
Subproject commit 7179572c7fe842df688bcf6b2a1c08e7623ab284
libraries/chain/chain_controller.cpp
浏览文件 @
c2305ef4
...
@@ -55,8 +55,12 @@ chain_controller::chain_controller( const chain_controller::controller_config& c
...
@@ -55,8 +55,12 @@ chain_controller::chain_controller( const chain_controller::controller_config& c
{
{
_initialize_indexes
();
_initialize_indexes
();
for
(
auto
&
f
:
cfg
.
applied_block_callbacks
)
applied_block
.
connect
(
f
);
for
(
auto
&
f
:
cfg
.
applied_irreversible_block_callbacks
)
for
(
auto
&
f
:
cfg
.
applied_irreversible_block_callbacks
)
applied_irreversible_block
.
connect
(
f
);
applied_irreversible_block
.
connect
(
f
);
for
(
auto
&
f
:
cfg
.
on_pending_transaction_callbacks
)
on_pending_transaction
.
connect
(
f
);
contracts
::
chain_initializer
starter
(
cfg
.
genesis
);
contracts
::
chain_initializer
starter
(
cfg
.
genesis
);
starter
.
register_types
(
*
this
,
_db
);
starter
.
register_types
(
*
this
,
_db
);
...
...
libraries/chain/include/eosio/chain/chain_controller.hpp
浏览文件 @
c2305ef4
...
@@ -72,12 +72,14 @@ namespace eosio { namespace chain {
...
@@ -72,12 +72,14 @@ namespace eosio { namespace chain {
path
shared_memory_dir
=
config
::
default_shared_memory_dir
;
path
shared_memory_dir
=
config
::
default_shared_memory_dir
;
uint64_t
shared_memory_size
=
config
::
default_shared_memory_size
;
uint64_t
shared_memory_size
=
config
::
default_shared_memory_size
;
bool
read_only
=
false
;
bool
read_only
=
false
;
std
::
vector
<
signal
<
void
(
const
block_trace
&
)
>::
slot_type
>
applied_block_callbacks
;
std
::
vector
<
signal
<
void
(
const
signed_block
&
)
>::
slot_type
>
applied_irreversible_block_callbacks
;
std
::
vector
<
signal
<
void
(
const
signed_block
&
)
>::
slot_type
>
applied_irreversible_block_callbacks
;
std
::
vector
<
signal
<
void
(
const
transaction_metadata
&
,
const
packed_transaction
&
)
>::
slot_type
>
on_pending_transaction_callbacks
;
contracts
::
genesis_state_type
genesis
;
contracts
::
genesis_state_type
genesis
;
runtime_limits
limits
;
runtime_limits
limits
;
};
};
chain_controller
(
const
controller_config
&
cfg
);
explicit
chain_controller
(
const
controller_config
&
cfg
);
~
chain_controller
();
~
chain_controller
();
...
...
libraries/chain/include/eosio/chain/config.hpp
浏览文件 @
c2305ef4
...
@@ -24,8 +24,6 @@ const static uint64_t eosio_all_scope = N(eosio.all);
...
@@ -24,8 +24,6 @@ const static uint64_t eosio_all_scope = N(eosio.all);
const
static
uint64_t
active_name
=
N
(
active
);
const
static
uint64_t
active_name
=
N
(
active
);
const
static
uint64_t
owner_name
=
N
(
owner
);
const
static
uint64_t
owner_name
=
N
(
owner
);
const
static
share_type
initial_token_supply
=
asset
::
from_string
(
"1000000000.0000 EOS"
).
amount
;
const
static
int
block_interval_ms
=
500
;
const
static
int
block_interval_ms
=
500
;
const
static
int
block_interval_us
=
block_interval_ms
*
1000
;
const
static
int
block_interval_us
=
block_interval_ms
*
1000
;
const
static
uint64_t
block_timestamp_epoch
=
946684800000ll
;
// epoch is year 2000.
const
static
uint64_t
block_timestamp_epoch
=
946684800000ll
;
// epoch is year 2000.
...
...
plugins/mongo_db_plugin/mongo_db_plugin.cpp
浏览文件 @
c2305ef4
此差异已折叠。
点击以展开。
programs/eosioc/main.cpp
浏览文件 @
c2305ef4
...
@@ -978,9 +978,9 @@ int main( int argc, char** argv ) {
...
@@ -978,9 +978,9 @@ int main( int argc, char** argv ) {
trxsSubcommand
->
set_callback
([
&
]
{
trxsSubcommand
->
set_callback
([
&
]
{
fc
::
variant
trx_var
;
fc
::
variant
trx_var
;
try
{
try
{
trx_var
=
fc
::
json
::
from_string
(
trxJson
);
trx_var
=
fc
::
json
::
from_string
(
trx
s
Json
);
}
EOS_CAPTURE_AND_RETHROW
(
transaction_type_exception
,
"Fail to parse transaction JSON"
)
}
EOS_CAPTURE_AND_RETHROW
(
transaction_type_exception
,
"Fail to parse transaction JSON"
)
auto
trxs_result
=
call
(
push_txn_func
,
trx_var
);
auto
trxs_result
=
call
(
push_txn
s
_func
,
trx_var
);
std
::
cout
<<
fc
::
json
::
to_pretty_string
(
trxs_result
)
<<
std
::
endl
;
std
::
cout
<<
fc
::
json
::
to_pretty_string
(
trxs_result
)
<<
std
::
endl
;
});
});
...
...
tests/testUtils.py
浏览文件 @
c2305ef4
...
@@ -331,7 +331,7 @@ class Node(object):
...
@@ -331,7 +331,7 @@ class Node(object):
else
:
else
:
for
i
in
range
(
2
):
for
i
in
range
(
2
):
cmd
=
"%s %s"
%
(
Utils
.
MongoPath
,
self
.
mongoEndpointArgs
)
cmd
=
"%s %s"
%
(
Utils
.
MongoPath
,
self
.
mongoEndpointArgs
)
subcommand
=
'db.Transactions.findOne( {
"transaction_id": "%s"
} )'
%
(
transId
)
subcommand
=
'db.Transactions.findOne( {
$and : [ { "transaction_id": "%s" }, {"pending":false} ]
} )'
%
(
transId
)
Utils
.
Debug
and
Utils
.
Print
(
"cmd: echo '%s' | %s"
%
(
subcommand
,
cmd
))
Utils
.
Debug
and
Utils
.
Print
(
"cmd: echo '%s' | %s"
%
(
subcommand
,
cmd
))
try
:
try
:
trans
=
Node
.
runMongoCmdReturnJson
(
cmd
.
split
(),
subcommand
)
trans
=
Node
.
runMongoCmdReturnJson
(
cmd
.
split
(),
subcommand
)
...
@@ -452,6 +452,12 @@ class Node(object):
...
@@ -452,6 +452,12 @@ class Node(object):
transId
=
Node
.
getTransId
(
trans
[
1
])
transId
=
Node
.
getTransId
(
trans
[
1
])
self
.
waitForTransIdOnNode
(
transId
)
self
.
waitForTransIdOnNode
(
transId
)
expectedAmount
=
10000000000000
Utils
.
Print
(
"Verify eosio issue, Expected: %d"
%
(
expectedAmount
))
actualAmount
=
self
.
getAccountBalance
(
eosio
.
name
)
if
expectedAmount
!=
actualAmount
:
Utils
.
errorExit
(
"Issue verification failed. Excepted %d, actual: %d"
%
(
expectedAmount
,
actualAmount
))
initx
=
copy
.
copy
(
Cluster
.
initaAccount
)
initx
=
copy
.
copy
(
Cluster
.
initaAccount
)
self
.
createAccount
(
Cluster
.
initaAccount
,
eosio
,
0
)
self
.
createAccount
(
Cluster
.
initaAccount
,
eosio
,
0
)
for
i
in
range
(
2
,
21
):
for
i
in
range
(
2
,
21
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录