Sync with mythic-project Sept 25

Author: ggnine-jito

.yarnrc

@@ -1,2 +1,3 @@
 --add.exact true
 ignore-scripts true
+--frozen-lockfile true

Strategies/protocols/solend/index.ts

@@ -32,7 +32,7 @@ import { SolendStrategy } from 'Strategies/types/types'
 import { VotingClient } from '@utils/uiTypes/VotePlugin'
 import { AssetAccount } from '@utils/uiTypes/assets'
 import { ConnectionContext } from '@utils/connection'
-import { MAIN_POOL_CONFIGS, RESERVE_CONFIG } from '@hub/providers/Defi/plans/save'
+import { Config, ReserveConfig } from '@hub/providers/Defi/plans/save'
 
 const MAINNET_PROGRAM = 'So1endDq2YkqhipRh3WViPa8hdiSpxWy6z3Z6tMCpAo'
 const DEVNET_PROGRAM = 'ALend7Ketfx5bxh6ghsCDXAoDrhvEmsXT3cynB6aPLgx'
@@ -65,38 +65,6 @@ export type CreateSolendStrategyParams = (
   client?: VotingClient,
 ) => Promise<PublicKey>
 
-type Config = Array<MarketConfig>
-
-type MarketConfig = {
-  name: string
-  isPrimary: boolean
-  description: string
-  creator: string
-  address: string
-  authorityAddress: string
-  reserves: Array<ReserveConfig>
-}
-
-type ReserveConfig = {
-  liquidityToken: {
-    coingeckoID: string
-    decimals: number
-    logo: string
-    mint: string
-    name: string
-    symbol: string
-    volume24h: number
-  }
-  pythOracle: string
-  switchboardOracle: string
-  address: string
-  collateralMintAddress: string
-  collateralSupplyAddress: string
-  liquidityAddress: string
-  liquidityFeeReceiverAddress: string
-  userSupplyCap: number
-}
-
 type ReserveStat = {
   reserve: {
     lendingMarket: string
@@ -173,13 +141,13 @@ export function cTokenExchangeRate(reserve: ReserveStat) {
     .toNumber()
 }
 
-export async function getReserve(): Promise<Config> {
+export async function getReserve(): Promise<Config[]> {
   return await (
     await axios.get(`${SOLEND_ENDPOINT}/v1/markets/configs?scope=all`)
   ).data
 }
 
-export async function getReserves(): Promise<Config[0]['reserves']> {
+export async function getReserves(): Promise<ReserveConfig[]> {
   const config = await getReserve()
   const reserves = config.flatMap((market) =>
     market.reserves.map((reserve) => ({
@@ -526,37 +494,57 @@ export async function handleSolendActionV2(
   proposalIndex: number,
   isDraft: boolean,
   connection: ConnectionContext,
-  client?: VotingClient
+  config: Config,
+  reserveConfig: ReserveConfig,
+  client?: VotingClient,
 ) {
   const isSol = matchedTreasury.isSol
   const owner = isSol
     ? matchedTreasury!.pubkey
     : matchedTreasury!.extensions!.token!.account.owner
 
     const solendAction = form.action === 'Deposit' ? await SolendActionCore.buildDepositReserveLiquidityTxns(
-      MAIN_POOL_CONFIGS,
-      RESERVE_CONFIG[form.reserveAddress],
+      config,
+      {
+        address: reserveConfig.address,
+        liquidityAddress: reserveConfig.liquidityAddress,
+        cTokenMint: reserveConfig.collateralMintAddress,
+        cTokenLiquidityAddress: reserveConfig.liquidityAddress,
+        pythOracle: reserveConfig.pythOracle,
+        switchboardOracle: reserveConfig.switchboardOracle,
+        mintAddress: reserveConfig.liquidityToken.mint,
+        liquidityFeeReceiverAddress: reserveConfig.liquidityFeeReceiverAddress,
+      },
       connection.current,
       form.bnAmount.toString(),
       {
         publicKey: owner,
       },
       {
-        lookupTableAddress: MAIN_POOL_CONFIGS.lookupTableAddress
-          ? new PublicKey(MAIN_POOL_CONFIGS.lookupTableAddress)
+        lookupTableAddress: config?.lookupTableAddress
+          ? new PublicKey(config.lookupTableAddress)
           : undefined,
       },
     ) : await SolendActionCore.buildRedeemReserveCollateralTxns(
-      MAIN_POOL_CONFIGS,
-      RESERVE_CONFIG[form.reserveAddress],
+      config,
+      {
+        address: reserveConfig.address,
+        liquidityAddress: reserveConfig.liquidityAddress,
+        cTokenMint: reserveConfig.collateralMintAddress,
+        cTokenLiquidityAddress: reserveConfig.liquidityAddress,
+        pythOracle: reserveConfig.pythOracle,
+        switchboardOracle: reserveConfig.switchboardOracle,
+        mintAddress: reserveConfig.liquidityToken.mint,
+        liquidityFeeReceiverAddress: reserveConfig.liquidityFeeReceiverAddress,
+      },
       connection.current,
       form.bnAmount.toString(),
       {
         publicKey: owner,
       },
       {
-        lookupTableAddress: MAIN_POOL_CONFIGS.lookupTableAddress
-          ? new PublicKey(MAIN_POOL_CONFIGS.lookupTableAddress)
+        lookupTableAddress: config.lookupTableAddress
+          ? new PublicKey(config.lookupTableAddress)
           : undefined,
       },
     );
@@ -586,7 +574,7 @@ export async function handleSolendActionV2(
     form.title ||
       `${form.action} ${form.amountFmt} ${
         tokenPriceService.getTokenInfo(
-          RESERVE_CONFIG[form.reserveAddress].mintAddress
+          reserveConfig.liquidityToken.mint
         )?.symbol || 'tokens'
       } ${form.action === 'Deposit' ? 'into' : 'from'} Save`,
     form.description,

VoteStakeRegistry/sdk/withCreateNewDeposit.ts

@@ -67,8 +67,11 @@ export const withCreateNewDeposit = async ({
     clientProgramId,
   )
   const existingVoter = await tryGetVoter(voter, client)
-  const mintInfo = await client.program.provider.connection.getAccountInfo(mintPk)
-  const tokenProgram = mintInfo?.owner.equals(TOKEN_2022_PROGRAM_ID) ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID
+  const mintInfo =
+    await client.program.provider.connection.getAccountInfo(mintPk)
+  const tokenProgram = mintInfo?.owner.equals(TOKEN_2022_PROGRAM_ID)
+    ? TOKEN_2022_PROGRAM_ID
+    : TOKEN_PROGRAM_ID
 
   const voterATAPk = await Token.getAssociatedTokenAddress(
     ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -159,6 +162,6 @@ export const withCreateNewDeposit = async ({
     voter,
     tokenOwnerRecordPubKey,
     voterWeightPk,
-    tokenProgram
+    tokenProgram,
   }
 }

actions/castVote.ts

@@ -2,6 +2,7 @@ import {
   Connection,
   Keypair,
   PublicKey,
+  SystemProgram,
   TransactionInstruction,
 } from '@solana/web3.js'
 import {
@@ -46,6 +47,8 @@ import { postComment } from './chat/postMessage'
 import { withPostChatMessageEphSigner } from '@utils/ephemeral-signers/postMessageWithEphSigner'
 import { getEphemeralSigners } from '@utils/ephemeral-signers'
 import { Wallet } from '@solana/wallet-adapter-react'
+import { FEE_WALLET } from '@utils/orders'
+import { VOTER_ACCOUNT_FEE } from '@tools/constants'
 
 const getVetoTokenMint = (
   proposal: ProgramAccount<Proposal>,
@@ -156,6 +159,13 @@ const createTokenOwnerRecordIfNeeded = async ({
     governingTokenMint,
     payer,
   )
+  ixs.push(
+    SystemProgram.transfer({
+      fromPubkey: payer!,
+      toPubkey: FEE_WALLET,
+      lamports: VOTER_ACCOUNT_FEE,
+    }),
+  )
   return ixs
 }
 
@@ -239,7 +249,14 @@ export async function castVote(
   const castVoteIxs: TransactionInstruction[] = []
   const pluginCastVoteIxs: TransactionInstruction[] = []
 
-  if (calculatedVoterWeight !== null && calculatedVoterWeight.gtn(0)) {
+  const isPyth = realm.owner.equals(
+    new PublicKey('pytGY6tWRgGinSCvRLnSv4fHfBTMoiDGiCsesmHWM6U'),
+  )
+
+  if (
+    isPyth ||
+    (calculatedVoterWeight !== null && calculatedVoterWeight.gtn(0))
+  ) {
     //will run only if any plugin is connected with realm
     const plugin = await votingPlugin?.withCastPluginVote(
       pluginCastVoteIxs,

actions/createMultisigWallet.ts

@@ -40,16 +40,18 @@ export default async function createMultisigWallet({
     ...params,
   })
   const solBalance = await connection.getBalance(wallet.publicKey!)
-  if (lamportsToSol(new BN(solBalance)) < 0.25) {
-    throw new Error('You need to have at least 0.25 SOL to create a realm')
+  if (lamportsToSol(new BN(solBalance)) < 1.05) {
+    throw new Error('You need to have at least 1.05 SOL to create a realm')
   }
 
   try {
     const councilMembersChunks = chunks(councilMembersInstructions, 8)
 
     const allSigners = [...mintsSetupSigners, ...realmSigners]
 
-    const cuLimtIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 800_000})
+    const cuLimtIx = ComputeBudgetProgram.setComputeUnitLimit({
+      units: 800_000,
+    })
     realmInstructions.unshift(cuLimtIx)
 
     const txes = [
@@ -60,7 +62,7 @@ export default async function createMultisigWallet({
         SystemProgram.transfer({
           fromPubkey: wallet.publicKey!,
           toPubkey: FEE_WALLET,
-          lamports: solToLamports(0.2).toNumber(),
+          lamports: solToLamports(2).toNumber(),
         }),
       ],
     ].map((txBatch) => {

actions/createNFTRealm.ts

@@ -76,8 +76,8 @@ export default async function createNFTRealm({
     wallet,
   })
   const solBalance = await connection.getBalance(wallet.publicKey!)
-  if (lamportsToSol(new BN(solBalance)) < 0.25) {
-    throw new Error('You need to have at least 0.25 SOL to create a realm')
+  if (lamportsToSol(new BN(solBalance)) < 1.05) {
+    throw new Error('You need to have at least 1.05 SOL to create a realm')
   }
 
   console.log('NFT REALM realm public-key', realmPk.toBase58())
@@ -214,7 +214,9 @@ export default async function createNFTRealm({
       nftSigners,
     ]
 
-    const cuLimtIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 800_000})
+    const cuLimtIx = ComputeBudgetProgram.setComputeUnitLimit({
+      units: 800_000,
+    })
     realmInstructions.unshift(cuLimtIx)
 
     const txes = [
@@ -226,7 +228,7 @@ export default async function createNFTRealm({
         SystemProgram.transfer({
           fromPubkey: wallet.publicKey!,
           toPubkey: FEE_WALLET,
-          lamports: solToLamports(0.2).toNumber(),
+          lamports: solToLamports(2).toNumber(),
         }),
       ],
     ].map((txBatch, batchIdx) => {

actions/createTokenizedRealm.ts

@@ -92,8 +92,8 @@ export default async function createTokenizedRealm({
   })
 
   const solBalance = await connection.getBalance(wallet.publicKey!)
-  if (lamportsToSol(new BN(solBalance)) < 0.25) {
-    throw new Error('You need to have at least 0.25 SOL to create a realm')
+  if (lamportsToSol(new BN(solBalance)) < 1.05) {
+    throw new Error('You need to have at least 1.05 SOL to create a realm')
   }
 
   try {
@@ -195,7 +195,7 @@ export default async function createTokenizedRealm({
         SystemProgram.transfer({
           fromPubkey: walletPk,
           toPubkey: FEE_WALLET,
-          lamports: solToLamports(0.2).toNumber(),
+          lamports: solToLamports(2).toNumber(),
         }),
       ],
     ].map((ixBatch, batchIdx) => ({

components/App.tsx

@@ -326,6 +326,17 @@ export function AppContents(props: Props) {
       <ErrorBoundary>
         <ThemeProvider defaultTheme="Dark">
           <GatewayProvider>
+            <div className="relative color-white z-10 text-center w-full py-2">
+              Faster. Sharper. More. Yours.{' '}
+              <a
+                href="https://v2.realms.today"
+                rel="noreferrer"
+                target="_blank"
+                className="underline"
+              >
+                Try Realms v2
+              </a>
+            </div>
             <Telemetry></Telemetry>
             <NavBar />
             <Notifications />

components/GovernancePower/Power/Vanilla/useDepositCallback.tsx

@@ -2,10 +2,13 @@ import { useCallback } from 'react'
 import useWalletOnePointOh from '@hooks/useWalletOnePointOh'
 import { fetchRealmByPubkey } from '@hooks/queries/realm'
 import { useConnection } from '@solana/wallet-adapter-react'
-import { Keypair, TransactionInstruction } from '@solana/web3.js'
+import { Keypair, SystemProgram, TransactionInstruction } from '@solana/web3.js'
 import { approveTokenTransfer } from '@utils/tokens'
 import useSelectedRealmPubkey from '@hooks/selectedRealm/useSelectedRealmPubkey'
-import { withDepositGoverningTokens } from '@solana/spl-governance'
+import {
+  getTokenOwnerRecordAddress,
+  withDepositGoverningTokens,
+} from '@solana/spl-governance'
 import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   Token,
@@ -16,6 +19,8 @@ import { fetchProgramVersion } from '@hooks/queries/useProgramVersionQuery'
 import queryClient from '@hooks/queries/queryClient'
 import { useJoinRealm } from '@hooks/useJoinRealm'
 import { SequenceType, sendTransactionsV3 } from '@utils/sendTransactions'
+import { FEE_WALLET } from '@utils/orders'
+import { VOTER_ACCOUNT_FEE } from '@tools/constants'
 
 export const useDepositCallback = (
   role: 'community' | 'council' | 'undefined',

components/Members/AddMemberForm.tsx

@@ -280,7 +280,7 @@ const AddMemberForm: FC<{ close: () => void; mintAccount: AssetAccount }> = ({
         })
 
         const url = fmtUrlWithCluster(
-          `/dao/${symbol}/proposal/${proposalAddress}`,
+          `https://v2.realms.today/dao/${symbol}/proposal/${proposalAddress}?share=true`,
         )
 
         router.push(url)