Update SDK version. (#48)

Reviewed-on: cerc-io/laconic-registry-cli#48
Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com>
Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>

.gitea/workflows/publish.yaml

@@ -0,0 +1,36 @@
+name: Publish npm package to gitea
+on:
+  release:
+    types: [published]
+jobs:
+  npm_publish:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [ 18.x ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Download yarn
+        run: |
+          curl -fsSL -o /usr/local/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.21/yarn-1.22.21.js
+          chmod +x /usr/local/bin/yarn
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn
+      - name: Run yarn build
+        run: |
+          yarn build
+      - name: Configure git.vdb.to npm registry
+        run: |
+          npm config set registry https://git.vdb.to/api/packages/cerc-io/npm/
+      - name: Authenticate to git.vdb.to registry
+        run: |
+          npm config set -- '//git.vdb.to/api/packages/cerc-io/npm/:_authToken' "${{ secrets.CICD_PUBLISH_TOKEN }}"
+      - name: npm publish
+        run: |
+          npm publish

.gitea/workflows/test.yml

@@ -0,0 +1,45 @@
+name: Tests
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - main
+      - release/**
+
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+
+jobs:
+  sdk_tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Checkout laconicd
+        uses: actions/checkout@v3
+        with:
+          path: "./laconicd/"
+          repository: cerc-io/laconicd
+          fetch-depth: 0
+          ref: main
+      - name: Environment
+        run: ls -tlh && env
+      - name: Start dockerd
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
+      - name: build registry-cli container
+        run: docker build -t cerc/laconic-registry-cli:local-test --build-arg CERC_NPM_URL=https://git.vdb.to/api/packages/cerc-io/npm/ --build-arg CERC_NPM_AUTH_TOKEN="${{ secrets.CICD_PUBLISH_TOKEN }}" .
+      - name: build containers scripts
+        working-directory: laconicd/tests/sdk_tests
+        run: ./build-laconicd-container.sh
+      - name: start laconicd container
+        working-directory: laconicd/tests/sdk_tests
+        run: docker compose up laconicd -d
+
+      - name: Run registry-cli demo commands in registry-cli container
+        run : ls -tla
+      - name: stop containers
+        working-directory: laconicd/tests/sdk_tests
+        run: docker compose down

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/laconic-registry-cli",
-  "version": "0.1.0",
+  "version": "0.1.7",
   "main": "index.js",
   "repository": "git@github.com:cerc-io/laconic-registry-cli.git",
   "author": "",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "fs-extra": "^10.1.0",
-    "@cerc-io/laconic-sdk": "0.1.6",
+    "@cerc-io/laconic-sdk": "^0.1.13",
     "js-yaml": "^3.14.1",
     "lodash": "^4.17.21",
     "lodash-clean": "^2.2.3",

src/cmds/cns-cmds/name-cmds/resolve.ts

@@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
 import assert from 'assert';
 import { Registry } from '@cerc-io/laconic-sdk';
 
-import { getConfig, getConnectionInfo,txOutput } from '../../../util';
+import { getConfig, getConnectionInfo, queryOutput } from '../../../util';
 
 export const command = 'resolve [name]';
 
@@ -20,8 +20,8 @@ export const handler = async (argv: Arguments) => {
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
-  const result = await registry.resolveNames([name]);
-  const success = `{"success":${result.code==0}}`
-  txOutput(result,success,argv.output,argv.verbose)
+  let result = await registry.resolveNames([name]);
+  result = result.filter((v: any) => v);
 
+  queryOutput(result, argv.output);
 }

src/cmds/cns-cmds/record-cmds/list.ts

@@ -12,6 +12,9 @@ export const builder = {
   'bond-id': {
     type: 'string'
   },
+  owner: {
+    type: 'string'
+  },
   type: {
     type: 'string'
   },
@@ -27,7 +30,13 @@ export const builder = {
 export const handler = async (argv: Arguments) => {
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
-  const { type, name, bondId, all } = argv;
+  const { type, name, bondId, owner, all } = argv;
+  const filters: any = {};
+
+  const filterArgs = argv._.slice(3);
+  for (let i = 0; i < filterArgs.length-1; i+=2) {
+    filters[String(filterArgs[i]).replace(/^-+/,"")] = filterArgs[i+1];
+  }
 
   assert(restEndpoint, 'Invalid CNS REST endpoint.');
   assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
@@ -35,6 +44,16 @@ export const handler = async (argv: Arguments) => {
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
-  const result = await registry.queryRecords({ bondId, type, name }, all as boolean);
-  queryOutput(result,argv.output)
+  let result = await registry.queryRecords({...filters,  type, name}, all as boolean);
+
+  // Apply ex post filters.
+  if (bondId) {
+    result = result.filter((v: any) => v.bondId === bondId);
+  }
+
+  if (owner) {
+    result = result.filter((v: any) => v.owners?.find((e: string) => e === owner));
+  }
+
+  queryOutput(result, argv.output)
 }

src/cmds/cns-cmds/record-cmds/publish.ts

@@ -30,12 +30,20 @@ export const handler = async (argv: Arguments) => {
 
   let file = null;
   if (filename) {
-    file = path.join(process.cwd(), filename as string);
+    file = filename as string;
   } else {
     file = 0; // stdin
   }
 
   const { record } = await yaml.load(fs.readFileSync(file, 'utf-8')) as any;
+
+  // Convert sub-objects (other than arrays) to a JSON automatically.
+  for (const [k, v] of Object.entries(record)) {
+    if (v && typeof v === "object" && !Array.isArray(v)) {
+      record[k] = JSON.stringify(v);
+    }
+  }
+
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
   const result = await registry.setRecord({ privateKey: userKey, record, bondId }, txKey as string, fee);

src/cmds/cns-cmds/record.ts

@@ -6,5 +6,6 @@ export const desc = 'Record operations.';
 
 exports.builder = (yargs: yargs.Argv) => {
   return yargs.commandDir('record-cmds')
+    .parserConfiguration({'unknown-options-as-args': true})
     .demandCommand()
 }

src/util/output.ts

@@ -11,6 +11,12 @@ export const queryOutput = (result: any, output: unknown) => {
     if (output=="json"){
         console.log(JSON.parse(JSON.stringify(result)));
     } else {
-        console.log(JSON.stringify(result,undefined,2));
+        console.log(JSON.stringify(result, (key, value) => {
+            try {
+                return JSON.parse(value)
+            } catch (e) {
+                return value;
+            }
+        }, 2));
     }
 }

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@cerc-io/laconic-sdk@0.1.6":
-  version "0.1.6"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Flaconic-sdk/-/0.1.6/laconic-sdk-0.1.6.tgz#2c4e678800467e7c92c3198fe332401d2ab395ce"
-  integrity sha512-o7G/QpfmNTFkmKQEuCf8mdZc8AePRMQ9T5kLqW30aHi9vzwA5rI7I6dXmPLzGYwdMWUdeeQcePOQhwD2qccryw==
+"@cerc-io/laconic-sdk@^0.1.13":
+  version "0.1.13"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Flaconic-sdk/-/0.1.13/laconic-sdk-0.1.13.tgz#a51c601f50f3c96656556b7c3f28bc544aac8aef"
+  integrity sha512-P5dCEZjpQTGupSDz1mBfGl3SK/95KKHP0Yww6zlz9xva8l66P9t6juYcF//Os2vA4PzDujCTETPr15kJHSFcTQ==
   dependencies:
     "@cosmjs/amino" "^0.28.1"
     "@cosmjs/crypto" "^0.28.1"