Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
ffde3055
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,发现更多精彩内容 >>
提交
ffde3055
编写于
6月 14, 2018
作者:
P
Paul Calabrese
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove eosio-key option
上级
f4af5945
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
1 addition
and
14 deletion
+1
-14
plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_manager.hpp
...let_plugin/include/eosio/wallet_plugin/wallet_manager.hpp
+1
-4
plugins/wallet_plugin/wallet_manager.cpp
plugins/wallet_plugin/wallet_manager.cpp
+0
-2
plugins/wallet_plugin/wallet_plugin.cpp
plugins/wallet_plugin/wallet_plugin.cpp
+0
-6
tests/wallet_tests.cpp
tests/wallet_tests.cpp
+0
-2
未找到文件。
plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_manager.hpp
浏览文件 @
ffde3055
...
...
@@ -39,8 +39,6 @@ public:
/// @param secs The timeout in seconds.
void
set_timeout
(
int64_t
secs
)
{
set_timeout
(
std
::
chrono
::
seconds
(
secs
));
}
void
set_eosio_key
(
const
std
::
string
&
key
)
{
eosio_key
=
key
;
}
/// Sign transaction with the private keys specified via their public keys.
/// Use chain_controller::get_required_keys to determine which keys are needed for txn.
/// @param txn the transaction to sign.
...
...
@@ -109,7 +107,7 @@ public:
/// Removes a key from the specified wallet.
/// Wallet must be opened and unlocked.
/// @param name the name of the wallet to
import into
.
/// @param name the name of the wallet to
remove the key from
.
/// @param password the plaintext password returned from ::create.
/// @param key the Public Key to remove, e.g. EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV
/// @throws fc::exception if wallet not found or locked or key is not removed.
...
...
@@ -134,7 +132,6 @@ private:
std
::
chrono
::
seconds
timeout
=
std
::
chrono
::
seconds
::
max
();
///< how long to wait before calling lock_all()
mutable
timepoint_t
timeout_time
=
timepoint_t
::
max
();
///< when to call lock_all()
boost
::
filesystem
::
path
dir
=
"."
;
std
::
string
eosio_key
;
};
}
// namespace wallet
...
...
plugins/wallet_plugin/wallet_manager.cpp
浏览文件 @
ffde3055
...
...
@@ -56,8 +56,6 @@ std::string wallet_manager::create(const std::string& name) {
wallet
->
set_password
(
password
);
wallet
->
set_wallet_filename
(
wallet_filename
.
string
());
wallet
->
unlock
(
password
);
if
(
eosio_key
.
size
())
wallet
->
import_key
(
eosio_key
);
wallet
->
lock
();
wallet
->
unlock
(
password
);
...
...
plugins/wallet_plugin/wallet_plugin.cpp
浏览文件 @
ffde3055
...
...
@@ -32,8 +32,6 @@ void wallet_plugin::set_program_options(options_description& cli, options_descri
"Timeout for unlocked wallet in seconds (default 900 (15 minutes)). "
"Wallets will automatically lock after specified number of seconds of inactivity. "
"Activity is defined as any wallet command e.g. list-wallets."
)
(
"eosio-key"
,
bpo
::
value
<
std
::
string
>
(),
"eosio key that will be imported automatically when a wallet is created."
)
;
}
...
...
@@ -52,9 +50,5 @@ void wallet_plugin::plugin_initialize(const variables_map& options) {
std
::
chrono
::
seconds
t
(
timeout
);
wallet_manager_ptr
->
set_timeout
(
t
);
}
if
(
options
.
count
(
"eosio-key"
))
{
std
::
string
eosio_wif_key
=
options
.
at
(
"eosio-key"
).
as
<
std
::
string
>
();
wallet_manager_ptr
->
set_eosio_key
(
eosio_wif_key
);
}
}
}
// namespace eosio
tests/wallet_tests.cpp
浏览文件 @
ffde3055
...
...
@@ -188,8 +188,6 @@ BOOST_AUTO_TEST_CASE(wallet_manager_test)
wm
.
set_timeout
(
chrono
::
seconds
(
15
));
wm
.
set_eosio_key
(
""
);
wm
.
create
(
"testgen"
);
BOOST_CHECK_THROW
(
wm
.
create_key
(
"testgen"
,
"xxx"
),
chain
::
wallet_exception
);
wm
.
lock
(
"testgen"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录