Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
345b66ae
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,发现更多精彩内容 >>
未验证
提交
345b66ae
编写于
11月 13, 2017
作者:
K
Kevin Heifner
提交者:
GitHub
11月 13, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #680 from EOSIO/mongo-json-native-abi-677
Add nonce as native type for cleaner support. STAT-159 #677
上级
4571ea3d
88e051a6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
2 deletion
+13
-2
libraries/native_contract/native_contract_chain_initializer.cpp
...ies/native_contract/native_contract_chain_initializer.cpp
+2
-0
libraries/types/types.eos
libraries/types/types.eos
+3
-0
programs/eosc/main.cpp
programs/eosc/main.cpp
+1
-1
tests/eosd_run_mongodb_test.sh
tests/eosd_run_mongodb_test.sh
+7
-1
未找到文件。
libraries/native_contract/native_contract_chain_initializer.cpp
浏览文件 @
345b66ae
...
...
@@ -62,6 +62,7 @@ types::abi native_contract_chain_initializer::eos_contract_abi()
// eos_abi.types.push_back( types::type_def{"account_name","name"} );
eos_abi
.
types
.
push_back
(
types
::
type_def
{
"share_type"
,
"int64"
}
);
eos_abi
.
actions
.
push_back
(
types
::
action
{
name
(
"transfer"
),
"transfer"
}
);
eos_abi
.
actions
.
push_back
(
types
::
action
{
name
(
"nonce"
),
"nonce"
}
);
eos_abi
.
actions
.
push_back
(
types
::
action
{
name
(
"lock"
),
"lock"
}
);
eos_abi
.
actions
.
push_back
(
types
::
action
{
name
(
"unlock"
),
"unlock"
}
);
eos_abi
.
actions
.
push_back
(
types
::
action
{
name
(
"claim"
),
"claim"
}
);
...
...
@@ -75,6 +76,7 @@ types::abi native_contract_chain_initializer::eos_contract_abi()
eos_abi
.
actions
.
push_back
(
types
::
action
{
name
(
"deleteauth"
),
"deleteauth"
}
);
eos_abi
.
actions
.
push_back
(
types
::
action
{
name
(
"newaccount"
),
"newaccount"
}
);
eos_abi
.
structs
.
push_back
(
eosio
::
types
::
get_struct
<
eosio
::
types
::
transfer
>::
type
()
);
eos_abi
.
structs
.
push_back
(
eosio
::
types
::
get_struct
<
eosio
::
types
::
nonce
>::
type
()
);
eos_abi
.
structs
.
push_back
(
eosio
::
types
::
get_struct
<
eosio
::
types
::
lock
>::
type
()
);
eos_abi
.
structs
.
push_back
(
eosio
::
types
::
get_struct
<
eosio
::
types
::
unlock
>::
type
()
);
eos_abi
.
structs
.
push_back
(
eosio
::
types
::
get_struct
<
eosio
::
types
::
claim
>::
type
()
);
...
...
libraries/types/types.eos
浏览文件 @
345b66ae
...
...
@@ -81,6 +81,9 @@ struct transfer
amount uint64
memo string
struct nonce # used to make a transaction unique
value string
struct lock
from account_name
to account_name
...
...
programs/eosc/main.cpp
浏览文件 @
345b66ae
...
...
@@ -224,7 +224,7 @@ std::string generate_nonce_string() {
}
types
::
message
generate_nonce
()
{
return
message
(
N
(
eos
),{},
N
(
nonce
),
generate_nonce_string
()
);
return
message
(
N
(
eos
),{},
N
(
nonce
),
types
::
nonce
{
generate_nonce_string
()}
);
}
vector
<
types
::
account_permission
>
get_account_permissions
(
const
vector
<
string
>&
permissions
)
{
...
...
tests/eosd_run_mongodb_test.sh
浏览文件 @
345b66ae
...
...
@@ -222,7 +222,7 @@ if [ $count == 0 ]; then
fi
# transfer
TRANSFER_INFO="
$(
programs/eosc/eosc
--wallet-port
8899 transfer inita testera 975321
"test transfer"
)
"
TRANSFER_INFO="
$(
programs/eosc/eosc
--wallet-port
8899 transfer
-f
inita testera 975321
"test transfer"
)
"
verifyErrorCode "
eosc
transfer
"
waitForNextTransaction
...
...
@@ -461,6 +461,12 @@ while [ "$NEXT_BLOCK_NUM" -le "$HEAD_BLOCK_NUM" ]; do
NEXT_BLOCK_NUM=
$((
NEXT_BLOCK_NUM+1
))
done
ASSERT_ERRORS="
$(
grep
Assert tn_data_0/stderr.txt
)
"
count=
`
grep
-c
Assert tn_data_0/stderr.txt
`
if [
$count
!= 0 ]; then
error "
FAILURE
- Assert in tn_data_0/stderr.txt
"
fi
killAll
cleanup
echo SUCCESS!
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录