Merge pull request #4242 from redjade/redjade-patch-1

Add R1 public key for cleos set account permission
EOSIO · Jun 26, 2018 · 74c6c27 · 74c6c27
2 parents 905e7c8 + 3dfd627
commit 74c6c27
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
@@ -548,7 +548,7 @@ authority parse_json_authority(const std::string& authorityJsonOrFile) {
 }
 
 authority parse_json_authority_or_key(const std::string& authorityJsonOrFile) {
-   if (boost::istarts_with(authorityJsonOrFile, "EOS")) {
+   if (boost::istarts_with(authorityJsonOrFile, "EOS") || boost::istarts_with(authorityJsonOrFile, "PUB_R1")) {
       try {
          return authority(public_key_type(authorityJsonOrFile));
       } EOS_RETHROW_EXCEPTIONS(public_key_type_exception, "Invalid public key: ${public_key}", ("public_key", authorityJsonOrFile))