diff --git a/explorer/src/components/instruction/system/NonceAdvanceDetailsCard.tsx b/explorer/src/components/instruction/system/NonceAdvanceDetailsCard.tsx
index 7b5bd5d3a4..1e94951261 100644
--- a/explorer/src/components/instruction/system/NonceAdvanceDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/NonceAdvanceDetailsCard.tsx
@@ -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;
diff --git a/explorer/src/components/instruction/system/NonceAuthorizeDetailsCard.tsx b/explorer/src/components/instruction/system/NonceAuthorizeDetailsCard.tsx
index 766f0aa262..fecb52009c 100644
--- a/explorer/src/components/instruction/system/NonceAuthorizeDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/NonceAuthorizeDetailsCard.tsx
@@ -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;
diff --git a/explorer/src/components/instruction/system/NonceInitializeDetailsCard.tsx b/explorer/src/components/instruction/system/NonceInitializeDetailsCard.tsx
index da7c184879..c5d2345a62 100644
--- a/explorer/src/components/instruction/system/NonceInitializeDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/NonceInitializeDetailsCard.tsx
@@ -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;
diff --git a/explorer/src/components/instruction/system/NonceWithdrawDetailsCard.tsx b/explorer/src/components/instruction/system/NonceWithdrawDetailsCard.tsx
index 26d3e09a30..176ca8b66e 100644
--- a/explorer/src/components/instruction/system/NonceWithdrawDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/NonceWithdrawDetailsCard.tsx
@@ -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;
diff --git a/explorer/src/components/instruction/system/SystemDetailsCard.tsx b/explorer/src/components/instruction/system/SystemDetailsCard.tsx
index dee0d4b130..c39b7d1351 100644
--- a/explorer/src/components/instruction/system/SystemDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/SystemDetailsCard.tsx
@@ -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 ;
}
- case "advanceNonceAccount": {
- const info = coerce(parsed.info, AdvanceNonceAccountInfo);
+ case "advanceNonce": {
+ const info = coerce(parsed.info, AdvanceNonceInfo);
return ;
}
- case "withdrawNonceAccount": {
- const info = coerce(parsed.info, WithdrawNonceAccountInfo);
+ case "withdrawNonce": {
+ const info = coerce(parsed.info, WithdrawNonceInfo);
return ;
}
- case "authorizeNonceAccount": {
- const info = coerce(parsed.info, AuthorizeNonceAccountInfo);
+ case "authorizeNonce": {
+ const info = coerce(parsed.info, AuthorizeNonceInfo);
return ;
}
- case "initializeNonceAccount": {
- const info = coerce(parsed.info, InitializeNonceAccountInfo);
+ case "initializeNonce": {
+ const info = coerce(parsed.info, InitializeNonceInfo);
return ;
}
default:
diff --git a/explorer/src/components/instruction/system/types.ts b/explorer/src/components/instruction/system/types.ts
index 8f64821a0f..171fed122b 100644
--- a/explorer/src/components/instruction/system/types.ts
+++ b/explorer/src/components/instruction/system/types.ts
@@ -38,36 +38,28 @@ export const CreateAccountWithSeedInfo = pick({
owner: Pubkey,
});
-export type AdvanceNonceAccountInfo = StructType<
- typeof AdvanceNonceAccountInfo
->;
-export const AdvanceNonceAccountInfo = pick({
+export type AdvanceNonceInfo = StructType;
+export const AdvanceNonceInfo = pick({
nonceAccount: Pubkey,
nonceAuthority: Pubkey,
});
-export type WithdrawNonceAccountInfo = StructType<
- typeof WithdrawNonceAccountInfo
->;
-export const WithdrawNonceAccountInfo = pick({
+export type WithdrawNonceInfo = StructType;
+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;
+export const InitializeNonceInfo = pick({
nonceAccount: Pubkey,
nonceAuthority: Pubkey,
});
-export type AuthorizeNonceAccountInfo = StructType<
- typeof AuthorizeNonceAccountInfo
->;
-export const AuthorizeNonceAccountInfo = pick({
+export type AuthorizeNonceInfo = StructType;
+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
]);