From 07284f539409880543fdae64b51b2764c726e9b6 Mon Sep 17 00:00:00 2001 From: Arrowana Date: Fri, 13 Oct 2023 14:26:41 +1100 Subject: [PATCH] feature: Nested inner instructions using stackHeight --- .../transaction/InstructionsSection.tsx | 120 +++++++++-- app/providers/transactions/parsed.tsx | 5 +- pnpm-lock.yaml | 194 ++++++------------ 3 files changed, 171 insertions(+), 148 deletions(-) diff --git a/app/components/transaction/InstructionsSection.tsx b/app/components/transaction/InstructionsSection.tsx index 680f69c0..3f6175ff 100644 --- a/app/components/transaction/InstructionsSection.tsx +++ b/app/components/transaction/InstructionsSection.tsx @@ -54,6 +54,97 @@ export type InstructionDetailsProps = { childIndex?: number; }; +interface InnerInstruction { + index: number; + stackHeight: number; + instruction: ParsedInstruction | PartiallyDecodedInstruction; + innerInstructions: InnerInstruction[]; +} + +function makeInnerInstructionsTree( + innerInstructions: (ParsedInstruction | PartiallyDecodedInstruction)[], + index = 0, + stackHeight = 2 +): InnerInstruction[] { + const innerInstructionsTree: InnerInstruction[] = []; + const remainingInnerInstructions = innerInstructions.slice(); + let currentInstruction = remainingInnerInstructions.shift(); + if (!currentInstruction) return innerInstructionsTree; + + let innerInstructionsForInnerInstruction: (ParsedInstruction | PartiallyDecodedInstruction)[] = []; + for (const instruction of remainingInnerInstructions) { + const ixStackHeight = instruction.stackHeight; + if (ixStackHeight > stackHeight) { + innerInstructionsForInnerInstruction.push(instruction); + } else { + innerInstructionsTree.push({ + index, + innerInstructions: makeInnerInstructionsTree( + innerInstructionsForInnerInstruction, + index + 1, + stackHeight + 1 + ), + instruction: currentInstruction, + stackHeight: ixStackHeight, + }); + + index += 1 + innerInstructionsForInnerInstruction.length; + currentInstruction = instruction; + innerInstructionsForInnerInstruction = []; + } + } + innerInstructionsTree.push({ + index, + innerInstructions: makeInnerInstructionsTree(innerInstructionsForInnerInstruction, index + 1, stackHeight + 1), + instruction: currentInstruction, + stackHeight: currentInstruction.stackHeight, + }); + return innerInstructionsTree; +} + +function instructionCardForInnerInstruction({ + index, + innerInstruction, + signature, + tx, + result, + url, +}: { + index: number; + innerInstruction: InnerInstruction; + signature: string; + tx: ParsedTransaction; + result: SignatureResult; + url: string; +}) { + const innerCards = + innerInstruction.innerInstructions.length > 0 + ? innerInstruction.innerInstructions.map(inner => + instructionCardForInnerInstruction({ + index, + innerInstruction: inner, + result, + signature, + tx, + url, + }) + ) + : undefined; + return ( + + ); +} + export function InstructionsSection({ signature }: SignatureProps) { const status = useTransactionStatus(signature); const details = useTransactionDetails(signature); @@ -106,22 +197,21 @@ export function InstructionsSection({ signature }: SignatureProps) { {transaction.message.instructions.map((instruction, index) => { const innerCards: JSX.Element[] = []; - if (index in innerInstructions) { - innerInstructions[index].forEach((ix, childIndex) => { - const res = ( - + const currentInstructionInnerInstructions = innerInstructions[index]; + if (currentInstructionInnerInstructions) { + const innerInstructions = makeInnerInstructionsTree(currentInstructionInnerInstructions); + for (const innerInstruction of innerInstructions) { + innerCards.push( + instructionCardForInnerInstruction({ + index, + innerInstruction, + result, + signature, + tx: transaction, + url, + }) ); - innerCards.push(res); - }); + } } return ( diff --git a/app/providers/transactions/parsed.tsx b/app/providers/transactions/parsed.tsx index 13b93de2..a2c23058 100644 --- a/app/providers/transactions/parsed.tsx +++ b/app/providers/transactions/parsed.tsx @@ -48,11 +48,10 @@ async function fetchDetails(dispatch: Dispatch, signature: TransactionSignature, commitment: 'confirmed', maxSupportedTransactionVersion: 0, }); + console.log(transactionWithMeta); fetchStatus = FetchStatus.Fetched; } catch (error) { - if (cluster !== Cluster.Custom) { - console.error(error, { url }); - } + console.error(error, { url }); fetchStatus = FetchStatus.FetchFailed; } dispatch({ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 70aaab77..6843d573 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,7 +15,7 @@ dependencies: version: 3.6.7 '@bonfida/spl-name-service': specifier: 0.1.30 - version: 0.1.30(@solana/buffer-layout@3.0.0)(@solana/spl-token@0.1.8)(@solana/web3.js@1.66.0)(bn.js@5.2.1)(borsh@0.7.0) + version: 0.1.30(@solana/buffer-layout@3.0.0)(@solana/spl-token@0.1.8)(@solana/web3.js@1.78.0)(bn.js@5.2.1)(borsh@0.7.0) '@cloudflare/stream-react': specifier: ^1.2.0 version: 1.2.0(react@18.2.0) @@ -27,7 +27,7 @@ dependencies: version: 1.1.0 '@metaplex/js': specifier: ^4.12.0 - version: 4.12.0(@metaplex-foundation/mpl-auction@0.0.2)(@metaplex-foundation/mpl-core@0.0.2)(@metaplex-foundation/mpl-metaplex@0.0.5)(@metaplex-foundation/mpl-token-metadata@1.1.0)(@metaplex-foundation/mpl-token-vault@0.0.2)(@solana/spl-token@0.1.8)(@solana/web3.js@1.66.0) + version: 4.12.0(@metaplex-foundation/mpl-auction@0.0.2)(@metaplex-foundation/mpl-core@0.0.2)(@metaplex-foundation/mpl-metaplex@0.0.5)(@metaplex-foundation/mpl-token-metadata@1.1.0)(@metaplex-foundation/mpl-token-vault@0.0.2)(@solana/spl-token@0.1.8)(@solana/web3.js@1.78.0) '@project-serum/anchor': specifier: ^0.23.0 version: 0.23.0 @@ -45,16 +45,16 @@ dependencies: version: 3.0.0 '@solana/spl-account-compression': specifier: ^0.1.8 - version: 0.1.8(@solana/web3.js@1.66.0) + version: 0.1.8(@solana/web3.js@1.78.0) '@solana/spl-token': specifier: ^0.1.8 version: 0.1.8 '@solana/web3.js': specifier: ^1.66.0 - version: 1.66.0 + version: link:../../solana-web3.js/packages/library-legacy '@solflare-wallet/utl-sdk': specifier: ^1.4.0 - version: 1.4.0(@solana/web3.js@1.66.0) + version: 1.4.0(@solana/web3.js@1.78.0) '@types/bn.js': specifier: 5.1.0 version: 5.1.0 @@ -1119,9 +1119,9 @@ packages: dependencies: '@project-serum/anchor': 0.21.0 '@project-serum/serum': 0.13.55 - '@project-serum/sol-wallet-adapter': 0.2.6(@solana/web3.js@1.66.0) + '@project-serum/sol-wallet-adapter': 0.2.6(@solana/web3.js@1.78.0) '@solana/spl-token': 0.1.8 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 big.js: 6.2.1 bn.js: 5.2.1 buffer-layout: 1.2.2 @@ -1132,10 +1132,11 @@ packages: transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false - /@bonfida/spl-name-service@0.1.30(@solana/buffer-layout@3.0.0)(@solana/spl-token@0.1.8)(@solana/web3.js@1.66.0)(bn.js@5.2.1)(borsh@0.7.0): + /@bonfida/spl-name-service@0.1.30(@solana/buffer-layout@3.0.0)(@solana/spl-token@0.1.8)(@solana/web3.js@1.78.0)(bn.js@5.2.1)(borsh@0.7.0): resolution: {integrity: sha512-0aSpymeNDq7rDSDEJgB6/qKyy3yUkHLQk7Jxwtmibfva3s1johEfFdl2kUDDPWi/ubgbxYjPxJRGrlGQNEmmQw==} peerDependencies: '@solana/buffer-layout': ^4.0.0 @@ -1146,7 +1147,7 @@ packages: dependencies: '@solana/buffer-layout': 3.0.0 '@solana/spl-token': 0.1.8 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bn.js: 5.2.1 borsh: 0.7.0 ethers: 5.7.2 @@ -1159,11 +1160,11 @@ packages: resolution: {integrity: sha512-1qTDrwgmgeh0pO24JbeGt2W8GlpWYkVnQ8AhEZ02Lm00J7RALSyma3C5pNlKuvAQBczL1r9KhLr9KHK1og3J0g==} hasBin: true dependencies: - '@solana/wallet-adapter-base': 0.9.22(@solana/web3.js@1.66.0) - '@solana/web3.js': 1.66.0 + '@solana/wallet-adapter-base': 0.9.22(@solana/web3.js@1.78.0) + '@solana/web3.js': 1.78.0 '@supercharge/promise-pool': 2.4.0 algosdk: 1.24.1 - arbundles: 0.6.22(@solana/web3.js@1.66.0)(debug@4.3.4) + arbundles: 0.6.22(@solana/web3.js@1.78.0)(debug@4.3.4) arweave: 1.14.0 async-retry: 1.3.3 axios: 0.25.0(debug@4.3.4) @@ -1182,6 +1183,7 @@ packages: - bufferutil - debug - encoding + - supports-color - utf-8-validate dev: false @@ -1930,7 +1932,7 @@ packages: resolution: {integrity: sha512-QV2DbxjaJWLkMvn12OC09g+r7a6R0uNwf8msYuOUSw4cG7amXzvFb7s0bh4IxY3Rk8/0ma0PfKi/FEdC7Hi4Pg==} dependencies: '@metaplex-foundation/beet': 0.7.1 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 transitivePeerDependencies: - bufferutil - encoding @@ -1942,7 +1944,7 @@ packages: resolution: {integrity: sha512-tgyEl6dvtLln8XX81JyBvWjIiEcjTkUwZbrM5dIobTmoqMuGewSyk9CClno8qsMsFdB5T3jC91Rjeqmu/6xk2g==} dependencies: '@metaplex-foundation/beet': 0.7.1 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bs58: 5.0.0 debug: 4.3.4 transitivePeerDependencies: @@ -1956,7 +1958,7 @@ packages: resolution: {integrity: sha512-B1L94N3ZGMo53b0uOSoznbuM5GBNJ8LwSeznxBxJ+OThvfHQ4B5oMUqb+0zdLRfkKGS7Q6tpHK9P+QK0j3w2cQ==} dependencies: '@metaplex-foundation/beet': 0.7.1 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bs58: 5.0.0 debug: 4.3.4 transitivePeerDependencies: @@ -2022,7 +2024,7 @@ packages: '@metaplex-foundation/mpl-candy-machine': 4.7.1 '@metaplex-foundation/mpl-token-metadata': 2.13.0 '@solana/spl-token': 0.2.0 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 abort-controller: 3.0.0 bignumber.js: 9.0.2 bn.js: 5.2.1 @@ -2049,8 +2051,8 @@ packages: '@metaplex-foundation/beet': 0.6.1 '@metaplex-foundation/beet-solana': 0.3.1 '@metaplex-foundation/cusper': 0.0.2 - '@solana/spl-token': 0.3.8(@solana/web3.js@1.66.0) - '@solana/web3.js': 1.66.0 + '@solana/spl-token': 0.3.8(@solana/web3.js@1.78.0) + '@solana/web3.js': 1.78.0 bn.js: 5.2.1 transitivePeerDependencies: - bufferutil @@ -2079,7 +2081,7 @@ packages: '@metaplex-foundation/beet-solana': 0.3.1 '@metaplex-foundation/cusper': 0.0.2 '@metaplex-foundation/mpl-core': 0.6.1 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 transitivePeerDependencies: - bufferutil - encoding @@ -2091,11 +2093,12 @@ packages: resolution: {integrity: sha512-UUJ4BlYiWdDegAWmjsNQiNehwYU3QfSFWs3sv4VX0J6/ZrQ28zqosGhQ+I2ZCTEy216finJ82sZWNjuwSWCYyQ==} deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. dependencies: - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bs58: 4.0.1 transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false @@ -2103,11 +2106,12 @@ packages: resolution: {integrity: sha512-6R4HkfAqU2EUakNbVLcCmka0YuQTLGTbHJ62ig765+NRWuB2HNGUQ1HfHcRsGnyxhlCvwKK79JE01XUjFE+dzw==} deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. dependencies: - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bs58: 4.0.1 transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false @@ -2145,10 +2149,11 @@ packages: dependencies: '@metaplex-foundation/mpl-core': 0.0.2 '@solana/spl-token': 0.1.8 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false @@ -2218,7 +2223,7 @@ packages: '@metaplex-foundation/umi-serializers-numbers': 0.8.2 dev: false - /@metaplex/js@4.12.0(@metaplex-foundation/mpl-auction@0.0.2)(@metaplex-foundation/mpl-core@0.0.2)(@metaplex-foundation/mpl-metaplex@0.0.5)(@metaplex-foundation/mpl-token-metadata@1.1.0)(@metaplex-foundation/mpl-token-vault@0.0.2)(@solana/spl-token@0.1.8)(@solana/web3.js@1.66.0): + /@metaplex/js@4.12.0(@metaplex-foundation/mpl-auction@0.0.2)(@metaplex-foundation/mpl-core@0.0.2)(@metaplex-foundation/mpl-metaplex@0.0.5)(@metaplex-foundation/mpl-token-metadata@1.1.0)(@metaplex-foundation/mpl-token-vault@0.0.2)(@solana/spl-token@0.1.8)(@solana/web3.js@1.78.0): resolution: {integrity: sha512-rIUTMXo5gIXFIZt08AEHyqH4oVoLL2dMYiNePQluw9pydesRym4jDayJ5POxEmKmyc6KGqVKw/YWUIivmUY5zg==} deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. peerDependencies: @@ -2236,7 +2241,7 @@ packages: '@metaplex-foundation/mpl-token-metadata': 1.1.0 '@metaplex-foundation/mpl-token-vault': 0.0.2 '@solana/spl-token': 0.1.8 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 '@types/bs58': 4.0.1 axios: 0.25.0(debug@4.3.4) bn.js: 5.2.1 @@ -2350,19 +2355,11 @@ packages: resolution: {integrity: sha512-iR8GBkDt0Q3GyaVcIu7mSsVIqnFbkbRzGLWlvhwunacoLwt4J3swfKhfaM6rN6WY+TBGoYT1GtT1mIh2/jGbRQ==} dev: false - /@noble/hashes@1.3.0: - resolution: {integrity: sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==} - dev: false - /@noble/hashes@1.3.1: resolution: {integrity: sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==} engines: {node: '>= 16'} dev: false - /@noble/secp256k1@1.7.1: - resolution: {integrity: sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==} - dev: false - /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -2401,8 +2398,8 @@ packages: resolution: {integrity: sha512-oIdm4vTJkUy6GmE6JgqDAuQPKI7XM4TPJkjtoIzp69RZe0iAD9JP2XHx7lV1jLdYXeYHqDXfBt3zcq7W91K6PA==} engines: {node: '>=11'} dependencies: - '@project-serum/borsh': 0.2.5(@solana/web3.js@1.66.0) - '@solana/web3.js': 1.66.0 + '@project-serum/borsh': 0.2.5(@solana/web3.js@1.78.0) + '@solana/web3.js': 1.78.0 base64-js: 1.5.1 bn.js: 5.2.1 bs58: 4.0.1 @@ -2418,6 +2415,7 @@ packages: transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false @@ -2425,8 +2423,8 @@ packages: resolution: {integrity: sha512-flRuW/F+iC8mitNokx82LOXyND7Dyk6n5UUPJpQv/+NfySFrNFlzuQZaBZJ4CG5g9s8HS/uaaIz1nVkDR8V/QA==} engines: {node: '>=11'} dependencies: - '@project-serum/borsh': 0.2.5(@solana/web3.js@1.66.0) - '@solana/web3.js': 1.66.0 + '@project-serum/borsh': 0.2.5(@solana/web3.js@1.78.0) + '@solana/web3.js': 1.78.0 base64-js: 1.5.1 bn.js: 5.2.1 bs58: 4.0.1 @@ -2443,6 +2441,7 @@ packages: transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false @@ -2450,8 +2449,8 @@ packages: resolution: {integrity: sha512-LV2/ifZOJVFTZ4GbEloXln3iVfCvO1YM8i7BBCrUm4tehP7irMx4nr4/IabHWOzrQcQElsxSP/lb1tBp+2ff8A==} engines: {node: '>=11'} dependencies: - '@project-serum/borsh': 0.2.5(@solana/web3.js@1.66.0) - '@solana/web3.js': 1.66.0 + '@project-serum/borsh': 0.2.5(@solana/web3.js@1.78.0) + '@solana/web3.js': 1.78.0 base64-js: 1.5.1 bn.js: 5.2.1 bs58: 4.0.1 @@ -2468,16 +2467,17 @@ packages: transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false - /@project-serum/borsh@0.2.5(@solana/web3.js@1.66.0): + /@project-serum/borsh@0.2.5(@solana/web3.js@1.78.0): resolution: {integrity: sha512-UmeUkUoKdQ7rhx6Leve1SssMR/Ghv8qrEiyywyxSWg7ooV7StdpPBhciiy5eB3T0qU1BXvdRNC8TdrkxK7WC5Q==} engines: {node: '>=10'} peerDependencies: '@solana/web3.js': ^1.2.0 dependencies: - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bn.js: 5.2.1 buffer-layout: 1.2.2 dev: false @@ -2488,12 +2488,13 @@ packages: dependencies: '@project-serum/anchor': 0.11.1 '@solana/spl-token': 0.1.8 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bn.js: 5.2.1 buffer-layout: 1.2.2 transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false @@ -2503,22 +2504,23 @@ packages: dependencies: '@project-serum/anchor': 0.11.1 '@solana/spl-token': 0.1.8 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bn.js: 5.2.1 buffer-layout: 1.2.2 transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false - /@project-serum/sol-wallet-adapter@0.2.6(@solana/web3.js@1.66.0): + /@project-serum/sol-wallet-adapter@0.2.6(@solana/web3.js@1.78.0): resolution: {integrity: sha512-cpIb13aWPW8y4KzkZAPDgw+Kb+DXjCC6rZoH74MGm3I/6e/zKyGnfAuW5olb2zxonFqsYgnv7ev8MQnvSgJ3/g==} engines: {node: '>=10'} peerDependencies: '@solana/web3.js': ^1.5.0 dependencies: - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bs58: 4.0.1 eventemitter3: 4.0.7 dev: false @@ -3047,12 +3049,13 @@ packages: engines: {node: '>= 10'} dependencies: '@solana/buffer-layout': 4.0.1 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bigint-buffer: 1.1.5 bignumber.js: 9.0.2 transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false @@ -3121,7 +3124,7 @@ packages: resolution: {integrity: sha512-gTcHCJJ6wZeL2akMU5HUhGydsoFYRojW0X++JtAcW9d/+68NOrWMytvVnHMMICDrdQ7+QSi8sZc3xx1/L+/zMQ==} dev: false - /@solana/spl-account-compression@0.1.8(@solana/web3.js@1.66.0): + /@solana/spl-account-compression@0.1.8(@solana/web3.js@1.78.0): resolution: {integrity: sha512-vsvsx358pVFPtyNd8zIZy0lezR0NuvOykQ29Zq+8oto+kHfTXMGXXQ1tKHUYke6XkINIWLFVg/jDi+1D9RYaqQ==} engines: {node: '>=16'} peerDependencies: @@ -3129,7 +3132,7 @@ packages: dependencies: '@metaplex-foundation/beet': 0.7.1 '@metaplex-foundation/beet-solana': 0.4.0 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bn.js: 5.2.1 borsh: 0.7.0 js-sha3: 0.8.0 @@ -3146,7 +3149,7 @@ packages: engines: {node: '>= 10'} dependencies: '@babel/runtime': 7.21.5 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 bn.js: 5.2.1 buffer: 6.0.3 buffer-layout: 1.2.2 @@ -3154,6 +3157,7 @@ packages: transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false @@ -3163,7 +3167,7 @@ packages: dependencies: '@solana/buffer-layout': 4.0.1 '@solana/buffer-layout-utils': 0.2.0 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 start-server-and-test: 1.15.4 transitivePeerDependencies: - bufferutil @@ -3172,22 +3176,6 @@ packages: - utf-8-validate dev: false - /@solana/spl-token@0.3.8(@solana/web3.js@1.66.0): - resolution: {integrity: sha512-ogwGDcunP9Lkj+9CODOWMiVJEdRtqHAtX2rWF62KxnnSWtMZtV9rDhTrZFshiyJmxDnRL/1nKE1yJHg4jjs3gg==} - engines: {node: '>=16'} - peerDependencies: - '@solana/web3.js': ^1.47.4 - dependencies: - '@solana/buffer-layout': 4.0.1 - '@solana/buffer-layout-utils': 0.2.0 - '@solana/web3.js': 1.66.0 - buffer: 6.0.3 - transitivePeerDependencies: - - bufferutil - - encoding - - utf-8-validate - dev: false - /@solana/spl-token@0.3.8(@solana/web3.js@1.78.0): resolution: {integrity: sha512-ogwGDcunP9Lkj+9CODOWMiVJEdRtqHAtX2rWF62KxnnSWtMZtV9rDhTrZFshiyJmxDnRL/1nKE1yJHg4jjs3gg==} engines: {node: '>=16'} @@ -3201,17 +3189,18 @@ packages: transitivePeerDependencies: - bufferutil - encoding + - supports-color - utf-8-validate dev: false - /@solana/wallet-adapter-base@0.9.22(@solana/web3.js@1.66.0): + /@solana/wallet-adapter-base@0.9.22(@solana/web3.js@1.78.0): resolution: {integrity: sha512-xbLEZPGSJFvgTeldG9D55evhl7QK/3e/F7vhvcA97mEt1eieTgeKMnGlmmjs3yivI3/gtZNZeSk1XZLnhKcQvw==} engines: {node: '>=16'} peerDependencies: '@solana/web3.js': ^1.58.0 dependencies: '@solana/wallet-standard-features': 1.0.1 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 '@wallet-standard/base': 1.0.1 '@wallet-standard/features': 1.0.3 eventemitter3: 4.0.7 @@ -3225,37 +3214,12 @@ packages: '@wallet-standard/features': 1.0.3 dev: false - /@solana/web3.js@1.66.0: - resolution: {integrity: sha512-hQCzWd9u100Ba3da52u7GeDRqSRwyFZtZkUj4j08GKSK3c3+ZQ6CQoN3HBXzfyjVKMTyRGKT0FlPA+hOX3kmOQ==} - engines: {node: '>=12.20.0'} - dependencies: - '@babel/runtime': 7.21.5 - '@noble/ed25519': 1.7.3 - '@noble/hashes': 1.3.0 - '@noble/secp256k1': 1.7.1 - '@solana/buffer-layout': 4.0.1 - bigint-buffer: 1.1.5 - bn.js: 5.2.1 - borsh: 0.7.0 - bs58: 4.0.1 - buffer: 6.0.1 - fast-stable-stringify: 1.0.0 - jayson: 3.7.0 - node-fetch: 2.6.9 - rpc-websockets: 7.5.1 - superstruct: 0.14.2 - transitivePeerDependencies: - - bufferutil - - encoding - - utf-8-validate - dev: false - /@solana/web3.js@1.78.0: resolution: {integrity: sha512-CSjCjo+RELJ5puoZALfznN5EF0YvL1V8NQrQYovsdjE1lCV6SqbKAIZD0+9LlqCBoa1ibuUaR7G2SooYzvzmug==} dependencies: '@babel/runtime': 7.22.6 '@noble/curves': 1.1.0 - '@noble/hashes': 1.3.0 + '@noble/hashes': 1.3.1 '@solana/buffer-layout': 4.0.1 agentkeepalive: 4.3.0 bigint-buffer: 1.1.5 @@ -3285,13 +3249,13 @@ packages: fast-stable-stringify: 1.0.0 dev: false - /@solflare-wallet/utl-sdk@1.4.0(@solana/web3.js@1.66.0): + /@solflare-wallet/utl-sdk@1.4.0(@solana/web3.js@1.78.0): resolution: {integrity: sha512-0E3s+fXs5XMGBNrXGB4XSH4+sPgLanbBEVyz227KJyxSIgiRdQMcM2Yv/KdnMHNmhYoR/aPpH6TH115SIJqM0A==} peerDependencies: '@solana/web3.js': '*' dependencies: '@metaplex-foundation/js': 0.11.7 - '@solana/web3.js': 1.66.0 + '@solana/web3.js': 1.78.0 axios: 0.27.2(debug@4.3.4) eventemitter3: 5.0.1 lodash: 4.17.21 @@ -3863,16 +3827,16 @@ packages: normalize-path: 3.0.0 picomatch: 2.3.1 - /arbundles@0.6.22(@solana/web3.js@1.66.0)(debug@4.3.4): + /arbundles@0.6.22(@solana/web3.js@1.78.0)(debug@4.3.4): resolution: {integrity: sha512-QlSavBHk59mNqgQ6ScxlqaBJlDbSmSrK/uTcF3HojLAZ/4aufTkVTBjl1hSfZ/ZN45oIPgJC05R8SmVARF+8VA==} dependencies: '@noble/ed25519': 1.7.3 '@randlabs/myalgo-connect': 1.4.2 - '@solana/wallet-adapter-base': 0.9.22(@solana/web3.js@1.66.0) + '@solana/wallet-adapter-base': 0.9.22(@solana/web3.js@1.78.0) algosdk: 1.24.1 arweave: 1.14.0 arweave-stream-tx: 1.2.2(arweave@1.14.0) - avsc: github.com/Bundlr-Network/avsc/a730cc8018b79e114b6a3381bbb57760a24c6cef + avsc: git/github.com+Bundlr-Network/avsc/a730cc8018b79e114b6a3381bbb57760a24c6cef axios: 0.21.4(debug@4.3.4) base64url: 3.0.1 bs58: 4.0.1 @@ -4329,13 +4293,6 @@ packages: ieee754: 1.2.1 dev: false - /buffer@6.0.1: - resolution: {integrity: sha512-rVAXBwEcEoYtxnHSO5iWyhzV/O1WMtkUYWlfdLS7FjU4PnSJJHEfHXi/uHPI5EwltmOA794gN3bm3/pzuctWjQ==} - dependencies: - base64-js: 1.5.1 - ieee754: 1.2.1 - dev: false - /buffer@6.0.3: resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==} dependencies: @@ -6253,29 +6210,6 @@ packages: istanbul-lib-report: 3.0.0 dev: true - /jayson@3.7.0: - resolution: {integrity: sha512-tfy39KJMrrXJ+mFcMpxwBvFDetS8LAID93+rycFglIQM4kl3uNR3W4lBLE/FFhsoUCEox5Dt2adVpDm/XtebbQ==} - engines: {node: '>=8'} - hasBin: true - dependencies: - '@types/connect': 3.4.35 - '@types/node': 12.20.55 - '@types/ws': 7.4.7 - JSONStream: 1.3.5 - commander: 2.20.3 - delay: 5.0.0 - es6-promisify: 5.0.0 - eyes: 0.1.8 - isomorphic-ws: 4.0.1(ws@7.5.9) - json-stringify-safe: 5.0.1 - lodash: 4.17.21 - uuid: 9.0.0 - ws: 7.5.9 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - dev: false - /jayson@4.1.0: resolution: {integrity: sha512-R6JlbyLN53Mjku329XoRT2zJAE6ZgOQ8f91ucYdMCD4nkGCF9kZSrcGXpHIU4jeKj58zUZke2p+cdQchU7Ly7A==} engines: {node: '>=8'} @@ -8804,8 +8738,8 @@ packages: resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==} dev: false - github.com/Bundlr-Network/avsc/a730cc8018b79e114b6a3381bbb57760a24c6cef: - resolution: {tarball: https://codeload.github.com/Bundlr-Network/avsc/tar.gz/a730cc8018b79e114b6a3381bbb57760a24c6cef} + git/github.com+Bundlr-Network/avsc/a730cc8018b79e114b6a3381bbb57760a24c6cef: + resolution: {commit: a730cc8018b79e114b6a3381bbb57760a24c6cef, repo: git@github.com:Bundlr-Network/avsc.git, type: git} name: avsc version: 5.4.7 engines: {node: '>=0.11'}