diff --git a/client/share/utils.js b/client/share/utils.js index 7a61adeb..cfd9dd29 100644 --- a/client/share/utils.js +++ b/client/share/utils.js @@ -90,7 +90,7 @@ export function toBase58(data) { } export function fromBase58(data) { - return bs58.decode(data); + return Buffer.from(bs58.decode(data)); } //base-x слишком тормозит, используем sjcl diff --git a/package-lock.json b/package-lock.json index 0d463cc0..c0a25b36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@quasar/extras": "^1.12.0", "@vue/compat": "^3.2.21", "axios": "^0.27.2", - "base-x": "^3.0.9", + "base-x": "^4.0.0", "chardet": "^1.4.0", "compression": "^1.7.4", "express": "^4.17.1", @@ -3016,12 +3016,9 @@ "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" }, "node_modules/base-x": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz", - "integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==", - "dependencies": { - "safe-buffer": "^5.0.1" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", + "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" }, "node_modules/base64-js": { "version": "1.5.1", @@ -13687,12 +13684,9 @@ "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" }, "base-x": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz", - "integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==", - "requires": { - "safe-buffer": "^5.0.1" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", + "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" }, "base64-js": { "version": "1.5.1", diff --git a/package.json b/package.json index 8d57fd2b..255a1c38 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@quasar/extras": "^1.12.0", "@vue/compat": "^3.2.21", "axios": "^0.27.2", - "base-x": "^3.0.9", + "base-x": "^4.0.0", "chardet": "^1.4.0", "compression": "^1.7.4", "express": "^4.17.1", diff --git a/server/core/utils.js b/server/core/utils.js index 18017223..7dc2b636 100644 --- a/server/core/utils.js +++ b/server/core/utils.js @@ -13,7 +13,7 @@ function toBase36(data) { } function fromBase36(data) { - return bs36.decode(data); + return Buffer.from(bs36.decode(data)); } function bufferRemoveZeroes(buf) {