@@ -124,33 +190,23 @@ function DelegationCard({ stakeAccount }: { stakeAccount: StakeAccount }) {
-
- | Delegated Vote Address |
-
-
- |
-
+ {voterPubkey && (
+
+ | Delegated Vote Address |
+
+
+ |
+
+ )}
| Activation Epoch |
-
- {stake.delegation.isBootstrapStake()
- ? "-"
- : stake.delegation.activationEpoch}
- |
+ {activationEpoch} |
| Deactivation Epoch |
-
- {stake.delegation.isDeactivated()
- ? stake.delegation.deactivationEpoch
- : "-"}
- |
+ {deactivationEpoch} |
)}
@@ -159,7 +215,7 @@ function DelegationCard({ stakeAccount }: { stakeAccount: StakeAccount }) {
);
}
-function AuthoritiesCard({ meta }: { meta: Meta }) {
+function AuthoritiesCard({ meta }: { meta: Meta | StakeMeta }) {
const hasLockup = meta && meta.lockup.unixTimestamp > 0;
return (
diff --git a/explorer/src/components/account/UnknownAccountCard.tsx b/explorer/src/components/account/UnknownAccountCard.tsx
index e0ff9f3ce..115f3cd14 100644
--- a/explorer/src/components/account/UnknownAccountCard.tsx
+++ b/explorer/src/components/account/UnknownAccountCard.tsx
@@ -28,7 +28,7 @@ export function UnknownAccountCard({ account }: { account: Account }) {
- {details && (
+ {details?.space !== undefined && (
| Data (Bytes) |
{details.space} |
diff --git a/explorer/src/components/instruction/token/TokenDetailsCard.tsx b/explorer/src/components/instruction/token/TokenDetailsCard.tsx
index 385401c1c..5e20853b3 100644
--- a/explorer/src/components/instruction/token/TokenDetailsCard.tsx
+++ b/explorer/src/components/instruction/token/TokenDetailsCard.tsx
@@ -10,7 +10,8 @@ import {
import { UnknownDetailsCard } from "../UnknownDetailsCard";
import { InstructionCard } from "../InstructionCard";
import { Address } from "components/common/Address";
-import { ParsedInstructionInfo, IX_STRUCTS } from "./types";
+import { IX_STRUCTS, TokenInstructionType } from "./types";
+import { ParsedInfo } from "validators";
const IX_TITLES = {
initializeMint: "Initialize Mint",
@@ -34,8 +35,9 @@ type DetailsProps = {
export function TokenDetailsCard(props: DetailsProps) {
try {
- const parsed = coerce(props.ix.parsed, ParsedInstructionInfo);
- const { type, info } = parsed;
+ const parsed = coerce(props.ix.parsed, ParsedInfo);
+ const { type: rawType, info } = parsed;
+ const type = coerce(rawType, TokenInstructionType);
const title = `Token: ${IX_TITLES[type]}`;
const coerced = coerce(info, IX_STRUCTS[type] as any);
return ;
diff --git a/explorer/src/components/instruction/token/types.ts b/explorer/src/components/instruction/token/types.ts
index a16939cf6..b7bcb4731 100644
--- a/explorer/src/components/instruction/token/types.ts
+++ b/explorer/src/components/instruction/token/types.ts
@@ -1,21 +1,12 @@
import {
enums,
object,
- any,
StructType,
- coercion,
- struct,
number,
optional,
array,
} from "superstruct";
-import { PublicKey } from "@solana/web3.js";
-
-const PubkeyValue = struct("Pubkey", (value) => value instanceof PublicKey);
-const Pubkey = coercion(PubkeyValue, (value) => {
- if (typeof value === "string") return new PublicKey(value);
- throw new Error("invalid pubkey");
-});
+import { Pubkey } from "validators/pubkey";
const InitializeMint = object({
mint: Pubkey,
@@ -95,8 +86,8 @@ const CloseAccount = object({
signers: optional(array(Pubkey)),
});
-type TokenInstructionType = StructType;
-const TokenInstructionType = enums([
+export type TokenInstructionType = StructType;
+export const TokenInstructionType = enums([
"initializeMint",
"initializeAccount",
"initializeMultisig",
@@ -121,9 +112,3 @@ export const IX_STRUCTS = {
burn: Burn,
closeAccount: CloseAccount,
};
-
-export type ParsedInstructionInfo = StructType;
-export const ParsedInstructionInfo = object({
- type: TokenInstructionType,
- info: any(),
-});
diff --git a/explorer/src/pages/AccountDetailsPage.tsx b/explorer/src/pages/AccountDetailsPage.tsx
index 3b14fbe34..2627ccaf5 100644
--- a/explorer/src/pages/AccountDetailsPage.tsx
+++ b/explorer/src/pages/AccountDetailsPage.tsx
@@ -68,7 +68,22 @@ function InfoSection({ pubkey }: { pubkey: PublicKey }) {
const owner = info.details?.owner;
const data = info.details?.data;
if (data && owner && owner.equals(StakeProgram.programId)) {
- return ;
+ let stakeAccountType, stakeAccount;
+ if ("accountType" in data) {
+ stakeAccount = data;
+ stakeAccountType = data.accountType as any;
+ } else {
+ stakeAccount = data.info;
+ stakeAccountType = data.type;
+ }
+
+ return (
+
+ );
} else {
return ;
}
diff --git a/explorer/src/providers/accounts/index.tsx b/explorer/src/providers/accounts/index.tsx
index 45a35f0f4..1b58fa897 100644
--- a/explorer/src/providers/accounts/index.tsx
+++ b/explorer/src/providers/accounts/index.tsx
@@ -1,9 +1,12 @@
import React from "react";
-import { StakeAccount } from "solana-sdk-wasm";
+import { StakeAccount as StakeAccountWasm } from "solana-sdk-wasm";
import { PublicKey, Connection, StakeProgram } from "@solana/web3.js";
import { useCluster } from "../cluster";
import { HistoryProvider } from "./history";
import { TokensProvider } from "./tokens";
+import { coerce } from "superstruct";
+import { ParsedInfo } from "validators";
+import { StakeAccount } from "./types";
export { useAccountHistory } from "./history";
export enum FetchStatus {
@@ -15,8 +18,8 @@ export enum FetchStatus {
export interface Details {
executable: boolean;
owner: PublicKey;
- space: number;
- data?: StakeAccount;
+ space?: number;
+ data?: StakeAccount | StakeAccountWasm;
}
export interface Account {
@@ -156,18 +159,30 @@ async function fetchAccountInfo(
let details;
let lamports;
try {
- const result = await new Connection(url, "recent").getAccountInfo(pubkey);
+ const result = (
+ await new Connection(url, "single").getParsedAccountInfo(pubkey)
+ ).value;
if (result === null) {
lamports = 0;
} else {
lamports = result.lamports;
- let data = undefined;
// Only save data in memory if we can decode it
+ let space;
+ if (!("parsed" in result.data)) {
+ space = result.data.length;
+ }
+
+ let data;
if (result.owner.equals(StakeProgram.programId)) {
try {
- const wasm = await import("solana-sdk-wasm");
- data = wasm.StakeAccount.fromAccountData(result.data);
+ if ("parsed" in result.data) {
+ const info = coerce(result.data.parsed, ParsedInfo);
+ data = coerce(info, StakeAccount);
+ } else {
+ const wasm = await import("solana-sdk-wasm");
+ data = wasm.StakeAccount.fromAccountData(result.data);
+ }
} catch (err) {
console.error("Unexpected error loading wasm", err);
// TODO store error state in Account info
@@ -175,7 +190,7 @@ async function fetchAccountInfo(
}
details = {
- space: result.data.length,
+ space,
executable: result.executable,
owner: result.owner,
data,
diff --git a/explorer/src/providers/accounts/types.ts b/explorer/src/providers/accounts/types.ts
new file mode 100644
index 000000000..6dae5ab14
--- /dev/null
+++ b/explorer/src/providers/accounts/types.ts
@@ -0,0 +1,48 @@
+import { object, StructType, number, optional, enums } from "superstruct";
+import { Pubkey } from "validators/pubkey";
+import { BigNum } from "validators/bignum";
+
+export type StakeAccountType = StructType;
+export const StakeAccountType = enums([
+ "uninitialized",
+ "initialized",
+ "delegated",
+ "rewardsPool",
+]);
+
+export type StakeMeta = StructType;
+export const StakeMeta = object({
+ rentExemptReserve: BigNum,
+ authorized: object({
+ staker: Pubkey,
+ withdrawer: Pubkey,
+ }),
+ lockup: object({
+ unixTimestamp: number(),
+ epoch: number(),
+ custodian: Pubkey,
+ }),
+});
+
+export type StakeAccountInfo = StructType;
+export const StakeAccountInfo = object({
+ meta: StakeMeta,
+ stake: optional(
+ object({
+ delegation: object({
+ voter: Pubkey,
+ stake: BigNum,
+ activationEpoch: BigNum,
+ deactivationEpoch: BigNum,
+ warmupCooldownRate: number(),
+ }),
+ creditsObserved: number(),
+ })
+ ),
+});
+
+export type StakeAccount = StructType;
+export const StakeAccount = object({
+ type: StakeAccountType,
+ info: StakeAccountInfo,
+});
diff --git a/explorer/src/utils/index.tsx b/explorer/src/utils/index.tsx
index e7fb806bf..e2997412a 100644
--- a/explorer/src/utils/index.tsx
+++ b/explorer/src/utils/index.tsx
@@ -1,10 +1,12 @@
-import React from "react";
-import { LAMPORTS_PER_SOL } from "@solana/web3.js";
+import React, { ReactNode } from "react";
+import BN from "bn.js";
import {
HumanizeDuration,
HumanizeDurationLanguage,
} from "humanize-duration-ts";
-import { ReactNode } from "react";
+
+// Switch to web3 constant when web3 updates superstruct
+export const LAMPORTS_PER_SOL = 1000000000;
export const NUM_TICKS_PER_SECOND = 160;
export const DEFAULT_TICKS_PER_SLOT = 64;
@@ -16,11 +18,31 @@ export function assertUnreachable(x: never): never {
throw new Error("Unreachable!");
}
+export function lamportsToSol(lamports: number | BN): number {
+ if (typeof lamports === "number") {
+ return Math.abs(lamports) / LAMPORTS_PER_SOL;
+ }
+
+ let signMultiplier = 1;
+ if (lamports.isNeg()) {
+ signMultiplier = -1;
+ }
+
+ const absLamports = lamports.abs();
+ const lamportsString = absLamports.toString(10).padStart(10, "0");
+ const splitIndex = lamportsString.length - 9;
+ const solString =
+ lamportsString.slice(0, splitIndex) +
+ "." +
+ lamportsString.slice(splitIndex);
+ return signMultiplier * parseFloat(solString);
+}
+
export function lamportsToSolString(
- lamports: number,
+ lamports: number | BN,
maximumFractionDigits: number = 9
): ReactNode {
- const sol = Math.abs(lamports) / LAMPORTS_PER_SOL;
+ const sol = lamportsToSol(lamports);
return (
<>
◎
diff --git a/explorer/src/validators/bignum.ts b/explorer/src/validators/bignum.ts
new file mode 100644
index 000000000..14d201d04
--- /dev/null
+++ b/explorer/src/validators/bignum.ts
@@ -0,0 +1,8 @@
+import { coercion, struct, Struct } from "superstruct";
+import BN from "bn.js";
+
+const BigNumValue = struct("BigNum", (value) => value instanceof BN);
+export const BigNum: Struct = coercion(BigNumValue, (value) => {
+ if (typeof value === "string") return new BN(value, 10);
+ throw new Error("invalid big num");
+});
diff --git a/explorer/src/validators/index.ts b/explorer/src/validators/index.ts
new file mode 100644
index 000000000..fc8ecb242
--- /dev/null
+++ b/explorer/src/validators/index.ts
@@ -0,0 +1,7 @@
+import { object, any, StructType, string } from "superstruct";
+
+export type ParsedInfo = StructType;
+export const ParsedInfo = object({
+ type: string(),
+ info: any(),
+});
diff --git a/explorer/src/validators/pubkey.ts b/explorer/src/validators/pubkey.ts
new file mode 100644
index 000000000..b4a19fee3
--- /dev/null
+++ b/explorer/src/validators/pubkey.ts
@@ -0,0 +1,8 @@
+import { coercion, struct, Struct } from "superstruct";
+import { PublicKey } from "@solana/web3.js";
+
+const PubkeyValue = struct("Pubkey", (value) => value instanceof PublicKey);
+export const Pubkey: Struct = coercion(PubkeyValue, (value) => {
+ if (typeof value === "string") return new PublicKey(value);
+ throw new Error("invalid pubkey");
+});
diff --git a/explorer/wasm/pkg/package.json b/explorer/wasm/pkg/package.json
index f0ea2ed83..be4838bad 100644
--- a/explorer/wasm/pkg/package.json
+++ b/explorer/wasm/pkg/package.json
@@ -4,7 +4,7 @@
"Solana Maintainers "
],
"description": "Solana SDK Wasm",
- "version": "1.2.0",
+ "version": "1.4.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
diff --git a/explorer/wasm/pkg/solana_sdk_wasm.d.ts b/explorer/wasm/pkg/solana_sdk_wasm.d.ts
index fc1750262..510281750 100644
--- a/explorer/wasm/pkg/solana_sdk_wasm.d.ts
+++ b/explorer/wasm/pkg/solana_sdk_wasm.d.ts
@@ -124,7 +124,7 @@ export class StakeAccount {
/**
* @returns {string}
*/
- displayState(): string;
+ accountType(): string;
/**
* @returns {Meta | undefined}
*/
diff --git a/explorer/wasm/pkg/solana_sdk_wasm_bg.d.ts b/explorer/wasm/pkg/solana_sdk_wasm_bg.d.ts
index 32ac915c5..a646f9608 100644
--- a/explorer/wasm/pkg/solana_sdk_wasm_bg.d.ts
+++ b/explorer/wasm/pkg/solana_sdk_wasm_bg.d.ts
@@ -9,7 +9,7 @@ export function __wbg_set_stakeaccount_stake(a: number, b: number): void;
export function __wbg_get_stakeaccount_state(a: number): number;
export function __wbg_set_stakeaccount_state(a: number, b: number): void;
export function stakeaccount_fromAccountData(a: number, b: number): number;
-export function stakeaccount_displayState(a: number, b: number): void;
+export function stakeaccount_accountType(a: number, b: number): void;
export function __wbg_lockup_free(a: number): void;
export function __wbg_get_lockup_custodian(a: number): number;
export function __wbg_set_lockup_custodian(a: number, b: number): void;
diff --git a/explorer/wasm/pkg/solana_sdk_wasm_bg.js b/explorer/wasm/pkg/solana_sdk_wasm_bg.js
index 2fb23b789..27ed5fbdb 100644
--- a/explorer/wasm/pkg/solana_sdk_wasm_bg.js
+++ b/explorer/wasm/pkg/solana_sdk_wasm_bg.js
@@ -456,9 +456,9 @@ export class StakeAccount {
/**
* @returns {string}
*/
- displayState() {
+ accountType() {
try {
- wasm.stakeaccount_displayState(8, this.ptr);
+ wasm.stakeaccount_accountType(8, this.ptr);
var r0 = getInt32Memory0()[8 / 4 + 0];
var r1 = getInt32Memory0()[8 / 4 + 1];
return getStringFromWasm0(r0, r1);
diff --git a/explorer/wasm/pkg/solana_sdk_wasm_bg.wasm b/explorer/wasm/pkg/solana_sdk_wasm_bg.wasm
index 588775629..7f2e36195 100644
Binary files a/explorer/wasm/pkg/solana_sdk_wasm_bg.wasm and b/explorer/wasm/pkg/solana_sdk_wasm_bg.wasm differ
diff --git a/explorer/wasm/src/stake_account.rs b/explorer/wasm/src/stake_account.rs
index 93a050964..530e8faa2 100644
--- a/explorer/wasm/src/stake_account.rs
+++ b/explorer/wasm/src/stake_account.rs
@@ -62,13 +62,13 @@ impl StakeAccount {
return Ok(stake_state.into());
}
- #[wasm_bindgen(js_name = displayState)]
- pub fn display_state(&self) -> String {
+ #[wasm_bindgen(js_name = accountType)]
+ pub fn account_type(&self) -> String {
match self.state {
- State::Uninitialized => "Uninitialized".to_string(),
- State::Initialized => "Initialized".to_string(),
- State::Delegated => "Delegated".to_string(),
- State::RewardsPool => "RewardsPool".to_string(),
+ State::Uninitialized => "uninitialized".to_string(),
+ State::Initialized => "initialized".to_string(),
+ State::Delegated => "delegated".to_string(),
+ State::RewardsPool => "rewardsPool".to_string(),
}
}
}