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

use season number instand of dist number - fill vaults mango #1905

Merged
merged 1 commit into from
Nov 5, 2023
Merged

use season number instand of dist number - fill vaults mango #1905

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions pages/dao/[symbol]/proposal/components/instructions/DistrubtionProgram/CloseVaults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ import {
Token,
} from '@solana/spl-token'
import { validateInstruction } from '@utils/instructionTools'
import { SEASON_PREFIX } from './FillVaults'

interface CloseVaultsForm {
governedAccount: AssetAccount | null
distributionNumber: number
season: number
}

type Vault = {
Expand All @@ -57,7 +58,7 @@ const CloseVaults = ({
const shouldBeGoverned = !!(index !== 0 && governance)
const [form, setForm] = useState<CloseVaultsForm>({
governedAccount: null,
distributionNumber: 0,
season: 0,
})
const [client, setClient] = useState<MangoMintsRedemptionClient>()
const [distribution, setDistribution] = useState<Distribution>()
Expand Down Expand Up @@ -152,7 +153,9 @@ const CloseVaults = ({
wallet?.publicKey,
])
const handleSelectDistribution = async (number: number) => {
const distribution = await client?.loadDistribution(number)
const distribution = await client?.loadDistribution(
Number(`${SEASON_PREFIX}${number}`)
)
setDistribution(distribution)
}
const fetchVaults = async () => {
Expand Down Expand Up @@ -217,19 +220,17 @@ const CloseVaults = ({
},
{
label: 'Distribution Number',
initialValue: form.distributionNumber,
initialValue: form.season,
type: InstructionInputType.INPUT,
additionalComponent: (
<div>
<Button
onClick={() => handleSelectDistribution(form.distributionNumber)}
>
<Button onClick={() => handleSelectDistribution(form.season)}>
Load
</Button>
</div>
),
inputType: 'number',
name: 'distributionNumber',
name: 'season',
},
]

Expand Down
86 changes: 46 additions & 40 deletions pages/dao/[symbol]/proposal/components/instructions/DistrubtionProgram/FillVaults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ import { parseMintNaturalAmountFromDecimal } from '@tools/sdk/units'
import { validateInstruction } from '@utils/instructionTools'
import useGovernanceNfts from '@components/treasuryV2/WalletList/WalletListItem/AssetList/useGovernanceNfts'

export const SEASON_PREFIX = 112

interface FillVaultsForm {
governedAccount: AssetAccount | null
distributionNumber: number
season: number
}

type Vault = {
Expand Down Expand Up @@ -68,7 +70,7 @@ const FillVaults = ({
const shouldBeGoverned = !!(index !== 0 && governance)
const [form, setForm] = useState<FillVaultsForm>({
governedAccount: null,
distributionNumber: 0,
season: 1,
})
const [transfers, setTransfers] = useState<Transfer[]>([])
const [client, setClient] = useState<MangoMintsRedemptionClient>()
Expand Down Expand Up @@ -131,7 +133,9 @@ const FillVaults = ({
return obj
}, [form, schema, transfers, vaults, wallet?.publicKey])
const handleSelectDistribution = async (number: number) => {
const distribution = await client?.loadDistribution(number)
const distribution = await client?.loadDistribution(
Number(`${SEASON_PREFIX}${number}`)
)
setDistribution(distribution)
}
const fetchVaults = async () => {
Expand Down Expand Up @@ -180,39 +184,43 @@ const FillVaults = ({
}, [])
useEffect(() => {
if (vaults && form.governedAccount) {
const trans = Object.values(vaults).map((v) => {
const isToken = v.type.toLowerCase() === 'token'
const fromToken = assetAccounts.find(
(assetAccount) =>
assetAccount.isToken &&
assetAccount.extensions.mint?.publicKey.equals(v.mint) &&
assetAccount.extensions.token?.account.owner.equals(
form.governedAccount!.extensions.transferAddress!
)
)
const fromNft = nfts?.find((x) => x.id === v.mint.toBase58())
const trans = Object.values(vaults)
.filter((x) => x.mint)
.map((v) => {
const isToken = v.type.toLowerCase() === 'token'
const fromToken = assetAccounts.find(
(assetAccount) =>
assetAccount.isToken &&
assetAccount.extensions.mint?.publicKey.equals(v.mint) &&
assetAccount.extensions.token?.account.owner.equals(
form.governedAccount!.extensions.transferAddress!
)
)
const fromNft = nfts?.find((x) => x.id === v.mint.toBase58())

if (!fromToken && !fromNft) {
return undefined
}
if (!fromToken && !fromNft) {
return undefined
}

return {
from: isToken
? fromToken!.pubkey
: PublicKey.findProgramAddressSync(
[
new PublicKey(fromNft!.ownership.owner).toBuffer(),
TOKEN_PROGRAM_ID.toBuffer(),
new PublicKey(fromNft!.id).toBuffer(),
],
ASSOCIATED_TOKEN_PROGRAM_ID
)[0],
to: v.publicKey,
amount: '',
decimals: isToken ? fromToken!.extensions.mint!.account.decimals : 0,
mintIndex: v.mintIndex,
}
})
return {
from: isToken
? fromToken!.pubkey
: PublicKey.findProgramAddressSync(
[
new PublicKey(fromNft!.ownership.owner).toBuffer(),
TOKEN_PROGRAM_ID.toBuffer(),
new PublicKey(fromNft!.id).toBuffer(),
],
ASSOCIATED_TOKEN_PROGRAM_ID
)[0],
to: v.publicKey,
amount: '',
decimals: isToken
? fromToken!.extensions.mint!.account.decimals
: 0,
mintIndex: v.mintIndex,
}
})
setTransfers(trans.filter((x) => x) as Transfer[])
} else {
setTransfers([])
Expand All @@ -237,20 +245,18 @@ const FillVaults = ({
options: solAccounts,
},
{
label: 'Distribution Number',
initialValue: form.distributionNumber,
label: 'Season',
initialValue: form.season,
type: InstructionInputType.INPUT,
additionalComponent: (
<div>
<Button
onClick={() => handleSelectDistribution(form.distributionNumber)}
>
<Button onClick={() => handleSelectDistribution(form.season)}>
Load
</Button>
</div>
),
inputType: 'number',
name: 'distributionNumber',
name: 'season',
},
]

Expand Down