soluser 1.0.9 → 1.0.11

package/README.md

@@ -57,3 +57,8 @@ Signature: 4BLUt5uxutbEwVywBTbAoBnG4EKb6QgsHgk3JRfjy6uJCoNjxdyYodbAhsWPXquBBwVzu
 500000005 SOL
 ```
 
+
+## import 助记词
+```shell
+$ soluser import "mnemonic words" --alias someone
+```

package/bin/index.js

@@ -8,7 +8,9 @@ const removeAccount = require('../src/commands/remove');
 const { showExamples } = require('../src/utils/example');
 const pruneAccount = require('../src/commands/prune');
 const clear = require('../src/commands/clear');
-
+  // 导入 keyfile 命令
+const showKeyfilePath = require('../src/commands/keyfile');
+const importMnemonic = require( '../src/commands/from_mnemonic');
 
 // 导入地址查询命令
 const showAddress = require('../src/commands/address');
@@ -44,6 +46,16 @@ program
     requestAirdrop(amount, alias);
   });
 
+program
+  .command('import')
+  .description('Import a Solana account from mnemonic')
+  .argument('<mnemonic>', 'mnemoic oconsole.logf the account to import')
+  .option('--alias <alias>', 'alias of account')
+  .action((mnemonic,{alias}) => {
+    console.log("alias:" ,alias)
+    importMnemonic(mnemonic, alias);
+  });
+
 // ... existing code ...
 // 定义余额查询命令
 program
@@ -77,6 +89,17 @@ program
     );
   });
 
+// ...
+
+// 定义 keyfile 命令
+program
+  .command('keyfile')
+  .alias('k')
+  .description('Output the keyfile path of the current Solana account')
+  .action(() => {
+    showKeyfilePath();
+  });
+
 
 // 定义切换账号命令（修改后）
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soluser",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "A CLI tool to manage Solana accounts (new, switch, list)",
   "main": "bin/index.js",
   "bin": {
@@ -20,9 +20,13 @@
   "author": "guahuzi",
   "license": "MIT",
   "dependencies": {
+    "@solana/web3.js": "^1.98.4",
+    "bip39": "^3.1.0",
     "chalk": "4.1.2",
     "cli-table3": "^0.6.5",
     "commander": "^14.0.2",
+    "dotenv": "^17.2.3",
+    "ed25519-hd-key": "^1.3.0",
     "readline": "^1.3.0"
   },
   "devDependencies": {
@@ -37,6 +41,7 @@
     "package-lock.json",
     "README.md"
   ],
+  "type": "commonjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/nextuser/soluser.git"

package/src/commands/from_mnemonic.js

@@ -0,0 +1,79 @@
+const  { Keypair } = require( '@solana/web3.js');
+const  bip39 = require( 'bip39');
+const  { Buffer } = require( 'buffer');
+const  dotenv = require( 'dotenv');
+const  bs58 = require( 'bs58');
+const  fs = require( 'fs');
+const  path = require( 'path');
+const {debug} = require('../utils/debug');
+//根据助记词推算密钥(secretkey)和地址(publickey)
+///const ed25519 = = require('ed25519-hd-keyed25519-hd-key')
+const ed25519 = require( 'ed25519-hd-key');
+const { fileURLToPath } = require('url');
+dotenv.config()
+// BIP44路径
+const BIP44_SOLANA_PATH = "m/44'/501'/0'/0'";
+
+
+function generate_keypair_path(mnemonic,bip44path) {
+        // 生成种子
+        const seed =  bip39.mnemonicToSeedSync(mnemonic);
+        //console.log('seed ', seed)
+        const hex_bytes=  seed.toString('hex');
+        //console.log("hex seed byte",Buffer.from(hex_bytes));
+        debug("****BIP44_PATH:",bip44path);
+        // 派生密钥
+        const derivedSeed = ed25519.derivePath(bip44path,hex_bytes).key
+        // 创建 ED25519 密钥对
+        const keypair = Keypair.fromSeed(derivedSeed.slice(0, 32)); // 只取前32字节
+        return keypair;
+}
+
+function importMnemonic(mnemonic,alias) {
+    // 验证助记词
+    if (!bip39.validateMnemonic(mnemonic)) {
+        debug("mnemonic is ",mnemonic);
+        throw new Error('无效的助记词');
+    }
+    let keypair = generate_keypair_path(mnemonic,BIP44_SOLANA_PATH);
+
+    // 对公钥进行哈希处理
+// 输出公钥和私钥
+    console.log('Address:', keypair.publicKey.toBase58());
+    //console.log('SOLANA Private Key:', bs58.encode(keypair.secretKey)); // Base64 编码私钥
+
+    write_secretekey(keypair,alias);
+}
+
+function test() {
+    // 输入助记词
+    const mnemonic = process.env.MNEMONIC; // 替换为你的助记词
+    if (!mnemonic) {
+        console.log('Your need export MNEMONIC=  ')
+        process.exit(-1)
+    }
+
+
+    importMnemonic(mnemonic,'abc');
+}
+
+
+function write_secretekey(keypair ,alias){
+    let arr = [];
+    keypair.secretKey.forEach((item)=>{
+        arr.push(item)
+    })
+
+    let account= keypair.publicKey.toBase58()
+    let msg = JSON.stringify(arr);
+    alias = alias || account;
+    //console.log('msg ', msg)
+    let file = path.resolve(process.env.HOME,".config/solana/keys/" , alias + ".json");
+    fs.writeFileSync(file,msg)
+    console.log("write file  :",file);
+}
+
+if (process.env.TEST == "true"){
+    test()
+}
+module.exports = importMnemonic;

package/src/commands/keyfile.js

@@ -0,0 +1,15 @@
+
+const { execCommand } = require('../utils/solana');
+function getKeyFilePath() {
+  const keyfile = execCommand('solana config get keypair');
+  if(keyfile && keyfile.includes('Key Path') && keyfile.includes(":")){
+    return keyfile.split(":")[1].trim();
+  }
+  throw new Error('Error: Keypair path not found in config , failed to parse' + keyfile) ;
+}
+
+function showKeyfilePath() {
+  console.log(getKeyFilePath());
+}
+
+module.exports = showKeyfilePath;

package/src/utils/example.js

@@ -1,42 +1,45 @@
 const examples = `
 
-## 查看版本
+## Check version
 
 $ soluser --version
 
 
-## 新建账号
+## create account
 
 $ soluser new  alice 
 $ soluser new  bob --word-length 12
 $ soluser new  charlie --word-length 24 --without-passphrase
 
 
-## 切换账号
+## Switch account
 
 $ soluser switch  bob
 
-
-## 列出账号
+## List all accounts
 
 $ soluser list
 
-
-## 删除账号
+## Delete account
 
 $ soluser remove alice
 
-## 查看alias对应的地址
+## View address of alias
 
 $ soluser address alice
 
-## 查看alias对应的余额
+## View balance of alias
 
 $ soluser balance alice
 
-## airdrop 给alias
+## airdrop to alias
 
 $ soluser airdrop 5 alice
+
+## import Mnemonic 
+
+$ soluser import "mnemonic ... (12words or 24words)" --alias someone
+
 `;
 
 const chalk = require('chalk');

package/src/utils/execExpectInput.js

@@ -67,7 +67,7 @@ function execExpectOutput(inputArgs, expectOut,finish_callback){
     
     child.on('close', (code) => {
       try{
-        //debug("output :",output);
+        debug("output :",output);
         //debug("code",code);
         if(expectOut) expect(output).to.include(expectOut);
         if(finish_callback) finish_callback(output);