renaming clyos => infra-cli

Author: bezalel

CMakeLists.txt

@@ -45,7 +45,7 @@ else()
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 endif()
 
-set( CLI_CLIENT_EXECUTABLE_NAME clyos )
+set( CLI_CLIENT_EXECUTABLE_NAME infra-cli )
 set( NODE_EXECUTABLE_NAME yosemite )
 set( KEY_STORE_EXECUTABLE_NAME keyos )
 set( LAUNCHER_EXECUTABLE_NAME yoslauncher )

Docker/README.md

@@ -66,16 +66,16 @@ docker volume create --name=keyos-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 clyos when running cleos is running inside the keyos container as described in "Execute clyos commands" section.
+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 cleos is running inside the keyos container as described in "Execute infra-cli commands" section.
 
-### Execute clyos commands
+### Execute infra-cli commands
 
-You can run the `clyos` commands via a bash alias.
+You can run the `infra-cli` commands via a bash alias.
 
 ```bash
-alias clyos='docker-compose exec keyos /opt/yosemite/bin/clyos -u http://yosemited:8888 --wallet-url http://localhost:8900'
-cleos get info
-cleos get account inita
+alias infra-cli='docker-compose exec keyos /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

Docker/clyos.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
 # Usage:
-# Go into cmd loop: sudo ./clyos.sh
-# Run single cmd:  sudo ./clyos.sh <clyos paramers>
+# Go into cmd loop: sudo ./infra-cli.sh
+# Run single cmd:  sudo ./infra-cli.sh <infra-cli paramers>
 
-PREFIX="docker-compose exec yosemited clyos"
+PREFIX="docker-compose exec yosemited infra-cli"
 if [ -z $1 ] ; then
   while :
   do
-    read -e -p "clyos " cmd
+    read -e -p "infra-cli " cmd
     history -s "$cmd"
     $PREFIX $cmd
   done

README.md

@@ -103,11 +103,11 @@ YOSEMITE is based on [EOSIO software](https://github.com/EOSIO/eos). So instruct
 But the names of programs and scripts are changed.
 ```
 nodeos -> yosemite
-cleos  -> clyos ('cl'ient + 'yos'emite)
+cleos  -> infra-cli
 keosd  -> keyos (key + 'yos'emite)
 ```
 ### Client Tool
-clyos : https://developers.eos.io/eosio-nodeos/docs/cleos-overview
+infra-cli : https://developers.eos.io/eosio-nodeos/docs/cleos-overview
 
 ### Key Store Daemon
 keyos : https://developers.eos.io/eosio-nodeos/docs/keosd-overview

contracts/yx.token/README.md

@@ -24,17 +24,17 @@ You must consider the decision points carefully because it cannot be changed onc
 ## setting fee for operations
 * Transaction fee for operations is set by [yx.txfee](../../contracts/yx.txfee/)::settxfee operation.
 ```
-clyos push action yx.txfee settxfee '{"operation":"tf.tcreate", "fee":"10000.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.tissue", "fee":"100.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.tredeem", "fee":"100.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.ttransfer", "fee":"10.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.tsetkyc", "fee":"5.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.tsetopts", "fee":"5.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.tfreezeac", "fee":"5.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.tsetuilim", "fee":"10.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.tissuebyu", "fee":"10.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.ttrustui", "fee":"10.00 DKRW"}}' -p yosemite
-clyos push action yx.txfee settxfee '{"operation":"tf.tchangeis", "fee":"10.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tcreate", "fee":"10000.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tissue", "fee":"100.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tredeem", "fee":"100.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.ttransfer", "fee":"10.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tsetkyc", "fee":"5.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tsetopts", "fee":"5.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tfreezeac", "fee":"5.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tsetuilim", "fee":"10.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tissuebyu", "fee":"10.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.ttrustui", "fee":"10.00 DKRW"}}' -p yosemite
+infra-cli push action yx.txfee settxfee '{"operation":"tf.tchangeis", "fee":"10.00 DKRW"}}' -p yosemite
 ```
 
 # Actions
@@ -45,7 +45,7 @@ Create a (non-native) token with its symbol and precision
 * The token creator naturally becomes the token depository.
 * Enabling the setting of options cannot be done any more after creation, because the owners of the token should know about what options can be set and it must not be changed after they own.
 ```
-clyos push action yx.token create '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"},"can_set_options":0}' -p d2
+infra-cli push action yx.token create '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"},"can_set_options":0}' -p d2
 ```
 
 ### parameters of create
@@ -68,7 +68,7 @@ clyos push action yx.token create '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"},
 Issue the token to an account by the token depository
 
 ```
-clyos push action yx.token issue '{"to":"user2","token":{"amount":"100000.0000 BTC","issuer":"d2"},"memo":"my memo"}' -p d2
+infra-cli push action yx.token issue '{"to":"user2","token":{"amount":"100000.0000 BTC","issuer":"d2"},"memo":"my memo"}' -p d2
 ```
 
 ### parameters of issue
@@ -103,11 +103,11 @@ Redeem(burn) token from an account by the token depository
 
 * At first, the account transfers the token to the depository.
 ```
-clyos push action yx.token transfer '{"from":"user2","to":"d2","token":{"amount":"10000.0000 BTC","issuer":"d2"},"memo":"redeem by user2"}' -p user2
+infra-cli push action yx.token transfer '{"from":"user2","to":"d2","token":{"amount":"10000.0000 BTC","issuer":"d2"},"memo":"redeem by user2"}' -p user2
 ```
 * Then the token depository checks the transfer action is irreversible and calls redeem action.
 ```
-clyos push action yx.token redeem '{"token":{"amount":"10000.0000 BTC","issuer":"d2"},"memo":"redeem for user2"}' -p d2
+infra-cli push action yx.token redeem '{"token":{"amount":"10000.0000 BTC","issuer":"d2"},"memo":"redeem for user2"}' -p d2
 ```
 
 ### parameters of redeem
@@ -121,7 +121,7 @@ clyos push action yx.token redeem '{"token":{"amount":"10000.0000 BTC","issuer":
 Transfer token
 
 ```
-clyos push action yx.token transfer '{"from":"user2","to":"user3","token":{"amount":"10000.0000 BTC","issuer":"d2"},"memo":"my memo"}' -p user2
+infra-cli push action yx.token transfer '{"from":"user2","to":"user3","token":{"amount":"10000.0000 BTC","issuer":"d2"},"memo":"my memo"}' -p user2
 ```
 
 ### parameters of transfer
@@ -138,8 +138,8 @@ Set the KYC vector for send or receive
 
 * SET_KYC_RULE flag of can_set_options must be set at token creation time.
 ```
-clyos push action yx.token setkycrule '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "type":0, "kyc":4}' -p d2
-clyos push action yx.token setkycrule '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "type":1, "kyc":4}' -p d2
+infra-cli push action yx.token setkycrule '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "type":0, "kyc":4}' -p d2
+infra-cli push action yx.token setkycrule '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "type":1, "kyc":4}' -p d2
 ```
 
 ### parameters of setkycrule
@@ -156,7 +156,7 @@ set or add token options
    * FREEZE_TOKEN_TRANSFER flag of can_set_options must be set at token creation time.
 
 ```
-clyos push action yx.token setoptions '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "options":1, "reset":1}' -p d2
+infra-cli push action yx.token setoptions '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "options":1, "reset":1}' -p d2
 ```
 
 ### parameters of setoptions
@@ -173,8 +173,8 @@ Freeze an account which has the token by its issuer
 
 * FREEZE_ACCOUNT flag of can_set_options must be set at token creation time.
 ```
-clyos push action yx.token freezeacc '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "accs":["user1","user2"], "freeze":1}' -p d2
-clyos push action yx.token freezeacc '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "accs":["user2"], "freeze":0}' -p d2
+infra-cli push action yx.token freezeacc '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "accs":["user1","user2"], "freeze":1}' -p d2
+infra-cli push action yx.token freezeacc '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}, "accs":["user2"], "freeze":0}' -p d2
 ```
 
 ### parameters of freezeacc
@@ -186,7 +186,7 @@ clyos push action yx.token freezeacc '{"ysymbol":{"tsymbol":"4,BTC","issuer":"d2
 ## setuilimit
 Set the limit of user issue amount by the token depository.
 ```
-clyos push action yx.token setuilimit '{"to":"user1", "limit":{"amount":"1000000.0000 BTC","issuer":"d2"}}' -p d2
+infra-cli push action yx.token setuilimit '{"to":"user1", "limit":{"amount":"1000000.0000 BTC","issuer":"d2"}}' -p d2
 ```
 
 ### parameters of setuilimit
@@ -201,7 +201,7 @@ Issue the token by the user with the user issue authority and the limit
 * The total 'issued' amount of the user is incresed by the amount of token.
 * The total 'issued' amount of the user cannot exceed the issue limit granted by the token issuer.
 ```
-clyos push action yx.token issuebyuser '{"user":"user1","to":"user1","token":{"amount":"100000.0000 BTC","issuer":"d2"}, "memo":"my memo"}' -p user1
+infra-cli push action yx.token issuebyuser '{"user":"user1","to":"user1","token":{"amount":"100000.0000 BTC","issuer":"d2"}, "memo":"my memo"}' -p user1
 ```
 
 ### parameters of issuebyuser
@@ -218,7 +218,7 @@ Entrust the user issue authority to another account
 
 * Agreed by the user under the terms and conditions, the delegated account can issue the amount of the token by the issue limit.
 ```
-clyos push action yx.token entrustui '{"user":"user1","to":"d2","ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}}' -p user1
+infra-cli push action yx.token entrustui '{"user":"user1","to":"d2","ysymbol":{"tsymbol":"4,BTC","issuer":"d2"}}' -p user1
 ```
 
 ### parameters of issuebyuser
@@ -231,7 +231,7 @@ clyos push action yx.token entrustui '{"user":"user1","to":"d2","ysymbol":{"tsym
 ## changeissued
 Decrease or increase the total user-issued amount of token of the user
 ```
-clyos push action yx.token changeissued '{"user":"user1", "delta":{"amount":"1000000.0000 BTC","issuer":"d2"}, "decrease":1}' -p d2
+infra-cli push action yx.token changeissued '{"user":"user1", "delta":{"amount":"1000000.0000 BTC","issuer":"d2"}, "decrease":1}' -p d2
 ```
 
 ### parameters of changeissued
@@ -247,7 +247,7 @@ clyos push action yx.token changeissued '{"user":"user1", "delta":{"amount":"100
 ## tstats
 Get the token statistics
 ```
-clyos get table yx.token 4,BTC tstats
+infra-cli get table yx.token 4,BTC tstats
 ```
 
 ### results of tstats
@@ -270,7 +270,7 @@ clyos get table yx.token 4,BTC tstats
 ## taccounts
 Get all the token balances of the user
 ```
-clyos get table yx.token user2 taccounts
+infra-cli get table yx.token user2 taccounts
 ```
 
 ### results of taccounts
@@ -297,5 +297,5 @@ clyos get table yx.token user2 taccounts
    * | the symbol(64-bit integer) | issuer (64-bit integer) |
    * Web Assembly VM follows little endian.
 ```
-clyos get table yx.token user2 taccounts --index 2 --key-type i128 -L 0x00000000000080480654455354000000 -l 1
+infra-cli get table yx.token user2 taccounts --index 2 --key-type i128 -L 0x00000000000080480654455354000000 -l 1
 ```

contracts/yx.tokenabi/yx.tokenabi.hpp

@@ -20,7 +20,7 @@ namespace yosemite { namespace contract {
     * Every account on YOSEMITE blockchain can process built-in standard token actions (settokenmeta, issue, transfer, redeem)
     * without custom smart contract code deployed to an account.
     * This system contract (yx.tokenabi) provide standard application binary interface(abi) for standard token actions.
-    * Client tools such as clyos encoding YOSEMITE blockchain transactions could refer 'yx.tokenabi' contract account
+    * Client tools such as infra-cli encoding YOSEMITE blockchain transactions could refer 'yx.tokenabi' contract account
     * to retrieve abi information for standard token actions.
     */
    class tokenabi : public eosio::contract {

contracts/yx.txfee/README.md

@@ -9,14 +9,14 @@ Environment Var.
 ---
 
 ```bash
-YOSEMITE_CLYOS=$YOSEMITE_HOME/build/programs/clyos/clyos
+INFRA_CLI=$YOSEMITE_HOME/build/programs/infra-cli/infra-cli
 YOSEMITE_CONTRACTS_DIR=$YOSEMITE_HOME/build/contracts
 ```
 
 Install Transaction Fee System Contract
 ---
 ```bash
-$YOSEMITE_CLYOS set contract yx.txfee $YOSEMITE_CONTRACTS_DIR/yx.txfee/ -p yx.txfee@active
+$INFRA_CLI set contract yx.txfee $YOSEMITE_CONTRACTS_DIR/yx.txfee/ -p yx.txfee@active
 ```
 
 YOSEMITE Transaction Fee Operation Names
@@ -30,31 +30,31 @@ Transaction fees can be updated by the active block producers
 
 ```bash
 # yx.system
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.newacc", "1000.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.regprod", "3000000.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.regsysdep", "2000000.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.regidauth", "2000000.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.newacc", "1000.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.regprod", "3000000.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.regsysdep", "2000000.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.regidauth", "2000000.00 DKRW" ]' -p yosemite@active
 
 # yx.ntoken
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.nissue", "0.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.nredeem", "1000.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.transfer", "100.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.ntransfer", "200.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.nissue", "0.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.nredeem", "1000.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.transfer", "100.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.ntransfer", "200.00 DKRW" ]' -p yosemite@active
 
 # yx.token, yx.nft
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.tcreate", "10000.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.tissue", "500.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.tredeem", "500.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.ttransfer", "100.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.tcreate", "10000.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.tissue", "500.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.tredeem", "500.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.ttransfer", "100.00 DKRW" ]' -p yosemite@active
 
 // yx.dcontract
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.dccreate", "500.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.dcaddsign", "100.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.dcsign", "300.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.dcupadd", "50.00 DKRW" ]' -p yosemite@active
-$YOSEMITE_CLYOS push action yx.txfee settxfee '[ "tf.dcremove", "0.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.dccreate", "500.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.dcaddsign", "100.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.dcsign", "300.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.dcupadd", "50.00 DKRW" ]' -p yosemite@active
+$INFRA_CLI push action yx.txfee settxfee '[ "tf.dcremove", "0.00 DKRW" ]' -p yosemite@active
 
-$YOSEMITE_CLYOS get table -l 100 yx.txfee yx.txfee txfees
+$INFRA_CLI get table -l 100 yx.txfee yx.txfee txfees
 {
   "rows": [{
       "operation": "tf.dcaddsign",
@@ -83,7 +83,7 @@ Querying the accumulated native token amount in the Transaction Fee Profit Pool
 ---
 
 ```bash
-$YOSEMITE_CLYOS get table yx.ntoken yx.txfee ntaccounts
+$INFRA_CLI get table yx.ntoken yx.txfee ntaccounts
 {
   "rows": [{
       "depository": "sysdepo1",

testnet.template

@@ -44,9 +44,9 @@ sleep 1
 
 ecmd () {
     echo ===== Start: $step ============ >> $logfile
-    echo executing: clyos --wallet-url $wdurl --url http://$bioshost:$biosport "$@" | tee -a $logfile
+    echo executing: infra-cli --wallet-url $wdurl --url http://$bioshost:$biosport "$@" | tee -a $logfile
     echo ----------------------- >> $logfile
-    programs/clyos/clyos  --wallet-url $wdurl --url http://$bioshost:$biosport "$@" >> $logfile 2>&1
+    programs/infra-cli/infra-cli  --wallet-url $wdurl --url http://$bioshost:$biosport "$@" >> $logfile 2>&1
     echo ==== End: $step ============== >> $logfile
     step=$(($step + 1))
 }
@@ -56,7 +56,7 @@ wcmd () {
 }
 
 cacmd () {
-    programs/clyos/clyos  --wallet-url $wdurl --url http://$bioshost:$biosport system newaccount yosemite "$@" >> $logfile 2>&1
+    programs/infra-cli/infra-cli  --wallet-url $wdurl --url http://$bioshost:$biosport system newaccount yosemite "$@" >> $logfile 2>&1
     ecmd system regproducer $1 $2
     ecmd push action yosemite authproducer "[\"$1\"]" -p yosemite
     ecmd push action yx.ntoken nissue "{\"to\":\"$1\", \"token\":{\"amount\":\"1000000.00 DKRW\",\"issuer\":\"sysdepo1\"}, \"memo\":\"my memo\"}" -p sysdepo1

tests/nodeos_run_test.py

@@ -50,7 +50,7 @@
 dontBootstrap=sanityTest # intent is to limit the scope of the sanity test to just verifying that nodes can be started
 
 WalletdName=Utils.EosWalletName
-ClientName="clyos"
+ClientName="infra-cli"
 timeout = .5 * 12 * 2 + 60 # time for finalization with 1 producer + 60 seconds padding
 Utils.setIrreversibleTimeout(timeout)
 

tests/p2p_tests/dawn_515/test.sh

@@ -280,9 +280,9 @@ if [ $res -ne 0 ]; then
     ret=1
 fi
 
-b5idbios=`./programs/clyos/clyos -u http://localhost:8888 get block 5 | grep "^ *\"id\""`
-b5id00=`./programs/clyos/clyos -u http://localhost:8889 get block 5 | grep "^ *\"id\""`
-b5id01=`./programs/clyos/clyos -u http://localhost:8890 get block 5 | grep "^ *\"id\""`
+b5idbios=`./programs/infra-cli/infra-cli -u http://localhost:8888 get block 5 | grep "^ *\"id\""`
+b5id00=`./programs/infra-cli/infra-cli -u http://localhost:8889 get block 5 | grep "^ *\"id\""`
+b5id01=`./programs/infra-cli/infra-cli -u http://localhost:8890 get block 5 | grep "^ *\"id\""`
 
 if [ "$b5idbios" != "$b5id00" ]; then
     echo FAILURE: nodes are not in sync