Skip to content

Commit

Permalink
Merge pull request #82 from vitelabs/dev/2.3.19
Browse files Browse the repository at this point in the history 
Dev/2.3.19
  • Loading branch information
@AllenLiuxt
AllenLiuxt committed Sep 17, 2022
2 parents 5275ec4 + 77f5933 commit 7b62704
Show file tree
Hide file tree
Showing 98 changed files with 9,608 additions and 5,151 deletions.
8 changes: 5 additions & 3 deletions .eslintrc.js
View file
Expand Up @@ -4,10 +4,12 @@ module.exports = {
'@typescript-eslint'
],
'env': {
'es2020': true,
'browser': true,
'commonjs': true,
'es6': true,
'node': true
// 'es6': true,
'node': true,
'mocha': true
},
'parserOptions': {
'ecmaFeatures': {'jsx': true},
Expand All @@ -29,7 +31,7 @@ module.exports = {
'guard-for-in': 'off',
'no-throw-literal': 'off',
'prefer-promise-reject-errors': 'off',
'eqeqeq': 'error',
'eqeqeq': [ 'error', 'smart' ],
'no-else-return': 'error',
'no-labels': 'error',
'no-return-assign': 'error',
Expand Down
4 changes: 2 additions & 2 deletions .nycrc
View file
Expand Up @@ -15,6 +15,6 @@
"html",
"text"
],
"sourceMap": false,
"sourceMap": true,
"instrument": true
}
}
132 changes: 132 additions & 0 deletions CHANGELOG.md
View file
@@ -1,3 +1,135 @@
## [2.3.19](https://github.com/vitelabs/vite.js/compare/v2.3.19-alpha.8...v2.3.19) (2022-09-17)


### chore

* 2.3.19-alpha.8 changelog ([03d3b6d](https://github.com/vitelabs/vite.js/commit/03d3b6d6ea52983e6b16a64cb14c0889747fbe4b))

### refactor

* connect handler and provider ([e3dcc6e](https://github.com/vitelabs/vite.js/commit/e3dcc6e56aafbd57980ba7a0a4f04267e092305d))

### test

* fix ([2481799](https://github.com/vitelabs/vite.js/commit/24817998e06bd79d9a4de6a52db603bc50507c49))
* use buidl ([1b69488](https://github.com/vitelabs/vite.js/commit/1b69488c857f0f1066415803b55fbb7ed7cc74a4))



## [2.3.19-alpha.8](https://github.com/vitelabs/vite.js/compare/v2.3.19-alpha.7...v2.3.19-alpha.8) (2022-08-18)


### chore

* 2.3.19-alpha.7 changelog ([634d926](https://github.com/vitelabs/vite.js/commit/634d926114173737ce760bacc48fde9c2b7495f2))

### refactor

* fix types and add more test ([7b36a6c](https://github.com/vitelabs/vite.js/commit/7b36a6cce6f4f8e4ae4f1dfbbdfd4a47a93f4103))
* new abi ([7e99408](https://github.com/vitelabs/vite.js/commit/7e99408c6d74f5e66daf7266f7f953a2cae2a9cd)), closes [#77](https://github.com/vitelabs/vite.js/issues/77)



## [2.3.19-alpha.7](https://github.com/vitelabs/vite.js/compare/v2.3.19-alpha.6...v2.3.19-alpha.7) (2022-07-30)


### chore

* 2.3.19-alpha.6 changelog ([f0ca4ba](https://github.com/vitelabs/vite.js/commit/f0ca4ba5997babee182b2164e8780379319cc67a))

### fix

* process polyfill ([37c9631](https://github.com/vitelabs/vite.js/commit/37c9631d9ea227411956dd3e051a59c364ae1270))



## [2.3.19-alpha.6](https://github.com/vitelabs/vite.js/compare/v2.3.19-alpha.5...v2.3.19-alpha.6) (2022-07-29)


### chore

* 2.3.19-alpha.5 changelog ([5fa4e5d](https://github.com/vitelabs/vite.js/commit/5fa4e5d8679ad6278ce5f6f0cee4ea7664050989))

### fix

* webpack polyfill ([9f9c48f](https://github.com/vitelabs/vite.js/commit/9f9c48f7c9884bcc41b4036146598b00fdb205d7))



## [2.3.19-alpha.5](https://github.com/vitelabs/vite.js/compare/v2.3.19-alpha.4...v2.3.19-alpha.5) (2022-07-27)


### build

* fix buffer polyfill ([4e5f08a](https://github.com/vitelabs/vite.js/commit/4e5f08a880cf54e104ae78a2a992ac2a0752b758))

### chore

* 2.3.19-alpha.4 changelog ([4673804](https://github.com/vitelabs/vite.js/commit/4673804930d7a7c961eb818ff066ccbe4ec6f103))



## [2.3.19-alpha.4](https://github.com/vitelabs/vite.js/compare/v2.3.19-alpha.3...v2.3.19-alpha.4) (2022-07-26)


### chore

* 2.3.19-alpha.3 changelog ([2529d33](https://github.com/vitelabs/vite.js/commit/2529d332b8bb2dbb5ccff7f3936e01c2716ee2e4))

### fix

* params ([776a3af](https://github.com/vitelabs/vite.js/commit/776a3af27939465cecbf37d74ecd008c91564bbb))



## [2.3.19-alpha.3](https://github.com/vitelabs/vite.js/compare/v2.3.19-alpha.2...v2.3.19-alpha.3) (2022-05-09)


### chore

* 2.3.19-alpha.2 changelog ([71a3cbb](https://github.com/vitelabs/vite.js/commit/71a3cbbbb8b24bfcac638eb2f1df03e369370663))

### feat

* add rpc modules into main package ([652686d](https://github.com/vitelabs/vite.js/commit/652686d22178ad03595ccbe25798c3378cc4f473))
* add support for dex internal transfer, agent deposit and assigned withdraw ([b7756cc](https://github.com/vitelabs/vite.js/commit/b7756cc60dcc895e6c1d473b05cdb5f4aa9d91bc))
* refactor reconnect and support for renew subscription ([5bd74e1](https://github.com/vitelabs/vite.js/commit/5bd74e135dfcdb6e86e5fe33cbf78d56534ee823))



## [2.3.19-alpha.2](https://github.com/vitelabs/vite.js/compare/v2.3.19-alpha.1...v2.3.19-alpha.2) (2022-04-22)


### chore

* use tsc-alias ([cc9d06c](https://github.com/vitelabs/vite.js/commit/cc9d06ceac0b3e04bd92966e2af3ea6e3e292ac2))
* v2.3.19-alpha.1 changelog ([59012a1](https://github.com/vitelabs/vite.js/commit/59012a18a70b052aa1cde4858f4a62c410cb96d8))

### fix

* make keepalive default ([7719e50](https://github.com/vitelabs/vite.js/commit/7719e50f9f413e3e4ed0fc9e563656435d83fe00))

### test

* add test case ([f566fdf](https://github.com/vitelabs/vite.js/commit/f566fdff92ad48eb74696a349fbf65416083033a))
* add test case for decodeLog ([ba64095](https://github.com/vitelabs/vite.js/commit/ba640954f654582c7d1612dfd092a31a86c2595f))



## [2.3.19-alpha.1](https://github.com/vitelabs/vite.js/compare/v2.3.18...v2.3.19-alpha.1) (2022-04-20)


### chore

* 2.3.18 changelog ([0350a4a](https://github.com/vitelabs/vite.js/commit/0350a4a89d18815178dc3e8339f256a37aaf679c))
* remove outdated package ([686ad6b](https://github.com/vitelabs/vite.js/commit/686ad6b1279867362ac0584d562d077bd01e1aed))

### fix

* lint ([ce26532](https://github.com/vitelabs/vite.js/commit/ce26532f3f945205301806bd006bc6a714bab5fa))



## [2.3.18](https://github.com/vitelabs/vite.js/compare/v2.3.18-alpha.3...v2.3.18) (2022-04-02)


Expand Down
5 changes: 3 additions & 2 deletions build/writePkgJson.js
View file
Expand Up @@ -45,8 +45,9 @@ function copyFile({ fromPath, name }) {
fs.writeFileSync(packageFile, `${ JSON.stringify(packageJsonContent, null, 4) }\n`);

const tsConfigFile = path.join(fromPath, './tsconfig.json');
delete currTsConfigJsonContent.compilerOptions.baseUrl;
delete currTsConfigJsonContent.compilerOptions.paths;
currTsConfigJsonContent.compilerOptions.baseUrl = '../';
// delete currTsConfigJsonContent.compilerOptions.baseUrl;
// delete currTsConfigJsonContent.compilerOptions.paths;
delete currTsConfigJsonContent.compilerOptions.outDir;
delete currTsConfigJsonContent.include;
delete currTsConfigJsonContent.exclude;
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
@@ -1,5 +1,5 @@
{
"version": "2.3.18",
"version": "2.3.19",
"packages": [
"src/*"
],
Expand Down
12 changes: 3 additions & 9 deletions package.json
View file
Expand Up @@ -7,7 +7,7 @@
"prebuild": "rm -rf ./dist && rm -rf ./distSrc && node build/clean",
"build:node": "cross-env build_target=node webpack",
"build:web": "cross-env build_target=web webpack",
"build:vitejsES5": "tsc && node build/vitejsES5",
"build:vitejsES5": "tsc && tsc-alias",
"build:vitets": "cp -r ./src/. ./distSrc && cp -r ./distSrc ./src/vitejs/distSrc",
"build:vitejs": "yarn run build:vitets && yarn run build:vitejsES5",
"build:all": "yarn run build:node && yarn run build:web",
Expand Down Expand Up @@ -43,9 +43,7 @@
"devDependencies": {
"@babel/cli": "^7.17.6",
"@babel/core": "^7.17.7",
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.16.11",
"@babel/preset-es2015": "^7.0.0-beta.53",
"@babel/register": "^7.17.7",
"@babel/eslint-parser": "^7.17.0",
"@types/bn.js": "^4.11.6",
Expand All @@ -55,8 +53,6 @@
"@types/node": "^16.11.26",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/parser": "^5.15.0",
"@vite/vitejs": "^2.3.17",
"@vite/vitejs-ws": "^2.3.17",
"babel-loader": "^8.2.3",
"babel-plugin-istanbul": "^6.1.1",
"babelify": "^10.0.0",
Expand All @@ -80,9 +76,8 @@
"terser-webpack-plugin": "^5.3.1",
"ts-loader": "^9.2.8",
"ts-node": "^10.7.0",
"tsc-alias": "^1.6.6",
"tsconfig-paths": "^3.14.0",
"typedoc": "^0.22.13",
"typedoc-webpack-plugin": "^1.1.4",
"typescript": "^4.6.2",
"webpack": "^5.70.0",
"webpack-cli": "^4.9.2",
Expand All @@ -102,7 +97,6 @@
"jsonrpc-lite": "^2.2.0",
"net": "^1.0.2",
"pure-uuid": "^1.6.2",
"qs": "^6.10.3",
"scryptsy": "^2.1.0",
"websocket": "^1.0.34",
"xhr2": "^0.2.1"
Expand All @@ -124,7 +118,7 @@
"html",
"text"
],
"sourceMap": false,
"sourceMap": true,
"instrument": true
}
}
6 changes: 3 additions & 3 deletions src/HTTP/index.js
View file
Expand Up @@ -3,7 +3,7 @@ const XMLHttpRequest = typeof window !== 'undefined' && window.XMLHttpRequest
? window.XMLHttpRequest : require('xhr2');

class HttpRpc extends Communication {
constructor(host = 'http://localhost:8415', timeout = 60000, options = { headers: [] }) {
constructor(host = 'http://localhost:23456', timeout = 60000, options = { headers: [] }) {
super();

this.type = 'http';
Expand Down Expand Up @@ -73,7 +73,7 @@ class HttpRpc extends Communication {
return rej(result);
}
} catch (e) {
return rej(this.ERRORS.INVAILID_RESPONSE(result));
return rej(this.ERRORS.INVALID_RESPONSE(result));
}

return res(result);
Expand All @@ -98,7 +98,7 @@ class HttpRpc extends Communication {

return this._send(requestObj).then(res => {
if (!res) {
throw this.ERRORS.INVAILID_RESPONSE(res);
throw this.ERRORS.INVALID_RESPONSE(res);
}

return {
Expand Down
2 changes: 1 addition & 1 deletion src/HTTP/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@vite/vitejs-http",
"version": "2.3.18",
"version": "2.3.19",
"main": "dist/index.node.js",
"browser": "dist/index.web.js",
"repository": {
Expand Down
57 changes: 57 additions & 0 deletions src/HTTP/tsconfig.json
View file
Expand Up @@ -10,6 +10,63 @@
"sourceMap": false,
"moduleResolution": "node",
"resolveJsonModule": true,
"baseUrl": "../",
"paths": {
"~@vite/vitejs-abi": [
"abi/index.ts"
],
"~@vite/vitejs-abi/*": [
"abi/*"
],
"~@vite/vitejs-accountblock": [
"accountBlock/index.ts"
],
"~@vite/vitejs-accountblock/*": [
"accountBlock/*"
],
"~@vite/vitejs-communication": [
"communication/index.js"
],
"~@vite/vitejs-communication/*": [
"communication/*"
],
"~@vite/vitejs-constant": [
"constant/index.ts"
],
"~@vite/vitejs-error": [
"error/index.ts"
],
"~@vite/vitejs-keystore": [
"keystore/index.ts"
],
"~@vite/vitejs-viteapi": [
"viteAPI/index.ts"
],
"~@vite/vitejs-viteapi/*": [
"viteAPI/*"
],
"~@vite/vitejs-wallet": [
"wallet/index.ts"
],
"~@vite/vitejs-wallet/*": [
"wallet/*"
],
"~@vite/vitejs-utils": [
"utils/index.ts"
],
"~@vite/vitejs-ws": [
"WS/index.js"
],
"~@vite/vitejs-http": [
"HTTP/index.js"
],
"~@vite/vitejs-ipc": [
"IPC/index.js"
],
"~@vite/vitejs": [
"vitejs/index.ts"
]
},
"lib": [
"es5",
"es2017",
Expand Down
5 changes: 4 additions & 1 deletion src/HTTP/type.ts
View file
Expand Up @@ -80,7 +80,10 @@ export enum TransactionType {
'DexLockVxForDividend',
'DexSwitchConfig',
'DexStakeForPrincipalSVIP',
'DexCancelStakeById'
'DexCancelStakeById',
'DexTransfer',
'DexAgentDeposit',
'DexAssignedWithdraw'
}

export declare type TokenInfo = {
Expand Down

0 comments on commit 7b62704

Please sign in to comment.