feat!: rename and expose Account module

vitelabs · Jan 1, 2022 · 08361a5 · 08361a5
1 parent d8d739f
commit 08361a5
Show file tree

Hide file tree

Showing 23 changed files with 9,405 additions and 9,422 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.3.16",
+    "version": "2.3.17-alpha.1",
     "packages": [
         "src/*"
     ],

diff --git a/src/HTTP/tsconfig.json b/src/HTTP/tsconfig.json
diff --git a/src/IPC/tsconfig.json b/src/IPC/tsconfig.json
diff --git a/src/WS/tsconfig.json b/src/WS/tsconfig.json
diff --git a/src/abi/tsconfig.json b/src/abi/tsconfig.json
diff --git a/src/accountBlock/transaction.ts → src/accountBlock/account.ts b/src/accountBlock/transaction.ts → src/accountBlock/account.ts
@@ -9,7 +9,7 @@ import { getCreateContractData, getCallContractData } from './utils';
 import { Hex, Address, TokenId, BigInt, Base64, Int32, Uint8, Uint32, Uint256, Bytes32, ProviderType } from './type';
 
 
-class TransactionClass {
+class AccountClass {
     readonly address: Address
     private provider: ProviderType
     private privateKey: Hex
@@ -26,12 +26,12 @@ class TransactionClass {
         this.address = address;
     }
 
-    setProvider(provider: ProviderType): TransactionClass {
+    setProvider(provider: ProviderType): AccountClass {
         this.provider = provider;
         return this;
     }
 
-    setPrivateKey(privateKey: Hex): TransactionClass {
+    setPrivateKey(privateKey: Hex): AccountClass {
         const err = checkParams({ privateKey }, ['privateKey'], [{
             name: 'privateKey',
             func: isHexString
@@ -839,5 +839,5 @@ class TransactionClass {
     }
 }
 
-export const Transaction = TransactionClass;
-export default TransactionClass;
+export const Account = AccountClass;
+export default AccountClass;
diff --git a/src/accountBlock/index.ts b/src/accountBlock/index.ts
@@ -1,12 +1,12 @@
 import { checkParams, isObject } from '~@vite/vitejs-utils';
 
 import _AccountBlock from './accountBlock';
-import _Transaction from './transaction';
+import _Account from './account';
 import { ReceiveAccountBlockTask as _ReceiveAccountBlockTask } from './receiveAccountBlockTask';
 import * as _utils from './utils';
 
 export const AccountBlock = _AccountBlock;
-export const Transaction = _Transaction;
+export const Account = _Account;
 export const ReceiveAccountBlockTask = _ReceiveAccountBlockTask;
 export const utils = _utils;
 
@@ -22,10 +22,10 @@ export function createAccountBlock(methodName: string, params: any) {
         throw err;
     }
 
-    const tx = new _Transaction(params.address);
-    if (!tx[methodName]) {
+    const a = new _Account(params.address);
+    if (!a[methodName]) {
         throw new Error(`Don\'t support transaction type ${ methodName }`);
     }
 
-    return tx[methodName](params);
+    return a[methodName](params);
 }
diff --git a/src/accountBlock/receiveAccountBlockTask.ts b/src/accountBlock/receiveAccountBlockTask.ts
@@ -1,7 +1,7 @@
 import { isValidAddress } from '~@vite/vitejs-wallet/address';
 import { checkParams, isHexString } from '~@vite/vitejs-utils';
 
-import Transaction from './transaction';
+import Account from './account';
 
 import { Address, Hex, ProviderType, AccountBlockBlock } from './type';
 
@@ -11,7 +11,7 @@ export class ReceiveAccountBlockTask {
     private provider: ProviderType
     private sign: Function | undefined | null
     private privateKey: Hex | undefined | null
-    private _transaction: Transaction
+    private _account: Account
     private _timer: any
     private successCB: Function
     private errorCB: Function
@@ -42,11 +42,11 @@ export class ReceiveAccountBlockTask {
         this.sign = sign;
         this.privateKey = privateKey;
 
-        this._transaction = new Transaction(address);
-        this._transaction.setProvider(provider);
+        this._account = new Account(address);
+        this._account.setProvider(provider);
 
         if (privateKey) {
-            this._transaction.setPrivateKey(privateKey);
+            this._account.setPrivateKey(privateKey);
         }
 
         this._timer = null;
@@ -171,7 +171,7 @@ export class ReceiveAccountBlockTask {
     }
 
     private async receiveAccountBlockByPrevious({ sendBlockHash, previousAccountBlock }) {
-        const accountBlock = this._transaction.receive({ sendBlockHash });
+        const accountBlock = this._account.receive({ sendBlockHash });
 
         if (this.privateKey) {
             if (!previousAccountBlock) {

diff --git a/src/accountBlock/tsconfig.json b/src/accountBlock/tsconfig.json
diff --git a/src/communication/tsconfig.json b/src/communication/tsconfig.json
diff --git a/src/constant/tsconfig.json b/src/constant/tsconfig.json
diff --git a/src/error/tsconfig.json b/src/error/tsconfig.json
diff --git a/src/index.ts b/src/index.ts
@@ -3,6 +3,7 @@ import * as _error from './error/index';
 import * as _keystore from './keystore/index';
 import * as _utils from './utils/index';
 import * as _constant from './constant/index';
+import * as _account from './accountBlock/account';
 import * as _accountBlock from './accountBlock/index';
 import _viteAPI from './viteAPI/index';
 import _wallet from './wallet/index';
@@ -19,6 +20,7 @@ export const constant = _constant;
 
 // Change a lot
 export const accountBlock = _accountBlock;
+export const account = _account;
 
 // Add
 export const ViteAPI = _viteAPI;

diff --git a/src/keystore/tsconfig.json b/src/keystore/tsconfig.json
diff --git a/src/utils/tsconfig.json b/src/utils/tsconfig.json
diff --git a/src/viteAPI/tsconfig.json b/src/viteAPI/tsconfig.json
diff --git a/src/vitejs/tsconfig.json b/src/vitejs/tsconfig.json
diff --git a/src/wallet/tsconfig.json b/src/wallet/tsconfig.json