addr to address

src/HTTP/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/IPC/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/WS/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/abi/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/account/index.ts

@@ -35,15 +35,15 @@ class AccountClass extends addrAccount {
             this.privateKey = null;
             this.publicKey = null;
         } else {
-            const { pubKey, privKey, hexAddr } = privToAddr.createAddressByPrivateKey(privateKey);
+            const addrObj = privToAddr.createAddressByPrivateKey(privateKey);
 
-            if (privateKey && address && hexAddr !== address) {
+            if (privateKey && address && addrObj.address !== address) {
                 throw new Error(`Private key does not match address ${ address }`);
             }
 
-            super({ address: hexAddr, client });
-            this.privateKey = privKey;
-            this.publicKey = pubKey;
+            super({ address: addrObj.address, client });
+            this.privateKey = addrObj.privateKey;
+            this.publicKey = addrObj.publicKey;
         }
 
         this._lock = true;
@@ -66,13 +66,13 @@ class AccountClass extends addrAccount {
             return;
         }
 
-        const { pubKey, privKey, hexAddr } = privToAddr.createAddressByPrivateKey(privateKey);
-        if (hexAddr !== this.address) {
+        const addrObj = privToAddr.createAddressByPrivateKey(privateKey);
+        if (addrObj.address !== this.address) {
             throw new Error(`Private key does not match address ${ this.address }`);
         }
 
-        this.privateKey = privKey;
-        this.publicKey = pubKey;
+        this.privateKey = addrObj.privateKey;
+        this.publicKey = addrObj.publicKey;
     }
 
     getPublicKey() {

src/account/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/accountBlock/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/addrAccount/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/address/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/client/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/communication/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/constant/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/error/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/hdAccount/index.ts

@@ -138,7 +138,7 @@ class HdAccountClass {
         let i;
         for (i = 0; i < this.activeAccountList.length; i++) {
             const account = this.activeAccountList[i];
-            if (account.address === addrObj.hexAddr) {
+            if (account.address === addrObj.address) {
                 break;
             }
         }
@@ -148,7 +148,7 @@ class HdAccountClass {
         }
 
         return new Account({
-            privateKey: addrObj.privKey,
+            privateKey: addrObj.privateKey,
             client: this._client
         }, { autoPow, usePledgeQuota });
     }
@@ -186,7 +186,7 @@ class HdAccountClass {
 
         let i;
         for (i = 0; i < this.addrList.length; i++) {
-            if (this.addrList[i].hexAddr === address) {
+            if (this.addrList[i].address === address) {
                 break;
             }
         }

src/hdAccount/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/hdAddr/index.ts

@@ -2,7 +2,7 @@ const bip39 = require('bip39');
 const hd = require('@sisi/ed25519-blake2b-hd-key');
 import { createAddressByPrivateKey, isAddress as _isAddress, getRealAddressFromAddress as _getRealAddressFromAddress } from '~@vite/vitejs-privtoaddr';
 import { paramsFormat } from '~@vite/vitejs-error';
-import { checkParams, bytesToHex, blake2b } from '~@vite/vitejs-utils';
+import { checkParams, blake2b } from '~@vite/vitejs-utils';
 
 import { AddrObj, Hex } from './type';
 
@@ -36,9 +36,7 @@ export function getMnemonicFromEntropy(entropy: string, wordlist: Array<String>)
     return bip39.entropyToMnemonic(entropy, wordlist);
 }
 
-export function createAddress(bits: number = 256, wordlist: Array<String>, pwd: string = '', isContract?: boolean): {
-    addr: AddrObj; entropy: string; mnemonic: string; id: Hex;
-} {
+export function createMnemonic(bits: number = 256, wordlist: Array<String>, pwd: string = '') {
     const err = checkParams({ bits }, ['bits']);
     if (err) {
         throw new Error(err.message);
@@ -48,6 +46,22 @@ export function createAddress(bits: number = 256, wordlist: Array<String>, pwd:
     const mnemonic = bip39.generateMnemonic(bits, null, wordlist);
     const entropy = bip39.mnemonicToEntropy(mnemonic, wordlist);
     const seed = bip39.mnemonicToSeedSync(mnemonic, pwd).toString('hex');
+
+    return { mnemonic, entropy, seed };
+}
+
+export function deriveKeyPair(seed, index: number) {
+    const path = getPath(index);
+    const { key } = hd.derivePath(path, seed);
+    return hd.getPublicKey(key);
+}
+
+export function createAddress(bits: number = 256, wordlist: Array<String>, pwd: string = '', isContract?: boolean): {
+    addr: AddrObj; entropy: string; mnemonic: string; id: Hex;
+} {
+    wordlist = wordlist || bip39.wordlists.EN;
+    const { mnemonic, entropy, seed } = createMnemonic(bits, wordlist, pwd);
+
     const path = getPath(0);
     const addr = getAddrFromPath(path, seed, isContract);
     const id = getId(mnemonic, wordlist);
@@ -113,15 +127,14 @@ export const getRealAddressFromAddress = _getRealAddressFromAddress;
 export const isAddress = _isAddress;
 
 
+function getPath(index: number): string {
+    return `${ ROOT_PATH }/${ index }\'`;
+}
+
 function getAddrFromPath(path: string, seed: string, isContract?: boolean): AddrObj {
     const { key } = hd.derivePath(path, seed);
     const { privateKey } = hd.getPublicKey(key);
-    const priv = bytesToHex(privateKey);
-    return createAddressByPrivateKey(priv, isContract);
-}
-
-function getPath(index: number): string {
-    return `${ ROOT_PATH }/${ index }\'`;
+    return createAddressByPrivateKey(privateKey, isContract);
 }
 
 function _getId(mnemonic: string, wordlist: Array<String>, pwd: string = '', isContract?: boolean): Hex {
@@ -136,7 +149,7 @@ function _getId(mnemonic: string, wordlist: Array<String>, pwd: string = '', isC
     }
 
     const addrObj = getAddrFromMnemonic(mnemonic, 0, wordlist, pwd, isContract);
-    const keyBuffer = Buffer.from(addrObj.hexAddr);
+    const keyBuffer = Buffer.from(addrObj.address);
     const idByte = blake2b(keyBuffer, null, 32);
     return Buffer.from(idByte).toString('hex');
 }

src/hdAddr/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {

src/keystore/encrypt.ts

@@ -79,7 +79,7 @@ export function encryptOldKeystore(privKey, pwd, selfScryptsy) {
         throw new Error(err.message);
     }
 
-    const key = createAddressByPrivateKey(privKey);
+    const addrObj = createAddressByPrivateKey(privKey);
 
     const scryptParams = {
         n,
@@ -92,7 +92,7 @@ export function encryptOldKeystore(privKey, pwd, selfScryptsy) {
     const getResult = (_encryptPwd, res) => {
         const nonce = random(12);
         const text = cipheriv({
-            rawText: key.privKey,
+            rawText: addrObj.privateKey,
             pwd: _encryptPwd,
             nonce,
             algorithm
@@ -107,7 +107,7 @@ export function encryptOldKeystore(privKey, pwd, selfScryptsy) {
         };
 
         const encryptedKeyJSON = {
-            hexAddress: key.hexAddr,
+            hexAddress: addrObj.address,
             crypto: cryptoJSON,
             id: new UUID(1).format(),
             keystoreVersion: 1,

src/keystore/type.ts

@@ -253,10 +253,10 @@ export declare type changeTransferOwnerBlock = {
 }
 
 export declare type AddrObj = {
-    addr: string;
-    pubKey: Hex;
-    privKey: Hex;
-    hexAddr: Address;
+    realAddress: string;
+    publicKey: Hex;
+    privateKey: Hex;
+    address: Address;
 }
 
 export enum BlockType {