Update records publishing script to resolve watcher and image records

The current code throws an exception if no address is specified.  It is supposed to return the current account info.

Reviewed-on: cerc-io/laconic-registry-cli#77
Reviewed-by: David Boreham <dboreham@noreply.git.vdb.to>
Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com>
Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>

.gitea/workflows/test.yml

@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: "./laconicd/"
-          repository: cerc-io/laconic2d # TODO: Update to laconicd after renaming repo
+          repository: cerc-io/laconicd
           fetch-depth: 0
           ref: main
 

README.md

@@ -54,7 +54,15 @@ Registering records in registry requires an account. To get account private key
 laconicd keys export alice --keyring-backend test  --unarmored-hex --unsafe
 ```
 
-In `config.yml` file assign the account private key to `userKey`.
+In `config.yml` file assign the account private key to `userKey`:
+
+```yml
+services:
+  registry:
+    ..
+    userKey: "<user-key>"
+    ..
+```
 
 ## Gas and Fees
 
@@ -68,7 +76,7 @@ The `gas` and `fees` can be set to some default values in the config, and can be
 Example:
 
 ```bash
-$ laconic registry bond create --type photon --quantity 1000000000 --gas 200000 --fees 200000photon
+$ laconic registry bond create --type alnt --quantity 100000000000 --gas 200000 --fees 200000alnt
 ```
 
 ## Operations
@@ -121,7 +129,7 @@ $ laconic registry account get --address laconic15za32wly5exgcrt2zfr8php4ya49n5y
     "sequence": "37",
     "balance": [
       {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "89998999999999991999799300"
       }
     ]
@@ -132,33 +140,62 @@ $ laconic registry account get --address laconic15za32wly5exgcrt2zfr8php4ya49n5y
 Send tokens:
 
 ```bash
-$ laconic registry tokens send --address laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k --type photon --quantity 1000000000
-[
-  {
-    "address": "laconic1pmuxrcnuhhf8qdllzuf2ctj2tnwwcg6yswqnyd",
-    "pubKey": "A68/q7/xazFzNj+rrvE07ALxkMgqw1ugL35VECkWAYvt",
-    "number": "0",
-    "sequence": "16",
-    "balance": [
-      {
-        "type": "photon",
-        "quantity": "99998999999999997973999700"
-      }
-    ]
+$ laconic registry tokens send --address laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k --type alnt --quantity 1000000000
+{
+  "tx": {
+    "hash": "977152CBE474613E1BBAFEF286F12134829FAF3C9E7C8349149DE3E687B816FC",
+    "height": 343369,
+    "index": 0,
+    "code": 0,
+    "log": "",
+    "sender": "laconic1pmuxrcnuhhf8qdllzuf2ctj2tnwwcg6yswqnyd",
+    "recipient": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
+    "amount": "1000000000alnt"
   },
-  {
-    "address": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
-    "pubKey": null,
-    "number": "12",
-    "sequence": "0",
-    "balance": [
-      {
-        "type": "photon",
-        "quantity": "1000000000"
-      }
-    ]
-  }
-]
+  "accounts": [
+    {
+      "address": "laconic1pmuxrcnuhhf8qdllzuf2ctj2tnwwcg6yswqnyd",
+      "pubKey": "A68/q7/xazFzNj+rrvE07ALxkMgqw1ugL35VECkWAYvt",
+      "number": "0",
+      "sequence": "16",
+      "balance": [
+        {
+          "type": "alnt",
+          "quantity": "99998999999999997973999700"
+        }
+      ]
+    },
+    {
+      "address": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
+      "pubKey": null,
+      "number": "12",
+      "sequence": "0",
+      "balance": [
+        {
+          "type": "alnt",
+          "quantity": "1000000000"
+        }
+      ]
+    }
+  ]
+}
+```
+
+Get token TX details:
+
+```bash
+$ laconic registry tokens gettx --hash 977152CBE474613E1BBAFEF286F12134829FAF3C9E7C8349149DE3E687B816FC
+{
+  "hash": "977152CBE474613E1BBAFEF286F12134829FAF3C9E7C8349149DE3E687B816FC",
+  "height": 343369,
+  "index": 0,
+  "code": 0,
+  "log": "",
+  "sender": "laconic1pmuxrcnuhhf8qdllzuf2ctj2tnwwcg6yswqnyd",
+  "recipient": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
+  "amount": "1000000000alnt",
+  "raw": "0A91010A8E010A1C2F636F736D6F732E62616E6B2E763162657461312E4D736753656E64126E0A2E6C61636F6E696331347763303777613372377270707275343367396A786B7A68716E686D76666D34646765793673122E6C61636F6E6963317971706337637966657470676D71746B6B30756B657675676561617539703063776D6A6C73751A0C0A04616C6E7412043130303012680A500A460A1F2F636F736D6F732E63727970746F2E736563703235366B312E5075624B657912230A2102F3A1D077638F9FD828C4CF126FE82E0BE98388083F5BC1E1DD4D84132AEBFF8112040A020801185A12140A0E0A04616C6E7412063430303030301080B5181A4088DF7BA4B63EA68E185AB2887C9EC29EBC4158874BC037816B8494AD36D3B2433B5223CECC336D4624BB7FEF4DBB4A8B5F4707ACD8E55443312009E9473DF821"
+}
 ```
 
 Create record (generic):
@@ -177,7 +214,7 @@ record:
 Publish record (see below for commands to create/query bonds):
 
 ```bash
-$ laconic registry record publish --filename watcher.yml --bond-id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --gas 250000
+$ laconic registry record publish --filename watcher.yml --bond-id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --gas 250000 --fees 250000alnt
 
 { id: 'bafyreic3auqajvgszh3vfjsouew2rsctswukc346dmlf273ln4g6iyyhba' }
 ```
@@ -255,15 +292,15 @@ $ laconic registry authority whois laconic
       "commitsEndTime": "2022-04-26T11:44:45.679728594",
       "revealsEndTime": "2022-04-26T11:45:45.679728594",
       "commitFee": {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "1000000"
       },
       "revealFee": {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "1000000"
       },
       "minimumBid": {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "5000000"
       },
       "winnerAddress": "",
@@ -294,15 +331,15 @@ $ laconic registry auction get 0294fb2e3659c347b53a6faf4bef041fd934f0f3ab13df6d2
     "commitsEndTime": "2022-04-26T11:44:45.679728594",
     "revealsEndTime": "2022-04-26T11:45:45.679728594",
     "commitFee": {
-      "type": "photon",
+      "type": "alnt",
       "quantity": "1000000"
     },
     "revealFee": {
-      "type": "photon",
+      "type": "alnt",
       "quantity": "1000000"
     },
     "minimumBid": {
-      "type": "photon",
+      "type": "alnt",
       "quantity": "5000000"
     },
     "winnerAddress": "",
@@ -322,7 +359,7 @@ $ laconic registry auction get 0294fb2e3659c347b53a6faf4bef041fd934f0f3ab13df6d2
 Commit an auction bid:
 
 ```bash
-$ laconic registry auction bid commit 0294fb2e3659c347b53a6faf4bef041fd934f0f3ab13df6d2468d5d63abacd48 25000000 photon
+$ laconic registry auction bid commit 0294fb2e3659c347b53a6faf4bef041fd934f0f3ab13df6d2468d5d63abacd48 25000000 alnt
 
 Reveal file: ./out/bafyreiay2rccax64yn4ljhvzvm3jkbebvzheyucuma5jlbpzpzd5i5gjuy.json
 ```
@@ -351,6 +388,18 @@ Create sub-authority (custom owner for sub-authority):
 $ laconic registry authority reserve kube.laconic --owner laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k
 ```
 
+Get all the authorities:
+
+```bash
+$ laconic registry authority list
+```
+
+Get all the authorities by owner:
+
+```bash
+$ laconic registry authority list --owner laconic1zayjut6pd4xy9dguut56v55hktzmeq6r777hmd
+```
+
 Set name:
 
 ```bash
@@ -426,7 +475,7 @@ $ laconic registry name resolve lrn://laconic/watcher/erc20
 Create bond:
 
 ```bash
-$ laconic registry bond create --type photon --quantity 1000
+$ laconic registry bond create --type alnt --quantity 1000
 ```
 
 List bonds:
@@ -439,7 +488,7 @@ $ laconic registry bond list
     "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
     "balance": [
       {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "698000000"
       }
     ]
@@ -449,7 +498,7 @@ $ laconic registry bond list
     "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
     "balance": [
       {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "1000"
       }
     ]
@@ -467,7 +516,7 @@ $ laconic registry bond get --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa1953
     "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
     "balance": [
       {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "691000000"
       }
     ]
@@ -485,7 +534,7 @@ $ laconic registry bond list --owner laconic15za32wly5exgcrt2zfr8php4ya49n5y7mas
     "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
     "balance": [
       {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "684000000"
       }
     ]
@@ -495,7 +544,7 @@ $ laconic registry bond list --owner laconic15za32wly5exgcrt2zfr8php4ya49n5y7mas
     "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k",
     "balance": [
       {
-        "type": "photon",
+        "type": "alnt",
         "quantity": "1000"
       }
     ]
@@ -506,13 +555,13 @@ $ laconic registry bond list --owner laconic15za32wly5exgcrt2zfr8php4ya49n5y7mas
 Refill bond:
 
 ```bash
-$ laconic registry bond refill --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --type photon --quantity 1000
+$ laconic registry bond refill --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --type alnt --quantity 1000
 ```
 
 Withdraw funds from bond:
 
 ```bash
-$ laconic registry bond withdraw --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --type photon --quantity 500
+$ laconic registry bond withdraw --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --type alnt --quantity 500
 ```
 
 Cancel bond:

config.example.yml

@@ -6,4 +6,4 @@ services:
     bondId:
     chainId: laconic_9000-1
     gas: 200000
-    fees: 200000photon
+    fees: 200000alnt

demo/README.md

@@ -34,7 +34,7 @@
   # userKey: <ALICE_PRIVATE_KEY>
 
   # Create a bond
-  laconic --config config.yml registry bond create --type photon --quantity 100000000000
+  laconic --config config.yml registry bond create --type alnt --quantity 100000000000
 
   # Get the bond id
   laconic --config config.yml registry bond list | jq -r '.[].id'
@@ -57,12 +57,12 @@
 
 ### Example
 
-* Query for `ajna-watcher` deployment(s):
+* Query for `azimuth-watcher` deployment(s):
 
-  * Find the `WatcherRecord` for `ajna-watcher`:
+  * Find the `WatcherRecord` for `azimuth-watcher`:
 
     ```bash
-    WATCHER_RECORD_ID=$(laconic registry record list --all --type WatcherRecord --name ajna-watcher | jq -r '.[].id')
+    WATCHER_RECORD_ID=$(laconic registry record list --all --type WatcherRecord --name azimuth-watcher | jq -r '.[].id')
     ```
 
   * Find corresponding deployment(s):
@@ -74,7 +74,7 @@
     laconic registry record list --all --type WatcherDeploymentRecord watcher $WATCHER_RECORD_ID | jq -r '.[].attributes.url'
 
     # Expected output:
-    https://ajna-watcher-endpoint.example.com
+    https://azimuth-watcher-endpoint.example.com
     ```
 
 * Query for `sushiswap-v3-subgraph` deployment(s):

demo/scripts/publish-records.ts

@@ -1,17 +1,28 @@
 import yargs from 'yargs';
 import fs from 'fs';
 import path from 'path';
+import yaml from 'js-yaml';
 import assert from 'assert';
 import { hideBin } from 'yargs/helpers';
 
+import { StdFee } from '@cosmjs/stargate';
 import { Registry } from '@cerc-io/registry-sdk';
 
 import { getConfig, getGasAndFees, getConnectionInfo, txOutput } from '../../src/util';
 
+enum RecordType {
+  RepositoryRecord = 'RepositoryRecord',
+  ServiceRecord = 'ServiceRecord',
+  StackRecord = 'StackRecord',
+  SubgraphRecord = 'SubgraphRecord',
+  WatcherRecord = 'WatcherRecord',
+  DockerImageRecord = 'DockerImageRecord'
+}
+
 const recordTypeToRecordField = new Map<string, string>([
-  ['WatcherRecord', 'watcher'],
-  ['SubgraphRecord', 'subgraph'],
-  ['ServiceRecord', 'service']
+  [RecordType.WatcherRecord, 'watcher'],
+  [RecordType.SubgraphRecord, 'subgraph'],
+  [RecordType.ServiceRecord, 'service']
 ]);
 
 let registry: Registry;
@@ -45,10 +56,8 @@ async function main () {
 async function processDir (directoryPath: string): Promise<void> {
   const files = fs.readdirSync(directoryPath);
 
-  // Check if any JSON record file exists in the directory
-  if (files.some(file => file.endsWith('.json'))) {
-    await publishRecordsFromDir(directoryPath);
-
+  const dirHasRecords = await publishRecordsFromDir(directoryPath);
+  if (dirHasRecords) {
     // Skip further recursion in the current dir
     return;
   }
@@ -64,24 +73,28 @@ async function processDir (directoryPath: string): Promise<void> {
   }
 }
 
-async function publishRecordsFromDir (recordsDir: string): Promise<void> {
+async function publishRecordsFromDir (recordsDir: string): Promise<boolean> {
   // List record files
   const files = fs.readdirSync(recordsDir);
-  const jsonFiles = files.filter(file => path.extname(file).toLowerCase() === '.json');
+  const recordFiles = files.filter(file => ['.json', '.yaml', '.yml'].includes(path.extname(file).toLowerCase()));
+
+  if (recordFiles.length === 0) {
+    return false;
+  }
 
   // Read record from each JSON file
   console.log('**************************************');
   console.log(`Publishing records from ${recordsDir}`);
 
   let recordType;
-  for (let i = 0; i < jsonFiles.length; i++) {
-    const file = jsonFiles[i];
+  for (let i = 0; i < recordFiles.length; i++) {
+    const file = recordFiles[i];
 
     const filePath = path.resolve(recordsDir, file);
-    const record = readRecord(filePath);
+    const record = await readRecord(filePath);
 
     // Publish record
-    const result = await registry.setRecord({ privateKey: userKey, record, bondId }, userKey, fee);
+    const result = await publishRecord(userKey, bondId, fee, record);
 
     console.log(`Published record ${file}`);
     txOutput(result, JSON.stringify(result, undefined, 2), '', false);
@@ -91,8 +104,8 @@ async function publishRecordsFromDir (recordsDir: string): Promise<void> {
 
   // Check if deployment record files exist
   const deploymentRecordsDir = path.resolve(recordsDir, 'deployments');
-  if (!fs.statSync(deploymentRecordsDir).isDirectory()) {
-    return;
+  if (!fs.existsSync(deploymentRecordsDir) || !fs.statSync(deploymentRecordsDir).isDirectory()) {
+    return true;
   }
   console.log('--------------------------------------');
   console.log(`Publishing deployment records from ${deploymentRecordsDir}`);
@@ -105,7 +118,7 @@ async function publishRecordsFromDir (recordsDir: string): Promise<void> {
     const file = deploymentJsonFiles[i];
 
     const filePath = path.resolve(deploymentRecordsDir, file);
-    const deploymentRecord = readRecord(filePath);
+    const deploymentRecord = await readRecord(filePath);
 
     // Find record using name and given type
     const recordName = deploymentRecord.name;
@@ -128,13 +141,30 @@ async function publishRecordsFromDir (recordsDir: string): Promise<void> {
     console.log(`Published record ${file}`);
     txOutput(deploymentResult, JSON.stringify(deploymentResult, undefined, 2), '', false);
   }
+
+  return true;
 }
 
-function readRecord (filePath: string): any {
+async function readRecord (filePath: string): Promise<any> {
   let record;
   try {
+    const fileExt = path.extname(filePath).toLowerCase();
     const data = fs.readFileSync(filePath, 'utf8');
-    record = JSON.parse(data);
+
+    if (fileExt === '.json') {
+      // JSON file
+      record = JSON.parse(data);
+    } else {
+      // YAML file
+      ({ record } = await yaml.load(data) 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);
+        }
+      }
+    }
   } catch (err) {
     console.error(`Error reading file ${filePath}:`, err);
   }
@@ -142,6 +172,66 @@ function readRecord (filePath: string): any {
   return record;
 }
 
+async function publishRecord (userKey: string, bondId: string, fee: StdFee, record: any): Promise<any> {
+  // Replace repository URL with record id (if type is one of RecordType)
+  if (record.repository && Object.values(RecordType).includes(record.type)) {
+    const repoUrl = record.repository;
+
+    const queryResult = await registry.queryRecords({ type: RecordType.RepositoryRecord, url: repoUrl }, true);
+    if (queryResult.length === 0) {
+      throw new Error(`Record not found, type: ${RecordType.RepositoryRecord}, url: ${repoUrl}`);
+    }
+
+    // Assume the first query result
+    const repoRecordId = queryResult[0].id;
+
+    // Replace repository URL with the repo record id
+    record.repository = repoRecordId;
+  }
+
+  // For stack records, check for attributes
+  if (record.type === RecordType.StackRecord) {
+    const watcherName = record.meta?.watcher;
+    const dockerImages = record.docker_images;
+
+    // If .docker_images present, check for image records
+    if (Array.isArray(dockerImages) && dockerImages.length > 0) {
+      const dockerImageRecordsIdPromises = dockerImages.map(async (dockerImage) => {
+        // Find the required docker image record
+        const queryResult = await registry.queryRecords({ type: RecordType.DockerImageRecord, name: dockerImage }, true);
+        if (queryResult.length === 0) {
+          throw new Error(`Record not found, type: ${RecordType.DockerImageRecord}, name: ${dockerImage}`);
+        }
+
+        // Assume the first query result
+        const dockerImageRecordId = queryResult[0].id;
+
+        // Replace watcher name with the watcher record id
+        return dockerImageRecordId;
+      });
+
+      record.docker_images = await Promise.all(dockerImageRecordsIdPromises);
+    }
+
+    // If .meta.watcher present, check for watcher record
+    if (watcherName) {
+      // Find the required watcher record
+      const queryResult = await registry.queryRecords({ type: RecordType.WatcherRecord, name: watcherName }, true);
+      if (queryResult.length === 0) {
+        throw new Error(`Record not found, type: ${RecordType.WatcherRecord}, name: ${watcherName}`);
+      }
+
+      // Assume the first query result
+      const watcherRecordId = queryResult[0].id;
+
+      // Replace watcher name with the watcher record id
+      record.meta.watcher = watcherRecordId;
+    }
+  }
+
+  return registry.setRecord({ privateKey: userKey, record, bondId }, userKey, fee);
+}
+
 function getArgs (): any {
   return yargs(hideBin(process.argv)).parserConfiguration({
     'parse-numbers': false

docker-compose.yml

@@ -2,7 +2,7 @@ services:
   laconicd:
     restart: unless-stopped
     image: cerc/laconicd:local
-    command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
+    command: ["bash", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
     environment:
       - TEST_AUCTION_ENABLED
       - TEST_REGISTRY_EXPIRY
@@ -10,7 +10,7 @@ services:
     volumes:
       - ./laconicd/scripts/init.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh
     healthcheck:
-      test: ["CMD", "curl", "-v", "http://127.0.0.1:6060"]
+      test: ["CMD", "curl", "-v", "http://127.0.0.1", "6060"]
       interval: 1s
       timeout: 5s
       retries: 30

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/laconic-registry-cli",
-  "version": "0.2.0",
+  "version": "0.2.6",
   "main": "index.js",
   "repository": "git@github.com:cerc-io/laconic-registry-cli.git",
   "author": "",
@@ -29,7 +29,7 @@
     "typescript": "^4.6.3"
   },
   "dependencies": {
-    "@cerc-io/registry-sdk": "^0.2.1",
+    "@cerc-io/registry-sdk": "^0.2.6",
     "fs-extra": "^10.1.0",
     "js-yaml": "^3.14.1",
     "lodash": "^4.17.21",

src/cmds/registry-cmds/account-cmds/get.ts

@@ -18,7 +18,9 @@ export const handler = async (argv: Arguments) => {
   assert(chainId, 'Invalid registry Chain ID.');
 
   if (!address && privateKey) {
-    address = new Account(Buffer.from(privateKey, 'hex')).address;
+    const account = new Account(Buffer.from(privateKey, 'hex'));
+    await account.init();
+    address = account.address;
   }
 
   const registry = new Registry(gqlEndpoint, rpcEndpoint, chainId);

src/cmds/registry-cmds/authority-cmds/list.ts

@@ -0,0 +1,29 @@
+import { Arguments } from 'yargs';
+import assert from 'assert';
+
+import { Registry } from '@cerc-io/registry-sdk';
+
+import { getConfig, getConnectionInfo, queryOutput } from '../../../util';
+
+export const command = 'list';
+
+export const desc = 'List authorities (optionally by owner).';
+
+export const builder = {
+  owner: {
+    type: 'string'
+  }
+};
+
+export const handler = async (argv: Arguments) => {
+  const { services: { registry: registryConfig } } = getConfig(argv.config as string);
+  const { rpcEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, registryConfig);
+  assert(rpcEndpoint, 'Invalid registry RPC endpoint.');
+  assert(gqlEndpoint, 'Invalid registry GQL endpoint.');
+  assert(chainId, 'Invalid registry Chain ID.');
+
+  const registry = new Registry(gqlEndpoint, rpcEndpoint, chainId);
+  const result = await registry.getAuthorities(argv.owner as string);
+
+  queryOutput(result, argv.output);
+};

src/cmds/registry-cmds/tokens-cmds/gettx.ts

@@ -0,0 +1,54 @@
+import { Arguments } from 'yargs';
+import assert from 'assert';
+import { Account, Registry } from '@cerc-io/registry-sdk';
+
+import { getConfig, getConnectionInfo, queryOutput } from '../../../util';
+import { IndexedTx } from '@cosmjs/stargate/build/stargateclient';
+
+export const command = 'gettx';
+
+export const desc = 'Get token transfer tx info.';
+
+export const builder = {
+  hash: {
+    type: 'string'
+  }
+};
+
+export const handler = async (argv: Arguments) => {
+  const hash = argv.hash as string;
+
+  assert(hash, 'Invalid tx hash.');
+
+  const { services: { registry: registryConfig } } = getConfig(argv.config as string);
+  const { rpcEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, registryConfig);
+  assert(rpcEndpoint, 'Invalid registry RPC endpoint.');
+  assert(gqlEndpoint, 'Invalid registry GQL endpoint.');
+  assert(privateKey, 'Invalid Transaction Key.');
+  assert(chainId, 'Invalid registry Chain ID.');
+
+  const account = new Account(Buffer.from(privateKey, 'hex'));
+  await account.init();
+
+  const registry = new Registry(gqlEndpoint, rpcEndpoint, chainId);
+  const laconicClient = await registry.getLaconicClient(account);
+
+  const txResponse: IndexedTx | null = await laconicClient.getTx(hash);
+  if (txResponse) {
+    const transfer = txResponse.events.find(e => e.type === 'transfer' ? e.attributes.find(a => a.key === 'msg_index') : null);
+    const output = {
+      hash: txResponse.hash,
+      height: txResponse.height,
+      index: txResponse.txIndex,
+      code: txResponse.code,
+      log: txResponse.rawLog,
+      sender: transfer?.attributes.find(a => a.key === 'sender')?.value,
+      recipient: transfer?.attributes.find(a => a.key === 'recipient')?.value,
+      amount: transfer?.attributes.find(a => a.key === 'amount')?.value,
+      raw: Buffer.from(txResponse.tx).toString('hex').toUpperCase()
+    };
+    queryOutput(output, argv.output);
+  } else {
+    queryOutput(null, argv.output);
+  }
+};

src/cmds/registry-cmds/tokens-cmds/send.ts

@@ -3,6 +3,7 @@ import assert from 'assert';
 import { Account, Registry } from '@cerc-io/registry-sdk';
 
 import { getConfig, getConnectionInfo, getGasAndFees, queryOutput } from '../../../util';
+import { DeliverTxResponse } from '@cosmjs/stargate';
 
 export const command = 'send';
 
@@ -38,8 +39,38 @@ export const handler = async (argv: Arguments) => {
   const fromAddress = account.address;
 
   const registry = new Registry(gqlEndpoint, rpcEndpoint, chainId);
+  const laconicClient = await registry.getLaconicClient(account);
   const fee = getGasAndFees(argv, registryConfig);
-  await registry.sendCoins({ denom, amount, destinationAddress }, privateKey, fee);
-  const result = await registry.getAccounts([fromAddress, destinationAddress]);
-  queryOutput(result, argv.output);
+
+  const txResponse: DeliverTxResponse = await laconicClient.sendTokens(
+    account.address,
+    destinationAddress,
+    [
+      {
+        denom,
+        amount
+      }
+    ],
+    fee);
+
+  assert(txResponse.code === 0, `TX Failed - Hash: ${txResponse.transactionHash}, Code: ${txResponse.code}, Message: ${txResponse.rawLog}`);
+
+  const transfer = txResponse.events.find(e => e.type === 'transfer' ? e.attributes.find(a => a.key === 'msg_index') : null);
+  const accountResponse = await registry.getAccounts([fromAddress, destinationAddress]);
+
+  const output = {
+    tx: {
+      hash: txResponse.transactionHash,
+      height: txResponse.height,
+      index: txResponse.txIndex,
+      code: txResponse.code,
+      log: txResponse.rawLog,
+      sender: transfer?.attributes.find(a => a.key === 'sender')?.value,
+      recipient: transfer?.attributes.find(a => a.key === 'recipient')?.value,
+      amount: transfer?.attributes.find(a => a.key === 'amount')?.value
+    },
+    accounts: accountResponse
+  };
+
+  queryOutput(output, argv.output);
 };

src/util/common.ts

@@ -6,11 +6,16 @@ export const getConnectionInfo = (argv: Arguments, config: any) => {
 
   const result = {
     ...config,
+    userKey: stripHexPrefix(config.userKey),
     ...clean({ server, userKey, bondId, txKey, chainId }),
-    privateKey: txKey || userKey || config.userKey,
+    privateKey: stripHexPrefix(txKey || userKey || config.userKey),
     gas: String(gas || config.gas),
     fees: String(fees || config.fees)
   };
 
   return result;
 };
+
+function stripHexPrefix (hex: string): string {
+  return hex && hex.startsWith('0x') ? hex.slice(2) : hex;
+}

test/cli.test.ts

@@ -52,7 +52,7 @@ describe('Test laconic CLI commands', () => {
     const testAccount = process.env.TEST_ACCOUNT;
     assert(testAccount, 'TEST_ACCOUNT not set in env');
     const testAccount2 = 'laconic1pmuxrcnuhhf8qdllzuf2ctj2tnwwcg6yswqnyd';
-    const initialAccountBalance = Number('100000000000000000000000000');
+    const initialAccountBalance = Number('1000000000000000000000000000000');
 
     const testAuthorityName = 'laconic';
     const testRecordFilePath = 'test/data/watcher-record.yml';
@@ -67,12 +67,12 @@ describe('Test laconic CLI commands', () => {
       expect(outputObj).toHaveProperty('node');
       expect(outputObj).toHaveProperty('node.network', CHAIN_ID);
       expect(outputObj).toHaveProperty('sync');
-      expect(Number(outputObj.sync.latest_block_height)).toBeGreaterThan(0);
+      expect(Number(outputObj.sync.latestBlockHeight)).toBeGreaterThan(0);
       expect(outputObj).toHaveProperty('validator');
       expect(outputObj).toHaveProperty('validators');
-      expect(outputObj).toHaveProperty('num_peers');
+      expect(outputObj).toHaveProperty('numPeers');
       expect(outputObj).toHaveProperty('peers');
-      expect(outputObj).toHaveProperty('disk_usage');
+      expect(outputObj).toHaveProperty('diskUsage');
     });
 
     describe('Bond operations', () => {
@@ -217,19 +217,40 @@ describe('Test laconic CLI commands', () => {
           getAccountObj({ address: testAccount2, balance: sendAmount })
         ];
 
-        expect(outputObj.length).toEqual(2);
-        expect(outputObj).toMatchObject(expectedAccounts);
+        expect(outputObj.tx.code).toEqual(0);
+        expect(outputObj.tx.amount).toEqual(`${sendAmount}${TOKEN_TYPE}`);
+        expect(outputObj.tx.sender).toEqual(testAccount);
+        expect(outputObj.tx.recipient).toEqual(testAccount2);
+        expect(outputObj.accounts.length).toEqual(2);
+        expect(outputObj.accounts).toMatchObject(expectedAccounts);
+      });
+      test('laconic registry tokens gettx --hash <hash>', async () => {
+        const sendAmount = 1000000000;
+
+        const sendResult = spawnSync('laconic', ['registry', 'tokens', 'send', '--address', testAccount2, '--type', TOKEN_TYPE, '--quantity', sendAmount.toString()]);
+        const sendOutput = checkResultAndRetrieveOutput(sendResult);
+        expect(sendOutput.tx.code).toEqual(0);
+
+        const gettxResult = spawnSync('laconic', ['registry', 'tokens', 'gettx', '--hash', sendOutput.tx.hash]);
+        const gettxOutput = checkResultAndRetrieveOutput(gettxResult);
+
+        expect(gettxOutput.hash).toEqual(sendOutput.tx.hash);
+        expect(gettxOutput.code).toEqual(0);
+        expect(gettxOutput.amount).toEqual(`${sendAmount}${TOKEN_TYPE}`);
+        expect(gettxOutput.sender).toEqual(testAccount);
+        expect(gettxOutput.recipient).toEqual(testAccount2);
       });
     });
 
     describe('Record operations', () => {
       const gas = 250000;
+      const fees = `250000${TOKEN_TYPE}`;
       const bondBalance = 1000000000;
 
-      test('laconic registry record publish --filename <record_file> --bond-id <bond_id> --gas <gas>', async () => {
+      test('laconic registry record publish --filename <record_file> --bond-id <bond_id> --gas <gas> --fees <fees>', async () => {
         // Create a new bond to be associated with the record
         ({ bondId: testRecordBondId } = createBond(bondBalance));
-        const result = spawnSync('laconic', ['registry', 'record', 'publish', '--filename', testRecordFilePath, '--bond-id', testRecordBondId, '--gas', gas.toString()]);
+        const result = spawnSync('laconic', ['registry', 'record', 'publish', '--filename', testRecordFilePath, '--bond-id', testRecordBondId, '--gas', gas.toString(), '--fees', fees]);
         const outputObj = checkResultAndRetrieveOutput(result);
 
         // Expect output object to resultant bond id
@@ -397,7 +418,7 @@ describe('Test laconic CLI commands', () => {
           chainId: CHAIN_ID,
           auctionId: testAuctionId,
           bidderAddress: testAccount,
-          bidAmount: `${bidAmount}photon`
+          bidAmount: `${bidAmount}alnt`
         });
       }, (AUCTION_COMMIT_DURATION + 5) * 1000);
     });
@@ -477,6 +498,47 @@ describe('Test laconic CLI commands', () => {
         expect(authorityOutputObj.length).toEqual(1);
         expect(authorityOutputObj[0]).toMatchObject(expectedAuthority);
       });
+
+      test('laconic registry authority list', async () => {
+        const result = spawnSync('laconic', ['registry', 'authority', 'list']);
+        const authoritiesOutputObj = checkResultAndRetrieveOutput(result);
+
+        // Expected authorities
+        const expectedAuthorities = [
+          { name: 'echo.laconic', entry: { ownerAddress: testAccount, status: 'active' } },
+          { name: 'kube.laconic', entry: { ownerAddress: testAccount2, status: 'active' } },
+          { name: 'laconic', entry: { ownerAddress: testAccount, status: 'active' } }
+        ];
+
+        // Expected output
+        expect(authoritiesOutputObj.length).toEqual(3);
+        expect(authoritiesOutputObj).toMatchObject(expectedAuthorities);
+      });
+
+      test('laconic registry authority list --owner <owner_address>', async () => {
+        let result = spawnSync('laconic', ['registry', 'authority', 'list', '--owner', testAccount]);
+        const authoritiesByOwner1 = checkResultAndRetrieveOutput(result);
+
+        // Expected output
+        const expectedAuthoritiesByOwner1 = [
+          { name: 'echo.laconic', entry: { ownerAddress: testAccount, status: 'active' } },
+          { name: 'laconic', entry: { ownerAddress: testAccount, status: 'active' } }
+        ];
+
+        expect(authoritiesByOwner1.length).toEqual(2);
+        expect(authoritiesByOwner1).toMatchObject(expectedAuthoritiesByOwner1);
+
+        result = spawnSync('laconic', ['registry', 'authority', 'list', '--owner', testAccount2]);
+        const authoritiesByOwner2 = checkResultAndRetrieveOutput(result);
+
+        // Expected output
+        const expectedAuthoritiesByOwner2 = [
+          { name: 'kube.laconic', entry: { ownerAddress: testAccount2, status: 'active' } }
+        ];
+
+        expect(authoritiesByOwner2.length).toEqual(1);
+        expect(authoritiesByOwner2).toMatchObject(expectedAuthoritiesByOwner2);
+      });
     });
 
     describe('Name operations', () => {

test/helpers.ts

@@ -3,7 +3,7 @@ import yaml from 'js-yaml';
 import { SpawnSyncReturns, spawnSync } from 'child_process';
 
 export const CHAIN_ID = 'laconic_9000-1';
-export const TOKEN_TYPE = 'photon';
+export const TOKEN_TYPE = 'alnt';
 
 export const AUCTION_FEES = {
   commit: 1000000,

test/run-tests.sh

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 
+set -e
+set -u
+
+# Wait for the laconid endpoint to come up
+docker compose exec laconicd sh -c "curl --retry 10 --retry-delay 3 --retry-connrefused http://127.0.0.1:9473/api"
+
 # Get the key from laconicd
 laconicd_key=$(yes | docker compose exec laconicd laconicd keys export alice --keyring-backend test --unarmored-hex --unsafe)
 
@@ -22,13 +28,10 @@ services:
     bondId:
     chainId: $cosmos_chain_id
     gas: 200000
-    fees: 200000photon
+    fees: 200000alnt
 EOL
 )
 echo "$config" > "$config_file"
 
-# Wait for the laconid endpoint to come up
-docker compose exec laconicd sh -c "curl --retry 10 --retry-delay 3 --retry-connrefused http://127.0.0.1:9473/api"
-
 # Run tests
 TEST_ACCOUNT=$laconicd_account_address yarn test

yarn.lock

@@ -302,10 +302,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cerc-io/registry-sdk@^0.2.1":
-  version "0.2.1"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fregistry-sdk/-/0.2.1/registry-sdk-0.2.1.tgz#c25cbfc89e469197b18e960baa4204e9e5c5511c"
-  integrity sha512-rshIFOaYVyKJu4MU0OATN0JLYrjue9xvQ4Eqnd2z03lS8WMh0gt1eJHzp8A8sxs1IP/jpb6mWXhmu0oQujO2Sg==
+"@cerc-io/registry-sdk@^0.2.6":
+  version "0.2.6"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fregistry-sdk/-/0.2.6/registry-sdk-0.2.6.tgz#af8a5844bdb742a01d322a9d93ace90d35aad37e"
+  integrity sha512-Z2rneeoPLTJk9aBTqMrR9WPKfPQZhNWShI4IYOb7kzoIorp3eD8mEals0I5bVjzStjapw/5RKf8lVnDCX9I4iA==
   dependencies:
     "@cosmjs/amino" "^0.28.1"
     "@cosmjs/crypto" "^0.28.1"