feat: iWallet

AElfProject · Oct 30, 2023 · 3f0293c · 3f0293c
1 parent d30bc3f
commit 3f0293c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/types/chain/index.d.ts b/types/chain/index.d.ts
@@ -1,7 +1,7 @@
 import { Contract } from 'types/contract';
 import { RequestManager } from 'types/util/requestManage';
 import * as Bip39 from 'bip39';
-import { IWallet } from '../wallet';
+import { IWalletInfo } from '../wallet';
 import { IExtractArgumentsIntoObjectResult, TExtractArg } from './chainMethod';
 export interface IError {
   Error: {
@@ -164,7 +164,7 @@ declare class Chain {
   ): IExtractArgumentsIntoObjectResult;
   public contractAt(
     address: string,
-    wallet: IWallet,
+    wallet: IWalletInfo,
     args: { [k in string]: any }
   ): Contract | Promise<Contract>;
   public getMerklePath(

diff --git a/types/contract/contractMethod.d.ts b/types/contract/contractMethod.d.ts
@@ -1,5 +1,5 @@
 import Chain from '../chain';
-import { IWallet } from '../wallet';
+import { IWalletInfo } from '../wallet';
 import * as protobuf from '@aelfqueen/protobufjs';
 import { ITransaction } from '../util/proto';
 import { Contract } from '.';
@@ -24,7 +24,7 @@ declare class ContractMethod {
     chain: Chain,
     method: protobuf.Method,
     contractAddress: string,
-    walletInstance: IWallet
+    walletInstance: IWalletInfo
   );
   public packInput(input?: any): Buffer | null;
   public unpackPackedInput(

diff --git a/types/contract/index.d.ts b/types/contract/index.d.ts
@@ -1,7 +1,7 @@
 import Chain from '../chain';
 import { IFileDescriptorSet } from '@aelfqueen/protobufjs/ext/descriptor';
 import * as protobuf from '@aelfqueen/protobufjs/light';
-import { IWallet } from '../wallet';
+import { IWalletInfo } from '../wallet';
 import { GenericFunction } from '../util/utils';
 export class Contract {
   constructor(chain: Chain, services: Array<protobuf.Service>, address: string);
@@ -15,11 +15,11 @@ declare class ContractFactory implements IContractFactory {
   constructor(
     chain: Chain,
     fileDescriptorSet: IFileDescriptorSet,
-    wallet: IWallet
+    wallet: IWalletInfo
   );
   public static bindMethodsToContract(
     contract: Contract,
-    wallet: IWallet
+    wallet: IWalletInfo
   ): void;
 
   public at(address: string, callback: GenericFunction): Contract;

diff --git a/types/util/keyStore.d.ts b/types/util/keyStore.d.ts
@@ -1,4 +1,4 @@
-import { IWallet } from '../wallet';
+import { IWalletInfo } from '../wallet';
 
 interface IOptions {
   dklen: number;
@@ -14,7 +14,7 @@ interface IKdfparams {
   p: number;
   salt: string;
 }
-type TWalletInfo = IWallet & {
+type TWalletInfo = IWalletInfo & {
   nickName?: string;
 };
 interface ICipherparams {

diff --git a/types/wallet/index.d.ts b/types/wallet/index.d.ts
@@ -10,16 +10,16 @@ interface ISignature {
 }
 type TSignTransaction = ISignature & TRawTx;
 
-export interface IWallet {
+export interface IWalletInfo {
   BIP44Path: string;
   address: string;
-  childWallet: IWallet | string;
+  childWallet: IWalletInfo | string;
   keyPair: ec.KeyPair;
   mnemonic: string;
   privateKey: string;
 }
 
-export declare class Wallet {
+interface IWallet {
   ellipticEc: ec;
   hdkey: HDNode;
   bip39: typeof Bip39;
@@ -28,9 +28,24 @@ export declare class Wallet {
   AESDescrypt(input: string, password: string): string;
   getSignature(bytesToBeSign: string, keyPair: ec.KeyPair): Buffer;
   getAddressFromPubKey(pubKey: curve.base.BasePoint): string;
-  createNewWallet(BIP44Path?: string): IWallet;
-  getWalletByMnemonic(mnemonic: string, BIP44Path: string): IWallet;
-  getWalletByPrivateKey(privateKey: string): IWallet;
+  createNewWallet(BIP44Path?: string): IWalletInfo;
+  getWalletByMnemonic(mnemonic: string, BIP44Path: string): IWalletInfo;
+  getWalletByPrivateKey(privateKey: string): IWalletInfo;
+  signTransaction(rawTxn: ITransaction, keyPair: ec.KeyPair): TSignTransaction;
+  sign(hexString: string, keyPair: ec.KeyPair): Buffer;
+}
+export declare class Wallet implements IWallet{
+  ellipticEc: ec;
+  hdkey: HDNode;
+  bip39: typeof Bip39;
+  keyStore: typeof KeyStore;
+  AESEncrypt(input: string, password: string): string;
+  AESDescrypt(input: string, password: string): string;
+  getSignature(bytesToBeSign: string, keyPair: ec.KeyPair): Buffer;
+  getAddressFromPubKey(pubKey: curve.base.BasePoint): string;
+  createNewWallet(BIP44Path?: string): IWalletInfo;
+  getWalletByMnemonic(mnemonic: string, BIP44Path: string): IWalletInfo;
+  getWalletByPrivateKey(privateKey: string): IWalletInfo;
   signTransaction(rawTxn: ITransaction, keyPair: ec.KeyPair): TSignTransaction;
   sign(hexString: string, keyPair: ec.KeyPair): Buffer;
 }