Fixes for ping-pub stack

Co-authored-by: zramsay <zach@bluecollarcoding.ca>
Reviewed-on: #897
Reviewed-by: ashwin <ashwin@noreply.git.vdb.to>
Co-authored-by: zramsay <zramsay@noreply.git.vdb.to>
Co-committed-by: zramsay <zramsay@noreply.git.vdb.to>

docs/cli.md

@@ -51,7 +51,7 @@ $ laconic-so build-npms --include <package-name>
 ```
 e.g.
 ```
-$ laconic-so build-npms --include laconic-sdk
+$ laconic-so build-npms --include registry-sdk
 ```
 Build the packages for a stack:
 ```

docs/gitea-with-laconicd-fixturenet.md

@@ -56,7 +56,7 @@ laconic-so --stack fixturenet-laconicd build-npms
 Navigate to the Gitea console and switch to the `cerc-io` user then find the `Packages` tab to confirm that these two npm packages have been published:
 
 - `@cerc-io/laconic-registry-cli`
-- `@cerc-io/laconic-sdk`
+- `@cerc-io/registry-sdk`
 
 ### Build and deploy fixturenet containers
 

stack_orchestrator/data/compose/docker-compose-ping-pub.yml

@@ -4,5 +4,9 @@ services:
   ping-pub:
     image: cerc/ping-pub:local
     restart: always
+    environment:
+      LACONIC_LACONICD_CHAIN_ID: ${LACONIC_LACONICD_CHAIN_ID:-laconic_9000-1}
+      LACONIC_LACONICD_RPC_URL: ${LACONIC_LACONICD_RPC_URL:-http://localhost:26657}
+      LACONIC_LACONICD_API_URL: ${LACONIC_LACONICD_API_URL:-http://localhost:1317}
     ports:
-      - "5173:5173"
+     - 5173

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

@@ -88,6 +88,10 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data/blockstore.db" ]; then
     sed -i 's/prometheus = false/prometheus = true/g' $HOME/.laconicd/config/config.toml
   fi
 
+  # Run this to allow requests from any origin
+  sed -i 's/cors_allowed_origins.*$/cors_allowed_origins = ["*"]/' $HOME/.laconicd/config/config.toml
+  sed -i 's/enabled-unsafe-cors.*$/enabled-unsafe-cors = true/' $HOME/.laconicd/config/app.toml
+
   # Allocate genesis accounts (cosmos formatted addresses)
   laconicd genesis add-genesis-account $KEY 100000000000000000000000000photon --keyring-backend $KEYRING
 

stack_orchestrator/data/container-build/cerc-builder-js/Dockerfile

@@ -68,5 +68,5 @@ ENV PATH="${PATH}:/scripts"
 COPY entrypoint.sh .
 ENTRYPOINT ["./entrypoint.sh"]
 # Placeholder CMD : generally this will be overridden at run time like :
-# docker run -it -v /home/builder/cerc/laconic-sdk:/workspace cerc/builder-js sh -c 'cd /workspace && yarn && yarn build'
+# docker run -it -v /home/builder/cerc/registry-sdk:/workspace cerc/builder-js sh -c 'cd /workspace && yarn && yarn build'
 CMD node --version

stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh

@@ -98,39 +98,67 @@ try {
 console.log(envMap);
 EOF
 
-CONFIG_LINES=$(wc -l ${NEXT_CONFIG_JS} | awk '{ print $1 }')
+grep 'withPWA' ${NEXT_CONFIG_JS} >/dev/null && HAS_WITHPWA=true || HAS_WITHPWA=false
-ENV_LINE=$(grep -n 'env:' ${NEXT_CONFIG_JS} | cut -d':' -f1)
-WEBPACK_CONF_LINE=$(egrep -n 'webpack:\s+\([^,]+,' ${NEXT_CONFIG_JS} | cut -d':' -f1)
-NEXT_SECTION_ADJUSTMENT=0
 
-if [ -n "$WEBPACK_CONF_LINE" ]; then
+if [ "$HAS_WITHPWA" == "true" ]; then
-  WEBPACK_CONF_VAR=$(egrep -n 'webpack:\s+\([^,]+,' ${NEXT_CONFIG_JS} | cut -d',' -f1 | cut -d'(' -f2)
+  if [ "$IMPORT_OR_REQUIRE" == "import" ]; then
-  head -$(( ${WEBPACK_CONF_LINE} )) ${NEXT_CONFIG_JS} > ${NEXT_CONFIG_JS}.2
+    cat > ${NEXT_CONFIG_JS}.2 <<EOF
-  cat > ${NEXT_CONFIG_JS}.3 <<EOF
+const __xPWA__ = (p) => {
-      $WEBPACK_CONF_VAR.plugins.push(new webpack.DefinePlugin(envMap));
+  const realPWA = withPWA(p);
-EOF
+  return (nextConfig) => {
-  NEXT_SECTION_LINE=$((WEBPACK_CONF_LINE))
+    const modConfig = {...nextConfig};
-elif [ -n "$ENV_LINE" ]; then
+
-  head -$(( ${ENV_LINE} - 1 )) ${NEXT_CONFIG_JS} > ${NEXT_CONFIG_JS}.2
+    modConfig.webpack = (config) => {
-  cat > ${NEXT_CONFIG_JS}.3 <<EOF
-    webpack: (config) => {
       config.plugins.push(new webpack.DefinePlugin(envMap));
-      return config;
+      return nextConfig.webpack ? nextConfig.webpack(config) : config;
-    },
+    };
+
+    return realPWA(modConfig);
+  };
+};
 EOF
-  NEXT_SECTION_ADJUSTMENT=1
+  else
-  NEXT_SECTION_LINE=$ENV_LINE
+    cat > ${NEXT_CONFIG_JS}.3 <<EOF
+const __xPWA__ = (nextConfig) => {
+  const modConfig = {...nextConfig};
+
+  modConfig.webpack = (config) => {
+    config.plugins.push(new webpack.DefinePlugin(envMap));
+    return nextConfig.webpack ? nextConfig.webpack(config) : config;
+  };
+
+  return withPWA(modConfig);
+};
+EOF
+  fi
+
+  cat ${NEXT_CONFIG_JS} | js-beautify | sed 's/withPWA(/__xPWA__(/g' > ${NEXT_CONFIG_JS}.4
 else
-  echo "WARNING: Cannot find location to insert environment variable map in ${NEXT_CONFIG_JS}" 1>&2
+    cat > ${NEXT_CONFIG_JS}.3 <<EOF
-  rm -f ${NEXT_CONFIG_JS}.*
+  const __xCfg__ = (nextConfig) => {
-  NEXT_SECTION_LINE=0
+    const modConfig = {...nextConfig};
+
+    modConfig.webpack = (config) => {
+      config.plugins.push(new webpack.DefinePlugin(envMap));
+      return nextConfig.webpack ? nextConfig.webpack(config) : config;
+    };
+
+    return modConfig;
+  };
+EOF
+  if [ "$IMPORT_OR_REQUIRE" == "import" ]; then
+    cat ${NEXT_CONFIG_JS} | js-beautify | sed 's/export\s\+default\s\+/const __orig_cfg__ = /g' > ${NEXT_CONFIG_JS}.4
+    echo "export default __xCfg__(__orig_cfg__);" > ${NEXT_CONFIG_JS}.5
+  else
+    cat ${NEXT_CONFIG_JS} | js-beautify | sed 's/module.exports\s\+=\s\+/const __orig_cfg__ = /g' > ${NEXT_CONFIG_JS}.4
+    echo "module.exports = __xCfg__(__orig_cfg__);" > ${NEXT_CONFIG_JS}.5
+  fi
 fi
 
-tail -$(( ${CONFIG_LINES} - ${NEXT_SECTION_LINE} + ${NEXT_SECTION_ADJUSTMENT} )) ${NEXT_CONFIG_JS} > ${NEXT_CONFIG_JS}.4
 
 rm -f ${NEXT_CONFIG_JS}
-for ((i=0; i <=5; i++)); do
+for ((i=0; i <= 10; i++)); do
-  if [ -f "${NEXT_CONFIG_JS}.${i}" ]; then
+  if [ -s "${NEXT_CONFIG_JS}.${i}" ]; then
     if [ $i -le 2 ] ; then
       cat ${NEXT_CONFIG_JS}.${i} >> ${NEXT_CONFIG_JS}
     else
@@ -139,6 +167,8 @@ for ((i=0; i <=5; i++)); do
   fi
 done
 rm ${NEXT_CONFIG_JS}.*
+cat ${NEXT_CONFIG_JS} | js-beautify > ${NEXT_CONFIG_JS}.pretty
+mv ${NEXT_CONFIG_JS}.pretty ${NEXT_CONFIG_JS}
 
 "${SCRIPT_DIR}/find-env.sh" "$(pwd)" > .env-list.json
 

stack_orchestrator/data/container-build/cerc-ping-pub/scripts/update-explorer-config.sh

@@ -26,6 +26,11 @@ fi
 # subvert this lunacy.
 explorer_mainnet_config_dir=/app/chains/mainnet
 explorer_testnet_config_dir=/app/chains/testnet
+
+# Create required directories
+mkdir -p $explorer_mainnet_config_dir
+mkdir -p $explorer_testnet_config_dir
+
 config_template_file=/config/chains/laconic-chaindata-template.json
 chain_config_name=laconic.json
 mainnet_config_file=${explorer_mainnet_config_dir}/${chain_config_name}

stack_orchestrator/data/npm-package-list.txt

@@ -1,4 +1,4 @@
-laconic-sdk
+registry-sdk
 laconic-registry-cli
 laconic-console
 debug

stack_orchestrator/data/repository-list.txt

@@ -7,7 +7,7 @@ github.com/cerc-io/ipld-eth-db-validator
 github.com/cerc-io/ipld-eth-beacon-indexer
 github.com/cerc-io/ipld-eth-beacon-db
 github.com/cerc-io/laconicd
-github.com/cerc-io/laconic-sdk
+github.com/cerc-io/registry-sdk
 github.com/cerc-io/laconic-registry-cli
 github.com/cerc-io/laconic-console
 github.com/cerc-io/mobymask-watcher-ts

stack_orchestrator/data/stacks/build-support/README.md

@@ -58,5 +58,5 @@ Now npm packages can be built:
 Ensure that `CERC_NPM_AUTH_TOKEN` is set with the token printed above when the package-registry stack was deployed (the actual token value will be different than shown in this example):
 ```
 $ export CERC_NPM_AUTH_TOKEN=84fe66a73698bf11edbdccd0a338236b7d1d5c45
-$ laconic-so build-npms --include laconic-sdk,laconic-registry-cli
+$ laconic-so build-npms --include registry-sdk,laconic-registry-cli
 ```

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

@@ -7,11 +7,11 @@ repos:
   - github.com/lirewine/crypto
   - github.com/lirewine/gem
   - github.com/lirewine/sdk
-  - git.vdb.to/cerc-io/laconic-sdk
+  - git.vdb.to/cerc-io/registry-sdk
   - git.vdb.to/cerc-io/laconic-registry-cli
   - git.vdb.to/cerc-io/laconic-console
 npms:
-  - laconic-sdk
+  - registry-sdk
   - laconic-registry-cli
   - debug
   - crypto

stack_orchestrator/data/stacks/fixturenet-laconicd/stack.yml

@@ -3,10 +3,10 @@ name: fixturenet-laconicd
 description: "A laconicd fixturenet"
 repos:
   - git.vdb.to/cerc-io/laconicd
-  - git.vdb.to/cerc-io/laconic-sdk
+  - git.vdb.to/cerc-io/registry-sdk
   - git.vdb.to/cerc-io/laconic-registry-cli
 npms:
-  - laconic-sdk
+  - registry-sdk
   - laconic-registry-cli
 containers:
   - cerc/laconicd

stack_orchestrator/data/stacks/mainnet-laconic/stack.yml

@@ -7,12 +7,12 @@ repos:
   - github.com/lirewine/crypto
   - github.com/lirewine/gem
   - github.com/lirewine/sdk
-  - git.vdb.to/cerc-io/laconic-sdk
+  - git.vdb.to/cerc-io/registry-sdk
   - git.vdb.to/cerc-io/laconic-registry-cli
   - git.vdb.to/cerc-io/laconic-console
   - github.com/ping-pub/explorer
 npms:
-  - laconic-sdk
+  - registry-sdk
   - laconic-registry-cli
   - debug
   - crypto

stack_orchestrator/data/stacks/osmosis/README.md

@@ -109,7 +109,7 @@ Setup a test chain:
 ```bash
 export CERC_NPM_REGISTRY_URL=https://git.vdb.to/api/packages/cerc-io/npm/
 
-laconic-so --stack fixturenet-laconic-loaded setup-repositories --include git.vdb.to/cerc-io/laconicd,git.vdb.to/cerc-io/laconic-sdk,git.vdb.to/cerc-io/laconic-registry-cli,git.vdb.to/cerc-io/laconic-console
+laconic-so --stack fixturenet-laconic-loaded setup-repositories --include git.vdb.to/cerc-io/laconicd,git.vdb.to/cerc-io/registry-sdk,git.vdb.to/cerc-io/laconic-registry-cli,git.vdb.to/cerc-io/laconic-console
 
 laconic-so --stack fixturenet-laconic-loaded build-containers
 

stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py

@@ -66,8 +66,8 @@ def process_app_deployment_request(
         fqdn = f"{requested_name}.{default_dns_suffix}"
 
     # 3. check ownership of existing dnsrecord vs this request
-    dns_crn = f"{dns_record_namespace}/{fqdn}"
+    dns_lrn = f"{dns_record_namespace}/{fqdn}"
-    dns_record = laconic.get_record(dns_crn)
+    dns_record = laconic.get_record(dns_lrn)
     if dns_record:
         matched_owner = match_owner(app_deployment_request, dns_record)
         if not matched_owner and dns_record.attributes.request:
@@ -77,9 +77,9 @@ def process_app_deployment_request(
             logger.log(f"Matched DnsRecord ownership: {matched_owner}")
         else:
             raise Exception("Unable to confirm ownership of DnsRecord %s for request %s" %
-                            (dns_crn, app_deployment_request.id))
+                            (dns_lrn, app_deployment_request.id))
     elif "preexisting" == fqdn_policy:
-        raise Exception(f"No pre-existing DnsRecord {dns_crn} could be found for request {app_deployment_request.id}.")
+        raise Exception(f"No pre-existing DnsRecord {dns_lrn} could be found for request {app_deployment_request.id}.")
 
     # 4. get build and runtime config from request
     env_filename = None
@@ -90,14 +90,14 @@ def process_app_deployment_request(
                 file.write("%s=%s\n" % (k, shlex.quote(str(v))))
 
     # 5. determine new or existing deployment
-    #   a. check for deployment crn
+    #   a. check for deployment lrn
-    app_deployment_crn = f"{deployment_record_namespace}/{fqdn}"
+    app_deployment_lrn = f"{deployment_record_namespace}/{fqdn}"
     if app_deployment_request.attributes.deployment:
-        app_deployment_crn = app_deployment_request.attributes.deployment
+        app_deployment_lrn = app_deployment_request.attributes.deployment
-    if not app_deployment_crn.startswith(deployment_record_namespace):
+    if not app_deployment_lrn.startswith(deployment_record_namespace):
         raise Exception("Deployment CRN %s is not in a supported namespace" % app_deployment_request.attributes.deployment)
 
-    deployment_record = laconic.get_record(app_deployment_crn)
+    deployment_record = laconic.get_record(app_deployment_lrn)
     deployment_dir = os.path.join(deployment_parent_dir, fqdn)
     # At present we use this to generate a unique but stable ID for the app's host container
     # TODO: implement support to derive this transparently from the already-unique deployment id
@@ -109,7 +109,7 @@ def process_app_deployment_request(
     if not os.path.exists(deployment_dir):
         if deployment_record:
             raise Exception("Deployment record %s exists, but not deployment dir %s. Please remove name." %
-                            (app_deployment_crn, deployment_dir))
+                            (app_deployment_lrn, deployment_dir))
         logger.log(f"Creating webapp deployment in: {deployment_dir} with container id: {deployment_container_tag}")
         deploy_webapp.create_deployment(ctx, deployment_dir, deployment_container_tag,
                                         f"https://{fqdn}", kube_config, image_registry, env_filename)
@@ -173,9 +173,9 @@ def process_app_deployment_request(
         laconic,
         app,
         deployment_record,
-        app_deployment_crn,
+        app_deployment_lrn,
         dns_record,
-        dns_crn,
+        dns_lrn,
         deployment_dir,
         app_deployment_request,
         logger
@@ -214,8 +214,8 @@ def dump_known_requests(filename, requests, status="SEEN"):
 @click.option("--only-update-state", help="Only update the state file, don't process any requests anything.", is_flag=True)
 @click.option("--dns-suffix", help="DNS domain to use eg, laconic.servesthe.world")
 @click.option("--fqdn-policy", help="How to handle requests with an FQDN: prohibit, allow, preexisting", default="prohibit")
-@click.option("--record-namespace-dns", help="eg, crn://laconic/dns")
+@click.option("--record-namespace-dns", help="eg, lrn://laconic/dns")
-@click.option("--record-namespace-deployments", help="eg, crn://laconic/deployments")
+@click.option("--record-namespace-deployments", help="eg, lrn://laconic/deployments")
 @click.option("--dry-run", help="Don't do anything, just report what would be done.", is_flag=True)
 @click.option("--include-tags", help="Only include requests with matching tags (comma-separated).", default="")
 @click.option("--exclude-tags", help="Exclude requests with matching tags (comma-separated).", default="")

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, "cns", "record", "list"]
+        args = ["laconic", "-c", self.config_file, "registry", "record", "list"]
 
         if all:
             args.append("--all")
@@ -112,13 +112,13 @@ class LaconicRegistryClient:
 
         return results
 
-    def is_crn(self, name_or_id: str):
+    def is_lrn(self, name_or_id: str):
         if name_or_id:
-            return str(name_or_id).startswith("crn://")
+            return str(name_or_id).startswith("lrn://")
         return False
 
     def is_id(self, name_or_id: str):
-        return not self.is_crn(name_or_id)
+        return not self.is_lrn(name_or_id)
 
     def _add_to_cache(self, records):
         if not records:
@@ -127,8 +127,8 @@ class LaconicRegistryClient:
         for p in records:
             self.cache["name_or_id"][p.id] = p
             if p.names:
-                for crn in p.names:
+                for lrn in p.names:
-                    self.cache["name_or_id"][crn] = p
+                    self.cache["name_or_id"][lrn] = p
             if p.attributes.type not in self.cache:
                 self.cache[p.attributes.type] = []
             self.cache[p.attributes.type].append(p)
@@ -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, "cns", "name", "resolve", name]
+        args = ["laconic", "-c", self.config_file, "registry", "name", "resolve", name]
 
         parsed = [AttrDict(r) for r in json.loads(logged_cmd(self.log_file, *args))]
         if parsed:
@@ -158,14 +158,14 @@ class LaconicRegistryClient:
         if name_or_id in self.cache.name_or_id:
             return self.cache.name_or_id[name_or_id]
 
-        if self.is_crn(name_or_id):
+        if self.is_lrn(name_or_id):
             return self.resolve(name_or_id)
 
         args = [
             "laconic",
             "-c",
             self.config_file,
-            "cns",
+            "registry",
             "record",
             "get",
             "--id",
@@ -203,7 +203,16 @@ 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, "cns", "record", "publish", "--filename", record_fname)
+                logged_cmd(
+                    self.log_file,
+                    "laconic", "-c",
+                    self.config_file,
+                    "registry",
+                    "record",
+                    "publish",
+                    "--filename",
+                    record_fname
+                    )
             )["id"]
             for name in names:
                 self.set_name(name, new_record_id)
@@ -212,10 +221,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, "cns", "name", "set", name, record_id)
+        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", "name", "set", name, record_id)
 
     def delete_name(self, name):
-        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "name", "delete", name)
+        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", "name", "delete", name)
 
 
 def file_hash(filename):
@@ -326,9 +335,9 @@ def deploy_to_k8s(deploy_record, deployment_dir, logger):
 def publish_deployment(laconic: LaconicRegistryClient,
                        app_record,
                        deploy_record,
-                       deployment_crn,
+                       deployment_lrn,
                        dns_record,
-                       dns_crn,
+                       dns_lrn,
                        deployment_dir,
                        app_deployment_request=None,
                        logger=None):
@@ -363,7 +372,7 @@ def publish_deployment(laconic: LaconicRegistryClient,
 
     if logger:
         logger.log("Publishing DnsRecord.")
-    dns_id = laconic.publish(new_dns_record, [dns_crn])
+    dns_id = laconic.publish(new_dns_record, [dns_lrn])
 
     new_deployment_record = {
         "record": {
@@ -384,7 +393,7 @@ def publish_deployment(laconic: LaconicRegistryClient,
 
     if logger:
         logger.log("Publishing ApplicationDeploymentRecord.")
-    deployment_id = laconic.publish(new_deployment_record, [deployment_crn])
+    deployment_id = laconic.publish(new_deployment_record, [deployment_lrn])
     return {"dns": dns_id, "deployment": deployment_id}
 
 
@@ -393,7 +402,7 @@ def hostname_for_deployment_request(app_deployment_request, laconic):
     if not dns_name:
         app = laconic.get_record(app_deployment_request.attributes.application, require=True)
         dns_name = generate_hostname_for_app(app)
-    elif dns_name.startswith("crn://"):
+    elif dns_name.startswith("lrn://"):
         record = laconic.get_record(dns_name, require=True)
         dns_name = record.attributes.name
     return dns_name

tests/smoke-test/run-smoke-test.sh

@@ -20,7 +20,7 @@ echo "Cloning repositories into: $CERC_REPO_BASE_DIR"
 rm -rf $CERC_REPO_BASE_DIR
 mkdir -p $CERC_REPO_BASE_DIR
 # Pull an example small public repo to test we can pull a repo
-$TEST_TARGET_SO setup-repositories --include cerc-io/laconic-sdk
+$TEST_TARGET_SO setup-repositories --include cerc-io/registry-sdk
 # Test pulling a stack
 $TEST_TARGET_SO --stack test setup-repositories
 # Test building the a stack container