Update suggestions according to PR review

packages/claim-cli/package.json

@@ -34,11 +34,13 @@
  "oclif": {
  "bin": "claim-cli",
  "dirname": "claim-cli",
- "commands": "./dist/commands",
+ "commands": {
+ "strategy": "single",
+ "target": "./dist/index.js"
+ },
  "plugins": [
  "@oclif/plugin-help"
- ],
- "topicSeparator": " "
+ ]
  },
  "dependencies": {
  "@inquirer/prompts": "^5.0.4",

packages/claim-cli/src/applications/submit-claim.ts

@@ -27,13 +27,29 @@ export default async function submitClaim(networkParams: NetworkParams): Promise
 
  const result = await fetchCheckEligibility(lskAddress, networkParams);
  if (!result.account && result.multisigAccounts.length === 0) {
- console.log(`No Eligible Claim for Address: ${lskAddress}`);
+ console.log(`No Eligible Claim for Address: ${lskAddress}.`);
+ return process.exit(1);
+ }
+
+ const choices = await buildAccountList(result, networkParams);
+
+ if (
+ choices.reduce((numOfClaimed, choice) => numOfClaimed + (choice.claimed ? 1 : 0), 0) ==
+ choices.length
+ ) {
+ for (const [index, choice] of choices.entries()) {
+ console.log(`${index + 1}: ${choice.value.lskAddress} ${choice.claimed}`);
+ }
+ console.log(`All accounts under ${lskAddress} have successfully been claimed.`);
  return process.exit(1);
  }
 
  const claimAccount = await select({
  message: 'Choose Claim Address',
- choices: await buildAccountList(result, networkParams),
+ choices: choices.map(account => ({
+ ...account,
+ disabled: !!account.claimed,
+ })),
  });
 
  if (claimAccount.numberOfSignatures === 0) {

packages/claim-cli/src/index.ts

@@ -1 +1,51 @@
-export { run } from '@oclif/core';
+import { Flags, Command } from '@oclif/core';
+import { select } from '@inquirer/prompts';
+import checkEligibility from './applications/check-eligibility';
+import submitClaim from './applications/submit-claim';
+import publishMultisigClaim from './applications/publish-multisig-claim';
+import { Mainnet, Testnet } from './utils/';
+
+enum Choice {
+ CHECK_ELIGIBILITY,
+ SUBMIT_CLAIM,
+ SUBMIT_MULTISIG_CLAIM,
+}
+
+export default class Start extends Command {
+ static flags = {
+ network: Flags.string({
+ description: 'Operating network for the tool to run.',
+ required: false,
+ default: 'mainnet',
+ options: ['mainnet', 'testnet'],
+ }),
+ };
+
+ static description = 'Start Lisk Claim CLI Tool.';
+
+ static examples = [`$ oex claim-cli`];
+
+ async run(): Promise<void> {
+ const { flags } = await this.parse(Start);
+ const { network } = flags;
+
+ console.log(`Welcome to Lisk Migration CLI (Running on "${network}" Network)`);
+ const answer = await select({
+ message: 'Please enter your choices',
+ choices: [
+ { name: 'Check my Eligibility', value: Choice.CHECK_ELIGIBILITY },
+ { name: 'Submit a Claim', value: Choice.SUBMIT_CLAIM },
+ {
+ name: 'Publish a Multisig claim with completed signatures onchain',
+ value: Choice.SUBMIT_MULTISIG_CLAIM,
+ },
+ ],
+ });
+
+ const networkParams = {
+ mainnet: Mainnet,
+ testnet: Testnet,
+ }[network as 'mainnet' | 'testnet'];
+ await [checkEligibility, submitClaim, publishMultisigClaim][answer](networkParams);
+ }
+}

packages/claim-cli/src/utils/confirm-send-transaction.ts

@@ -38,7 +38,7 @@ export async function confirmSendTransaction(
  console.log(
  `Estimated Network Fee (${estimatedGas} * ${maxFeePerGas} wei) = ${ethers.formatUnits(estimatedFee)} ETH.`,
  );
- console.log(`Your Balance: ${ethers.formatUnits(ethBalance)} ETH`);
+ console.log(`Your Balance: ${ethers.formatUnits(ethBalance)} ETH.`);
  if (estimatedFee > ethBalance) {
  console.log('Insufficient Balance for the Transaction.');
  return process.exit(1);

packages/claim-cli/src/utils/get-private-key.ts

@@ -20,7 +20,7 @@ const getSecretType = (wallet: string) =>
  });
 
 export async function getLSKPrivateKeyFromMnemonic(): Promise<Buffer> {
- const mnemonic = await getInput({ message: 'Your Mnemonic' });
+ const mnemonic = await getPassword({ message: 'Your Mnemonic' });
  if (!Mnemonic.isValidMnemonic(mnemonic)) {
  console.log('Invalid Mnemonic, please check again.');
  return process.exit(1);
@@ -32,7 +32,7 @@ export async function getLSKPrivateKeyFromMnemonic(): Promise<Buffer> {
 }
 
 export async function getLSKPrivateKeyFromString(): Promise<Buffer> {
- const privKey = await getInput({
+ const privKey = await getPassword({
  message: 'Your Private Key',
  });
 
@@ -61,7 +61,7 @@ export async function getLSKPrivateKey() {
 }
 
 export async function getETHWalletFromMnemonic(): Promise<HDNodeWallet> {
- const mnemonic = await getInput({ message: 'Your L2 Mnemonic' });
+ const mnemonic = await getPassword({ message: 'Your L2 Mnemonic' });
  if (!Mnemonic.isValidMnemonic(mnemonic)) {
  console.log('Invalid Mnemonic, please check again.');
  return process.exit(1);
@@ -74,7 +74,7 @@ export async function getETHWalletFromMnemonic(): Promise<HDNodeWallet> {
 }
 
 export const getETHWalletKeyFromString = async (): Promise<Wallet> => {
- const privKey = await getInput({
+ const privKey = await getPassword({
  message: 'Your Private Key',
  });