renaming keyos => infra-keystore

Author: bezalel

.gitignore

@@ -55,7 +55,7 @@ programs/infra-cli/config.hpp
 programs/eosio-applesedemo/eosio-applesedemo
 programs/eosio-launcher/config.hpp
 programs/eosio-launcher/eosio-launcher
-programs/keosd/keosd
+programs/infra-keystore/infra-keystore
 programs/nodeos/config.hpp
 programs/nodeos/nodeos
 

CMakeLists.txt

@@ -47,7 +47,7 @@ endif()
 
 set( CLI_CLIENT_EXECUTABLE_NAME infra-cli )
 set( NODE_EXECUTABLE_NAME yosemite )
-set( KEY_STORE_EXECUTABLE_NAME keyos )
+set( KEY_STORE_EXECUTABLE_NAME infra-keystore )
 set( LAUNCHER_EXECUTABLE_NAME yoslauncher )
 set( ABI_GENERATOR_EXECUTABLE_NAME yosabigen )
 set( BLOCKLOG_EXECUTABLE_NAME yosblocklog )

Docker/README.md

@@ -58,30 +58,30 @@ docker run --name yosemite -v /path-to-data-dir:/opt/yosemite/bin/data-dir -p 88
 curl http://127.0.0.1:8888/v1/chain/get_info
 ```
 
-## Start both yosemite and keyos containers
+## Start both yosemite and infra-keystore containers
 
 ```bash
 docker volume create --name=yosemite-data-volume
-docker volume create --name=keyos-data-volume
+docker volume create --name=infra-keystore-data-volume
 docker-compose up -d
 ```
 
-After `docker-compose up -d`, two services named `yosemited` and `keyos` will be started. The yosemited service would expose ports 8888 and 9876 to the host. The keyos service does not expose any port to the host, it is only accessible to infra-cli when running infra-cli is running inside the keyos container as described in "Execute infra-cli commands" section.
+After `docker-compose up -d`, two services named `yosemited` and `infra-keystore` will be started. The yosemited service would expose ports 8888 and 9876 to the host. The infra-keystore service does not expose any port to the host, it is only accessible to infra-cli when running infra-cli is running inside the infra-keystore container as described in "Execute infra-cli commands" section.
 
 ### Execute infra-cli commands
 
 You can run the `infra-cli` commands via a bash alias.
 
 ```bash
-alias infra-cli='docker-compose exec keyos /opt/yosemite/bin/infra-cli -u http://yosemited:8888 --wallet-url http://localhost:8900'
+alias infra-cli='docker-compose exec infra-keystore /opt/yosemite/bin/infra-cli -u http://yosemited:8888 --wallet-url http://localhost:8900'
 infra-cli get info
 infra-cli get account inita
 ```
 
-If you don't need keyos afterwards, you can stop the keyos service using
+If you don't need infra-keystore afterwards, you can stop the infra-keystore service using
 
 ```bash
-docker-compose stop keyos
+docker-compose stop infra-keystore
 ```
 
 ### Change default configuration
@@ -111,7 +111,7 @@ The data volume created by docker-compose can be deleted as follows:
 
 ```bash
 docker volume rm yosemite-data-volume
-docker volume rm keyos-data-volume
+docker volume rm infra-keystore-data-volume
 ```
 
 ### Docker Hub
@@ -135,18 +135,18 @@ services:
     volumes:
       - yosemite-data-volume:/opt/yosemite/bin/data-dir
 
-  keyos:
+  infra-keystore:
     image: yosemitex/yosemite:latest
-    command: /opt/yosemite/bin/keyos --wallet-dir /opt/yosemite/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=localhost:8900 --http-alias=keyos:8900
-    hostname: keyos
+    command: /opt/yosemite/bin/infra-keystore --wallet-dir /opt/yosemite/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=localhost:8900 --http-alias=infrakeystore:8900
+    hostname: infrakeystore
     links:
       - yosemited
     volumes:
-      - keyos-data-volume:/opt/yosemite/bin/data-dir
+      - infra-keystore-data-volume:/opt/yosemite/bin/data-dir
 
 volumes:
   yosemite-data-volume:
-  keyos-data-volume:
+  infra-keystore-data-volume:
 
 ```
 
@@ -165,7 +165,7 @@ Note: if you want to use the mongo db plugin, you have to enable it in your `dat
 ```
 # create volume
 docker volume create --name=yosemite-data-volume
-docker volume create --name=keyos-data-volume
+docker volume create --name=infra-keystore-data-volume
 # pull images and start containers
 docker-compose -f docker-compose-yosemite-latest.yaml up -d
 # get chain info

Docker/config.ini

@@ -135,15 +135,15 @@ producer-name = yosemite
 #
 #    <provider-spec> 	is a string in the form <provider-type>:<data>
 #
-#    <provider-type> 	is KEY, or KEYOS
+#    <provider-type> 	is KEY, or KEYSTORE
 #
 #    KEY:<data>      	is a string form of a valid YOSEMITE private key which maps to the provided public key
 #
-#    KEYOS:<data>    	is the URL where keosd is available and the approptiate wallet(s) are unlocked (eosio::producer_plugin)
+#    KEYSTORE:<data>    	is the URL where infra-keystore is available and the appropriate wallet(s) are unlocked (eosio::producer_plugin)
 signature-provider = YOS7qFXz5bvLYphF8S8XXTYgExnN2hXRBSMHTXs8oartApBx5upR3=KEY:YPV_5J7MF5bWVzjLczmVFMwiRjD5TVBG1o8UELy4jkaikXETbaMHZSb
 
-# Limits the maximum time (in milliseconds) that is allowd for sending blocks to a keosd provider for signing (eosio::producer_plugin)
-keyos-provider-timeout = 5
+# Limits the maximum time (in milliseconds) that is allowd for sending blocks to a keystore provider for signing (eosio::producer_plugin)
+keystore-provider-timeout = 5
 
 # Lag in number of blocks from the head block when selecting the reference block for transactions (-1 means Last Irreversible Block) (eosio::txn_test_gen_plugin)
 txn-reference-block-lag = 0

Docker/docker-compose-latest.yml

@@ -16,18 +16,18 @@ services:
       - IPC_LOCK
     stop_grace_period: 10m
 
-  keyos:
+  infra-keystore:
     image: yosemitex/yosemite:latest
-    command: /opt/yosemite/bin/keyos --wallet-dir /opt/yosemite/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=keyos:8900 --http-alias=localhost:8900
-    hostname: keyos
+    command: /opt/yosemite/bin/infra-keystore --wallet-dir /opt/yosemite/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=infrakeystore:8900 --http-alias=localhost:8900
+    hostname: infrakeystore
     links:
       - yosemited
     volumes:
-      - keyos-data-volume:/opt/yosemite/bin/data-dir
+      - infra-keystore-data-volume:/opt/yosemite/bin/data-dir
     stop_grace_period: 10m
 
 volumes:
  yosemite-data-volume:
    external: true
- keyos-data-volume:
+ infra-keystore-data-volume:
    external: true

Docker/docker-compose.yml

@@ -23,18 +23,18 @@ services:
       - IPC_LOCK
     stop_grace_period: 10m
 
-  keyos:
+  infra-keystore:
     image: yosemitex/yosemite
-    command: /opt/yosemite/bin/keyos --wallet-dir /opt/yosemite/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=keyos:8900 --http-alias=localhost:8900
-    hostname: keyos
+    command: /opt/yosemite/bin/infra-keystore --wallet-dir /opt/yosemite/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=infrakeystore:8900 --http-alias=localhost:8900
+    hostname: infrakeystore
     links:
       - yosemited
     volumes:
-      - keyos-data-volume:/opt/yosemite/bin/data-dir
+      - infra-keystore-data-volume:/opt/yosemite/bin/data-dir
     stop_grace_period: 10m
 
 volumes:
   yosemite-data-volume:
     external: true
-  keyos-data-volume:
+  infra-keystore-data-volume:
     external: true

README.md

@@ -104,13 +104,13 @@ But the names of programs and scripts are changed.
 ```
 nodeos -> yosemite
 cleos  -> infra-cli
-keosd  -> keyos (key + 'yos'emite)
+keosd  -> infra-keystore (key + 'yos'emite)
 ```
 ### Client Tool
 infra-cli : https://developers.eos.io/eosio-nodeos/docs/cleos-overview
 
 ### Key Store Daemon
-keyos : https://developers.eos.io/eosio-nodeos/docs/keosd-overview
+infra-keystore : https://developers.eos.io/eosio-nodeos/docs/keosd-overview
 
 ## Build and Install
 To build YOSEMITE, use `yosemite_build.sh`. To install and unsintall, use `yosemite_install.sh` and `yosemite_uninstall.sh`.

plugins/producer_plugin/producer_plugin.cpp

@@ -534,11 +534,11 @@ void producer_plugin::set_program_options(
           "Where:\n"
           "  <public-key>    \tis a string form of a vaild YOSEMITE public key\n\n"
           "  <provider-spec> \tis a string in the form <provider-type>:<data>\n\n"
-          "    <provider-type> \tis KEY, or KEYOS\n\n"
+          "    <provider-type> \tis KEY, or KEYSTORE\n\n"
           "      KEY:<data>      \tis a string form of a valid YOSEMITE private key which maps to the provided public key\n\n"
-          "      KEYOS:<data>    \tis the URL where keyos is available and the approptiate wallet(s) are unlocked")
-         ("keyos-provider-timeout", boost::program_options::value<int32_t>()->default_value(5),
-          "Limits the maximum time (in milliseconds) that is allowd for sending blocks to a keyos provider for signing")
+          "      KEYSTORE:<data>    \tis the URL where infra-keystore is available and the appropriate wallet(s) are unlocked")
+         ("keystore-provider-timeout", boost::program_options::value<int32_t>()->default_value(5),
+          "Limits the maximum time (in milliseconds) that is allowd for sending blocks to a infra-keystore provider for signing")
          ("greylist-account", boost::program_options::value<vector<string>>()->composing()->multitoken(),
           "account that can not access to extended CPU/NET virtual resources")
          ("produce-time-offset-us", boost::program_options::value<int32_t>()->default_value(0),
@@ -661,7 +661,7 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
 
             if (spec_type_str == "KEY") {
                my->_signature_providers[pubkey] = make_key_signature_provider(private_key_type(spec_data));
-            } else if (spec_type_str == "KEYOS") {
+            } else if (spec_type_str == "KEYSTORE") {
                my->_signature_providers[pubkey] = make_keosd_signature_provider(my, spec_data, pubkey);
             }
 
@@ -671,7 +671,7 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
       }
    }
 
-   my->_keosd_provider_timeout_us = fc::milliseconds(options.at("keyos-provider-timeout").as<int32_t>());
+   my->_keosd_provider_timeout_us = fc::milliseconds(options.at("keystore-provider-timeout").as<int32_t>());
 
    my->_produce_time_offset_us = options.at("produce-time-offset-us").as<int32_t>();
 

plugins/wallet_plugin/wallet_manager.cpp

@@ -276,7 +276,7 @@ void wallet_manager::own_and_use_wallet(const string& name, std::unique_ptr<wall
 }
 
 void wallet_manager::initialize_lock() {
-   //This is technically somewhat racy in here -- if multiple keyos are in this function at once.
+   //This is technically somewhat racy in here -- if multiple infra-keystore are in this function at once.
    //I've considered that an acceptable tradeoff to maintain cross-platform boost constructs here
    lock_path = dir / "wallet.lock";
    {
@@ -286,7 +286,7 @@ void wallet_manager::initialize_lock() {
    wallet_dir_lock = std::make_unique<boost::interprocess::file_lock>(lock_path.string().c_str());
    if(!wallet_dir_lock->try_lock()) {
       wallet_dir_lock.reset();
-      EOS_THROW(wallet_exception, "Failed to lock access to wallet directory; is another keyos running?");
+      EOS_THROW(wallet_exception, "Failed to lock access to wallet directory; is another infra-keystore running?");
    }
 }
 

plugins/wallet_plugin/yubihsm_wallet.cpp

@@ -249,7 +249,7 @@ struct yubihsm_wallet_impl {
          FC_THROW_EXCEPTION(chain::wallet_exception, "Cannot create caps mask");
 
       try {
-         if((rc = api.util_generate_key_ec(session, &new_key_id, "keyos created key", authkey_domains, &creation_caps, YH_ALGO_EC_P256)))
+         if((rc = api.util_generate_key_ec(session, &new_key_id, "infra-keystore created key", authkey_domains, &creation_caps, YH_ALGO_EC_P256)))
             FC_THROW_EXCEPTION(chain::wallet_exception, "yh_util_generate_key_ec failed: ${m}", ("m", api.strerror(rc)));
          return populate_key_map_with_keyid(new_key_id)->first;
       }