Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issue2689 error loading blspass #2695

Merged
merged 1 commit into from
Apr 3, 2020

Conversation

coolcottontail
Copy link
Contributor

@coolcottontail coolcottontail commented Apr 3, 2020

Issue

This is a fix for issue #2689. The reason is that the blspass read from stdin when "-blspass std" is specified and it conflict with aws setting (which also read from stdin) reading required for aws encrypted bls key.

Test

Tested both "-blspass std" and "--aws_blskey " works. Note that only one way of reading from stdin is supported. Either for blspass or for aws credentials.

@fxfactorial fxfactorial merged commit 4c15caa into harmony-one:master Apr 3, 2020
fxfactorial added a commit to john-harmony/harmony that referenced this pull request Apr 3, 2020
commit 56d19d2
Author: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date:   Fri Apr 3 13:08:15 2020 -0700

    [offchain][effective][validator][rpc] Give reason why booted from committeee, move effective stake in rpc outside metrics (harmony-one#2699)

commit d21f68d
Author: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date:   Thu Apr 2 21:48:18 2020 -0700

    [go.mod][pubsub][test] Update libp2p, use MaxMessage at p2p level protection, remove dead code  (harmony-one#2692)

    * [project] Update Dockerfile

    * [main] Whitespace

    * [p2p][go.mod] Update libp2p, pick pubsub from master as of commit now time. Limit max p2p message size

    * [go.mod] Unused package

    * [project] Remove p2pchat test app

    * [project] Remove unused test/txgen

    * [project] Remove two one off test programs, unused shell scripts

    * [p2p] Temp log out sign of receive p2p message

    * [p2p] Use 3 MB as max message size

commit 4c15caa
Author: coolcottontail <50373379+coolcottontail@users.noreply.github.com>
Date:   Thu Apr 2 21:44:04 2020 -0700

    fix issue2689 error loading blspass (harmony-one#2695)

commit 5b7d216
Author: Ganesha Upadhyaya <ganeshrvce@gmail.com>
Date:   Thu Apr 2 20:03:10 2020 -0700

    fix earned-reward per key by temporary persisting stats and writing at once (harmony-one#2693)

    sorted slice of map for deterministic write

commit 9fa85b5
Author: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date:   Thu Apr 2 14:29:57 2020 -0700

    [project] Remove dead Lottery app code, optimize node/... on what staticcheck showed (harmony-one#2688)

commit 780ecf4
Author: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date:   Thu Apr 2 14:13:31 2020 -0700

    [project] More leftover wallet support scripts, update README (harmony-one#2687)
fxfactorial added a commit to john-harmony/harmony that referenced this pull request Apr 3, 2020
Squashed commit of the following:

commit 56d19d2
Author: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date:   Fri Apr 3 13:08:15 2020 -0700

    [offchain][effective][validator][rpc] Give reason why booted from committeee, move effective stake in rpc outside metrics (harmony-one#2699)

commit d21f68d
Author: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date:   Thu Apr 2 21:48:18 2020 -0700

    [go.mod][pubsub][test] Update libp2p, use MaxMessage at p2p level protection, remove dead code  (harmony-one#2692)

    * [project] Update Dockerfile

    * [main] Whitespace

    * [p2p][go.mod] Update libp2p, pick pubsub from master as of commit now time. Limit max p2p message size

    * [go.mod] Unused package

    * [project] Remove p2pchat test app

    * [project] Remove unused test/txgen

    * [project] Remove two one off test programs, unused shell scripts

    * [p2p] Temp log out sign of receive p2p message

    * [p2p] Use 3 MB as max message size

commit 4c15caa
Author: coolcottontail <50373379+coolcottontail@users.noreply.github.com>
Date:   Thu Apr 2 21:44:04 2020 -0700

    fix issue2689 error loading blspass (harmony-one#2695)

commit 5b7d216
Author: Ganesha Upadhyaya <ganeshrvce@gmail.com>
Date:   Thu Apr 2 20:03:10 2020 -0700

    fix earned-reward per key by temporary persisting stats and writing at once (harmony-one#2693)

    sorted slice of map for deterministic write

commit 9fa85b5
Author: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date:   Thu Apr 2 14:29:57 2020 -0700

    [project] Remove dead Lottery app code, optimize node/... on what staticcheck showed (harmony-one#2688)

commit 780ecf4
Author: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date:   Thu Apr 2 14:13:31 2020 -0700

    [project] More leftover wallet support scripts, update README (harmony-one#2687)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants