From 9b1d5c00a7b1ebb5b6d26bf9199bdcdb960eff5b Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Tue, 1 Dec 2020 01:59:17 +0800 Subject: [PATCH 01/12] installed alpha sdk --- package-lock.json | 190 ++++++++++++++++++++++++++-------------------- package.json | 5 +- 2 files changed, 110 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf8f46801..74f03f1ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2792,6 +2792,11 @@ "@types/yargs": "^13.0.0" } }, + "@js-joda/core": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@js-joda/core/-/core-3.2.0.tgz", + "integrity": "sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==" + }, "@mdi/font": { "version": "5.2.45", "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.2.45.tgz", @@ -4419,6 +4424,7 @@ "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "dev": true, "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -4630,6 +4636,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dev": true, "requires": { "safer-buffer": "~2.1.0" } @@ -4684,7 +4691,8 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true }, "assign-symbols": { "version": "1.0.0", @@ -4728,7 +4736,8 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true }, "atob": { "version": "2.1.2", @@ -4767,12 +4776,14 @@ "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true }, "aws4": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", + "dev": true }, "axios": { "version": "0.19.2", @@ -6065,6 +6076,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, "requires": { "tweetnacl": "^0.14.3" } @@ -6631,12 +6643,13 @@ "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true }, "catbuffer-typescript": { - "version": "0.0.22", - "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.22.tgz", - "integrity": "sha512-Wip3kJFnXrsMRF+4yJSE/F+aEqrTYLPPXdNuVftHNl9oFaKwQ9si8oI2ruSu53QIR+/ohOlY4QYtOagRpHnrFg==" + "version": "0.0.24-alpha-202011210642", + "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.24-alpha-202011210642.tgz", + "integrity": "sha512-rxbr92UcwTgCrpEbapaLROyMAE9RAssU7OXmWfodvYmi3VADZAo3OzqF3pxCSALvCJNRgWB2bXKT0IvE/012CA==" }, "ccount": { "version": "1.0.4", @@ -7123,6 +7136,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -7526,7 +7540,8 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true }, "cosmiconfig": { "version": "5.2.1", @@ -7994,6 +8009,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -8318,7 +8334,8 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true }, "delegates": { "version": "1.0.0", @@ -8533,6 +8550,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -9579,7 +9597,8 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true }, "extend-shallow": { "version": "3.0.2", @@ -9744,12 +9763,14 @@ "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true }, "fast-deep-equal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true }, "fast-glob": { "version": "2.2.7", @@ -9768,7 +9789,8 @@ "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "dev": true }, "fast-levenshtein": { "version": "2.0.6", @@ -10009,12 +10031,14 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -10841,6 +10865,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -11002,12 +11027,14 @@ "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true }, "har-validator": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "dev": true, "requires": { "ajv": "^6.5.5", "har-schema": "^2.0.0" @@ -11366,6 +11393,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -12021,7 +12049,8 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true }, "is-utf8": { "version": "0.2.1", @@ -12102,7 +12131,8 @@ "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true }, "istanbul-lib-coverage": { "version": "2.0.5", @@ -14751,11 +14781,6 @@ } } }, - "js-joda": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/js-joda/-/js-joda-1.11.0.tgz", - "integrity": "sha512-/HJpRhwP2fPyuSsCaZuoVJuaSIt8tUXykV4wOMRXrFk7RP9h9VWaFdS9YHKdMepxb/3TdXpL6IhfC9L0sqYVBw==" - }, "js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", @@ -14811,7 +14836,8 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true }, "jsdom": { "version": "11.12.0", @@ -14885,12 +14911,14 @@ "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -14901,7 +14929,8 @@ "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true }, "json3": { "version": "3.3.3", @@ -14931,6 +14960,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -15461,7 +15491,8 @@ "lodash": { "version": "4.17.19", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true }, "lodash.defaultsdeep": { "version": "4.6.1", @@ -15940,12 +15971,14 @@ "mime-db": { "version": "1.40.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", + "dev": true }, "mime-types": { "version": "2.1.24", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "dev": true, "requires": { "mime-db": "1.40.0" } @@ -16520,7 +16553,8 @@ "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true }, "object-assign": { "version": "4.1.1", @@ -17070,7 +17104,8 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true }, "picomatch": { "version": "2.1.1", @@ -18190,7 +18225,8 @@ "psl": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz", - "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==" + "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==", + "dev": true }, "public-encrypt": { "version": "4.0.3", @@ -18250,7 +18286,8 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true }, "q": { "version": "1.5.1", @@ -18261,7 +18298,8 @@ "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true }, "query-string": { "version": "4.3.4", @@ -18770,6 +18808,7 @@ "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "dev": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -18806,6 +18845,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz", "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==", + "dev": true, "requires": { "lodash": "^4.17.11" } @@ -18814,6 +18854,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz", "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==", + "dev": true, "requires": { "request-promise-core": "1.1.2", "stealthy-require": "^1.1.1", @@ -19017,7 +19058,8 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "sane": { "version": "4.1.0", @@ -19792,6 +19834,7 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -19876,7 +19919,8 @@ "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "dev": true }, "stream-browserify": { "version": "2.0.2", @@ -20803,37 +20847,34 @@ "dev": true }, "symbol-openapi-typescript-fetch-client": { - "version": "0.10.0-3", - "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-0.10.0-3.tgz", - "integrity": "sha512-cdRz7Nc/m2i7CC8wHtj//z5RxOKEKhS4l+fFQvh7YUlYcUPaHbgcq4RMXSZPmMJ4PnzocnqWpVKjMj5cTYgrPA==" + "version": "0.10.1-SNAPSHOT.202011191848", + "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-0.10.1-SNAPSHOT.202011191848.tgz", + "integrity": "sha512-5V7FBtdzz8nX3U06a6yqudLOMvk0/sw+cD5uIubYOmOrleIWFp2nb1IE7nrCSr1t4Qr/Rlg9UU6T/Xuyfp4YFA==" }, "symbol-sdk": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-0.21.0.tgz", - "integrity": "sha512-YFJ1PcVlFSivZe8RUOOGJJvXN2uleNTZB8ma6VONdz+obyI8QMAzdt4c6niyGTr76Md6dRQVJ/uaq+MpbJtDQg==", + "version": "0.21.1-alpha-202011262256", + "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-0.21.1-alpha-202011262256.tgz", + "integrity": "sha512-2wbVMW4UD5Jj2tkRi19prWsapiMPxMmxHVhCQTaandOiL3yLrbOAyywXh0TKUUvZ4RXCsgwblSMDn/1+f4kiOw==", "requires": { + "@js-joda/core": "^3.2.0", "bluebird": "^3.7.2", - "catbuffer-typescript": "0.0.22", + "catbuffer-typescript": "0.0.24-alpha-202011210642", "crypto-js": "^4.0.0", "diff": "^4.0.2", - "futoin-hkdf": "^1.3.1", - "js-joda": "^1.6.2", + "futoin-hkdf": "^1.3.2", "js-sha256": "^0.9.0", "js-sha3": "^0.8.0", "js-sha512": "^0.8.0", "long": "^4.0.0", - "merkletreejs": "^0.1.7", + "merkletreejs": "^0.2.9", "minimist": "^1.2.5", "node-fetch": "^2.6.0", - "request": "^2.88.0", - "request-promise-native": "^1.0.5", "ripemd160": "^2.0.2", - "rxjs": "^6.5.3", - "rxjs-compat": "^6.5.3", - "symbol-openapi-typescript-fetch-client": "0.10.0-3", + "rxjs": "^6.6.3", + "rxjs-compat": "^6.6.3", + "symbol-openapi-typescript-fetch-client": "0.10.1-SNAPSHOT.202011191848", "tweetnacl": "^1.0.3", - "utf8": "^3.0.0", - "ws": "^7.2.3" + "ws": "^7.3.1" }, "dependencies": { "bluebird": { @@ -20841,30 +20882,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" - }, - "merkletreejs": { - "version": "0.1.11", - "resolved": "https://registry.npmjs.org/merkletreejs/-/merkletreejs-0.1.11.tgz", - "integrity": "sha512-nJN3VIHeIAyB/PjO5Dj/Y0SEK7CGCCLD2IbV4el2kUIwlOtX3GOr5MwVO4EU+0AXvoDnJ0nmaLe5O86uIjWz/Q==", - "requires": { - "buffer-reverse": "^1.0.1", - "crypto-js": "^3.1.9-1", - "is-buffer": "^2.0.3", - "merkle-lib": "^2.0.10", - "treeify": "^1.1.0" - }, - "dependencies": { - "crypto-js": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz", - "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==" - } - } - }, "rxjs": { "version": "6.6.3", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", @@ -20879,9 +20896,9 @@ "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" }, "ws": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", - "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==" + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz", + "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==" } } }, @@ -21305,6 +21322,7 @@ "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "dev": true, "requires": { "psl": "^1.1.24", "punycode": "^1.4.1" @@ -21313,7 +21331,8 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true } } }, @@ -21438,6 +21457,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, "requires": { "safe-buffer": "^5.0.1" } @@ -21445,7 +21465,8 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true }, "type-check": { "version": "0.3.2", @@ -21744,6 +21765,7 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "dev": true, "requires": { "punycode": "^2.1.0" } @@ -21906,7 +21928,8 @@ "uuid": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "dev": true }, "v8-compile-cache": { "version": "2.1.0", @@ -21959,6 +21982,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", diff --git a/package.json b/package.json index aa213607c..fbf5064da 100644 --- a/package.json +++ b/package.json @@ -23,13 +23,14 @@ "bootstrap-vue": "^2.7.0", "chart.js": "^2.9.3", "core-js": "^2.6.11", + "js-sha3": "^0.8.0", "leaflet": "^1.6.0", "leaflet.markercluster": "^1.4.1", - "js-sha3": "^0.8.0", "merkletreejs": "^0.2.9", "moment-timezone": "^0.5.28", - "symbol-sdk": "^0.21.0", + "symbol-sdk": "^0.21.1-alpha-202011262256", "url-parse": "^1.4.7", + "utf8": "^3.0.0", "vue": "^2.6.11", "vue-apexcharts": "^1.5.2", "vue-material-design-icons": "^4.4.0", From 1d72852aed60f36ef611eea0fe1909db26bea6a9 Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Tue, 1 Dec 2020 18:15:01 +0800 Subject: [PATCH 02/12] update timestamp and epoch adjustment from alpha sdk --- src/components/fields/MosaicsField.vue | 2 +- src/config/globalConfig.js | 2 +- src/helper.js | 5 ++-- src/infrastructure/BlockService.js | 4 +-- src/infrastructure/TransactionService.js | 8 +++--- src/infrastructure/http.js | 33 ++++++++++++++---------- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/components/fields/MosaicsField.vue b/src/components/fields/MosaicsField.vue index c048ce5a3..26ab98741 100644 --- a/src/components/fields/MosaicsField.vue +++ b/src/components/fields/MosaicsField.vue @@ -65,7 +65,7 @@ export default { getMosaicName(mosaic) { return mosaic.mosaicAliasName !== 'N/A' - ? mosaic.mosaicAliasName + ? mosaic.mosaicAliasName[0] : mosaic.mosaicId; } } diff --git a/src/config/globalConfig.js b/src/config/globalConfig.js index 42a2c4848..a654e79f9 100644 --- a/src/config/globalConfig.js +++ b/src/config/globalConfig.js @@ -16,7 +16,7 @@ const defaultGlobalConfig = { 'statisticsService': '' }, 'networkConfig': { - 'namespaceName': 'SYMBOL.XEM', + 'namespaceName': 'symbol.xym', 'mosaicId': '5B66E76BECAD0860', 'divisibility': '6' }, diff --git a/src/helper.js b/src/helper.js index 26e70edf7..1f9089635 100644 --- a/src/helper.js +++ b/src/helper.js @@ -344,8 +344,7 @@ class helper { * @param deadlineValue - deadline from block * @returns YYYY-MM-DD HH:mm:ss */ - static convertDeadlinetoDate = deadline => moment.utc(new Date(deadline)).local() - .format('YYYY-MM-DD HH:mm:ss') + static convertDeadlinetoDate = deadline => this.convertToUTCDate(this.networkTimestamp(deadline)) /** * Get RGB color from hash @@ -513,7 +512,7 @@ class helper { const values = http.nativeNamespaces.map(namespace => namespace.namespaceName); - return values.indexOf(namespaceName.toUpperCase()) !== -1; + return values.indexOf(namespaceName) !== -1; } /** diff --git a/src/infrastructure/BlockService.js b/src/infrastructure/BlockService.js index af1e06d79..e2664b4e3 100644 --- a/src/infrastructure/BlockService.js +++ b/src/infrastructure/BlockService.js @@ -280,8 +280,8 @@ class BlockService { static formatBlock = block => ({ ...block, height: block.height.compact(), - timestampRaw: block.timestamp, - timestamp: helper.networkTimestamp(block.timestamp), + timestampRaw: Number(block.timestamp.toString()), + timestamp: helper.networkTimestamp(Number(block.timestamp.toString())), totalFee: helper.toNetworkCurrency(block.totalFee), difficulty: helper.convertBlockDifficultyToReadable(block.difficulty), feeMultiplier: block.feeMultiplier.toString(), diff --git a/src/infrastructure/TransactionService.js b/src/infrastructure/TransactionService.js index de8ef340c..d3687c699 100644 --- a/src/infrastructure/TransactionService.js +++ b/src/infrastructure/TransactionService.js @@ -233,8 +233,8 @@ class TransactionService { */ static formatTransaction = transaction => ({ ...transaction, - deadline: helper.convertDeadlinetoDate(transaction.deadline.value), - maxFee: helper.toNetworkCurrency(transaction.maxFee), + deadline: helper.convertDeadlinetoDate(transaction.deadline.adjustedValue), + maxFee: helper.toNetworkCurrency(Number(transaction.maxFee.toString())), signer: transaction.signer.address.plain(), transactionBody: this.formatTransactionBody(transaction), transactionInfo: this.formatTransactionInfo(transaction.transactionInfo) @@ -600,7 +600,7 @@ class TransactionService { const transactionObj = { ...transactionDTO, transactionType: transactionDTO.type, - deadline: helper.convertDeadlinetoDate(transactionDTO.deadline.value), + deadline: helper.convertDeadlinetoDate(transactionDTO.deadline.adjustedValue), maxFee: helper.toNetworkCurrency(transactionDTO.maxFee), signer: transactionDTO.signer.address.plain(), transactionInfo: this.formatTransactionInfo(transactionDTO.transactionInfo) @@ -680,7 +680,7 @@ class TransactionService { signer: cosignature.signer.address.plain() }; }) : [], - deadline: helper.convertDeadlinetoDate(transactionDTO.deadline.value), + deadline: helper.convertDeadlinetoDate(transactionDTO.deadline.adjustedValue), maxFee: helper.toNetworkCurrency(transactionDTO.maxFee), signer: transactionDTO.signer.address.plain(), transactionInfo: this.formatTransactionInfo(transactionDTO.transactionInfo), diff --git a/src/infrastructure/http.js b/src/infrastructure/http.js index e53594d36..ee77770d8 100644 --- a/src/infrastructure/http.js +++ b/src/infrastructure/http.js @@ -17,7 +17,7 @@ */ import * as symbol from 'symbol-sdk'; -import { MosaicService, NamespaceService } from '../infrastructure'; +import { NamespaceService } from '../infrastructure'; import globalConfig from '../config/globalConfig'; let NODE_URL; @@ -34,29 +34,30 @@ let NETWORK_CURRECY; let NATIVE_NAMESPACES; +let EPOCH_ADJUSTMENT; + export default class http { static init = async (nodeUrl, marketDataUrl) => { NODE_URL = nodeUrl; MARKET_DATA_URL = marketDataUrl; - NETWORK_TYPE = await http.createRepositoryFactory.getNetworkType().toPromise(); - GENERATION_HASH = await http.createRepositoryFactory.getGenerationHash().toPromise(); - NETWORK_PROPERTIES = await http.createRepositoryFactory.createNetworkRepository().getNetworkProperties() - .toPromise(); - - const mosaicId = NETWORK_PROPERTIES.chain.currencyMosaicId.replace(/0x|'/g, ''); - NETWORK_CURRECY = await MosaicService.getMosaicInfo(mosaicId); + [NETWORK_TYPE, GENERATION_HASH, NETWORK_PROPERTIES, EPOCH_ADJUSTMENT, NETWORK_CURRECY] = await Promise.all([ + http.createRepositoryFactory.getNetworkType().toPromise(), + http.createRepositoryFactory.getGenerationHash().toPromise(), + http.createRepositoryFactory.createNetworkRepository().getNetworkProperties() + .toPromise(), + http.createRepositoryFactory.getEpochAdjustment().toPromise(), + http.createRepositoryFactory.getCurrencies().toPromise() + ]); NATIVE_NAMESPACES = await NamespaceService.getNativeNamespaces() || []; } static get networkCurrency() { - const networkNamespace = NETWORK_CURRECY?.mosaicAliasNames[0].toUpperCase() || globalConfig.networkConfig.namespaceName.toUpperCase(); - return { - namespaceName: networkNamespace, - mosaicId: NETWORK_CURRECY?.mosaicId || globalConfig.networkConfig.mosaicId, - divisibility: NETWORK_CURRECY?.divisibility || globalConfig.networkConfig.divisibility + namespaceName: NETWORK_CURRECY?.currency.namespaceId.fullName || globalConfig.networkConfig.namespaceName, + mosaicId: NETWORK_CURRECY?.currency.namespaceId.toHex() || globalConfig.networkConfig.mosaicId, + divisibility: NETWORK_CURRECY?.currency.divisibility || globalConfig.networkConfig.divisibility }; } @@ -78,7 +79,7 @@ export default class http { MosaicRentalSinkAddress: symbol.Address.createFromRawAddress(this.networkProperties.plugins.mosaic.mosaicRentalFeeSinkAddress), NamespaceRentalFeeSinkAddress: symbol.Address.createFromRawAddress(this.networkProperties.plugins.namespace.namespaceRentalFeeSinkAddress), NetworkType: this.networkType, - NemsisTimestamp: symbol.Deadline.timestampNemesisBlock, + NemsisTimestamp: this.epochAdjustment, TargetBlockTime: convertedBlockGenerationTargetTime, NamespaceGraceDuration: convertedNamespaceGracePeriodDuration * blockPerday, TotalChainImportance: convertedTotalChainImportance @@ -101,6 +102,10 @@ export default class http { return NETWORK_TYPE; } + static get epochAdjustment() { + return EPOCH_ADJUSTMENT; + } + static get createRepositoryFactory() { return new symbol.RepositoryFactoryHttp(this.nodeUrl, { networkType: this.networkType, From 7f694bb8ca50c117f7f9a65a1f5476a564fd2f50 Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Wed, 2 Dec 2020 17:41:39 +0800 Subject: [PATCH 03/12] added block type, raw message type and update restriction method --- src/components/fields/MessageField.vue | 2 +- src/config/constants.js | 14 +++++++++++--- src/config/i18n/en-us.json | 4 +++- src/config/i18n/es.json | 4 +++- src/config/i18n/ja.json | 11 ++++++++++- src/config/i18n/pt.json | 4 +++- src/config/i18n/ru.json | 4 +++- src/config/i18n/ua.json | 4 +++- src/config/i18n/zh.json | 4 +++- src/config/pages/block-detail.json | 4 +++- src/config/pages/block-list.json | 3 ++- src/infrastructure/AccountService.js | 6 +++--- src/infrastructure/BlockService.js | 4 +++- src/infrastructure/RestrictionService.js | 2 +- 14 files changed, 52 insertions(+), 18 deletions(-) diff --git a/src/components/fields/MessageField.vue b/src/components/fields/MessageField.vue index 7defa212e..43095d625 100644 --- a/src/components/fields/MessageField.vue +++ b/src/components/fields/MessageField.vue @@ -60,7 +60,7 @@ export default { return this.value.type; }, isPlainMessage() { - return this.value.type === MessageType.PlainMessage; + return this.value.type === MessageType.PlainMessage || this.value.type === MessageType.RawMessage; }, title() { return `Click to view ${this.getKeyName(`messageTypeDescriptor_${this.messageType}`)}`; diff --git a/src/config/constants.js b/src/config/constants.js index 0dbe67607..9bd404dd1 100644 --- a/src/config/constants.js +++ b/src/config/constants.js @@ -15,7 +15,9 @@ import { MosaicRestrictionFlag, OperationRestrictionFlag, MosaicRestrictionEntryType, - MosaicRestrictionType + MosaicRestrictionType, + LockStatus, + BlockType } from 'symbol-sdk'; class Constants { @@ -189,8 +191,14 @@ class Constants { } static LockStatusType = { - 0: 'Unused', - 1: 'Used' + [LockStatus.UNUSED]: 'Unused', + [LockStatus.USED]: 'Used' + } + + static BlockType = { + [BlockType.ImportanceBlock]: 'Importance Block', + [BlockType.NemesisBlock]: 'Nemesis Block', + [BlockType.NormalBlock]: 'Normal Block' } } diff --git a/src/config/i18n/en-us.json b/src/config/i18n/en-us.json index dde0a664a..7764ec78a 100644 --- a/src/config/i18n/en-us.json +++ b/src/config/i18n/en-us.json @@ -360,11 +360,13 @@ "receiptTitle": "Receipt", "created": "Created", "ago": "ago", + "messageTypeDescriptor_-1": "Raw message", "messageTypeDescriptor_0": "Plain message", "messageTypeDescriptor_1": "Encrypted message", "messageTypeDescriptor_254": "Delegated Harvesting Persistent message", "votingNode": "Voting Node", "nonVotingNode": "Non Voting Node", "votingNodeTooltips": "Sync ahead of common node.", - "nonVotingNodeTooltips": "Sync behind of Voting node." + "nonVotingNodeTooltips": "Sync behind of Voting node.", + "blockType": "Type" } diff --git a/src/config/i18n/es.json b/src/config/i18n/es.json index d18f814ff..b1f802fb7 100644 --- a/src/config/i18n/es.json +++ b/src/config/i18n/es.json @@ -356,11 +356,13 @@ "receiptTitle": "Receipt", "created": "Created", "ago": "ago", + "messageTypeDescriptor_-1": "Raw message", "messageTypeDescriptor_0": "Plain message", "messageTypeDescriptor_1": "Encrypted message", "messageTypeDescriptor_254": "Delegated Harvesting Persistent message", "votingNode": "Voting Node", "nonVotingNode": "Non Voting Node", "votingNodeTooltips": "Sync ahead of common node.", - "nonVotingNodeTooltips": "Sync behind of Voting node." + "nonVotingNodeTooltips": "Sync behind of Voting node.", + "blockType": "Type" } diff --git a/src/config/i18n/ja.json b/src/config/i18n/ja.json index 16edf85f4..914c19834 100644 --- a/src/config/i18n/ja.json +++ b/src/config/i18n/ja.json @@ -357,5 +357,14 @@ "nodeDetailError": "ノード詳細の取得に失敗", "extendGraphicValue": "情報", "created": "作成", - "ago": "前" + "ago": "前", + "messageTypeDescriptor_-1": "Raw message", + "messageTypeDescriptor_0": "Plain message", + "messageTypeDescriptor_1": "Encrypted message", + "messageTypeDescriptor_254": "Delegated Harvesting Persistent message", + "votingNode": "Voting Node", + "nonVotingNode": "Non Voting Node", + "votingNodeTooltips": "Sync ahead of common node.", + "nonVotingNodeTooltips": "Sync behind of Voting node.", + "blockType": "Type" } diff --git a/src/config/i18n/pt.json b/src/config/i18n/pt.json index 99f054785..9828a928f 100644 --- a/src/config/i18n/pt.json +++ b/src/config/i18n/pt.json @@ -356,11 +356,13 @@ "receiptTitle": "Receipt", "created": "Created", "ago": "ago", + "messageTypeDescriptor_-1": "Raw message", "messageTypeDescriptor_0": "Plain message", "messageTypeDescriptor_1": "Encrypted message", "messageTypeDescriptor_254": "Delegated Harvesting Persistent message", "votingNode": "Voting Node", "nonVotingNode": "Non Voting Node", "votingNodeTooltips": "Sync ahead of common node.", - "nonVotingNodeTooltips": "Sync behind of Voting node." + "nonVotingNodeTooltips": "Sync behind of Voting node.", + "blockType": "Type" } diff --git a/src/config/i18n/ru.json b/src/config/i18n/ru.json index 966032643..616b7afb1 100644 --- a/src/config/i18n/ru.json +++ b/src/config/i18n/ru.json @@ -356,11 +356,13 @@ "receiptTitle": "Receipt", "created": "Created", "ago": "ago", + "messageTypeDescriptor_-1": "Raw message", "messageTypeDescriptor_0": "Plain message", "messageTypeDescriptor_1": "Encrypted message", "messageTypeDescriptor_254": "Delegated Harvesting Persistent message", "votingNode": "Voting Node", "nonVotingNode": "Non Voting Node", "votingNodeTooltips": "Sync ahead of common node.", - "nonVotingNodeTooltips": "Sync behind of Voting node." + "nonVotingNodeTooltips": "Sync behind of Voting node.", + "blockType": "Type" } diff --git a/src/config/i18n/ua.json b/src/config/i18n/ua.json index 2f0b353d7..b77dd3fea 100644 --- a/src/config/i18n/ua.json +++ b/src/config/i18n/ua.json @@ -356,11 +356,13 @@ "receiptTitle": "Receipt", "created": "Created", "ago": "ago", + "messageTypeDescriptor_-1": "Raw message", "messageTypeDescriptor_0": "Plain message", "messageTypeDescriptor_1": "Encrypted message", "messageTypeDescriptor_254": "Delegated Harvesting Persistent message", "votingNode": "Voting Node", "nonVotingNode": "Non Voting Node", "votingNodeTooltips": "Sync ahead of common node.", - "nonVotingNodeTooltips": "Sync behind of Voting node." + "nonVotingNodeTooltips": "Sync behind of Voting node.", + "blockType": "Type" } diff --git a/src/config/i18n/zh.json b/src/config/i18n/zh.json index 9a5632bd3..463d21899 100644 --- a/src/config/i18n/zh.json +++ b/src/config/i18n/zh.json @@ -356,11 +356,13 @@ "receiptTitle": "Receipt", "created": "Created", "ago": "ago", + "messageTypeDescriptor_-1": "Raw message", "messageTypeDescriptor_0": "Plain message", "messageTypeDescriptor_1": "Encrypted message", "messageTypeDescriptor_254": "Delegated Harvesting Persistent message", "votingNode": "Voting Node", "nonVotingNode": "Non Voting Node", "votingNodeTooltips": "Sync ahead of common node.", - "nonVotingNodeTooltips": "Sync behind of Voting node." + "nonVotingNodeTooltips": "Sync behind of Voting node.", + "blockType": "Type" } diff --git a/src/config/pages/block-detail.json b/src/config/pages/block-detail.json index b7e7e4c53..0b274bbb2 100644 --- a/src/config/pages/block-detail.json +++ b/src/config/pages/block-detail.json @@ -24,6 +24,7 @@ "canFetchNext": true }, "fields": [ + "blockType", "confirmations", "height", "payloadSize", @@ -31,7 +32,8 @@ "totalFee", "difficulty", "feeMultiplier", - "transactions", + "totalTransactions", + "statements", "harvester", "beneficiaryAddress", "blockHash", diff --git a/src/config/pages/block-list.json b/src/config/pages/block-list.json index 0d190a1ac..5e69fece7 100644 --- a/src/config/pages/block-list.json +++ b/src/config/pages/block-list.json @@ -21,8 +21,9 @@ "onRowClickKey": "height", "fields": [ "height", + "blockType", "age", - "transactions", + "totalTransactions", "statements", "totalFee", "date", diff --git a/src/infrastructure/AccountService.js b/src/infrastructure/AccountService.js index f0975f8a3..8c4d57a15 100644 --- a/src/infrastructure/AccountService.js +++ b/src/infrastructure/AccountService.js @@ -417,11 +417,11 @@ class AccountService { static extractAccountNamespace = (accountInfo, accountNames) => { let accountName = accountNames.find((name) => name.address === accountInfo.address); - const aliasNames = accountName.names.map(names => names.name); + const aliasNames = accountName.names.map(names => names.name); - const names = aliasNames.length > 0 ? aliasNames : [Constants.Message.UNAVAILABLE]; + const names = aliasNames.length > 0 ? aliasNames : [Constants.Message.UNAVAILABLE]; - return names; + return names; } /** diff --git a/src/infrastructure/BlockService.js b/src/infrastructure/BlockService.js index e2664b4e3..7d5e6e41d 100644 --- a/src/infrastructure/BlockService.js +++ b/src/infrastructure/BlockService.js @@ -279,14 +279,16 @@ class BlockService { */ static formatBlock = block => ({ ...block, + blockType: Constants.BlockType[block.type], height: block.height.compact(), timestampRaw: Number(block.timestamp.toString()), timestamp: helper.networkTimestamp(Number(block.timestamp.toString())), totalFee: helper.toNetworkCurrency(block.totalFee), difficulty: helper.convertBlockDifficultyToReadable(block.difficulty), feeMultiplier: block.feeMultiplier.toString(), - transactions: block.totalTransactionsCount, + totalTransactions: block.totalTransactionsCount, statements: block.statementsCount, + transactions: block.transactionsCount, signer: helper.publicKeyToAddress(block.signer.publicKey), beneficiaryAddress: block?.beneficiaryAddress.plain() || Constants.Message.UNAVAILABLE }) diff --git a/src/infrastructure/RestrictionService.js b/src/infrastructure/RestrictionService.js index 3b801f008..52ed341f7 100644 --- a/src/infrastructure/RestrictionService.js +++ b/src/infrastructure/RestrictionService.js @@ -43,7 +43,7 @@ class RestrictionService { */ static searchMosaicRestrictions = async restrictionMosaicSearchCriteria => { const searchMosaicRestrictions = await http.createRepositoryFactory.createRestrictionMosaicRepository() - .searchMosaicRestrictions(restrictionMosaicSearchCriteria) + .search(restrictionMosaicSearchCriteria) .toPromise(); return { From 4ed495ea660dfe2f4255b33fd380eaa4902b9173 Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Wed, 2 Dec 2020 18:42:04 +0800 Subject: [PATCH 04/12] added optional chaining in http --- src/infrastructure/http.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/infrastructure/http.js b/src/infrastructure/http.js index ee77770d8..b22c441bf 100644 --- a/src/infrastructure/http.js +++ b/src/infrastructure/http.js @@ -55,8 +55,8 @@ export default class http { static get networkCurrency() { return { - namespaceName: NETWORK_CURRECY?.currency.namespaceId.fullName || globalConfig.networkConfig.namespaceName, - mosaicId: NETWORK_CURRECY?.currency.namespaceId.toHex() || globalConfig.networkConfig.mosaicId, + namespaceName: NETWORK_CURRECY?.currency.namespaceId?.fullName || globalConfig.networkConfig.namespaceName, + mosaicId: NETWORK_CURRECY?.currency.namespaceId?.toHex() || globalConfig.networkConfig.mosaicId, divisibility: NETWORK_CURRECY?.currency.divisibility || globalConfig.networkConfig.divisibility }; } From 13859d1e032e3589e0fe14aa98e1674a767717d7 Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Thu, 3 Dec 2020 19:01:54 +0800 Subject: [PATCH 05/12] added travis submodule --- .gitmodules | 3 +++ .travis.yml | 66 ++++++++++++++++++++++++++++------------------- travis | 1 + travis/docker.sh | 52 ------------------------------------- travis/release.sh | 48 ---------------------------------- 5 files changed, 43 insertions(+), 127 deletions(-) create mode 100644 .gitmodules create mode 160000 travis delete mode 100644 travis/docker.sh delete mode 100644 travis/release.sh diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..dcf374d36 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "travis"] + path = travis + url = https://github.com/nemgrouplimited/travis-functions.git diff --git a/.travis.yml b/.travis.yml index bfa9e9b71..c5d71556d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,38 +2,50 @@ language: node_js services: - docker node_js: - - "8" - - "9" - "10" + - "12" +env: + global: + - DEV_BRANCH=dev + - RELEASE_BRANCH=main + - POST_RELEASE_BRANCH=main + - RELEASE_MESSAGE=release cache: npm: true directories: - - ./node_modules + - "node_modules" override: - npx cypress verify -before_install: - - npm i -g npm@6.13.4 before_script: - - npm run build + - . ./travis/node-functions.sh + - VERSION="$(node_load_version)" + - log_env_variables script: - - npm run lint - - npm run lint:css -deploy: - # automation build docker images for release branch - - provider: script - skip_cleanup: true - script: /bin/sh travis/docker.sh - on: - branch: $RELEASE_BRANCH - - provider: script - skip_cleanup: true - script: /bin/sh travis/release.sh - on: - branch: $RELEASE_BRANCH - # automation build docker images for main branch - - provider: script - skip_cleanup: true - script: /bin/sh travis/docker.sh - on: - branch: $MAIN_BRANCH - + - npm run build +jobs: + include: + - stage: test + name: lint + script: npm run lint + - stage: test + name: lint css + script: npm run lint:css + - stage: test + name: docker test build + script: /bin/bash travis/docker-functions.sh docker_build $VERSION + node_js: 10 + - stage: publish + name: docker publish alpha + script: /bin/bash travis/docker-functions.sh docker_build $VERSION publish + if: branch = env(DEV_BRANCH) AND type = push + node_js: 10 + - stage: release + name: docker publish release + script: /bin/bash travis/docker-functions.sh docker_build $VERSION release + if: branch = env(RELEASE_BRANCH) AND type = api AND commit_message = env(RELEASE_MESSAGE) + node_js: 10 + - stage: post release + name: tag and version upgrade + script: /bin/bash travis/node-functions.sh node_post_release + if: branch = env(RELEASE_BRANCH) AND type = api AND commit_message = env(RELEASE_MESSAGE) + node_js: 10 diff --git a/travis b/travis new file mode 160000 index 000000000..522f452e1 --- /dev/null +++ b/travis @@ -0,0 +1 @@ +Subproject commit 522f452e19332bdea3c1d7823c7d8b1fda70ee16 diff --git a/travis/docker.sh b/travis/docker.sh deleted file mode 100644 index 33ebf6c38..000000000 --- a/travis/docker.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -set -e - -if [ "${DOCKER_IMAGE_NAME}" = "" ] -then - echo "Docker deployment error. Env DOCKER_IMAGE_NAME has not been provided" - exit 128 -fi - -if [ "${DOCKER_USERNAME}" = "" ] -then - echo "Docker deployment error. Env DOCKER_USERNAME has not been provided" - exit 128 -fi - -if [ "${DOCKER_PASSWORD}" = "" ] -then - echo "Docker deployment error. Env DOCKER_PASSWORD has not been provided" - exit 128 -fi - -echo "Login into docker..." -echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin - -CURRENT_VERSION=$(npm run version --silent) - -echo "Creating image ${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}" -docker build -t "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}" . - -if [ "$TRAVIS_BRANCH" = "$MAIN_BRANCH" ] -then - echo "Building for ${MAIN_BRANCH} branch..." - - echo "Docker tagging alpha version" - docker tag "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}" "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}-alpha" - docker tag "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}" "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}-alpha-$(date +%Y%m%d%H%M)" - - echo "Docker pushing alpha" - docker push "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}-alpha" - docker push "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}-alpha-$(date +%Y%m%d%H%M)" -fi - -if [ "$TRAVIS_BRANCH" = "$RELEASE_BRANCH" ] -then - echo "Building for ${RELEASE_BRANCH} branch..." - echo "Docker tagging release version" - docker tag "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}" "${DOCKER_IMAGE_NAME}:release" - - echo "Docker pushing release" - docker push "${DOCKER_IMAGE_NAME}:release" - docker push "${DOCKER_IMAGE_NAME}:${CURRENT_VERSION}" -fi diff --git a/travis/release.sh b/travis/release.sh deleted file mode 100644 index 4f97411f6..000000000 --- a/travis/release.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -set -e - -if [ "$TRAVIS_BRANCH" = "$RELEASE_BRANCH" ]; then - - REMOTE_NAME="origin" - POST_RELEASE_BRANCH="$POST_RELEASE_BRANCH" - - git remote rm $REMOTE_NAME - - echo "Setting remote url https://github.com/${TRAVIS_REPO_SLUG}.git" - git remote add $REMOTE_NAME "https://${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git" > /dev/null 2>&1 - - echo "Checking out $RELEASE_BRANCH as travis leaves the head detached." - git checkout $RELEASE_BRANCH - - CURRENT_VERSION=$(npm run version --silent) - - echo "Current Version" - echo "$CURRENT_VERSION" - echo "" - - echo "Testing git remote" - git branch -vv - echo "" - - echo "Creating tag v$CURRENT_VERSION" - git tag -fa "v$CURRENT_VERSION" -m "Releasing version $CURRENT_VERSION" - - echo "Increasing package version" - npm version patch -m "Increasing version to %s" --git-tag-version false - - CURRENT_VERSION=$(npm run version --silent) - - echo "New Version" - echo "$CURRENT_VERSION" - echo "" - - git add . - git commit -m "Creating new version $CURRENT_VERSION" - - echo "Pushing code to $REMOTE_NAME $POST_RELEASE_BRANCH" - git push --set-upstream $REMOTE_NAME $RELEASE_BRANCH:$POST_RELEASE_BRANCH - echo "Pushing tags to $REMOTE_NAME" - git push --tags $REMOTE_NAME -else - echo "Release is disabled" -fi From 716cae8c0ba39779843bb35b0bfa748fad33c466 Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Tue, 8 Dec 2020 23:31:52 +0800 Subject: [PATCH 06/12] update to 0.22 alpha --- package-lock.json | 28 ++++++++++++++-------------- package.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 74f03f1ba..c6382dc40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6647,9 +6647,9 @@ "dev": true }, "catbuffer-typescript": { - "version": "0.0.24-alpha-202011210642", - "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.24-alpha-202011210642.tgz", - "integrity": "sha512-rxbr92UcwTgCrpEbapaLROyMAE9RAssU7OXmWfodvYmi3VADZAo3OzqF3pxCSALvCJNRgWB2bXKT0IvE/012CA==" + "version": "0.0.24-alpha-202011261917", + "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.24-alpha-202011261917.tgz", + "integrity": "sha512-lyWdQFP7/ekc/mU5vVgPfHvHAIXufaH5t3jo6XVQq+2s8bn2rWlN2zGgO55Xyo1QRBwYmBQa5o4itk5NwP5KHw==" }, "ccount": { "version": "1.0.4", @@ -20847,18 +20847,18 @@ "dev": true }, "symbol-openapi-typescript-fetch-client": { - "version": "0.10.1-SNAPSHOT.202011191848", - "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-0.10.1-SNAPSHOT.202011191848.tgz", - "integrity": "sha512-5V7FBtdzz8nX3U06a6yqudLOMvk0/sw+cD5uIubYOmOrleIWFp2nb1IE7nrCSr1t4Qr/Rlg9UU6T/Xuyfp4YFA==" + "version": "0.10.1-SNAPSHOT.202012011711", + "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-0.10.1-SNAPSHOT.202012011711.tgz", + "integrity": "sha512-siNjO76byI75+PuOsDKkCFMvDcsbmFwuX0qAxYGN/qJdevOAgEoEo80uozaP69JGVUkOw8Xdqt+GXmoeQTrjlA==" }, "symbol-sdk": { - "version": "0.21.1-alpha-202011262256", - "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-0.21.1-alpha-202011262256.tgz", - "integrity": "sha512-2wbVMW4UD5Jj2tkRi19prWsapiMPxMmxHVhCQTaandOiL3yLrbOAyywXh0TKUUvZ4RXCsgwblSMDn/1+f4kiOw==", + "version": "0.22.0-alpha-202012081346", + "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-0.22.0-alpha-202012081346.tgz", + "integrity": "sha512-eEfsOUdsBpL2oz+fDFM+FxilymBx0gRnThRmdCQanFDzJbP2/GuC+HNFgzDqt/Du4wwmZjelx0RbNNKJrKrc/A==", "requires": { "@js-joda/core": "^3.2.0", "bluebird": "^3.7.2", - "catbuffer-typescript": "0.0.24-alpha-202011210642", + "catbuffer-typescript": "0.0.24-alpha-202011261917", "crypto-js": "^4.0.0", "diff": "^4.0.2", "futoin-hkdf": "^1.3.2", @@ -20872,7 +20872,7 @@ "ripemd160": "^2.0.2", "rxjs": "^6.6.3", "rxjs-compat": "^6.6.3", - "symbol-openapi-typescript-fetch-client": "0.10.1-SNAPSHOT.202011191848", + "symbol-openapi-typescript-fetch-client": "0.10.1-SNAPSHOT.202012011711", "tweetnacl": "^1.0.3", "ws": "^7.3.1" }, @@ -20896,9 +20896,9 @@ "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" }, "ws": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz", - "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==" + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz", + "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==" } } }, diff --git a/package.json b/package.json index fbf5064da..7ac26b73f 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "leaflet.markercluster": "^1.4.1", "merkletreejs": "^0.2.9", "moment-timezone": "^0.5.28", - "symbol-sdk": "^0.21.1-alpha-202011262256", + "symbol-sdk": "^0.22.0-alpha-202012081346", "url-parse": "^1.4.7", "utf8": "^3.0.0", "vue": "^2.6.11", From 534203c3551425e71008ac80bd91d5585008c3ce Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Wed, 9 Dec 2020 01:10:14 +0800 Subject: [PATCH 07/12] release note 0.7 --- CHANGELOG.md | 33 ++++++++++++++++++++++++++++++++- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4135c6c54..b8e3efa54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,36 @@ All notable changes to this project will be documented in this file. The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [v0.7.0][v0.7.0] - 9-Dec-2020 + +### Milestone: [catapult-server@v0.10.0.4](https://github.com/nemtech/catapult-server/releases/tag/v0.10.0.4) + +Package | Version | Link +---|---|--- +REST Core| v2.2.0 | [catapult-rest](https://github.com/nemtech/catapult-rest/releases/tag/v2.2.0) +SDK Core| v0.22.0 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk) + +### Added +- Added compatibility for 0.10.0.4 server. +- Add extra graph info into transaction list [#709](https://github.com/nemgrouplimited/symbol-explorer/pull/709) +- Display node type on base info widget (Voting node / non voting node) [#723](https://github.com/nemgrouplimited/symbol-explorer/pull/723) +- View receipt info in detail page such as Account, Block, Mosaic and Namespace [#716](https://github.com/nemgrouplimited/symbol-explorer/pull/716) +- Display more than 1 alias name in listing or detail page. [#716](https://github.com/nemgrouplimited/symbol-explorer/pull/717) +- new message component [#724](https://github.com/nemgrouplimited/symbol-explorer/pull/724) + +### Fixed +- Finalized Blocks are not up to date [#675](https://github.com/nemgrouplimited/symbol-explorer/issues/675) +- Replace hardcoded XYM text from i18n properties [#684](https://github.com/nemgrouplimited/symbol-explorer/issues/684) +- Address are not displayed correctly [#701](https://github.com/nemgrouplimited/symbol-explorer/issues/701) +- Transaction Detail. Doesn't display info for some transactions [#703](https://github.com/nemgrouplimited/symbol-explorer/issues/703) +- Display all transactions at one page for an account [#704](https://github.com/nemgrouplimited/symbol-explorer/issues/704) +- Namespace Detail. Handle expired namespace. [#705](https://github.com/nemgrouplimited/symbol-explorer/issues/705) +- TG. Aggrate Bonded icon missing. [#706](https://github.com/nemgrouplimited/symbol-explorer/issues/706) +- Only one account alias is presented. [#714](https://github.com/nemgrouplimited/symbol-explorer/issues/714) +- Minor change for CR. [#718](https://github.com/nemgrouplimited/symbol-explorer/issues/718) +- Account Detail. metadata is missing. [#725](https://github.com/nemgrouplimited/symbol-explorer/issues/725) + + ## [v0.6.2][v0.6.2] - 19-Oct-2020 ### Milestone: [catapult-server@v0.10.0.3](https://github.com/nemtech/catapult-server/releases/tag/v0.10.0.3) @@ -26,7 +56,7 @@ SDK Core| v0.21.0 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk) - Namespaces List. Showing wrong Expiration and Expiration Date [#644](https://github.com/nemgrouplimited/symbol-explorer/issues/644) - Problem with presenting address without outgoing transactions. [#663](https://github.com/nemgrouplimited/symbol-explorer/issues/663) - Problem with displaying account detail. [#638](https://github.com/nemgrouplimited/symbol-explorer/issues/638) -- Page Assembler 'adaptive' card layout. +- Page Assembler 'adaptive' card layout. - Fixes wrong display expiration date in the namespace list on the private network. [#686](https://github.com/nemgrouplimited/symbol-explorer/pull/686) ## [v0.6.1][v0.6.1] - 2-Oct-2020 @@ -175,3 +205,4 @@ SDK Core| v0.20.7 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk) [v0.6.0]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.6.0 [v0.6.1]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.6.1 [v0.6.2]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.6.2 +[v0.7.0]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.7.0 diff --git a/package-lock.json b/package-lock.json index bf8f46801..fcbb91ad1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "symbol-explorer", - "version": "0.6.3", + "version": "0.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index aa213607c..1fcc636d2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "symbol-explorer", "description": "Symbol Block and Network Explorer", "homepage": "https://github.com/nemgrouplimited/symbol-explorer", - "version": "0.6.3", + "version": "0.7.0", "scripts": { "dev": "vue-cli-service serve", "build": "vue-cli-service build", From b255de29017cb6f521f5e20539ede19f3e8d1160 Mon Sep 17 00:00:00 2001 From: Anthony Law Date: Wed, 9 Dec 2020 16:13:24 +0800 Subject: [PATCH 08/12] Update CHANGELOG.md Co-authored-by: Xavi Artigas --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8e3efa54..ab1548f27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ SDK Core| v0.22.0 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk) ### Fixed - Finalized Blocks are not up to date [#675](https://github.com/nemgrouplimited/symbol-explorer/issues/675) - Replace hardcoded XYM text from i18n properties [#684](https://github.com/nemgrouplimited/symbol-explorer/issues/684) -- Address are not displayed correctly [#701](https://github.com/nemgrouplimited/symbol-explorer/issues/701) +- Addresses are not displayed correctly [#701](https://github.com/nemgrouplimited/symbol-explorer/issues/701) - Transaction Detail. Doesn't display info for some transactions [#703](https://github.com/nemgrouplimited/symbol-explorer/issues/703) - Display all transactions at one page for an account [#704](https://github.com/nemgrouplimited/symbol-explorer/issues/704) - Namespace Detail. Handle expired namespace. [#705](https://github.com/nemgrouplimited/symbol-explorer/issues/705) From 102484553bd22d4a001e465167ad389799ce8f72 Mon Sep 17 00:00:00 2001 From: Anthony Law Date: Wed, 9 Dec 2020 16:13:34 +0800 Subject: [PATCH 09/12] Update CHANGELOG.md Co-authored-by: Xavi Artigas --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab1548f27..0e2d913a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ SDK Core| v0.22.0 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk) - Display node type on base info widget (Voting node / non voting node) [#723](https://github.com/nemgrouplimited/symbol-explorer/pull/723) - View receipt info in detail page such as Account, Block, Mosaic and Namespace [#716](https://github.com/nemgrouplimited/symbol-explorer/pull/716) - Display more than 1 alias name in listing or detail page. [#716](https://github.com/nemgrouplimited/symbol-explorer/pull/717) -- new message component [#724](https://github.com/nemgrouplimited/symbol-explorer/pull/724) +- New message component [#724](https://github.com/nemgrouplimited/symbol-explorer/pull/724) ### Fixed - Finalized Blocks are not up to date [#675](https://github.com/nemgrouplimited/symbol-explorer/issues/675) From 30bbaa068d19517fdfcec4501c4991224eea39f7 Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Thu, 10 Dec 2020 04:21:03 +0800 Subject: [PATCH 10/12] updated to SDK 0.22 --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6382dc40..940f120c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6647,9 +6647,9 @@ "dev": true }, "catbuffer-typescript": { - "version": "0.0.24-alpha-202011261917", - "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.24-alpha-202011261917.tgz", - "integrity": "sha512-lyWdQFP7/ekc/mU5vVgPfHvHAIXufaH5t3jo6XVQq+2s8bn2rWlN2zGgO55Xyo1QRBwYmBQa5o4itk5NwP5KHw==" + "version": "0.0.24", + "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.24.tgz", + "integrity": "sha512-kHXDDXfZlTCk7QKh9j1zddtpChxSLd+vmWGqHQ0mO0+ekyJUT1h77tjviccQY1HONT0+ddQ2o3AhvdU77coytw==" }, "ccount": { "version": "1.0.4", @@ -20847,18 +20847,18 @@ "dev": true }, "symbol-openapi-typescript-fetch-client": { - "version": "0.10.1-SNAPSHOT.202012011711", - "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-0.10.1-SNAPSHOT.202012011711.tgz", - "integrity": "sha512-siNjO76byI75+PuOsDKkCFMvDcsbmFwuX0qAxYGN/qJdevOAgEoEo80uozaP69JGVUkOw8Xdqt+GXmoeQTrjlA==" + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-0.10.4.tgz", + "integrity": "sha512-WME5yuvfYTT7BxvKOyKu6iAWPPXCBmuARTpwBfh5jW+3SkmZ5KVVgl2H54ORmJILFGBm1ozzvMlyuGa+fsd7hw==" }, "symbol-sdk": { - "version": "0.22.0-alpha-202012081346", - "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-0.22.0-alpha-202012081346.tgz", - "integrity": "sha512-eEfsOUdsBpL2oz+fDFM+FxilymBx0gRnThRmdCQanFDzJbP2/GuC+HNFgzDqt/Du4wwmZjelx0RbNNKJrKrc/A==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-0.22.0.tgz", + "integrity": "sha512-cWIqHLKArv5RjInENgOdnyCBV06Eb41BWB0lQ05yeYdbxvz5eW/mFbSTxAxw6ai72f5I1yAIbKaxEzLKzTbMbQ==", "requires": { "@js-joda/core": "^3.2.0", "bluebird": "^3.7.2", - "catbuffer-typescript": "0.0.24-alpha-202011261917", + "catbuffer-typescript": "0.0.24", "crypto-js": "^4.0.0", "diff": "^4.0.2", "futoin-hkdf": "^1.3.2", @@ -20872,7 +20872,7 @@ "ripemd160": "^2.0.2", "rxjs": "^6.6.3", "rxjs-compat": "^6.6.3", - "symbol-openapi-typescript-fetch-client": "0.10.1-SNAPSHOT.202012011711", + "symbol-openapi-typescript-fetch-client": "0.10.4", "tweetnacl": "^1.0.3", "ws": "^7.3.1" }, diff --git a/package.json b/package.json index 7ac26b73f..d8f80b2c4 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "leaflet.markercluster": "^1.4.1", "merkletreejs": "^0.2.9", "moment-timezone": "^0.5.28", - "symbol-sdk": "^0.22.0-alpha-202012081346", + "symbol-sdk": "^0.22.0", "url-parse": "^1.4.7", "utf8": "^3.0.0", "vue": "^2.6.11", From df4194ce1eff498a821d636dca7b7ada73930830 Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Thu, 10 Dec 2020 04:21:24 +0800 Subject: [PATCH 11/12] minor bug fixes --- src/components/widgets/AccountBalanceWidget.vue | 2 +- src/infrastructure/AccountService.js | 2 +- src/infrastructure/MosaicService.js | 9 ++++++--- src/infrastructure/NamespaceService.js | 9 ++++++--- src/infrastructure/RestrictionService.js | 12 +++++++----- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/components/widgets/AccountBalanceWidget.vue b/src/components/widgets/AccountBalanceWidget.vue index d7410c4fc..dec914da5 100644 --- a/src/components/widgets/AccountBalanceWidget.vue +++ b/src/components/widgets/AccountBalanceWidget.vue @@ -81,7 +81,7 @@ export default { }, balance() { - return this.data.balance || 0; + return this.data.balance || '0'; }, address() { diff --git a/src/infrastructure/AccountService.js b/src/infrastructure/AccountService.js index 8c4d57a15..252a8f38d 100644 --- a/src/infrastructure/AccountService.js +++ b/src/infrastructure/AccountService.js @@ -417,7 +417,7 @@ class AccountService { static extractAccountNamespace = (accountInfo, accountNames) => { let accountName = accountNames.find((name) => name.address === accountInfo.address); - const aliasNames = accountName.names.map(names => names.name); + const aliasNames = accountName.names.map(names => names.name); const names = aliasNames.length > 0 ? aliasNames : [Constants.Message.UNAVAILABLE]; diff --git a/src/infrastructure/MosaicService.js b/src/infrastructure/MosaicService.js index 502c60039..a5394a4a7 100644 --- a/src/infrastructure/MosaicService.js +++ b/src/infrastructure/MosaicService.js @@ -149,16 +149,19 @@ class MosaicService { * Gets mosaic Metadata list dataset into Vue component * @param pageInfo - object for page info such as pageNumber, pageSize * @param filterVaule - object for search criteria - * @param mosaicId - mosaicid + * @param hexOrNamespace - hex value or namespace name * @returns formatted mosaic Metadata list */ - static getMosaicMetadataList = async (pageInfo, filterVaule, mosaicId) => { + static getMosaicMetadataList = async (pageInfo, filterVaule, hexOrNamespace) => { + const mosaicId = await helper.hexOrNamespaceToId(hexOrNamespace, 'mosaic'); + const { pageNumber, pageSize } = pageInfo; + const searchCriteria = { pageNumber, pageSize, order: Order.Desc, - targetId: new MosaicId(mosaicId), + targetId: mosaicId, ...filterVaule }; const mosaicMetadatas = await MetadataService.searchMetadatas(searchCriteria); diff --git a/src/infrastructure/NamespaceService.js b/src/infrastructure/NamespaceService.js index 381b01363..18d65c284 100644 --- a/src/infrastructure/NamespaceService.js +++ b/src/infrastructure/NamespaceService.js @@ -220,16 +220,19 @@ class NamespaceService { * Gets namespace metadata list dataset into Vue component * @param pageInfo - object for page info such as pageNumber, pageSize * @param filterVaule - object for search criteria - * @param namespaceId - namespaceId + * @param hexOrNamespace - hex value or namespace name * @returns formatted mamespace Metadata list */ - static getNamespaceMetadataList = async (pageInfo, filterVaule, namespaceId) => { + static getNamespaceMetadataList = async (pageInfo, filterVaule, hexOrNamespace) => { + const namespaceId = await helper.hexOrNamespaceToId(hexOrNamespace, 'namespace'); + const { pageNumber, pageSize } = pageInfo; + const searchCriteria = { pageNumber, pageSize, order: Order.Desc, - targetId: new NamespaceId(namespaceId), + targetId: namespaceId, ...filterVaule }; const namespaceMetadatas = await MetadataService.searchMetadatas(searchCriteria); diff --git a/src/infrastructure/RestrictionService.js b/src/infrastructure/RestrictionService.js index 52ed341f7..d171d2c0f 100644 --- a/src/infrastructure/RestrictionService.js +++ b/src/infrastructure/RestrictionService.js @@ -7,9 +7,9 @@ import { MosaicAddressRestriction, MosaicGlobalRestriction, MosaicRestrictionEntryType, - Order, - MosaicId + Order } from 'symbol-sdk'; +import helper from '../helper'; import Constants from '../config/constants'; class RestrictionService { @@ -155,17 +155,19 @@ class RestrictionService { * Gets Mosaic Restriction list dataset into Vue component * @param pageInfo - object for page info such as pageNumber, pageSize * @param filterVaule - object for search criteria eg. mosaic global or mosaic address - * @param mosaicId - mosaicId + * @param hexOrNamespace - hex value or namespace name * @returns formatted mosaic restriction list */ - static getMosaicRestrictionList = async (pageInfo, filterVaule, mosaicId) => { + static getMosaicRestrictionList = async (pageInfo, filterVaule, hexOrNamespace) => { + const mosaicId = await helper.hexOrNamespaceToId(hexOrNamespace, 'mosaic'); + const { pageNumber, pageSize } = pageInfo; const searchCriteria = { pageNumber, pageSize, order: Order.Desc, - mosaicId: new MosaicId(mosaicId), + mosaicId: mosaicId, ...filterVaule }; From 30d20d46b8b20384dc7b3036fc991930025df8c3 Mon Sep 17 00:00:00 2001 From: Anthony Law Yong Chuan Date: Tue, 15 Dec 2020 05:26:52 +0800 Subject: [PATCH 12/12] update SDK 22.2 --- CHANGELOG.md | 2 +- package-lock.json | 45 ++++++++++++++++++++++----------------------- package.json | 2 +- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e2d913a9..6fb5070a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e Package | Version | Link ---|---|--- REST Core| v2.2.0 | [catapult-rest](https://github.com/nemtech/catapult-rest/releases/tag/v2.2.0) -SDK Core| v0.22.0 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk) +SDK Core| v0.22.2 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk) ### Added - Added compatibility for 0.10.0.4 server. diff --git a/package-lock.json b/package-lock.json index aa0bc0771..7fc30bd8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6647,9 +6647,9 @@ "dev": true }, "catbuffer-typescript": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.24.tgz", - "integrity": "sha512-kHXDDXfZlTCk7QKh9j1zddtpChxSLd+vmWGqHQ0mO0+ekyJUT1h77tjviccQY1HONT0+ddQ2o3AhvdU77coytw==" + "version": "0.0.25", + "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.0.25.tgz", + "integrity": "sha512-ju+46OuI/f9dpvzS6S/oDfLFdT/kDWilKXBe3e4DXGy9bZFtEfmxXBmNyUy4a36JlHKoDDZMq15D+0k+rDWNSg==" }, "ccount": { "version": "1.0.4", @@ -10329,8 +10329,7 @@ }, "ini": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "resolved": "", "dev": true, "optional": true }, @@ -11591,9 +11590,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, "inquirer": { @@ -16247,9 +16246,9 @@ "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" }, "node-forge": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", - "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, "node-gyp": { @@ -19259,12 +19258,12 @@ "dev": true }, "selfsigned": { - "version": "1.10.7", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", - "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", + "version": "1.10.8", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", + "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "dev": true, "requires": { - "node-forge": "0.9.0" + "node-forge": "^0.10.0" } }, "semver": { @@ -20847,18 +20846,18 @@ "dev": true }, "symbol-openapi-typescript-fetch-client": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-0.10.4.tgz", - "integrity": "sha512-WME5yuvfYTT7BxvKOyKu6iAWPPXCBmuARTpwBfh5jW+3SkmZ5KVVgl2H54ORmJILFGBm1ozzvMlyuGa+fsd7hw==" + "version": "0.10.5-1", + "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-0.10.5-1.tgz", + "integrity": "sha512-LS+Ka7hF+IaxinJjvnykKK05wUySXTeYFv1GOjEgj+vXQxewK/TtWrlx9baCeGs6198GJ2f1nYmykflAlLt9OQ==" }, "symbol-sdk": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-0.22.0.tgz", - "integrity": "sha512-cWIqHLKArv5RjInENgOdnyCBV06Eb41BWB0lQ05yeYdbxvz5eW/mFbSTxAxw6ai72f5I1yAIbKaxEzLKzTbMbQ==", + "version": "0.22.2", + "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-0.22.2.tgz", + "integrity": "sha512-NQWP3fBtDNfqwU7wEB46fUt7sqckyjjVTjldDpK6Y9KE1sLvYFoM81OrKNnn3MjaZMe65lY0MytyRSSiMEqR/w==", "requires": { "@js-joda/core": "^3.2.0", "bluebird": "^3.7.2", - "catbuffer-typescript": "0.0.24", + "catbuffer-typescript": "0.0.25", "crypto-js": "^4.0.0", "diff": "^4.0.2", "futoin-hkdf": "^1.3.2", @@ -20872,7 +20871,7 @@ "ripemd160": "^2.0.2", "rxjs": "^6.6.3", "rxjs-compat": "^6.6.3", - "symbol-openapi-typescript-fetch-client": "0.10.4", + "symbol-openapi-typescript-fetch-client": "0.10.5-1", "tweetnacl": "^1.0.3", "ws": "^7.3.1" }, diff --git a/package.json b/package.json index fad9efc88..e984f3b99 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "leaflet.markercluster": "^1.4.1", "merkletreejs": "^0.2.9", "moment-timezone": "^0.5.28", - "symbol-sdk": "^0.22.0", + "symbol-sdk": "^0.22.2", "url-parse": "^1.4.7", "utf8": "^3.0.0", "vue": "^2.6.11",