LaconicNetwork/cosmjs-util
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #135 from confio/cli-stuff

Browse Source 
Improve CLI usage
This commit is contained in:
Simon Warta 2020-03-06 12:36:51 +01:00 committed by GitHub
commit bd16afcf22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/bcp/src/decode.ts
View File

@ -101,10 +101,10 @@ export function parseMsg(
};
}
const recipient: string | undefined = (msg.value.msg as any).transfer?.recipient;
const recipient: string | undefined = msg.value.msg.transfer?.recipient;
if (!recipient) throw new Error("Could not read recipient");
const amount: string | undefined = (msg.value.msg as any).transfer?.amount;
const amount: string | undefined = msg.value.msg.transfer?.amount;
if (!amount) throw new Error("Could not read recipient");
const send: SendTransaction = {

1
packages/cli/package.json
View File

@ -20,6 +20,7 @@
"lint": "eslint --max-warnings 0 \"**/*.{js,ts}\"",
"build": "tsc",
"build-or-skip": "[ -n \"$SKIP_BUILD\" ] || yarn build",
"start": "yarn build-or-skip && ./bin/cosmwasm-cli",
"selftest": "yarn build-or-skip && ./bin/cosmwasm-cli --selftest",
"test-node": "node jasmine-testrunner.js",
"test": "yarn build-or-skip && yarn test-node"

73
packages/cli/src/cli.ts
View File

@ -50,6 +50,30 @@ export function main(originalArgs: readonly string[]): void {
"RestClient",
"Secp256k1Pen",
"types",
// cosmwasmclient
"Account",
"Block",
"BlockHeader",
"Code",
"CodeDetails",
"Contract",
"ContractDetails",
"CosmWasmClient",
"GetNonceResult",
"IndexedTx",
"PostTxResult",
"SearchByHeightQuery",
"SearchByIdQuery",
"SearchBySentFromOrToQuery",
"SearchTxQuery",
"SearchTxFilter",
// signingcosmwasmclient
"ExecuteResult",
"InstantiateResult",
"SigningCallback",
"SigningCosmWasmClient",
"UploadMeta",
"UploadResult",
],
],
[
@ -73,6 +97,7 @@ export function main(originalArgs: readonly string[]): void {
[
"Bech32",
"Encoding",
"Decimal",
// integers
"Int53",
"Uint32",
@ -80,45 +105,37 @@ export function main(originalArgs: readonly string[]): void {
"Uint64",
],
],
["@iov/utils", ["sleep"]],
["@iov/utils", ["assert", "sleep"]],
]);
console.info(colors.green("Initializing session for you. Have fun!"));
console.info(colors.yellow("Available imports:"));
console.info(colors.yellow(" * http"));
console.info(colors.yellow(" * https"));
console.info(colors.yellow(" * from long"));
console.info(colors.yellow(" - Long"));
for (const moduleName of imports.keys()) {
console.info(colors.yellow(` * from ${moduleName}`));
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
for (const symbol of imports.get(moduleName)!) {
console.info(colors.yellow(` - ${symbol}`));
}
for (const [moduleName, symbols] of imports.entries()) {
console.info(colors.yellow(` * from ${moduleName}: ${symbols.join(", ")}`));
}
console.info(colors.yellow(" * helper functions"));
console.info(colors.yellow(" - fromAscii"));
console.info(colors.yellow(" - fromBase64"));
console.info(colors.yellow(" - fromHex"));
console.info(colors.yellow(" - fromUtf8"));
console.info(colors.yellow(" - toAscii"));
console.info(colors.yellow(" - toBase64"));
console.info(colors.yellow(" - toHex"));
console.info(colors.yellow(" - toUtf8"));
const encodingHelpers = [
"fromAscii",
"fromBase64",
"fromHex",
"fromUtf8",
"toAscii",
"toBase64",
"toHex",
"toUtf8",
];
console.info(colors.yellow(` * helper functions: ${encodingHelpers.join(", ")}`));
let init = `
import * as http from 'http';
import * as https from 'https';
import Long from "long";
`;
for (const moduleName of imports.keys()) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
init += `import { ${imports.get(moduleName)!.join(", ")} } from "${moduleName}";\n`;
for (const [moduleName, symbols] of imports.entries()) {
init += `import { ${symbols.join(", ")} } from "${moduleName}";\n`;
}
// helper functions
init += `
const { fromAscii, fromBase64, fromHex, fromUtf8, toAscii, toBase64, toHex, toUtf8 } = Encoding;
`;
init += `const { ${encodingHelpers.join(", ")} } = Encoding;\n`;
if (args.selftest) {
// execute some trival stuff and exit
@ -128,8 +145,12 @@ export function main(originalArgs: readonly string[]): void {
const hexHash = toHex(hash);
export class NewDummyClass {};
const encoded = toHex(toUtf8(toBase64(toAscii("hello world"))));
const original = "hello world";
const encoded = toHex(toUtf8(toBase64(toAscii(original))));
const decoded = fromAscii(fromBase64(fromUtf8(fromHex(encoded))));
assert(decoded === original);
assert(Decimal.fromAtomics("12870000", 6).toString() === "12.87");
const mnemonic = Bip39.encode(Random.getBytes(16)).toString();
const pen = await Secp256k1Pen.fromMnemonic(mnemonic);

6
packages/sdk/src/types.ts
View File

@ -24,7 +24,7 @@ export interface CosmosSdkTx {
interface MsgTemplate {
readonly type: string;
readonly value: object;
readonly value: any;
}
/** A Cosmos SDK token transfer message */
@ -73,7 +73,7 @@ export interface MsgInstantiateContract extends MsgTemplate {
/** Human-readable label for this contract */
readonly label: string;
/** Init message as JavaScript object */
readonly init_msg: object;
readonly init_msg: any;
readonly init_funds: ReadonlyArray<Coin>;
};
}
@ -91,7 +91,7 @@ export interface MsgExecuteContract extends MsgTemplate {
/** Bech32 account address */
readonly contract: string;
/** Handle message as JavaScript object */
readonly msg: object;
readonly msg: any;
readonly sent_funds: ReadonlyArray<Coin>;
};
}

6
packages/sdk/types/types.d.ts vendored
View File

@ -12,7 +12,7 @@ export interface CosmosSdkTx {
}
interface MsgTemplate {
readonly type: string;
readonly value: object;
readonly value: any;
}
/** A Cosmos SDK token transfer message */
export interface MsgSend extends MsgTemplate {
@ -58,7 +58,7 @@ export interface MsgInstantiateContract extends MsgTemplate {
/** Human-readable label for this contract */
readonly label: string;
/** Init message as JavaScript object */
readonly init_msg: object;
readonly init_msg: any;
readonly init_funds: ReadonlyArray<Coin>;
};
}
@ -75,7 +75,7 @@ export interface MsgExecuteContract extends MsgTemplate {
/** Bech32 account address */
readonly contract: string;
/** Handle message as JavaScript object */
readonly msg: object;
readonly msg: any;
readonly sent_funds: ReadonlyArray<Coin>;
};
}