Explorer: correct system instruction names (#13284)

* fix system instruction names
This commit is contained in:
Josh 2020-10-29 13:14:22 -07:00 committed by GitHub
parent 6606590b81
commit ecd74c3786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 40 deletions

View File

@ -6,13 +6,13 @@ import {
} from "@solana/web3.js";
import { InstructionCard } from "../InstructionCard";
import { Address } from "components/common/Address";
import { AdvanceNonceAccountInfo } from "./types";
import { AdvanceNonceInfo } from "./types";
export function NonceAdvanceDetailsCard(props: {
ix: ParsedInstruction;
index: number;
result: SignatureResult;
info: AdvanceNonceAccountInfo;
info: AdvanceNonceInfo;
}) {
const { ix, index, result, info } = props;

View File

@ -6,13 +6,13 @@ import {
} from "@solana/web3.js";
import { InstructionCard } from "../InstructionCard";
import { Address } from "components/common/Address";
import { AuthorizeNonceAccountInfo } from "./types";
import { AuthorizeNonceInfo } from "./types";
export function NonceAuthorizeDetailsCard(props: {
ix: ParsedInstruction;
index: number;
result: SignatureResult;
info: AuthorizeNonceAccountInfo;
info: AuthorizeNonceInfo;
}) {
const { ix, index, result, info } = props;

View File

@ -6,13 +6,13 @@ import {
} from "@solana/web3.js";
import { InstructionCard } from "../InstructionCard";
import { Address } from "components/common/Address";
import { InitializeNonceAccountInfo } from "./types";
import { InitializeNonceInfo } from "./types";
export function NonceInitializeDetailsCard(props: {
ix: ParsedInstruction;
index: number;
result: SignatureResult;
info: InitializeNonceAccountInfo;
info: InitializeNonceInfo;
}) {
const { ix, index, result, info } = props;

View File

@ -7,13 +7,13 @@ import {
import { lamportsToSolString } from "utils";
import { InstructionCard } from "../InstructionCard";
import { Address } from "components/common/Address";
import { WithdrawNonceAccountInfo } from "./types";
import { WithdrawNonceInfo } from "./types";
export function NonceWithdrawDetailsCard(props: {
ix: ParsedInstruction;
index: number;
result: SignatureResult;
info: WithdrawNonceAccountInfo;
info: WithdrawNonceInfo;
}) {
const { ix, index, result, info } = props;

View File

@ -28,10 +28,10 @@ import {
AssignInfo,
AssignWithSeedInfo,
TransferInfo,
AdvanceNonceAccountInfo,
AuthorizeNonceAccountInfo,
InitializeNonceAccountInfo,
WithdrawNonceAccountInfo,
AdvanceNonceInfo,
AuthorizeNonceInfo,
InitializeNonceInfo,
WithdrawNonceInfo,
} from "./types";
type DetailsProps = {
@ -73,20 +73,20 @@ export function SystemDetailsCard(props: DetailsProps) {
const info = coerce(parsed.info, TransferInfo);
return <TransferDetailsCard info={info} {...props} />;
}
case "advanceNonceAccount": {
const info = coerce(parsed.info, AdvanceNonceAccountInfo);
case "advanceNonce": {
const info = coerce(parsed.info, AdvanceNonceInfo);
return <NonceAdvanceDetailsCard info={info} {...props} />;
}
case "withdrawNonceAccount": {
const info = coerce(parsed.info, WithdrawNonceAccountInfo);
case "withdrawNonce": {
const info = coerce(parsed.info, WithdrawNonceInfo);
return <NonceWithdrawDetailsCard info={info} {...props} />;
}
case "authorizeNonceAccount": {
const info = coerce(parsed.info, AuthorizeNonceAccountInfo);
case "authorizeNonce": {
const info = coerce(parsed.info, AuthorizeNonceInfo);
return <NonceAuthorizeDetailsCard info={info} {...props} />;
}
case "initializeNonceAccount": {
const info = coerce(parsed.info, InitializeNonceAccountInfo);
case "initializeNonce": {
const info = coerce(parsed.info, InitializeNonceInfo);
return <NonceInitializeDetailsCard info={info} {...props} />;
}
default:

View File

@ -38,36 +38,28 @@ export const CreateAccountWithSeedInfo = pick({
owner: Pubkey,
});
export type AdvanceNonceAccountInfo = StructType<
typeof AdvanceNonceAccountInfo
>;
export const AdvanceNonceAccountInfo = pick({
export type AdvanceNonceInfo = StructType<typeof AdvanceNonceInfo>;
export const AdvanceNonceInfo = pick({
nonceAccount: Pubkey,
nonceAuthority: Pubkey,
});
export type WithdrawNonceAccountInfo = StructType<
typeof WithdrawNonceAccountInfo
>;
export const WithdrawNonceAccountInfo = pick({
export type WithdrawNonceInfo = StructType<typeof WithdrawNonceInfo>;
export const WithdrawNonceInfo = pick({
nonceAccount: Pubkey,
destination: Pubkey,
nonceAuthority: Pubkey,
lamports: number(),
});
export type InitializeNonceAccountInfo = StructType<
typeof InitializeNonceAccountInfo
>;
export const InitializeNonceAccountInfo = pick({
export type InitializeNonceInfo = StructType<typeof InitializeNonceInfo>;
export const InitializeNonceInfo = pick({
nonceAccount: Pubkey,
nonceAuthority: Pubkey,
});
export type AuthorizeNonceAccountInfo = StructType<
typeof AuthorizeNonceAccountInfo
>;
export const AuthorizeNonceAccountInfo = pick({
export type AuthorizeNonceInfo = StructType<typeof AuthorizeNonceInfo>;
export const AuthorizeNonceInfo = pick({
nonceAccount: Pubkey,
nonceAuthority: Pubkey,
newAuthorized: Pubkey,
@ -115,9 +107,9 @@ export const SystemInstructionType = enums([
"assign",
"assignWithSeed",
"transfer",
"advanceNonceAccount",
"withdrawNonceAccount",
"authorizeNonceAccount",
"initializeNonceAccount",
"advanceNonce",
"withdrawNonce",
"authorizeNonce",
"initializeNonce",
// "transferWithSeed", TODO: Add support for transfer with seed
]);