Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature: Nested inner instructions using stackHeight #301

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feature: Nested inner instructions using stackHeight #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
120 changes: 105 additions & 15 deletions app/components/transaction/InstructionsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<InstructionCard
key={`${index}-${innerInstruction.index}`}
index={index}
ix={innerInstruction.instruction}
result={result}
signature={signature}
tx={tx}
innerCards={innerCards}
childIndex={innerInstruction.index}
url={url}
/>
);
}

export function InstructionsSection({ signature }: SignatureProps) {
const status = useTransactionStatus(signature);
const details = useTransactionDetails(signature);
Expand Down Expand Up @@ -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 = (
<InstructionCard
key={`${index}-${childIndex}`}
index={index}
ix={ix}
result={result}
signature={signature}
tx={transaction}
childIndex={childIndex}
url={url}
/>
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 (
Expand Down
4 changes: 1 addition & 3 deletions app/providers/transactions/parsed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ async function fetchDetails(dispatch: Dispatch, signature: TransactionSignature,
});
fetchStatus = FetchStatus.Fetched;
} catch (error) {
if (cluster !== Cluster.Custom) {
console.error(error, { url });
}
console.error(error, { url });
fetchStatus = FetchStatus.FetchFailed;
}
dispatch({
Expand Down