From 281aeb30f75dfe45b2a18934f6758ea5bf6b6956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Brzezi=C5=84ski?= <a.brzezinski94@gmail.com>
Date: Tue, 18 Jan 2022 23:01:34 +0100
Subject: [PATCH] Voter weight plugin config (#481)

* voter weight addin

* vote weight plugin yarn

* playaround wip

* fixes

* fix version

* configuremint

* chore: setup DEFAULT_GOVERNANCE_PROGRAM_ID in .env files

* chore: rename useVoteRegistry to useVoterStakeRegistryClient

* chore:

* feat: Configure voter stake registry with default values

* feat:  crate mint config form

* fix: hide V2 options from V1 program UI

* feat: add voterWeightAddin to realm config proposal

* fix: add voterWeightRecord to sdk api

* feat: setup voter stake configure mint instruction

Co-authored-by: Sebastian.Bor <sebastian_bor@hotmail.com>
---
 .gitignore                                    |   6 +
 .vscode/settings.json                         |   1 +
 packages/common/src/contexts/wallet.tsx       |  78 ++++----
 packages/governance-sdk/package.json          |   2 +-
 .../governance-sdk/src/governance/accounts.ts |   2 +-
 .../src/governance/withCastVote.ts            |   4 +
 .../governance/withCreateAccountGovernance.ts |   4 +
 .../governance/withCreateMintGovernance.ts    |   4 +
 .../governance/withCreateProgramGovernance.ts |   4 +
 .../src/governance/withCreateProposal.ts      |  10 +-
 .../governance/withCreateTokenGovernance.ts   |   4 +
 .../src/governance/withVoterWeightAccounts.ts |  25 +++
 packages/governance/.env                      |   3 +
 packages/governance/.env.development          |   1 +
 packages/governance/package.json              |   5 +-
 .../governance/src/actions/registerRealm.ts   |   3 +-
 .../configureVoterStakeRegistry.ts            |  78 ++++++++
 .../ModalFormAction/modalFormAction.tsx       |   2 +
 .../votingMintConfigFormItem.tsx              |  86 ++++++++
 .../src/contexts/GovernanceContext.tsx        |  10 +-
 .../src/hooks/useVoterStakeRegistryClient.ts  |  36 ++++
 packages/governance/src/tools/units.ts        |   7 +
 .../src/tools/validators/voterWeightPlugin.ts |  11 ++
 .../src/tools/voterStakeRegistry/accounts.ts  |  14 ++
 .../voterStakeRegistry/voterStakeRegistry.ts  |  10 +
 .../home/buttons/registerRealmButton.tsx      |  30 ++-
 .../accountInstructionsForm.tsx               |   4 +-
 .../governanceInstructionForm.tsx             |  30 ++-
 .../instructionInput/instructionInput.tsx     |  19 +-
 .../instructionInput/instructionSelector.tsx  |   6 +-
 .../instructionInput/mintInstructionsForm.tsx |   4 +-
 .../programInstructionsForm.tsx               |   4 +-
 .../instructionInput/realmConfigForm.tsx      |  30 ++-
 .../tokenInstructionsForm.tsx                 |  16 +-
 .../voterStakeConfigureMintForm.tsx           |  90 +++++++++
 .../voterStakeSetRegistrarForm.tsx            |  75 +++++++
 .../configureVoterStakeRegistryButton.tsx     |  57 ++++++
 .../views/realm/buttons/realmActionBar.tsx    |  14 +-
 yarn.lock                                     | 183 ++++++++++++++++--
 39 files changed, 888 insertions(+), 84 deletions(-)
 create mode 100644 packages/governance-sdk/src/governance/withVoterWeightAccounts.ts
 create mode 100644 packages/governance/.env.development
 create mode 100644 packages/governance/src/actions/voterStakeRegistry/configureVoterStakeRegistry.ts
 create mode 100644 packages/governance/src/components/voterStakeRegistry/votingMintConfigFormItem.tsx
 create mode 100644 packages/governance/src/hooks/useVoterStakeRegistryClient.ts
 create mode 100644 packages/governance/src/tools/validators/voterWeightPlugin.ts
 create mode 100644 packages/governance/src/tools/voterStakeRegistry/accounts.ts
 create mode 100644 packages/governance/src/tools/voterStakeRegistry/voterStakeRegistry.ts
 create mode 100644 packages/governance/src/views/proposal/components/instructionInput/voterStakeRegistry/voterStakeConfigureMintForm.tsx
 create mode 100644 packages/governance/src/views/proposal/components/instructionInput/voterStakeRegistry/voterStakeSetRegistrarForm.tsx
 create mode 100644 packages/governance/src/views/realm/buttons/configureVoterStakeRegistryButton.tsx

diff --git a/.gitignore b/.gitignore
index 0fbbdfef..215e4017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,9 @@ yarn-debug.log*
 yarn-error.log*
 *.css
 *.css.map
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a79af11e..5d4dab63 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,6 +10,7 @@
   "cSpell.words": [
     "Addin",
     "Blockhash",
+    "blockworks",
     "Lamport",
     "lamports",
     "localnet",
diff --git a/packages/common/src/contexts/wallet.tsx b/packages/common/src/contexts/wallet.tsx
index 926a0753..e159fd09 100644
--- a/packages/common/src/contexts/wallet.tsx
+++ b/packages/common/src/contexts/wallet.tsx
@@ -9,7 +9,7 @@ import {
 } from '@solana/wallet-adapter-base';
 import {
   useWallet as useWalletBase,
-  WalletProvider as BaseWalletProvider
+  WalletProvider as BaseWalletProvider,
 } from '@solana/wallet-adapter-react';
 import {
   getLedgerWallet,
@@ -22,10 +22,19 @@ import {
   Wallet,
   WalletName,
 } from '@solana/wallet-adapter-wallets';
-import { Button, Modal } from "antd";
-import React, { createContext, FC, ReactNode, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { notify } from "../utils";
-import { useConnectionConfig } from "./connection";
+import { Button, Modal } from 'antd';
+import React, {
+  createContext,
+  FC,
+  ReactNode,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import { notify } from '../utils';
+import { useConnectionConfig } from './connection';
 
 export interface WalletContextState extends WalletAdapterProps {
   wallets: Wallet[];
@@ -43,20 +52,25 @@ export interface WalletContextState extends WalletAdapterProps {
   signMessage: MessageSignerWalletAdapterProps['signMessage'] | undefined;
 }
 
-export function useWallet (): WalletContextState {
+export function useWallet(): WalletContextState {
   return useWalletBase() as WalletContextState;
 }
 
 export { SignerWalletAdapter, WalletNotConnectedError };
 
-export type WalletSigner = Pick<SignerWalletAdapter, 'publicKey' | 'signTransaction' | 'signAllTransactions'>;
+export type WalletSigner = Pick<
+  SignerWalletAdapter,
+  'publicKey' | 'signTransaction' | 'signAllTransactions'
+>;
 
 export interface WalletModalContextState {
   visible: boolean;
   setVisible: (open: boolean) => void;
 }
 
-export const WalletModalContext = createContext<WalletModalContextState>({} as WalletModalContextState);
+export const WalletModalContext = createContext<WalletModalContextState>(
+  {} as WalletModalContextState,
+);
 
 export function useWalletModal(): WalletModalContextState {
   return useContext(WalletModalContext);
@@ -76,20 +90,23 @@ export const WalletModal = () => {
       onCancel={close}
       width={400}
     >
-      {wallets.map((wallet) => {
+      {wallets.map(wallet => {
         return (
           <Button
             key={wallet.name}
             size="large"
             type={wallet === selected ? 'primary' : 'ghost'}
-            onClick={() => { select(wallet.name); close(); }}
+            onClick={() => {
+              select(wallet.name);
+              close();
+            }}
             icon={
               <img
                 alt={`${wallet.name}`}
                 width={20}
                 height={20}
                 src={wallet.icon}
-                style={{marginRight: 8}}
+                style={{ marginRight: 8 }}
               />
             }
             style={{
@@ -117,13 +134,10 @@ export const WalletModalProvider = ({ children }: { children: ReactNode }) => {
       const base58 = publicKey.toBase58();
       const keyToDisplay =
         base58.length > 20
-          ? `${base58.substring(
-            0,
-            7,
-          )}.....${base58.substring(
-            base58.length - 7,
-            base58.length,
-          )}`
+          ? `${base58.substring(0, 7)}.....${base58.substring(
+              base58.length - 7,
+              base58.length,
+            )}`
           : base58;
 
       notify({
@@ -151,22 +165,22 @@ export const WalletModalProvider = ({ children }: { children: ReactNode }) => {
       }}
     >
       {children}
-      <WalletModal/>
+      <WalletModal />
     </WalletModalContext.Provider>
   );
 };
 
-export const WalletProvider = ({ children }: {children: ReactNode }) => {
+export const WalletProvider = ({ children }: { children: ReactNode }) => {
   const { env } = useConnectionConfig();
 
   const network = useMemo(() => {
     switch (env) {
-      case "mainnet-beta":
+      case 'mainnet-beta':
         return WalletAdapterNetwork.Mainnet;
-      case "testnet":
+      case 'testnet':
         return WalletAdapterNetwork.Testnet;
-      case "devnet":
-      case "localnet":
+      case 'devnet':
+      case 'localnet':
       default:
         return WalletAdapterNetwork.Devnet;
     }
@@ -178,13 +192,13 @@ export const WalletProvider = ({ children }: {children: ReactNode }) => {
       getSlopeWallet(),
       getSolflareWallet(),
       getTorusWallet({
-        options: { clientId: 'Get a client ID @ https://developer.tor.us' }
+        options: { clientId: 'Get a client ID @ https://developer.tor.us' },
       }),
       getLedgerWallet(),
       getSolletWallet({ network }),
       getSolletExtensionWallet({ network }),
     ],
-    []
+    [],
   );
 
   const onError = useCallback((error: WalletError) => {
@@ -196,14 +210,8 @@ export const WalletProvider = ({ children }: {children: ReactNode }) => {
   }, []);
 
   return (
-    <BaseWalletProvider
-      wallets={wallets}
-      onError={onError}
-      autoConnect
-    >
-      <WalletModalProvider>
-        {children}
-      </WalletModalProvider>
+    <BaseWalletProvider wallets={wallets} onError={onError} autoConnect>
+      <WalletModalProvider>{children}</WalletModalProvider>
     </BaseWalletProvider>
   );
-}
+};
diff --git a/packages/governance-sdk/package.json b/packages/governance-sdk/package.json
index 89952771..c2c838ad 100644
--- a/packages/governance-sdk/package.json
+++ b/packages/governance-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solana/spl-governance",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "SPL Governance Client API",
   "author": "Solana Maintainers <maintainers@solana.foundation>",
   "homepage": "https://github.com/solana-labs/oyster/blob/main/packages/governance-sdk/README.md",
diff --git a/packages/governance-sdk/src/governance/accounts.ts b/packages/governance-sdk/src/governance/accounts.ts
index f5648c09..486b0c67 100644
--- a/packages/governance-sdk/src/governance/accounts.ts
+++ b/packages/governance-sdk/src/governance/accounts.ts
@@ -238,7 +238,7 @@ export class RealmConfig {
       args.communityMintMaxVoteWeightSource;
     this.minCommunityTokensToCreateGovernance =
       args.minCommunityTokensToCreateGovernance;
-    this.useCommunityVoterWeightAddin = args.useCommunityVoterWeightAddin;
+    this.useCommunityVoterWeightAddin = !!args.useCommunityVoterWeightAddin;
     this.reserved = args.reserved;
   }
 }
diff --git a/packages/governance-sdk/src/governance/withCastVote.ts b/packages/governance-sdk/src/governance/withCastVote.ts
index a52ae6f2..4ee5541f 100644
--- a/packages/governance-sdk/src/governance/withCastVote.ts
+++ b/packages/governance-sdk/src/governance/withCastVote.ts
@@ -10,6 +10,7 @@ import { CastVoteArgs, Vote } from './instructions';
 import { getVoteRecordAddress } from './accounts';
 import { PROGRAM_VERSION_V1 } from '../registry/constants';
 import { SYSTEM_PROGRAM_ID } from '../tools/sdk/runtime';
+import { withVoterWeightAccounts } from './withVoterWeightAccounts';
 
 export const withCastVote = async (
   instructions: TransactionInstruction[],
@@ -24,6 +25,7 @@ export const withCastVote = async (
   governingTokenMint: PublicKey,
   vote: Vote,
   payer: PublicKey,
+  voterWeightRecord?: PublicKey,
 ) => {
   const args = new CastVoteArgs(
     programVersion === PROGRAM_VERSION_V1
@@ -103,6 +105,8 @@ export const withCastVote = async (
     },
   ];
 
+  withVoterWeightAccounts(keys, programId, realm, voterWeightRecord);
+
   instructions.push(
     new TransactionInstruction({
       keys,
diff --git a/packages/governance-sdk/src/governance/withCreateAccountGovernance.ts b/packages/governance-sdk/src/governance/withCreateAccountGovernance.ts
index a3366242..25449960 100644
--- a/packages/governance-sdk/src/governance/withCreateAccountGovernance.ts
+++ b/packages/governance-sdk/src/governance/withCreateAccountGovernance.ts
@@ -8,6 +8,7 @@ import { serialize } from 'borsh';
 import { GovernanceConfig } from './accounts';
 import { CreateAccountGovernanceArgs } from './instructions';
 import { SYSTEM_PROGRAM_ID } from '../tools/sdk/runtime';
+import { withVoterWeightAccounts } from './withVoterWeightAccounts';
 
 export const withCreateAccountGovernance = async (
   instructions: TransactionInstruction[],
@@ -18,6 +19,7 @@ export const withCreateAccountGovernance = async (
   tokenOwnerRecord: PublicKey,
   payer: PublicKey,
   governanceAuthority: PublicKey,
+  voterWeightRecord?: PublicKey,
 ): Promise<{ governanceAddress: PublicKey }> => {
   const args = new CreateAccountGovernanceArgs({ config });
   const data = Buffer.from(serialize(GOVERNANCE_SCHEMA, args));
@@ -74,6 +76,8 @@ export const withCreateAccountGovernance = async (
     },
   ];
 
+  withVoterWeightAccounts(keys, programId, realm, voterWeightRecord);
+
   instructions.push(
     new TransactionInstruction({
       keys,
diff --git a/packages/governance-sdk/src/governance/withCreateMintGovernance.ts b/packages/governance-sdk/src/governance/withCreateMintGovernance.ts
index 9c376cbf..9c676260 100644
--- a/packages/governance-sdk/src/governance/withCreateMintGovernance.ts
+++ b/packages/governance-sdk/src/governance/withCreateMintGovernance.ts
@@ -9,6 +9,7 @@ import { GovernanceConfig } from './accounts';
 import { CreateMintGovernanceArgs } from './instructions';
 import { TOKEN_PROGRAM_ID } from '../tools/sdk/splToken';
 import { SYSTEM_PROGRAM_ID } from '../tools/sdk/runtime';
+import { withVoterWeightAccounts } from './withVoterWeightAccounts';
 
 export const withCreateMintGovernance = async (
   instructions: TransactionInstruction[],
@@ -21,6 +22,7 @@ export const withCreateMintGovernance = async (
   tokenOwnerRecord: PublicKey,
   payer: PublicKey,
   governanceAuthority: PublicKey,
+  voterWeightRecord?: PublicKey,
 ): Promise<{ governanceAddress: PublicKey }> => {
   const args = new CreateMintGovernanceArgs({
     config,
@@ -86,6 +88,8 @@ export const withCreateMintGovernance = async (
     },
   ];
 
+  withVoterWeightAccounts(keys, programId, realm, voterWeightRecord);
+
   instructions.push(
     new TransactionInstruction({
       keys,
diff --git a/packages/governance-sdk/src/governance/withCreateProgramGovernance.ts b/packages/governance-sdk/src/governance/withCreateProgramGovernance.ts
index ffe58c6e..9dc24bcf 100644
--- a/packages/governance-sdk/src/governance/withCreateProgramGovernance.ts
+++ b/packages/governance-sdk/src/governance/withCreateProgramGovernance.ts
@@ -9,6 +9,7 @@ import { GovernanceConfig } from './accounts';
 import { CreateProgramGovernanceArgs } from './instructions';
 import { SYSTEM_PROGRAM_ID } from '../tools/sdk/runtime';
 import { BPF_UPGRADE_LOADER_ID } from '../tools/sdk/bpfUpgradeableLoader';
+import { withVoterWeightAccounts } from './withVoterWeightAccounts';
 
 export const withCreateProgramGovernance = async (
   instructions: TransactionInstruction[],
@@ -21,6 +22,7 @@ export const withCreateProgramGovernance = async (
   tokenOwnerRecord: PublicKey,
   payer: PublicKey,
   governanceAuthority: PublicKey,
+  voterWeightRecord?: PublicKey,
 ): Promise<{ governanceAddress: PublicKey }> => {
   const args = new CreateProgramGovernanceArgs({
     config,
@@ -100,6 +102,8 @@ export const withCreateProgramGovernance = async (
     },
   ];
 
+  withVoterWeightAccounts(keys, programId, realm, voterWeightRecord);
+
   instructions.push(
     new TransactionInstruction({
       keys,
diff --git a/packages/governance-sdk/src/governance/withCreateProposal.ts b/packages/governance-sdk/src/governance/withCreateProposal.ts
index 629f78e1..a5f889ae 100644
--- a/packages/governance-sdk/src/governance/withCreateProposal.ts
+++ b/packages/governance-sdk/src/governance/withCreateProposal.ts
@@ -7,9 +7,14 @@ import {
 import { getGovernanceSchema } from './serialisation';
 import { serialize } from 'borsh';
 import { CreateProposalArgs } from './instructions';
-import { GOVERNANCE_PROGRAM_SEED, VoteType } from './accounts';
+import {
+  getRealmConfigAddress,
+  GOVERNANCE_PROGRAM_SEED,
+  VoteType,
+} from './accounts';
 import { PROGRAM_VERSION_V1 } from '../registry/constants';
 import { SYSTEM_PROGRAM_ID } from '../tools/sdk/runtime';
+import { withVoterWeightAccounts } from './withVoterWeightAccounts';
 
 export const withCreateProposal = async (
   instructions: TransactionInstruction[],
@@ -27,6 +32,7 @@ export const withCreateProposal = async (
   options: string[],
   useDenyOption: boolean,
   payer: PublicKey,
+  voterWeightRecord?: PublicKey,
 ) => {
   const args = new CreateProposalArgs({
     name,
@@ -110,6 +116,8 @@ export const withCreateProposal = async (
     },
   ];
 
+  withVoterWeightAccounts(keys, programId, realm, voterWeightRecord);
+
   instructions.push(
     new TransactionInstruction({
       keys,
diff --git a/packages/governance-sdk/src/governance/withCreateTokenGovernance.ts b/packages/governance-sdk/src/governance/withCreateTokenGovernance.ts
index d00e69a9..46325105 100644
--- a/packages/governance-sdk/src/governance/withCreateTokenGovernance.ts
+++ b/packages/governance-sdk/src/governance/withCreateTokenGovernance.ts
@@ -9,6 +9,7 @@ import { GovernanceConfig } from './accounts';
 import { CreateTokenGovernanceArgs } from './instructions';
 import { SYSTEM_PROGRAM_ID } from '../tools/sdk/runtime';
 import { TOKEN_PROGRAM_ID } from '../tools/sdk/splToken';
+import { withVoterWeightAccounts } from './withVoterWeightAccounts';
 
 export const withCreateTokenGovernance = async (
   instructions: TransactionInstruction[],
@@ -21,6 +22,7 @@ export const withCreateTokenGovernance = async (
   tokenOwnerRecord: PublicKey,
   payer: PublicKey,
   governanceAuthority: PublicKey,
+  voterWeightRecord?: PublicKey,
 ): Promise<{ governanceAddress: PublicKey }> => {
   const args = new CreateTokenGovernanceArgs({
     config,
@@ -90,6 +92,8 @@ export const withCreateTokenGovernance = async (
     },
   ];
 
+  withVoterWeightAccounts(keys, programId, realm, voterWeightRecord);
+
   instructions.push(
     new TransactionInstruction({
       keys,
diff --git a/packages/governance-sdk/src/governance/withVoterWeightAccounts.ts b/packages/governance-sdk/src/governance/withVoterWeightAccounts.ts
new file mode 100644
index 00000000..35133067
--- /dev/null
+++ b/packages/governance-sdk/src/governance/withVoterWeightAccounts.ts
@@ -0,0 +1,25 @@
+import { AccountMeta, PublicKey } from '@solana/web3.js';
+import { getRealmConfigAddress } from './accounts';
+
+export async function withVoterWeightAccounts(
+  keys: AccountMeta[],
+  programId: PublicKey,
+  realm: PublicKey,
+  voterWeightRecord: PublicKey | undefined,
+) {
+  if (!voterWeightRecord) {
+    return;
+  }
+
+  const realmConfigAddress = await getRealmConfigAddress(programId, realm);
+  keys.push({
+    pubkey: realmConfigAddress,
+    isWritable: false,
+    isSigner: false,
+  });
+  keys.push({
+    pubkey: voterWeightRecord,
+    isWritable: false,
+    isSigner: false,
+  });
+}
diff --git a/packages/governance/.env b/packages/governance/.env
index a9768e06..8dbc1095 100644
--- a/packages/governance/.env
+++ b/packages/governance/.env
@@ -2,6 +2,8 @@
 LEND_HOST_FEE_ADDRESS=''
 MAINNET_RPC='https://ssc-dao.genesysgo.net/'
 DEVNET_RPC=''
+DEFAULT_GOVERNANCE_PROGRAM_ID='GovER5Lthms3bLBqWub97yVrMmEogzX7xNjdXpPPCVZw'
+
 
 # Rewired variables to comply with CRA restrictions
 REACT_APP_LEND_HOST_FEE_ADDRESS=$LEND_HOST_FEE_ADDRESS
@@ -9,4 +11,5 @@ REACT_APP_LEND_HOST_FEE_ADDRESS=$LEND_HOST_FEE_ADDRESS
 
 REACT_APP_MAINNET_RPC=$MAINNET_RPC
 REACT_APP_DEVNET_RPC=$DEVNET_RPC
+REACT_APP_DEFAULT_GOVERNANCE_PROGRAM_ID=$DEFAULT_GOVERNANCE_PROGRAM_ID
 
diff --git a/packages/governance/.env.development b/packages/governance/.env.development
new file mode 100644
index 00000000..17a89d36
--- /dev/null
+++ b/packages/governance/.env.development
@@ -0,0 +1 @@
+REACT_APP_DEFAULT_GOVERNANCE_PROGRAM_ID='GTesTBiEWE32WHXXE2S4XbZvA5CrEc4xs6ZgRe895dP'
\ No newline at end of file
diff --git a/packages/governance/package.json b/packages/governance/package.json
index b07c4f32..ac2da02d 100644
--- a/packages/governance/package.json
+++ b/packages/governance/package.json
@@ -5,11 +5,12 @@
     "@ant-design/icons": "^4.4.0",
     "@ant-design/pro-layout": "^6.7.0",
     "@babel/preset-typescript": "^7.12.13",
+    "@blockworks-foundation/voter-stake-registry-client": "^0.1.3",
     "@craco/craco": "^5.7.0",
     "@oyster/common": "0.0.2",
     "@project-serum/borsh": "^0.2.2",
     "@project-serum/serum": "^0.13.11",
-    "@solana/spl-governance": "0.0.13",
+    "@solana/spl-governance": "0.0.14",
     "@solana/spl-token": "0.0.13",
     "@solana/spl-token-swap": "0.1.0",
     "@solana/web3.js": "^1.22.0",
@@ -107,4 +108,4 @@
     "react": "16.13.1",
     "react-dom": "16.13.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/governance/src/actions/registerRealm.ts b/packages/governance/src/actions/registerRealm.ts
index bbc8a788..f6430913 100644
--- a/packages/governance/src/actions/registerRealm.ts
+++ b/packages/governance/src/actions/registerRealm.ts
@@ -13,6 +13,7 @@ export async function registerRealm(
   councilMint: PublicKey | undefined,
   communityMintMaxVoteWeightSource: MintMaxVoteWeightSource,
   minCommunityTokensToCreateGovernance: BN,
+  communityVoterWeightAddin: PublicKey | undefined,
 ) {
   let instructions: TransactionInstruction[] = [];
 
@@ -27,7 +28,7 @@ export async function registerRealm(
     councilMint,
     communityMintMaxVoteWeightSource,
     minCommunityTokensToCreateGovernance,
-    undefined,
+    communityVoterWeightAddin,
   );
 
   await sendTransactionWithNotifications(
diff --git a/packages/governance/src/actions/voterStakeRegistry/configureVoterStakeRegistry.ts b/packages/governance/src/actions/voterStakeRegistry/configureVoterStakeRegistry.ts
new file mode 100644
index 00000000..055c05c9
--- /dev/null
+++ b/packages/governance/src/actions/voterStakeRegistry/configureVoterStakeRegistry.ts
@@ -0,0 +1,78 @@
+import { VsrClient } from '@blockworks-foundation/voter-stake-registry-client';
+import {
+  ProgramAccount,
+  Realm,
+  RpcContext,
+  SYSTEM_PROGRAM_ID,
+} from '@solana/spl-governance';
+import { SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
+import BN from 'bn.js';
+import { sendTransactionWithNotifications } from '../../tools/transactions';
+import { getRegistrarAddress } from '../../tools/voterStakeRegistry/accounts';
+
+export async function configureVoterStakeRegistry(
+  { connection, wallet, walletPubkey }: RpcContext,
+  vsrClient: VsrClient,
+  realm: ProgramAccount<Realm>,
+  digitShift: number,
+  depositScaledFactor: BN,
+  lockupScaledFactor: BN,
+  lockupSaturationSecs: BN,
+) {
+  let instructions: TransactionInstruction[] = [];
+
+  const { registrarPda, registrarBump } = await getRegistrarAddress(
+    vsrClient?.program.programId!,
+    realm.pubkey,
+    realm.account.communityMint,
+  );
+
+  instructions.push(
+    vsrClient?.program.instruction.createRegistrar(registrarBump, {
+      accounts: {
+        registrar: registrarPda,
+        governanceProgramId: realm.owner,
+        realm: realm.pubkey,
+        realmGoverningTokenMint: realm.account.communityMint,
+        realmAuthority: realm.account.authority!,
+        payer: walletPubkey,
+        systemProgram: SYSTEM_PROGRAM_ID,
+        rent: SYSVAR_RENT_PUBKEY,
+      },
+    })!,
+  );
+
+  instructions.push(
+    vsrClient?.program.instruction.configureVotingMint(
+      0, // mint index
+      digitShift, // digit_shift
+      depositScaledFactor, // deposit_scaled_factor
+      lockupScaledFactor, // lockup_scaled_factor
+      lockupSaturationSecs, // lockup_saturation_secs
+      realm.account.authority!,
+      {
+        accounts: {
+          registrar: registrarPda,
+          realmAuthority: realm.account.authority!,
+          mint: realm.account.communityMint!,
+        },
+        remainingAccounts: [
+          {
+            pubkey: realm.account.communityMint!,
+            isSigner: false,
+            isWritable: false,
+          },
+        ],
+      },
+    )!,
+  );
+
+  await sendTransactionWithNotifications(
+    connection,
+    wallet,
+    instructions,
+    [],
+    'Configuring Voter Stake Registry',
+    'Voter Stake Registry Configured',
+  );
+}
diff --git a/packages/governance/src/components/ModalFormAction/modalFormAction.tsx b/packages/governance/src/components/ModalFormAction/modalFormAction.tsx
index c9c5d33b..a9b7352e 100644
--- a/packages/governance/src/components/ModalFormAction/modalFormAction.tsx
+++ b/packages/governance/src/components/ModalFormAction/modalFormAction.tsx
@@ -134,6 +134,8 @@ function ActionForm<TResult>({
       onFormSubmit(result);
       closeForm();
     } catch (ex) {
+      console.log('Submit error', ex);
+
       if (isSendTransactionError(ex)) {
         setError({
           txId: ex.txId,
diff --git a/packages/governance/src/components/voterStakeRegistry/votingMintConfigFormItem.tsx b/packages/governance/src/components/voterStakeRegistry/votingMintConfigFormItem.tsx
new file mode 100644
index 00000000..a3b7187e
--- /dev/null
+++ b/packages/governance/src/components/voterStakeRegistry/votingMintConfigFormItem.tsx
@@ -0,0 +1,86 @@
+import { ExplorerLink } from '@oyster/common';
+import { ProgramAccount, Realm } from '@solana/spl-governance';
+import { Form, InputNumber } from 'antd';
+import BN from 'bn.js';
+
+import React from 'react';
+
+import { getNameOf } from '../../tools/script';
+import { getSecondsFromYears } from '../../tools/units';
+import { getScaledFactor } from '../../tools/voterStakeRegistry/voterStakeRegistry';
+
+export interface VotingMintConfigValues {
+  digitShift: number;
+  depositFactor: number;
+  maxVotingTime: number;
+  lockupFactor: number;
+  lockupSaturationYears: number;
+}
+
+export function getVotingMintConfigApiValues(values: VotingMintConfigValues) {
+  const digitShift = values.digitShift;
+  const depositScaledFactor = getScaledFactor(values.depositFactor);
+  const lockupScaledFactor = getScaledFactor(values.lockupFactor);
+  const lockupSaturationSecs = new BN(
+    getSecondsFromYears(values.lockupSaturationYears).toString(),
+  );
+
+  return {
+    digitShift,
+    depositScaledFactor,
+    lockupScaledFactor,
+    lockupSaturationSecs,
+  };
+}
+
+const configNameOf = getNameOf<VotingMintConfigValues>();
+
+export function VotingMintConfigFormItem({
+  realm,
+}: {
+  realm: ProgramAccount<Realm>;
+}) {
+  return (
+    <>
+      <Form.Item label="community mint">
+        <ExplorerLink address={realm.account.communityMint} type="address" />
+      </Form.Item>
+
+      <Form.Item
+        name={configNameOf('digitShift')}
+        label={'mint digit shift'}
+        rules={[{ required: true }]}
+        initialValue={0}
+      >
+        <InputNumber min={0} />
+      </Form.Item>
+
+      <Form.Item
+        name={configNameOf('depositFactor')}
+        label={'mint deposit factor'}
+        rules={[{ required: true }]}
+        initialValue={1}
+      >
+        <InputNumber min={1} />
+      </Form.Item>
+
+      <Form.Item
+        name={configNameOf('lockupFactor')}
+        label={'mint lockup factor'}
+        rules={[{ required: true }]}
+        initialValue={1}
+      >
+        <InputNumber min={1} />
+      </Form.Item>
+
+      <Form.Item
+        name={configNameOf('lockupSaturationYears')}
+        label={'mint lockup saturation (years)'}
+        rules={[{ required: true }]}
+        initialValue={5}
+      >
+        <InputNumber min={1} />
+      </Form.Item>
+    </>
+  );
+}
diff --git a/packages/governance/src/contexts/GovernanceContext.tsx b/packages/governance/src/contexts/GovernanceContext.tsx
index 90c11892..a99a4fd2 100644
--- a/packages/governance/src/contexts/GovernanceContext.tsx
+++ b/packages/governance/src/contexts/GovernanceContext.tsx
@@ -113,8 +113,16 @@ export default function GovernanceProvider({ children = null as any }) {
 
   const programId = useMemo(() => {
     const params = new URLSearchParams(location.search);
+
+    console.log(
+      'DEFAULT_GOVERNANCE_PROGRAM_ID',
+      process.env.REACT_APP_DEFAULT_GOVERNANCE_PROGRAM_ID,
+    );
+
     return (
-      params.get('programId') ?? 'GovER5Lthms3bLBqWub97yVrMmEogzX7xNjdXpPPCVZw'
+      params.get('programId') ??
+      process.env.REACT_APP_DEFAULT_GOVERNANCE_PROGRAM_ID ??
+      'GovER5Lthms3bLBqWub97yVrMmEogzX7xNjdXpPPCVZw'
     );
   }, [location]);
 
diff --git a/packages/governance/src/hooks/useVoterStakeRegistryClient.ts b/packages/governance/src/hooks/useVoterStakeRegistryClient.ts
new file mode 100644
index 00000000..d8112461
--- /dev/null
+++ b/packages/governance/src/hooks/useVoterStakeRegistryClient.ts
@@ -0,0 +1,36 @@
+import { useConnectionConfig, useConnection, useWallet } from '@oyster/common';
+import { useEffect, useState } from 'react';
+
+import { useProgramInfo } from '../contexts/GovernanceContext';
+import { Provider, Wallet } from '@project-serum/anchor';
+import { VsrClient } from '@blockworks-foundation/voter-stake-registry-client';
+
+export function useVoterStakeRegistryClient() {
+  const { endpoint, env } = useConnectionConfig();
+  const connection = useConnection();
+  const wallet = useWallet();
+  const { programId, programVersion } = useProgramInfo();
+  const [client, setClient] = useState<VsrClient>();
+
+  useEffect(
+    () => {
+      const handleSetClient = async () => {
+        const options = Provider.defaultOptions();
+        const provider = new Provider(
+          connection,
+          (wallet as unknown) as Wallet,
+          options,
+        );
+        const vsrClient = await VsrClient.connect(provider, env === 'devnet');
+        setClient(vsrClient);
+      };
+      if (wallet.connected) {
+        handleSetClient();
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [programId, connection, wallet, endpoint, programVersion],
+  );
+
+  return client;
+}
diff --git a/packages/governance/src/tools/units.ts b/packages/governance/src/tools/units.ts
index 04dd5fb3..186dd7e9 100644
--- a/packages/governance/src/tools/units.ts
+++ b/packages/governance/src/tools/units.ts
@@ -5,6 +5,7 @@ import BN from 'bn.js';
 import { MintMaxVoteWeightSource } from '@solana/spl-governance';
 
 const SECONDS_PER_DAY = 86400;
+const DAYS_PER_YEAR = 365;
 
 export function getDaysFromTimestamp(unixTimestamp: number) {
   return unixTimestamp / SECONDS_PER_DAY;
@@ -14,6 +15,12 @@ export function getTimestampFromDays(days: number) {
   return days * SECONDS_PER_DAY;
 }
 
+export function getSecondsFromYears(years: number) {
+  return new BigNumber(years).multipliedBy(
+    new BigNumber(DAYS_PER_YEAR * SECONDS_PER_DAY),
+  );
+}
+
 /// Formats mint amount (natural units) as a decimal string
 export function formatMintNaturalAmountAsDecimal(
   mint: MintInfo,
diff --git a/packages/governance/src/tools/validators/voterWeightPlugin.ts b/packages/governance/src/tools/validators/voterWeightPlugin.ts
new file mode 100644
index 00000000..41c3c9d2
--- /dev/null
+++ b/packages/governance/src/tools/validators/voterWeightPlugin.ts
@@ -0,0 +1,11 @@
+import { tryParseKey } from '@oyster/common';
+
+export const voterWeightPluginValidator = async (rule: any, value: string) => {
+  if (value) {
+    const pubkey = tryParseKey(value);
+
+    if (!pubkey) {
+      throw new Error('Provided value is not a valid publickey');
+    }
+  }
+};
diff --git a/packages/governance/src/tools/voterStakeRegistry/accounts.ts b/packages/governance/src/tools/voterStakeRegistry/accounts.ts
new file mode 100644
index 00000000..ae6e519f
--- /dev/null
+++ b/packages/governance/src/tools/voterStakeRegistry/accounts.ts
@@ -0,0 +1,14 @@
+import { PublicKey } from '@solana/web3.js';
+
+export async function getRegistrarAddress(
+  programId: PublicKey,
+  realm: PublicKey,
+  governingTokenMint: PublicKey,
+) {
+  const [registrarPda, registrarBump] = await PublicKey.findProgramAddress(
+    [realm.toBuffer(), Buffer.from('registrar'), governingTokenMint.toBuffer()],
+    programId,
+  );
+
+  return { registrarPda, registrarBump };
+}
diff --git a/packages/governance/src/tools/voterStakeRegistry/voterStakeRegistry.ts b/packages/governance/src/tools/voterStakeRegistry/voterStakeRegistry.ts
new file mode 100644
index 00000000..5f0d0837
--- /dev/null
+++ b/packages/governance/src/tools/voterStakeRegistry/voterStakeRegistry.ts
@@ -0,0 +1,10 @@
+import BN from 'bn.js';
+import { BigNumber } from 'bignumber.js';
+
+export const SCALED_FACTOR_SHIFT = 9;
+
+export function getScaledFactor(amount: number) {
+  return new BN(
+    new BigNumber(amount.toString()).shiftedBy(SCALED_FACTOR_SHIFT).toString(),
+  );
+}
diff --git a/packages/governance/src/views/home/buttons/registerRealmButton.tsx b/packages/governance/src/views/home/buttons/registerRealmButton.tsx
index 9fc5459e..be2fbf3f 100644
--- a/packages/governance/src/views/home/buttons/registerRealmButton.tsx
+++ b/packages/governance/src/views/home/buttons/registerRealmButton.tsx
@@ -13,7 +13,10 @@ import { registerRealm } from '../../../actions/registerRealm';
 import { ModalFormAction } from '../../../components/ModalFormAction/modalFormAction';
 import { useRpcContext } from '../../../hooks/useRpcContext';
 import { getRealmUrl } from '../../../tools/routeTools';
-import { MintMaxVoteWeightSource } from '@solana/spl-governance';
+import {
+  MintMaxVoteWeightSource,
+  PROGRAM_VERSION_V1,
+} from '@solana/spl-governance';
 
 import { BigNumber } from 'bignumber.js';
 
@@ -25,6 +28,8 @@ import {
 import { RealmMintTokensFormItem } from '../../../components/realmMintTokensFormItem/realmMintTokensFormItem';
 import { parseMinTokensToCreate } from '../../../components/governanceConfigFormItem/governanceConfigFormItem';
 
+import { voterWeightPluginValidator } from '../../../tools/validators/voterWeightPlugin';
+
 const { Panel } = Collapse;
 const { Text } = Typography;
 
@@ -49,11 +54,13 @@ export function RegisterRealmButton({
 }) {
   const [redirectTo, setRedirectTo] = useState('');
   const rpcContext = useRpcContext();
-  const { programId } = rpcContext;
+  const { programId, programVersion } = rpcContext;
 
   const [councilVisible, setCouncilVisible] = useState(false);
 
   const [communityMintAddress, setCommunityMintAddress] = useState('');
+  const [communityVoterWeightAddin, setCommunityVoterWeightAddin] =
+    useState('');
 
   const onSubmit = async (
     values: {
@@ -63,6 +70,7 @@ export function RegisterRealmButton({
       useCouncilMint: boolean;
       mintDecimals: number;
       minTokensToCreateGovernance: number | string;
+      communityVoterWeightAddin: string;
     } & RealmMintSupplyConfigValues,
   ) => {
     let supplyFraction = parseMintSupplyFraction(
@@ -81,6 +89,9 @@ export function RegisterRealmButton({
       values.useCouncilMint ? new PublicKey(values.councilMint) : undefined,
       supplyFraction,
       new BN(minCommunityTokensToCreateGovernance),
+      communityVoterWeightAddin
+        ? new PublicKey(communityVoterWeightAddin)
+        : undefined,
     );
   };
 
@@ -153,6 +164,21 @@ export function RegisterRealmButton({
             communityMintAddress={communityMintAddress}
             maxVoteWeightSource={MintMaxVoteWeightSource.FULL_SUPPLY_FRACTION}
           ></RealmMintSupplyConfigFormItem>
+
+          {programVersion > PROGRAM_VERSION_V1 && (
+            <Form.Item
+              name="communityVoterWeightAddin"
+              label="community voter weight addin"
+              rules={[
+                { required: false, validator: voterWeightPluginValidator },
+              ]}
+            >
+              <Input
+                allowClear={true}
+                onChange={e => setCommunityVoterWeightAddin(e.target.value)}
+              />
+            </Form.Item>
+          )}
         </Panel>
       </Collapse>
     </ModalFormAction>
diff --git a/packages/governance/src/views/proposal/components/instructionInput/accountInstructionsForm.tsx b/packages/governance/src/views/proposal/components/instructionInput/accountInstructionsForm.tsx
index c7b50c73..aedf9505 100644
--- a/packages/governance/src/views/proposal/components/instructionInput/accountInstructionsForm.tsx
+++ b/packages/governance/src/views/proposal/components/instructionInput/accountInstructionsForm.tsx
@@ -14,12 +14,14 @@ import {
 import { ProgramAccount } from '@solana/spl-governance';
 
 export const AccountInstructionsForm = ({
+  programVersion,
   form,
   realm,
   governance,
   onCreateInstruction,
   coreInstructions,
 }: {
+  programVersion: number;
   form: FormInstance;
   realm: ProgramAccount<Realm>;
   governance: ProgramAccount<Governance>;
@@ -30,7 +32,7 @@ export const AccountInstructionsForm = ({
 
   let instructions = [
     ...coreInstructions,
-    ...getGovernanceInstructions(realm, governance),
+    ...getGovernanceInstructions(programVersion, realm, governance),
   ];
 
   if (!instruction) {
diff --git a/packages/governance/src/views/proposal/components/instructionInput/governanceInstructionForm.tsx b/packages/governance/src/views/proposal/components/instructionInput/governanceInstructionForm.tsx
index 0dee2580..b5ee3e1d 100644
--- a/packages/governance/src/views/proposal/components/instructionInput/governanceInstructionForm.tsx
+++ b/packages/governance/src/views/proposal/components/instructionInput/governanceInstructionForm.tsx
@@ -1,22 +1,30 @@
 import { FormInstance } from 'antd';
 import React from 'react';
 
-import { Governance, Realm } from '@solana/spl-governance';
+import { Governance, PROGRAM_VERSION_V1, Realm } from '@solana/spl-governance';
 import { GovernanceConfigForm } from './governanceConfigForm';
 import { InstructionType } from './instructionSelector';
 import { TransactionInstruction } from '@solana/web3.js';
 import { RealmConfigForm } from './realmConfigForm';
 import { NativeTransferForm } from './nativeTokenTransferForm';
 import { ProgramAccount } from '@solana/spl-governance';
+import { VoterStakeSetRegistrarForm } from './voterStakeRegistry/voterStakeSetRegistrarForm';
+import { VoterStakeConfigureMintForm } from './voterStakeRegistry/voterStakeConfigureMintForm';
 
 export function getGovernanceInstructions(
+  programVersion: number,
   realm: ProgramAccount<Realm>,
   governance: ProgramAccount<Governance>,
 ) {
   let instructions = [InstructionType.GovernanceSetConfig];
 
   if (governance.pubkey.toBase58() === realm.account.authority?.toBase58()) {
-    instructions.push(InstructionType.GovernanceSetRealmConfig);
+    instructions.push(InstructionType.SetRealmConfig);
+
+    if (programVersion > PROGRAM_VERSION_V1) {
+      instructions.push(InstructionType.VoterStakeSetRegistrar);
+      instructions.push(InstructionType.VoterStakeConfigureMint);
+    }
   }
 
   return instructions;
@@ -52,7 +60,7 @@ export function GovernanceInstructionForm({
           onCreateInstruction={onCreateInstruction}
         ></GovernanceConfigForm>
       )}
-      {instruction === InstructionType.GovernanceSetRealmConfig && (
+      {instruction === InstructionType.SetRealmConfig && (
         <RealmConfigForm
           form={form}
           realm={realm}
@@ -60,6 +68,22 @@ export function GovernanceInstructionForm({
           onCreateInstruction={onCreateInstruction}
         ></RealmConfigForm>
       )}
+      {instruction === InstructionType.VoterStakeSetRegistrar && (
+        <VoterStakeSetRegistrarForm
+          form={form}
+          realm={realm}
+          governance={governance}
+          onCreateInstruction={onCreateInstruction}
+        ></VoterStakeSetRegistrarForm>
+      )}
+      {instruction === InstructionType.VoterStakeConfigureMint && (
+        <VoterStakeConfigureMintForm
+          form={form}
+          realm={realm}
+          governance={governance}
+          onCreateInstruction={onCreateInstruction}
+        ></VoterStakeConfigureMintForm>
+      )}
     </>
   );
 }
diff --git a/packages/governance/src/views/proposal/components/instructionInput/instructionInput.tsx b/packages/governance/src/views/proposal/components/instructionInput/instructionInput.tsx
index 0bb1ef83..562f8596 100644
--- a/packages/governance/src/views/proposal/components/instructionInput/instructionInput.tsx
+++ b/packages/governance/src/views/proposal/components/instructionInput/instructionInput.tsx
@@ -16,6 +16,7 @@ import { MintInstructionsForm } from './mintInstructionsForm';
 import { useNativeTreasury } from '../../../../hooks/apiHooks';
 import { InstructionType } from './instructionSelector';
 import { ProgramAccount } from '@solana/spl-governance';
+import { useRpcContext } from '../../../../hooks/useRpcContext';
 
 export default function InstructionInput({
   realm,
@@ -33,6 +34,7 @@ export default function InstructionInput({
   const [coreInstructions, setCoreInstructions] = useState<InstructionType[]>(
     [],
   );
+  const { programVersion } = useRpcContext();
 
   useEffect(() => {
     if (nativeTreasury) {
@@ -75,17 +77,19 @@ export default function InstructionInput({
         onOk={form.submit}
         okText="Create"
         onCancel={() => setIsFormVisible(false)}
-        title={`Create ${governance.account.isProgramGovernance()
+        title={`Create ${
+          governance.account.isProgramGovernance()
             ? 'Program'
             : governance.account.isMintGovernance()
-              ? 'Mint'
-              : governance.account.isTokenGovernance()
-                ? 'Token'
-                : 'Account'
-          } Governance Instruction`}
+            ? 'Mint'
+            : governance.account.isTokenGovernance()
+            ? 'Token'
+            : 'Account'
+        } Governance Instruction`}
       >
         {governance.account.isProgramGovernance() && (
           <ProgramInstructionsForm
+            programVersion={programVersion}
             form={form}
             onCreateInstruction={onCreateInstruction}
             realm={realm}
@@ -95,6 +99,7 @@ export default function InstructionInput({
         )}
         {governance.account.isMintGovernance() && (
           <MintInstructionsForm
+            programVersion={programVersion}
             form={form}
             onCreateInstruction={onCreateInstruction}
             realm={realm}
@@ -104,6 +109,7 @@ export default function InstructionInput({
         )}
         {governance.account.isTokenGovernance() && (
           <TokenInstructionsForm
+            programVersion={programVersion}
             form={form}
             onCreateInstruction={onCreateInstruction}
             realm={realm}
@@ -113,6 +119,7 @@ export default function InstructionInput({
         )}
         {governance.account.isAccountGovernance() && (
           <AccountInstructionsForm
+            programVersion={programVersion}
             form={form}
             onCreateInstruction={onCreateInstruction}
             realm={realm}
diff --git a/packages/governance/src/views/proposal/components/instructionInput/instructionSelector.tsx b/packages/governance/src/views/proposal/components/instructionInput/instructionSelector.tsx
index 30985951..b008395f 100644
--- a/packages/governance/src/views/proposal/components/instructionInput/instructionSelector.tsx
+++ b/packages/governance/src/views/proposal/components/instructionInput/instructionSelector.tsx
@@ -12,7 +12,9 @@ export enum InstructionType {
   RaydiumStakeRAY,
   RaydiumHarvestRAY,
   SplTokenMintTo,
-  GovernanceSetRealmConfig,
+  SetRealmConfig,
+  VoterStakeSetRegistrar,
+  VoterStakeConfigureMint,
   NativeTransfer,
 }
 
@@ -28,6 +30,8 @@ const instructionNames = [
   'ray-harvest-RAY',
   'spl-token mint-to',
   'set-realm-config',
+  'voter-stake set-registrar',
+  'voter-stake config-mint',
   'SOL-transfer',
 ];
 
diff --git a/packages/governance/src/views/proposal/components/instructionInput/mintInstructionsForm.tsx b/packages/governance/src/views/proposal/components/instructionInput/mintInstructionsForm.tsx
index 8ba8cbab..967f1cbc 100644
--- a/packages/governance/src/views/proposal/components/instructionInput/mintInstructionsForm.tsx
+++ b/packages/governance/src/views/proposal/components/instructionInput/mintInstructionsForm.tsx
@@ -15,12 +15,14 @@ import {
 import { ProgramAccount } from '@solana/spl-governance';
 
 export const MintInstructionsForm = ({
+  programVersion,
   form,
   realm,
   governance,
   onCreateInstruction,
   coreInstructions,
 }: {
+  programVersion: number;
   form: FormInstance;
   realm: ProgramAccount<Realm>;
   governance: ProgramAccount<Governance>;
@@ -32,7 +34,7 @@ export const MintInstructionsForm = ({
   let instructions = [
     InstructionType.SplTokenMintTo,
     ...coreInstructions,
-    ...getGovernanceInstructions(realm, governance),
+    ...getGovernanceInstructions(programVersion, realm, governance),
   ];
 
   if (!instruction) {
diff --git a/packages/governance/src/views/proposal/components/instructionInput/programInstructionsForm.tsx b/packages/governance/src/views/proposal/components/instructionInput/programInstructionsForm.tsx
index 1cb89ca2..e5ea82b6 100644
--- a/packages/governance/src/views/proposal/components/instructionInput/programInstructionsForm.tsx
+++ b/packages/governance/src/views/proposal/components/instructionInput/programInstructionsForm.tsx
@@ -17,12 +17,14 @@ import {
 import { ProgramAccount } from '@solana/spl-governance';
 
 export const ProgramInstructionsForm = ({
+  programVersion,
   form,
   realm,
   governance,
   onCreateInstruction,
   coreInstructions,
 }: {
+  programVersion: number;
   form: FormInstance;
   realm: ProgramAccount<Realm>;
   governance: ProgramAccount<Governance>;
@@ -46,7 +48,7 @@ export const ProgramInstructionsForm = ({
     InstructionType.UpgradeProgram,
     ...coreInstructions,
     ...anchorInstructions,
-    ...getGovernanceInstructions(realm, governance),
+    ...getGovernanceInstructions(programVersion, realm, governance),
   ];
 
   return (
diff --git a/packages/governance/src/views/proposal/components/instructionInput/realmConfigForm.tsx b/packages/governance/src/views/proposal/components/instructionInput/realmConfigForm.tsx
index 1812bf6d..431a074e 100644
--- a/packages/governance/src/views/proposal/components/instructionInput/realmConfigForm.tsx
+++ b/packages/governance/src/views/proposal/components/instructionInput/realmConfigForm.tsx
@@ -1,7 +1,7 @@
-import { Form, FormInstance, InputNumber } from 'antd';
+import { Form, FormInstance, Input, InputNumber } from 'antd';
 import { ExplorerLink, useMint, useWallet } from '@oyster/common';
-import { Governance, Realm } from '@solana/spl-governance';
-import { TransactionInstruction } from '@solana/web3.js';
+import { Governance, PROGRAM_VERSION_V1, Realm } from '@solana/spl-governance';
+import { PublicKey, TransactionInstruction } from '@solana/web3.js';
 import React from 'react';
 
 import { formDefaults } from '../../../../tools/forms';
@@ -22,6 +22,7 @@ import {
 } from '../../../../tools/units';
 import { parseMinTokensToCreate } from '../../../../components/governanceConfigFormItem/governanceConfigFormItem';
 import { ProgramAccount } from '@solana/spl-governance';
+import { voterWeightPluginValidator } from '../../../../tools/validators/voterWeightPlugin';
 
 export interface RealmConfigValues {
   minCommunityTokensToCreateGovernance: number | string;
@@ -68,6 +69,7 @@ export const RealmConfigForm = ({
   const onCreate = async (
     values: {
       removeCouncil: boolean;
+      communityVoterWeightAddin: string | undefined;
     } & RealmMintSupplyConfigValues &
       RealmConfigValues,
   ) => {
@@ -76,6 +78,10 @@ export const RealmConfigForm = ({
       values.communityMintDecimals,
     );
 
+    const communityVoterWeightAddin = values.communityVoterWeightAddin
+      ? new PublicKey(values.communityVoterWeightAddin)
+      : undefined;
+
     const setRealmConfigIx = await createSetRealmConfig(
       programId,
       programVersion,
@@ -87,7 +93,7 @@ export const RealmConfigForm = ({
       parseMintSupplyFraction(values.communityMintMaxVoteWeightFraction),
       // Use minCommunityTokensToCreateGovernance.toString() in case the number is larger than number
       new BN(minCommunityTokensToCreateGovernance.toString()),
-      undefined,
+      communityVoterWeightAddin,
       // TODO: Once current wallet placeholder is supported to execute instruction using the wallet which executes the instruction replace it with the placeholder
       wallet.publicKey!,
     );
@@ -101,9 +107,9 @@ export const RealmConfigForm = ({
 
   const minCommunityTokensToCreateGovernance = communityMintInfo
     ? getMintDecimalAmountFromNatural(
-      communityMintInfo,
-      realm.account.config.minCommunityTokensToCreateGovernance,
-    ).toNumber()
+        communityMintInfo,
+        realm.account.config.minCommunityTokensToCreateGovernance,
+      ).toNumber()
     : 0;
 
   let mintDecimals = communityMintInfo ? communityMintInfo.decimals : 0;
@@ -165,6 +171,16 @@ export const RealmConfigForm = ({
           realm.account.config.communityMintMaxVoteWeightSource
         }
       ></RealmMintSupplyConfigFormItem>
+
+      {programVersion > PROGRAM_VERSION_V1 && (
+        <Form.Item
+          name="communityVoterWeightAddin"
+          label="community voter weight addin"
+          rules={[{ required: false, validator: voterWeightPluginValidator }]}
+        >
+          <Input allowClear={true} />
+        </Form.Item>
+      )}
     </Form>
   );
 };
diff --git a/packages/governance/src/views/proposal/components/instructionInput/tokenInstructionsForm.tsx b/packages/governance/src/views/proposal/components/instructionInput/tokenInstructionsForm.tsx
index 8604e9f1..97b90472 100644
--- a/packages/governance/src/views/proposal/components/instructionInput/tokenInstructionsForm.tsx
+++ b/packages/governance/src/views/proposal/components/instructionInput/tokenInstructionsForm.tsx
@@ -19,12 +19,14 @@ import { RaydiumStakeRAYForm } from './raydiumStakeRAYForm';
 import { ProgramAccount } from '@solana/spl-governance';
 
 export const TokenInstructionsForm = ({
+  programVersion,
   form,
   realm,
   governance,
   onCreateInstruction,
   coreInstructions,
 }: {
+  programVersion: number;
   form: FormInstance;
   realm: ProgramAccount<Realm>;
   governance: ProgramAccount<Governance>;
@@ -35,19 +37,19 @@ export const TokenInstructionsForm = ({
 
   const yfInstructions = isYieldFarmingGovernance(governance.pubkey)
     ? [
-      InstructionType.RaydiumAddLiquidity,
-      InstructionType.RaydiumStakeLP,
-      InstructionType.RaydiumHarvestLP,
-      InstructionType.RaydiumStakeRAY,
-      InstructionType.RaydiumHarvestRAY,
-    ]
+        InstructionType.RaydiumAddLiquidity,
+        InstructionType.RaydiumStakeLP,
+        InstructionType.RaydiumHarvestLP,
+        InstructionType.RaydiumStakeRAY,
+        InstructionType.RaydiumHarvestRAY,
+      ]
     : [];
 
   let instructions = [
     ...yfInstructions,
     InstructionType.SplTokenTransfer,
     ...coreInstructions,
-    ...getGovernanceInstructions(realm, governance),
+    ...getGovernanceInstructions(programVersion, realm, governance),
   ];
 
   if (!instruction) {
diff --git a/packages/governance/src/views/proposal/components/instructionInput/voterStakeRegistry/voterStakeConfigureMintForm.tsx b/packages/governance/src/views/proposal/components/instructionInput/voterStakeRegistry/voterStakeConfigureMintForm.tsx
new file mode 100644
index 00000000..5e249a84
--- /dev/null
+++ b/packages/governance/src/views/proposal/components/instructionInput/voterStakeRegistry/voterStakeConfigureMintForm.tsx
@@ -0,0 +1,90 @@
+import { Form, FormInstance } from 'antd';
+import { ExplorerLink, useWallet } from '@oyster/common';
+import { Governance, Realm } from '@solana/spl-governance';
+import { TransactionInstruction } from '@solana/web3.js';
+import React from 'react';
+
+import { ProgramAccount } from '@solana/spl-governance';
+
+import { useRpcContext } from '../../../../../hooks/useRpcContext';
+import { formDefaults } from '../../../../../tools/forms';
+import { useVoterStakeRegistryClient } from '../../../../../hooks/useVoterStakeRegistryClient';
+import { getRegistrarAddress } from '../../../../../tools/voterStakeRegistry/accounts';
+import {
+  getVotingMintConfigApiValues,
+  VotingMintConfigFormItem,
+  VotingMintConfigValues,
+} from '../../../../../components/voterStakeRegistry/votingMintConfigFormItem';
+
+export const VoterStakeConfigureMintForm = ({
+  form,
+  realm,
+  governance,
+  onCreateInstruction,
+}: {
+  form: FormInstance;
+  realm: ProgramAccount<Realm>;
+  governance: ProgramAccount<Governance>;
+  onCreateInstruction: (instruction: TransactionInstruction) => void;
+}) => {
+  const { programId } = useRpcContext();
+  const wallet = useWallet();
+  const vsrClient = useVoterStakeRegistryClient();
+
+  if (!wallet?.publicKey) {
+    return <div>Wallet not connected</div>;
+  }
+
+  const onCreate = async (values: VotingMintConfigValues) => {
+    const {
+      digitShift,
+      depositScaledFactor,
+      lockupScaledFactor,
+      lockupSaturationSecs,
+    } = getVotingMintConfigApiValues(values);
+
+    const { registrarPda } = await getRegistrarAddress(
+      vsrClient?.program.programId!,
+      realm.pubkey,
+      realm.account.communityMint,
+    );
+
+    const configureVotingMintIx =
+      vsrClient?.program.instruction.configureVotingMint(
+        0, // mint index
+        digitShift, // digit_shift
+        depositScaledFactor, // deposit_scaled_factor
+        lockupScaledFactor, // lockup_scaled_factor
+        lockupSaturationSecs, // lockup_saturation_secs
+        realm.account.authority!,
+        {
+          accounts: {
+            registrar: registrarPda,
+            realmAuthority: realm.account.authority!,
+            mint: realm.account.communityMint!,
+          },
+          remainingAccounts: [
+            {
+              pubkey: realm.account.communityMint!,
+              isSigner: false,
+              isWritable: false,
+            },
+          ],
+        },
+      )!;
+
+    onCreateInstruction(configureVotingMintIx);
+  };
+
+  return (
+    <Form {...formDefaults} form={form} onFinish={onCreate}>
+      <Form.Item label="program id">
+        <ExplorerLink address={programId} type="address" />
+      </Form.Item>
+      <Form.Item label="realm">
+        <ExplorerLink address={realm.pubkey} type="address" />
+      </Form.Item>
+      <VotingMintConfigFormItem realm={realm}></VotingMintConfigFormItem>
+    </Form>
+  );
+};
diff --git a/packages/governance/src/views/proposal/components/instructionInput/voterStakeRegistry/voterStakeSetRegistrarForm.tsx b/packages/governance/src/views/proposal/components/instructionInput/voterStakeRegistry/voterStakeSetRegistrarForm.tsx
new file mode 100644
index 00000000..25c900e6
--- /dev/null
+++ b/packages/governance/src/views/proposal/components/instructionInput/voterStakeRegistry/voterStakeSetRegistrarForm.tsx
@@ -0,0 +1,75 @@
+import { Form, FormInstance } from 'antd';
+import { ExplorerLink, useWallet } from '@oyster/common';
+import { Governance, Realm, SYSTEM_PROGRAM_ID } from '@solana/spl-governance';
+import { SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
+import React from 'react';
+
+import { ProgramAccount } from '@solana/spl-governance';
+
+import { useRpcContext } from '../../../../../hooks/useRpcContext';
+import { formDefaults } from '../../../../../tools/forms';
+import { useVoterStakeRegistryClient } from '../../../../../hooks/useVoterStakeRegistryClient';
+import { getRegistrarAddress } from '../../../../../tools/voterStakeRegistry/accounts';
+
+export const VoterStakeSetRegistrarForm = ({
+  form,
+  realm,
+  governance,
+  onCreateInstruction,
+}: {
+  form: FormInstance;
+  realm: ProgramAccount<Realm>;
+  governance: ProgramAccount<Governance>;
+  onCreateInstruction: (instruction: TransactionInstruction) => void;
+}) => {
+  const { programId } = useRpcContext();
+  const wallet = useWallet();
+  const vsrClient = useVoterStakeRegistryClient();
+
+  if (!wallet?.publicKey) {
+    return <div>Wallet not connected</div>;
+  }
+
+  const onCreate = async () => {
+    const { registrarPda, registrarBump } = await getRegistrarAddress(
+      vsrClient?.program.programId!,
+      realm.pubkey,
+      realm.account.communityMint,
+    );
+
+    const setRegistrarIx = await vsrClient?.program.instruction.createRegistrar(
+      registrarBump,
+      {
+        accounts: {
+          registrar: registrarPda,
+          governanceProgramId: realm.owner,
+          realm: realm.pubkey,
+          realmGoverningTokenMint: realm.account.communityMint,
+          realmAuthority: realm.account.authority!,
+          payer: wallet.publicKey!,
+          systemProgram: SYSTEM_PROGRAM_ID,
+          rent: SYSVAR_RENT_PUBKEY,
+        },
+      },
+    )!;
+
+    onCreateInstruction(setRegistrarIx);
+  };
+
+  return (
+    <Form {...formDefaults} form={form} onFinish={onCreate}>
+      <Form.Item label="program id">
+        <ExplorerLink address={programId} type="address" />
+      </Form.Item>
+      <Form.Item label="realm">
+        <ExplorerLink address={realm.pubkey} type="address" />
+      </Form.Item>
+      <Form.Item label="realm authority (governance account)">
+        <ExplorerLink address={governance.pubkey} type="address" />
+      </Form.Item>
+      <Form.Item label="realm community mint">
+        <ExplorerLink address={realm.account.communityMint} type="address" />
+      </Form.Item>
+    </Form>
+  );
+};
diff --git a/packages/governance/src/views/realm/buttons/configureVoterStakeRegistryButton.tsx b/packages/governance/src/views/realm/buttons/configureVoterStakeRegistryButton.tsx
new file mode 100644
index 00000000..836a9570
--- /dev/null
+++ b/packages/governance/src/views/realm/buttons/configureVoterStakeRegistryButton.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import { Realm } from '@solana/spl-governance';
+
+import { ModalFormAction } from '../../../components/ModalFormAction/modalFormAction';
+import { ProgramAccount } from '@solana/spl-governance';
+import { useVoterStakeRegistryClient } from '../../../hooks/useVoterStakeRegistryClient';
+
+import { configureVoterStakeRegistry } from '../../../actions/voterStakeRegistry/configureVoterStakeRegistry';
+import { useRpcContext } from '../../../hooks/useRpcContext';
+
+import {
+  getVotingMintConfigApiValues,
+  VotingMintConfigFormItem,
+  VotingMintConfigValues,
+} from '../../../components/voterStakeRegistry/votingMintConfigFormItem';
+
+export function ConfigureVoterStakeRegistryButton({
+  realm,
+}: {
+  realm: ProgramAccount<Realm>;
+}) {
+  const vsrClient = useVoterStakeRegistryClient();
+  const rpcContext = useRpcContext();
+
+  const onSubmit = async (values: VotingMintConfigValues) => {
+    const {
+      digitShift,
+      depositScaledFactor,
+      lockupScaledFactor,
+      lockupSaturationSecs,
+    } = getVotingMintConfigApiValues(values);
+
+    await configureVoterStakeRegistry(
+      rpcContext,
+      vsrClient!,
+      realm,
+      digitShift,
+      depositScaledFactor,
+      lockupScaledFactor,
+      lockupSaturationSecs,
+    );
+
+    return null;
+  };
+
+  return (
+    <ModalFormAction<null>
+      label="Configure Voter Stake Registry"
+      formTitle="Configure Voter Stake Registry"
+      formAction="Configure"
+      formPendingAction="Configuring"
+      onSubmit={onSubmit}
+    >
+      <VotingMintConfigFormItem realm={realm}></VotingMintConfigFormItem>
+    </ModalFormAction>
+  );
+}
diff --git a/packages/governance/src/views/realm/buttons/realmActionBar.tsx b/packages/governance/src/views/realm/buttons/realmActionBar.tsx
index 83f33576..4c5f2fa0 100644
--- a/packages/governance/src/views/realm/buttons/realmActionBar.tsx
+++ b/packages/governance/src/views/realm/buttons/realmActionBar.tsx
@@ -1,6 +1,6 @@
 import { Button, Popover, Space } from 'antd';
 import React, { useRef } from 'react';
-import { Realm } from '@solana/spl-governance';
+import { PROGRAM_VERSION_V1, Realm } from '@solana/spl-governance';
 import { DepositGoverningTokensButton } from './depositGoverningTokensButton';
 import { RegisterGovernanceButton } from './registerGovernanceButton';
 import { SetRealmAuthorityButton } from './setRealmAuthorityButton';
@@ -9,6 +9,8 @@ import { useWallet } from '@oyster/common';
 import { MoreOutlined } from '@ant-design/icons';
 import { CreateTreasuryAccountButton } from './createTreasuryAccountButton';
 import { ProgramAccount } from '@solana/spl-governance';
+import { ConfigureVoterStakeRegistryButton } from './configureVoterStakeRegistryButton';
+import { useRpcContext } from '../../../hooks/useRpcContext';
 
 export function RealmActionBar({
   realm,
@@ -19,6 +21,7 @@ export function RealmActionBar({
 }) {
   const parentRef = useRef<HTMLDivElement>(null);
   const { publicKey, connected } = useWallet();
+  const { programVersion } = useRpcContext();
 
   if (!realm) {
     return null;
@@ -32,6 +35,10 @@ export function RealmActionBar({
   const settingsVisible =
     showSettings && (showCreateNewGovernance || showSetRealmAuthority);
 
+  const useCommunityVoterWeightAddin =
+    programVersion > PROGRAM_VERSION_V1 &&
+    !!realm.account.config.useCommunityVoterWeightAddin;
+
   return (
     <Space>
       <DepositGoverningTokensButton
@@ -80,6 +87,11 @@ export function RealmActionBar({
                     realm={realm}
                   ></SetRealmAuthorityButton>
                 )}
+                {useCommunityVoterWeightAddin && (
+                  <ConfigureVoterStakeRegistryButton
+                    realm={realm}
+                  ></ConfigureVoterStakeRegistryButton>
+                )}
               </Space>
             }
           >
diff --git a/yarn.lock b/yarn.lock
index 2cce4bfe..e8786567 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1479,6 +1479,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@blockworks-foundation/voter-stake-registry-client@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@blockworks-foundation/voter-stake-registry-client/-/voter-stake-registry-client-0.1.3.tgz#d12525076ee557f0c970ab6e9108f6e4b44f4bb3"
+  integrity sha512-Hi5JwF5NEGrRplNSoJUMplvmXzgBCfb57humFJV1NPwzx07eaN1spTB0dp+AvGcvREIU/1DFpAqIC8Jv8r4Tpw==
+  dependencies:
+    "@project-serum/anchor" "^0.18.0"
+    "@project-serum/serum" "^0.13.61"
+
 "@blocto/sdk@^0.2.11":
   version "0.2.15"
   resolved "https://registry.yarnpkg.com/@blocto/sdk/-/sdk-0.2.15.tgz#acdc7098439fee8ded09511fb34150cd58dae033"
@@ -1730,6 +1738,13 @@
   dependencies:
     "@ethersproject/logger" "^5.1.0"
 
+"@ethersproject/bytes@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.5.0.tgz#cb11c526de657e7b45d2e0f0246fb3b9d29a601c"
+  integrity sha512-ABvc7BHWhZU9PNM/tANm/Qx4ostPGadAuQzWTr3doklZOhDlmcBqclrQe/ZXUIj3K8wC28oYeuRa+A37tX9kog==
+  dependencies:
+    "@ethersproject/logger" "^5.5.0"
+
 "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.1.0.tgz#4e7da6367ea0e9be87585d8b09f3fccf384b1452"
@@ -1764,6 +1779,11 @@
   resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.1.0.tgz#4cdeeefac029373349d5818f39c31b82cc6d9bbf"
   integrity sha512-wtUaD1lBX10HBXjjKV9VHCBnTdUaKQnQ2XSET1ezglqLdPdllNOIlLfhyCRqXm5xwcjExVI5ETokOYfjPtaAlw==
 
+"@ethersproject/logger@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.5.0.tgz#0c2caebeff98e10aefa5aef27d7441c7fd18cf5d"
+  integrity sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg==
+
 "@ethersproject/networks@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.1.0.tgz#f537290cb05aa6dc5e81e910926c04cfd5814bca"
@@ -1786,6 +1806,15 @@
     "@ethersproject/bytes" "^5.1.0"
     "@ethersproject/logger" "^5.1.0"
 
+"@ethersproject/sha2@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.5.0.tgz#a40a054c61f98fd9eee99af2c3cc6ff57ec24db7"
+  integrity sha512-B5UBoglbCiHamRVPLA110J+2uqsifpZaTmid2/7W5rbtYVz6gus6/hSDieIU/6gaKIDcOj12WnOdiymEUHIAOA==
+  dependencies:
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    hash.js "1.1.7"
+
 "@ethersproject/signing-key@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.1.0.tgz#6eddfbddb6826b597b9650e01acf817bf8991b9c"
@@ -3412,6 +3441,46 @@
     penpal "3.0.7"
     pocket-js-core "0.0.3"
 
+"@project-serum/anchor@^0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.11.1.tgz#155bff2c70652eafdcfd5559c81a83bb19cec9ff"
+  integrity sha512-oIdm4vTJkUy6GmE6JgqDAuQPKI7XM4TPJkjtoIzp69RZe0iAD9JP2XHx7lV1jLdYXeYHqDXfBt3zcq7W91K6PA==
+  dependencies:
+    "@project-serum/borsh" "^0.2.2"
+    "@solana/web3.js" "^1.17.0"
+    base64-js "^1.5.1"
+    bn.js "^5.1.2"
+    bs58 "^4.0.1"
+    buffer-layout "^1.2.0"
+    camelcase "^5.3.1"
+    crypto-hash "^1.3.0"
+    eventemitter3 "^4.0.7"
+    find "^0.3.0"
+    js-sha256 "^0.9.0"
+    pako "^2.0.3"
+    snake-case "^3.0.4"
+    toml "^3.0.0"
+
+"@project-serum/anchor@^0.18.0":
+  version "0.18.2"
+  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.18.2.tgz#0f13b5c2046446b7c24cf28763eec90febb28485"
+  integrity sha512-uyjiN/3Ipp+4hrZRm/hG18HzGLZyvP790LXrCsGO3IWxSl28YRhiGEpKnZycfMW94R7nxdUoE3wY67V+ZHSQBQ==
+  dependencies:
+    "@project-serum/borsh" "^0.2.2"
+    "@solana/web3.js" "^1.17.0"
+    base64-js "^1.5.1"
+    bn.js "^5.1.2"
+    bs58 "^4.0.1"
+    buffer-layout "^1.2.0"
+    camelcase "^5.3.1"
+    crypto-hash "^1.3.0"
+    eventemitter3 "^4.0.7"
+    find "^0.3.0"
+    js-sha256 "^0.9.0"
+    pako "^2.0.3"
+    snake-case "^3.0.4"
+    toml "^3.0.0"
+
 "@project-serum/borsh@^0.2.2":
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/@project-serum/borsh/-/borsh-0.2.2.tgz#63e558f2d6eb6ab79086bf499dea94da3182498f"
@@ -3429,6 +3498,17 @@
     bn.js "^5.1.2"
     buffer-layout "^1.2.0"
 
+"@project-serum/serum@^0.13.61":
+  version "0.13.61"
+  resolved "https://registry.yarnpkg.com/@project-serum/serum/-/serum-0.13.61.tgz#1f0e6dfa7786a71e4317593911e9915d8b2a06e6"
+  integrity sha512-aebaRGQ0/K7a5kJ9UXO59BAQFJILVu5jbGobU8GD2CTSy6SPceprB6/pgZmZLQIabhXWUHaZRF/wXIClgWataA==
+  dependencies:
+    "@project-serum/anchor" "^0.11.1"
+    "@solana/spl-token" "^0.1.6"
+    "@solana/web3.js" "^1.21.0"
+    bn.js "^5.1.2"
+    buffer-layout "^1.2.0"
+
 "@project-serum/sol-wallet-adapter@^0.2.5":
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/@project-serum/sol-wallet-adapter/-/sol-wallet-adapter-0.2.5.tgz#d949a8cc4d2f74e31e4f0205989703977689c76b"
@@ -3589,6 +3669,18 @@
     dotenv "8.2.0"
     mkdirp "1.0.4"
 
+"@solana/spl-token@^0.1.6":
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.1.8.tgz#f06e746341ef8d04165e21fc7f555492a2a0faa6"
+  integrity sha512-LZmYCKcPQDtJgecvWOgT/cnoIQPWjdH+QVyzPcFvyDUiT0DiRjZaam4aqNUyvchLFhzgunv3d9xOoyE34ofdoQ==
+  dependencies:
+    "@babel/runtime" "^7.10.5"
+    "@solana/web3.js" "^1.21.0"
+    bn.js "^5.1.0"
+    buffer "6.0.3"
+    buffer-layout "^1.2.0"
+    dotenv "10.0.0"
+
 "@solana/wallet-adapter-base@^0.6.0":
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/@solana/wallet-adapter-base/-/wallet-adapter-base-0.6.0.tgz#5a300dcf3021b4d7b8fe965020c2e282a7f27afd"
@@ -3749,6 +3841,26 @@
     tweetnacl "^1.0.0"
     ws "^7.0.0"
 
+"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0":
+  version "1.31.0"
+  resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.31.0.tgz#7a313d4c1a90b77f27ddbfe845a10d6883e06452"
+  integrity sha512-7nHHx1JNFnrt15e9y8m38I/EJCbaB+bFC3KZVM1+QhybCikFxGMtGA5r7PDC3GEL1R2RZA8yKoLkDKo3vzzqnw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@ethersproject/sha2" "^5.5.0"
+    "@solana/buffer-layout" "^3.0.0"
+    bn.js "^5.0.0"
+    borsh "^0.4.0"
+    bs58 "^4.0.1"
+    buffer "6.0.1"
+    cross-fetch "^3.1.4"
+    jayson "^3.4.4"
+    js-sha3 "^0.8.0"
+    rpc-websockets "^7.4.2"
+    secp256k1 "^4.0.2"
+    superstruct "^0.14.2"
+    tweetnacl "^1.0.0"
+
 "@solana/web3.js@^1.22.0":
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.22.0.tgz#ded439eb903aff4269a16a7fdfacc6866c6f0c13"
@@ -6899,7 +7011,7 @@ base-x@^3.0.2, base-x@^3.0.6, base-x@^3.0.8:
   dependencies:
     safe-buffer "^5.0.1"
 
-base64-js@^1.0.2, base64-js@^1.3.0, base64-js@^1.3.1:
+base64-js@^1.0.2, base64-js@^1.3.0, base64-js@^1.3.1, base64-js@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -7013,7 +7125,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
-bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.1.3:
+bn.js@^5.0.0, bn.js@^5.1.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.1.3:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
   integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
@@ -7321,6 +7433,14 @@ buffer@6.0.1:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
+buffer@6.0.3, buffer@^6.0.1, buffer@^6.0.3, buffer@~6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 buffer@^4.3.0:
   version "4.9.2"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
@@ -7338,14 +7458,6 @@ buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-buffer@^6.0.1, buffer@^6.0.3, buffer@~6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
 bufferutil@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz#66724b756bed23cd7c28c4d306d7994f9943cc6b"
@@ -8543,6 +8655,13 @@ cross-fetch@^2.1.0, cross-fetch@^2.1.1:
     node-fetch "2.1.2"
     whatwg-fetch "2.0.4"
 
+cross-fetch@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
+  integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
+  dependencies:
+    node-fetch "2.6.1"
+
 cross-spawn@7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
@@ -8589,7 +8708,7 @@ crypto-browserify@3.12.0, crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-hash@^1.2.2:
+crypto-hash@^1.2.2, crypto-hash@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/crypto-hash/-/crypto-hash-1.3.0.tgz#b402cb08f4529e9f4f09346c3e275942f845e247"
   integrity sha512-lyAZ0EMyjDkVvz8WOeVnuCPvKVBXcMv1l5SVqO1yC7PzTwrD/pPje/BIRbWhMoPe436U+Y2nD7f5bFx0kt+Sbg==
@@ -9709,6 +9828,11 @@ dotenv-expand@5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
+dotenv@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
+
 dotenv@8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
@@ -11482,6 +11606,13 @@ find-versions@^4.0.0:
   dependencies:
     semver-regex "^3.1.2"
 
+find@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find/-/find-0.3.0.tgz#4082e8fc8d8320f1a382b5e4f521b9bc50775cb8"
+  integrity sha512-iSd+O4OEYV/I36Zl8MdYJO0xD82wH528SaCieTVHhclgiYNe9y+yPKSwK+A7/WsmHL1EZ+pYUJBXWTL5qofksw==
+  dependencies:
+    traverse-chain "~0.1.0"
+
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -12337,7 +12468,7 @@ hash.js@1.1.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
-hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
+hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
   integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
@@ -14498,6 +14629,11 @@ jest@^27.4.7:
     import-local "^3.0.2"
     jest-cli "^27.4.7"
 
+js-sha256@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
+  integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
+
 js-sha3@0.5.7, js-sha3@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"
@@ -17068,6 +17204,11 @@ p-waterfall@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
+pako@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d"
+  integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg==
+
 pako@~1.0.5:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -20461,6 +20602,14 @@ smart-buffer@^4.1.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
   integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
 
+snake-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
+  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
+  dependencies:
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
+
 snakeize@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/snakeize/-/snakeize-0.1.0.tgz#10c088d8b58eb076b3229bb5a04e232ce126422d"
@@ -21586,6 +21735,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toml@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
+  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
+
 tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -21617,6 +21771,11 @@ tr46@^2.1.0:
   dependencies:
     punycode "^2.1.1"
 
+traverse-chain@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1"
+  integrity sha1-YdvC1Ttp/2CRoSoWj9fUMxB+QPE=
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"