wative 1.0.36 → 1.0.38

package/src/account.ts

@@ -19,6 +19,7 @@ import {
     inputPasswordWithoutValidator,
     getKeystoreSlugByAccountName,
     getAccountNameByKeystoreSlug,
+    inputMaskedPassword,
 } from "./utils";
 import { getAccountAddress, getAccountBalance, getNetworkInfoByName, getNetworkTypeByName, getStatus, selectDefaultNetwork, showAllAccounts, switchNetworkByAccountName } from "./network";
 import { getAssetList, showAssetsDetail } from './assets';
@@ -70,7 +71,7 @@ const importPassphrase = async (keystore_path: string, wative_core: typeof Wativ
         return;
     }
 
-    let passphrase = await inputSomething('Please enter a mnemonic [split by space]', passphraseValidator);
+    let passphrase = await inputMaskedPassword('Please enter a mnemonic [split by space]', passphraseValidator);
     passphrase = passphrase.replace(/\s+/g, " ");
 
     let keystore_slug = getKeystoreSlugByAccountName(pre_account_info.account_name);
@@ -99,7 +100,7 @@ const createPrivateKeyAccount = async (keystore_path: string, wative_core: typeo
         return;
     }
 
-    let private_key = await inputSomething('Please enter a private key');
+    let private_key = await inputMaskedPassword('Please enter a private key');
     let keystore_slug = getKeystoreSlugByAccountName(pre_account_info.account_name);
     await _importAccount(
         keystore_path,
@@ -248,9 +249,11 @@ export const loginIn = async (keystore_path: string, keystore_slug: string, wati
 
     for (let i = 0; i < 3; i++) {
         let account_name = getAccountNameByKeystoreSlug(keystore_path, keystore_slug);
-
+        let password_name = 'WATIVE_PASSWD_' + keystore_slug;
         let password: any;
-        if (process.env.WativePassword && process.env.WativePassword !== '') {
+        if (process.env[password_name] && process.env[password_name] !== '') {
+            password = process.env[password_name];
+        } else if (process.env.WativePassword && process.env.WativePassword !== '') {
             password = process.env.WativePassword;
         } else {
             password = await inputPasswordWithoutValidator(`Please input the password for Account [${account_name}]`);
@@ -317,6 +320,9 @@ const selectAccount = async (keystore_path: string, wative_core: typeof WativeCo
     const selected_account_name = account_name_list[select_account_options.indexOf(selected_account) - 2];
     const keystore_slug = getKeystoreSlugByAccountName(selected_account_name);
 
+    console.log(
+        chalk.green(`Keystore slug: [${keystore_slug}]`)
+    );
     let login_result = await loginIn(keystore_path, keystore_slug, wative_core);
     if (login_result.isLoginIn) {
         await accountManager(keystore_path, keystore_slug, wative_core, login_result.password);

package/src/tools.ts

@@ -83,6 +83,13 @@ const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, ch
         return;
     }
 
+    let transfer_gas_limit: string;
+    if (chain_id === "42161" || chain_id === "421614") {
+        transfer_gas_limit = "1700000";
+    } else {
+        transfer_gas_limit = "21000";
+    }
+
     let data: string;
     let value: any;
     if (code_result.output === "0x") {
@@ -95,7 +102,7 @@ const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, ch
         }
         let account_balance = new BigNumber(account_balance_result.output);
         let tx_gas_price = new BigNumber(gasPrice);
-        let max_value = account_balance.minus(tx_gas_price.multipliedBy(21000)).toFixed(0, BigNumber.ROUND_FLOOR);
+        let max_value = account_balance.minus(tx_gas_price.multipliedBy(Number(transfer_gas_limit))).toFixed(0, BigNumber.ROUND_FLOOR);
         let total_balance = (new BigNumber(max_value)).dividedBy(1e18).toFixed(4, BigNumber.ROUND_FLOOR);
 
         if (new BigNumber(total_balance) < new BigNumber(0)) {
@@ -127,7 +134,7 @@ const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, ch
     };
 
     if (data === '0x') {
-        txParams['gas'] = "21000";
+        txParams['gas'] = transfer_gas_limit;
     } else {
         let sendGasPrice = txParams.gasPrice;
         delete txParams.gasPrice;
@@ -421,7 +428,11 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
     };
 
     if (data === '0x') {
-        txParams['gas'] = "21000";
+        if (chain_id === "42161" || chain_id === "421614") {
+            txParams['gas'] = "1700000";
+        } else {
+            txParams['gas'] = "21000";
+        }
     } else {
         let sendGasPrice = txParams.gasPrice;
         delete txParams.gasPrice;

package/src/utils.ts

@@ -428,6 +428,20 @@ const passwordValidator = function (value: string) {
     }
 };
 
+export const inputMaskedPassword = async (text: string, validate_func?: Function) => {
+    const questions = [
+        {
+            name: 'inputText',
+            type: 'password',
+            mask: '#',
+            message: `${text}:`,
+            validate: validate_func
+        },
+    ]
+    const { inputText } = await inquirer.prompt(questions)
+    return inputText.trim().toString()
+}
+
 export const inputPasswordWithoutValidator = async (text: string) => {
     const questions = [
         {