Merge pull request #395 from Tonomy-Foundation/feature/cli-print-enha…

…ncement

feat: better cli print feature

src/cli/index.ts

@@ -26,28 +26,32 @@ async function main() {
  } else if (args[0] === 'msig') {
  await msig(args.slice(1));
  } else {
- console.log(`
-Usage:
- yarn run cli [commands]
- 
- Commands:
- apps create appName usernamePrefix description logoUrl origin publicKey
- accounts get username
- keys create
- keys convert publicKey
- authority publicKey/privateKey
- authority account1 [account2] [account3] [accountN]
- bootstrap privateKey
- msig cancel proposalName
- msig propose gov-migrate proposalName
- msig propose new-account proposalName
- msig propose transfer proposalName
- msig propose ... --test
- msig exec proposalName
-`);
+ printCliHelp();
  }
 }
 
+export function printCliHelp() {
+ console.log(`
+ Usage:
+ yarn run cli [commands]
+ 
+ Commands:
+ apps create appName usernamePrefix description logoUrl origin publicKey
+ accounts get username
+ keys create
+ keys convert publicKey
+ authority publicKey/privateKey
+ authority account1 [account2] [account3] [accountN]
+ bootstrap privateKey
+ msig cancel proposalName
+ msig propose gov-migrate proposalName
+ msig propose new-account proposalName
+ msig propose transfer proposalName
+ msig propose ... --test
+ msig exec proposalName
+ `);
+}
+
 Promise.resolve(main()).catch((err) => {
  console.error(err);
  process.exit(1);

src/cli/msig/index.ts

@@ -2,6 +2,7 @@ import { PrivateKey, Name, Checksum256 } from '@wharfkit/antelope';
 import { EosioMsigContract, setSettings } from '../../sdk';
 import { ActionData, Authority, EosioTokenContract, createSigner } from '../../sdk/services/blockchain';
 import settings from '../bootstrap/settings';
+import { printCliHelp } from '..';
 
 const eosioMsigContract = EosioMsigContract.Instance;
 
@@ -38,7 +39,7 @@ export default async function msig(args: string[]) {
  }
  }
 
- const proposer = '1.found.tmy';
+ const proposer = settings.isProduction() ? '14.found.tmy' : '1.found.tmy';
  const privateKey = PrivateKey.from(process.env.SIGNING_KEY || '');
  const signer = createSigner(privateKey);
 
@@ -165,6 +166,7 @@ export default async function msig(args: string[]) {
 
  if (test) await executeProposal(proposer, proposalName, proposalHash);
  } else {
+ printCliHelp();
  throw new Error(`Invalid msig proposal type ${proposalType}`);
  }
  } else if (args[0] === 'exec') {
@@ -180,6 +182,7 @@ export default async function msig(args: string[]) {
  console.error('Transaction failed');
  }
  } else {
+ printCliHelp();
  throw new Error(`Invalid msig command ${args[0]}`);
  }
 }

src/cli/vesting/index.ts

@@ -1,5 +1,7 @@
+import { PrivateKey } from '@wharfkit/antelope';
+import { printCliHelp } from '..';
 import { AccountType, TonomyContract, TonomyUsername, VestingContract } from '../../sdk';
-import { createSigner, getTonomyOperationsKey } from '../../sdk/services/blockchain';
+import { createSigner } from '../../sdk/services/blockchain';
 import { setSettings } from '../../sdk/util/settings';
 import settings from '../bootstrap/settings';
 
@@ -9,10 +11,9 @@ const tonomyContract = TonomyContract.Instance;
 const vestingContract = VestingContract.Instance;
 
 export default async function vesting(args: string[]) {
- const tonomyOpsKey = getTonomyOperationsKey();
- const signer = createSigner(tonomyOpsKey);
-
  if (args[0] === 'assign') {
+ const privateKey = PrivateKey.from(process.env.SIGNING_KEY || '');
+ const signer = createSigner(privateKey);
  const username = args[1];
 
  console.log('Searching for username: ', username);
@@ -47,8 +48,12 @@ export default async function vesting(args: string[]) {
 
  console.log('Transaction ID: ', JSON.stringify(res, null, 2));
  } else if (args[0] === 'setsettings') {
+ const privateKey = PrivateKey.from(process.env.SIGNING_KEY || '');
+ const signer = createSigner(privateKey);
+
  await vestingContract.setSettings('2024-04-30T12:00:00', '2030-01-01T00:00:00', signer);
  } else {
+ printCliHelp();
  throw new Error(`Unknown command ${args[0]}`);
  }
 }