diff --git a/src/cmds/cns-cmds/account-cmds/get.ts b/src/cmds/cns-cmds/account-cmds/get.ts index da3486d..4562ef5 100644 --- a/src/cmds/cns-cmds/account-cmds/get.ts +++ b/src/cmds/cns-cmds/account-cmds/get.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Account, Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo } from '../../../util'; +import { getConfig, getConnectionInfo, queryOutput } from '../../../util'; export const command = 'get'; @@ -24,5 +24,5 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const result = await registry.getAccounts([address]); - console.log(JSON.stringify(result, undefined, 2)); + queryOutput(result,argv.output); } diff --git a/src/cmds/cns-cmds/auction-cmds/bid-cmds/commit.ts b/src/cmds/cns-cmds/auction-cmds/bid-cmds/commit.ts index a9c6527..54e2a67 100644 --- a/src/cmds/cns-cmds/auction-cmds/bid-cmds/commit.ts +++ b/src/cmds/cns-cmds/auction-cmds/bid-cmds/commit.ts @@ -5,7 +5,7 @@ import { Account, createBid, Registry } from '@cerc-io/laconic-sdk'; import { ensureDir } from 'fs-extra'; import fs from 'fs'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees, txOutput } from '../../../../util'; const OUT_DIR = 'out'; @@ -43,7 +43,7 @@ export const handler = async (argv: Arguments) => { const fee = getGasAndFees(argv, cnsConfig); const result = await registry.commitBid({ auctionId, commitHash }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const revealFile = `{"reveal_file":"${revealFilePath}"}` - console.log(`\nReveal file: ${revealFilePath}`); + txOutput(result,revealFile,argv.output,argv.verbose) } diff --git a/src/cmds/cns-cmds/auction-cmds/bid-cmds/reveal.ts b/src/cmds/cns-cmds/auction-cmds/bid-cmds/reveal.ts index f7290d9..5200863 100644 --- a/src/cmds/cns-cmds/auction-cmds/bid-cmds/reveal.ts +++ b/src/cmds/cns-cmds/auction-cmds/bid-cmds/reveal.ts @@ -4,7 +4,7 @@ import path from 'path'; import { Registry } from '@cerc-io/laconic-sdk'; import fs from 'fs'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees, txOutput } from '../../../../util'; export const command = 'reveal [auction-id] [file-path]'; @@ -28,5 +28,7 @@ export const handler = async (argv: Arguments) => { const reveal = fs.readFileSync(path.resolve(filePath)); const result = await registry.revealBid({ auctionId, reveal: reveal.toString('hex') }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + + txOutput(result,success,argv.output,argv.verbose) } diff --git a/src/cmds/cns-cmds/auction-cmds/get.ts b/src/cmds/cns-cmds/auction-cmds/get.ts index 00f3bc9..c3bab65 100644 --- a/src/cmds/cns-cmds/auction-cmds/get.ts +++ b/src/cmds/cns-cmds/auction-cmds/get.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo } from '../../../util'; +import { getConfig, getConnectionInfo, queryOutput } from '../../../util'; export const command = 'get [id]'; @@ -21,5 +21,5 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const result = await registry.getAuctionsByIds([id as string]); - console.log(JSON.stringify(result, undefined, 2)); + queryOutput(result,argv.output) } diff --git a/src/cmds/cns-cmds/authority-cmds/bond-cmds/set.ts b/src/cmds/cns-cmds/authority-cmds/bond-cmds/set.ts index 2bf39cd..7839ae5 100644 --- a/src/cmds/cns-cmds/authority-cmds/bond-cmds/set.ts +++ b/src/cmds/cns-cmds/authority-cmds/bond-cmds/set.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees, txOutput } from '../../../../util'; export const command = 'set [name] [bond-id]'; @@ -24,5 +24,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const fee = getGasAndFees(argv, cnsConfig); const result = await registry.setAuthorityBond({ name, bondId }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + + txOutput(result,success,argv.output,argv.verbose) } diff --git a/src/cmds/cns-cmds/authority-cmds/reserve.ts b/src/cmds/cns-cmds/authority-cmds/reserve.ts index 7bedf23..437e8cc 100644 --- a/src/cmds/cns-cmds/authority-cmds/reserve.ts +++ b/src/cmds/cns-cmds/authority-cmds/reserve.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees, txOutput } from '../../../util'; export const command = 'reserve [name]'; @@ -31,5 +31,6 @@ export const handler = async (argv: Arguments) => { const fee = getGasAndFees(argv, cnsConfig); const result = await registry.reserveAuthority({ name, owner }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) } diff --git a/src/cmds/cns-cmds/authority-cmds/whois.ts b/src/cmds/cns-cmds/authority-cmds/whois.ts index 118f24c..6fbf9f7 100644 --- a/src/cmds/cns-cmds/authority-cmds/whois.ts +++ b/src/cmds/cns-cmds/authority-cmds/whois.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo } from '../../../util'; +import { getConfig, getConnectionInfo, queryOutput } from '../../../util'; export const command = 'whois [name]'; @@ -21,5 +21,5 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const result = await registry.lookupAuthorities([name], true); - console.log(JSON.stringify(result, undefined, 2)); + queryOutput(result,argv.output) } diff --git a/src/cmds/cns-cmds/bond-cmds/associate.ts b/src/cmds/cns-cmds/bond-cmds/associate.ts index 5f20a2f..de6ebf0 100644 --- a/src/cmds/cns-cmds/bond-cmds/associate.ts +++ b/src/cmds/cns-cmds/bond-cmds/associate.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util'; export const command = 'associate'; @@ -30,5 +30,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const fee = getGasAndFees(argv, cnsConfig); const result = await registry.associateBond({ recordId: id, bondId }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/bond-cmds/cancel.ts b/src/cmds/cns-cmds/bond-cmds/cancel.ts index dda59ef..de860e8 100644 --- a/src/cmds/cns-cmds/bond-cmds/cancel.ts +++ b/src/cmds/cns-cmds/bond-cmds/cancel.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees,txOutput } from '../../../util'; export const command = 'cancel'; @@ -22,5 +22,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const fee = getGasAndFees(argv, cnsConfig); const result = await registry.cancelBond({ id }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/bond-cmds/create.ts b/src/cmds/cns-cmds/bond-cmds/create.ts index 9e3a79d..8111fb2 100644 --- a/src/cmds/cns-cmds/bond-cmds/create.ts +++ b/src/cmds/cns-cmds/bond-cmds/create.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util'; export const command = 'create'; @@ -36,5 +36,8 @@ export const handler = async (argv: Arguments) => { const fee = getGasAndFees(argv, cnsConfig); const bondId = await registry.getNextBondId(privateKey); const result = await registry.createBond({ denom, amount }, privateKey, fee); - console.log(true ? JSON.stringify(result, undefined, 2)+"\nBondId:"+bondId : bondId); + const jsonString=`{"bondId":"${bondId}"}` + + txOutput(result,jsonString,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/bond-cmds/dissociate.ts b/src/cmds/cns-cmds/bond-cmds/dissociate.ts index 76d9185..96fda73 100644 --- a/src/cmds/cns-cmds/bond-cmds/dissociate.ts +++ b/src/cmds/cns-cmds/bond-cmds/dissociate.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util'; export const command = 'dissociate'; @@ -22,5 +22,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const fee = getGasAndFees(argv, cnsConfig); const result = await registry.dissociateBond({ recordId: id }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/bond-cmds/get.ts b/src/cmds/cns-cmds/bond-cmds/get.ts index ad2af5c..1c61a37 100644 --- a/src/cmds/cns-cmds/bond-cmds/get.ts +++ b/src/cmds/cns-cmds/bond-cmds/get.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo } from '../../../util'; +import { getConfig, getConnectionInfo ,queryOutput} from '../../../util'; export const command = 'get'; @@ -21,5 +21,6 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const result = await registry.getBondsByIds([id as string]); - console.log(JSON.stringify(result, undefined, 2)); + + queryOutput(result,argv.output) } diff --git a/src/cmds/cns-cmds/bond-cmds/list.ts b/src/cmds/cns-cmds/bond-cmds/list.ts index 965fa79..94e350d 100644 --- a/src/cmds/cns-cmds/bond-cmds/list.ts +++ b/src/cmds/cns-cmds/bond-cmds/list.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo } from '../../../util'; +import { getConfig, getConnectionInfo ,queryOutput} from '../../../util'; export const command = 'list'; @@ -25,5 +25,6 @@ export const handler = async (argv: Arguments) => { const { owner } = argv; const result = await registry.queryBonds({ owner }); - console.log(JSON.stringify(result, undefined, 2)); + + queryOutput(result,argv.output) } diff --git a/src/cmds/cns-cmds/bond-cmds/records-cmds/dissociate.ts b/src/cmds/cns-cmds/bond-cmds/records-cmds/dissociate.ts index 136e4d4..44edbcb 100644 --- a/src/cmds/cns-cmds/bond-cmds/records-cmds/dissociate.ts +++ b/src/cmds/cns-cmds/bond-cmds/records-cmds/dissociate.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees,txOutput } from '../../../../util'; export const command = 'dissociate'; @@ -28,5 +28,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const fee = getGasAndFees(argv, cnsConfig); const result = await registry.dissociateRecords({ bondId }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/bond-cmds/records-cmds/reassociate.ts b/src/cmds/cns-cmds/bond-cmds/records-cmds/reassociate.ts index 4e909e1..8893124 100644 --- a/src/cmds/cns-cmds/bond-cmds/records-cmds/reassociate.ts +++ b/src/cmds/cns-cmds/bond-cmds/records-cmds/reassociate.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../../util'; export const command = 'reassociate'; @@ -33,5 +33,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const fee = getGasAndFees(argv, cnsConfig); const result = await registry.reassociateRecords({ oldBondId, newBondId }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/bond-cmds/refill.ts b/src/cmds/cns-cmds/bond-cmds/refill.ts index 0a23269..a439000 100644 --- a/src/cmds/cns-cmds/bond-cmds/refill.ts +++ b/src/cmds/cns-cmds/bond-cmds/refill.ts @@ -2,7 +2,8 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util'; +import { isNil } from 'lodash'; export const command = 'refill'; @@ -36,5 +37,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const fee = getGasAndFees(argv, cnsConfig); const result = await registry.refillBond({ id, denom, amount }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/bond-cmds/withdraw.ts b/src/cmds/cns-cmds/bond-cmds/withdraw.ts index 1060e23..041563d 100644 --- a/src/cmds/cns-cmds/bond-cmds/withdraw.ts +++ b/src/cmds/cns-cmds/bond-cmds/withdraw.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees,txOutput } from '../../../util'; export const command = 'withdraw'; @@ -36,5 +36,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const fee = getGasAndFees(argv, cnsConfig); const result = await registry.withdrawBond({ id, denom, amount }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/name-cmds/delete.ts b/src/cmds/cns-cmds/name-cmds/delete.ts index 32ff8f9..f008786 100644 --- a/src/cmds/cns-cmds/name-cmds/delete.ts +++ b/src/cmds/cns-cmds/name-cmds/delete.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util'; export const command = 'delete [name]'; @@ -23,5 +23,7 @@ export const handler = async (argv: Arguments) => { const fee = getGasAndFees(argv, cnsConfig); const result = await registry.deleteName({ crn: name }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/name-cmds/lookup.ts b/src/cmds/cns-cmds/name-cmds/lookup.ts index 492f760..df5e43c 100644 --- a/src/cmds/cns-cmds/name-cmds/lookup.ts +++ b/src/cmds/cns-cmds/name-cmds/lookup.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo } from '../../../util'; +import { getConfig, getConnectionInfo ,queryOutput} from '../../../util'; export const command = 'lookup [name]'; @@ -27,5 +27,5 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const result = await registry.lookupNames([name], argv.history as boolean); - console.log(JSON.stringify(result, undefined, 2)); + queryOutput(result,argv.output) } diff --git a/src/cmds/cns-cmds/name-cmds/resolve.ts b/src/cmds/cns-cmds/name-cmds/resolve.ts index c6b651c..d125f9f 100644 --- a/src/cmds/cns-cmds/name-cmds/resolve.ts +++ b/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 } from '../../../util'; +import { getConfig, getConnectionInfo,txOutput } from '../../../util'; export const command = 'resolve [name]'; @@ -21,5 +21,7 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const result = await registry.resolveNames([name]); - console.log(JSON.stringify(result, undefined, 4)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/name-cmds/set.ts b/src/cmds/cns-cmds/name-cmds/set.ts index addb989..bb1bfeb 100644 --- a/src/cmds/cns-cmds/name-cmds/set.ts +++ b/src/cmds/cns-cmds/name-cmds/set.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees,txOutput } from '../../../util'; export const command = 'set [name] [id]'; @@ -25,5 +25,7 @@ export const handler = async (argv: Arguments) => { const fee = getGasAndFees(argv, cnsConfig); const result = await registry.setName({ crn: name, cid: id }, privateKey, fee); - console.log(JSON.stringify(result, undefined, 2)); + const success = `{"success":${result.code==0}}` + txOutput(result,success,argv.output,argv.verbose) + } diff --git a/src/cmds/cns-cmds/record-cmds/get.ts b/src/cmds/cns-cmds/record-cmds/get.ts index 9d0fc81..fbdf61e 100644 --- a/src/cmds/cns-cmds/record-cmds/get.ts +++ b/src/cmds/cns-cmds/record-cmds/get.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo } from '../../../util'; +import { getConfig, getConnectionInfo ,queryOutput} from '../../../util'; export const command = 'get'; @@ -21,5 +21,5 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const result = await registry.getRecordsByIds([id as string]); - console.log(JSON.stringify(result, undefined, 2)); + queryOutput(result,argv.output) } diff --git a/src/cmds/cns-cmds/record-cmds/list.ts b/src/cmds/cns-cmds/record-cmds/list.ts index d29ea02..49f5cee 100644 --- a/src/cmds/cns-cmds/record-cmds/list.ts +++ b/src/cmds/cns-cmds/record-cmds/list.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo } from '../../../util'; +import { getConfig, getConnectionInfo ,queryOutput} from '../../../util'; export const command = 'list'; @@ -36,5 +36,5 @@ export const handler = async (argv: Arguments) => { const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const result = await registry.queryRecords({ bondId, type, name }, all as boolean); - console.log(JSON.stringify(result, undefined, 2)); + queryOutput(result,argv.output) } diff --git a/src/cmds/cns-cmds/record-cmds/publish.ts b/src/cmds/cns-cmds/record-cmds/publish.ts index 8944bc8..beb01f9 100644 --- a/src/cmds/cns-cmds/record-cmds/publish.ts +++ b/src/cmds/cns-cmds/record-cmds/publish.ts @@ -5,7 +5,7 @@ import yaml from 'js-yaml'; import fs from 'fs'; import { Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getGasAndFees, getConnectionInfo } from '../../../util'; +import { getConfig, getGasAndFees, getConnectionInfo, txOutput } from '../../../util'; export const command = 'publish'; @@ -40,5 +40,5 @@ export const handler = async (argv: Arguments) => { const fee = getGasAndFees(argv, cnsConfig); const result = await registry.setRecord({ privateKey: userKey, record, bondId }, txKey as string, fee); - console.log(verbose ? JSON.stringify(result, undefined, 2) : result.data); + txOutput(result,JSON.stringify(result.data,undefined,2),argv.output,argv.verbose) } diff --git a/src/cmds/cns-cmds/tokens-cmds/send.ts b/src/cmds/cns-cmds/tokens-cmds/send.ts index 1262d41..983a097 100644 --- a/src/cmds/cns-cmds/tokens-cmds/send.ts +++ b/src/cmds/cns-cmds/tokens-cmds/send.ts @@ -2,7 +2,7 @@ import { Arguments } from 'yargs'; import assert from 'assert'; import { Account, Registry } from '@cerc-io/laconic-sdk'; -import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util'; +import { getConfig, getConnectionInfo, getGasAndFees, queryOutput } from '../../../util'; export const command = 'send'; @@ -40,5 +40,5 @@ export const handler = async (argv: Arguments) => { const fee = getGasAndFees(argv, cnsConfig); await registry.sendCoins({ denom, amount, destinationAddress }, privateKey, fee); const result = await registry.getAccounts([fromAddress, destinationAddress]); - console.log(JSON.stringify(result, undefined, 2)); + queryOutput(result,argv.output) } diff --git a/src/index.ts b/src/index.ts index 29723e2..eff7e67 100644 --- a/src/index.ts +++ b/src/index.ts @@ -15,6 +15,11 @@ yargs(hideBin(process.argv)) default: 'config.yml', describe: 'Config file path.', type: 'string' + }, + output: { + alias: 'o', + describe: 'Gives output in json format when specified.', + type: 'string' } }) .commandDir('cmds') diff --git a/src/util/index.ts b/src/util/index.ts index 1ffc85c..c87a1cc 100644 --- a/src/util/index.ts +++ b/src/util/index.ts @@ -1,3 +1,4 @@ export * from './fees'; export * from './config'; export * from './common'; +export * from './output'; diff --git a/src/util/output.ts b/src/util/output.ts new file mode 100644 index 0000000..15f449b --- /dev/null +++ b/src/util/output.ts @@ -0,0 +1,16 @@ + +export const txOutput = (result:any,msg:string,output:unknown,verbose:unknown) => { + if (output=="json"){ + console.log(verbose ? JSON.parse(JSON.stringify(result)) : JSON.parse(msg)); + } else { + console.log(verbose ? JSON.stringify(result,undefined,2) : msg); + } +}; + +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)); + } +} diff --git a/watcher.yml b/watcher.yml new file mode 100644 index 0000000..58502aa --- /dev/null +++ b/watcher.yml @@ -0,0 +1,7 @@ +record: + type: WebsiteRegistrationRecord + url: 'https://cerc.io' + repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D + build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9 + tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR + version: 1.0.35