Compare commits

..

No commits in common. "main" and "integrated_testing" have entirely different histories.

31 changed files with 71 additions and 127 deletions

View File

@ -10,14 +10,6 @@ CLI utility written in TS, used to interact with laconicd. Depends on [laconic-s
## Account Setup
Run the chain:
- In laconicd repo run:
```bash
TEST_AUCTION_ENABLED=true ./init.sh
```
Registering records in CNS requires an account. To get account private key run:
```bash
@ -136,18 +128,26 @@ Create record (generic):
```yaml
# watcher.yml
record:
type: WebsiteRegistrationRecord
url: 'https://cerc.io'
repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
version: 1.0.23
name: ERC20 Watcher
type: watcher
version: 1.0.0
protocol:
/: QmbQiRpLX5djUsfc2yDswHvTkHTGd9uQEy6oUJfxkBYwRq
package:
linux:
x64:
/: QmVRmLrQeLZS8Xee7YVzYYAQANWmXqsNgNkaPMxM8MtPLA
arm:
/: QmX3DDmeFunX5aVmaTNnViwQUe15Wa4UbZYcC3AwFwoWcg
macos:
x64:
/: QmXogCVZZ867qZfS3CYjYdDEziPb4ARiDfgwqbd7urVKkr
```
Publish record (see below for commands to create/query bonds):
```bash
$ laconic cns record publish --filename watcher.yml --bond-id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --gas 250000
$ laconic cns record publish --filename watcher.yml --bond-id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785
{ id: 'bafyreic3auqajvgszh3vfjsouew2rsctswukc346dmlf273ln4g6iyyhba' }
```

5
lerna.json Normal file
View File

@ -0,0 +1,5 @@
{
"version": "2.9.0",
"useWorkspaces": true,
"npmClient": "yarn"
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Account, Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, queryOutput } from '../../../util';
import { getConfig, getConnectionInfo } 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]);
queryOutput(result,argv.output);
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -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, txOutput } from '../../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } 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);
const revealFile = `{"reveal_file":"${revealFilePath}"}`
console.log(JSON.stringify(result, undefined, 2));
txOutput(result,revealFile,argv.output,argv.verbose)
console.log(`\nReveal file: ${revealFilePath}`);
}

View File

@ -4,7 +4,7 @@ import path from 'path';
import { Registry } from '@cerc-io/laconic-sdk';
import fs from 'fs';
import { getConfig, getConnectionInfo, getGasAndFees, txOutput } from '../../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util';
export const command = 'reveal [auction-id] [file-path]';
@ -28,7 +28,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, queryOutput } from '../../../util';
import { getConfig, getConnectionInfo } 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]);
queryOutput(result,argv.output)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees, txOutput } from '../../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util';
export const command = 'set [name] [bond-id]';
@ -24,7 +24,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees, txOutput } from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'reserve [name]';
@ -31,6 +31,5 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.reserveAuthority({ name, owner }, privateKey, fee);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, queryOutput } from '../../../util';
import { getConfig, getConnectionInfo } 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);
queryOutput(result,argv.output)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'associate';
@ -30,7 +30,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees,txOutput } from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'cancel';
@ -22,7 +22,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'create';
@ -34,10 +34,6 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const fee = getGasAndFees(argv, cnsConfig);
const bondId = await registry.getNextBondId(privateKey);
const result = await registry.createBond({ denom, amount }, privateKey, fee);
const jsonString=`{"bondId":"${bondId}"}`
txOutput(result,jsonString,argv.output,argv.verbose)
console.log(verbose ? JSON.stringify(result, undefined, 2) : result.data);
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'dissociate';
@ -22,7 +22,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo ,queryOutput} from '../../../util';
import { getConfig, getConnectionInfo } from '../../../util';
export const command = 'get';
@ -21,6 +21,5 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const result = await registry.getBondsByIds([id as string]);
queryOutput(result,argv.output)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo ,queryOutput} from '../../../util';
import { getConfig, getConnectionInfo } from '../../../util';
export const command = 'list';
@ -25,6 +25,5 @@ export const handler = async (argv: Arguments) => {
const { owner } = argv;
const result = await registry.queryBonds({ owner });
queryOutput(result,argv.output)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees,txOutput } from '../../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util';
export const command = 'dissociate';
@ -28,7 +28,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../../util';
export const command = 'reassociate';
@ -33,7 +33,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,8 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util';
import { isNil } from 'lodash';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'refill';
@ -37,7 +36,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees,txOutput } from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'withdraw';
@ -36,7 +36,5 @@ 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);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees ,txOutput} from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'delete [name]';
@ -23,7 +23,5 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.deleteName({ crn: name }, privateKey, fee);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo ,queryOutput} from '../../../util';
import { getConfig, getConnectionInfo } 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);
queryOutput(result,argv.output)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -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 } from '../../../util';
export const command = 'resolve [name]';
@ -21,7 +21,5 @@ 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)
console.log(JSON.stringify(result, undefined, 4));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees,txOutput } from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } from '../../../util';
export const command = 'set [name] [id]';
@ -25,7 +25,5 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.setName({ crn: name, cid: id }, privateKey, fee);
const success = `{"success":${result.code==0}}`
txOutput(result,success,argv.output,argv.verbose)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo ,queryOutput} from '../../../util';
import { getConfig, getConnectionInfo } 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]);
queryOutput(result,argv.output)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo ,queryOutput} from '../../../util';
import { getConfig, getConnectionInfo } 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);
queryOutput(result,argv.output)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -5,7 +5,7 @@ import yaml from 'js-yaml';
import fs from 'fs';
import { Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getGasAndFees, getConnectionInfo, txOutput } from '../../../util';
import { getConfig, getGasAndFees, getConnectionInfo } 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);
txOutput(result,JSON.stringify(result.data,undefined,2),argv.output,argv.verbose)
console.log(verbose ? JSON.stringify(result, undefined, 2) : result.data);
}

View File

@ -2,7 +2,7 @@ import { Arguments } from 'yargs';
import assert from 'assert';
import { Account, Registry } from '@cerc-io/laconic-sdk';
import { getConfig, getConnectionInfo, getGasAndFees, queryOutput } from '../../../util';
import { getConfig, getConnectionInfo, getGasAndFees } 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]);
queryOutput(result,argv.output)
console.log(JSON.stringify(result, undefined, 2));
}

View File

@ -15,11 +15,6 @@ 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')

View File

@ -1,4 +1,3 @@
export * from './fees';
export * from './config';
export * from './common';
export * from './output';

View File

@ -1,16 +0,0 @@
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));
}
}

View File

@ -1,7 +0,0 @@
record:
type: WebsiteRegistrationRecord
url: 'https://cerc.io'
repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
version: 1.0.35