Merge branch 'master' into dev/2.3.0

vitelabs · Jul 3, 2019 · 06151a5 · 06151a5
2 parents bdc3524 + 8316346
commit 06151a5
Show file tree

Hide file tree

Showing 44 changed files with 150 additions and 92 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.2.1",
+    "version": "2.2.2",
     "packages": [
         "src/*"
     ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vite/vitejs",
-    "version": "2.1.0",
+    "version": "2.2.2",
     "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.1","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.2","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/type.ts b/src/HTTP/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/IPC/package.json b/src/IPC/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-ipc","version":"2.2.1","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.2","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/type.ts b/src/IPC/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/WS/package.json b/src/WS/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-ws","version":"2.2.1","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.2","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/type.ts b/src/WS/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/abi/package.json b/src/abi/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-abi","version":"2.2.1","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.2","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/type.ts b/src/abi/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/account/package.json b/src/account/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-account","version":"2.2.1","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.2","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/type.ts b/src/account/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/accountBlock/builtin.ts b/src/accountBlock/builtin.ts
@@ -86,22 +86,27 @@ export function isAccountBlock({ blockType, fromBlockHash, accountAddress, messa
     return null;
 }
 
-export function getCreateContractData({ abi, hexCode, params, confirmTimes = 0, times = 10 }) {
-    const err = checkParams({ confirmTimes, times }, [ 'confirmTimes', 'times' ], [ {
-        name: 'confirmTimes',
-        func: _c => _c >= 0 && _c <= 75
+// gid + contractType + confirmTime + seedCount + quotaRatio + bytecode
+export function getCreateContractData({ abi, hexCode, params, confirmTime = '0', quotaRatio = '10', seedCount = '0' }) {
+    const err = checkParams({ confirmTime, quotaRatio, seedCount }, [ 'confirmTime', 'quotaRatio', 'seedCount' ], [ {
+        name: 'confirmTime',
+        func: _c => Number(_c) >= 0 && Number(_c) <= 75
     }, {
-        name: 'times',
-        func: _c => _c >= 10 && _c <= 100
+        name: 'quotaRatio',
+        func: _c => Number(_c) >= 10 && Number(_c) <= 100
+    }, {
+        name: 'seedCount',
+        func: _c => Number(_c) >= 0 && Number(_c) <= 75
     } ]);
     if (err) {
         throw err;
     }
 
     const jsonInterface = getAbi(abi);
-    const _confirmTimes = new BigNumber(confirmTimes).toArray();
-    const _times = new BigNumber(times).toArray();
-    let data = `${ Delegate_Gid }01${ Buffer.from(_confirmTimes).toString('hex') }${ Buffer.from(_times).toString('hex') }${ hexCode }`;
+    const _confirmTime = new BigNumber(confirmTime).toArray();
+    const _seedCount = new BigNumber(seedCount).toArray();
+    const _quotaRatio = new BigNumber(quotaRatio).toArray();
+    let data = `${ Delegate_Gid }01${ Buffer.from(_confirmTime).toString('hex') }${ Buffer.from(_seedCount).toString('hex') }${ Buffer.from(_quotaRatio).toString('hex') }${ hexCode }`;
 
     if (jsonInterface) {
         data += encodeParameters(jsonInterface, params);

diff --git a/src/accountBlock/package.json b/src/accountBlock/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-accountblock","version":"2.2.1","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.2","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/type.ts b/src/accountBlock/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/addrAccount/package.json b/src/addrAccount/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-addraccount","version":"2.2.1","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.2","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/type.ts b/src/addrAccount/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/client/package.json b/src/client/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-client","version":"2.2.1","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.2","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/txBlock.ts b/src/client/txBlock.ts
@@ -126,17 +126,21 @@ export default class Tx {
         });
     }
 
-    async createContract({ accountAddress, tokenId = Vite_TokenId, amount = '0', fee = '10000000000000000000', times = 10, hexCode, abi, params, height, prevHash, confirmTimes = 0 }: createContractBlock, requestType = 'async') {
-        const err = checkParams({ hexCode, abi, tokenId, amount, fee, confirmTimes, requestType, times }, [ 'hexCode', 'abi', 'tokenId', 'amount', 'fee', 'confirmTimes', 'times' ], [ {
-            name: 'confirmTimes',
-            func: _c => _c >= 0 && _c <= 75
-        }, {
-            name: 'times',
-            func: _c => _c >= 10 && _c <= 100
-        }, {
-            name: 'requestType',
-            func: validReqType
-        } ]);
+    async createContract({ accountAddress, tokenId = Vite_TokenId, amount = '0', fee = '10000000000000000000', confirmTime = '0', quotaRatio = '10', seedCount = '0', hexCode, abi, params, height, prevHash }: createContractBlock, requestType = 'async') {
+        const err = checkParams({ hexCode, abi, tokenId, amount, fee, confirmTime, requestType, quotaRatio, seedCount }, [ 'hexCode', 'abi', 'tokenId', 'amount', 'fee', 'confirmTime', 'quotaRatio', 'seedCount' ],
+            [ {
+                name: 'confirmTime',
+                func: _c => Number(_c) >= 0 && Number(_c) <= 75
+            }, {
+                name: 'quotaRatio',
+                func: _c => Number(_c) >= 10 && Number(_c) <= 100
+            }, {
+                name: 'seedCount',
+                func: _c => Number(_c) >= 0 && Number(_c) <= 75
+            }, {
+                name: 'requestType',
+                func: validReqType
+            } ]);
         if (err) {
             throw err;
         }
@@ -146,7 +150,7 @@ export default class Tx {
             : getAccountBlock({ blockType: 1, accountAddress, height, prevHash, tokenId, amount, fee });
 
         const toAddress = await this._client.contract.getCreateContractToAddress(accountAddress, block.height, block.prevHash);
-        const data = getCreateContractData({ abi, hexCode, params, confirmTimes, times });
+        const data = getCreateContractData({ abi, hexCode, params, confirmTime, quotaRatio, seedCount });
 
         block.toAddress = toAddress;
         block.data = data;

diff --git a/src/client/type.ts b/src/client/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/communication/package.json b/src/communication/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-communication","version":"2.2.1","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-communication","version":"2.2.2","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/communication/type.ts b/src/communication/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/constant/package.json b/src/constant/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-constant","version":"2.2.1","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-constant","version":"2.2.2","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/constant/type.ts b/src/constant/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/error/package.json b/src/error/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-error","version":"2.2.1","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-error","version":"2.2.2","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/error/type.ts b/src/error/type.ts
@@ -3,6 +3,7 @@ export declare type Address = string;
 export declare type Base64 = string;
 export declare type TokenId = string;
 export declare type Int64 = number;
+export declare type Uint8 = string;
 export declare type Uint64 = string;
 export declare type BigInt = string;
 
@@ -178,9 +179,10 @@ export declare type createContractBlock = {
     abi: string;
     amount: BigInt;
     fee: BigInt;
-    times: number;
+    confirmTime: Uint8;
+    quotaRatio: Uint8;
+    seedCount: Uint8;
     tokenId?: TokenId;
-    confirmTimes: number;
     params?: string;
     prevHash?: Hex;
     height?: Uint64;

diff --git a/src/hdAccount/package.json b/src/hdAccount/package.json
@@ -1 +1 @@
-{"name":"@vite/vitejs-hdaccount","version":"2.2.1","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-hdaccount","version":"2.2.2","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"}}