merge dev/2.3.0

vitelabs · Jul 24, 2019 · e305e72 · e305e72
2 parents 85c54df + a0ff0f5
commit e305e72
Show file tree

Hide file tree

Showing 67 changed files with 437 additions and 106 deletions.
diff --git a/build/clean.js b/build/clean.js
@@ -22,6 +22,11 @@ files.forEach(val => {
         }
     }
 
+    const tsPath = path.join(firstP, 'tsconfig.json');
+    if (fs.existsSync(tsPath)) {
+        fs.unlinkSync(tsPath);
+    }
+
     const fPath = path.join(firstP, 'dist');
     if (!fs.existsSync(fPath)) {
         return;

diff --git a/build/vitets.js b/build/vitets.js
diff --git a/build/writePkgJson.js b/build/writePkgJson.js
@@ -4,6 +4,7 @@ const traversing = require('./traversing');
 
 const packageJsonContent = require('../common/package.json');
 const currPackageJsonContent = require('../package.json');
+const currTsConfigJsonContent = require('../tsconfig.json');
 const lernaJsonContent = require('../lerna.json');
 
 // Change `dist/${packageName}.${"node"||"web"}.js` to `src/${packageName}/index.${"node"||"web"}.js`
@@ -42,4 +43,12 @@ function copyFile({ fromPath, name }) {
 
     const packageFile = path.join(fromPath, './package.json');
     fs.writeFileSync(packageFile, JSON.stringify(packageJsonContent));
+
+    const tsConfigFile = path.join(fromPath, './tsconfig.json');
+    delete currTsConfigJsonContent.compilerOptions.baseUrl;
+    delete currTsConfigJsonContent.compilerOptions.paths;
+    delete currTsConfigJsonContent.compilerOptions.outDir;
+    delete currTsConfigJsonContent.include;
+    delete currTsConfigJsonContent.exclude;
+    fs.writeFileSync(tsConfigFile, JSON.stringify(currTsConfigJsonContent));
 }
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.2.6",
+    "version": "2.2.8",
     "packages": [
         "src/*"
     ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vite/vitejs",
-    "version": "2.2.6",
+    "version": "2.2.8",
     "description": "",
     "scripts": {
         "format-type": "node build/type",

diff --git a/src/HTTP/package.json b/src/HTTP/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-http","version":"2.2.6","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
+{"name":"@vite/vitejs-http","version":"2.2.8","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
diff --git a/src/HTTP/tsconfig.json b/src/HTTP/tsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"allowSyntheticDefaultImports":true,"allowJs":true,"target":"es5","module":"commonjs","noImplicitAny":false,"removeComments":true,"preserveConstEnums":true,"sourceMap":false,"moduleResolution":"node","resolveJsonModule":true,"lib":["es5","es2017","es2015","es2017.typedarrays"]}}
diff --git a/src/HTTP/type.ts b/src/HTTP/type.ts
@@ -27,9 +27,13 @@ export enum TxType {
     'DexFundNewOrder',
     'DexTradeCancelOrder',
     'DexFundNewMarket',
-    'CreateContractReq',
     'DexFundPledgeForVx',
     'DexFundPledgeForVip',
+    'DexFundBindInviteCode',
+    'DexFundNewInviter',
+    'DexFundTransferTokenOwner',
+    'DexFundMarketOwnerConfig',
+    'CreateContractReq',
     'TxReq',
     'RewardReq',
     'TxRes',
@@ -364,7 +368,8 @@ export enum dexfund {
     'getAccountFundInfo' = 'dexfund_getAccountFundInfo',
     'getAccountFundInfoByStatus' = 'dexfund_getAccountFundInfoByStatus',
     'isPledgeVip' = 'dexfund_isPledgeVip',
-    'getMarketInfo' = 'dexfund_getMarketInfo'
+    'getMarketInfo' = 'dexfund_getMarketInfo',
+    'getCurrentDividendPools' = 'dexfund_getCurrentDividendPools'
 }
 
 export enum net {

diff --git a/src/IPC/package.json b/src/IPC/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-ipc","version":"2.2.6","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
+{"name":"@vite/vitejs-ipc","version":"2.2.8","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
diff --git a/src/IPC/tsconfig.json b/src/IPC/tsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"allowSyntheticDefaultImports":true,"allowJs":true,"target":"es5","module":"commonjs","noImplicitAny":false,"removeComments":true,"preserveConstEnums":true,"sourceMap":false,"moduleResolution":"node","resolveJsonModule":true,"lib":["es5","es2017","es2015","es2017.typedarrays"]}}
diff --git a/src/IPC/type.ts b/src/IPC/type.ts
@@ -27,9 +27,13 @@ export enum TxType {
     'DexFundNewOrder',
     'DexTradeCancelOrder',
     'DexFundNewMarket',
-    'CreateContractReq',
     'DexFundPledgeForVx',
     'DexFundPledgeForVip',
+    'DexFundBindInviteCode',
+    'DexFundNewInviter',
+    'DexFundTransferTokenOwner',
+    'DexFundMarketOwnerConfig',
+    'CreateContractReq',
     'TxReq',
     'RewardReq',
     'TxRes',
@@ -364,7 +368,8 @@ export enum dexfund {
     'getAccountFundInfo' = 'dexfund_getAccountFundInfo',
     'getAccountFundInfoByStatus' = 'dexfund_getAccountFundInfoByStatus',
     'isPledgeVip' = 'dexfund_isPledgeVip',
-    'getMarketInfo' = 'dexfund_getMarketInfo'
+    'getMarketInfo' = 'dexfund_getMarketInfo',
+    'getCurrentDividendPools' = 'dexfund_getCurrentDividendPools'
 }
 
 export enum net {

diff --git a/src/WS/package.json b/src/WS/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-ws","version":"2.2.6","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
+{"name":"@vite/vitejs-ws","version":"2.2.8","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
diff --git a/src/WS/tsconfig.json b/src/WS/tsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"allowSyntheticDefaultImports":true,"allowJs":true,"target":"es5","module":"commonjs","noImplicitAny":false,"removeComments":true,"preserveConstEnums":true,"sourceMap":false,"moduleResolution":"node","resolveJsonModule":true,"lib":["es5","es2017","es2015","es2017.typedarrays"]}}
diff --git a/src/WS/type.ts b/src/WS/type.ts
@@ -27,9 +27,13 @@ export enum TxType {
     'DexFundNewOrder',
     'DexTradeCancelOrder',
     'DexFundNewMarket',
-    'CreateContractReq',
     'DexFundPledgeForVx',
     'DexFundPledgeForVip',
+    'DexFundBindInviteCode',
+    'DexFundNewInviter',
+    'DexFundTransferTokenOwner',
+    'DexFundMarketOwnerConfig',
+    'CreateContractReq',
     'TxReq',
     'RewardReq',
     'TxRes',
@@ -364,7 +368,8 @@ export enum dexfund {
     'getAccountFundInfo' = 'dexfund_getAccountFundInfo',
     'getAccountFundInfoByStatus' = 'dexfund_getAccountFundInfoByStatus',
     'isPledgeVip' = 'dexfund_isPledgeVip',
-    'getMarketInfo' = 'dexfund_getMarketInfo'
+    'getMarketInfo' = 'dexfund_getMarketInfo',
+    'getCurrentDividendPools' = 'dexfund_getCurrentDividendPools'
 }
 
 export enum net {

diff --git a/src/abi/coder/index.ts b/src/abi/coder/index.ts
@@ -47,6 +47,7 @@ export function encodeParameters(types, params) {
         throw new Error('[Error] Illegal inputs. Inputs should be array.');
     }
 
+    // console.log(types);
     if (!types.length) {
         return '';
     }
@@ -103,6 +104,8 @@ export function decodeParameter(typeStr, params) {
 }
 
 export function decodeParameters(types, params) {
+    // console.log('startDecode', types, params);
+
     if (!isArray(types)) {
         throw new Error('[Error] Illegal types. Should be array.');
     }
@@ -117,7 +120,7 @@ export function decodeParameters(types, params) {
 
     types.forEach(type => {
         const typeObj = formatType(type);
-
+        // console.log(typeObj);
         if (!typeObj.isDynamic && typeObj.isArr) {
             let len = 0;
             typeObj.arrLen.forEach(_l => {

diff --git a/src/abi/index.ts b/src/abi/index.ts
@@ -23,16 +23,20 @@ export const decodeParameter = _decodeParameter;
 
 export function encodeParameters(types, params, mehtodName?: string) {
     try {
-        const func = getFunction(types, mehtodName);
-        types = getTypes(func);
+        if (mehtodName || !isArray(types) && isObject(types)) {
+            const func = getFunction(types, mehtodName);
+            types = getTypes(func);
+        }
     } catch (err) {}
 
     return _encodeParameters(getTypes(types), params);
 }
 export function decodeParameters(types, params, mehtodName?: string) {
     try {
-        const func = getFunction(types, mehtodName);
-        types = getTypes(func);
+        if (mehtodName || !isArray(types) && isObject(types)) {
+            const func = getFunction(types, mehtodName);
+            types = getTypes(func);
+        }
     } catch (err) {}
     return _decodeParameters(getTypes(types), params);
 }

diff --git a/src/abi/package.json b/src/abi/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-abi","version":"2.2.6","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
+{"name":"@vite/vitejs-abi","version":"2.2.8","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
diff --git a/src/abi/tsconfig.json b/src/abi/tsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"allowSyntheticDefaultImports":true,"allowJs":true,"target":"es5","module":"commonjs","noImplicitAny":false,"removeComments":true,"preserveConstEnums":true,"sourceMap":false,"moduleResolution":"node","resolveJsonModule":true,"lib":["es5","es2017","es2015","es2017.typedarrays"]}}
diff --git a/src/abi/type.ts b/src/abi/type.ts
@@ -27,9 +27,13 @@ export enum TxType {
     'DexFundNewOrder',
     'DexTradeCancelOrder',
     'DexFundNewMarket',
-    'CreateContractReq',
     'DexFundPledgeForVx',
     'DexFundPledgeForVip',
+    'DexFundBindInviteCode',
+    'DexFundNewInviter',
+    'DexFundTransferTokenOwner',
+    'DexFundMarketOwnerConfig',
+    'CreateContractReq',
     'TxReq',
     'RewardReq',
     'TxRes',
@@ -364,7 +368,8 @@ export enum dexfund {
     'getAccountFundInfo' = 'dexfund_getAccountFundInfo',
     'getAccountFundInfoByStatus' = 'dexfund_getAccountFundInfoByStatus',
     'isPledgeVip' = 'dexfund_isPledgeVip',
-    'getMarketInfo' = 'dexfund_getMarketInfo'
+    'getMarketInfo' = 'dexfund_getMarketInfo',
+    'getCurrentDividendPools' = 'dexfund_getCurrentDividendPools'
 }
 
 export enum net {

diff --git a/src/account/package.json b/src/account/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-account","version":"2.2.6","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
+{"name":"@vite/vitejs-account","version":"2.2.8","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
diff --git a/src/account/tsconfig.json b/src/account/tsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"allowSyntheticDefaultImports":true,"allowJs":true,"target":"es5","module":"commonjs","noImplicitAny":false,"removeComments":true,"preserveConstEnums":true,"sourceMap":false,"moduleResolution":"node","resolveJsonModule":true,"lib":["es5","es2017","es2015","es2017.typedarrays"]}}
diff --git a/src/account/type.ts b/src/account/type.ts
@@ -27,9 +27,13 @@ export enum TxType {
     'DexFundNewOrder',
     'DexTradeCancelOrder',
     'DexFundNewMarket',
-    'CreateContractReq',
     'DexFundPledgeForVx',
     'DexFundPledgeForVip',
+    'DexFundBindInviteCode',
+    'DexFundNewInviter',
+    'DexFundTransferTokenOwner',
+    'DexFundMarketOwnerConfig',
+    'CreateContractReq',
     'TxReq',
     'RewardReq',
     'TxRes',
@@ -364,7 +368,8 @@ export enum dexfund {
     'getAccountFundInfo' = 'dexfund_getAccountFundInfo',
     'getAccountFundInfoByStatus' = 'dexfund_getAccountFundInfoByStatus',
     'isPledgeVip' = 'dexfund_isPledgeVip',
-    'getMarketInfo' = 'dexfund_getMarketInfo'
+    'getMarketInfo' = 'dexfund_getMarketInfo',
+    'getCurrentDividendPools' = 'dexfund_getCurrentDividendPools'
 }
 
 export enum net {

diff --git a/src/accountBlock/package.json b/src/accountBlock/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-accountblock","version":"2.2.6","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
+{"name":"@vite/vitejs-accountblock","version":"2.2.8","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
diff --git a/src/accountBlock/tsconfig.json b/src/accountBlock/tsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"allowSyntheticDefaultImports":true,"allowJs":true,"target":"es5","module":"commonjs","noImplicitAny":false,"removeComments":true,"preserveConstEnums":true,"sourceMap":false,"moduleResolution":"node","resolveJsonModule":true,"lib":["es5","es2017","es2015","es2017.typedarrays"]}}
diff --git a/src/accountBlock/type.ts b/src/accountBlock/type.ts
@@ -27,9 +27,13 @@ export enum TxType {
     'DexFundNewOrder',
     'DexTradeCancelOrder',
     'DexFundNewMarket',
-    'CreateContractReq',
     'DexFundPledgeForVx',
     'DexFundPledgeForVip',
+    'DexFundBindInviteCode',
+    'DexFundNewInviter',
+    'DexFundTransferTokenOwner',
+    'DexFundMarketOwnerConfig',
+    'CreateContractReq',
     'TxReq',
     'RewardReq',
     'TxRes',
@@ -364,7 +368,8 @@ export enum dexfund {
     'getAccountFundInfo' = 'dexfund_getAccountFundInfo',
     'getAccountFundInfoByStatus' = 'dexfund_getAccountFundInfoByStatus',
     'isPledgeVip' = 'dexfund_isPledgeVip',
-    'getMarketInfo' = 'dexfund_getMarketInfo'
+    'getMarketInfo' = 'dexfund_getMarketInfo',
+    'getCurrentDividendPools' = 'dexfund_getCurrentDividendPools'
 }
 
 export enum net {

diff --git a/src/addrAccount/package.json b/src/addrAccount/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-addraccount","version":"2.2.6","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
+{"name":"@vite/vitejs-addraccount","version":"2.2.8","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
diff --git a/src/addrAccount/tsconfig.json b/src/addrAccount/tsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"allowSyntheticDefaultImports":true,"allowJs":true,"target":"es5","module":"commonjs","noImplicitAny":false,"removeComments":true,"preserveConstEnums":true,"sourceMap":false,"moduleResolution":"node","resolveJsonModule":true,"lib":["es5","es2017","es2015","es2017.typedarrays"]}}
diff --git a/src/addrAccount/type.ts b/src/addrAccount/type.ts
@@ -27,9 +27,13 @@ export enum TxType {
     'DexFundNewOrder',
     'DexTradeCancelOrder',
     'DexFundNewMarket',
-    'CreateContractReq',
     'DexFundPledgeForVx',
     'DexFundPledgeForVip',
+    'DexFundBindInviteCode',
+    'DexFundNewInviter',
+    'DexFundTransferTokenOwner',
+    'DexFundMarketOwnerConfig',
+    'CreateContractReq',
     'TxReq',
     'RewardReq',
     'TxRes',
@@ -364,7 +368,8 @@ export enum dexfund {
     'getAccountFundInfo' = 'dexfund_getAccountFundInfo',
     'getAccountFundInfoByStatus' = 'dexfund_getAccountFundInfoByStatus',
     'isPledgeVip' = 'dexfund_isPledgeVip',
-    'getMarketInfo' = 'dexfund_getMarketInfo'
+    'getMarketInfo' = 'dexfund_getMarketInfo',
+    'getCurrentDividendPools' = 'dexfund_getCurrentDividendPools'
 }
 
 export enum net {

diff --git a/src/client/index.ts b/src/client/index.ts
@@ -151,6 +151,9 @@ class ClientClass extends netProcessor {
             list.push(item);
         });
 
+        if (list.length > totalNum) {
+            console.warn('[client.getTxList] Please confirm that totalNum is correct.');
+        }
         return { list, totalNum };
     }
 

diff --git a/src/client/package.json b/src/client/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-client","version":"2.2.6","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
+{"name":"@vite/vitejs-client","version":"2.2.8","main":"dist/index.node.js","browser":"dist/index.web.js","typings":"index.ts","repository":{"type":"git","url":"git+https://github.com/vitelabs/vite.js.git"},"license":"ISC","bugs":{"url":"https://github.com/vitelabs/vite.js/issues"},"homepage":"https://github.com/vitelabs/vite.js#readme","publishConfig":{"access":"public"}}
diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"allowSyntheticDefaultImports":true,"allowJs":true,"target":"es5","module":"commonjs","noImplicitAny":false,"removeComments":true,"preserveConstEnums":true,"sourceMap":false,"moduleResolution":"node","resolveJsonModule":true,"lib":["es5","es2017","es2015","es2017.typedarrays"]}}