From 09a7a45bff92cf6098bdb0e3e170b0574611cac6 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Fri, 13 Dec 2019 10:29:55 +0800 Subject: [PATCH 01/18] feat: add travis ci --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..fa3068c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: node_js +sudo: true +node_js: + - '10.16' +before_install: skip + - yarn audit +install: + - yarn +script: + - yarn run build From a48087e62806ea7f66a83d656aebd97c513a7b8f Mon Sep 17 00:00:00 2001 From: travis_joe Date: Fri, 13 Dec 2019 10:35:10 +0800 Subject: [PATCH 02/18] feat: comment audit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa3068c..ca876ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: node_js sudo: true node_js: - '10.16' -before_install: skip - - yarn audit +#before_install: +# - yarn audit install: - yarn script: From cb383838370eb8b06b43f3f346a8295eabdef7a3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2019 02:49:19 +0000 Subject: [PATCH 03/18] chore(deps): bump webpack from 4.35.2 to 4.41.2 Bumps [webpack](https://github.com/webpack/webpack) from 4.35.2 to 4.41.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.35.2...v4.41.2) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 173 ++++++++++++++++++++++++++++----------------------- 2 files changed, 97 insertions(+), 78 deletions(-) diff --git a/package.json b/package.json index f4536d6..c5c90c8 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "ts-loader": "^6.0.4", "typescript": "^3.2.2", "web3-eth-abi": "^1.0.0-beta.55", - "webpack": "^4.0.0", + "webpack": "^4.41.2", "webpack-cli": "^3.1.2", "webpack-merge": "^4.1.4" }, diff --git a/yarn.lock b/yarn.lock index 886685e..183b0f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -483,11 +483,6 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-dynamic-import@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" - integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== - acorn-jsx@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" @@ -498,15 +493,10 @@ acorn-walk@^6.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw== -acorn@^6.0.5: - version "6.2.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3" - integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw== - -acorn@^6.0.7: - version "6.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" - integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA== +acorn@^6.0.7, acorn@^6.2.1: + version "6.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" + integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== add-dom-event-listener@^1.1.0: version "1.1.0" @@ -525,15 +515,15 @@ ajv-errors@^1.0.0: resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== -ajv-keywords@^3.1.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d" - integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw== +ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" + integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1: - version "6.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" - integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg== +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1: + version "6.10.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" + integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -1835,6 +1825,27 @@ cacache@^11.3.2: unique-filename "^1.1.1" y18n "^4.0.0" +cacache@^12.0.2: + version "12.0.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" + integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== + dependencies: + bluebird "^3.5.5" + chownr "^1.1.1" + figgy-pudding "^3.5.1" + glob "^7.1.4" + graceful-fs "^4.1.15" + infer-owner "^1.0.3" + lru-cache "^5.1.1" + mississippi "^3.0.0" + mkdirp "^0.5.1" + move-concurrently "^1.0.1" + promise-inflight "^1.0.1" + rimraf "^2.6.3" + ssri "^6.0.1" + unique-filename "^1.1.1" + y18n "^4.0.0" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -1974,7 +1985,7 @@ chownr@^1.1.1: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6" integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A== -chrome-trace-event@^1.0.0: +chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== @@ -2101,7 +2112,7 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1: +commander@^2.18.0, commander@^2.20.0, commander@^2.8.1: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== @@ -4703,6 +4714,11 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= +infer-owner@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -5437,7 +5453,7 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -loader-runner@^2.3.0: +loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== @@ -5690,7 +5706,7 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" -memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1: +memory-fs@^0.4.0, memory-fs@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= @@ -5729,7 +5745,7 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -5905,7 +5921,7 @@ mkdirp-promise@^5.0.1: dependencies: mkdirp "*" -mkdirp@*, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: +mkdirp@*, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -6044,7 +6060,7 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.5.0: +neo-async@^2.5.0, neo-async@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== @@ -6074,7 +6090,7 @@ node-forge@0.7.5: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df" integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ== -node-libs-browser@^2.0.0: +node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== @@ -7955,6 +7971,11 @@ serialize-javascript@^1.7.0: resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65" integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA== +serialize-javascript@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" + integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== + serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" @@ -8206,10 +8227,10 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@~0.5.10: - version "0.5.12" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" - integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== +source-map-support@~0.5.12: + version "0.5.16" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" + integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -8638,7 +8659,7 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tapable@^1.0.0, tapable@^1.1.0: +tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== @@ -8696,30 +8717,29 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" -terser-webpack-plugin@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4" - integrity sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg== +terser-webpack-plugin@^1.4.1: + version "1.4.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" + integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== dependencies: - cacache "^11.3.2" - find-cache-dir "^2.0.0" + cacache "^12.0.2" + find-cache-dir "^2.1.0" is-wsl "^1.1.0" - loader-utils "^1.2.3" schema-utils "^1.0.0" - serialize-javascript "^1.7.0" + serialize-javascript "^2.1.2" source-map "^0.6.1" - terser "^4.0.0" - webpack-sources "^1.3.0" + terser "^4.1.2" + webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.2.tgz#580cea06c4932f46a48ed13804c93bc93c275968" - integrity sha512-IWLuJqTvx97KP3uTYkFVn93cXO+EtlzJu8TdJylq+H0VBDlPMIfQA9MBS5Vc5t3xTEUG1q0hIfHMpAP2R+gWTw== +terser@^4.1.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8" + integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ== dependencies: - commander "^2.19.0" + commander "^2.20.0" source-map "~0.6.1" - source-map-support "~0.5.10" + source-map-support "~0.5.12" text-table@^0.2.0: version "0.2.0" @@ -9260,7 +9280,7 @@ warning@^4.0.2: dependencies: loose-envify "^1.0.0" -watchpack@^1.5.0: +watchpack@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA== @@ -9629,43 +9649,42 @@ webpack-merge@^4.1.4: dependencies: lodash "^4.17.5" -webpack-sources@^1.1.0, webpack-sources@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85" - integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA== +webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: + version "1.4.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== dependencies: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.0.0: - version "4.35.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.2.tgz#5c8b8a66602cbbd6ec65c6e6747914a61c1449b1" - integrity sha512-TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A== +webpack@^4.41.2: + version "4.41.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e" + integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" "@webassemblyjs/wasm-edit" "1.8.5" "@webassemblyjs/wasm-parser" "1.8.5" - acorn "^6.0.5" - acorn-dynamic-import "^4.0.0" - ajv "^6.1.0" - ajv-keywords "^3.1.0" - chrome-trace-event "^1.0.0" + acorn "^6.2.1" + ajv "^6.10.2" + ajv-keywords "^3.4.1" + chrome-trace-event "^1.0.2" enhanced-resolve "^4.1.0" - eslint-scope "^4.0.0" + eslint-scope "^4.0.3" json-parse-better-errors "^1.0.2" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - micromatch "^3.1.8" - mkdirp "~0.5.0" - neo-async "^2.5.0" - node-libs-browser "^2.0.0" + loader-runner "^2.4.0" + loader-utils "^1.2.3" + memory-fs "^0.4.1" + micromatch "^3.1.10" + mkdirp "^0.5.1" + neo-async "^2.6.1" + node-libs-browser "^2.2.1" schema-utils "^1.0.0" - tapable "^1.1.0" - terser-webpack-plugin "^1.1.0" - watchpack "^1.5.0" - webpack-sources "^1.3.0" + tapable "^1.1.3" + terser-webpack-plugin "^1.4.1" + watchpack "^1.6.0" + webpack-sources "^1.4.1" websocket-driver@>=0.5.1: version "0.7.3" From 546027b553fb0405ac95085b320182c3549400c2 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Tue, 17 Dec 2019 17:17:54 +0800 Subject: [PATCH 04/18] feat: add how to modify config in README --- README-CN.md | 34 ++++++++++++++++++++++++++++++++++ README.md | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/README-CN.md b/README-CN.md index e6a0da9..85bc407 100644 --- a/README-CN.md +++ b/README-CN.md @@ -66,6 +66,40 @@ English | [简体中文](./README-CN.md) yarn install ``` + * 修改配置, 在"src/utils/config.ts" + + ``` + const api: API = { + serverList: [ + { + name: 'Re-Birth Server', + url: 'https://rebirth.citahub.com' + }, + { + name: 'CITA Node Server', + url: 'https://node.citahub.com' + } + ], + jsonRpc: '/', + url: '/api/info/url', + status: '/api/status', + statistics: '/api/statistics', + blockList: '/api/blocks', + blockListV2: '/api/v2/blocks', + transactionList: '/api/transactions', + ercTransactionList: '/api/erc20/transfers' + } + + const config: Config = { + api: api, + apiTimeout: 15000, + apiTimeoutMsg: 'api timeout，try it later', + apiErrorMsg: 'network error！', + icpRecordName: '', + icpRecordUrl: '' + } + ``` + * 调试环境 ``` diff --git a/README.md b/README.md index 6d18980..27c1801 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ English | [简体中文](./README-CN.md) # Run - + * Prerequisite node ^8.10.0 || ^10.13.0 || >=11.10.1 @@ -68,6 +68,40 @@ English | [简体中文](./README-CN.md) yarn install ``` + * modify config in "src/utils/config.ts" + + ``` + const api: API = { + serverList: [ + { + name: 'Re-Birth Server', + url: 'https://rebirth.citahub.com' + }, + { + name: 'CITA Node Server', + url: 'https://node.citahub.com' + } + ], + jsonRpc: '/', + url: '/api/info/url', + status: '/api/status', + statistics: '/api/statistics', + blockList: '/api/blocks', + blockListV2: '/api/v2/blocks', + transactionList: '/api/transactions', + ercTransactionList: '/api/erc20/transfers' + } + + const config: Config = { + api: api, + apiTimeout: 15000, + apiTimeoutMsg: 'api timeout，try it later', + apiErrorMsg: 'network error！', + icpRecordName: '', + icpRecordUrl: '' + } + ``` + * Develop Environment ``` @@ -122,7 +156,7 @@ English | [简体中文](./README-CN.md) * /src/layouts/search/ -------- Search Failed Page * /src/layouts/common --------- Transaction Table、Transaction Search Modal、Block Search Modal - + * /src/components/ ------------ Basic Components，header/content/footer/loading/tab/toast/modal * /src/components/redux ------- redux reduce/action/state From 1c2163e8021f1adf6cc459cf64d02757a8af44fa Mon Sep 17 00:00:00 2001 From: travis_joe Date: Tue, 17 Dec 2019 17:38:51 +0800 Subject: [PATCH 05/18] fix: testnet's url change --- README-CN.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-CN.md b/README-CN.md index 85bc407..b172685 100644 --- a/README-CN.md +++ b/README-CN.md @@ -77,7 +77,7 @@ English | [简体中文](./README-CN.md) }, { name: 'CITA Node Server', - url: 'https://node.citahub.com' + url: 'https://testnet.citahub.com' } ], jsonRpc: '/', diff --git a/README.md b/README.md index 27c1801..1153d1c 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ English | [简体中文](./README-CN.md) }, { name: 'CITA Node Server', - url: 'https://node.citahub.com' + url: 'https://testnet.citahub.com' } ], jsonRpc: '/', From 9f8e1c32355479acec22ed2f1c1bf8bdfa7c4e02 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2019 10:12:33 +0000 Subject: [PATCH 06/18] chore(deps): bump @cryptape/cita-sdk from 0.24.1 to 1.0.1 Bumps [@cryptape/cita-sdk](https://github.com/cryptape/cita-sdk-js) from 0.24.1 to 1.0.1. - [Release notes](https://github.com/cryptape/cita-sdk-js/releases) - [Changelog](https://github.com/citahub/cita-sdk-js/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cryptape/cita-sdk-js/compare/@cryptape/cita-sdk@0.24.1...@cryptape/cita-sdk@1.0.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index c5c90c8..7846b2c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "keywords": [], "author": "wuyuyue@cryptape.com", "dependencies": { - "@cryptape/cita-sdk": "^0.24.0", + "@cryptape/cita-sdk": "^1.0.1", "@types/echarts": "^4.1.9", "@types/history": "^4.7.2", "@types/react": "^16.7.18", diff --git a/yarn.lock b/yarn.lock index 183b0f5..5fc6907 100644 --- a/yarn.lock +++ b/yarn.lock @@ -104,22 +104,24 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" -"@cryptape/cita-sdk@^0.24.0": - version "0.24.1" - resolved "https://registry.yarnpkg.com/@cryptape/cita-sdk/-/cita-sdk-0.24.1.tgz#e302a7403c123eaf2b02fa2aaae21ff3b2bc1625" - integrity sha512-HN0MlETdEII15PKpAIA0K4ppp6z/NXe5BbmRHYxSujk3mS+8oL+bwK9X5dEVuttihizNIdtjDypHzsbcjOArAA== +"@cryptape/cita-sdk@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@cryptape/cita-sdk/-/cita-sdk-1.0.1.tgz#b6d684af60fbe744aece8129157acdeef2115ae2" + integrity sha512-Whj2SL2Pbisj5C8qnGNQfH8GkGAK1b5jfiMT3GvBedohxklImK9KvPfflxVa7JYanfUwcJ60TuVCK66wJJI9uw== dependencies: - "@cryptape/cita-signer" "^2.4.1" + "@cryptape/cita-signer" "^2.6.0" + fstream "1.0.12" web3 "1.0.0-beta.37" -"@cryptape/cita-signer@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@cryptape/cita-signer/-/cita-signer-2.4.1.tgz#4074b0c0296885405d14f511dd98e2810d6dddb4" - integrity sha512-zV7/SfQZxSj3reHp5oGImKqDojUB2zDX7xfkJT58tn0603E7IkJhhHMGcpJEW2P+pb3+uRTyCkhnVnOMjh+Mgw== +"@cryptape/cita-signer@^2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@cryptape/cita-signer/-/cita-signer-2.6.0.tgz#5c8863b673e96b4c915b7d76a80406566ca36214" + integrity sha512-cAsrJp8Tw78Qm/ZzIqF7kncJG8O1Aei1UEP17MZGB2L+HlVKI2GHJrKjxkQun6MybSu3iPQ9bUSDyeb+Rp/JJQ== dependencies: - ec "^0.0.1" elliptic "^6.4.0" + fstream "1.0.12" google-protobuf "^3.5.0" + sm-series-crypto "^0.2.1" web3 "1.0.0-beta.37" "@cryptape/sdk-ts-config@0.0.1": @@ -2929,11 +2931,6 @@ duplexify@^3.4.2, duplexify@^3.6.0: readable-stream "^2.0.0" stream-shift "^1.0.0" -ec@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/ec/-/ec-0.0.1.tgz#5579aad6053f2ce337bc712a905188f69450b8e1" - integrity sha1-VXmq1gU/LOM3vHEqkFGI9pRQuOE= - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -3929,7 +3926,7 @@ fsevents@^1.2.7: nan "^2.12.1" node-pre-gyp "^0.12.0" -fstream@^1.0.12, fstream@^1.0.8: +fstream@1.0.12, fstream@^1.0.12, fstream@^1.0.8: version "1.0.12" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== @@ -4382,7 +4379,7 @@ history@^4.9.0: tiny-warning "^1.0.0" value-equal "^0.4.0" -hmac-drbg@^1.0.0: +hmac-drbg@^1.0.0, hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= @@ -8147,6 +8144,18 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +sm-series-crypto@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/sm-series-crypto/-/sm-series-crypto-0.2.1.tgz#509a4aaaa2d2dfbc9661c840ae7e554fe3f3234d" + integrity sha512-JXBYpD/wHaD9RGpA/MOwF+5Nb7PbkNGvRKaqFmEGZQc4TUtEkf+mmkEFEEPz0LO8S019Yh4rkEgd5gaEytHF2g== + dependencies: + bn.js "^4.11.6" + buffer "^5.2.1" + elliptic "^6.4.0" + hash.js "^1.0.3" + hmac-drbg "^1.0.1" + inherits "^2.0.3" + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" From 45f93b6e403f4d859e1012ef864707f36c720ec9 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Tue, 17 Dec 2019 17:37:04 +0800 Subject: [PATCH 07/18] fix: testnet's url change --- src/utils/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/config.ts b/src/utils/config.ts index 3e216e0..8535ef7 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -32,7 +32,7 @@ const api: API = { }, { name: 'CITA Node Server', - url: 'https://node.citahub.com' + url: 'https://testnet.citahub.com' } ], jsonRpc: '/', From 2e878cdff9e0ed2bb93adc3a7b5d00ea9897d5c9 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Wed, 18 Dec 2019 15:26:35 +0800 Subject: [PATCH 08/18] chore(deps): update copy-webpack-plugin to 5.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7846b2c..2d4f4c1 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "babel-preset-react": "6.24.1", "babel-register": "^6.26.0", "bootstrap": "^4.1.3", - "copy-webpack-plugin": "^5.0.3", + "copy-webpack-plugin": "^5.1.1", "css-loader": "^3.0.0", "echarts": "^4.1.0", "echarts-for-react": "^2.0.15-beta.0", From 43a59fcc7e72d9a56a50ff3fab2c532a53ae1d02 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Wed, 18 Dec 2019 20:16:35 +0800 Subject: [PATCH 09/18] chore(deps): update yarn.lock --- yarn.lock | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5fc6907..13f5bac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1807,27 +1807,7 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^11.3.2: - version "11.3.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc" - integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - -cacache@^12.0.2: +cacache@^12.0.2, cacache@^12.0.3: version "12.0.3" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== @@ -2293,12 +2273,12 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.3.tgz#2179e3c8fd69f13afe74da338896f1f01a875b5c" - integrity sha512-PlZRs9CUMnAVylZq+vg2Juew662jWtwOXOqH4lbQD9ZFhRG9R7tVStOgHt21CBGVq7k5yIJaz8TXDLSjV+Lj8Q== +copy-webpack-plugin@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88" + integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg== dependencies: - cacache "^11.3.2" + cacache "^12.0.3" find-cache-dir "^2.1.0" glob-parent "^3.1.0" globby "^7.1.1" @@ -2306,9 +2286,9 @@ copy-webpack-plugin@^5.0.3: loader-utils "^1.2.3" minimatch "^3.0.4" normalize-path "^3.0.0" - p-limit "^2.2.0" + p-limit "^2.2.1" schema-utils "^1.0.0" - serialize-javascript "^1.7.0" + serialize-javascript "^2.1.2" webpack-log "^2.0.0" core-js@^1.0.0: @@ -6457,6 +6437,13 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-limit@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" + integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== + dependencies: + p-try "^2.0.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -7963,11 +7950,6 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65" - integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA== - serialize-javascript@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" From acb26ee41e9351182114fc227cc81421a8992c12 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 07:45:04 +0000 Subject: [PATCH 10/18] chore(deps): [security] bump serialize-javascript from 1.7.0 to 2.1.2 Bumps [serialize-javascript](https://github.com/yahoo/serialize-javascript) from 1.7.0 to 2.1.2. **This update includes a security fix.** - [Release notes](https://github.com/yahoo/serialize-javascript/releases) - [Commits](https://github.com/yahoo/serialize-javascript/compare/v1.7.0...v2.1.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5fc6907..13f5bac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1807,27 +1807,7 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^11.3.2: - version "11.3.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc" - integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - -cacache@^12.0.2: +cacache@^12.0.2, cacache@^12.0.3: version "12.0.3" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== @@ -2293,12 +2273,12 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.3.tgz#2179e3c8fd69f13afe74da338896f1f01a875b5c" - integrity sha512-PlZRs9CUMnAVylZq+vg2Juew662jWtwOXOqH4lbQD9ZFhRG9R7tVStOgHt21CBGVq7k5yIJaz8TXDLSjV+Lj8Q== +copy-webpack-plugin@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88" + integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg== dependencies: - cacache "^11.3.2" + cacache "^12.0.3" find-cache-dir "^2.1.0" glob-parent "^3.1.0" globby "^7.1.1" @@ -2306,9 +2286,9 @@ copy-webpack-plugin@^5.0.3: loader-utils "^1.2.3" minimatch "^3.0.4" normalize-path "^3.0.0" - p-limit "^2.2.0" + p-limit "^2.2.1" schema-utils "^1.0.0" - serialize-javascript "^1.7.0" + serialize-javascript "^2.1.2" webpack-log "^2.0.0" core-js@^1.0.0: @@ -6457,6 +6437,13 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-limit@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" + integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== + dependencies: + p-try "^2.0.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -7963,11 +7950,6 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65" - integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA== - serialize-javascript@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" From 77be6cf81684ae8e9dd3a8cebc91b894bdbaa3a5 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Tue, 14 Jan 2020 10:22:28 +0800 Subject: [PATCH 11/18] chore(deps): change the cryptape to citahub --- package.json | 2 +- src/utils/sdk.ts | 2 +- yarn.lock | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 2d4f4c1..ccf5be4 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "keywords": [], "author": "wuyuyue@cryptape.com", "dependencies": { - "@cryptape/cita-sdk": "^1.0.1", + "@citahub/cita-sdk": "^1.0.1", "@types/echarts": "^4.1.9", "@types/history": "^4.7.2", "@types/react": "^16.7.18", diff --git a/src/utils/sdk.ts b/src/utils/sdk.ts index 740554b..54072c2 100644 --- a/src/utils/sdk.ts +++ b/src/utils/sdk.ts @@ -1,6 +1,6 @@ import { ServerNode } from './config' import { getSelectNetwork } from './storage' -import CITASDK from '@cryptape/cita-sdk' +import CITASDK from '@citahub/cita-sdk' var serverNode: ServerNode = getSelectNetwork() const citaSDK = CITASDK(serverNode.url) diff --git a/yarn.lock b/yarn.lock index 13f5bac..3ad2942 100644 --- a/yarn.lock +++ b/yarn.lock @@ -104,19 +104,19 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" -"@cryptape/cita-sdk@^1.0.1": +"@citahub/cita-sdk@^1.0.1": version "1.0.1" - resolved "https://registry.yarnpkg.com/@cryptape/cita-sdk/-/cita-sdk-1.0.1.tgz#b6d684af60fbe744aece8129157acdeef2115ae2" - integrity sha512-Whj2SL2Pbisj5C8qnGNQfH8GkGAK1b5jfiMT3GvBedohxklImK9KvPfflxVa7JYanfUwcJ60TuVCK66wJJI9uw== + resolved "https://registry.yarnpkg.com/@citahub/cita-sdk/-/cita-sdk-1.0.1.tgz#4ad0696c0d3bb88c6b42f35b82cdd176eaf1f7b1" + integrity sha512-mJQ0swYOAsuMul8imulVH1eT85e2YkHpBwM0XC97WRsU5yRt5w8XE4MhzHqmeaqBZevDj5FsoaJaR0z9T3EVkQ== dependencies: - "@cryptape/cita-signer" "^2.6.0" + "@citahub/cita-signer" "^2.6.0" fstream "1.0.12" web3 "1.0.0-beta.37" -"@cryptape/cita-signer@^2.6.0": +"@citahub/cita-signer@^2.6.0": version "2.6.0" - resolved "https://registry.yarnpkg.com/@cryptape/cita-signer/-/cita-signer-2.6.0.tgz#5c8863b673e96b4c915b7d76a80406566ca36214" - integrity sha512-cAsrJp8Tw78Qm/ZzIqF7kncJG8O1Aei1UEP17MZGB2L+HlVKI2GHJrKjxkQun6MybSu3iPQ9bUSDyeb+Rp/JJQ== + resolved "https://registry.yarnpkg.com/@citahub/cita-signer/-/cita-signer-2.6.0.tgz#82de46dd8a6d24bdd450a48e76b388fd29848242" + integrity sha512-M8F707AQez3UMqtWpshPuseslDLqgSUEziUN/LXio0p2YYC/rZGDSO8LjKJXc/rfneVC+55cD6Y1inAo4LAw6w== dependencies: elliptic "^6.4.0" fstream "1.0.12" From 1fdf23e19c7f4e5dc8c91ec66e50e02bbd8f33dc Mon Sep 17 00:00:00 2001 From: travis_joe Date: Tue, 14 Jan 2020 11:44:58 +0800 Subject: [PATCH 12/18] build: suporting deploying by docker image --- Dockerfile | 18 ++++++++++++++++++ README-CN.md | 3 +++ README.md | 3 +++ 3 files changed, 24 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e723d73 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM node:10 as node + +WORKDIR /app + +COPY package*.json ./ +COPY yarn.lock .. + +RUN yarn +COPY . . + +RUN npm run build + +FROM nginx +EXPOSE 80 + +COPY --from=node /app/build /usr/share/nginx/html + + diff --git a/README-CN.md b/README-CN.md index b172685..4c5418d 100644 --- a/README-CN.md +++ b/README-CN.md @@ -121,6 +121,9 @@ English | [简体中文](./README-CN.md) * 验证是否成功通过访问 https://YOUR_GITHUB_USERNAME.github.io/microscope-v2/ i.e. if your github name is cryptape then replace YOUR_GITHUB_USERNAME with cryptape. +# 使用docker 部署一个microscope + * docker build -t microscope . 构建docker镜像 + * docker run --name microscope -d -p 80:80 microscope 后台启动镜像，绑定80端口 # 目录结构 diff --git a/README.md b/README.md index 1153d1c..eee3766 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,9 @@ English | [简体中文](./README-CN.md) * Verify that it works by visiting https://YOUR_GITHUB_USERNAME.github.io/microscope-v2/ i.e. if your github name is cryptape then replace YOUR_GITHUB_USERNAME with cryptape. +# Having a microscope on docker + * docker build -t microscope . build docker image + * docker run --name microscope -d -p 80:80 microscope run microscope on port 80 # Directory Structure From f966ee6a273aa19f6c591ac3f83514dde1c7b566 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Fri, 17 Jan 2020 14:46:18 +0800 Subject: [PATCH 13/18] chore: to order list --- README-CN.md | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README-CN.md b/README-CN.md index 4c5418d..7077a4d 100644 --- a/README-CN.md +++ b/README-CN.md @@ -122,8 +122,8 @@ English | [简体中文](./README-CN.md) * 验证是否成功通过访问 https://YOUR_GITHUB_USERNAME.github.io/microscope-v2/ i.e. if your github name is cryptape then replace YOUR_GITHUB_USERNAME with cryptape. # 使用docker 部署一个microscope - * docker build -t microscope . 构建docker镜像 - * docker run --name microscope -d -p 80:80 microscope 后台启动镜像，绑定80端口 + 1. docker build -t microscope . 构建docker镜像 + 2. docker run --name microscope -d -p 80:80 microscope 后台启动镜像，绑定80端口 # 目录结构 diff --git a/README.md b/README.md index eee3766..31ba791 100644 --- a/README.md +++ b/README.md @@ -124,8 +124,8 @@ English | [简体中文](./README-CN.md) * Verify that it works by visiting https://YOUR_GITHUB_USERNAME.github.io/microscope-v2/ i.e. if your github name is cryptape then replace YOUR_GITHUB_USERNAME with cryptape. # Having a microscope on docker - * docker build -t microscope . build docker image - * docker run --name microscope -d -p 80:80 microscope run microscope on port 80 + 1. docker build -t microscope . build docker image + 2. docker run --name microscope -d -p 80:80 microscope run microscope on port 80 # Directory Structure From dffecfc9a089888bfd5cd9278a2d8d3ae46f6732 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Fri, 17 Jan 2020 14:46:33 +0800 Subject: [PATCH 14/18] chore: remove blanks --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e723d73..bee98dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,5 +14,3 @@ FROM nginx EXPOSE 80 COPY --from=node /app/build /usr/share/nginx/html - - From 747d844fe37fec5f6c77395396fd23436ff4444f Mon Sep 17 00:00:00 2001 From: travis_joe Date: Fri, 17 Jan 2020 15:08:15 +0800 Subject: [PATCH 15/18] ci: test docker build case --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index ca876ff..f7793f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,3 +8,6 @@ install: - yarn script: - yarn run build + - docker build -t microscope . + - docker run --name microscope -d -p 8080:80 microscope + - curl 127.0.0.1:8080 From a9a3fc03d716e0180ca644d17f664e02f40b4716 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Fri, 13 Dec 2019 10:59:13 +0800 Subject: [PATCH 16/18] feat: open audit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca876ff..a2623d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: node_js sudo: true node_js: - '10.16' -#before_install: -# - yarn audit +before_install: + - yarn audit install: - yarn script: From 462ec7294412b29e54e0a48de7b3c349ae5389b7 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Tue, 25 Feb 2020 15:29:15 +0800 Subject: [PATCH 17/18] fix: get contract function signature --- src/utils/hex.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/utils/hex.ts b/src/utils/hex.ts index d162e96..00c1e12 100644 --- a/src/utils/hex.ts +++ b/src/utils/hex.ts @@ -1,3 +1,5 @@ +import citaSDK from './sdk' + const web3Utils = require('web3-utils') const BN = web3Utils.BN export function valueFormat( @@ -87,6 +89,7 @@ export function getContractData( ) { getAbi(contractAddress) .then((abis: any) => { + new citaSDK.base.Contract(abis) const fnHash = data.slice(0, 10) abis.forEach((_abi: any) => { if (_abi.signature === fnHash) { From f798bc91df93006c41e10439de0255d7a3157788 Mon Sep 17 00:00:00 2001 From: travis_joe Date: Thu, 27 Feb 2020 10:57:55 +0800 Subject: [PATCH 18/18] ci: close audit in ci temporarily --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7209b54..f7793f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: node_js sudo: true node_js: - '10.16' -before_install: - - yarn audit +#before_install: +# - yarn audit install: - yarn script: