fix
This commit is contained in:
parent
840084433c
commit
6660b751bb
|
@ -138,17 +138,6 @@ const ConnectedMenu = () => {
|
||||||
</button>
|
</button>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
) : null}
|
) : null}
|
||||||
{/* <Menu.Item>
|
|
||||||
<button
|
|
||||||
className="flex w-full flex-row items-center rounded-none py-0.5 font-normal hover:cursor-pointer hover:text-th-active focus:outline-none"
|
|
||||||
onClick={() => setShowProfileImageModal(true)}
|
|
||||||
>
|
|
||||||
<ProfileIcon className="h-4 w-4" />
|
|
||||||
<div className="pl-2 text-left">
|
|
||||||
{t('edit-profile-image')}
|
|
||||||
</div>
|
|
||||||
</button>
|
|
||||||
</Menu.Item> */}
|
|
||||||
<Menu.Item>
|
<Menu.Item>
|
||||||
<button
|
<button
|
||||||
className="default-transition flex w-full flex-row items-center rounded-none py-0.5 font-normal focus:outline-none md:hover:cursor-pointer md:hover:text-th-fgd-1"
|
className="default-transition flex w-full flex-row items-center rounded-none py-0.5 font-normal focus:outline-none md:hover:cursor-pointer md:hover:text-th-fgd-1"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { BN } from '@coral-xyz/anchor'
|
import { BN } from '@coral-xyz/anchor'
|
||||||
import { MintInfo } from '@solana/spl-token'
|
import { Mint } from '@solana/spl-token'
|
||||||
import { PublicKey } from '@solana/web3.js'
|
import { PublicKey } from '@solana/web3.js'
|
||||||
import { VsrClient } from '../voteStakeRegistryClient'
|
import { VsrClient } from '../voteStakeRegistryClient'
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ export interface Deposit {
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DepositWithMintAccount extends Deposit {
|
export interface DepositWithMintAccount extends Deposit {
|
||||||
mint: TokenProgramAccount<MintInfo>
|
mint: TokenProgramAccount<Mint>
|
||||||
index: number
|
index: number
|
||||||
available: BN
|
available: BN
|
||||||
vestingRate: BN | null
|
vestingRate: BN | null
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import { MintInfo } from '@blockworks-foundation/mango-v4'
|
|
||||||
import { BN, EventParser } from '@coral-xyz/anchor'
|
import { BN, EventParser } from '@coral-xyz/anchor'
|
||||||
import { Connection, PublicKey, Transaction } from '@solana/web3.js'
|
import { Connection, PublicKey, Transaction } from '@solana/web3.js'
|
||||||
import {
|
import {
|
||||||
|
@ -17,6 +16,7 @@ import {
|
||||||
tryGetRegistrar,
|
tryGetRegistrar,
|
||||||
tryGetVoter,
|
tryGetVoter,
|
||||||
} from '../accounts/vsrAccounts'
|
} from '../accounts/vsrAccounts'
|
||||||
|
import { RawMint } from '@solana/spl-token'
|
||||||
|
|
||||||
type Event = {
|
type Event = {
|
||||||
depositEntryIndex: number
|
depositEntryIndex: number
|
||||||
|
@ -67,7 +67,7 @@ export const getDeposits = async ({
|
||||||
])
|
])
|
||||||
|
|
||||||
const mintCfgs = existingRegistrar?.votingMints || []
|
const mintCfgs = existingRegistrar?.votingMints || []
|
||||||
const mints: { [key: string]: TokenProgramAccount<MintInfo> | undefined } = {}
|
const mints: { [key: string]: TokenProgramAccount<RawMint> | undefined } = {}
|
||||||
let votingPower = new BN(0)
|
let votingPower = new BN(0)
|
||||||
let votingPowerFromDeposits = new BN(0)
|
let votingPowerFromDeposits = new BN(0)
|
||||||
let deposits: DepositWithMintAccount[] = []
|
let deposits: DepositWithMintAccount[] = []
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import { MintInfo } from '@blockworks-foundation/mango-v4'
|
|
||||||
import {
|
import {
|
||||||
getGovernanceAccounts,
|
getGovernanceAccounts,
|
||||||
getRealm,
|
getRealm,
|
||||||
|
@ -10,7 +9,7 @@ import { Connection, PublicKey } from '@solana/web3.js'
|
||||||
import { getProposals } from './fetch/getProposals'
|
import { getProposals } from './fetch/getProposals'
|
||||||
import { ConnectionContext } from './types'
|
import { ConnectionContext } from './types'
|
||||||
import { TokenProgramAccount } from './accounts/vsrAccounts'
|
import { TokenProgramAccount } from './accounts/vsrAccounts'
|
||||||
import { u64, MintLayout } from '@solana/spl-token'
|
import { MintLayout, RawMint } from '@solana/spl-token'
|
||||||
import BN from 'bn.js'
|
import BN from 'bn.js'
|
||||||
|
|
||||||
export async function fetchRealm({
|
export async function fetchRealm({
|
||||||
|
@ -79,7 +78,7 @@ export function arrayToRecord<T>(
|
||||||
export async function tryGetMint(
|
export async function tryGetMint(
|
||||||
connection: Connection,
|
connection: Connection,
|
||||||
publicKey: PublicKey
|
publicKey: PublicKey
|
||||||
): Promise<TokenProgramAccount<MintInfo> | undefined> {
|
): Promise<TokenProgramAccount<RawMint> | undefined> {
|
||||||
try {
|
try {
|
||||||
const result = await connection.getAccountInfo(publicKey)
|
const result = await connection.getAccountInfo(publicKey)
|
||||||
const data = Buffer.from(result!.data)
|
const data = Buffer.from(result!.data)
|
||||||
|
@ -97,22 +96,8 @@ export async function tryGetMint(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function parseMintAccountData(data: Buffer): MintInfo {
|
export function parseMintAccountData(data: Buffer): RawMint {
|
||||||
const mintInfo = MintLayout.decode(data)
|
const mintInfo = MintLayout.decode(data)
|
||||||
if (mintInfo.mintAuthorityOption === 0) {
|
|
||||||
mintInfo.mintAuthority = null
|
|
||||||
} else {
|
|
||||||
mintInfo.mintAuthority = new PublicKey(mintInfo.mintAuthority)
|
|
||||||
}
|
|
||||||
|
|
||||||
mintInfo.supply = u64.fromBuffer(mintInfo.supply)
|
|
||||||
mintInfo.isInitialized = mintInfo.isInitialized != 0
|
|
||||||
|
|
||||||
if (mintInfo.freezeAuthorityOption === 0) {
|
|
||||||
mintInfo.freezeAuthority = null
|
|
||||||
} else {
|
|
||||||
mintInfo.freezeAuthority = new PublicKey(mintInfo.freezeAuthority)
|
|
||||||
}
|
|
||||||
return mintInfo
|
return mintInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue