revert 5308ab1e4e (#788)

revert Blind commit to fix laconic CLI calls after rename. (#784)

`laconic cns` got renamed to `laconic registry` which breaks all the scripts and commands that use it.

Reviewed-on: #784
Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com>
Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>

Reviewed-on: #788

stack_orchestrator/data/compose/docker-compose-fixturenet-laconic2d.yml

@@ -1,30 +0,0 @@
-services:
-  laconic2d:
-    restart: unless-stopped
-    image: cerc/laconic2d:local
-    command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
-    volumes:
-      # The cosmos-sdk node's database directory:
-      - laconic2d-data:/root/.laconic2d
-      # TODO: look at folding these scripts into the container
-      - ../config/fixturenet-laconic2d/create-fixturenet.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh
-      - ../config/fixturenet-laconic2d/export-mykey.sh:/docker-entrypoint-scripts.d/export-mykey.sh
-      - ../config/fixturenet-laconic2d/export-myaddress.sh:/docker-entrypoint-scripts.d/export-myaddress.sh
-    # TODO: determine which of the ports below is really needed
-    ports:
-      - "6060"
-      - "26657"
-      - "26656"
-      - "9473"
-      - "8545"
-      - "8546"
-      - "9090"
-      - "9091"
-      - "1317"
-  cli:
-    image: cerc/laconic-registry-cli:local
-    volumes:
-      - ../config/fixturenet-laconic2d/registry-cli-config-template.yml:/registry-cli-config-template.yml
-
-volumes:
-  laconic2d-data:

stack_orchestrator/data/config/fixturenet-laconic2d/create-fixturenet.sh

@@ -1,91 +0,0 @@
-#!/bin/bash
-
-KEY="mykey"
-CHAINID="laconic_9000-1"
-MONIKER="localtestnet"
-KEYRING="test"
-LOGLEVEL="${LOGLEVEL:-info}"
-
-if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconic2d/data/blockstore.db" ]; then
-  # validate dependencies are installed
-  command -v jq > /dev/null 2>&1 || {
-    echo >&2 "jq not installed. More info: https://stedolan.github.io/jq/download/"
-    exit 1
-  }
-
-  # remove existing daemon and client
-  rm -rf $HOME/.laconic2d/*
-  rm -rf $HOME/.laconic/*
-
-  if [ -n "`which make`" ]; then
-    make install
-  fi
-
-  laconic2d config set client chain-id $CHAINID
-  laconic2d config set client keyring-backend $KEYRING
-
-  # if $KEY exists it should be deleted
-  laconic2d keys add $KEY --keyring-backend $KEYRING
-
-  # Set moniker and chain-id for Ethermint (Moniker can be anything, chain-id must be an integer)
-  laconic2d init $MONIKER --chain-id $CHAINID --default-denom photon
-
-  update_genesis() {
-    jq "$1" $HOME/.laconic2d/config/genesis.json > $HOME/.laconic2d/config/tmp_genesis.json &&
-      mv $HOME/.laconic2d/config/tmp_genesis.json $HOME/.laconic2d/config/genesis.json
-  }
-
-  if [[ "$TEST_REGISTRY_EXPIRY" == "true" ]]; then
-    echo "Setting timers for expiry tests."
-
-    update_genesis '.app_state["registry"]["params"]["record_rent_duration"]="60s"'
-    update_genesis '.app_state["registry"]["params"]["authority_grace_period"]="60s"'
-    update_genesis '.app_state["registry"]["params"]["authority_rent_duration"]="60s"'
-  fi
-
-  if [[ "$TEST_AUCTION_ENABLED" == "true" ]]; then
-    echo "Enabling auction and setting timers."
-
-    update_genesis '.app_state["registry"]["params"]["authority_auction_enabled"]=true'
-    update_genesis '.app_state["registry"]["params"]["authority_rent_duration"]="60s"'
-    update_genesis '.app_state["registry"]["params"]["authority_grace_period"]="300s"'
-    update_genesis '.app_state["registry"]["params"]["authority_auction_commits_duration"]="60s"'
-    update_genesis '.app_state["registry"]["params"]["authority_auction_reveals_duration"]="60s"'
-  fi
-
-  # increase block time (?)
-  update_genesis '.consensus["params"]["block"]["time_iota_ms"]="1000"'
-
-  # Set gas limit in genesis
-  update_genesis '.consensus["params"]["block"]["max_gas"]="10000000"'
-
-  # disable produce empty block
-  if [[ "$OSTYPE" == "darwin"* ]]; then
-      sed -i '' 's/create_empty_blocks = true/create_empty_blocks = false/g' $HOME/.laconic2d/config/config.toml
-    else
-      sed -i 's/create_empty_blocks = true/create_empty_blocks = false/g' $HOME/.laconic2d/config/config.toml
-  fi
-
-  # Allocate genesis accounts (cosmos formatted addresses)
-  laconic2d genesis add-genesis-account $KEY 100000000000000000000000000photon --keyring-backend $KEYRING
-
-  # Sign genesis transaction
-  laconic2d genesis gentx $KEY 1000000000000000000000photon --keyring-backend $KEYRING --chain-id $CHAINID
-
-  # Collect genesis tx
-  laconic2d genesis collect-gentxs
-
-  # Run this to ensure everything worked and that the genesis file is setup correctly
-  laconic2d genesis validate
-else
-  echo "Using existing database at $HOME/.laconic2d.  To replace, run '`basename $0` clean'"
-fi
-
-# Start the node (remove the --pruning=nothing flag if historical queries are not needed)
-laconic2d start \
-  --pruning=nothing \
-  --log_level $LOGLEVEL \
-  --minimum-gas-prices=0.0001photon \
-  --api.enable \
-  --rpc.laddr="tcp://0.0.0.0:26657" \
-  --gql-server --gql-playground

stack_orchestrator/data/config/fixturenet-laconic2d/export-myaddress.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-laconic2d keys show mykey | grep address | cut -d ' ' -f 3

stack_orchestrator/data/config/fixturenet-laconic2d/export-mykey.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-echo y | laconic2d keys export mykey --unarmored-hex --unsafe

stack_orchestrator/data/config/fixturenet-laconic2d/registry-cli-config-template.yml

@@ -1,9 +0,0 @@
-services:
-  registry:
-    restEndpoint: 'http://laconic2d:1317'
-    gqlEndpoint: 'http://laconic2d:9473/api'
-    userKey: REPLACE_WITH_MYKEY
-    bondId:
-    chainId: laconic_9000-1
-    gas: 350000
-    fees: 200000aphoton

stack_orchestrator/data/container-build/cerc-laconic-registry-cli/create-demo-records.sh

@@ -5,7 +5,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-registry_command="laconic registry"
+registry_command="laconic cns"
 demo_records_dir="scripts/demo-records"
 
 # Check we have funds

stack_orchestrator/data/container-build/cerc-laconic2d/build.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/laconicd
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/laconic2d:local ${build_command_args} ${CERC_REPO_BASE_DIR}/laconic2d

stack_orchestrator/data/stacks/fixturenet-laconic-loaded/README.md

@@ -49,7 +49,7 @@ $ laconic-so --stack fixturenet-laconic-loaded deploy logs
 ```
 ## 6. Test with the Registry CLI
 ```
-$ laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic registry status"
+$ laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns status"
 ```
 ## 7. View the laconic console
 Get the URL for the console web app with this command (the port number will be different for each deployment):

stack_orchestrator/data/stacks/fixturenet-laconic-loaded/stack.yml

@@ -2,16 +2,16 @@ version: "1.1"
 name: fixturenet-laconic-loaded
 description: "A full featured laconic fixturenet"
 repos:
-  - git.vdb.to/cerc-io/laconic2d
+  - git.vdb.to/cerc-io/laconicd
   - github.com/lirewine/debug
   - github.com/lirewine/crypto
   - github.com/lirewine/gem
   - github.com/lirewine/sdk
-  - git.vdb.to/cerc-io/registry-sdk
-  - git.vdb.to/cerc-io/laconic-registry-cli@laconic2
-  - git.vdb.to/cerc-io/laconic-console@laconic2
+  - git.vdb.to/cerc-io/laconic-sdk
+  - git.vdb.to/cerc-io/laconic-registry-cli
+  - git.vdb.to/cerc-io/laconic-console
 npms:
-  - registry-sdk
+  - laconic-sdk
   - laconic-registry-cli
   - debug
   - crypto
@@ -19,12 +19,12 @@ npms:
   - gem
   - laconic-console
 containers:
-  - cerc/laconic2d
+  - cerc/laconicd
   - cerc/laconic-registry-cli
   - cerc/webapp-base
   - cerc/laconic-console-host
 pods:
-  - fixturenet-laconic2d
+  - fixturenet-laconicd
   - fixturenet-laconic-console
 config:
   cli:

stack_orchestrator/data/stacks/fixturenet-laconicd/README.md

@@ -44,5 +44,5 @@ $ laconic-so --stack fixturenet-laconicd deploy logs
 ```
 ## 6. Test with the Registry CLI
 ```
-$ laconic-so --stack fixturenet-laconicd deploy exec cli "laconic registry status"
+$ laconic-so --stack fixturenet-laconicd deploy exec cli "laconic cns status"
 ```

stack_orchestrator/deploy/webapp/util.py

@@ -94,7 +94,7 @@ class LaconicRegistryClient:
         )
 
     def list_records(self, criteria={}, all=False):
-        args = ["laconic", "-c", self.config_file, "registry", "record", "list"]
+        args = ["laconic", "-c", self.config_file, "cns", "record", "list"]
 
         if all:
             args.append("--all")
@@ -140,7 +140,7 @@ class LaconicRegistryClient:
         if name in self.cache.name_or_id:
             return self.cache.name_or_id[name]
 
-        args = ["laconic", "-c", self.config_file, "registry", "name", "resolve", name]
+        args = ["laconic", "-c", self.config_file, "cns", "name", "resolve", name]
 
         parsed = [AttrDict(r) for r in json.loads(logged_cmd(self.log_file, *args))]
         if parsed:
@@ -165,7 +165,7 @@ class LaconicRegistryClient:
             "laconic",
             "-c",
             self.config_file,
-            "registry",
+            "cns",
             "record",
             "get",
             "--id",
@@ -203,8 +203,7 @@ class LaconicRegistryClient:
             print(open(record_fname, 'r').read(), file=self.log_file)
 
             new_record_id = json.loads(
-                logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry",
-                           "record", "publish", "--filename", record_fname)
+                logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "record", "publish", "--filename", record_fname)
             )["id"]
             for name in names:
                 self.set_name(name, new_record_id)
@@ -213,10 +212,10 @@ class LaconicRegistryClient:
             logged_cmd(self.log_file, "rm", "-rf", tmpdir)
 
     def set_name(self, name, record_id):
-        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", "name", "set", name, record_id)
+        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "name", "set", name, record_id)
 
     def delete_name(self, name):
-        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", "name", "delete", name)
+        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "name", "delete", name)
 
 
 def file_hash(filename):