From 46db029a00270baec231a413551c774098f11307 Mon Sep 17 00:00:00 2001 From: microwavedcola1 <89031858+microwavedcola1@users.noreply.github.com> Date: Mon, 6 Sep 2021 23:41:18 +0200 Subject: [PATCH] Bump mango client used by explorer, previous version was breaking explorer builds (#19668) * Bump mango client used by explorer, previous version was breaking explorer builds Signed-off-by: microwavedcola1 * run prettier Signed-off-by: microwavedcola1 --- explorer/package-lock.json | 78 ++++++++++--------- explorer/package.json | 2 +- .../components/account/TokenHistoryCard.tsx | 5 +- 3 files changed, 47 insertions(+), 38 deletions(-) diff --git a/explorer/package-lock.json b/explorer/package-lock.json index 4f99b5104..0b1e8203c 100644 --- a/explorer/package-lock.json +++ b/explorer/package-lock.json @@ -8,7 +8,7 @@ "name": "explorer", "version": "0.1.0", "dependencies": { - "@blockworks-foundation/mango-client": "^3.0.12", + "@blockworks-foundation/mango-client": "^3.0.14", "@bonfida/bot": "^0.5.3", "@metamask/jazzicon": "^2.0.0", "@project-serum/serum": "^0.13.58", @@ -1309,18 +1309,18 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, "node_modules/@blockworks-foundation/mango-client": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/@blockworks-foundation/mango-client/-/mango-client-3.0.12.tgz", - "integrity": "sha512-gDwn2feXPMuyxb+mQXXJfAlyVLojnCifPbvxfRNikV4nswHQmPVQ1GhLzqAYXxqxANBiRlDB3uHISnnQp0Xqcw==", + "version": "3.0.14", + "resolved": "https://registry.npmjs.org/@blockworks-foundation/mango-client/-/mango-client-3.0.14.tgz", + "integrity": "sha512-t6W4yYFtoEVdG8d4ItspVbSOvNK/8o8iy9y/Fy2dhEFBf++pzIIMaaDPvN8H8zDZmzhCYuDnqL4GUhTO9qTGKg==", "dependencies": { "@project-serum/serum": "0.13.55", "@project-serum/sol-wallet-adapter": "^0.2.0", "@solana/spl-token": "^0.1.6", "@solana/web3.js": "1.21.0", + "axios": "^0.21.1", "big.js": "^6.1.1", "bigint-buffer": "^1.1.5", "bn.js": "^5.1.0", - "borsh": "git+https://github.com/defactojob/borsh-js.git#field-mapper", "buffer-layout": "^1.2.1", "yargs": "^17.0.1" }, @@ -1474,17 +1474,6 @@ "url": "https://opencollective.com/bigjs" } }, - "node_modules/@blockworks-foundation/mango-client/node_modules/borsh": { - "version": "0.3.1", - "resolved": "git+ssh://git@github.com/defactojob/borsh-js.git#33a0d24af281112c0a48efb3fa503f3212443de9", - "license": "Apache-2.0", - "dependencies": { - "@types/bn.js": "^4.11.5", - "bn.js": "^5.0.0", - "bs58": "^4.0.0", - "text-encoding-utf-8": "^1.0.2" - } - }, "node_modules/@blockworks-foundation/mango-client/node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -5547,6 +5536,14 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -10390,11 +10387,22 @@ } }, "node_modules/follow-redirects": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz", - "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz", + "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], "engines": { "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } } }, "node_modules/for-in": { @@ -26347,18 +26355,18 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, "@blockworks-foundation/mango-client": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/@blockworks-foundation/mango-client/-/mango-client-3.0.12.tgz", - "integrity": "sha512-gDwn2feXPMuyxb+mQXXJfAlyVLojnCifPbvxfRNikV4nswHQmPVQ1GhLzqAYXxqxANBiRlDB3uHISnnQp0Xqcw==", + "version": "3.0.14", + "resolved": "https://registry.npmjs.org/@blockworks-foundation/mango-client/-/mango-client-3.0.14.tgz", + "integrity": "sha512-t6W4yYFtoEVdG8d4ItspVbSOvNK/8o8iy9y/Fy2dhEFBf++pzIIMaaDPvN8H8zDZmzhCYuDnqL4GUhTO9qTGKg==", "requires": { "@project-serum/serum": "0.13.55", "@project-serum/sol-wallet-adapter": "^0.2.0", "@solana/spl-token": "^0.1.6", "@solana/web3.js": "1.21.0", + "axios": "^0.21.1", "big.js": "^6.1.1", "bigint-buffer": "^1.1.5", "bn.js": "^5.1.0", - "borsh": "git+https://github.com/defactojob/borsh-js.git#field-mapper", "buffer-layout": "^1.2.1", "yargs": "^17.0.1" }, @@ -26471,16 +26479,6 @@ "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.1.1.tgz", "integrity": "sha512-1vObw81a8ylZO5ePrtMay0n018TcftpTA5HFKDaSuiUDBo8biRBtjIobw60OpwuvrGk+FsxKamqN4cnmj/eXdg==" }, - "borsh": { - "version": "git+ssh://git@github.com/defactojob/borsh-js.git#33a0d24af281112c0a48efb3fa503f3212443de9", - "from": "borsh@git+https://github.com/defactojob/borsh-js.git#field-mapper", - "requires": { - "@types/bn.js": "^4.11.5", - "bn.js": "^5.0.0", - "bs58": "^4.0.0", - "text-encoding-utf-8": "^1.0.2" - } - }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -29828,6 +29826,14 @@ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.1.2.tgz", "integrity": "sha512-V+Nq70NxKhYt89ArVcaNL9FDryB3vQOd+BFXZIfO3RP6rwtj+2yqqqdHEkacutglPaZLkJeuXKCjCJDMGPtPqg==" }, + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "requires": { + "follow-redirects": "^1.14.0" + } + }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -33883,9 +33889,9 @@ } }, "follow-redirects": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz", - "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==" + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz", + "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==" }, "for-in": { "version": "1.0.2", diff --git a/explorer/package.json b/explorer/package.json index 2ce29d355..b3e79fac5 100644 --- a/explorer/package.json +++ b/explorer/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@blockworks-foundation/mango-client": "^3.0.12", + "@blockworks-foundation/mango-client": "^3.0.14", "@bonfida/bot": "^0.5.3", "@metamask/jazzicon": "^2.0.0", "@project-serum/serum": "^0.13.58", diff --git a/explorer/src/components/account/TokenHistoryCard.tsx b/explorer/src/components/account/TokenHistoryCard.tsx index bb504aefe..fc0f2f434 100644 --- a/explorer/src/components/account/TokenHistoryCard.tsx +++ b/explorer/src/components/account/TokenHistoryCard.tsx @@ -51,7 +51,10 @@ import { useQuery } from "utils/url"; import { TokenInfoMap } from "@solana/spl-token-registry"; import { useTokenRegistry } from "providers/mints/token-registry"; import { getTokenProgramInstructionName } from "utils/instruction"; -import { isMangoInstruction, parseMangoInstructionTitle } from "components/instruction/mango/types"; +import { + isMangoInstruction, + parseMangoInstructionTitle, +} from "components/instruction/mango/types"; const TRUNCATE_TOKEN_LENGTH = 10; const ALL_TOKENS = "";